XFree86 4.0.1h merge

43 files changed, 1421 insertions, 4331 deletions

diff --git a/xc/extras/Mesa/src/FX/Makefile.am b/xc/extras/Mesa/src/FX/Makefile.am
index c852d92ec..8d08efa3e 100644
--- a/xc/extras/Mesa/src/FX/Makefile.am
+++ b/xc/extras/Mesa/src/FX/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = no-dependencies
+#AUTOMAKE_OPTIONS = no-dependencies
 
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src $(FX_CFLAGS)
 
diff --git a/xc/extras/Mesa/src/FX/Makefile.in b/xc/extras/Mesa/src/FX/Makefile.in
deleted file mode 100644
index 2eec49306..000000000
--- a/xc/extras/Mesa/src/FX/Makefile.in
+++ /dev/null
@@ -1,405 +0,0 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-AS = @AS@
-CC = @CC@
-CPP = @CPP@
-DLLTOOL = @DLLTOOL@
-EXEEXT = @EXEEXT@
-FX_CFLAGS = @FX_CFLAGS@
-FX_LIBS = @FX_LIBS@
-GGI_CFLAGS = @GGI_CFLAGS@
-GGI_LIBS = @GGI_LIBS@
-GLUT_CFLAGS = @GLUT_CFLAGS@
-GLUT_LIBS = @GLUT_LIBS@
-LIBGLUT_VERSION = @LIBGLUT_VERSION@
-LIBGLU_VERSION = @LIBGLU_VERSION@
-LIBGL_VERSION = @LIBGL_VERSION@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-MAKEINFO = @MAKEINFO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-SVGA_CFLAGS = @SVGA_CFLAGS@
-SVGA_LIBS = @SVGA_LIBS@
-THREAD_LIBS = @THREAD_LIBS@
-VERSION = @VERSION@
-X_LIBADD = @X_LIBADD@
-ggi_confdir = @ggi_confdir@
-ggi_libdir = @ggi_libdir@
-
-AUTOMAKE_OPTIONS = no-dependencies
-
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src $(FX_CFLAGS)
-
-# Build a libtool convenience library.
-@HAVE_FX_TRUE@noinst_LTLIBRARIES = libMesaFX.la
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@SUBDIRS = X86
-
-libMesaFX_la_SOURCES =  	fxapi.c 	fxcva.c 	fxcva.h 	fxcvatmp.h 	fxclip.c 	fxcliptmp.h 	fxdd.c 	fxddspan.c 	fxddtex.c 	fxdrv.h 	fxglidew.c         fxglidew.h 	fxfastpath.c 	fxfasttmp.h 	fxpipeline.c 	fxrender.c 	fxrender.h 	fxsanity.c 	fxsetup.c 	fxtexman.c 	fxtrifuncs.c 	fxtritmp.h 	fxvs_tmp.h 	fxvsetup.c 	fxvsetup.h 	fxwgl.c
-
-
-libMesaFX_la_LIBADD = $(FX_LIBS)
-
-EXTRA_DIST = fxwgl.c
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../conf.h
-CONFIG_CLEAN_FILES = 
-LTLIBRARIES =  $(noinst_LTLIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I../..
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-libMesaFX_la_LDFLAGS = 
-libMesaFX_la_DEPENDENCIES = 
-libMesaFX_la_OBJECTS =  fxapi.lo fxcva.lo fxclip.lo fxdd.lo fxddspan.lo \
-fxddtex.lo fxglidew.lo fxfastpath.lo fxpipeline.lo fxrender.lo \
-fxsanity.lo fxsetup.lo fxtexman.lo fxtrifuncs.lo fxvsetup.lo fxwgl.lo
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-DIST_SUBDIRS =  X86
-SOURCES = $(libMesaFX_la_SOURCES)
-OBJECTS = $(libMesaFX_la_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu src/FX/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-noinstLTLIBRARIES:
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-
-distclean-noinstLTLIBRARIES:
-
-maintainer-clean-noinstLTLIBRARIES:
-
-.c.o:
-	$(COMPILE) -c $<
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-libMesaFX.la: $(libMesaFX_la_OBJECTS) $(libMesaFX_la_DEPENDENCIES)
-	$(LINK)  $(libMesaFX_la_LDFLAGS) $(libMesaFX_la_OBJECTS) $(libMesaFX_la_LIBADD) $(LIBS)
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
-	done; \
-	test "$$dot_seen" = "no" && rev=". $$rev"; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = src/FX
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-	for subdir in $(DIST_SUBDIRS); do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
-check-am: all-am
-check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-install-exec-am:
-install-exec: install-exec-recursive
-
-install-data-am:
-install-data: install-data-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am:
-uninstall: uninstall-recursive
-all-am: Makefile $(LTLIBRARIES)
-all-redirect: all-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLTLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-tags \
-		mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am:  clean-noinstLTLIBRARIES clean-compile clean-libtool \
-		clean-tags clean-generic mostlyclean-am
-
-clean: clean-recursive
-
-distclean-am:  distclean-noinstLTLIBRARIES distclean-compile \
-		distclean-libtool distclean-tags distclean-generic \
-		clean-am
-	-rm -f libtool
-
-distclean: distclean-recursive
-
-maintainer-clean-am:  maintainer-clean-noinstLTLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-recursive
-
-.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
-clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool install-data-recursive \
-uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/xc/extras/Mesa/src/FX/X86/Makefile.am b/xc/extras/Mesa/src/FX/X86/Makefile.am
index cb28ae9d5..3564a9def 100644
--- a/xc/extras/Mesa/src/FX/X86/Makefile.am
+++ b/xc/extras/Mesa/src/FX/X86/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = no-dependencies
+#AUTOMAKE_OPTIONS = no-dependencies
 
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src $(FX_CFLAGS)
 
diff --git a/xc/extras/Mesa/src/FX/X86/Makefile.in b/xc/extras/Mesa/src/FX/X86/Makefile.in
deleted file mode 100644
index 867ef41b5..000000000
--- a/xc/extras/Mesa/src/FX/X86/Makefile.in
+++ /dev/null
@@ -1,327 +0,0 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-AS = @AS@
-CC = @CC@
-CPP = @CPP@
-DLLTOOL = @DLLTOOL@
-EXEEXT = @EXEEXT@
-FX_CFLAGS = @FX_CFLAGS@
-FX_LIBS = @FX_LIBS@
-GGI_CFLAGS = @GGI_CFLAGS@
-GGI_LIBS = @GGI_LIBS@
-GLUT_CFLAGS = @GLUT_CFLAGS@
-GLUT_LIBS = @GLUT_LIBS@
-LIBGLUT_VERSION = @LIBGLUT_VERSION@
-LIBGLU_VERSION = @LIBGLU_VERSION@
-LIBGL_VERSION = @LIBGL_VERSION@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-MAKEINFO = @MAKEINFO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-SVGA_CFLAGS = @SVGA_CFLAGS@
-SVGA_LIBS = @SVGA_LIBS@
-THREAD_LIBS = @THREAD_LIBS@
-VERSION = @VERSION@
-X_LIBADD = @X_LIBADD@
-ggi_confdir = @ggi_confdir@
-ggi_libdir = @ggi_libdir@
-
-AUTOMAKE_OPTIONS = no-dependencies
-
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src $(FX_CFLAGS)
-
-x3dnow_files =  	fx_3dnow_fasttmp.h 	fx_3dnow_fastpath.S
-
-
-@HAVE_3DNOW_TRUE@x3dnow_sources = $(x3dnow_files)
-
-@HAVE_X86_TRUE@noinst_LTLIBRARIES = libMesaFX_X86.la
-
-libMesaFX_X86_la_SOURCES = $(x3dnow_sources)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../../conf.h
-CONFIG_CLEAN_FILES = 
-LTLIBRARIES =  $(noinst_LTLIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I../../..
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-libMesaFX_X86_la_LDFLAGS = 
-libMesaFX_X86_la_LIBADD = 
-@HAVE_3DNOW_FALSE@libMesaFX_X86_la_OBJECTS = 
-@HAVE_3DNOW_TRUE@libMesaFX_X86_la_OBJECTS =  fx_3dnow_fastpath.lo
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-SOURCES = $(libMesaFX_X86_la_SOURCES)
-OBJECTS = $(libMesaFX_X86_la_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu src/FX/X86/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-noinstLTLIBRARIES:
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-
-distclean-noinstLTLIBRARIES:
-
-maintainer-clean-noinstLTLIBRARIES:
-
-.c.o:
-	$(COMPILE) -c $<
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-libMesaFX_X86.la: $(libMesaFX_X86_la_OBJECTS) $(libMesaFX_X86_la_DEPENDENCIES)
-	$(LINK)  $(libMesaFX_X86_la_LDFLAGS) $(libMesaFX_X86_la_OBJECTS) $(libMesaFX_X86_la_LIBADD) $(LIBS)
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = src/FX/X86
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(LTLIBRARIES)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLTLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-tags \
-		mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-noinstLTLIBRARIES clean-compile clean-libtool \
-		clean-tags clean-generic mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-noinstLTLIBRARIES distclean-compile \
-		distclean-libtool distclean-tags distclean-generic \
-		clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-noinstLTLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
-clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-@HAVE_X86_TRUE@fx_3dnow_fastpath.lo: fx_3dnow_fastpath.S fx_3dnow_fasttmp.h
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/xc/extras/Mesa/src/FX/fxcva.c b/xc/extras/Mesa/src/FX/fxcva.c
index 188210add..44c15c5aa 100644
--- a/xc/extras/Mesa/src/FX/fxcva.c
+++ b/xc/extras/Mesa/src/FX/fxcva.c
@@ -395,7 +395,11 @@ void fxDDCheckMergeAndRender( GLcontext *ctx, struct gl_pipeline_stage *d )
    GLuint inputs = ctx->RenderFlags & ~ctx->CVA.pre.outputs;
 
    if (!(ctx->TriangleCaps & DD_TRI_UNFILLED) &&
+#ifdef VAO
+       (ctx->Array.Current->Summary & VERT_OBJ_ANY))
+#else
        (ctx->Array.Summary & VERT_OBJ_ANY))
+#endif
    {
       d->inputs = (VERT_SETUP_PART | VERT_ELT | inputs);   
       d->outputs = 0;
diff --git a/xc/extras/Mesa/src/FX/fxdrv.h b/xc/extras/Mesa/src/FX/fxdrv.h
index c85c73d8e..19c0d6bab 100644
--- a/xc/extras/Mesa/src/FX/fxdrv.h
+++ b/xc/extras/Mesa/src/FX/fxdrv.h
@@ -274,7 +274,7 @@ typedef struct {
 } tfxMipMapLevel;
 
 typedef struct tfxTexInfo_t {
-  struct tfxTexInfo *next;
+  struct tfxTexInfo_t *next;
   struct gl_texture_object *tObj;
 
   GLuint lastTimeUsed;
diff --git a/xc/extras/Mesa/src/FX/fxpipeline.c b/xc/extras/Mesa/src/FX/fxpipeline.c
index cf4c9ebbc..e7821fa56 100644
--- a/xc/extras/Mesa/src/FX/fxpipeline.c
+++ b/xc/extras/Mesa/src/FX/fxpipeline.c
@@ -217,7 +217,11 @@ GLboolean fxDDBuildPrecalcPipeline( GLcontext *ctx )
    if (fxMesa->is_in_hardware &&
        fxMesa->render_index == 0 && 
        (ctx->Enabled & ILLEGAL_ENABLES) == 0 &&
+#ifdef VAO
+       (ctx->Array.Current->Flags & (VERT_OBJ_234|
+#else
        (ctx->Array.Flags & (VERT_OBJ_234|
+#endif
 			    VERT_TEX0_4|
 			    VERT_TEX1_4|
 			    VERT_ELT)) == (VERT_OBJ_23|VERT_ELT))
@@ -236,6 +240,7 @@ GLboolean fxDDBuildPrecalcPipeline( GLcontext *ctx )
 
    if (fxMesa->using_fast_path) 
    {
+#if 0
       if (MESA_VERBOSE & (VERBOSE_STATE|VERBOSE_DRIVER)) 
  	 fprintf(stderr, "fxMesa: fall back to full pipeline %x %x %x %x %x\n",
 		 fxMesa->is_in_hardware,
@@ -243,11 +248,16 @@ GLboolean fxDDBuildPrecalcPipeline( GLcontext *ctx )
 		 (ctx->Enabled & ILLEGAL_ENABLES),
 		 (ctx->Array.Summary & (VERT_OBJ_23)),
 		 (ctx->Array.Summary & (VERT_OBJ_4|VERT_TEX0_4|VERT_TEX1_4)));
+#endif
 
       fxMesa->using_fast_path = 0;
       ctx->CVA.VB->ClipOrMask = 0;
       ctx->CVA.VB->ClipAndMask = CLIP_ALL_BITS;
+#ifdef VAO
+      ctx->Array.NewArrayState |= ctx->Array.Current->Summary;
+#else
       ctx->Array.NewArrayState |= ctx->Array.Summary;
+#endif
       return 0;
    }
    
@@ -272,7 +282,11 @@ void fxDDOptimizePrecalcPipeline( GLcontext *ctx, struct gl_pipeline *pipe )
    if (fxMesa->is_in_hardware &&
        fxMesa->render_index == 0 && 
        (ctx->Enabled & ILLEGAL_ENABLES) == 0 &&
+#ifdef VAO
+       (ctx->Array.Current->Summary & VERT_ELT))
+#else
        (ctx->Array.Summary & VERT_ELT))
+#endif
    {
       pipe->stages[0] = &fx_fast_stage;
       pipe->stages[1] = 0;
diff --git a/xc/extras/Mesa/src/FX/fxrender.c b/xc/extras/Mesa/src/FX/fxrender.c
index 5935998f8..b07a67ce7 100644
--- a/xc/extras/Mesa/src/FX/fxrender.c
+++ b/xc/extras/Mesa/src/FX/fxrender.c
@@ -215,7 +215,7 @@ static INLINE void fxSafeClippedTriangle3( struct vertex_buffer *VB,
 #define RENDER_POINTS( start, count )				\
    (void) gWin;							\
    (void) VB;							\
-   (VB->ctx->Driver.PointsFunc)( VB->ctx, start, count-1 )
+   (VB->ctx->Driver.PointsFunc)( VB->ctx, start, count )
 
 #define RENDER_LINE( i1, i )			\
   do {						\
@@ -278,7 +278,7 @@ static INLINE void fxSafeClippedTriangle3( struct vertex_buffer *VB,
 #define RENDER_POINTS( start, count )				\
    (void) gWin;							\
    (void) cullmask;						\
-   (VB->ctx->Driver.PointsFunc)( VB->ctx, start, count-1 )
+   (VB->ctx->Driver.PointsFunc)( VB->ctx, start, count )
 
 
 #define RENDER_LINE( i1, i )						\
@@ -376,7 +376,7 @@ static INLINE void fxSafeClippedTriangle3( struct vertex_buffer *VB,
     fxVertex *gWin = FX_DRIVER_DATA(VB)->verts;	\
     GLubyte *clipmask = VB->ClipMask;		\
     GLuint i;					\
-    for (i = start ; i <= count ; i++)		\
+    for (i = start ; i < count ; i++)		\
       if (clipmask[i] == 0) {			\
         RVB_COLOR(i);				\
         FX_grDrawPoint( (GrVertex *)gWin[i].f );\
@@ -435,7 +435,7 @@ static INLINE void fxSafeClippedTriangle3( struct vertex_buffer *VB,
     fxVertex *gWin = FX_DRIVER_DATA(VB)->verts;		\
     GLuint e;						\
     GLubyte *clipmask = VB->ClipMask;			\
-    for(e=start;e<=count;e++)				\
+    for(e=start;e<count;e++)				\
       if(clipmask[elt[e]]==0) {				\
         FX_grDrawPoint((GrVertex *)gWin[elt[e]].f);	\
       }							\
@@ -482,7 +482,7 @@ static INLINE void fxSafeClippedTriangle3( struct vertex_buffer *VB,
     fxVertex *gWin = FX_DRIVER_DATA(VB)->verts;		\
     GLuint e;						\
     GLubyte *clipmask = VB->ClipMask;			\
-    for(e=start;e<=count;e++)				\
+    for(e=start;e<count;e++)				\
       if(clipmask[elt[e]]==0) {				\
         FX_grDrawPoint((GrVertex *)gWin[elt[e]].f);	\
       }							\
@@ -532,7 +532,7 @@ static INLINE void fxSafeClippedTriangle3( struct vertex_buffer *VB,
 #define RENDER_POINTS( start, count )			\
   do {							\
     GLuint e;						\
-    for(e=start;e<=count;e++) {				\
+    for(e=start;e<count;e++) {				\
       FX_grDrawPoint((GrVertex *)gWin[elt[e]].f);	\
     }							\
   } while (0)
diff --git a/xc/extras/Mesa/src/FX/fxvsetup.c b/xc/extras/Mesa/src/FX/fxvsetup.c
index 5b075f404..e8207a37a 100644
--- a/xc/extras/Mesa/src/FX/fxvsetup.c
+++ b/xc/extras/Mesa/src/FX/fxvsetup.c
@@ -378,7 +378,11 @@ void fxDDCheckPartialRasterSetup( GLcontext *ctx, struct gl_pipeline_stage *d )
    /* Indirect triangles must be rendered via the immediate pipeline.  
     * If all rasterization is software, no need to set up.  
     */
+#ifdef VAO
+   if ((ctx->Array.Current->Summary & VERT_OBJ_ANY) == 0)
+#else
    if ((ctx->Array.Summary & VERT_OBJ_ANY) == 0)
+#endif
       return;
    
    if ((ctx->IndirectTriangles & DD_SW_SETUP) ||
@@ -386,7 +390,11 @@ void fxDDCheckPartialRasterSetup( GLcontext *ctx, struct gl_pipeline_stage *d )
       return;
 
    if ((ctx->Texture.ReallyEnabled & 0xf) &&
+#ifdef VAO
+       !(ctx->Array.Current->Flags & VERT_TEX0_ANY))
+#else
        !(ctx->Array.Flags & VERT_TEX0_ANY))
+#endif
    {
       if (ctx->TextureMatrix[0].type == MATRIX_GENERAL ||
 	  ctx->TextureMatrix[0].type == MATRIX_PERSPECTIVE ||
@@ -397,7 +405,11 @@ void fxDDCheckPartialRasterSetup( GLcontext *ctx, struct gl_pipeline_stage *d )
    }
 
    if ((ctx->Texture.ReallyEnabled & 0xf0) &&
+#ifdef VAO
+       !(ctx->Array.Current->Flags & VERT_TEX1_ANY))
+#else
        !(ctx->Array.Flags & VERT_TEX1_ANY))
+#endif
    {
       if (ctx->TextureMatrix[1].type == MATRIX_GENERAL ||
 	  ctx->TextureMatrix[1].type == MATRIX_PERSPECTIVE ||
@@ -420,27 +432,27 @@ void fxDDCheckPartialRasterSetup( GLcontext *ctx, struct gl_pipeline_stage *d )
  */
 void fxDDPartialRasterSetup( struct vertex_buffer *VB )
 {
-   GLuint new = VB->pipeline->new_outputs;
+   GLuint newOut = VB->pipeline->new_outputs;
    fxMesaContext fxMesa = (fxMesaContext)VB->ctx->DriverCtx;
    GLuint ind = 0;
 
    FX_DRIVER_DATA(VB)->last_vert = FX_DRIVER_DATA(VB)->verts + VB->Count;
 
-   if (new & VERT_WIN) {
-      new = VB->pipeline->outputs;
+   if (newOut & VERT_WIN) {
+      newOut = VB->pipeline->outputs;
       ind |= SETUP_XY|SETUP_W|SETUP_Z;
    }
 
-   if (new & VERT_TEX0_ANY)
+   if (newOut & VERT_TEX0_ANY)
       ind |= SETUP_W | fxMesa->tex_dest[0];
 
-   if (new & VERT_TEX1_ANY)
+   if (newOut & VERT_TEX1_ANY)
       ind |= SETUP_W | fxMesa->tex_dest[1];
 
-   if (new & VERT_RGBA)
+   if (newOut & VERT_RGBA)
       ind |= SETUP_W|SETUP_RGBA;
 
-   if ((new & VERT_WIN) == 0)
+   if ((newOut & VERT_WIN) == 0)
       ind &= ~(fxMesa->setupdone & SETUP_W);
       
    fxMesa->setupdone &= ~ind;
diff --git a/xc/extras/Mesa/src/Makefile b/xc/extras/Mesa/src/Makefile
deleted file mode 100644
index 107781860..000000000
--- a/xc/extras/Mesa/src/Makefile
+++ /dev/null
@@ -1,805 +0,0 @@
-# Generated automatically from Makefile.in by configure.
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-#AUTOMAKE_OPTIONS = no-dependencies
-
-
-SHELL = /bin/sh
-
-srcdir = .
-top_srcdir = ..
-prefix = /usr/local
-exec_prefix = ${prefix}
-
-bindir = ${exec_prefix}/bin
-sbindir = ${exec_prefix}/sbin
-libexecdir = ${exec_prefix}/libexec
-datadir = ${prefix}/share
-sysconfdir = ${prefix}/etc
-sharedstatedir = ${prefix}/com
-localstatedir = ${prefix}/var
-libdir = ${exec_prefix}/lib
-infodir = ${prefix}/info
-mandir = ${prefix}/man
-includedir = ${prefix}/include
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/Mesa
-pkglibdir = $(libdir)/Mesa
-pkgincludedir = $(includedir)/Mesa
-
-top_builddir = ..
-
-ACLOCAL = aclocal
-AUTOCONF = autoconf
-AUTOMAKE = automake
-AUTOHEADER = autoheader
-
-INSTALL = /usr/bin/install -c
-INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_SCRIPT = ${INSTALL_PROGRAM}
-transform = s,x,x,
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = i686-pc-linux-gnu
-host_triplet = i686-pc-linux-gnu
-AS = @AS@
-CC = gcc
-CPP = gcc -E
-DLLTOOL = @DLLTOOL@
-EXEEXT = 
-FX_CFLAGS = -I/usr/include/glide3 -I/usr/local/include/glide3
-FX_LIBS =  -lglide3x
-GGI_CFLAGS = 
-GGI_LIBS = 
-GLUT_CFLAGS = 
-GLUT_LIBS =  -lglut
-LIBGLUT_VERSION = 3:7:0
-LIBGLU_VERSION = 1:1:030300
-LIBGL_VERSION = 1:2:030300
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LN_S = ln -s
-MAKEINFO = makeinfo
-OBJDUMP = @OBJDUMP@
-OBJEXT = o
-PACKAGE = Mesa
-RANLIB = ranlib
-STRIP = strip
-SVGA_CFLAGS = 
-SVGA_LIBS =  -lvga
-THREAD_LIBS =  -lpthread
-VERSION = 3.3b1
-X_LIBADD =  -lXmu -lXext -lXi -lX11
-ggi_confdir = /usr/local/etc
-ggi_libdir = /usr/local/lib
-
-INCLUDES = -I$(top_srcdir)/include
-
-# Build a libtool library for installation in libdir.
-lib_LTLIBRARIES = libGL.la
-
-sysconf_DATA = mesa.conf
-
-EXTRA_DIST = ddsample.c mesa.conf
-
-libGL_la_LDFLAGS = -version-info $(LIBGL_VERSION)
-libGL_la_SOURCES =  	aatriangle.c 	aatriangle.h 	accum.c 	accum.h 	all.h 	alpha.c 	alpha.h 	alphabuf.c 	alphabuf.h 	attrib.c 	attrib.h 	bbox.c 	bbox.h 	bitmap.c 	bitmap.h 	blend.c 	blend.h 	buffers.c 	buffers.h 	clip.c 	clip.h 	clip_funcs.h 	clip_tmp.h 	colortab.c 	colortab.h 	config.c 	config.h 	context.c 	context.h 	copy_tmp.h 	copypix.c 	copypix.h 	cull_tmp.h 	cva.c 	cva.h 	dd.h 	debug_xform.c 	debug_xform.h 	depth.c 	depth.h 	dispatch.c 	dlist.c 	dlist.h 	dotprod_tmp.h 	drawpix.c 	drawpix.h 	enable.c 	enable.h 	enums.c 	enums.h 	eval.c 	eval.h 	extensions.c 	extensions.h 	feedback.c 	feedback.h 	fixed.h 	glapi.c 	glapi.h 	glapinoop.c 	glapinoop.h 	glapioffsets.h 	glapitable.h 	glapitemp.h 	glthread.c 	glthread.h 	fog.c 	fog.h 	fog_tmp.h 	general_clip.h 	get.c 	get.h 	glheader.h 	hash.c 	hash.h 	hint.c 	hint.h 	imaging.c 	imaging.h 	image.c 	image.h 	indirect_tmp.h 	interp_tmp.h 	light.c 	light.h 	lines.c 	lines.h 	linetemp.h 	lnaatemp.h 	logic.c 	logic.h 	macros.h 	masking.c 	masking.h 	matrix.c 	matrix.h 	mem.c 	mem.h 	mmath.c 	mmath.h 	norm_tmp.h 	pb.c 	pb.h 	pipeline.c 	pipeline.h 	pixel.c 	pixel.h 	pixeltex.c 	pixeltex.h 	points.c 	points.h 	polygon.c 	polygon.h 	quads.c 	quads.h 	rastpos.c 	rastpos.h 	readpix.c 	readpix.h 	rect.c 	rect.h 	render_tmp.h 	scissor.c 	scissor.h 	shade.c 	shade.h 	shade_tmp.h 	simple_list.h 	span.c 	span.h 	stages.c 	stages.h 	state.c 	state.h 	stencil.c 	stencil.h 	texgen_tmp.h 	teximage.c 	teximage.h 	texobj.c 	texobj.h 	texstate.c 	texstate.h 	texture.c 	texture.h 	texutil.c 	texutil.h 	trans_tmp.h 	translate.c 	translate.h 	triangle.c 	triangle.h 	tritemp.h 	types.h 	varray.c 	varray.h 	vb.c 	vb.h 	vbcull.c 	vbcull.h 	vbfill.c 	vbfill.h 	vbindirect.c 	vbindirect.h 	vbrender.c 	vbrender.h 	vbxform.c 	vbxform.h 	vector.c 	vector.h 	vertices.c 	vertices.h 	winpos.c 	winpos.h 	xform.c 	xform.h 	xform_tmp.h 	zoom.c 	zoom.h
-
-
-DRV_X86 = X86/libMesaX86.la
-SUB_X86 = X86
-
-DRV_FX = FX/libMesaFX.la
-SUB_FX = FX
-DRV_FX_X86 = FX/X86/libMesaFX_X86.la
-
-#DRV_GGI = GGI/libMesaGGI.la
-#SUB_GGI = GGI
-
-DRV_OSMESA = OSmesa/libMesaOS.la
-SUB_OSMESA = OSmesa
-
-DRV_SVGA = SVGA/libMesaSVGA.la
-SUB_SVGA = SVGA
-
-DRV_X11 = X/libMesaX11.la
-SUB_X11 = X
-
-SUBDIRS = $(SUB_X86) $(SUB_FX) $(SUB_GGI) $(SUB_OSMESA) $(SUB_SVGA) $(SUB_X11) 
-
-libGL_la_LIBADD = $(DRV_X86) $(DRV_FX) $(DRV_FX_X86) $(DRV_GGI) $(DRV_OSMESA) 	$(DRV_SVGA) $(DRV_X11) $(THREAD_LIBS)
-
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../conf.h
-CONFIG_CLEAN_FILES = 
-LTLIBRARIES =  $(lib_LTLIBRARIES)
-
-
-DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I..
-CPPFLAGS = 
-LDFLAGS = 
-LIBS = 
-X_CFLAGS =  -I/usr/X11R6/include
-X_LIBS =  -L/usr/X11R6/lib
-X_EXTRA_LIBS = 
-X_PRE_LIBS =  -lSM -lICE
-##libGL_la_DEPENDENCIES =  \
-##X86/libMesaX86.la \
-##FX/libMesaFX.la \
-##FX/X86/libMesaFX_X86.la \
-##GGI/libMesaGGI.la \
-##OSmesa/libMesaOS.la \
-##X/libMesaX11.la
-###libGL_la_DEPENDENCIES =  \
-###X86/libMesaX86.la \
-###FX/libMesaFX.la \
-###FX/X86/libMesaFX_X86.la
-#####libGL_la_DEPENDENCIES =  \
-#####FX/libMesaFX.la \
-#####GGI/libMesaGGI.la
-###libGL_la_DEPENDENCIES =  \
-###FX/libMesaFX.la \
-###OSmesa/libMesaOS.la
-###libGL_la_DEPENDENCIES =  \
-###SVGA/libMesaSVGA.la \
-###X/libMesaX11.la
-###libGL_la_DEPENDENCIES =  \
-###X86/libMesaX86.la \
-###GGI/libMesaGGI.la \
-###OSmesa/libMesaOS.la \
-###SVGA/libMesaSVGA.la
-###libGL_la_DEPENDENCIES =  \
-###X86/libMesaX86.la \
-###FX/libMesaFX.la \
-###FX/X86/libMesaFX_X86.la \
-###GGI/libMesaGGI.la \
-###X/libMesaX11.la
-#libGL_la_DEPENDENCIES =  \
-#X86/libMesaX86.la \
-#FX/libMesaFX.la \
-#FX/X86/libMesaFX_X86.la \
-#OSmesa/libMesaOS.la \
-#X/libMesaX11.la
-###libGL_la_DEPENDENCIES =  \
-###FX/libMesaFX.la \
-###GGI/libMesaGGI.la \
-###OSmesa/libMesaOS.la \
-###X/libMesaX11.la
-####libGL_la_DEPENDENCIES =  \
-####X/libMesaX11.la
-####libGL_la_DEPENDENCIES =  \
-####X86/libMesaX86.la \
-####GGI/libMesaGGI.la \
-####X/libMesaX11.la
-##libGL_la_DEPENDENCIES =  \
-##X86/libMesaX86.la \
-##OSmesa/libMesaOS.la \
-##X/libMesaX11.la
-####libGL_la_DEPENDENCIES =  \
-####GGI/libMesaGGI.la \
-####OSmesa/libMesaOS.la \
-####X/libMesaX11.la
-##libGL_la_DEPENDENCIES =  \
-##FX/libMesaFX.la \
-##SVGA/libMesaSVGA.la \
-##X/libMesaX11.la
-##libGL_la_DEPENDENCIES =  \
-##FX/libMesaFX.la \
-##GGI/libMesaGGI.la \
-##OSmesa/libMesaOS.la \
-##SVGA/libMesaSVGA.la \
-##X/libMesaX11.la
-libGL_la_DEPENDENCIES =  \
-X86/libMesaX86.la \
-FX/libMesaFX.la \
-FX/X86/libMesaFX_X86.la \
-OSmesa/libMesaOS.la \
-SVGA/libMesaSVGA.la \
-X/libMesaX11.la
-##libGL_la_DEPENDENCIES =  \
-##X86/libMesaX86.la \
-##FX/libMesaFX.la \
-##FX/X86/libMesaFX_X86.la \
-##GGI/libMesaGGI.la \
-##SVGA/libMesaSVGA.la \
-##X/libMesaX11.la
-#####libGL_la_DEPENDENCIES =  \
-#####X86/libMesaX86.la \
-#####GGI/libMesaGGI.la
-###libGL_la_DEPENDENCIES =  \
-###X86/libMesaX86.la \
-###OSmesa/libMesaOS.la
-#####libGL_la_DEPENDENCIES =  \
-#####GGI/libMesaGGI.la \
-#####OSmesa/libMesaOS.la
-###libGL_la_DEPENDENCIES =  \
-###FX/libMesaFX.la \
-###SVGA/libMesaSVGA.la
-#libGL_la_DEPENDENCIES =  \
-#X86/libMesaX86.la \
-#FX/libMesaFX.la \
-#FX/X86/libMesaFX_X86.la \
-#SVGA/libMesaSVGA.la \
-#X/libMesaX11.la
-###libGL_la_DEPENDENCIES =  \
-###FX/libMesaFX.la \
-###GGI/libMesaGGI.la \
-###SVGA/libMesaSVGA.la \
-###X/libMesaX11.la
-#libGL_la_DEPENDENCIES =  \
-#FX/libMesaFX.la \
-#OSmesa/libMesaOS.la \
-#SVGA/libMesaSVGA.la \
-#X/libMesaX11.la
-###libGL_la_DEPENDENCIES =  \
-###X86/libMesaX86.la \
-###GGI/libMesaGGI.la \
-###OSmesa/libMesaOS.la \
-###X/libMesaX11.la
-####libGL_la_DEPENDENCIES =  \
-####FX/libMesaFX.la
-####libGL_la_DEPENDENCIES =  \
-####X86/libMesaX86.la \
-####FX/libMesaFX.la \
-####FX/X86/libMesaFX_X86.la \
-####GGI/libMesaGGI.la
-##libGL_la_DEPENDENCIES =  \
-##X86/libMesaX86.la \
-##FX/libMesaFX.la \
-##FX/X86/libMesaFX_X86.la \
-##OSmesa/libMesaOS.la
-####libGL_la_DEPENDENCIES =  \
-####FX/libMesaFX.la \
-####GGI/libMesaGGI.la \
-####OSmesa/libMesaOS.la
-##libGL_la_DEPENDENCIES =  \
-##X86/libMesaX86.la \
-##SVGA/libMesaSVGA.la \
-##X/libMesaX11.la
-####libGL_la_DEPENDENCIES =  \
-####GGI/libMesaGGI.la \
-####SVGA/libMesaSVGA.la \
-####X/libMesaX11.la
-##libGL_la_DEPENDENCIES =  \
-##OSmesa/libMesaOS.la \
-##SVGA/libMesaSVGA.la \
-##X/libMesaX11.la
-##libGL_la_DEPENDENCIES =  \
-##X86/libMesaX86.la \
-##GGI/libMesaGGI.la \
-##OSmesa/libMesaOS.la \
-##SVGA/libMesaSVGA.la \
-##X/libMesaX11.la
-###libGL_la_DEPENDENCIES =  \
-###FX/libMesaFX.la \
-###X/libMesaX11.la
-###libGL_la_DEPENDENCIES =  \
-###OSmesa/libMesaOS.la \
-###SVGA/libMesaSVGA.la
-#####libGL_la_DEPENDENCIES =  \
-#####GGI/libMesaGGI.la \
-#####SVGA/libMesaSVGA.la
-###libGL_la_DEPENDENCIES =  \
-###X86/libMesaX86.la \
-###SVGA/libMesaSVGA.la
-###libGL_la_DEPENDENCIES =  \
-###X86/libMesaX86.la \
-###GGI/libMesaGGI.la \
-###SVGA/libMesaSVGA.la \
-###X/libMesaX11.la
-#libGL_la_DEPENDENCIES =  \
-#X86/libMesaX86.la \
-#OSmesa/libMesaOS.la \
-#SVGA/libMesaSVGA.la \
-#X/libMesaX11.la
-###libGL_la_DEPENDENCIES =  \
-###GGI/libMesaGGI.la \
-###OSmesa/libMesaOS.la \
-###SVGA/libMesaSVGA.la \
-###X/libMesaX11.la
-###libGL_la_DEPENDENCIES =  \
-###X86/libMesaX86.la \
-###FX/libMesaFX.la \
-###FX/X86/libMesaFX_X86.la \
-###GGI/libMesaGGI.la \
-###OSmesa/libMesaOS.la
-####libGL_la_DEPENDENCIES =  \
-####OSmesa/libMesaOS.la
-######libGL_la_DEPENDENCIES =  \
-######GGI/libMesaGGI.la
-####libGL_la_DEPENDENCIES =  \
-####X86/libMesaX86.la
-##libGL_la_DEPENDENCIES =  \
-##FX/libMesaFX.la \
-##OSmesa/libMesaOS.la \
-##SVGA/libMesaSVGA.la
-####libGL_la_DEPENDENCIES =  \
-####FX/libMesaFX.la \
-####GGI/libMesaGGI.la \
-####SVGA/libMesaSVGA.la
-##libGL_la_DEPENDENCIES =  \
-##X86/libMesaX86.la \
-##FX/libMesaFX.la \
-##FX/X86/libMesaFX_X86.la \
-##SVGA/libMesaSVGA.la
-####libGL_la_DEPENDENCIES =  \
-####X86/libMesaX86.la \
-####GGI/libMesaGGI.la \
-####OSmesa/libMesaOS.la
-#####libGL_la_DEPENDENCIES = 
-##libGL_la_DEPENDENCIES =  \
-##X86/libMesaX86.la \
-##FX/libMesaFX.la \
-##FX/X86/libMesaFX_X86.la \
-##GGI/libMesaGGI.la \
-##OSmesa/libMesaOS.la \
-##SVGA/libMesaSVGA.la
-###libGL_la_DEPENDENCIES =  \
-###X86/libMesaX86.la \
-###X/libMesaX11.la
-#####libGL_la_DEPENDENCIES =  \
-#####GGI/libMesaGGI.la \
-#####X/libMesaX11.la
-###libGL_la_DEPENDENCIES =  \
-###OSmesa/libMesaOS.la \
-###X/libMesaX11.la
-###libGL_la_DEPENDENCIES =  \
-###FX/libMesaFX.la \
-###GGI/libMesaGGI.la \
-###OSmesa/libMesaOS.la \
-###SVGA/libMesaSVGA.la
-#libGL_la_DEPENDENCIES =  \
-#X86/libMesaX86.la \
-#FX/libMesaFX.la \
-#FX/X86/libMesaFX_X86.la \
-#OSmesa/libMesaOS.la \
-#SVGA/libMesaSVGA.la
-###libGL_la_DEPENDENCIES =  \
-###X86/libMesaX86.la \
-###FX/libMesaFX.la \
-###FX/X86/libMesaFX_X86.la \
-###GGI/libMesaGGI.la \
-###SVGA/libMesaSVGA.la
-####libGL_la_DEPENDENCIES =  \
-####SVGA/libMesaSVGA.la
-#libGL_la_DEPENDENCIES =  \
-#X86/libMesaX86.la \
-#FX/libMesaFX.la \
-#FX/X86/libMesaFX_X86.la \
-#GGI/libMesaGGI.la \
-#OSmesa/libMesaOS.la \
-#SVGA/libMesaSVGA.la \
-#X/libMesaX11.la
-##libGL_la_DEPENDENCIES =  \
-##X86/libMesaX86.la \
-##FX/libMesaFX.la \
-##FX/X86/libMesaFX_X86.la \
-##X/libMesaX11.la
-####libGL_la_DEPENDENCIES =  \
-####FX/libMesaFX.la \
-####GGI/libMesaGGI.la \
-####X/libMesaX11.la
-##libGL_la_DEPENDENCIES =  \
-##FX/libMesaFX.la \
-##OSmesa/libMesaOS.la \
-##X/libMesaX11.la
-####libGL_la_DEPENDENCIES =  \
-####GGI/libMesaGGI.la \
-####OSmesa/libMesaOS.la \
-####SVGA/libMesaSVGA.la
-##libGL_la_DEPENDENCIES =  \
-##X86/libMesaX86.la \
-##OSmesa/libMesaOS.la \
-##SVGA/libMesaSVGA.la
-####libGL_la_DEPENDENCIES =  \
-####X86/libMesaX86.la \
-####GGI/libMesaGGI.la \
-####SVGA/libMesaSVGA.la
-libGL_la_OBJECTS =  aatriangle.lo accum.lo alpha.lo alphabuf.lo \
-attrib.lo bbox.lo bitmap.lo blend.lo buffers.lo clip.lo colortab.lo \
-config.lo context.lo copypix.lo cva.lo debug_xform.lo depth.lo \
-dispatch.lo dlist.lo drawpix.lo enable.lo enums.lo eval.lo \
-extensions.lo feedback.lo glapi.lo glapinoop.lo glthread.lo fog.lo \
-get.lo hash.lo hint.lo imaging.lo image.lo light.lo lines.lo logic.lo \
-masking.lo matrix.lo mem.lo mmath.lo pb.lo pipeline.lo pixel.lo \
-pixeltex.lo points.lo polygon.lo quads.lo rastpos.lo readpix.lo rect.lo \
-scissor.lo shade.lo span.lo stages.lo state.lo stencil.lo teximage.lo \
-texobj.lo texstate.lo texture.lo texutil.lo translate.lo triangle.lo \
-varray.lo vb.lo vbcull.lo vbfill.lo vbindirect.lo vbrender.lo \
-vbxform.lo vector.lo vertices.lo winpos.lo xform.lo zoom.lo
-CFLAGS = -g -O2 -Wall -fomit-frame-pointer -ffast-math -fexpensive-optimizations -fstrict-aliasing -malign-loops=2 -malign-jumps=2 -malign-functions=2 -D_REENTRANT
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DATA =  $(sysconf_DATA)
-
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-DIST_SUBDIRS =  X86 FX GGI OSmesa SVGA X
-DEP_FILES =  .deps/aatriangle.P .deps/accum.P .deps/alpha.P \
-.deps/alphabuf.P .deps/attrib.P .deps/bbox.P .deps/bitmap.P \
-.deps/blend.P .deps/buffers.P .deps/clip.P .deps/colortab.P \
-.deps/config.P .deps/context.P .deps/copypix.P .deps/cva.P \
-.deps/debug_xform.P .deps/depth.P .deps/dispatch.P .deps/dlist.P \
-.deps/drawpix.P .deps/enable.P .deps/enums.P .deps/eval.P \
-.deps/extensions.P .deps/feedback.P .deps/fog.P .deps/get.P \
-.deps/glapi.P .deps/glapinoop.P .deps/glthread.P .deps/hash.P \
-.deps/hint.P .deps/image.P .deps/imaging.P .deps/light.P .deps/lines.P \
-.deps/logic.P .deps/masking.P .deps/matrix.P .deps/mem.P .deps/mmath.P \
-.deps/pb.P .deps/pipeline.P .deps/pixel.P .deps/pixeltex.P \
-.deps/points.P .deps/polygon.P .deps/quads.P .deps/rastpos.P \
-.deps/readpix.P .deps/rect.P .deps/scissor.P .deps/shade.P .deps/span.P \
-.deps/stages.P .deps/state.P .deps/stencil.P .deps/teximage.P \
-.deps/texobj.P .deps/texstate.P .deps/texture.P .deps/texutil.P \
-.deps/translate.P .deps/triangle.P .deps/varray.P .deps/vb.P \
-.deps/vbcull.P .deps/vbfill.P .deps/vbindirect.P .deps/vbrender.P \
-.deps/vbxform.P .deps/vector.P .deps/vertices.P .deps/winpos.P \
-.deps/xform.P .deps/zoom.P
-SOURCES = $(libGL_la_SOURCES)
-OBJECTS = $(libGL_la_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-libLTLIBRARIES:
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-
-distclean-libLTLIBRARIES:
-
-maintainer-clean-libLTLIBRARIES:
-
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
-	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
-	  else :; fi; \
-	done
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
-	done
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-libGL.la: $(libGL_la_OBJECTS) $(libGL_la_DEPENDENCIES)
-	$(LINK) -rpath $(libdir) $(libGL_la_LDFLAGS) $(libGL_la_OBJECTS) $(libGL_la_LIBADD) $(LIBS)
-
-install-sysconfDATA: $(sysconf_DATA)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
-	@list='$(sysconf_DATA)'; for p in $$list; do \
-	  if test -f $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$p; \
-	  fi; fi; \
-	done
-
-uninstall-sysconfDATA:
-	@$(NORMAL_UNINSTALL)
-	list='$(sysconf_DATA)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(sysconfdir)/$$p; \
-	done
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-
-
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
-	done; \
-	test "$$dot_seen" = "no" && rev=". $$rev"; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = src
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-	for subdir in $(DIST_SUBDIRS); do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-
-DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-
--include $(DEP_FILES)
-
-mostlyclean-depend:
-
-clean-depend:
-
-distclean-depend:
-	-rm -rf .deps
-
-maintainer-clean-depend:
-
-%.o: %.c
-	@echo '$(COMPILE) -c $<'; \
-	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm .deps/$(*F).pp
-
-%.lo: %.c
-	@echo '$(LTCOMPILE) -c $<'; \
-	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-	  < .deps/$(*F).pp > .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm -f .deps/$(*F).pp
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
-check-am: all-am
-check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-install-exec-am: install-libLTLIBRARIES install-sysconfDATA
-install-exec: install-exec-recursive
-
-install-data-am:
-install-data: install-data-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am: uninstall-libLTLIBRARIES uninstall-sysconfDATA
-uninstall: uninstall-recursive
-all-am: Makefile $(LTLIBRARIES) $(DATA)
-all-redirect: all-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(sysconfdir)
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-libLTLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
-		mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am:  clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \
-		clean-depend clean-generic mostlyclean-am
-
-clean: clean-recursive
-
-distclean-am:  distclean-libLTLIBRARIES distclean-compile \
-		distclean-libtool distclean-tags distclean-depend \
-		distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-recursive
-
-maintainer-clean-am:  maintainer-clean-libLTLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-tags maintainer-clean-depend \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-recursive
-
-.PHONY: mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
-clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
-uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
-distclean-compile clean-compile maintainer-clean-compile \
-mostlyclean-libtool distclean-libtool clean-libtool \
-maintainer-clean-libtool uninstall-sysconfDATA install-sysconfDATA \
-install-data-recursive uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir \
-mostlyclean-depend distclean-depend clean-depend \
-maintainer-clean-depend info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs-am installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-strip:
-	-if strip -V 2>&1 | grep "GNU" > /dev/null; then \
-		strip --strip-unneeded .libs/*.so; \
-		strip --strip-debug .libs/*.a; \
-	fi
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/xc/extras/Mesa/src/Makefile.BeOS-R4 b/xc/extras/Mesa/src/Makefile.BeOS-R4
index db5c675b0..024165021 100755
--- a/xc/extras/Mesa/src/Makefile.BeOS-R4
+++ b/xc/extras/Mesa/src/Makefile.BeOS-R4
@@ -1,9 +1,9 @@
-# $Id: Makefile.BeOS-R4,v 1.1 2000/11/30 17:31:31 dawes Exp $
+# $Id: Makefile.BeOS-R4,v 1.2 2000/12/05 19:51:29 dawes Exp $
 
 # Mesa 3-D graphics library
-# Version:  3.3
+# Version:  3.4
 # 
-# 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"),
@@ -98,6 +98,7 @@ CORE_SOURCES = \
 	teximage.c \
 	texobj.c \
 	texstate.c \
+	texture.c \
 	texutil.c \
 	translate.c \
 	triangle.c \
@@ -114,6 +115,7 @@ CORE_SOURCES = \
 	xform.c \
 	zoom.c
 
+
 DRIVER_SOURCES = OSmesa/osmesa.c BeOS/GLView.cpp
 
 OBJECTS = $(CORE_SOURCES:.c=.o) OSmesa/osmesa.o BeOS/GLView.o
diff --git a/xc/extras/Mesa/src/Makefile.am b/xc/extras/Mesa/src/Makefile.am
index c23549e21..45642a080 100644
--- a/xc/extras/Mesa/src/Makefile.am
+++ b/xc/extras/Mesa/src/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = no-dependencies
+#AUTOMAKE_OPTIONS = no-dependencies
 
 INCLUDES = -I$(top_srcdir)/include
 
diff --git a/xc/extras/Mesa/src/Makefile.in b/xc/extras/Mesa/src/Makefile.in
deleted file mode 100644
index 437c9684d..000000000
--- a/xc/extras/Mesa/src/Makefile.in
+++ /dev/null
@@ -1,753 +0,0 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-AS = @AS@
-CC = @CC@
-CPP = @CPP@
-DLLTOOL = @DLLTOOL@
-EXEEXT = @EXEEXT@
-FX_CFLAGS = @FX_CFLAGS@
-FX_LIBS = @FX_LIBS@
-GGI_CFLAGS = @GGI_CFLAGS@
-GGI_LIBS = @GGI_LIBS@
-GLUT_CFLAGS = @GLUT_CFLAGS@
-GLUT_LIBS = @GLUT_LIBS@
-LIBGLUT_VERSION = @LIBGLUT_VERSION@
-LIBGLU_VERSION = @LIBGLU_VERSION@
-LIBGL_VERSION = @LIBGL_VERSION@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-MAKEINFO = @MAKEINFO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-SVGA_CFLAGS = @SVGA_CFLAGS@
-SVGA_LIBS = @SVGA_LIBS@
-THREAD_LIBS = @THREAD_LIBS@
-VERSION = @VERSION@
-X_LIBADD = @X_LIBADD@
-ggi_confdir = @ggi_confdir@
-ggi_libdir = @ggi_libdir@
-
-AUTOMAKE_OPTIONS = no-dependencies
-
-INCLUDES = -I$(top_srcdir)/include
-
-# Build a libtool library for installation in libdir.
-lib_LTLIBRARIES = libGL.la
-
-sysconf_DATA = mesa.conf
-
-EXTRA_DIST = ddsample.c mesa.conf
-
-libGL_la_LDFLAGS = -version-info $(LIBGL_VERSION)
-libGL_la_SOURCES =  	aatriangle.c 	aatriangle.h 	accum.c 	accum.h 	all.h 	alpha.c 	alpha.h 	alphabuf.c 	alphabuf.h 	attrib.c 	attrib.h 	bbox.c 	bbox.h 	bitmap.c 	bitmap.h 	blend.c 	blend.h 	buffers.c 	buffers.h 	clip.c 	clip.h 	clip_funcs.h 	clip_tmp.h 	colortab.c 	colortab.h 	config.c 	config.h 	context.c 	context.h 	copy_tmp.h 	copypix.c 	copypix.h 	cull_tmp.h 	cva.c 	cva.h 	dd.h 	debug_xform.c 	debug_xform.h 	depth.c 	depth.h 	dispatch.c 	dlist.c 	dlist.h 	dotprod_tmp.h 	drawpix.c 	drawpix.h 	enable.c 	enable.h 	enums.c 	enums.h 	eval.c 	eval.h 	extensions.c 	extensions.h 	feedback.c 	feedback.h 	fixed.h 	glapi.c 	glapi.h 	glapinoop.c 	glapinoop.h 	glapioffsets.h 	glapitable.h 	glapitemp.h 	glthread.c 	glthread.h 	fog.c 	fog.h 	fog_tmp.h 	general_clip.h 	get.c 	get.h 	glheader.h 	hash.c 	hash.h 	hint.c 	hint.h 	imaging.c 	imaging.h 	image.c 	image.h 	indirect_tmp.h 	interp_tmp.h 	light.c 	light.h 	lines.c 	lines.h 	linetemp.h 	lnaatemp.h 	logic.c 	logic.h 	macros.h 	masking.c 	masking.h 	matrix.c 	matrix.h 	mem.c 	mem.h 	mmath.c 	mmath.h 	norm_tmp.h 	pb.c 	pb.h 	pipeline.c 	pipeline.h 	pixel.c 	pixel.h 	pixeltex.c 	pixeltex.h 	points.c 	points.h 	polygon.c 	polygon.h 	quads.c 	quads.h 	rastpos.c 	rastpos.h 	readpix.c 	readpix.h 	rect.c 	rect.h 	render_tmp.h 	scissor.c 	scissor.h 	shade.c 	shade.h 	shade_tmp.h 	simple_list.h 	span.c 	span.h 	stages.c 	stages.h 	state.c 	state.h 	stencil.c 	stencil.h 	texgen_tmp.h 	teximage.c 	teximage.h 	texobj.c 	texobj.h 	texstate.c 	texstate.h 	texture.c 	texture.h 	texutil.c 	texutil.h 	trans_tmp.h 	translate.c 	translate.h 	triangle.c 	triangle.h 	tritemp.h 	types.h 	varray.c 	varray.h 	vb.c 	vb.h 	vbcull.c 	vbcull.h 	vbfill.c 	vbfill.h 	vbindirect.c 	vbindirect.h 	vbrender.c 	vbrender.h 	vbxform.c 	vbxform.h 	vector.c 	vector.h 	vertices.c 	vertices.h 	winpos.c 	winpos.h 	xform.c 	xform.h 	xform_tmp.h 	zoom.c 	zoom.h
-
-
-@HAVE_X86_TRUE@DRV_X86 = X86/libMesaX86.la
-@HAVE_X86_TRUE@SUB_X86 = X86
-
-@HAVE_FX_TRUE@DRV_FX = FX/libMesaFX.la
-@HAVE_FX_TRUE@SUB_FX = FX
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@DRV_FX_X86 = FX/X86/libMesaFX_X86.la
-
-@HAVE_GGI_TRUE@DRV_GGI = GGI/libMesaGGI.la
-@HAVE_GGI_TRUE@SUB_GGI = GGI
-
-@HAVE_OSMESA_TRUE@DRV_OSMESA = OSmesa/libMesaOS.la
-@HAVE_OSMESA_TRUE@SUB_OSMESA = OSmesa
-
-@HAVE_SVGA_TRUE@DRV_SVGA = SVGA/libMesaSVGA.la
-@HAVE_SVGA_TRUE@SUB_SVGA = SVGA
-
-@HAVE_X11_TRUE@DRV_X11 = X/libMesaX11.la
-@HAVE_X11_TRUE@SUB_X11 = X
-
-SUBDIRS = $(SUB_X86) $(SUB_FX) $(SUB_GGI) $(SUB_OSMESA) $(SUB_SVGA) $(SUB_X11) 
-
-libGL_la_LIBADD = $(DRV_X86) $(DRV_FX) $(DRV_FX_X86) $(DRV_GGI) $(DRV_OSMESA) 	$(DRV_SVGA) $(DRV_X11) $(THREAD_LIBS)
-
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../conf.h
-CONFIG_CLEAN_FILES = 
-LTLIBRARIES =  $(lib_LTLIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I..
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@X86/libMesaX86.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@FX/libMesaFX.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@FX/X86/libMesaFX_X86.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@GGI/libMesaGGI.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@OSmesa/libMesaOS.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@X/libMesaX11.la
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@X86/libMesaX86.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@FX/libMesaFX.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@FX/X86/libMesaFX_X86.la
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@FX/libMesaFX.la \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@GGI/libMesaGGI.la
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@FX/libMesaFX.la \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@OSmesa/libMesaOS.la
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@SVGA/libMesaSVGA.la \
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@X/libMesaX11.la
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@X86/libMesaX86.la \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@GGI/libMesaGGI.la \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@OSmesa/libMesaOS.la \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@SVGA/libMesaSVGA.la
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@X86/libMesaX86.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@FX/libMesaFX.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@FX/X86/libMesaFX_X86.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@GGI/libMesaGGI.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@X/libMesaX11.la
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@X86/libMesaX86.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@FX/libMesaFX.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@FX/X86/libMesaFX_X86.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@OSmesa/libMesaOS.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@X/libMesaX11.la
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@FX/libMesaFX.la \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@GGI/libMesaGGI.la \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@OSmesa/libMesaOS.la \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@X/libMesaX11.la
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@X/libMesaX11.la
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@X86/libMesaX86.la \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@GGI/libMesaGGI.la \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@X/libMesaX11.la
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@X86/libMesaX86.la \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@OSmesa/libMesaOS.la \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@X/libMesaX11.la
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@GGI/libMesaGGI.la \
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@OSmesa/libMesaOS.la \
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@X/libMesaX11.la
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@FX/libMesaFX.la \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@SVGA/libMesaSVGA.la \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@X/libMesaX11.la
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@FX/libMesaFX.la \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@GGI/libMesaGGI.la \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@OSmesa/libMesaOS.la \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@SVGA/libMesaSVGA.la \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@X/libMesaX11.la
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@X86/libMesaX86.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@FX/libMesaFX.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@FX/X86/libMesaFX_X86.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@OSmesa/libMesaOS.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@SVGA/libMesaSVGA.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@X/libMesaX11.la
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@X86/libMesaX86.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@FX/libMesaFX.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@FX/X86/libMesaFX_X86.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@GGI/libMesaGGI.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@SVGA/libMesaSVGA.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@X/libMesaX11.la
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@X86/libMesaX86.la \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@GGI/libMesaGGI.la
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@X86/libMesaX86.la \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@OSmesa/libMesaOS.la
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@GGI/libMesaGGI.la \
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@OSmesa/libMesaOS.la
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@FX/libMesaFX.la \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@SVGA/libMesaSVGA.la
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@X86/libMesaX86.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@FX/libMesaFX.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@FX/X86/libMesaFX_X86.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@SVGA/libMesaSVGA.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@X/libMesaX11.la
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@FX/libMesaFX.la \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@GGI/libMesaGGI.la \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@SVGA/libMesaSVGA.la \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@X/libMesaX11.la
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@FX/libMesaFX.la \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@OSmesa/libMesaOS.la \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@SVGA/libMesaSVGA.la \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@X/libMesaX11.la
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@X86/libMesaX86.la \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@GGI/libMesaGGI.la \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@OSmesa/libMesaOS.la \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@X/libMesaX11.la
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@FX/libMesaFX.la
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@X86/libMesaX86.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@FX/libMesaFX.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@FX/X86/libMesaFX_X86.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@GGI/libMesaGGI.la
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@X86/libMesaX86.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@FX/libMesaFX.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@FX/X86/libMesaFX_X86.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@OSmesa/libMesaOS.la
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@FX/libMesaFX.la \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@GGI/libMesaGGI.la \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@OSmesa/libMesaOS.la
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@X86/libMesaX86.la \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@SVGA/libMesaSVGA.la \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@X/libMesaX11.la
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@GGI/libMesaGGI.la \
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@SVGA/libMesaSVGA.la \
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@X/libMesaX11.la
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@OSmesa/libMesaOS.la \
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@SVGA/libMesaSVGA.la \
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@X/libMesaX11.la
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@X86/libMesaX86.la \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@GGI/libMesaGGI.la \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@OSmesa/libMesaOS.la \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@SVGA/libMesaSVGA.la \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@X/libMesaX11.la
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@FX/libMesaFX.la \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@X/libMesaX11.la
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@OSmesa/libMesaOS.la \
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@SVGA/libMesaSVGA.la
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@GGI/libMesaGGI.la \
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@SVGA/libMesaSVGA.la
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@X86/libMesaX86.la \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@SVGA/libMesaSVGA.la
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@X86/libMesaX86.la \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@GGI/libMesaGGI.la \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@SVGA/libMesaSVGA.la \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@X/libMesaX11.la
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@X86/libMesaX86.la \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@OSmesa/libMesaOS.la \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@SVGA/libMesaSVGA.la \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@X/libMesaX11.la
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@GGI/libMesaGGI.la \
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@OSmesa/libMesaOS.la \
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@SVGA/libMesaSVGA.la \
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@X/libMesaX11.la
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@X86/libMesaX86.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@FX/libMesaFX.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@FX/X86/libMesaFX_X86.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@GGI/libMesaGGI.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@OSmesa/libMesaOS.la
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@OSmesa/libMesaOS.la
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@GGI/libMesaGGI.la
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@X86/libMesaX86.la
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@FX/libMesaFX.la \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@OSmesa/libMesaOS.la \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@SVGA/libMesaSVGA.la
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@FX/libMesaFX.la \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@GGI/libMesaGGI.la \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@SVGA/libMesaSVGA.la
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@X86/libMesaX86.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@FX/libMesaFX.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@FX/X86/libMesaFX_X86.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@SVGA/libMesaSVGA.la
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@X86/libMesaX86.la \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@GGI/libMesaGGI.la \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@OSmesa/libMesaOS.la
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_FALSE@libGL_la_DEPENDENCIES = 
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@X86/libMesaX86.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@FX/libMesaFX.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@FX/X86/libMesaFX_X86.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@GGI/libMesaGGI.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@OSmesa/libMesaOS.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@SVGA/libMesaSVGA.la
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@X86/libMesaX86.la \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@X/libMesaX11.la
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@GGI/libMesaGGI.la \
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@X/libMesaX11.la
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@OSmesa/libMesaOS.la \
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@X/libMesaX11.la
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@FX/libMesaFX.la \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@GGI/libMesaGGI.la \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@OSmesa/libMesaOS.la \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@SVGA/libMesaSVGA.la
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@X86/libMesaX86.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@FX/libMesaFX.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@FX/X86/libMesaFX_X86.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@OSmesa/libMesaOS.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@SVGA/libMesaSVGA.la
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@X86/libMesaX86.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@FX/libMesaFX.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@FX/X86/libMesaFX_X86.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@GGI/libMesaGGI.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@SVGA/libMesaSVGA.la
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@SVGA/libMesaSVGA.la
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@X86/libMesaX86.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@FX/libMesaFX.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@FX/X86/libMesaFX_X86.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@GGI/libMesaGGI.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@OSmesa/libMesaOS.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@SVGA/libMesaSVGA.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_TRUE@X/libMesaX11.la
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@X86/libMesaX86.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@FX/libMesaFX.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@FX/X86/libMesaFX_X86.la \
-@HAVE_FX_TRUE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@X/libMesaX11.la
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@FX/libMesaFX.la \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@GGI/libMesaGGI.la \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@X/libMesaX11.la
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@FX/libMesaFX.la \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@OSmesa/libMesaOS.la \
-@HAVE_FX_TRUE@@HAVE_X86_FALSE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_FALSE@@HAVE_X11_TRUE@X/libMesaX11.la
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@GGI/libMesaGGI.la \
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@OSmesa/libMesaOS.la \
-@HAVE_FX_FALSE@@HAVE_X86_FALSE@@HAVE_GGI_TRUE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@SVGA/libMesaSVGA.la
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@X86/libMesaX86.la \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@OSmesa/libMesaOS.la \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_FALSE@@HAVE_OSMESA_TRUE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@SVGA/libMesaSVGA.la
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@libGL_la_DEPENDENCIES =  \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@X86/libMesaX86.la \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@GGI/libMesaGGI.la \
-@HAVE_FX_FALSE@@HAVE_X86_TRUE@@HAVE_GGI_TRUE@@HAVE_OSMESA_FALSE@@HAVE_SVGA_TRUE@@HAVE_X11_FALSE@SVGA/libMesaSVGA.la
-libGL_la_OBJECTS =  aatriangle.lo accum.lo alpha.lo alphabuf.lo \
-attrib.lo bbox.lo bitmap.lo blend.lo buffers.lo clip.lo colortab.lo \
-config.lo context.lo copypix.lo cva.lo debug_xform.lo depth.lo \
-dispatch.lo dlist.lo drawpix.lo enable.lo enums.lo eval.lo \
-extensions.lo feedback.lo glapi.lo glapinoop.lo glthread.lo fog.lo \
-get.lo hash.lo hint.lo imaging.lo image.lo light.lo lines.lo logic.lo \
-masking.lo matrix.lo mem.lo mmath.lo pb.lo pipeline.lo pixel.lo \
-pixeltex.lo points.lo polygon.lo quads.lo rastpos.lo readpix.lo rect.lo \
-scissor.lo shade.lo span.lo stages.lo state.lo stencil.lo teximage.lo \
-texobj.lo texstate.lo texture.lo texutil.lo translate.lo triangle.lo \
-varray.lo vb.lo vbcull.lo vbfill.lo vbindirect.lo vbrender.lo \
-vbxform.lo vector.lo vertices.lo winpos.lo xform.lo zoom.lo
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DATA =  $(sysconf_DATA)
-
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-DIST_SUBDIRS =  X86 FX GGI OSmesa SVGA X
-SOURCES = $(libGL_la_SOURCES)
-OBJECTS = $(libGL_la_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-libLTLIBRARIES:
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-
-distclean-libLTLIBRARIES:
-
-maintainer-clean-libLTLIBRARIES:
-
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
-	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
-	  else :; fi; \
-	done
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
-	done
-
-.c.o:
-	$(COMPILE) -c $<
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-libGL.la: $(libGL_la_OBJECTS) $(libGL_la_DEPENDENCIES)
-	$(LINK) -rpath $(libdir) $(libGL_la_LDFLAGS) $(libGL_la_OBJECTS) $(libGL_la_LIBADD) $(LIBS)
-
-install-sysconfDATA: $(sysconf_DATA)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
-	@list='$(sysconf_DATA)'; for p in $$list; do \
-	  if test -f $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$p; \
-	  fi; fi; \
-	done
-
-uninstall-sysconfDATA:
-	@$(NORMAL_UNINSTALL)
-	list='$(sysconf_DATA)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(sysconfdir)/$$p; \
-	done
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
-	done; \
-	test "$$dot_seen" = "no" && rev=". $$rev"; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = src
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-	for subdir in $(DIST_SUBDIRS); do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
-check-am: all-am
-check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-install-exec-am: install-libLTLIBRARIES install-sysconfDATA
-install-exec: install-exec-recursive
-
-install-data-am:
-install-data: install-data-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am: uninstall-libLTLIBRARIES uninstall-sysconfDATA
-uninstall: uninstall-recursive
-all-am: Makefile $(LTLIBRARIES) $(DATA)
-all-redirect: all-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(sysconfdir)
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-libLTLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-tags \
-		mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am:  clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \
-		clean-generic mostlyclean-am
-
-clean: clean-recursive
-
-distclean-am:  distclean-libLTLIBRARIES distclean-compile \
-		distclean-libtool distclean-tags distclean-generic \
-		clean-am
-	-rm -f libtool
-
-distclean: distclean-recursive
-
-maintainer-clean-am:  maintainer-clean-libLTLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-recursive
-
-.PHONY: mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
-clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
-uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
-distclean-compile clean-compile maintainer-clean-compile \
-mostlyclean-libtool distclean-libtool clean-libtool \
-maintainer-clean-libtool uninstall-sysconfDATA install-sysconfDATA \
-install-data-recursive uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-strip:
-	-if strip -V 2>&1 | grep "GNU" > /dev/null; then \
-		strip --strip-unneeded .libs/*.so; \
-		strip --strip-debug .libs/*.a; \
-	fi
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/xc/extras/Mesa/src/OSmesa/Makefile.am b/xc/extras/Mesa/src/OSmesa/Makefile.am
index 9f71106c5..1ff552057 100644
--- a/xc/extras/Mesa/src/OSmesa/Makefile.am
+++ b/xc/extras/Mesa/src/OSmesa/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = no-dependencies
+#AUTOMAKE_OPTIONS = no-dependencies
 
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src
 
diff --git a/xc/extras/Mesa/src/OSmesa/Makefile.in b/xc/extras/Mesa/src/OSmesa/Makefile.in
deleted file mode 100644
index a46b7cd8f..000000000
--- a/xc/extras/Mesa/src/OSmesa/Makefile.in
+++ /dev/null
@@ -1,320 +0,0 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-AS = @AS@
-CC = @CC@
-CPP = @CPP@
-DLLTOOL = @DLLTOOL@
-EXEEXT = @EXEEXT@
-FX_CFLAGS = @FX_CFLAGS@
-FX_LIBS = @FX_LIBS@
-GGI_CFLAGS = @GGI_CFLAGS@
-GGI_LIBS = @GGI_LIBS@
-GLUT_CFLAGS = @GLUT_CFLAGS@
-GLUT_LIBS = @GLUT_LIBS@
-LIBGLUT_VERSION = @LIBGLUT_VERSION@
-LIBGLU_VERSION = @LIBGLU_VERSION@
-LIBGL_VERSION = @LIBGL_VERSION@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-MAKEINFO = @MAKEINFO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-SVGA_CFLAGS = @SVGA_CFLAGS@
-SVGA_LIBS = @SVGA_LIBS@
-THREAD_LIBS = @THREAD_LIBS@
-VERSION = @VERSION@
-X_LIBADD = @X_LIBADD@
-ggi_confdir = @ggi_confdir@
-ggi_libdir = @ggi_libdir@
-
-AUTOMAKE_OPTIONS = no-dependencies
-
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src
-
-# Build a libtool convenience library.
-@HAVE_OSMESA_TRUE@noinst_LTLIBRARIES = libMesaOS.la
-
-libMesaOS_la_SOURCES = osmesa.c
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../conf.h
-CONFIG_CLEAN_FILES = 
-LTLIBRARIES =  $(noinst_LTLIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I../..
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-libMesaOS_la_LDFLAGS = 
-libMesaOS_la_LIBADD = 
-libMesaOS_la_OBJECTS =  osmesa.lo
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-SOURCES = $(libMesaOS_la_SOURCES)
-OBJECTS = $(libMesaOS_la_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu src/OSmesa/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-noinstLTLIBRARIES:
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-
-distclean-noinstLTLIBRARIES:
-
-maintainer-clean-noinstLTLIBRARIES:
-
-.c.o:
-	$(COMPILE) -c $<
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-libMesaOS.la: $(libMesaOS_la_OBJECTS) $(libMesaOS_la_DEPENDENCIES)
-	$(LINK)  $(libMesaOS_la_LDFLAGS) $(libMesaOS_la_OBJECTS) $(libMesaOS_la_LIBADD) $(LIBS)
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = src/OSmesa
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(LTLIBRARIES)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLTLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-tags \
-		mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-noinstLTLIBRARIES clean-compile clean-libtool \
-		clean-tags clean-generic mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-noinstLTLIBRARIES distclean-compile \
-		distclean-libtool distclean-tags distclean-generic \
-		clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-noinstLTLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
-clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/xc/extras/Mesa/src/OSmesa/osmesa.c b/xc/extras/Mesa/src/OSmesa/osmesa.c
index 4cc3e29d5..09e6ed0e9 100644
--- a/xc/extras/Mesa/src/OSmesa/osmesa.c
+++ b/xc/extras/Mesa/src/OSmesa/osmesa.c
@@ -102,7 +102,7 @@ OSMesaCreateContext( GLenum format, OSMesaContext sharelist )
    OSMesaContext osmesa;
    GLint rshift, gshift, bshift, ashift;
    GLint rind, gind, bind;
-   GLint indexBits, alphaBits;
+   GLint indexBits, alphaBits = 0;
    GLboolean rgbmode;
    GLboolean swalpha;
    GLuint i4 = 1;
diff --git a/xc/extras/Mesa/src/X/Makefile.am b/xc/extras/Mesa/src/X/Makefile.am
index bae8b2379..f0d65fd8f 100644
--- a/xc/extras/Mesa/src/X/Makefile.am
+++ b/xc/extras/Mesa/src/X/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = no-dependencies
+#AUTOMAKE_OPTIONS = no-dependencies
 
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src $(X_CFLAGS) $(FX_CFLAGS)
 
diff --git a/xc/extras/Mesa/src/X/Makefile.in b/xc/extras/Mesa/src/X/Makefile.in
deleted file mode 100644
index f86974fea..000000000
--- a/xc/extras/Mesa/src/X/Makefile.in
+++ /dev/null
@@ -1,324 +0,0 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-AS = @AS@
-CC = @CC@
-CPP = @CPP@
-DLLTOOL = @DLLTOOL@
-EXEEXT = @EXEEXT@
-FX_CFLAGS = @FX_CFLAGS@
-FX_LIBS = @FX_LIBS@
-GGI_CFLAGS = @GGI_CFLAGS@
-GGI_LIBS = @GGI_LIBS@
-GLUT_CFLAGS = @GLUT_CFLAGS@
-GLUT_LIBS = @GLUT_LIBS@
-LIBGLUT_VERSION = @LIBGLUT_VERSION@
-LIBGLU_VERSION = @LIBGLU_VERSION@
-LIBGL_VERSION = @LIBGL_VERSION@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-MAKEINFO = @MAKEINFO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-SVGA_CFLAGS = @SVGA_CFLAGS@
-SVGA_LIBS = @SVGA_LIBS@
-THREAD_LIBS = @THREAD_LIBS@
-VERSION = @VERSION@
-X_LIBADD = @X_LIBADD@
-ggi_confdir = @ggi_confdir@
-ggi_libdir = @ggi_libdir@
-
-AUTOMAKE_OPTIONS = no-dependencies
-
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src $(X_CFLAGS) $(FX_CFLAGS)
-
-# Build a libtool convenience library.
-@HAVE_X11_TRUE@noinst_LTLIBRARIES = libMesaX11.la
-
-libMesaX11_la_SOURCES =  	glxapi.c 	glxapi.h 	fakeglx.c 	xfonts.c 	xmesa1.c 	xmesa2.c 	xmesa3.c 	xmesa4.c 	xmesaP.h
-
-
-libMesaX11_la_LIBADD = $(X_LIBS) $(X_PRE_LIBS) $(X_LIBADD)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../conf.h
-CONFIG_CLEAN_FILES = 
-LTLIBRARIES =  $(noinst_LTLIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I../..
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-libMesaX11_la_LDFLAGS = 
-libMesaX11_la_DEPENDENCIES = 
-libMesaX11_la_OBJECTS =  glxapi.lo fakeglx.lo xfonts.lo xmesa1.lo \
-xmesa2.lo xmesa3.lo xmesa4.lo
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-SOURCES = $(libMesaX11_la_SOURCES)
-OBJECTS = $(libMesaX11_la_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu src/X/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-noinstLTLIBRARIES:
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-
-distclean-noinstLTLIBRARIES:
-
-maintainer-clean-noinstLTLIBRARIES:
-
-.c.o:
-	$(COMPILE) -c $<
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-libMesaX11.la: $(libMesaX11_la_OBJECTS) $(libMesaX11_la_DEPENDENCIES)
-	$(LINK)  $(libMesaX11_la_LDFLAGS) $(libMesaX11_la_OBJECTS) $(libMesaX11_la_LIBADD) $(LIBS)
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = src/X
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(LTLIBRARIES)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLTLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-tags \
-		mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-noinstLTLIBRARIES clean-compile clean-libtool \
-		clean-tags clean-generic mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-noinstLTLIBRARIES distclean-compile \
-		distclean-libtool distclean-tags distclean-generic \
-		clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-noinstLTLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
-clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/xc/extras/Mesa/src/X/fakeglx.c b/xc/extras/Mesa/src/X/fakeglx.c
index 0b7cf6bf3..6c9f04aee 100644
--- a/xc/extras/Mesa/src/X/fakeglx.c
+++ b/xc/extras/Mesa/src/X/fakeglx.c
@@ -560,7 +560,7 @@ static XVisualInfo *choose_x_visual( Display *dpy, int screen,
                                      int preferred_class )
 {
    XVisualInfo *vis;
-   int xclass, visclass;
+   int xclass, visclass = 0;
    int depth;
 
    if (rgba) {
diff --git a/xc/extras/Mesa/src/X/xfonts.c b/xc/extras/Mesa/src/X/xfonts.c
index 9b1148db9..b56d2471a 100644
--- a/xc/extras/Mesa/src/X/xfonts.c
+++ b/xc/extras/Mesa/src/X/xfonts.c
@@ -179,7 +179,7 @@ fill_bitmap (Display *dpy, Window win, GC gc,
 static XCharStruct *isvalid(XFontStruct *fs, int which)
 {
   unsigned int  rows,pages;
-  int           byte1,byte2;
+  int           byte1 = 0,byte2 = 0;
   int           i,valid = 1;
 
   rows = fs->max_byte1 - fs->min_byte1 + 1;
diff --git a/xc/extras/Mesa/src/X86/3dnow.c b/xc/extras/Mesa/src/X86/3dnow.c
index 7b642dc04..e52809493 100644
--- a/xc/extras/Mesa/src/X86/3dnow.c
+++ b/xc/extras/Mesa/src/X86/3dnow.c
@@ -30,6 +30,7 @@
 
 #include "glheader.h"
 #include "context.h"
+#include "shade.h"
 #include "types.h"
 #include "vertices.h"
 #include "xform.h"
@@ -170,6 +171,18 @@ void gl_init_3dnow_transform_asm( void )
 #endif
 }
 
+void gl_init_3dnow_shade_asm( void )
+{
+#ifdef USE_3DNOW_ASM
+   /* When the time comes, initialize optimized lighting here.
+    */
+
+#if 0
+   gl_test_all_shade_functions( "3DNow!" );
+#endif
+#endif
+}
+
 void gl_init_3dnow_vertex_asm( void )
 {
 #ifdef USE_3DNOW_ASM
diff --git a/xc/extras/Mesa/src/X86/3dnow.h b/xc/extras/Mesa/src/X86/3dnow.h
index 6e34b6ce4..a65c51060 100644
--- a/xc/extras/Mesa/src/X86/3dnow.h
+++ b/xc/extras/Mesa/src/X86/3dnow.h
@@ -31,9 +31,8 @@
 #ifndef __3DNOW_H__
 #define __3DNOW_H__
 
-#include "xform.h"
-
 void gl_init_3dnow_transform_asm( void );
+void gl_init_3dnow_shade_asm( void );
 void gl_init_3dnow_vertex_asm( void );
 
 #endif
diff --git a/xc/extras/Mesa/src/X86/Makefile.am b/xc/extras/Mesa/src/X86/Makefile.am
index d4d4f2ebd..96c377198 100644
--- a/xc/extras/Mesa/src/X86/Makefile.am
+++ b/xc/extras/Mesa/src/X86/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = no-dependencies
+#AUTOMAKE_OPTIONS = no-dependencies
 
 x3dnow_files = \
 	3dnow.c \
diff --git a/xc/extras/Mesa/src/X86/Makefile.in b/xc/extras/Mesa/src/X86/Makefile.in
deleted file mode 100644
index 31a68c082..000000000
--- a/xc/extras/Mesa/src/X86/Makefile.in
+++ /dev/null
@@ -1,472 +0,0 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-AS = @AS@
-CC = @CC@
-CPP = @CPP@
-DLLTOOL = @DLLTOOL@
-EXEEXT = @EXEEXT@
-FX_CFLAGS = @FX_CFLAGS@
-FX_LIBS = @FX_LIBS@
-GGI_CFLAGS = @GGI_CFLAGS@
-GGI_LIBS = @GGI_LIBS@
-GLUT_CFLAGS = @GLUT_CFLAGS@
-GLUT_LIBS = @GLUT_LIBS@
-LIBGLUT_VERSION = @LIBGLUT_VERSION@
-LIBGLU_VERSION = @LIBGLU_VERSION@
-LIBGL_VERSION = @LIBGL_VERSION@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-MAKEINFO = @MAKEINFO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-SVGA_CFLAGS = @SVGA_CFLAGS@
-SVGA_LIBS = @SVGA_LIBS@
-THREAD_LIBS = @THREAD_LIBS@
-VERSION = @VERSION@
-X_LIBADD = @X_LIBADD@
-ggi_confdir = @ggi_confdir@
-ggi_libdir = @ggi_libdir@
-
-AUTOMAKE_OPTIONS = no-dependencies
-
-x3dnow_files =  	3dnow.c 	3dnow.h 	3dnow_norm_raw.S 	3dnow_xform_masked1.S 	3dnow_xform_masked2.S 	3dnow_xform_masked3.S 	3dnow_xform_masked4.S 	3dnow_xform_raw1.S 	3dnow_xform_raw2.S 	3dnow_xform_raw3.S 	3dnow_xform_raw4.S 	vertex_3dnow.S
-
-
-katmai_files =  	katmai.c 	katmai.h 	katmai_norm_raw.S 	katmai_xform_raw1.S 	katmai_xform_masked1.S 	katmai_xform_raw2.S 	katmai_xform_masked2.S 	katmai_xform_raw3.S 	katmai_xform_masked3.S 	katmai_xform_raw4.S 	katmai_xform_masked4.S 	vertex_katmai.S
-
-
-mmx_files = mmx.h mmx_blend.S
-
-@HAVE_3DNOW_TRUE@x3dnow_sources = $(x3dnow_files)
-@HAVE_3DNOW_TRUE@CFLAGS_3DNOW = -DUSE_3DNOW_ASM
-
-@HAVE_SSE_TRUE@katmai_sources = $(katmai_files)
-@HAVE_SSE_TRUE@CFLAGS_KATMAI = -DUSE_KATMAI_ASM
-
-@HAVE_MMX_TRUE@mmx_sources = $(mmx_files)
-@HAVE_MMX_TRUE@CFLAGS_MMX = -DUSE_MMX_ASM
-
-# Build a libtool convenience library.
-@HAVE_X86_TRUE@noinst_LTLIBRARIES = libMesaX86.la
-@HAVE_X86_TRUE@CFLAGS_X86 = -DUSE_X86_ASM
-
-libMesaX86_la_SOURCES = x86a.S assyntax.h 	common_x86.c common_x86_asm.S common_x86_asm.h 	common_x86_features.h glapi_x86.S 	x86.c x86.h vertex.S $(mmx_sources) $(x3dnow_sources) $(katmai_sources)
-
-
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src $(CFLAGS_X86) $(CFLAGS_MMX) $(CFLAGS_3DNOW) $(CFLAGS_KATMAI)
-
-EXTRA_DIST = x86flatregs.m4 x86a.S.m4 $(x3dnow_files) $(mmx_files) $(katmai_files)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../conf.h
-CONFIG_CLEAN_FILES = 
-LTLIBRARIES =  $(noinst_LTLIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I../..
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-libMesaX86_la_LDFLAGS = 
-libMesaX86_la_LIBADD = 
-@HAVE_MMX_TRUE@@HAVE_SSE_FALSE@@HAVE_3DNOW_FALSE@libMesaX86_la_OBJECTS =  \
-@HAVE_MMX_TRUE@@HAVE_SSE_FALSE@@HAVE_3DNOW_FALSE@x86a.lo common_x86.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_FALSE@@HAVE_3DNOW_FALSE@common_x86_asm.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_FALSE@@HAVE_3DNOW_FALSE@glapi_x86.lo x86.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_FALSE@@HAVE_3DNOW_FALSE@vertex.lo mmx_blend.lo
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_FALSE@libMesaX86_la_OBJECTS =  \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_FALSE@x86a.lo common_x86.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_FALSE@common_x86_asm.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_FALSE@glapi_x86.lo x86.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_FALSE@vertex.lo katmai.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_FALSE@katmai_norm_raw.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_FALSE@katmai_xform_raw1.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_FALSE@katmai_xform_masked1.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_FALSE@katmai_xform_raw2.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_FALSE@katmai_xform_masked2.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_FALSE@katmai_xform_raw3.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_FALSE@katmai_xform_masked3.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_FALSE@katmai_xform_raw4.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_FALSE@katmai_xform_masked4.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_FALSE@vertex_katmai.lo
-@HAVE_MMX_FALSE@@HAVE_SSE_FALSE@@HAVE_3DNOW_TRUE@libMesaX86_la_OBJECTS =  \
-@HAVE_MMX_FALSE@@HAVE_SSE_FALSE@@HAVE_3DNOW_TRUE@x86a.lo common_x86.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_FALSE@@HAVE_3DNOW_TRUE@common_x86_asm.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_FALSE@@HAVE_3DNOW_TRUE@glapi_x86.lo x86.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_FALSE@@HAVE_3DNOW_TRUE@vertex.lo 3dnow.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_FALSE@@HAVE_3DNOW_TRUE@3dnow_norm_raw.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_FALSE@@HAVE_3DNOW_TRUE@3dnow_xform_masked1.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_FALSE@@HAVE_3DNOW_TRUE@3dnow_xform_masked2.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_FALSE@@HAVE_3DNOW_TRUE@3dnow_xform_masked3.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_FALSE@@HAVE_3DNOW_TRUE@3dnow_xform_masked4.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_FALSE@@HAVE_3DNOW_TRUE@3dnow_xform_raw1.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_FALSE@@HAVE_3DNOW_TRUE@3dnow_xform_raw2.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_FALSE@@HAVE_3DNOW_TRUE@3dnow_xform_raw3.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_FALSE@@HAVE_3DNOW_TRUE@3dnow_xform_raw4.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_FALSE@@HAVE_3DNOW_TRUE@vertex_3dnow.lo
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@libMesaX86_la_OBJECTS =  \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@x86a.lo common_x86.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@common_x86_asm.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@glapi_x86.lo x86.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@vertex.lo 3dnow.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@3dnow_norm_raw.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@3dnow_xform_masked1.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@3dnow_xform_masked2.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@3dnow_xform_masked3.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@3dnow_xform_masked4.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@3dnow_xform_raw1.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@3dnow_xform_raw2.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@3dnow_xform_raw3.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@3dnow_xform_raw4.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@vertex_3dnow.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@katmai.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@katmai_norm_raw.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@katmai_xform_raw1.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@katmai_xform_masked1.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@katmai_xform_raw2.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@katmai_xform_masked2.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@katmai_xform_raw3.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@katmai_xform_masked3.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@katmai_xform_raw4.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@katmai_xform_masked4.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@vertex_katmai.lo
-@HAVE_MMX_TRUE@@HAVE_SSE_FALSE@@HAVE_3DNOW_TRUE@libMesaX86_la_OBJECTS =  \
-@HAVE_MMX_TRUE@@HAVE_SSE_FALSE@@HAVE_3DNOW_TRUE@x86a.lo common_x86.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_FALSE@@HAVE_3DNOW_TRUE@common_x86_asm.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_FALSE@@HAVE_3DNOW_TRUE@glapi_x86.lo x86.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_FALSE@@HAVE_3DNOW_TRUE@vertex.lo mmx_blend.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_FALSE@@HAVE_3DNOW_TRUE@3dnow.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_FALSE@@HAVE_3DNOW_TRUE@3dnow_norm_raw.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_FALSE@@HAVE_3DNOW_TRUE@3dnow_xform_masked1.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_FALSE@@HAVE_3DNOW_TRUE@3dnow_xform_masked2.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_FALSE@@HAVE_3DNOW_TRUE@3dnow_xform_masked3.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_FALSE@@HAVE_3DNOW_TRUE@3dnow_xform_masked4.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_FALSE@@HAVE_3DNOW_TRUE@3dnow_xform_raw1.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_FALSE@@HAVE_3DNOW_TRUE@3dnow_xform_raw2.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_FALSE@@HAVE_3DNOW_TRUE@3dnow_xform_raw3.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_FALSE@@HAVE_3DNOW_TRUE@3dnow_xform_raw4.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_FALSE@@HAVE_3DNOW_TRUE@vertex_3dnow.lo
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_FALSE@libMesaX86_la_OBJECTS =  \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_FALSE@x86a.lo common_x86.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_FALSE@common_x86_asm.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_FALSE@glapi_x86.lo x86.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_FALSE@vertex.lo mmx_blend.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_FALSE@katmai.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_FALSE@katmai_norm_raw.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_FALSE@katmai_xform_raw1.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_FALSE@katmai_xform_masked1.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_FALSE@katmai_xform_raw2.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_FALSE@katmai_xform_masked2.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_FALSE@katmai_xform_raw3.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_FALSE@katmai_xform_masked3.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_FALSE@katmai_xform_raw4.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_FALSE@katmai_xform_masked4.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_FALSE@vertex_katmai.lo
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@libMesaX86_la_OBJECTS =  \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@x86a.lo common_x86.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@common_x86_asm.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@glapi_x86.lo x86.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@vertex.lo mmx_blend.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@3dnow.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@3dnow_norm_raw.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@3dnow_xform_masked1.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@3dnow_xform_masked2.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@3dnow_xform_masked3.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@3dnow_xform_masked4.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@3dnow_xform_raw1.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@3dnow_xform_raw2.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@3dnow_xform_raw3.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@3dnow_xform_raw4.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@vertex_3dnow.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@katmai.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@katmai_norm_raw.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@katmai_xform_raw1.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@katmai_xform_masked1.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@katmai_xform_raw2.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@katmai_xform_masked2.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@katmai_xform_raw3.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@katmai_xform_masked3.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@katmai_xform_raw4.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@katmai_xform_masked4.lo \
-@HAVE_MMX_TRUE@@HAVE_SSE_TRUE@@HAVE_3DNOW_TRUE@vertex_katmai.lo
-@HAVE_MMX_FALSE@@HAVE_SSE_FALSE@@HAVE_3DNOW_FALSE@libMesaX86_la_OBJECTS =  \
-@HAVE_MMX_FALSE@@HAVE_SSE_FALSE@@HAVE_3DNOW_FALSE@x86a.lo common_x86.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_FALSE@@HAVE_3DNOW_FALSE@common_x86_asm.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_FALSE@@HAVE_3DNOW_FALSE@glapi_x86.lo x86.lo \
-@HAVE_MMX_FALSE@@HAVE_SSE_FALSE@@HAVE_3DNOW_FALSE@vertex.lo
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-SOURCES = $(libMesaX86_la_SOURCES)
-OBJECTS = $(libMesaX86_la_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu src/X86/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-noinstLTLIBRARIES:
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-
-distclean-noinstLTLIBRARIES:
-
-maintainer-clean-noinstLTLIBRARIES:
-
-.c.o:
-	$(COMPILE) -c $<
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-libMesaX86.la: $(libMesaX86_la_OBJECTS) $(libMesaX86_la_DEPENDENCIES)
-	$(LINK)  $(libMesaX86_la_LDFLAGS) $(libMesaX86_la_OBJECTS) $(libMesaX86_la_LIBADD) $(LIBS)
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = src/X86
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(LTLIBRARIES)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLTLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-tags \
-		mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-noinstLTLIBRARIES clean-compile clean-libtool \
-		clean-tags clean-generic mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-noinstLTLIBRARIES distclean-compile \
-		distclean-libtool distclean-tags distclean-generic \
-		clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-noinstLTLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
-clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-x86a.S: $(srcdir)/x86flatregs.m4
-x86a.S: $(srcdir)/x86a.S.m4
-	m4 $< >$@
-
-x86a.asm: x86a.S
-	gcc -E -P -DNASM_ASSEMBLER $< >$@
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/xc/extras/Mesa/src/X86/common_x86.c b/xc/extras/Mesa/src/X86/common_x86.c
index 4679613b6..d64484d52 100644
--- a/xc/extras/Mesa/src/X86/common_x86.c
+++ b/xc/extras/Mesa/src/X86/common_x86.c
@@ -212,6 +212,21 @@ void gl_init_all_x86_transform_asm( void )
 /* Note: the above function must be called before this one, so that
  * gl_x86_cpu_features gets correctly initialized.
  */
+void gl_init_all_x86_shade_asm( void )
+{
+#ifdef USE_X86_ASM
+   if ( gl_x86_cpu_features ) {
+      /* Nothing here yet... */
+   }
+
+#ifdef USE_3DNOW_ASM
+   if ( cpu_has_3dnow && getenv( "MESA_NO_3DNOW" ) == 0 ) {
+      gl_init_3dnow_shade_asm();
+   }
+#endif
+#endif
+}
+
 void gl_init_all_x86_vertex_asm( void )
 {
 #ifdef USE_X86_ASM
diff --git a/xc/extras/Mesa/src/X86/common_x86_asm.h b/xc/extras/Mesa/src/X86/common_x86_asm.h
index f781d503e..cf1116f8d 100644
--- a/xc/extras/Mesa/src/X86/common_x86_asm.h
+++ b/xc/extras/Mesa/src/X86/common_x86_asm.h
@@ -57,6 +57,7 @@
 extern int gl_x86_cpu_features;
 
 extern void gl_init_all_x86_transform_asm( void );
+extern void gl_init_all_x86_shade_asm( void );
 extern void gl_init_all_x86_vertex_asm( void );
 
 #endif
diff --git a/xc/extras/Mesa/src/X86/katmai.h b/xc/extras/Mesa/src/X86/katmai.h
index 0deeb629b..e1149e8a0 100644
--- a/xc/extras/Mesa/src/X86/katmai.h
+++ b/xc/extras/Mesa/src/X86/katmai.h
@@ -31,8 +31,6 @@
 #ifndef __KATMAI_H__
 #define __KATMAI_H__
 
-#include "xform.h"
-
 void gl_init_katmai_transform_asm( void );
 void gl_init_katmai_vertex_asm( void );
 
diff --git a/xc/extras/Mesa/src/aamask.c b/xc/extras/Mesa/src/aamask.c
deleted file mode 100644
index da84e6fc0..000000000
--- a/xc/extras/Mesa/src/aamask.c
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-static void
-build_aa_samples(GLint xSamples, GLint ySamples,
-                 GLfloat samples[][2])
-{
-   const GLfloat dx = 1.0F / (GLfloat) xSamples;
-   const GLfloat dy = 1.0F / (GLfloat) ySamples;
-   GLint x, y;
-   GLint i;
-
-   i = 4;
-   for (x = 0; x < xSamples; x++) {
-      for (y = 0; y < ySamples; y++) {
-         GLint j;
-         if (x == 0 && y == 0) {
-            /* lower left */
-            j = 0;
-         }
-         else if (x == xSamples - 1 && y == 0) {
-            /* lower right */
-            j = 1;
-         }
-         else if (x == 0 && y == ySamples - 1) {
-            /* upper left */
-            j = 2;
-         }
-         else if (x == xSamples - 1 && y == ySamples - 1) {
-            /* upper right */
-            j = 3;
-         }
-         else {
-            j = i++;
-         }
-         samples[j][0] = x * dx;
-         samples[j][1] = y * dy;
-      }
-   }
-}
diff --git a/xc/extras/Mesa/src/context.c b/xc/extras/Mesa/src/context.c
index 4d4a5974c..43219cd28 100644
--- a/xc/extras/Mesa/src/context.c
+++ b/xc/extras/Mesa/src/context.c
@@ -412,10 +412,10 @@ one_time_init( void )
       _mesa_init_fog();
       _mesa_init_math();
       gl_init_lists();
-      gl_init_shade();
       gl_init_texture();
       gl_init_transformation();
       gl_init_translate();
+      gl_init_shade();
       gl_init_vbrender();
       gl_init_vbxform();
       gl_init_vertices();
@@ -456,6 +456,9 @@ alloc_shared_state( void )
 
    ss->DisplayList = _mesa_NewHashTable();
    ss->TexObjects = _mesa_NewHashTable();
+#ifdef VAO
+   ss->ArrayObjects = _mesa_NewHashTable();
+#endif
 
    /* Default Texture objects */
    outOfMemory = GL_FALSE;
@@ -1188,6 +1191,13 @@ init_attrib_groups( GLcontext *ctx )
    ctx->Viewport.WindowMap.type = MATRIX_3D_NO_ROT;
 
    /* Vertex arrays */
+#ifdef VAO
+   {
+      struct gl_array_object *arrayObj;
+      arrayObj = _mesa_alloc_vertex_array_object(ctx, 0);
+      ctx->Array.Current = arrayObj;
+   }
+#else
    ctx->Array.Vertex.Size = 4;
    ctx->Array.Vertex.Type = GL_FLOAT;
    ctx->Array.Vertex.Stride = 0;
@@ -1223,6 +1233,7 @@ init_attrib_groups( GLcontext *ctx )
    ctx->Array.EdgeFlag.StrideB = 0;
    ctx->Array.EdgeFlag.Ptr = NULL;
    ctx->Array.EdgeFlag.Enabled = GL_FALSE;
+#endif
    ctx->Array.ActiveTexture = 0;   /* GL_ARB_multitexture */
 
    /* Pixel transfer */
diff --git a/xc/extras/Mesa/src/cva.c b/xc/extras/Mesa/src/cva.c
index f4f1a7ba2..1f1c83358 100644
--- a/xc/extras/Mesa/src/cva.c
+++ b/xc/extras/Mesa/src/cva.c
@@ -201,7 +201,11 @@ void gl_merge_cva( struct vertex_buffer *VB,
    GLcontext *ctx = VB->ctx;
    GLuint *elt = VB->EltPtr->start;
    GLuint count = VB->Count - VB->Start;
+#ifdef VAO
+   GLuint available = ctx->CVA.pre.outputs | ctx->Array.Current->Summary;
+#else
    GLuint available = ctx->CVA.pre.outputs | ctx->Array.Summary;
+#endif
    GLuint required = ctx->CVA.elt.inputs;
    GLuint flags;
 
@@ -391,6 +395,17 @@ _mesa_LockArraysEXT(GLint first, GLsizei count)
    {   
       struct gl_cva *cva = &ctx->CVA;
 
+#ifdef VAO
+      if (!ctx->Array.Current->LockCount) {
+	 ctx->Array.NewArrayState = ~0;
+	 ctx->CVA.lock_changed ^= 1;
+	 ctx->NewState |= NEW_CLIENT_STATE;
+      }
+
+      ctx->Array.Current->LockFirst = first;
+      ctx->Array.Current->LockCount = count;     
+      ctx->CompileCVAFlag = !ctx->CompileFlag;
+#else
       if (!ctx->Array.LockCount) {
 	 ctx->Array.NewArrayState = ~0;
 	 ctx->CVA.lock_changed ^= 1;
@@ -400,6 +415,7 @@ _mesa_LockArraysEXT(GLint first, GLsizei count)
       ctx->Array.LockFirst = first;
       ctx->Array.LockCount = count;     
       ctx->CompileCVAFlag = !ctx->CompileFlag;
+#endif
 
       if (!cva->VB) {
 	 cva->VB = gl_vb_create_for_cva( ctx, ctx->Const.MaxArrayLockSize );
@@ -409,14 +425,23 @@ _mesa_LockArraysEXT(GLint first, GLsizei count)
    } 
    else
    {
+#ifdef VAO
+      if (ctx->Array.Current->LockCount) {
+#else
       if (ctx->Array.LockCount) {
+#endif
 	 ctx->CVA.lock_changed ^= 1;
 	 ctx->NewState |= NEW_CLIENT_STATE;
       }
 
 
+#ifdef VAO
+      ctx->Array.Current->LockFirst = 0;
+      ctx->Array.Current->LockCount = 0;
+#else
       ctx->Array.LockFirst = 0;
       ctx->Array.LockCount = 0;
+#endif
       ctx->CompileCVAFlag = 0;
    }
 }
@@ -433,13 +458,22 @@ _mesa_UnlockArraysEXT( void )
    if (MESA_VERBOSE & VERBOSE_API)
       fprintf(stderr, "glUnlockArrays\n");
 
+#ifdef VAO
+   if (ctx->Array.Current->LockCount) {
+#else
    if (ctx->Array.LockCount) {
+#endif
       ctx->CVA.lock_changed ^= 1;
       ctx->NewState |= NEW_CLIENT_STATE;
    }
 
+#ifdef VAO
+   ctx->Array.Current->LockFirst = 0;
+   ctx->Array.Current->LockCount = 0;
+#else
    ctx->Array.LockFirst = 0;
    ctx->Array.LockCount = 0;
+#endif
    ctx->CompileCVAFlag = 0;
 }
 
@@ -477,11 +511,19 @@ void gl_prepare_arrays_cva( struct vertex_buffer *VB )
 {
    GLcontext *ctx = VB->ctx;
    struct gl_cva *cva = &ctx->CVA;
+#ifdef VAO
+   GLuint start = ctx->Array.Current->LockFirst;
+   GLuint n = ctx->Array.Current->LockCount;
+   GLuint enable = ((ctx->Array.NewArrayState & ctx->Array.Current->Summary) |
+		    VB->pipeline->fallback);
+   GLuint disable = ctx->Array.NewArrayState & ~enable;
+#else
    GLuint start = ctx->Array.LockFirst;
    GLuint n = ctx->Array.LockCount;
    GLuint enable = ((ctx->Array.NewArrayState & ctx->Array.Summary) |
 		    VB->pipeline->fallback);
    GLuint disable = ctx->Array.NewArrayState & ~enable;
+#endif
    GLuint i;
 
    if (MESA_VERBOSE&VERBOSE_PIPELINE) {
@@ -519,7 +561,11 @@ void gl_prepare_arrays_cva( struct vertex_buffer *VB )
 	 elt->start = VEC_ELT(elt, GLuint, 0); 
 	 elt->count = cva->elt_count;
 
+#ifdef VAO
+	 fallback |= (cva->pre.new_inputs & ~ctx->Array.Current->Summary);
+#else
 	 fallback |= (cva->pre.new_inputs & ~ctx->Array.Summary);
+#endif
 	 enable |= fallback;
 	 disable &= ~fallback;
 	 if (MESA_VERBOSE&VERBOSE_PIPELINE) {
@@ -532,7 +578,11 @@ void gl_prepare_arrays_cva( struct vertex_buffer *VB )
       {
 	 GLvector4ub *col = &cva->v.Color;
 
+#ifdef VAO
+	 client_data = &ctx->Array.Current->Color;
+#else
 	 client_data = &ctx->Array.Color;
+#endif
 	 if (fallback & VERT_RGBA) client_data = &ctx->Fallback.Color;
 
 	 VB->Color[0] = VB->Color[1] = VB->ColorPtr = &cva->v.Color;
@@ -542,7 +592,11 @@ void gl_prepare_arrays_cva( struct vertex_buffer *VB )
 	 {
 	    col->data = cva->store.Color;
 	    col->stride = 4 * sizeof(GLubyte);
+#ifdef VAO
+	    ctx->Array.Current->ColorFunc( col->data, client_data, start, n );
+#else
 	    ctx->Array.ColorFunc( col->data, client_data, start, n );
+#endif
 	    col->flags = VEC_WRITABLE|VEC_GOOD_STRIDE;
 	 } else {
 	    col->data = (GLubyte (*)[4]) client_data->Ptr;
@@ -560,14 +614,22 @@ void gl_prepare_arrays_cva( struct vertex_buffer *VB )
 	 GLvector1ui *index = VB->IndexPtr = &cva->v.Index; 
 	 VB->Index[0] = VB->Index[1] = VB->IndexPtr;
 
+#ifdef VAO
+	 client_data = &ctx->Array.Current->Index;
+#else
 	 client_data = &ctx->Array.Index;
+#endif
 	 if (fallback & VERT_INDEX) client_data = &ctx->Fallback.Index;
 
 	 if (client_data->Type != GL_UNSIGNED_INT)
 	 {
 	    index->data = cva->store.Index;
 	    index->stride = sizeof(GLuint);
+#ifdef VAO
+	    ctx->Array.Current->IndexFunc( index->data, client_data, start, n );
+#else
 	    ctx->Array.IndexFunc( index->data, client_data, start, n );
+#endif
 	    index->flags = VEC_WRITABLE|VEC_GOOD_STRIDE;
 	 } else {
 	    index->data = (GLuint *) client_data->Ptr;
@@ -584,7 +646,11 @@ void gl_prepare_arrays_cva( struct vertex_buffer *VB )
 	 if (enable & PIPE_TEX(i)) {
 	    GLvector4f *tc = VB->TexCoordPtr[i] = &cva->v.TexCoord[i];
 
+#ifdef VAO
+	    client_data = &ctx->Array.Current->TexCoord[i];
+#else
 	    client_data = &ctx->Array.TexCoord[i];
+#endif
 
 	    if (fallback & PIPE_TEX(i)) {
 	       client_data = &ctx->Fallback.TexCoord[i];
@@ -604,7 +670,11 @@ void gl_prepare_arrays_cva( struct vertex_buffer *VB )
 	    } else {
 	       tc->data = cva->store.TexCoord[i];
 	       tc->stride = 4 * sizeof(GLfloat);
+#ifdef VAO
+	       ctx->Array.Current->TexCoordFunc[i]( tc->data, client_data, start, n );
+#else
 	       ctx->Array.TexCoordFunc[i]( tc->data, client_data, start, n );
+#endif
 	       tc->flags = VEC_WRITABLE|VEC_GOOD_STRIDE;
 	    }		 
 	    tc->count = n;
@@ -616,6 +686,24 @@ void gl_prepare_arrays_cva( struct vertex_buffer *VB )
       {
 	 GLvector4f *obj = VB->ObjPtr = &cva->v.Obj;
 
+#ifdef VAO
+	 if (ctx->Array.Current->Vertex.Type == GL_FLOAT)
+	 {
+	    obj->data = (GLfloat (*)[4]) ctx->Array.Current->Vertex.Ptr;
+	    obj->stride = ctx->Array.Current->Vertex.StrideB;
+	    obj->flags = VEC_NOT_WRITABLE|VEC_GOOD_STRIDE;
+	    if (obj->stride != 4 * sizeof(GLfloat)) 
+	       obj->flags ^= VEC_STRIDE_FLAGS;
+	 } else {
+	    obj->data = cva->store.Obj;
+	    obj->stride = 4 * sizeof(GLfloat);
+	    ctx->Array.Current->VertexFunc( obj->data, &ctx->Array.Current->Vertex, start, n );
+	    obj->flags = VEC_WRITABLE|VEC_GOOD_STRIDE;
+	 }
+	 obj->count = n;
+	 obj->start = VEC_ELT(obj, GLfloat, start);
+	 obj->size = ctx->Array.Current->Vertex.Size;
+#else
 	 if (ctx->Array.Vertex.Type == GL_FLOAT)
 	 {
 	    obj->data = (GLfloat (*)[4]) ctx->Array.Vertex.Ptr;
@@ -632,13 +720,18 @@ void gl_prepare_arrays_cva( struct vertex_buffer *VB )
 	 obj->count = n;
 	 obj->start = VEC_ELT(obj, GLfloat, start);
 	 obj->size = ctx->Array.Vertex.Size;
+#endif
       }
 
       if (enable & VERT_NORM) 
       {
 	 GLvector3f *norm = VB->NormalPtr = &cva->v.Normal;
 
+#ifdef VAO
+	 client_data = &ctx->Array.Current->Normal;
+#else
 	 client_data = &ctx->Array.Normal;
+#endif
 
 	 if (fallback & VERT_NORM) 
 	    client_data = &ctx->Fallback.Normal;
@@ -651,7 +744,11 @@ void gl_prepare_arrays_cva( struct vertex_buffer *VB )
 	 } else {
 	    norm->data = cva->store.Normal;
 	    norm->stride = 3 * sizeof(GLfloat);
+#ifdef VAO
+	    ctx->Array.Current->NormalFunc( norm->data, client_data, start, n );
+#else
 	    ctx->Array.NormalFunc( norm->data, client_data, start, n );
+#endif
 	 }
 	 norm->flags = 0;
 	 norm->count = n;
@@ -662,7 +759,11 @@ void gl_prepare_arrays_cva( struct vertex_buffer *VB )
       {
 	 GLvector1ub *edge = VB->EdgeFlagPtr = &cva->v.EdgeFlag;
 
+#ifdef VAO
+	 client_data = &ctx->Array.Current->EdgeFlag;
+#else
 	 client_data = &ctx->Array.EdgeFlag;
+#endif
 
 	 if (fallback & VERT_EDGE) 
 	    client_data = &ctx->Fallback.EdgeFlag;
@@ -693,12 +794,20 @@ void gl_prepare_arrays_cva( struct vertex_buffer *VB )
       	 
    if (ctx->Enabled & ENABLE_LIGHT) 
    {
+#ifdef VAO
+      if (ctx->Array.Current->Flags != VB->Flag[0])
+#else
       if (ctx->Array.Flags != VB->Flag[0])
+#endif
 	 VB->FlagMax = 0;
       
       if (VB->FlagMax < n) {
 	 for (i = VB->FlagMax ; i < n ; i++) 
+#ifdef VAO
+	    VB->Flag[i] = ctx->Array.Current->Flags;
+#else
 	    VB->Flag[i] = ctx->Array.Flags;
+#endif
 	 VB->Flag[i] = 0;
 	 VB->FlagMax = n;
       }
diff --git a/xc/extras/Mesa/src/depend b/xc/extras/Mesa/src/depend
deleted file mode 100644
index 1e2404b9a..000000000
--- a/xc/extras/Mesa/src/depend
+++ /dev/null
@@ -1,429 +0,0 @@
-# DO NOT DELETE
-
-aatriangle.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h
-aatriangle.o: aatriangle.h types.h config.h fixed.h glapitable.h glthread.h
-aatriangle.o: macros.h matrix.h vb.h vector.h dd.h span.h aatritemp.h
-accum.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h accum.h types.h
-accum.o: config.h fixed.h glapitable.h glthread.h macros.h matrix.h vb.h
-accum.o: vector.h dd.h context.h glapi.h mem.h masking.h span.h state.h
-alpha.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h alpha.h types.h
-alpha.o: config.h fixed.h glapitable.h glthread.h macros.h matrix.h vb.h
-alpha.o: vector.h dd.h context.h glapi.h mmath.h
-alphabuf.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h alphabuf.h
-alphabuf.o: types.h config.h fixed.h glapitable.h glthread.h macros.h
-alphabuf.o: matrix.h vb.h vector.h dd.h context.h glapi.h mem.h
-attrib.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h attrib.h
-attrib.o: types.h config.h fixed.h glapitable.h glthread.h macros.h matrix.h
-attrib.o: vb.h vector.h dd.h buffers.h context.h glapi.h enable.h enums.h
-attrib.o: mem.h simple_list.h texstate.h
-bbox.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h bbox.h types.h
-bbox.o: config.h fixed.h glapitable.h glthread.h macros.h matrix.h vb.h
-bbox.o: vector.h dd.h xform.h
-bitmap.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h bitmap.h
-bitmap.o: types.h config.h fixed.h glapitable.h glthread.h macros.h matrix.h
-bitmap.o: vb.h vector.h dd.h context.h glapi.h feedback.h image.h pb.h
-bitmap.o: pixel.h state.h vbrender.h
-blend.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h alphabuf.h
-blend.o: types.h config.h fixed.h glapitable.h glthread.h macros.h matrix.h
-blend.o: vb.h vector.h dd.h blend.h context.h glapi.h enums.h pb.h span.h
-buffers.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h accum.h
-buffers.o: types.h config.h fixed.h glapitable.h glthread.h macros.h matrix.h
-buffers.o: vb.h vector.h dd.h alphabuf.h buffers.h context.h glapi.h depth.h
-buffers.o: enums.h masking.h mem.h stencil.h state.h
-clip.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h clip.h types.h
-clip.o: config.h fixed.h glapitable.h glthread.h macros.h matrix.h vb.h
-clip.o: vector.h dd.h context.h glapi.h mmath.h xform.h interp_tmp.h
-clip.o: clip_funcs.h general_clip.h
-colortab.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h colortab.h
-colortab.o: types.h config.h fixed.h glapitable.h glthread.h macros.h
-colortab.o: matrix.h vb.h vector.h dd.h context.h glapi.h image.h mem.h
-colortab.o: mmath.h span.h
-config.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h config.h
-config.o: enums.h extensions.h types.h fixed.h glapitable.h glthread.h
-config.o: macros.h matrix.h vb.h vector.h dd.h hint.h simple_list.h mem.h
-context.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h accum.h
-context.o: types.h config.h fixed.h glapitable.h glthread.h macros.h matrix.h
-context.o: vb.h vector.h dd.h alphabuf.h clip.h colortab.h context.h glapi.h
-context.o: cva.h depth.h dlist.h eval.h enums.h extensions.h fog.h get.h
-context.o: glapinoop.h hash.h light.h mem.h mmath.h pb.h pipeline.h shade.h
-context.o: simple_list.h stencil.h stages.h state.h translate.h teximage.h
-context.o: texobj.h texstate.h texture.h varray.h vbcull.h vbrender.h
-context.o: vbxform.h vertices.h xform.h
-copypix.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h context.h
-copypix.o: glapi.h types.h config.h fixed.h glapitable.h glthread.h macros.h
-copypix.o: matrix.h vb.h vector.h dd.h copypix.h depth.h feedback.h imaging.h
-copypix.o: mem.h mmath.h pixel.h pixeltex.h span.h state.h stencil.h
-copypix.o: texture.h zoom.h
-cva.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h types.h config.h
-cva.o: fixed.h glapitable.h glthread.h macros.h matrix.h vb.h vector.h dd.h
-cva.o: cva.h context.h glapi.h mem.h pipeline.h varray.h vbcull.h vbrender.h
-cva.o: vbxform.h
-debug_xform.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h context.h
-debug_xform.o: glapi.h types.h config.h fixed.h glapitable.h glthread.h
-debug_xform.o: macros.h matrix.h vb.h vector.h dd.h mem.h xform.h
-debug_xform.o: debug_xform.h
-depth.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h context.h
-depth.o: glapi.h types.h config.h fixed.h glapitable.h glthread.h macros.h
-depth.o: matrix.h vb.h vector.h dd.h enums.h depth.h mem.h pb.h
-dispatch.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h glapi.h
-dispatch.o: glapitable.h glapitemp.h
-dlist.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h accum.h types.h
-dlist.o: config.h fixed.h glapitable.h glthread.h macros.h matrix.h vb.h
-dlist.o: vector.h dd.h attrib.h bitmap.h bbox.h blend.h buffers.h clip.h
-dlist.o: colortab.h context.h glapi.h copypix.h cva.h depth.h enable.h
-dlist.o: enums.h eval.h extensions.h feedback.h get.h hash.h image.h
-dlist.o: imaging.h light.h lines.h dlist.h mem.h pipeline.h pixel.h
-dlist.o: pixeltex.h points.h polygon.h readpix.h rect.h state.h texobj.h
-dlist.o: teximage.h texstate.h varray.h vbfill.h vbxform.h xform.h
-drawpix.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h context.h
-drawpix.o: glapi.h types.h config.h fixed.h glapitable.h glthread.h macros.h
-drawpix.o: matrix.h vb.h vector.h dd.h drawpix.h feedback.h image.h mem.h
-drawpix.o: mmath.h pixel.h pixeltex.h span.h state.h stencil.h texture.h
-drawpix.o: zoom.h
-enable.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h context.h
-enable.o: glapi.h types.h config.h fixed.h glapitable.h glthread.h macros.h
-enable.o: matrix.h vb.h vector.h dd.h enable.h light.h mmath.h simple_list.h
-enable.o: vbfill.h xform.h enums.h
-enums.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h enums.h mem.h
-eval.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h context.h glapi.h
-eval.o: types.h config.h fixed.h glapitable.h glthread.h macros.h matrix.h
-eval.o: vb.h vector.h dd.h eval.h mem.h mmath.h vbcull.h vbfill.h vbxform.h
-extensions.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h context.h
-extensions.o: glapi.h types.h config.h fixed.h glapitable.h glthread.h
-extensions.o: macros.h matrix.h vb.h vector.h dd.h extensions.h mem.h
-extensions.o: simple_list.h
-feedback.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h context.h
-feedback.o: glapi.h types.h config.h fixed.h glapitable.h glthread.h macros.h
-feedback.o: matrix.h vb.h vector.h dd.h enums.h feedback.h mmath.h triangle.h
-fog.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h context.h glapi.h
-fog.o: types.h config.h fixed.h glapitable.h glthread.h macros.h matrix.h
-fog.o: vb.h vector.h dd.h fog.h mmath.h xform.h fog_tmp.h
-get.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h context.h glapi.h
-get.o: types.h config.h fixed.h glapitable.h glthread.h macros.h matrix.h
-get.o: vb.h vector.h dd.h enable.h enums.h extensions.h get.h mmath.h
-glapi.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h glapi.h
-glapi.o: glapinoop.h glapioffsets.h glapitable.h glthread.h
-glapinoop.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h glapi.h
-glapinoop.o: glapinoop.h glapitable.h glapitemp.h
-glthread.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h glthread.h
-hash.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h glthread.h hash.h
-hash.o: mem.h
-hint.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h enums.h context.h
-hint.o: glapi.h types.h config.h fixed.h glapitable.h glthread.h macros.h
-hint.o: matrix.h vb.h vector.h dd.h hint.h state.h
-image.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h context.h
-image.o: glapi.h types.h config.h fixed.h glapitable.h glthread.h macros.h
-image.o: matrix.h vb.h vector.h dd.h image.h imaging.h mem.h mmath.h pixel.h
-imaging.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h context.h
-imaging.o: glapi.h types.h config.h fixed.h glapitable.h glthread.h macros.h
-imaging.o: matrix.h vb.h vector.h dd.h image.h imaging.h mmath.h span.h
-light.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h context.h
-light.o: glapi.h types.h config.h fixed.h glapitable.h glthread.h macros.h
-light.o: matrix.h vb.h vector.h dd.h enums.h light.h mem.h mmath.h
-light.o: simple_list.h xform.h
-lines.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h context.h
-lines.o: glapi.h types.h config.h fixed.h glapitable.h glthread.h macros.h
-lines.o: matrix.h vb.h vector.h dd.h depth.h feedback.h lines.h mmath.h pb.h
-lines.o: texstate.h linetemp.h lnaatemp.h
-logic.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h alphabuf.h
-logic.o: types.h config.h fixed.h glapitable.h glthread.h macros.h matrix.h
-logic.o: vb.h vector.h dd.h context.h glapi.h logic.h pb.h span.h
-masking.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h alphabuf.h
-masking.o: types.h config.h fixed.h glapitable.h glthread.h macros.h matrix.h
-masking.o: vb.h vector.h dd.h context.h glapi.h enums.h masking.h pb.h span.h
-matrix.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h buffers.h
-matrix.o: types.h config.h fixed.h glapitable.h glthread.h macros.h matrix.h
-matrix.o: vb.h vector.h dd.h context.h glapi.h enums.h mem.h mmath.h
-mem.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h macros.h mem.h
-mmath.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h mmath.h
-pb.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h alpha.h types.h
-pb.o: config.h fixed.h glapitable.h glthread.h macros.h matrix.h vb.h
-pb.o: vector.h dd.h alphabuf.h blend.h depth.h fog.h logic.h mem.h masking.h
-pb.o: pb.h scissor.h stencil.h texture.h
-pipeline.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h bbox.h
-pipeline.o: types.h config.h fixed.h glapitable.h glthread.h macros.h
-pipeline.o: matrix.h vb.h vector.h dd.h clip.h context.h glapi.h cva.h fog.h
-pipeline.o: light.h mem.h mmath.h pipeline.h shade.h stages.h state.h
-pipeline.o: translate.h vbcull.h vbindirect.h vbrender.h vbxform.h xform.h
-pixel.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h context.h
-pixel.o: glapi.h types.h config.h fixed.h glapitable.h glthread.h macros.h
-pixel.o: matrix.h vb.h vector.h dd.h mem.h pixel.h
-pixeltex.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h context.h
-pixeltex.o: glapi.h types.h config.h fixed.h glapitable.h glthread.h macros.h
-pixeltex.o: matrix.h vb.h vector.h dd.h pixeltex.h
-points.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h context.h
-points.o: glapi.h types.h config.h fixed.h glapitable.h glthread.h macros.h
-points.o: matrix.h vb.h vector.h dd.h feedback.h mmath.h pb.h points.h span.h
-points.o: texstate.h
-polygon.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h context.h
-polygon.o: glapi.h types.h config.h fixed.h glapitable.h glthread.h macros.h
-polygon.o: matrix.h vb.h vector.h dd.h image.h enums.h mem.h polygon.h
-quads.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h quads.h types.h
-quads.o: config.h fixed.h glapitable.h glthread.h macros.h matrix.h vb.h
-quads.o: vector.h dd.h
-rastpos.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h clip.h types.h
-rastpos.o: config.h fixed.h glapitable.h glthread.h macros.h matrix.h vb.h
-rastpos.o: vector.h dd.h context.h glapi.h feedback.h light.h mmath.h
-rastpos.o: rastpos.h shade.h state.h xform.h
-readpix.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h alphabuf.h
-readpix.o: types.h config.h fixed.h glapitable.h glthread.h macros.h matrix.h
-readpix.o: vb.h vector.h dd.h context.h glapi.h depth.h feedback.h image.h
-readpix.o: mem.h pixel.h readpix.h span.h stencil.h
-rect.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h context.h glapi.h
-rect.o: types.h config.h fixed.h glapitable.h glthread.h macros.h matrix.h
-rect.o: vb.h vector.h dd.h rect.h varray.h vbfill.h
-scissor.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h context.h
-scissor.o: glapi.h types.h config.h fixed.h glapitable.h glthread.h macros.h
-scissor.o: matrix.h vb.h vector.h dd.h scissor.h
-shade.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h light.h types.h
-shade.o: config.h fixed.h glapitable.h glthread.h macros.h matrix.h vb.h
-shade.o: vector.h dd.h mmath.h pipeline.h shade.h simple_list.h shade_tmp.h
-span.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h alpha.h types.h
-span.o: config.h fixed.h glapitable.h glthread.h macros.h matrix.h vb.h
-span.o: vector.h dd.h alphabuf.h blend.h depth.h fog.h logic.h masking.h
-span.o: mem.h scissor.h span.h stencil.h texture.h
-stages.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h bbox.h types.h
-stages.o: config.h fixed.h glapitable.h glthread.h macros.h matrix.h vb.h
-stages.o: vector.h dd.h clip.h context.h glapi.h cva.h fog.h light.h mmath.h
-stages.o: pipeline.h shade.h stages.h translate.h vbcull.h vbindirect.h
-stages.o: vbrender.h vbxform.h xform.h
-state.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h accum.h types.h
-state.o: config.h fixed.h glapitable.h glthread.h macros.h matrix.h vb.h
-state.o: vector.h dd.h alpha.h attrib.h bitmap.h blend.h buffers.h clip.h
-state.o: colortab.h context.h glapi.h copypix.h cva.h depth.h dlist.h
-state.o: drawpix.h enable.h eval.h get.h feedback.h fog.h hint.h imaging.h
-state.o: light.h lines.h logic.h masking.h mmath.h pipeline.h pixel.h
-state.o: pixeltex.h points.h polygon.h quads.h rastpos.h readpix.h rect.h
-state.o: scissor.h shade.h state.h stencil.h teximage.h texobj.h texstate.h
-state.o: texture.h triangle.h varray.h vbfill.h vbrender.h winpos.h
-stencil.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h context.h
-stencil.o: glapi.h types.h config.h fixed.h glapitable.h glthread.h macros.h
-stencil.o: matrix.h vb.h vector.h dd.h depth.h mem.h pb.h stencil.h enable.h
-teximage.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h context.h
-teximage.o: glapi.h types.h config.h fixed.h glapitable.h glthread.h macros.h
-teximage.o: matrix.h vb.h vector.h dd.h image.h mem.h mmath.h span.h
-teximage.o: teximage.h texstate.h
-texobj.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h colortab.h
-texobj.o: types.h config.h fixed.h glapitable.h glthread.h macros.h matrix.h
-texobj.o: vb.h vector.h dd.h context.h glapi.h enums.h hash.h mem.h
-texobj.o: teximage.h texstate.h texobj.h
-texstate.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h context.h
-texstate.o: glapi.h types.h config.h fixed.h glapitable.h glthread.h macros.h
-texstate.o: matrix.h vb.h vector.h dd.h enums.h extensions.h texobj.h
-texstate.o: teximage.h texstate.h texture.h xform.h
-texture.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h context.h
-texture.o: glapi.h types.h config.h fixed.h glapitable.h glthread.h macros.h
-texture.o: matrix.h vb.h vector.h dd.h mmath.h mem.h pb.h teximage.h
-texture.o: texture.h xform.h texgen_tmp.h
-texutil.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h context.h
-texutil.o: glapi.h types.h config.h fixed.h glapitable.h glthread.h macros.h
-texutil.o: matrix.h vb.h vector.h dd.h image.h mem.h texutil.h
-translate.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h mem.h
-translate.o: mmath.h translate.h types.h config.h fixed.h glapitable.h
-translate.o: glthread.h macros.h matrix.h vb.h vector.h dd.h trans_tmp.h
-triangle.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h aatriangle.h
-triangle.o: types.h config.h fixed.h glapitable.h glthread.h macros.h
-triangle.o: matrix.h vb.h vector.h dd.h context.h glapi.h depth.h feedback.h
-triangle.o: mem.h mmath.h span.h teximage.h texstate.h triangle.h tritemp.h
-varray.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h context.h
-varray.o: glapi.h types.h config.h fixed.h glapitable.h glthread.h macros.h
-varray.o: matrix.h vb.h vector.h dd.h cva.h enable.h enums.h dlist.h light.h
-varray.o: mmath.h pipeline.h state.h texstate.h translate.h varray.h vbfill.h
-varray.o: vbrender.h vbindirect.h vbxform.h xform.h
-vb.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h mem.h types.h
-vb.o: config.h fixed.h glapitable.h glthread.h macros.h matrix.h vb.h
-vb.o: vector.h dd.h vbxform.h xform.h
-vbcull.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h context.h
-vbcull.o: glapi.h types.h config.h fixed.h glapitable.h glthread.h macros.h
-vbcull.o: matrix.h vb.h vector.h dd.h mem.h vbcull.h vbrender.h xform.h
-vbcull.o: cull_tmp.h
-vbfill.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h context.h
-vbfill.o: glapi.h types.h config.h fixed.h glapitable.h glthread.h macros.h
-vbfill.o: matrix.h vb.h vector.h dd.h enums.h light.h mmath.h state.h
-vbfill.o: varray.h vbcull.h vbfill.h vbrender.h vbxform.h xform.h
-vbindirect.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h pb.h
-vbindirect.o: types.h config.h fixed.h glapitable.h glthread.h macros.h
-vbindirect.o: matrix.h vb.h vector.h dd.h pipeline.h stages.h vbcull.h
-vbindirect.o: vbindirect.h vbrender.h
-vbrender.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h clip.h
-vbrender.o: types.h config.h fixed.h glapitable.h glthread.h macros.h
-vbrender.o: matrix.h vb.h vector.h dd.h context.h glapi.h light.h lines.h
-vbrender.o: pb.h points.h pipeline.h stages.h vbcull.h vbrender.h
-vbrender.o: vbindirect.h xform.h render_tmp.h
-vbxform.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h context.h
-vbxform.o: glapi.h types.h config.h fixed.h glapitable.h glthread.h macros.h
-vbxform.o: matrix.h vb.h vector.h dd.h cva.h clip.h eval.h enums.h dlist.h
-vbxform.o: fog.h light.h mem.h mmath.h pipeline.h shade.h state.h texture.h
-vbxform.o: varray.h vbcull.h vbfill.h vbrender.h vbxform.h xform.h
-vector.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h config.h
-vector.o: macros.h mem.h vector.h
-vertices.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h types.h
-vertices.o: config.h fixed.h glapitable.h glthread.h macros.h matrix.h vb.h
-vertices.o: vector.h dd.h vertices.h
-winpos.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h context.h
-winpos.o: glapi.h types.h config.h fixed.h glapitable.h glthread.h macros.h
-winpos.o: matrix.h vb.h vector.h dd.h feedback.h mmath.h rastpos.h winpos.h
-xform.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h context.h
-xform.o: glapi.h types.h config.h fixed.h glapitable.h glthread.h macros.h
-xform.o: matrix.h vb.h vector.h dd.h mmath.h xform.h xform_tmp.h clip_tmp.h
-xform.o: norm_tmp.h dotprod_tmp.h copy_tmp.h
-zoom.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h macros.h span.h
-zoom.o: types.h config.h fixed.h glapitable.h glthread.h matrix.h vb.h
-zoom.o: vector.h dd.h stencil.h zoom.h
-X86/x86.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h context.h
-X86/x86.o: glapi.h types.h config.h fixed.h glapitable.h glthread.h macros.h
-X86/x86.o: matrix.h vb.h vector.h dd.h vertices.h xform.h X86/x86.h
-X86/common_x86.o: X86/common_x86_asm.h X86/common_x86_features.h
-X86/3dnow.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h context.h
-X86/3dnow.o: glapi.h types.h config.h fixed.h glapitable.h glthread.h
-X86/3dnow.o: macros.h matrix.h vb.h vector.h dd.h vertices.h xform.h
-X86/3dnow.o: X86/3dnow.h
-X86/katmai.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h context.h
-X86/katmai.o: glapi.h types.h config.h fixed.h glapitable.h glthread.h
-X86/katmai.o: macros.h matrix.h vb.h vector.h dd.h vertices.h xform.h
-X86/katmai.o: X86/katmai.h
-X/glxapi.o: glapi.h ../include/GL/gl.h ../include/GL/glext.h X/glxapi.h
-X/glxapi.o: ../include/GL/glx.h
-X/fakeglx.o: X/glxheader.h glheader.h ../include/GL/gl.h
-X/fakeglx.o: ../include/GL/glext.h X/glxapi.h ../include/GL/glx.h
-X/fakeglx.o: ../include/GL/xmesa.h ../include/GL/xmesa_x.h context.h glapi.h
-X/fakeglx.o: types.h config.h fixed.h glapitable.h glthread.h macros.h
-X/fakeglx.o: matrix.h vb.h vector.h dd.h mmath.h X/xfonts.h X/xmesaP.h
-X/fakeglx.o: ../include/GL/fxmesa.h FX/fxdrv.h mem.h texture.h xform.h clip.h
-X/fakeglx.o: vbrender.h FX/fxglidew.h
-X/xfonts.o: ../include/GL/gl.h ../include/GL/glext.h ../include/GL/glx.h
-X/xfonts.o: context.h glapi.h types.h glheader.h config.h fixed.h
-X/xfonts.o: glapitable.h glthread.h macros.h matrix.h vb.h vector.h dd.h
-X/xfonts.o: mem.h X/xfonts.h
-X/xmesa1.o: X/glxheader.h glheader.h ../include/GL/gl.h ../include/GL/glext.h
-X/xmesa1.o: ../include/GL/xmesa.h ../include/GL/xmesa_x.h X/xmesaP.h types.h
-X/xmesa1.o: config.h fixed.h glapitable.h glthread.h macros.h matrix.h vb.h
-X/xmesa1.o: vector.h dd.h ../include/GL/fxmesa.h FX/fxdrv.h context.h glapi.h
-X/xmesa1.o: mem.h texture.h xform.h clip.h vbrender.h FX/fxglidew.h
-X/xmesa1.o: extensions.h
-X/xmesa2.o: X/glxheader.h glheader.h ../include/GL/gl.h ../include/GL/glext.h
-X/xmesa2.o: context.h glapi.h types.h config.h fixed.h glapitable.h
-X/xmesa2.o: glthread.h macros.h matrix.h vb.h vector.h dd.h drawpix.h mem.h
-X/xmesa2.o: state.h depth.h X/xmesaP.h ../include/GL/xmesa.h
-X/xmesa2.o: ../include/GL/xmesa_x.h ../include/GL/fxmesa.h FX/fxdrv.h
-X/xmesa2.o: texture.h xform.h clip.h vbrender.h FX/fxglidew.h extensions.h
-X/xmesa3.o: X/glxheader.h glheader.h ../include/GL/gl.h ../include/GL/glext.h
-X/xmesa3.o: depth.h types.h config.h fixed.h glapitable.h glthread.h macros.h
-X/xmesa3.o: matrix.h vb.h vector.h dd.h X/xmesaP.h ../include/GL/xmesa.h
-X/xmesa3.o: ../include/GL/xmesa_x.h ../include/GL/fxmesa.h FX/fxdrv.h
-X/xmesa3.o: context.h glapi.h mem.h texture.h xform.h clip.h vbrender.h
-X/xmesa3.o: FX/fxglidew.h linetemp.h
-X/xmesa4.o: X/glxheader.h glheader.h ../include/GL/gl.h ../include/GL/glext.h
-X/xmesa4.o: depth.h types.h config.h fixed.h glapitable.h glthread.h macros.h
-X/xmesa4.o: matrix.h vb.h vector.h dd.h X/xmesaP.h ../include/GL/xmesa.h
-X/xmesa4.o: ../include/GL/xmesa_x.h ../include/GL/fxmesa.h FX/fxdrv.h
-X/xmesa4.o: context.h glapi.h mem.h texture.h xform.h clip.h vbrender.h
-X/xmesa4.o: FX/fxglidew.h tritemp.h
-OSmesa/osmesa.o: glheader.h ../include/GL/gl.h ../include/GL/glext.h
-OSmesa/osmesa.o: ../include/GL/osmesa.h context.h glapi.h types.h config.h
-OSmesa/osmesa.o: fixed.h glapitable.h glthread.h macros.h matrix.h vb.h
-OSmesa/osmesa.o: vector.h dd.h depth.h mem.h extensions.h linetemp.h
-OSmesa/osmesa.o: tritemp.h
-SVGA/svgamesa.o: ../include/GL/svgamesa.h ../include/GL/gl.h
-SVGA/svgamesa.o: ../include/GL/glext.h context.h glapi.h types.h glheader.h
-SVGA/svgamesa.o: config.h fixed.h glapitable.h glthread.h macros.h matrix.h
-SVGA/svgamesa.o: vb.h vector.h dd.h SVGA/svgapix.h SVGA/svgamesa8.h
-SVGA/svgamesa.o: SVGA/svgamesa15.h SVGA/svgamesa16.h SVGA/svgamesa24.h
-SVGA/svgamesa.o: SVGA/svgamesa32.h
-SVGA/svgamesa8.o: SVGA/svgapix.h ../include/GL/gl.h ../include/GL/glext.h
-SVGA/svgamesa8.o: ../include/GL/svgamesa.h context.h glapi.h types.h
-SVGA/svgamesa8.o: glheader.h config.h fixed.h glapitable.h glthread.h
-SVGA/svgamesa8.o: macros.h matrix.h vb.h vector.h dd.h SVGA/svgamesa8.h
-SVGA/svgamesa15.o: SVGA/svgapix.h ../include/GL/gl.h ../include/GL/glext.h
-SVGA/svgamesa15.o: ../include/GL/svgamesa.h context.h glapi.h types.h
-SVGA/svgamesa15.o: glheader.h config.h fixed.h glapitable.h glthread.h
-SVGA/svgamesa15.o: macros.h matrix.h vb.h vector.h dd.h SVGA/svgamesa15.h
-SVGA/svgamesa16.o: SVGA/svgapix.h ../include/GL/gl.h ../include/GL/glext.h
-SVGA/svgamesa16.o: ../include/GL/svgamesa.h context.h glapi.h types.h
-SVGA/svgamesa16.o: glheader.h config.h fixed.h glapitable.h glthread.h
-SVGA/svgamesa16.o: macros.h matrix.h vb.h vector.h dd.h SVGA/svgamesa16.h
-SVGA/svgamesa24.o: SVGA/svgapix.h ../include/GL/gl.h ../include/GL/glext.h
-SVGA/svgamesa24.o: ../include/GL/svgamesa.h context.h glapi.h types.h
-SVGA/svgamesa24.o: glheader.h config.h fixed.h glapitable.h glthread.h
-SVGA/svgamesa24.o: macros.h matrix.h vb.h vector.h dd.h SVGA/svgamesa24.h
-SVGA/svgamesa32.o: SVGA/svgapix.h ../include/GL/gl.h ../include/GL/glext.h
-SVGA/svgamesa32.o: ../include/GL/svgamesa.h context.h glapi.h types.h
-SVGA/svgamesa32.o: glheader.h config.h fixed.h glapitable.h glthread.h
-SVGA/svgamesa32.o: macros.h matrix.h vb.h vector.h dd.h SVGA/svgamesa32.h
-FX/fxapi.o: FX/fxdrv.h glheader.h ../include/GL/gl.h ../include/GL/glext.h
-FX/fxapi.o: context.h glapi.h types.h config.h fixed.h glapitable.h
-FX/fxapi.o: glthread.h macros.h matrix.h vb.h vector.h dd.h mem.h texture.h
-FX/fxapi.o: xform.h clip.h vbrender.h ../include/GL/fxmesa.h FX/fxglidew.h
-FX/fxclip.o: FX/fxdrv.h glheader.h ../include/GL/gl.h ../include/GL/glext.h
-FX/fxclip.o: context.h glapi.h types.h config.h fixed.h glapitable.h
-FX/fxclip.o: glthread.h macros.h matrix.h vb.h vector.h dd.h mem.h texture.h
-FX/fxclip.o: xform.h clip.h vbrender.h ../include/GL/fxmesa.h FX/fxglidew.h
-FX/fxclip.o: mmath.h FX/fxcliptmp.h
-FX/fxcva.o: FX/fxdrv.h glheader.h ../include/GL/gl.h ../include/GL/glext.h
-FX/fxcva.o: context.h glapi.h types.h config.h fixed.h glapitable.h
-FX/fxcva.o: glthread.h macros.h matrix.h vb.h vector.h dd.h mem.h texture.h
-FX/fxcva.o: xform.h clip.h vbrender.h ../include/GL/fxmesa.h FX/fxglidew.h
-FX/fxcva.o: mmath.h vbindirect.h pb.h FX/fxvsetup.h pipeline.h stages.h
-FX/fxcva.o: FX/fxcvatmp.h
-FX/fxdd.o: image.h types.h glheader.h ../include/GL/gl.h
-FX/fxdd.o: ../include/GL/glext.h config.h fixed.h glapitable.h glthread.h
-FX/fxdd.o: macros.h matrix.h vb.h vector.h dd.h FX/fxdrv.h context.h glapi.h
-FX/fxdd.o: mem.h texture.h xform.h clip.h vbrender.h ../include/GL/fxmesa.h
-FX/fxdd.o: FX/fxglidew.h enums.h extensions.h pb.h
-FX/fxddspan.o: FX/fxdrv.h glheader.h ../include/GL/gl.h ../include/GL/glext.h
-FX/fxddspan.o: context.h glapi.h types.h config.h fixed.h glapitable.h
-FX/fxddspan.o: glthread.h macros.h matrix.h vb.h vector.h dd.h mem.h
-FX/fxddspan.o: texture.h xform.h clip.h vbrender.h ../include/GL/fxmesa.h
-FX/fxddspan.o: FX/fxglidew.h
-FX/fxddtex.o: FX/fxdrv.h glheader.h ../include/GL/gl.h ../include/GL/glext.h
-FX/fxddtex.o: context.h glapi.h types.h config.h fixed.h glapitable.h
-FX/fxddtex.o: glthread.h macros.h matrix.h vb.h vector.h dd.h mem.h texture.h
-FX/fxddtex.o: xform.h clip.h vbrender.h ../include/GL/fxmesa.h FX/fxglidew.h
-FX/fxddtex.o: image.h texutil.h
-FX/fxfastpath.o: types.h glheader.h ../include/GL/gl.h ../include/GL/glext.h
-FX/fxfastpath.o: config.h fixed.h glapitable.h glthread.h macros.h matrix.h
-FX/fxfastpath.o: vb.h vector.h dd.h cva.h mmath.h FX/fxdrv.h context.h
-FX/fxfastpath.o: glapi.h mem.h texture.h xform.h clip.h vbrender.h
-FX/fxfastpath.o: ../include/GL/fxmesa.h FX/fxglidew.h vertices.h
-FX/fxfastpath.o: X86/common_x86_asm.h X86/common_x86_features.h
-FX/fxfastpath.o: FX/fxfasttmp.h render_tmp.h
-FX/fxpipeline.o: FX/fxdrv.h glheader.h ../include/GL/gl.h
-FX/fxpipeline.o: ../include/GL/glext.h context.h glapi.h types.h config.h
-FX/fxpipeline.o: fixed.h glapitable.h glthread.h macros.h matrix.h vb.h
-FX/fxpipeline.o: vector.h dd.h mem.h texture.h xform.h clip.h vbrender.h
-FX/fxpipeline.o: ../include/GL/fxmesa.h FX/fxglidew.h vbindirect.h
-FX/fxrender.o: FX/fxdrv.h glheader.h ../include/GL/gl.h ../include/GL/glext.h
-FX/fxrender.o: context.h glapi.h types.h config.h fixed.h glapitable.h
-FX/fxrender.o: glthread.h macros.h matrix.h vb.h vector.h dd.h mem.h
-FX/fxrender.o: texture.h xform.h clip.h vbrender.h ../include/GL/fxmesa.h
-FX/fxrender.o: FX/fxglidew.h vbcull.h render_tmp.h
-FX/fxsanity.o: FX/fxdrv.h glheader.h ../include/GL/gl.h ../include/GL/glext.h
-FX/fxsanity.o: context.h glapi.h types.h config.h fixed.h glapitable.h
-FX/fxsanity.o: glthread.h macros.h matrix.h vb.h vector.h dd.h mem.h
-FX/fxsanity.o: texture.h xform.h clip.h vbrender.h ../include/GL/fxmesa.h
-FX/fxsanity.o: FX/fxglidew.h
-FX/fxsetup.o: FX/fxdrv.h glheader.h ../include/GL/gl.h ../include/GL/glext.h
-FX/fxsetup.o: context.h glapi.h types.h config.h fixed.h glapitable.h
-FX/fxsetup.o: glthread.h macros.h matrix.h vb.h vector.h dd.h mem.h texture.h
-FX/fxsetup.o: xform.h clip.h vbrender.h ../include/GL/fxmesa.h FX/fxglidew.h
-FX/fxsetup.o: enums.h
-FX/fxtexman.o: FX/fxdrv.h glheader.h ../include/GL/gl.h ../include/GL/glext.h
-FX/fxtexman.o: context.h glapi.h types.h config.h fixed.h glapitable.h
-FX/fxtexman.o: glthread.h macros.h matrix.h vb.h vector.h dd.h mem.h
-FX/fxtexman.o: texture.h xform.h clip.h vbrender.h ../include/GL/fxmesa.h
-FX/fxtexman.o: FX/fxglidew.h
-FX/fxtrifuncs.o: FX/fxdrv.h glheader.h ../include/GL/gl.h
-FX/fxtrifuncs.o: ../include/GL/glext.h context.h glapi.h types.h config.h
-FX/fxtrifuncs.o: fixed.h glapitable.h glthread.h macros.h matrix.h vb.h
-FX/fxtrifuncs.o: vector.h dd.h mem.h texture.h xform.h clip.h vbrender.h
-FX/fxtrifuncs.o: ../include/GL/fxmesa.h FX/fxglidew.h mmath.h FX/fxtritmp.h
-FX/fxvsetup.o: FX/fxdrv.h glheader.h ../include/GL/gl.h ../include/GL/glext.h
-FX/fxvsetup.o: context.h glapi.h types.h config.h fixed.h glapitable.h
-FX/fxvsetup.o: glthread.h macros.h matrix.h vb.h vector.h dd.h mem.h
-FX/fxvsetup.o: texture.h xform.h clip.h vbrender.h ../include/GL/fxmesa.h
-FX/fxvsetup.o: FX/fxglidew.h mmath.h pipeline.h FX/fxvsetup.h FX/fxvs_tmp.h
-FX/fxglidew.o: FX/fxglidew.h FX/fxdrv.h glheader.h ../include/GL/gl.h
-FX/fxglidew.o: ../include/GL/glext.h context.h glapi.h types.h config.h
-FX/fxglidew.o: fixed.h glapitable.h glthread.h macros.h matrix.h vb.h
-FX/fxglidew.o: vector.h dd.h mem.h texture.h xform.h clip.h vbrender.h
-FX/fxglidew.o: ../include/GL/fxmesa.h
diff --git a/xc/extras/Mesa/src/drawpix2.c b/xc/extras/Mesa/src/drawpix2.c
deleted file mode 100644
index 776fc822e..000000000
--- a/xc/extras/Mesa/src/drawpix2.c
+++ /dev/null
@@ -1,407 +0,0 @@
-
-
-/*
- * Try to do a fast glDrawPixels.  Conditions include:
- *   not using a display list
- *   simple pixel unpacking
- *   no raster ops
- *   etc....
- * Return:  GL_TRUE if success, GL_FALSE if slow path must be used instead
- */
-GLboolean gl_direct_DrawPixels( GLcontext *ctx,
-                                const struct gl_pixelstore_attrib *unpack,
-                                GLsizei width, GLsizei height,
-                                GLenum format, GLenum type,
-                                const GLvoid *pixels )
-{
-   GLubyte rgb[MAX_WIDTH][3];
-   GLubyte rgba[MAX_WIDTH][4];
-
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH_WITH_RETVAL(ctx, "glDrawPixels", 
-                                                  GL_FALSE);
-
-
-   if (ctx->RenderMode != GL_RENDER)
-      return GL_FALSE;
-
-   if (!ctx->Current.RasterPosValid) {
-      /* no-op */
-      return GL_TRUE;
-   }
-
-   if (ctx->NewState) {
-      gl_update_state(ctx);
-   }
-
-   /* see if device driver can do the drawpix */
-   if (ctx->Driver.DrawPixels) {
-      GLint x = (GLint) (ctx->Current.RasterPos[0] + 0.5F);
-      GLint y = (GLint) (ctx->Current.RasterPos[1] + 0.5F);
-      if ((*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.IndexShift==0 && ctx->Pixel.IndexOffset==0
-       && ctx->Pixel.MapColorFlag==0
-       && unpack->Alignment==1
-       && !unpack->SwapBytes
-       && !unpack->LsbFirst) {
-
-      GLint destX = (GLint) (ctx->Current.RasterPos[0] + 0.5F);
-      GLint destY = (GLint) (ctx->Current.RasterPos[1] + 0.5F);
-      GLint drawWidth = width;           /* actual width drawn */
-      GLint drawHeight = height;         /* actual height drawn */
-      GLint skipPixels = unpack->SkipPixels;
-      GLint skipRows = unpack->SkipRows;
-      GLint rowLength;
-      GLdepth zSpan[MAX_WIDTH];  /* only used when zooming */
-      GLint zoomY0 = 0;
-
-      if (unpack->RowLength > 0)
-         rowLength = unpack->RowLength;
-      else
-         rowLength = width;
-
-      /* If we're not using pixel zoom then do all clipping calculations
-       * now.  Otherwise, we'll let the gl_write_zoomed_*_span() functions
-       * handle the clipping.
-       */
-      if (ctx->Pixel.ZoomX==1.0F && ctx->Pixel.ZoomY==1.0F) {
-         /* horizontal clipping */
-         if (destX < ctx->Buffer->Xmin) {
-            skipPixels += (ctx->Buffer->Xmin - destX);
-            drawWidth  -= (ctx->Buffer->Xmin - destX);
-            destX = ctx->Buffer->Xmin;
-         }
-         if (destX + drawWidth > ctx->Buffer->Xmax)
-            drawWidth -= (destX + drawWidth - ctx->Buffer->Xmax - 1);
-         if (drawWidth <= 0)
-            return GL_TRUE;
-
-         /* vertical clipping */
-         if (destY < ctx->Buffer->Ymin) {
-            skipRows   += (ctx->Buffer->Ymin - destY);
-            drawHeight -= (ctx->Buffer->Ymin - destY);
-            destY = ctx->Buffer->Ymin;
-         }
-         if (destY + drawHeight > ctx->Buffer->Ymax)
-            drawHeight -= (destY + drawHeight - ctx->Buffer->Ymax - 1);
-         if (drawHeight <= 0)
-            return GL_TRUE;
-      } else if (ctx->Pixel.ZoomX==1.0F && ctx->Pixel.ZoomY==-1.0F) {
-         /* CUED MODIFICATION */
-         /* horizontal clipping */
-         if (destX < ctx->Buffer->Xmin) {
-            skipPixels += (ctx->Buffer->Xmin - destX);
-            drawWidth  -= (ctx->Buffer->Xmin - destX);
-            destX = ctx->Buffer->Xmin;
-         }
-         if (destX + drawWidth > ctx->Buffer->Xmax)
-            drawWidth -= (destX + drawWidth - ctx->Buffer->Xmax - 1);
-         if (drawWidth <= 0)
-            return GL_TRUE;
-
-         /* vertical clipping */
-         if (destY > ctx->Buffer->Ymax) {
-            skipRows   += (destY - ctx->Buffer->Ymax - 1);
-            drawHeight -= (destY - ctx->Buffer->Ymax - 1);
-            destY = ctx->Buffer->Ymax + 1;
-         }
-         if (destY - drawHeight < ctx->Buffer->Ymin)
-            drawHeight -= (ctx->Buffer->Ymin - (destY - drawHeight));
-         if (drawHeight <= 0)
-            return GL_TRUE;
-      }
-      else {
-         /* setup array of fragment Z value to pass to zoom function */
-         GLdepth z = (GLdepth) (ctx->Current.RasterPos[2] * DEPTH_SCALE);
-         GLint i;
-         assert(drawWidth < MAX_WIDTH);
-         for (i=0; i<drawWidth; i++)
-            zSpan[i] = z;
-
-         /* save Y value of first row */
-         zoomY0 = (GLint) (ctx->Current.RasterPos[1] + 0.5F);
-      }
-
-
-      /*
-       * Ready to draw!
-       * The window region at (destX, destY) of size (drawWidth, drawHeight)
-       * will be written to.
-       * We'll take pixel data from buffer pointed to by "pixels" but we'll
-       * skip "skipRows" rows and skip "skipPixels" pixels/row.
-       */
-
-      if (format==GL_RGBA && type==GL_UNSIGNED_BYTE) {
-         if (ctx->Visual->RGBAflag) {
-            GLubyte *src = (GLubyte *) pixels
-               + (skipRows * rowLength + skipPixels) * 4;
-            if (ctx->Pixel.ZoomX==1.0F && ctx->Pixel.ZoomY==1.0F) {
-               /* no zooming */
-               GLint row;
-               for (row=0; row<drawHeight; row++) {
-                  (*ctx->Driver.WriteRGBASpan)(ctx, drawWidth, destX, destY,
-                                               (void *) src, NULL);
-                  src += rowLength * 4;
-                  destY++;
-               }
-            } else if (ctx->Pixel.ZoomX==1.0F && ctx->Pixel.ZoomY==-1.0F) {
-               /* CUED MODIFICATION */
-               GLint row;
-               for (row=0; row<drawHeight; row++) {
-                  (*ctx->Driver.WriteRGBASpan)(ctx, drawWidth, destX, destY-1,
-                                              (void *) src, NULL);
-                  src += rowLength * 4;
-                  destY--;
-               }
-            }
-            else {
-               /* with zooming */
-               GLint row;
-               for (row=0; row<drawHeight; row++) {
-                  gl_write_zoomed_rgba_span(ctx, drawWidth, destX, destY,
-                                            zSpan, (void *) src, zoomY0);
-                  src += rowLength * 4;
-                  destY++;
-               }
-            }
-         }
-         return GL_TRUE;
-      }
-      else if (format==GL_RGB && type==GL_UNSIGNED_BYTE) {
-         if (ctx->Visual->RGBAflag) {
-            GLubyte *src = (GLubyte *) pixels
-               + (skipRows * rowLength + skipPixels) * 3;
-            if (ctx->Pixel.ZoomX==1.0F && ctx->Pixel.ZoomY==1.0F) {
-               GLint row;
-               for (row=0; row<drawHeight; row++) {
-                  (*ctx->Driver.WriteRGBSpan)(ctx, drawWidth, destX, destY,
-                                              (void *) src, NULL);
-                  src += rowLength * 3;
-                  destY++;
-               }
-            } else if (ctx->Pixel.ZoomX==1.0F && ctx->Pixel.ZoomY==-1.0F) {
-               /* CUED MODIFICATION */
-               GLint row;
-               for (row=0; row<drawHeight; row++) {
-                  (*ctx->Driver.WriteRGBSpan)(ctx, drawWidth, destX, destY-1,
-                                              (void *) src, NULL);
-                  src += rowLength * 3;
-                  destY--;
-               }
-            }
-            else {
-               /* with zooming */
-               GLint row;
-               for (row=0; row<drawHeight; row++) {
-                  gl_write_zoomed_rgb_span(ctx, drawWidth, destX, destY,
-                                           zSpan, (void *) src, zoomY0);
-                  src += rowLength * 3;
-                  destY++;
-               }
-            }
-         }
-         return GL_TRUE;
-      }
-      else if (format==GL_LUMINANCE && type==GL_UNSIGNED_BYTE) {
-         if (ctx->Visual->RGBAflag) {
-            GLubyte *src = (GLubyte *) pixels
-               + (skipRows * rowLength + skipPixels);
-            if (ctx->Pixel.ZoomX==1.0F && ctx->Pixel.ZoomY==1.0F) {
-               /* no zooming */
-               GLint row;
-               assert(drawWidth < MAX_WIDTH);
-               for (row=0; row<drawHeight; row++) {
-                  GLint i;
-                  for (i=0;i<drawWidth;i++) {
-                     rgb[i][0] = src[i];
-                     rgb[i][1] = src[i];
-                     rgb[i][2] = src[i];
-                  }
-                  (*ctx->Driver.WriteRGBSpan)(ctx, drawWidth, destX, destY,
-                                              (void *) rgb, NULL);
-                  src += rowLength;
-                  destY++;
-               }
-            } else if (ctx->Pixel.ZoomX==1.0F && ctx->Pixel.ZoomY==-1.0F) {
-               /* CUED MODIFICATION */
-               GLint row;
-               assert(drawWidth < MAX_WIDTH);
-               for (row=0; row<drawHeight; row++) {
-                  GLint i;
-                  for (i=0;i<drawWidth;i++) {
-                     rgb[i][0] = src[i];
-                     rgb[i][1] = src[i];
-                     rgb[i][2] = src[i];
-                  }
-                  (*ctx->Driver.WriteRGBSpan)(ctx, drawWidth, destX, destY-1,
-                                              (void *) rgb, NULL);
-                  src += rowLength;
-                  destY--;
-               }
-            }
-            else {
-               /* with zooming */
-               GLint row;
-               assert(drawWidth < MAX_WIDTH);
-               for (row=0; row<drawHeight; row++) {
-                  GLint i;
-                  for (i=0;i<drawWidth;i++) {
-                     rgb[i][0] = src[i];
-                     rgb[i][1] = src[i];
-                     rgb[i][2] = src[i];
-                  }
-                  gl_write_zoomed_rgb_span(ctx, drawWidth, destX, destY,
-                                           zSpan, (void *) rgb, zoomY0);
-                  src += rowLength;
-                  destY++;
-               }
-            }
-         }
-         return GL_TRUE;
-      }
-      else if (format==GL_LUMINANCE_ALPHA && type==GL_UNSIGNED_BYTE) {
-         if (ctx->Visual->RGBAflag) {
-            GLubyte *src = (GLubyte *) pixels
-               + (skipRows * rowLength + skipPixels)*2;
-            if (ctx->Pixel.ZoomX==1.0F && ctx->Pixel.ZoomY==1.0F) {
-               /* no zooming */
-               GLint row;
-               assert(drawWidth < MAX_WIDTH);
-               for (row=0; row<drawHeight; row++) {
-                  GLint i;
-                  GLubyte *ptr = src;
-                  for (i=0;i<drawWidth;i++) {
-                     rgba[i][0] = *ptr;
-                     rgba[i][1] = *ptr;
-                     rgba[i][2] = *ptr++;
-                     rgba[i][3] = *ptr++;
-                  }
-                  (*ctx->Driver.WriteRGBASpan)(ctx, drawWidth, destX, destY,
-                                               (void *) rgba, NULL);
-                  src += rowLength*2;
-                  destY++;
-               }
-            } else if (ctx->Pixel.ZoomX==1.0F && ctx->Pixel.ZoomY==-1.0F) {
-              /* CUED MODIFICATION */
-               GLint row;
-               assert(drawWidth < MAX_WIDTH);
-               for (row=0; row<drawHeight; row++) {
-                  GLint i;
-                  GLubyte *ptr = src;
-                  for (i=0;i<drawWidth;i++) {
-                     rgba[i][0] = *ptr;
-                     rgba[i][1] = *ptr;
-                     rgba[i][2] = *ptr++;
-                     rgba[i][3] = *ptr++;
-                  }
-                  (*ctx->Driver.WriteRGBASpan)(ctx, drawWidth, destX, destY-1,
-                                               (void *) rgba, NULL);
-                  src += rowLength*2;
-                  destY--;
-               }
-            }
-            else {
-               /* with zooming */
-               GLint row;
-               assert(drawWidth < MAX_WIDTH);
-               for (row=0; row<drawHeight; row++) {
-                  GLubyte *ptr = src;
-                  GLint i;
-                  for (i=0;i<drawWidth;i++) {
-                     rgba[i][0] = *ptr;
-                     rgba[i][1] = *ptr;
-                     rgba[i][2] = *ptr++;
-                     rgba[i][3] = *ptr++;
-                  }
-                  gl_write_zoomed_rgba_span(ctx, drawWidth, destX, destY,
-                                            zSpan, (void *) rgba, zoomY0);
-                  src += rowLength*2;
-                  destY++;
-               }
-            }
-         }
-         return GL_TRUE;
-      }
-      else if (format==GL_COLOR_INDEX && type==GL_UNSIGNED_BYTE) {
-         GLubyte *src = (GLubyte *) pixels + skipRows * rowLength + skipPixels;
-         if (ctx->Visual->RGBAflag) {
-            /* convert CI data to RGBA */
-            if (ctx->Pixel.ZoomX==1.0F && ctx->Pixel.ZoomY==1.0F) {
-               /* no zooming */
-               GLint row;
-               for (row=0; row<drawHeight; row++) {
-                  assert(drawWidth < MAX_WIDTH);
-                  gl_map_ci8_to_rgba(ctx, drawWidth, src, rgba);
-                  (*ctx->Driver.WriteRGBASpan)(ctx, drawWidth, destX, destY,
-                                               (const GLubyte (*)[4])rgba, 
-                                               NULL);
-                  src += rowLength;
-                  destY++;
-               }
-               return GL_TRUE;
-            } else if (ctx->Pixel.ZoomX==1.0F && ctx->Pixel.ZoomY==-1.0F) {
-               GLint row;
-               /* CUED MODIFICATION */
-               for (row=0; row<drawHeight; row++) {
-                  assert(drawWidth < MAX_WIDTH);
-                  gl_map_ci8_to_rgba(ctx, drawWidth, src, rgba);
-                  (*ctx->Driver.WriteRGBASpan)(ctx, drawWidth, destX, destY-1,
-                                               (const GLubyte (*)[4])rgba, 
-                                               NULL);
-                  src += rowLength;
-                  destY--;
-               }
-               return GL_TRUE;
-            }
-
-            else {
-               /* with zooming */
-               GLint row;
-               for (row=0; row<drawHeight; row++) {
-                  assert(drawWidth < MAX_WIDTH);
-                  gl_map_ci8_to_rgba(ctx, drawWidth, src, rgba);
-                  gl_write_zoomed_rgba_span(ctx, drawWidth, destX, destY,
-                                            zSpan, (void *) rgba, zoomY0);
-                  src += rowLength;
-                  destY++;
-               }
-               return GL_TRUE;
-            }
-         }
-         else {
-            /* write CI data to CI frame buffer */
-            GLint row;
-            if (ctx->Pixel.ZoomX==1.0F && ctx->Pixel.ZoomY==1.0F) {
-               /* no zooming */
-               for (row=0; row<drawHeight; row++) {
-                  (*ctx->Driver.WriteCI8Span)(ctx, drawWidth, destX, destY,
-                                              src, NULL);
-                  src += rowLength;
-                  destY++;
-               }
-               return GL_TRUE;
-            }
-            else {
-               /* with zooming */
-               return GL_FALSE;
-            }
-         }
-      }
-      else {
-         /* can't handle this pixel format and/or data type here */
-         return GL_FALSE;
-      }
-   }
-   else {
-      /* can't do direct render, have to use slow path */
-      return GL_FALSE;
-   }
-}
diff --git a/xc/extras/Mesa/src/enable.c b/xc/extras/Mesa/src/enable.c
index aaf577b1a..1de2d32ac 100644
--- a/xc/extras/Mesa/src/enable.c
+++ b/xc/extras/Mesa/src/enable.c
@@ -432,22 +432,46 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state )
        * CLIENT STATE!!!
        */
       case GL_VERTEX_ARRAY:
+#ifdef VAO
+         ctx->Array.Current->Vertex.Enabled = state;
+#else
          ctx->Array.Vertex.Enabled = state;
+#endif
          break;
       case GL_NORMAL_ARRAY:
+#ifdef VAO
+         ctx->Array.Current->Normal.Enabled = state;
+#else
          ctx->Array.Normal.Enabled = state;
+#endif
          break;
       case GL_COLOR_ARRAY:
+#ifdef VAO
+         ctx->Array.Current->Color.Enabled = state;
+#else
          ctx->Array.Color.Enabled = state;
+#endif
          break;
       case GL_INDEX_ARRAY:
+#ifdef VAO
+         ctx->Array.Current->Index.Enabled = state;
+#else
          ctx->Array.Index.Enabled = state;
+#endif
          break;
       case GL_TEXTURE_COORD_ARRAY:
+#ifdef VAO
+         ctx->Array.Current->TexCoord[ctx->Array.ActiveTexture].Enabled = state;
+#else
          ctx->Array.TexCoord[ctx->Array.ActiveTexture].Enabled = state;
+#endif
          break;
       case GL_EDGE_FLAG_ARRAY:
+#ifdef VAO
+         ctx->Array.Current->EdgeFlag.Enabled = state;
+#else
          ctx->Array.EdgeFlag.Enabled = state;
+#endif
          break;
 
       /* GL_HP_occlusion_test */
@@ -700,17 +724,41 @@ _mesa_IsEnabled( GLenum cap )
        * CLIENT STATE!!!
        */
       case GL_VERTEX_ARRAY:
+#ifdef VAO
+         return ctx->Array.Current->Vertex.Enabled;
+#else
          return ctx->Array.Vertex.Enabled;
+#endif
       case GL_NORMAL_ARRAY:
+#ifdef VAO
+         return ctx->Array.Current->Normal.Enabled;
+#else
          return ctx->Array.Normal.Enabled;
+#endif
       case GL_COLOR_ARRAY:
+#ifdef VAO
+         return ctx->Array.Current->Color.Enabled;
+#else
          return ctx->Array.Color.Enabled;
+#endif
       case GL_INDEX_ARRAY:
+#ifdef VAO
+         return ctx->Array.Current->Index.Enabled;
+#else
          return ctx->Array.Index.Enabled;
+#endif
       case GL_TEXTURE_COORD_ARRAY:
+#ifdef VAO
+         return ctx->Array.Current->TexCoord[ctx->Array.ActiveTexture].Enabled;
+#else
          return ctx->Array.TexCoord[ctx->Array.ActiveTexture].Enabled;
+#endif
       case GL_EDGE_FLAG_ARRAY:
+#ifdef VAO
+         return ctx->Array.Current->EdgeFlag.Enabled;
+#else
          return ctx->Array.EdgeFlag.Enabled;
+#endif
 
       /* GL_HP_occlusion_test */
       case GL_OCCLUSION_TEST_HP:
@@ -776,22 +824,46 @@ client_state( GLcontext *ctx, GLenum cap, GLboolean state )
 
    switch (cap) {
       case GL_VERTEX_ARRAY:
+#ifdef VAO
+         ctx->Array.Current->Vertex.Enabled = state;
+#else
          ctx->Array.Vertex.Enabled = state;
+#endif
          break;
       case GL_NORMAL_ARRAY:
+#ifdef VAO
+         ctx->Array.Current->Normal.Enabled = state;
+#else
          ctx->Array.Normal.Enabled = state;
+#endif
          break;
       case GL_COLOR_ARRAY:
+#ifdef VAO
+         ctx->Array.Current->Color.Enabled = state;
+#else
          ctx->Array.Color.Enabled = state;
+#endif
          break;
       case GL_INDEX_ARRAY:
+#ifdef VAO
+         ctx->Array.Current->Index.Enabled = state;
+#else
          ctx->Array.Index.Enabled = state;
+#endif
          break;
       case GL_TEXTURE_COORD_ARRAY:
+#ifdef VAO
+         ctx->Array.Current->TexCoord[ctx->Array.ActiveTexture].Enabled = state;
+#else
          ctx->Array.TexCoord[ctx->Array.ActiveTexture].Enabled = state;
+#endif
          break;
       case GL_EDGE_FLAG_ARRAY:
+#ifdef VAO
+         ctx->Array.Current->EdgeFlag.Enabled = state;
+#else
          ctx->Array.EdgeFlag.Enabled = state;
+#endif
          break;
       default:
          gl_error( ctx, GL_INVALID_ENUM, "glEnable/DisableClientState" );
diff --git a/xc/extras/Mesa/src/get.c b/xc/extras/Mesa/src/get.c
index 59e86056a..3f3897411 100644
--- a/xc/extras/Mesa/src/get.c
+++ b/xc/extras/Mesa/src/get.c
@@ -874,79 +874,159 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
 	 *params = FLOAT_TO_BOOL(ctx->Pixel.ZoomY);
 	 break;
       case GL_VERTEX_ARRAY:
+#ifdef VAO
+         *params = ctx->Array.Current->Vertex.Enabled;
+#else
          *params = ctx->Array.Vertex.Enabled;
+#endif
          break;
       case GL_VERTEX_ARRAY_SIZE:
+#ifdef VAO
+         *params = INT_TO_BOOL(ctx->Array.Current->Vertex.Size);
+#else
          *params = INT_TO_BOOL(ctx->Array.Vertex.Size);
+#endif
          break;
       case GL_VERTEX_ARRAY_TYPE:
+#ifdef VAO
+         *params = ENUM_TO_BOOL(ctx->Array.Current->Vertex.Type);
+#else
          *params = ENUM_TO_BOOL(ctx->Array.Vertex.Type);
+#endif
          break;
       case GL_VERTEX_ARRAY_STRIDE:
+#ifdef VAO
+         *params = INT_TO_BOOL(ctx->Array.Current->Vertex.Stride);
+#else
          *params = INT_TO_BOOL(ctx->Array.Vertex.Stride);
+#endif
          break;
       case GL_VERTEX_ARRAY_COUNT_EXT:
          *params = INT_TO_BOOL(0);
          break;
       case GL_NORMAL_ARRAY:
+#ifdef VAO
+         *params = ctx->Array.Current->Normal.Enabled;
+#else
          *params = ctx->Array.Normal.Enabled;
+#endif
          break;
       case GL_NORMAL_ARRAY_TYPE:
+#ifdef VAO
+         *params = ENUM_TO_BOOL(ctx->Array.Current->Normal.Type);
+#else
          *params = ENUM_TO_BOOL(ctx->Array.Normal.Type);
+#endif
          break;
       case GL_NORMAL_ARRAY_STRIDE:
+#ifdef VAO
+         *params = INT_TO_BOOL(ctx->Array.Current->Normal.Stride);
+#else
          *params = INT_TO_BOOL(ctx->Array.Normal.Stride);
+#endif
          break;
       case GL_NORMAL_ARRAY_COUNT_EXT:
          *params = INT_TO_BOOL(0);
          break;
       case GL_COLOR_ARRAY:
+#ifdef VAO
+         *params = ctx->Array.Current->Color.Enabled;
+#else
          *params = ctx->Array.Color.Enabled;
+#endif
          break;
       case GL_COLOR_ARRAY_SIZE:
+#ifdef VAO
+         *params = INT_TO_BOOL(ctx->Array.Current->Color.Size);
+#else
          *params = INT_TO_BOOL(ctx->Array.Color.Size);
+#endif
          break;
       case GL_COLOR_ARRAY_TYPE:
+#ifdef VAO
+         *params = ENUM_TO_BOOL(ctx->Array.Current->Color.Type);
+#else
          *params = ENUM_TO_BOOL(ctx->Array.Color.Type);
+#endif
          break;
       case GL_COLOR_ARRAY_STRIDE:
+#ifdef VAO
+         *params = INT_TO_BOOL(ctx->Array.Current->Color.Stride);
+#else
          *params = INT_TO_BOOL(ctx->Array.Color.Stride);
+#endif
          break;
       case GL_COLOR_ARRAY_COUNT_EXT:
          *params = INT_TO_BOOL(0);
          break;
       case GL_INDEX_ARRAY:
+#ifdef VAO
+         *params = ctx->Array.Current->Index.Enabled;
+#else
          *params = ctx->Array.Index.Enabled;
+#endif
          break;
       case GL_INDEX_ARRAY_TYPE:
+#ifdef VAO
+         *params = ENUM_TO_BOOL(ctx->Array.Current->Index.Type);
+#else
          *params = ENUM_TO_BOOL(ctx->Array.Index.Type);
+#endif
          break;
       case GL_INDEX_ARRAY_STRIDE:
+#ifdef VAO
+         *params = INT_TO_BOOL(ctx->Array.Current->Index.Stride);
+#else
          *params = INT_TO_BOOL(ctx->Array.Index.Stride);
+#endif
          break;
       case GL_INDEX_ARRAY_COUNT_EXT:
          *params = INT_TO_BOOL(0);
          break;
       case GL_TEXTURE_COORD_ARRAY:
+#ifdef VAO
+         *params = ctx->Array.Current->TexCoord[texUnit].Enabled;
+#else
          *params = ctx->Array.TexCoord[texUnit].Enabled;
+#endif
          break;
       case GL_TEXTURE_COORD_ARRAY_SIZE:
+#ifdef VAO
+         *params = INT_TO_BOOL(ctx->Array.Current->TexCoord[texUnit].Size);
+#else
          *params = INT_TO_BOOL(ctx->Array.TexCoord[texUnit].Size);
+#endif
          break;
       case GL_TEXTURE_COORD_ARRAY_TYPE:
+#ifdef VAO
+         *params = ENUM_TO_BOOL(ctx->Array.Current->TexCoord[texUnit].Type);
+#else
          *params = ENUM_TO_BOOL(ctx->Array.TexCoord[texUnit].Type);
+#endif
          break;
       case GL_TEXTURE_COORD_ARRAY_STRIDE:
+#ifdef VAO
+         *params = INT_TO_BOOL(ctx->Array.Current->TexCoord[texUnit].Stride);
+#else
          *params = INT_TO_BOOL(ctx->Array.TexCoord[texUnit].Stride);
+#endif
          break;
       case GL_TEXTURE_COORD_ARRAY_COUNT_EXT:
          *params = INT_TO_BOOL(0);
          break;
       case GL_EDGE_FLAG_ARRAY:
+#ifdef VAO
+         *params = ctx->Array.Current->EdgeFlag.Enabled;
+#else
          *params = ctx->Array.EdgeFlag.Enabled;
+#endif
          break;
       case GL_EDGE_FLAG_ARRAY_STRIDE:
+#ifdef VAO
+         *params = INT_TO_BOOL(ctx->Array.Current->EdgeFlag.Stride);
+#else
          *params = INT_TO_BOOL(ctx->Array.EdgeFlag.Stride);
+#endif
          break;
 
       /* GL_ARB_multitexture */
@@ -1057,10 +1137,18 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
 
       /* GL_EXT_compiled_vertex_array */
       case GL_ARRAY_ELEMENT_LOCK_FIRST_EXT:
+#ifdef VAO
+	 *params = ctx->Array.Current->LockFirst ? GL_TRUE : GL_FALSE;
+#else
 	 *params = ctx->Array.LockFirst ? GL_TRUE : GL_FALSE;
+#endif
 	 break;
       case GL_ARRAY_ELEMENT_LOCK_COUNT_EXT:
+#ifdef VAO
+	 *params = ctx->Array.Current->LockCount ? GL_TRUE : GL_FALSE;
+#else
 	 *params = ctx->Array.LockCount ? GL_TRUE : GL_FALSE;
+#endif
 	 break;
 
       /* GL_ARB_transpose_matrix */
@@ -2020,79 +2108,159 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params )
 	 *params = (GLdouble) ctx->Pixel.ZoomY;
 	 break;
       case GL_VERTEX_ARRAY:
+#ifdef VAO
+         *params = (GLdouble) ctx->Array.Current->Vertex.Enabled;
+#else
          *params = (GLdouble) ctx->Array.Vertex.Enabled;
+#endif
          break;
       case GL_VERTEX_ARRAY_SIZE:
+#ifdef VAO
+         *params = (GLdouble) ctx->Array.Current->Vertex.Size;
+#else
          *params = (GLdouble) ctx->Array.Vertex.Size;
+#endif
          break;
       case GL_VERTEX_ARRAY_TYPE:
+#ifdef VAO
+         *params = ENUM_TO_DOUBLE(ctx->Array.Current->Vertex.Type);
+#else
          *params = ENUM_TO_DOUBLE(ctx->Array.Vertex.Type);
+#endif
          break;
       case GL_VERTEX_ARRAY_STRIDE:
+#ifdef VAO
+         *params = (GLdouble) ctx->Array.Current->Vertex.Stride;
+#else
          *params = (GLdouble) ctx->Array.Vertex.Stride;
+#endif
          break;
       case GL_VERTEX_ARRAY_COUNT_EXT:
          *params = 0.0;
          break;
       case GL_NORMAL_ARRAY:
+#ifdef VAO
+         *params = (GLdouble) ctx->Array.Current->Normal.Enabled;
+#else
          *params = (GLdouble) ctx->Array.Normal.Enabled;
+#endif
          break;
       case GL_NORMAL_ARRAY_TYPE:
+#ifdef VAO
+         *params = ENUM_TO_DOUBLE(ctx->Array.Current->Normal.Type);
+#else
          *params = ENUM_TO_DOUBLE(ctx->Array.Normal.Type);
+#endif
          break;
       case GL_NORMAL_ARRAY_STRIDE:
+#ifdef VAO
+         *params = (GLdouble) ctx->Array.Current->Normal.Stride;
+#else
          *params = (GLdouble) ctx->Array.Normal.Stride;
+#endif
          break;
       case GL_NORMAL_ARRAY_COUNT_EXT:
          *params = 0.0;
          break;
       case GL_COLOR_ARRAY:
+#ifdef VAO
+         *params = (GLdouble) ctx->Array.Current->Color.Enabled;
+#else
          *params = (GLdouble) ctx->Array.Color.Enabled;
+#endif
          break;
       case GL_COLOR_ARRAY_SIZE:
+#ifdef VAO
+         *params = (GLdouble) ctx->Array.Current->Color.Size;
+#else
          *params = (GLdouble) ctx->Array.Color.Size;
+#endif
          break;
       case GL_COLOR_ARRAY_TYPE:
+#ifdef VAO
+         *params = ENUM_TO_DOUBLE(ctx->Array.Current->Color.Type);
+#else
          *params = ENUM_TO_DOUBLE(ctx->Array.Color.Type);
+#endif
          break;
       case GL_COLOR_ARRAY_STRIDE:
+#ifdef VAO
+         *params = (GLdouble) ctx->Array.Current->Color.Stride;
+#else
          *params = (GLdouble) ctx->Array.Color.Stride;
+#endif
          break;
       case GL_COLOR_ARRAY_COUNT_EXT:
          *params = 0.0;
          break;
       case GL_INDEX_ARRAY:
+#ifdef VAO
+         *params = (GLdouble) ctx->Array.Current->Index.Enabled;
+#else
          *params = (GLdouble) ctx->Array.Index.Enabled;
+#endif
          break;
       case GL_INDEX_ARRAY_TYPE:
+#ifdef VAO
+         *params = ENUM_TO_DOUBLE(ctx->Array.Current->Index.Type);
+#else
          *params = ENUM_TO_DOUBLE(ctx->Array.Index.Type);
+#endif
          break;
       case GL_INDEX_ARRAY_STRIDE:
+#ifdef VAO
+         *params = (GLdouble) ctx->Array.Current->Index.Stride;
+#else
          *params = (GLdouble) ctx->Array.Index.Stride;
+#endif
          break;
       case GL_INDEX_ARRAY_COUNT_EXT:
          *params = 0.0;
          break;
       case GL_TEXTURE_COORD_ARRAY:
+#ifdef VAO
+         *params = (GLdouble) ctx->Array.Current->TexCoord[texUnit].Enabled;
+#else
          *params = (GLdouble) ctx->Array.TexCoord[texUnit].Enabled;
+#endif
          break;
       case GL_TEXTURE_COORD_ARRAY_SIZE:
+#ifdef VAO
+         *params = (GLdouble) ctx->Array.Current->TexCoord[texUnit].Size;
+#else
          *params = (GLdouble) ctx->Array.TexCoord[texUnit].Size;
+#endif
          break;
       case GL_TEXTURE_COORD_ARRAY_TYPE:
+#ifdef VAO
+         *params = ENUM_TO_DOUBLE(ctx->Array.Current->TexCoord[texUnit].Type);
+#else
          *params = ENUM_TO_DOUBLE(ctx->Array.TexCoord[texUnit].Type);
+#endif
          break;
       case GL_TEXTURE_COORD_ARRAY_STRIDE:
+#ifdef VAO
+         *params = (GLdouble) ctx->Array.Current->TexCoord[texUnit].Stride;
+#else
          *params = (GLdouble) ctx->Array.TexCoord[texUnit].Stride;
+#endif
          break;
       case GL_TEXTURE_COORD_ARRAY_COUNT_EXT:
          *params = 0.0;
          break;
       case GL_EDGE_FLAG_ARRAY:
+#ifdef VAO
+         *params = (GLdouble) ctx->Array.Current->EdgeFlag.Enabled;
+#else
          *params = (GLdouble) ctx->Array.EdgeFlag.Enabled;
+#endif
          break;
       case GL_EDGE_FLAG_ARRAY_STRIDE:
+#ifdef VAO
+         *params = (GLdouble) ctx->Array.Current->EdgeFlag.Stride;
+#else
          *params = (GLdouble) ctx->Array.EdgeFlag.Stride;
+#endif
          break;
       case GL_EDGE_FLAG_ARRAY_COUNT_EXT:
          *params = 0.0;
@@ -2206,10 +2374,18 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params )
 
       /* GL_EXT_compiled_vertex_array */
       case GL_ARRAY_ELEMENT_LOCK_FIRST_EXT:
+#ifdef VAO
+	 *params = (GLdouble) ctx->Array.Current->LockFirst;
+#else
 	 *params = (GLdouble) ctx->Array.LockFirst;
+#endif
 	 break;
       case GL_ARRAY_ELEMENT_LOCK_COUNT_EXT:
+#ifdef VAO
+	 *params = (GLdouble) ctx->Array.Current->LockCount;
+#else
 	 *params = (GLdouble) ctx->Array.LockCount;
+#endif
 	 break;
 
       /* GL_ARB_transpose_matrix */
@@ -3168,79 +3344,159 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
 	 *params = (GLfloat) ctx->Pixel.ZoomY;
 	 break;
       case GL_VERTEX_ARRAY:
+#ifdef VAO
+         *params = (GLfloat) ctx->Array.Current->Vertex.Enabled;
+#else
          *params = (GLfloat) ctx->Array.Vertex.Enabled;
+#endif
          break;
       case GL_VERTEX_ARRAY_SIZE:
+#ifdef VAO
+         *params = (GLfloat) ctx->Array.Current->Vertex.Size;
+#else
          *params = (GLfloat) ctx->Array.Vertex.Size;
+#endif
          break;
       case GL_VERTEX_ARRAY_TYPE:
+#ifdef VAO
+         *params = ENUM_TO_FLOAT(ctx->Array.Current->Vertex.Type);
+#else
          *params = ENUM_TO_FLOAT(ctx->Array.Vertex.Type);
+#endif
          break;
       case GL_VERTEX_ARRAY_STRIDE:
+#ifdef VAO
+         *params = (GLfloat) ctx->Array.Current->Vertex.Stride;
+#else
          *params = (GLfloat) ctx->Array.Vertex.Stride;
+#endif
          break;
       case GL_VERTEX_ARRAY_COUNT_EXT:
          *params = 0.0;
          break;
       case GL_NORMAL_ARRAY:
+#ifdef VAO
+         *params = (GLfloat) ctx->Array.Current->Normal.Enabled;
+#else
          *params = (GLfloat) ctx->Array.Normal.Enabled;
+#endif
          break;
       case GL_NORMAL_ARRAY_TYPE:
+#ifdef VAO
+         *params = ENUM_TO_FLOAT(ctx->Array.Current->Normal.Type);
+#else
          *params = ENUM_TO_FLOAT(ctx->Array.Normal.Type);
+#endif
          break;
       case GL_NORMAL_ARRAY_STRIDE:
+#ifdef VAO
+         *params = (GLfloat) ctx->Array.Current->Normal.Stride;
+#else
          *params = (GLfloat) ctx->Array.Normal.Stride;
+#endif
          break;
       case GL_NORMAL_ARRAY_COUNT_EXT:
          *params = 0.0;
          break;
       case GL_COLOR_ARRAY:
+#ifdef VAO
+         *params = (GLfloat) ctx->Array.Current->Color.Enabled;
+#else
          *params = (GLfloat) ctx->Array.Color.Enabled;
+#endif
          break;
       case GL_COLOR_ARRAY_SIZE:
+#ifdef VAO
+         *params = (GLfloat) ctx->Array.Current->Color.Size;
+#else
          *params = (GLfloat) ctx->Array.Color.Size;
+#endif
          break;
       case GL_COLOR_ARRAY_TYPE:
+#ifdef VAO
+         *params = ENUM_TO_FLOAT(ctx->Array.Current->Color.Type);
+#else
          *params = ENUM_TO_FLOAT(ctx->Array.Color.Type);
+#endif
          break;
       case GL_COLOR_ARRAY_STRIDE:
+#ifdef VAO
+         *params = (GLfloat) ctx->Array.Current->Color.Stride;
+#else
          *params = (GLfloat) ctx->Array.Color.Stride;
+#endif
          break;
       case GL_COLOR_ARRAY_COUNT_EXT:
          *params = 0.0;
          break;
       case GL_INDEX_ARRAY:
+#ifdef VAO
+         *params = (GLfloat) ctx->Array.Current->Index.Enabled;
+#else
          *params = (GLfloat) ctx->Array.Index.Enabled;
+#endif
          break;
       case GL_INDEX_ARRAY_TYPE:
+#ifdef VAO
+         *params = ENUM_TO_FLOAT(ctx->Array.Current->Index.Type);
+#else
          *params = ENUM_TO_FLOAT(ctx->Array.Index.Type);
+#endif
          break;
       case GL_INDEX_ARRAY_STRIDE:
+#ifdef VAO
+         *params = (GLfloat) ctx->Array.Current->Index.Stride;
+#else
          *params = (GLfloat) ctx->Array.Index.Stride;
+#endif
          break;
       case GL_INDEX_ARRAY_COUNT_EXT:
          *params = 0.0;
          break;
       case GL_TEXTURE_COORD_ARRAY:
+#ifdef VAO
+         *params = (GLfloat) ctx->Array.Current->TexCoord[texUnit].Enabled;
+#else
          *params = (GLfloat) ctx->Array.TexCoord[texUnit].Enabled;
+#endif
          break;
       case GL_TEXTURE_COORD_ARRAY_SIZE:
+#ifdef VAO
+         *params = (GLfloat) ctx->Array.Current->TexCoord[texUnit].Size;
+#else
          *params = (GLfloat) ctx->Array.TexCoord[texUnit].Size;
+#endif
          break;
       case GL_TEXTURE_COORD_ARRAY_TYPE:
+#ifdef VAO
+         *params = ENUM_TO_FLOAT(ctx->Array.Current->TexCoord[texUnit].Type);
+#else
          *params = ENUM_TO_FLOAT(ctx->Array.TexCoord[texUnit].Type);
+#endif
          break;
       case GL_TEXTURE_COORD_ARRAY_STRIDE:
+#ifdef VAO
+         *params = (GLfloat) ctx->Array.Current->TexCoord[texUnit].Stride;
+#else
          *params = (GLfloat) ctx->Array.TexCoord[texUnit].Stride;
+#endif
          break;
       case GL_TEXTURE_COORD_ARRAY_COUNT_EXT:
          *params = 0.0;
          break;
       case GL_EDGE_FLAG_ARRAY:
+#ifdef VAO
+         *params = (GLfloat) ctx->Array.Current->EdgeFlag.Enabled;
+#else
          *params = (GLfloat) ctx->Array.EdgeFlag.Enabled;
+#endif
          break;
       case GL_EDGE_FLAG_ARRAY_STRIDE:
+#ifdef VAO
+         *params = (GLfloat) ctx->Array.Current->EdgeFlag.Stride;
+#else
          *params = (GLfloat) ctx->Array.EdgeFlag.Stride;
+#endif
          break;
       case GL_EDGE_FLAG_ARRAY_COUNT_EXT:
          *params = 0.0;
@@ -3354,10 +3610,18 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
 
       /* GL_EXT_compiled_vertex_array */
       case GL_ARRAY_ELEMENT_LOCK_FIRST_EXT:
+#ifdef VAO
+	 *params = (GLfloat) ctx->Array.Current->LockFirst;
+#else
 	 *params = (GLfloat) ctx->Array.LockFirst;
+#endif
 	 break;
       case GL_ARRAY_ELEMENT_LOCK_COUNT_EXT:
+#ifdef VAO
+	 *params = (GLfloat) ctx->Array.Current->LockCount;
+#else
 	 *params = (GLfloat) ctx->Array.LockCount;
+#endif
 	 break;
 
       /* GL_ARB_transpose_matrix */
@@ -4291,79 +4555,159 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
 	 *params = (GLint) ctx->Pixel.ZoomY;
 	 break;
       case GL_VERTEX_ARRAY:
+#ifdef VAO
+         *params = (GLint) ctx->Array.Current->Vertex.Enabled;
+#else
          *params = (GLint) ctx->Array.Vertex.Enabled;
+#endif
          break;
       case GL_VERTEX_ARRAY_SIZE:
+#ifdef VAO
+         *params = ctx->Array.Current->Vertex.Size;
+#else
          *params = ctx->Array.Vertex.Size;
+#endif
          break;
       case GL_VERTEX_ARRAY_TYPE:
+#ifdef VAO
+         *params = ctx->Array.Current->Vertex.Type;
+#else
          *params = ctx->Array.Vertex.Type;
+#endif
          break;
       case GL_VERTEX_ARRAY_STRIDE:
+#ifdef VAO
+         *params = ctx->Array.Current->Vertex.Stride;
+#else
          *params = ctx->Array.Vertex.Stride;
+#endif
          break;
       case GL_VERTEX_ARRAY_COUNT_EXT:
          *params = 0;
          break;
       case GL_NORMAL_ARRAY:
+#ifdef VAO
+         *params = (GLint) ctx->Array.Current->Normal.Enabled;
+#else
          *params = (GLint) ctx->Array.Normal.Enabled;
+#endif
          break;
       case GL_NORMAL_ARRAY_TYPE:
+#ifdef VAO
+         *params = ctx->Array.Current->Normal.Type;
+#else
          *params = ctx->Array.Normal.Type;
+#endif
          break;
       case GL_NORMAL_ARRAY_STRIDE:
+#ifdef VAO
+         *params = ctx->Array.Current->Normal.Stride;
+#else
          *params = ctx->Array.Normal.Stride;
+#endif
          break;
       case GL_NORMAL_ARRAY_COUNT_EXT:
          *params = 0;
          break;
       case GL_COLOR_ARRAY:
+#ifdef VAO
+         *params = (GLint) ctx->Array.Current->Color.Enabled;
+#else
          *params = (GLint) ctx->Array.Color.Enabled;
+#endif
          break;
       case GL_COLOR_ARRAY_SIZE:
+#ifdef VAO
+         *params = ctx->Array.Current->Color.Size;
+#else
          *params = ctx->Array.Color.Size;
+#endif
          break;
       case GL_COLOR_ARRAY_TYPE:
+#ifdef VAO
+         *params = ctx->Array.Current->Color.Type;
+#else
          *params = ctx->Array.Color.Type;
+#endif
          break;
       case GL_COLOR_ARRAY_STRIDE:
+#ifdef VAO
+         *params = ctx->Array.Current->Color.Stride;
+#else
          *params = ctx->Array.Color.Stride;
+#endif
          break;
       case GL_COLOR_ARRAY_COUNT_EXT:
          *params = 0;
          break;
       case GL_INDEX_ARRAY:
+#ifdef VAO
+         *params = (GLint) ctx->Array.Current->Index.Enabled;
+#else
          *params = (GLint) ctx->Array.Index.Enabled;
+#endif
          break;
       case GL_INDEX_ARRAY_TYPE:
+#ifdef VAO
+         *params = ctx->Array.Current->Index.Type;
+#else
          *params = ctx->Array.Index.Type;
+#endif
          break;
       case GL_INDEX_ARRAY_STRIDE:
+#ifdef VAO
+         *params = ctx->Array.Current->Index.Stride;
+#else
          *params = ctx->Array.Index.Stride;
+#endif
          break;
       case GL_INDEX_ARRAY_COUNT_EXT:
          *params = 0;
          break;
       case GL_TEXTURE_COORD_ARRAY:
+#ifdef VAO
+         *params = (GLint) ctx->Array.Current->TexCoord[texUnit].Enabled;
+#else
          *params = (GLint) ctx->Array.TexCoord[texUnit].Enabled;
+#endif
          break;
       case GL_TEXTURE_COORD_ARRAY_SIZE:
+#ifdef VAO
+         *params = ctx->Array.Current->TexCoord[texUnit].Size;
+#else
          *params = ctx->Array.TexCoord[texUnit].Size;
+#endif
          break;
       case GL_TEXTURE_COORD_ARRAY_TYPE:
+#ifdef VAO
+         *params = ctx->Array.Current->TexCoord[texUnit].Type;
+#else
          *params = ctx->Array.TexCoord[texUnit].Type;
+#endif
          break;
       case GL_TEXTURE_COORD_ARRAY_STRIDE:
+#ifdef VAO
+         *params = ctx->Array.Current->TexCoord[texUnit].Stride;
+#else
          *params = ctx->Array.TexCoord[texUnit].Stride;
+#endif
          break;
       case GL_TEXTURE_COORD_ARRAY_COUNT_EXT:
          *params = 0;
          break;
       case GL_EDGE_FLAG_ARRAY:
+#ifdef VAO
+         *params = (GLint) ctx->Array.Current->EdgeFlag.Enabled;
+#else
          *params = (GLint) ctx->Array.EdgeFlag.Enabled;
+#endif
          break;
       case GL_EDGE_FLAG_ARRAY_STRIDE:
+#ifdef VAO
+         *params = ctx->Array.Current->EdgeFlag.Stride;
+#else
          *params = ctx->Array.EdgeFlag.Stride;
+#endif
          break;
       case GL_EDGE_FLAG_ARRAY_COUNT_EXT:
          *params = 0;
@@ -4477,10 +4821,18 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
 
       /* GL_EXT_compiled_vertex_array */
       case GL_ARRAY_ELEMENT_LOCK_FIRST_EXT:
+#ifdef VAO
+	 *params = ctx->Array.Current->LockFirst;
+#else
 	 *params = ctx->Array.LockFirst;
+#endif
 	 break;
       case GL_ARRAY_ELEMENT_LOCK_COUNT_EXT:
+#ifdef VAO
+	 *params = ctx->Array.Current->LockCount;
+#else
 	 *params = ctx->Array.LockCount;
+#endif
 	 break;
 	 
       /* GL_ARB_transpose_matrix */
@@ -4669,22 +5021,46 @@ _mesa_GetPointerv( GLenum pname, GLvoid **params )
 
    switch (pname) {
       case GL_VERTEX_ARRAY_POINTER:
+#ifdef VAO
+         *params = ctx->Array.Current->Vertex.Ptr;
+#else
          *params = ctx->Array.Vertex.Ptr;
+#endif
          break;
       case GL_NORMAL_ARRAY_POINTER:
+#ifdef VAO
+         *params = ctx->Array.Current->Normal.Ptr;
+#else
          *params = ctx->Array.Normal.Ptr;
+#endif
          break;
       case GL_COLOR_ARRAY_POINTER:
+#ifdef VAO
+         *params = ctx->Array.Current->Color.Ptr;
+#else
          *params = ctx->Array.Color.Ptr;
+#endif
          break;
       case GL_INDEX_ARRAY_POINTER:
+#ifdef VAO
+         *params = ctx->Array.Current->Index.Ptr;
+#else
          *params = ctx->Array.Index.Ptr;
+#endif
          break;
       case GL_TEXTURE_COORD_ARRAY_POINTER:
+#ifdef VAO
+         *params = ctx->Array.Current->TexCoord[texUnit].Ptr;
+#else
          *params = ctx->Array.TexCoord[texUnit].Ptr;
+#endif
          break;
       case GL_EDGE_FLAG_ARRAY_POINTER:
+#ifdef VAO
+         *params = ctx->Array.Current->EdgeFlag.Ptr;
+#else
          *params = ctx->Array.EdgeFlag.Ptr;
+#endif
          break;
       case GL_FEEDBACK_BUFFER_POINTER:
          *params = ctx->Feedback.Buffer;
diff --git a/xc/extras/Mesa/src/hash.c b/xc/extras/Mesa/src/hash.c
index a682180ba..efa5c25e5 100644
--- a/xc/extras/Mesa/src/hash.c
+++ b/xc/extras/Mesa/src/hash.c
@@ -100,7 +100,6 @@ void *_mesa_HashLookup(const struct _mesa_HashTable *table, GLuint key)
    const struct HashEntry *entry;
 
    assert(table);
-   assert(key);
 
    pos = key & (TABLE_SIZE-1);
    entry = table->Table[pos];
@@ -129,7 +128,6 @@ void _mesa_HashInsert(struct _mesa_HashTable *table, GLuint key, void *data)
    struct HashEntry *entry;
 
    assert(table);
-   assert(key);
 
    _glthread_LOCK_MUTEX(table->Mutex);
 
@@ -171,7 +169,6 @@ void _mesa_HashRemove(struct _mesa_HashTable *table, GLuint key)
    struct HashEntry *entry, *prev;
 
    assert(table);
-   assert(key);
 
    _glthread_LOCK_MUTEX(table->Mutex);
 
diff --git a/xc/extras/Mesa/src/pipeline.c b/xc/extras/Mesa/src/pipeline.c
index 0a469894d..efca3012d 100644
--- a/xc/extras/Mesa/src/pipeline.c
+++ b/xc/extras/Mesa/src/pipeline.c
@@ -1,3 +1,4 @@
+/* $Id: pipeline.c,v 1.9 2000/12/05 19:51:30 dawes Exp $*/
 
 /*
  * Mesa 3-D graphics library
@@ -219,11 +220,19 @@ static void build_full_precalc_pipeline( GLcontext *ctx )
    GLuint changed_ops = 0;
    GLuint oldoutputs = pre->outputs;
    GLuint oldinputs = pre->inputs;
+#ifdef VAO
+   GLuint fallback = (VERT_CURRENT_DATA & ctx->Current.Flag & 
+		      ~ctx->Array.Current->Summary);
+   GLuint changed_outputs = (ctx->Array.NewArrayState | 
+			     (fallback & cva->orflag));
+   GLuint available = fallback | ctx->Array.Current->Flags;
+#else
    GLuint fallback = (VERT_CURRENT_DATA & ctx->Current.Flag & 
 		      ~ctx->Array.Summary);
    GLuint changed_outputs = (ctx->Array.NewArrayState | 
 			     (fallback & cva->orflag));
    GLuint available = fallback | ctx->Array.Flags;
+#endif
 
    pre->cva_state_change = 0;
    pre->ops = 0;
@@ -232,10 +241,18 @@ static void build_full_precalc_pipeline( GLcontext *ctx )
    pre->forbidden_inputs = 0;
    pre->fallback = 0;
    
+#ifdef VAO
+   if (ctx->Array.Current->Summary & VERT_ELT) 
+#else
    if (ctx->Array.Summary & VERT_ELT) 
+#endif
       cva->orflag &= VERT_MATERIAL;
   
+#ifdef VAO
+   cva->orflag &= ~(ctx->Array.Current->Summary & ~VERT_OBJ_ANY);
+#else
    cva->orflag &= ~(ctx->Array.Summary & ~VERT_OBJ_ANY);
+#endif
    available &= ~cva->orflag;
    
    pre->outputs = available;
@@ -429,7 +446,11 @@ void gl_update_pipelines( GLcontext *ctx )
    if (newstate ||
        cva->lock_changed ||
        cva->orflag != cva->last_orflag ||
+#ifdef VAO
+       ctx->Array.Current->Flags != cva->last_array_flags)
+#else
        ctx->Array.Flags != cva->last_array_flags)
+#endif
    {   
       GLuint flags = VERT_WIN;
 
@@ -470,13 +491,25 @@ void gl_update_pipelines( GLcontext *ctx )
       cva->lock_changed = 0;
    }
 
+#ifdef VAO
+   if (ctx->Array.NewArrayState != cva->last_array_new_state)
+#else
    if (ctx->Array.NewArrayState != cva->last_array_new_state)
+#endif
       cva->pre.pipeline_valid = 0;
 
    cva->pre.data_valid = 0;
+#ifdef VAO
    cva->last_array_new_state = ctx->Array.NewArrayState;
+#else
+   cva->last_array_new_state = ctx->Array.NewArrayState;
+#endif
    cva->last_orflag = cva->orflag;
+#ifdef VAO
+   cva->last_array_flags = ctx->Array.Current->Flags;
+#else
    cva->last_array_flags = ctx->Array.Flags;
+#endif
 }
 
 void gl_run_pipeline( struct vertex_buffer *VB )
diff --git a/xc/extras/Mesa/src/shade.c b/xc/extras/Mesa/src/shade.c
index e2516ece7..5c45a6e7e 100644
--- a/xc/extras/Mesa/src/shade.c
+++ b/xc/extras/Mesa/src/shade.c
@@ -38,6 +38,10 @@
 #include "types.h"
 #endif
 
+#if defined(USE_X86_ASM)
+#include "X86/common_x86_asm.h"
+#endif
+
 
 /* Lerp between adjacent values in the f(x) lookup table, giving a
  * continuous function, with adequeate overall accuracy.  (Though
@@ -196,6 +200,10 @@ void gl_init_shade( void )
    init_shade_tab_two_sided_masked();
    init_shade_tab_two_sided_compacted();
    init_shade_tab_two_sided_masked_compacted();
+
+#ifdef USE_X86_ASM
+   gl_init_all_x86_shade_asm();
+#endif
 }
 
 void gl_update_lighting_function( GLcontext *ctx )
diff --git a/xc/extras/Mesa/src/shade.h b/xc/extras/Mesa/src/shade.h
index ec90a4ec6..59109114b 100644
--- a/xc/extras/Mesa/src/shade.h
+++ b/xc/extras/Mesa/src/shade.h
@@ -2,19 +2,19 @@
 /*
  * 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
@@ -39,7 +39,11 @@ extern void gl_update_lighting_function( GLcontext *ctx );
 
 extern void gl_init_shade( void );
 
-extern gl_shade_func gl_shade_func_tab[];
+extern gl_shade_func gl_shade_tab[0x10];
+extern gl_shade_func gl_shade_fast_tab[0x10];
+extern gl_shade_func gl_shade_fast_single_tab[0x10];
+extern gl_shade_func gl_shade_spec_tab[0x10];
+extern gl_shade_func gl_shade_ci_tab[0x10];
 
 
 void gl_shade_rastpos( GLcontext *ctx,
@@ -49,4 +53,3 @@ void gl_shade_rastpos( GLcontext *ctx,
 		       GLuint *index );
 
 #endif
-
diff --git a/xc/extras/Mesa/src/stages.c b/xc/extras/Mesa/src/stages.c
index adf614270..8597108c3 100644
--- a/xc/extras/Mesa/src/stages.c
+++ b/xc/extras/Mesa/src/stages.c
@@ -93,10 +93,18 @@ void gl_update_materials( struct vertex_buffer *VB )
 void gl_clean_color( struct vertex_buffer *VB )
 {
    GLcontext *ctx = VB->ctx;
+#ifdef VAO
+   struct gl_client_array *client_data = &ctx->Array.Current->Color;
+#else
    struct gl_client_array *client_data = &ctx->Array.Color;
+#endif
    GLvector4ub *col;
 
+#ifdef VAO
+   if (!(ctx->Array.Current->Summary & VERT_RGBA))
+#else
    if (!(ctx->Array.Summary & VERT_RGBA))
+#endif
       client_data = &ctx->Fallback.Color;
 
    if (VB->Type == VB_CVA_PRECALC) {
@@ -116,10 +124,18 @@ void gl_clean_color( struct vertex_buffer *VB )
 static void clean_index( struct vertex_buffer *VB )
 {
    GLcontext *ctx = VB->ctx;
+#ifdef VAO
+   struct gl_client_array *client_data = &ctx->Array.Current->Index;
+#else
    struct gl_client_array *client_data = &ctx->Array.Index;
+#endif
    GLvector1ui *index;
 
+#ifdef VAO
+   if (!(ctx->Array.Current->Summary & VERT_INDEX))
+#else
    if (!(ctx->Array.Summary & VERT_INDEX))
+#endif
       client_data = &ctx->Fallback.Color;
 
    if (VB->Type == VB_CVA_PRECALC) {
@@ -140,10 +156,18 @@ static void clean_index( struct vertex_buffer *VB )
 static void clean_edgeflag( struct vertex_buffer *VB )
 {
    GLcontext *ctx = VB->ctx;
+#ifdef VAO
+   struct gl_client_array *client_data = &ctx->Array.Current->EdgeFlag;
+#else
    struct gl_client_array *client_data = &ctx->Array.EdgeFlag;
+#endif
    GLvector1ub *edge;
 
+#ifdef VAO
+   if (!(ctx->Array.Current->Summary & VERT_EDGE))
+#else
    if (!(ctx->Array.Summary & VERT_EDGE))
+#endif
       client_data = &ctx->Fallback.EdgeFlag;
 
    if (VB->Type == VB_CVA_PRECALC) {
@@ -164,11 +188,19 @@ static void clean_edgeflag( struct vertex_buffer *VB )
 static void clean_texcoord( struct vertex_buffer *VB, GLuint i )
 {
    GLcontext *ctx = VB->ctx;
+#ifdef VAO
+   struct gl_client_array *client_data = &ctx->Array.Current->TexCoord[i];
+#else
    struct gl_client_array *client_data = &ctx->Array.TexCoord[i];
+#endif
    GLvector4f *tc;
    GLuint flag = PIPE_TEX(i);
 
+#ifdef VAO
+   if (!(ctx->Array.Current->Summary & flag))
+#else
    if (!(ctx->Array.Summary & flag))
+#endif
       client_data = &ctx->Fallback.TexCoord[i];
 
    if (VB->Type == VB_CVA_PRECALC) {
diff --git a/xc/extras/Mesa/src/texobj.c b/xc/extras/Mesa/src/texobj.c
index f764c6eb4..65d96457c 100644
--- a/xc/extras/Mesa/src/texobj.c
+++ b/xc/extras/Mesa/src/texobj.c
@@ -1,4 +1,4 @@
-/* $Id: texobj.c,v 1.16 2000/11/30 18:49:40 dawes Exp $ */
+/* $Id: texobj.c,v 1.17 2000/12/05 19:51:30 dawes Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -621,8 +621,6 @@ _mesa_BindTexture( GLenum target, GLuint texName )
    /* Pass BindTexture call to device driver */
    if (ctx->Driver.BindTexture) {
       (*ctx->Driver.BindTexture)( ctx, target, newTexObj );
-      /* Make sure the Driver.UpdateState() function gets called! */
-      ctx->NewState |= NEW_TEXTURING;
    }
 
    if (oldTexObj->Name > 0) {
diff --git a/xc/extras/Mesa/src/types.h b/xc/extras/Mesa/src/types.h
index 9b1e832d7..092760aa5 100644
--- a/xc/extras/Mesa/src/types.h
+++ b/xc/extras/Mesa/src/types.h
@@ -1037,8 +1037,51 @@ typedef void (*trans_elt_3f_func)(GLfloat (*to)[3],
 				  GLuint n );
 
 
+/*#define VAO*/
+#ifdef VAO
+struct gl_array_object {
+   GLuint Name;
+   GLuint RefCount;
+
+   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;
+
+   GLuint LockFirst;
+   GLuint LockCount;
+	
+   GLuint Flag[VB_SIZE];	/* crock */
+   GLuint Flags;
+   GLuint Summary;		/* Like flags, but no size information */
+};
+#endif
+
 
 struct gl_array_attrib {
+#ifdef VAO
+   struct gl_array_object *Current;
+   GLint ActiveTexture;		/* Client Active Texture */
+   GLuint NewArrayState;	/* Tracks which arrays have been changed. */
+#else
    struct gl_client_array Vertex;	     /* client data descriptors */
    struct gl_client_array Normal;
    struct gl_client_array Color;
@@ -1070,6 +1113,7 @@ struct gl_array_attrib {
    GLuint Flags;
    GLuint Summary;		/* Like flags, but no size information */
    GLuint NewArrayState;	/* Tracks which arrays have been changed. */
+#endif
 };
 
 
@@ -1261,6 +1305,9 @@ struct gl_shared_state {
    GLint RefCount;			   /* Reference count */
    struct _mesa_HashTable *DisplayList;	   /* Display lists hash table */
    struct _mesa_HashTable *TexObjects;	   /* Texture objects hash table */
+#ifdef VAO
+   struct _mesa_HashTable *ArrayObjects;   /* GL_EXT_vertex_array_set */
+#endif
    struct gl_texture_object *TexObjectList;/* Linked list of texture objects */
    struct gl_texture_object *DirtyTexObjList; /* List of dirty tex objects */
 
diff --git a/xc/extras/Mesa/src/varray.c b/xc/extras/Mesa/src/varray.c
index d1b728965..39c07cc7c 100644
--- a/xc/extras/Mesa/src/varray.c
+++ b/xc/extras/Mesa/src/varray.c
@@ -1,4 +1,4 @@
-/* $Id: varray.c,v 1.14 2000/11/21 18:01:52 brianp Exp $ */
+/* $Id: varray.c,v 1.15 2000/12/05 19:51:30 dawes Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -30,11 +30,13 @@
 #include "glheader.h"
 #include "context.h"
 #include "cva.h"
+#include "dlist.h"
 #include "enable.h"
 #include "enums.h"
-#include "dlist.h"
+#include "hash.h"
 #include "light.h"
 #include "macros.h"
+#include "mem.h"
 #include "mmath.h"
 #include "pipeline.h"
 #include "state.h"
@@ -71,26 +73,55 @@ _mesa_VertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
 	      gl_lookup_enum_by_nr( type ),
 	      stride);
 
+#ifdef VAO
+   ctx->Array.Current->Vertex.StrideB = stride;
+#else
    ctx->Array.Vertex.StrideB = stride;
+#endif
    if (!stride) {
       switch (type) {
       case GL_SHORT:
+#ifdef VAO
+         ctx->Array.Current->Vertex.StrideB =  size*sizeof(GLshort);
+#else
          ctx->Array.Vertex.StrideB =  size*sizeof(GLshort);
+#endif
          break;
       case GL_INT:
+#ifdef VAO
+         ctx->Array.Current->Vertex.StrideB =  size*sizeof(GLint);
+#else
          ctx->Array.Vertex.StrideB =  size*sizeof(GLint);
+#endif
          break;
       case GL_FLOAT:
+#ifdef VAO
+         ctx->Array.Current->Vertex.StrideB =  size*sizeof(GLfloat);
+#else
          ctx->Array.Vertex.StrideB =  size*sizeof(GLfloat);
+#endif
          break;
       case GL_DOUBLE:
+#ifdef VAO
+         ctx->Array.Current->Vertex.StrideB =  size*sizeof(GLdouble);
+#else
          ctx->Array.Vertex.StrideB =  size*sizeof(GLdouble);
+#endif
          break;
       default:
          gl_error( ctx, GL_INVALID_ENUM, "glVertexPointer(type)" );
          return;
       }
    }
+#ifdef VAO
+   ctx->Array.Current->Vertex.Size = size;
+   ctx->Array.Current->Vertex.Type = type;
+   ctx->Array.Current->Vertex.Stride = stride;
+   ctx->Array.Current->Vertex.Ptr = (void *) ptr;
+   ctx->Array.Current->VertexFunc = gl_trans_4f_tab[size][TYPE_IDX(type)];
+   ctx->Array.Current->VertexEltFunc = gl_trans_elt_4f_tab[size][TYPE_IDX(type)];
+   ctx->Array.NewArrayState |= VERT_OBJ_ANY;
+#else
    ctx->Array.Vertex.Size = size;
    ctx->Array.Vertex.Type = type;
    ctx->Array.Vertex.Stride = stride;
@@ -98,6 +129,7 @@ _mesa_VertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
    ctx->Array.VertexFunc = gl_trans_4f_tab[size][TYPE_IDX(type)];
    ctx->Array.VertexEltFunc = gl_trans_elt_4f_tab[size][TYPE_IDX(type)];
    ctx->Array.NewArrayState |= VERT_OBJ_ANY;
+#endif
    ctx->NewState |= NEW_CLIENT_STATE;
 }
 
@@ -119,34 +151,66 @@ _mesa_NormalPointer(GLenum type, GLsizei stride, const GLvoid *ptr )
 	      gl_lookup_enum_by_nr( type ),
 	      stride);
 
+#ifdef VAO
+   ctx->Array.Current->Normal.StrideB = stride;
+#else
    ctx->Array.Normal.StrideB = stride;
+#endif
    if (!stride) {
       switch (type) {
       case GL_BYTE:
+#ifdef VAO
+         ctx->Array.Current->Normal.StrideB =  3*sizeof(GLbyte);
+#else
          ctx->Array.Normal.StrideB =  3*sizeof(GLbyte);
+#endif
          break;
       case GL_SHORT:
+#ifdef VAO
+         ctx->Array.Current->Normal.StrideB =  3*sizeof(GLshort);
+#else
          ctx->Array.Normal.StrideB =  3*sizeof(GLshort);
+#endif
          break;
       case GL_INT:
+#ifdef VAO
+         ctx->Array.Current->Normal.StrideB =  3*sizeof(GLint);
+#else
          ctx->Array.Normal.StrideB =  3*sizeof(GLint);
+#endif
          break;
       case GL_FLOAT:
+#ifdef VAO
+         ctx->Array.Current->Normal.StrideB =  3*sizeof(GLfloat);
+#else
          ctx->Array.Normal.StrideB =  3*sizeof(GLfloat);
+#endif
          break;
       case GL_DOUBLE:
+#ifdef VAO
+         ctx->Array.Current->Normal.StrideB =  3*sizeof(GLdouble);
+#else
          ctx->Array.Normal.StrideB =  3*sizeof(GLdouble);
+#endif
          break;
       default:
          gl_error( ctx, GL_INVALID_ENUM, "glNormalPointer(type)" );
          return;
       }
    }
+#ifdef VAO
+   ctx->Array.Current->Normal.Type = type;
+   ctx->Array.Current->Normal.Stride = stride;
+   ctx->Array.Current->Normal.Ptr = (void *) ptr;
+   ctx->Array.Current->NormalFunc = gl_trans_3f_tab[TYPE_IDX(type)];
+   ctx->Array.Current->NormalEltFunc = gl_trans_elt_3f_tab[TYPE_IDX(type)];
+#else
    ctx->Array.Normal.Type = type;
    ctx->Array.Normal.Stride = stride;
    ctx->Array.Normal.Ptr = (void *) ptr;
    ctx->Array.NormalFunc = gl_trans_3f_tab[TYPE_IDX(type)];
    ctx->Array.NormalEltFunc = gl_trans_elt_3f_tab[TYPE_IDX(type)];
+#endif
    ctx->Array.NewArrayState |= VERT_NORM;
    ctx->NewState |= NEW_CLIENT_STATE;
 }
@@ -172,44 +236,89 @@ _mesa_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
 	  gl_lookup_enum_by_nr( type ),
 	  stride);
 
+#ifdef VAO
+   ctx->Array.Current->Color.StrideB = stride;
+#else
    ctx->Array.Color.StrideB = stride;
+#endif
    if (!stride) {
       switch (type) {
       case GL_BYTE:
+#ifdef VAO
+         ctx->Array.Current->Color.StrideB =  size*sizeof(GLbyte);
+#else
          ctx->Array.Color.StrideB =  size*sizeof(GLbyte);
+#endif
          break;
       case GL_UNSIGNED_BYTE:
+#ifdef VAO
+         ctx->Array.Current->Color.StrideB =  size*sizeof(GLubyte);
+#else
          ctx->Array.Color.StrideB =  size*sizeof(GLubyte);
+#endif
          break;
       case GL_SHORT:
+#ifdef VAO
+         ctx->Array.Current->Color.StrideB =  size*sizeof(GLshort);
+#else
          ctx->Array.Color.StrideB =  size*sizeof(GLshort);
+#endif
          break;
       case GL_UNSIGNED_SHORT:
+#ifdef VAO
+         ctx->Array.Current->Color.StrideB =  size*sizeof(GLushort);
+#else
          ctx->Array.Color.StrideB =  size*sizeof(GLushort);
+#endif
          break;
       case GL_INT:
+#ifdef VAO
+         ctx->Array.Current->Color.StrideB =  size*sizeof(GLint);
+#else
          ctx->Array.Color.StrideB =  size*sizeof(GLint);
+#endif
          break;
       case GL_UNSIGNED_INT:
+#ifdef VAO
+         ctx->Array.Current->Color.StrideB =  size*sizeof(GLuint);
+#else
          ctx->Array.Color.StrideB =  size*sizeof(GLuint);
+#endif
          break;
       case GL_FLOAT:
+#ifdef VAO
+         ctx->Array.Current->Color.StrideB =  size*sizeof(GLfloat);
+#else
          ctx->Array.Color.StrideB =  size*sizeof(GLfloat);
+#endif
          break;
       case GL_DOUBLE:
+#ifdef VAO
+         ctx->Array.Current->Color.StrideB =  size*sizeof(GLdouble);
+#else
          ctx->Array.Color.StrideB =  size*sizeof(GLdouble);
+#endif
          break;
       default:
          gl_error( ctx, GL_INVALID_ENUM, "glColorPointer(type)" );
          return;
       }
    }
+#ifdef VAO
+   ctx->Array.Current->Color.Size = size;
+   ctx->Array.Current->Color.Type = type;
+   ctx->Array.Current->Color.Stride = stride;
+   ctx->Array.Current->Color.Ptr = (void *) ptr;
+   ctx->Array.Current->ColorFunc = gl_trans_4ub_tab[size][TYPE_IDX(type)];
+   ctx->Array.Current->ColorEltFunc = gl_trans_elt_4ub_tab[size][TYPE_IDX(type)];
+#else
    ctx->Array.Color.Size = size;
    ctx->Array.Color.Type = type;
    ctx->Array.Color.Stride = stride;
    ctx->Array.Color.Ptr = (void *) ptr;
    ctx->Array.ColorFunc = gl_trans_4ub_tab[size][TYPE_IDX(type)];
    ctx->Array.ColorEltFunc = gl_trans_elt_4ub_tab[size][TYPE_IDX(type)];
+#endif
    ctx->Array.NewArrayState |= VERT_RGBA;
    ctx->NewState |= NEW_CLIENT_STATE;
 }
@@ -226,34 +335,66 @@ _mesa_IndexPointer(GLenum type, GLsizei stride, const GLvoid *ptr)
       return;
    }
 
+#ifdef VAO
+   ctx->Array.Current->Index.StrideB = stride;
+#else
    ctx->Array.Index.StrideB = stride;
+#endif
    if (!stride) {
       switch (type) {
       case GL_UNSIGNED_BYTE:
+#ifdef VAO
+         ctx->Array.Current->Index.StrideB =  sizeof(GLubyte);
+#else
          ctx->Array.Index.StrideB =  sizeof(GLubyte);
+#endif
          break;
       case GL_SHORT:
+#ifdef VAO
+         ctx->Array.Current->Index.StrideB =  sizeof(GLshort);
+#else
          ctx->Array.Index.StrideB =  sizeof(GLshort);
+#endif
          break;
       case GL_INT:
+#ifdef VAO
+         ctx->Array.Current->Index.StrideB =  sizeof(GLint);
+#else
          ctx->Array.Index.StrideB =  sizeof(GLint);
+#endif
          break;
       case GL_FLOAT:
+#ifdef VAO
+         ctx->Array.Current->Index.StrideB =  sizeof(GLfloat);
+#else
          ctx->Array.Index.StrideB =  sizeof(GLfloat);
+#endif
          break;
       case GL_DOUBLE:
+#ifdef VAO
+         ctx->Array.Current->Index.StrideB =  sizeof(GLdouble);
+#else
          ctx->Array.Index.StrideB =  sizeof(GLdouble);
+#endif
          break;
       default:
          gl_error( ctx, GL_INVALID_ENUM, "glIndexPointer(type)" );
          return;
       }
    }
+#ifdef VAO
+   ctx->Array.Current->Index.Type = type;
+   ctx->Array.Current->Index.Stride = stride;
+   ctx->Array.Current->Index.Ptr = (void *) ptr;
+   ctx->Array.Current->IndexFunc = gl_trans_1ui_tab[TYPE_IDX(type)];
+   ctx->Array.Current->IndexEltFunc = gl_trans_elt_1ui_tab[TYPE_IDX(type)];
+#else
    ctx->Array.Index.Type = type;
    ctx->Array.Index.Stride = stride;
    ctx->Array.Index.Ptr = (void *) ptr;
    ctx->Array.IndexFunc = gl_trans_1ui_tab[TYPE_IDX(type)];
    ctx->Array.IndexEltFunc = gl_trans_elt_1ui_tab[TYPE_IDX(type)];
+#endif
    ctx->Array.NewArrayState |= VERT_INDEX;
    ctx->NewState |= NEW_CLIENT_STATE;
 }
@@ -284,26 +425,55 @@ _mesa_TexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr
 	  gl_lookup_enum_by_nr( type ),
 	  stride);
 
+#ifdef VAO
+   ctx->Array.Current->TexCoord[texUnit].StrideB = stride;
+#else
    ctx->Array.TexCoord[texUnit].StrideB = stride;
+#endif
    if (!stride) {
       switch (type) {
       case GL_SHORT:
+#ifdef VAO
+         ctx->Array.Current->TexCoord[texUnit].StrideB =  size*sizeof(GLshort);
+#else
          ctx->Array.TexCoord[texUnit].StrideB =  size*sizeof(GLshort);
+#endif
          break;
       case GL_INT:
+#ifdef VAO
+         ctx->Array.Current->TexCoord[texUnit].StrideB =  size*sizeof(GLint);
+#else
          ctx->Array.TexCoord[texUnit].StrideB =  size*sizeof(GLint);
+#endif
          break;
       case GL_FLOAT:
+#ifdef VAO
+         ctx->Array.Current->TexCoord[texUnit].StrideB =  size*sizeof(GLfloat);
+#else
          ctx->Array.TexCoord[texUnit].StrideB =  size*sizeof(GLfloat);
+#endif
          break;
       case GL_DOUBLE:
+#ifdef VAO
+         ctx->Array.Current->TexCoord[texUnit].StrideB =  size*sizeof(GLdouble);
+#else
          ctx->Array.TexCoord[texUnit].StrideB =  size*sizeof(GLdouble);
+#endif
          break;
       default:
          gl_error( ctx, GL_INVALID_ENUM, "glTexCoordPointer(type)" );
          return;
       }
    }
+#ifdef VAO
+   ctx->Array.Current->TexCoord[texUnit].Size = size;
+   ctx->Array.Current->TexCoord[texUnit].Type = type;
+   ctx->Array.Current->TexCoord[texUnit].Stride = stride;
+   ctx->Array.Current->TexCoord[texUnit].Ptr = (void *) ptr;
+
+   ctx->Array.Current->TexCoordFunc[texUnit] = gl_trans_4f_tab[size][TYPE_IDX(type)];
+   ctx->Array.Current->TexCoordEltFunc[texUnit] = gl_trans_elt_4f_tab[size][TYPE_IDX(type)];
+#else
    ctx->Array.TexCoord[texUnit].Size = size;
    ctx->Array.TexCoord[texUnit].Type = type;
    ctx->Array.TexCoord[texUnit].Stride = stride;
@@ -311,6 +481,7 @@ _mesa_TexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr
 
    ctx->Array.TexCoordFunc[texUnit] = gl_trans_4f_tab[size][TYPE_IDX(type)];
    ctx->Array.TexCoordEltFunc[texUnit] = gl_trans_elt_4f_tab[size][TYPE_IDX(type)];
+#endif
    ctx->Array.NewArrayState |= PIPE_TEX(texUnit);
    ctx->NewState |= NEW_CLIENT_STATE;
 }
@@ -328,6 +499,17 @@ _mesa_EdgeFlagPointer(GLsizei stride, const void *vptr)
       gl_error( ctx, GL_INVALID_VALUE, "glEdgeFlagPointer(stride)" );
       return;
    }
+#ifdef VAO
+   ctx->Array.Current->EdgeFlag.Stride = stride;
+   ctx->Array.Current->EdgeFlag.StrideB = stride ? stride : sizeof(GLboolean);
+   ctx->Array.Current->EdgeFlag.Ptr = (GLboolean *) ptr;
+   if (stride != sizeof(GLboolean)) {
+      ctx->Array.Current->EdgeFlagFunc = gl_trans_1ub_tab[TYPE_IDX(GL_UNSIGNED_BYTE)];
+   } else {
+      ctx->Array.Current->EdgeFlagFunc = 0;
+   }
+   ctx->Array.Current->EdgeFlagEltFunc = gl_trans_elt_1ub_tab[TYPE_IDX(GL_UNSIGNED_BYTE)];
+#else
    ctx->Array.EdgeFlag.Stride = stride;
    ctx->Array.EdgeFlag.StrideB = stride ? stride : sizeof(GLboolean);
    ctx->Array.EdgeFlag.Ptr = (GLboolean *) ptr;
@@ -337,6 +519,7 @@ _mesa_EdgeFlagPointer(GLsizei stride, const void *vptr)
       ctx->Array.EdgeFlagFunc = 0;
    }
    ctx->Array.EdgeFlagEltFunc = gl_trans_elt_1ub_tab[TYPE_IDX(GL_UNSIGNED_BYTE)];
+#endif
    ctx->Array.NewArrayState |= VERT_EDGE;
    ctx->NewState |= NEW_CLIENT_STATE;
 }
@@ -440,12 +623,59 @@ void gl_exec_array_elements( GLcontext *ctx, struct immediate *IM,
 {
    GLuint *flags = IM->Flag;
    GLuint *elts = IM->Elt;
+#ifdef VAO
+   GLuint translate = ctx->Array.Current->Flags;
+#else
    GLuint translate = ctx->Array.Flags;
+#endif
    GLuint i;
 
    if (MESA_VERBOSE&VERBOSE_IMMEDIATE)
       fprintf(stderr, "exec_array_elements %d .. %d\n", start, count);
    
+#ifdef VAO
+   if (translate & VERT_OBJ_ANY) 
+      (ctx->Array.Current->VertexEltFunc)( IM->Obj, 
+				  &ctx->Array.Current->Vertex, 
+				  flags, elts, (VERT_ELT|VERT_OBJ_ANY),
+				  start, count);
+   
+   if (translate & VERT_NORM) 
+      (ctx->Array.Current->NormalEltFunc)( IM->Normal, 
+				  &ctx->Array.Current->Normal, 
+				  flags, elts, (VERT_ELT|VERT_NORM),
+				  start, count);
+
+   if (translate & VERT_EDGE) 
+      (ctx->Array.Current->EdgeFlagEltFunc)( IM->EdgeFlag, 
+				    &ctx->Array.Current->EdgeFlag, 
+				    flags, elts, (VERT_ELT|VERT_EDGE),
+				    start, count);
+   
+   if (translate & VERT_RGBA)
+      (ctx->Array.Current->ColorEltFunc)( IM->Color, 
+				 &ctx->Array.Current->Color, 
+				 flags, elts, (VERT_ELT|VERT_RGBA),
+				 start, count);
+
+   if (translate & VERT_INDEX)
+      (ctx->Array.Current->IndexEltFunc)( IM->Index, 
+				 &ctx->Array.Current->Index, 
+				 flags, elts, (VERT_ELT|VERT_INDEX),
+				 start, count);
+
+   if (translate & VERT_TEX0_ANY)
+      (ctx->Array.Current->TexCoordEltFunc[0])( IM->TexCoord[0], 
+				       &ctx->Array.Current->TexCoord[0], 
+				       flags, elts, (VERT_ELT|VERT_TEX0_ANY),
+				       start, count);
+
+   if (translate & VERT_TEX1_ANY)
+      (ctx->Array.Current->TexCoordEltFunc[1])( IM->TexCoord[1], 
+				       &ctx->Array.Current->TexCoord[1], 
+				       flags, elts, (VERT_ELT|VERT_TEX1_ANY),
+				       start, count);
+#else
    if (translate & VERT_OBJ_ANY) 
       (ctx->Array.VertexEltFunc)( IM->Obj, 
 				  &ctx->Array.Vertex, 
@@ -487,7 +717,7 @@ void gl_exec_array_elements( GLcontext *ctx, struct immediate *IM,
 				       &ctx->Array.TexCoord[1], 
 				       flags, elts, (VERT_ELT|VERT_TEX1_ANY),
 				       start, count);
-
+#endif
 
    for (i = start ; i < count ; i++) 
       if (flags[i] & VERT_ELT) 
@@ -544,8 +774,11 @@ _mesa_DrawArrays(GLenum mode, GLint start, GLsizei count)
       return;
    }
 
-   if (!ctx->CompileFlag && ctx->Array.Vertex.Enabled)
-   {
+#ifdef VAO
+   if (!ctx->CompileFlag && ctx->Array.Current->Vertex.Enabled) {
+#else
+   if (!ctx->CompileFlag && ctx->Array.Vertex.Enabled) {
+#endif
       GLint remaining = count;
       GLint i;
       struct gl_client_array *Normal = 0;
@@ -575,11 +808,86 @@ _mesa_DrawArrays(GLenum mode, GLint start, GLsizei count)
 	 gl_build_immediate_pipeline( ctx );
 
       required = elt->inputs;
+#ifdef VAO
+      fallback = (elt->inputs & ~ctx->Array.Current->Summary);
+#else
       fallback = (elt->inputs & ~ctx->Array.Summary);
+#endif
 
       /* The translate function doesn't do anything about size.  It
        * just ensures that type and stride come out right.
        */
+#ifdef VAO
+      IM->v.Obj.size = ctx->Array.Current->Vertex.Size;
+
+      if (required & VERT_RGBA) 
+      {
+	 Color = &ctx->Array.Current->Color;
+	 if (fallback & VERT_RGBA) {
+	    Color = &ctx->Fallback.Color;
+	    ctx->Array.Current->ColorFunc = 
+	       gl_trans_4ub_tab[4][TYPE_IDX(GL_UNSIGNED_BYTE)];
+	 }
+      }
+   
+      if (required & VERT_INDEX) 
+      {
+	 Index = &ctx->Array.Current->Index;
+	 if (fallback & VERT_INDEX) {
+	    Index = &ctx->Fallback.Index;
+	    ctx->Array.Current->IndexFunc = gl_trans_1ui_tab[TYPE_IDX(GL_UNSIGNED_INT)];
+	 }
+      }
+
+      for (i = 0 ; i < MAX_TEXTURE_UNITS ; i++) 
+      {
+	 GLuint flag = VERT_TEX_ANY(i);
+
+	 if (required & flag) {
+	    TexCoord[i] = &ctx->Array.Current->TexCoord[i];
+
+	    if (fallback & flag) 
+	    {
+	       TexCoord[i] = &ctx->Fallback.TexCoord[i];
+	       TexCoord[i]->Size = gl_texcoord_size( ctx->Current.Flag, i );
+
+	       ctx->Array.Current->TexCoordFunc[i] = 
+		  gl_trans_4f_tab[TexCoord[i]->Size][TYPE_IDX(GL_FLOAT)];
+	    }
+	 }
+      }
+
+      if (ctx->Array.Current->Flags != ctx->Array.Current->Flag[0])
+ 	 for (i = 0 ; i < VB_MAX ; i++) 
+	    ctx->Array.Current->Flag[i] = ctx->Array.Current->Flags;
+
+
+      if (required & VERT_NORM) 
+      {
+	 Normal = &ctx->Array.Current->Normal;
+	 if (fallback & VERT_NORM) {
+	    Normal = &ctx->Fallback.Normal;
+	    ctx->Array.Current->NormalFunc = gl_trans_3f_tab[TYPE_IDX(GL_FLOAT)];
+	 }
+      }
+
+      if ( required & VERT_EDGE )
+      {
+	 if (mode == GL_TRIANGLES || 
+	     mode == GL_QUADS || 
+	     mode == GL_POLYGON)
+	 {
+	    EdgeFlag = &ctx->Array.Current->EdgeFlag;
+	    if (fallback & VERT_EDGE) {
+	       EdgeFlag = &ctx->Fallback.EdgeFlag;
+	       ctx->Array.Current->EdgeFlagFunc = 
+		  gl_trans_1ub_tab[TYPE_IDX(GL_UNSIGNED_BYTE)];
+	    }
+	 }
+	 else
+	    required &= ~VERT_EDGE;
+      }
+#else
       IM->v.Obj.size = ctx->Array.Vertex.Size;
 
       if (required & VERT_RGBA) 
@@ -649,6 +957,7 @@ _mesa_DrawArrays(GLenum mode, GLint start, GLsizei count)
 	 else
 	    required &= ~VERT_EDGE;
       }
+#endif
 
       VB->Primitive = IM->Primitive; 
       VB->NextPrimitive = IM->NextPrimitive; 
@@ -670,6 +979,42 @@ _mesa_DrawArrays(GLenum mode, GLint start, GLsizei count)
 	 
 	 VB->CullMode = 0;
 	 
+#ifdef VAO
+	 ctx->Array.Current->VertexFunc( IM->Obj + VB_START, 
+				&ctx->Array.Current->Vertex, start, n );
+	 
+	 if (required & VERT_NORM) {
+	    ctx->Array.Current->NormalFunc( IM->Normal + VB_START, 
+				   Normal, start, n );
+	 }
+	 
+	 if (required & VERT_EDGE) {
+	    ctx->Array.Current->EdgeFlagFunc( IM->EdgeFlag + VB_START, 
+				     EdgeFlag, start, n );
+	 }
+	 
+	 if (required & VERT_RGBA) {
+	    ctx->Array.Current->ColorFunc( IM->Color + VB_START, 
+				  Color, start, n );
+	 }
+	 
+	 if (required & VERT_INDEX) {
+	    ctx->Array.Current->IndexFunc( IM->Index + VB_START, 
+				  Index, start, n );
+	 }
+	 
+	 if (required & VERT_TEX0_ANY) {
+	    IM->v.TexCoord[0].size = TexCoord[0]->Size;
+	    ctx->Array.Current->TexCoordFunc[0]( IM->TexCoord[0] + VB_START, 
+					TexCoord[0], start, n );
+	 }
+	 
+	 if (required & VERT_TEX1_ANY) {
+	    IM->v.TexCoord[1].size = TexCoord[1]->Size;
+	    ctx->Array.Current->TexCoordFunc[1]( IM->TexCoord[1] + VB_START, 
+					TexCoord[1], start, n );
+	 }
+#else
 	 ctx->Array.VertexFunc( IM->Obj + VB_START, 
 				&ctx->Array.Vertex, start, n );
 	 
@@ -704,7 +1049,7 @@ _mesa_DrawArrays(GLenum mode, GLint start, GLsizei count)
 	    ctx->Array.TexCoordFunc[1]( IM->TexCoord[1] + VB_START, 
 					TexCoord[1], start, n );
 	 }
-
+#endif
 	 VB->ObjPtr = &IM->v.Obj;
 	 VB->NormalPtr = &IM->v.Normal;
 	 VB->ColorPtr = &IM->v.Color;
@@ -714,8 +1059,13 @@ _mesa_DrawArrays(GLenum mode, GLint start, GLsizei count)
 	 VB->TexCoordPtr[0] = &IM->v.TexCoord[0];
 	 VB->TexCoordPtr[1] = &IM->v.TexCoord[1];
 
+#ifdef VAO
+	 VB->Flag = ctx->Array.Current->Flag;
+	 VB->OrFlag = ctx->Array.Current->Flags;
+#else
 	 VB->Flag = ctx->Array.Flag;
 	 VB->OrFlag = ctx->Array.Flags;
+#endif
 
 	 VB->Start = IM->Start = VB_START;
 	 count = VB->Count = IM->Count = VB_START + n;
@@ -738,15 +1088,24 @@ _mesa_DrawArrays(GLenum mode, GLint start, GLsizei count)
 
 	 VB->NextPrimitive[VB->CopyStart] = VB->Count;
 	 VB->Primitive[VB->CopyStart] = mode;
+#ifdef VAO
+	 ctx->Array.Current->Flag[count] |= VERT_END_VB;
+#else
 	 ctx->Array.Flag[count] |= VERT_END_VB;
+#endif
 
          /* Transform and render.
 	  */
          gl_run_pipeline( VB );
 	 gl_reset_vb( VB );
 
+#ifdef VAO
+	 ctx->Array.Current->Flag[count] = ctx->Array.Current->Flags;
+	 ctx->Array.Current->Flag[VB_START] = ctx->Array.Current->Flags;
+#else
 	 ctx->Array.Flag[count] = ctx->Array.Flags;
 	 ctx->Array.Flag[VB_START] = ctx->Array.Flags;
+#endif
 
          start += n;
          remaining -= n;
@@ -759,7 +1118,11 @@ _mesa_DrawArrays(GLenum mode, GLint start, GLsizei count)
 	 elt->pipeline_valid = 0;
       }
    }
-   else if (ctx->Array.Vertex.Enabled) 
+#ifdef VAO
+   else if (ctx->Array.Current->Vertex.Enabled)
+#else
+   else if (ctx->Array.Vertex.Enabled)
+#endif
    {
       /* The GL_COMPILE and GL_COMPILE_AND_EXECUTE cases.  These
        * could be handled by the above code, but it gets a little
@@ -897,8 +1260,13 @@ _mesa_DrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indice
       /* Treat VERT_ELT like a special client array.
        */
       ctx->Array.NewArrayState |= VERT_ELT;
+#ifdef VAO
+      ctx->Array.Current->Summary |= VERT_ELT;
+      ctx->Array.Current->Flags |= VERT_ELT;
+#else
       ctx->Array.Summary |= VERT_ELT;
       ctx->Array.Flags |= VERT_ELT;
+#endif
 
       cva->elt_mode = mode;
       cva->elt_count = count;
@@ -918,8 +1286,13 @@ _mesa_DrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indice
        */
       if (ctx->CVA.pre.ops & PIPE_OP_RENDER) {
 	 ctx->Array.NewArrayState |= VERT_ELT;
+#ifdef VAO
+	 ctx->Array.Current->Summary &= ~VERT_ELT;
+	 ctx->Array.Current->Flags &= ~VERT_ELT;
+#else
 	 ctx->Array.Summary &= ~VERT_ELT;
 	 ctx->Array.Flags &= ~VERT_ELT;
+#endif
 	 return;
       } 
 
@@ -934,7 +1307,11 @@ _mesa_DrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indice
    case GL_UNSIGNED_BYTE:
    {
       GLubyte *ub_indices = (GLubyte *) indices;
+#ifdef VAO
+      if (ctx->Array.Current->Summary & VERT_OBJ_ANY) {
+#else
       if (ctx->Array.Summary & VERT_OBJ_ANY) {
+#endif
 	 draw_elt_ubyte( ctx, mode, ub_indices, count );
       } else {
 	 gl_ArrayElement( ctx, (GLuint) ub_indices[count-1] );
@@ -944,7 +1321,11 @@ _mesa_DrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indice
    case GL_UNSIGNED_SHORT:
    {
       GLushort *us_indices = (GLushort *) indices;
+#ifdef VAO
+      if (ctx->Array.Current->Summary & VERT_OBJ_ANY) {
+#else
       if (ctx->Array.Summary & VERT_OBJ_ANY) {
+#endif
 	 draw_elt_ushort( ctx, mode, us_indices, count );
       } else {
 	 gl_ArrayElement( ctx, (GLuint) us_indices[count-1] );
@@ -954,7 +1335,11 @@ _mesa_DrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indice
    case GL_UNSIGNED_INT:
    {
       GLuint *ui_indices = (GLuint *) indices;
+#ifdef VAO
+      if (ctx->Array.Current->Summary & VERT_OBJ_ANY) {
+#else
       if (ctx->Array.Summary & VERT_OBJ_ANY) {
+#endif
 	 draw_elt_uint( ctx, mode, ui_indices, count );
       } else {
 	 gl_ArrayElement( ctx, ui_indices[count-1] );
@@ -968,7 +1353,11 @@ _mesa_DrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indice
 
    if (ctx->CompileCVAFlag) {
       ctx->Array.NewArrayState |= VERT_ELT;
+#ifdef VAO
+      ctx->Array.Current->Summary &= ~VERT_ELT;
+#else
       ctx->Array.Summary &= ~VERT_ELT;
+#endif
    }
 }
 
@@ -1117,7 +1506,11 @@ _mesa_InterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer)
    coordUnitSave = ctx->Array.ActiveTexture;
    if (tflag) {
       GLint i;
+#ifdef VAO
+      GLint factor = ctx->Array.Current->TexCoordInterleaveFactor;
+#else
       GLint factor = ctx->Array.TexCoordInterleaveFactor;
+#endif
       for (i = 0; i < factor; i++) {
          _mesa_ClientActiveTextureARB( (GLenum) (GL_TEXTURE0_ARB + i) );
          _mesa_EnableClientState( GL_TEXTURE_COORD_ARRAY );
@@ -1215,10 +1608,31 @@ void gl_update_client_state( GLcontext *ctx )
 				 VERT_TEX0_123, 
 				 VERT_TEX0_1234 };
 
+#ifdef VAO
+   ctx->Array.Current->Flags = 0;
+   ctx->Array.Current->Summary = 0;
+#else
    ctx->Array.Flags = 0;
    ctx->Array.Summary = 0;
+#endif
    ctx->input->ArrayIncr = 0;
    
+#ifdef VAO
+   if (ctx->Array.Current->Normal.Enabled)      ctx->Array.Current->Flags |= VERT_NORM;
+   if (ctx->Array.Current->Color.Enabled)       ctx->Array.Current->Flags |= VERT_RGBA;
+   if (ctx->Array.Current->Index.Enabled)       ctx->Array.Current->Flags |= VERT_INDEX;
+   if (ctx->Array.Current->EdgeFlag.Enabled)    ctx->Array.Current->Flags |= VERT_EDGE;
+   if (ctx->Array.Current->Vertex.Enabled) {
+      ctx->Array.Current->Flags |= sz_flags[ctx->Array.Current->Vertex.Size];
+      ctx->input->ArrayIncr = 1;
+   }
+   if (ctx->Array.Current->TexCoord[0].Enabled) {
+      ctx->Array.Current->Flags |= tc_flags[ctx->Array.Current->TexCoord[0].Size];
+   }
+   if (ctx->Array.Current->TexCoord[1].Enabled) {
+      ctx->Array.Current->Flags |= (tc_flags[ctx->Array.Current->TexCoord[1].Size] << NR_TEXSIZE_BITS);
+   }
+#else
    if (ctx->Array.Normal.Enabled)      ctx->Array.Flags |= VERT_NORM;
    if (ctx->Array.Color.Enabled)       ctx->Array.Flags |= VERT_RGBA;
    if (ctx->Array.Index.Enabled)       ctx->Array.Flags |= VERT_INDEX;
@@ -1233,11 +1647,219 @@ void gl_update_client_state( GLcontext *ctx )
    if (ctx->Array.TexCoord[1].Enabled) {
       ctx->Array.Flags |= (tc_flags[ctx->Array.TexCoord[1].Size] << NR_TEXSIZE_BITS);
    }
+#endif
 
    /* Not really important any more:
     */
+#ifdef VAO
+   ctx->Array.Current->Summary = ctx->Array.Current->Flags & VERT_DATA;
+   ctx->input->ArrayAndFlags = ~ctx->Array.Current->Flags;
+#else
    ctx->Array.Summary = ctx->Array.Flags & VERT_DATA;
    ctx->input->ArrayAndFlags = ~ctx->Array.Flags;
+#endif
    ctx->input->ArrayEltFlush = !(ctx->CompileCVAFlag);
 }
 
+
+
+/**********************************************************************/
+/* Vertex Array Objects extension                                     */
+/**********************************************************************/
+
+#ifdef VAO
+
+struct gl_array_object *
+_mesa_alloc_vertex_array_object(GLcontext *ctx, GLuint name)
+{
+   struct gl_array_object *arrayObj;
+
+   arrayObj = MALLOC_STRUCT(gl_array_object);
+   if (arrayObj) {
+      GLuint i;
+      arrayObj->Name = name;
+      arrayObj->RefCount = 1;
+      arrayObj->Vertex.Size = 4;
+      arrayObj->Vertex.Type = GL_FLOAT;
+      arrayObj->Vertex.Stride = 0;
+      arrayObj->Vertex.StrideB = 0;
+      arrayObj->Vertex.Ptr = NULL;
+      arrayObj->Vertex.Enabled = GL_FALSE;
+      arrayObj->Normal.Type = GL_FLOAT;
+      arrayObj->Normal.Stride = 0;
+      arrayObj->Normal.StrideB = 0;
+      arrayObj->Normal.Ptr = NULL;
+      arrayObj->Normal.Enabled = GL_FALSE;
+      arrayObj->Color.Size = 4;
+      arrayObj->Color.Type = GL_FLOAT;
+      arrayObj->Color.Stride = 0;
+      arrayObj->Color.StrideB = 0;
+      arrayObj->Color.Ptr = NULL;
+      arrayObj->Color.Enabled = GL_FALSE;
+      arrayObj->Index.Type = GL_FLOAT;
+      arrayObj->Index.Stride = 0;
+      arrayObj->Index.StrideB = 0;
+      arrayObj->Index.Ptr = NULL;
+      arrayObj->Index.Enabled = GL_FALSE;
+      for (i = 0; i < MAX_TEXTURE_UNITS; i++) {
+         arrayObj->TexCoord[i].Size = 4;
+         arrayObj->TexCoord[i].Type = GL_FLOAT;
+         arrayObj->TexCoord[i].Stride = 0;
+         arrayObj->TexCoord[i].StrideB = 0;
+         arrayObj->TexCoord[i].Ptr = NULL;
+         arrayObj->TexCoord[i].Enabled = GL_FALSE;
+      }
+      arrayObj->TexCoordInterleaveFactor = 1;
+      arrayObj->EdgeFlag.Stride = 0;
+      arrayObj->EdgeFlag.StrideB = 0;
+      arrayObj->EdgeFlag.Ptr = NULL;
+      arrayObj->EdgeFlag.Enabled = GL_FALSE;
+
+      /* Put into hash table */
+      _mesa_HashInsert(ctx->Shared->ArrayObjects, name, arrayObj);
+   }
+   return arrayObj;
+}
+
+
+void
+glGenArraySetsEXT(GLsizei n, GLuint *arrayset)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint first;
+   GLint i;
+
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGenArraySetsEXT");
+
+   if (n < 0) {
+      gl_error(ctx, GL_INVALID_VALUE, "glGenArraySetsEXT");
+      return;
+   }
+
+   if (!arrayset)
+      return;
+
+   /*
+    * This must be atomic (generation and allocation of texture IDs)
+    */
+   /*XXX _glthread_LOCK_MUTEX(GenTexturesLock);*/
+
+   first = _mesa_HashFindFreeKeyBlock(ctx->Shared->ArrayObjects, n);
+
+   /* Return the object names */
+   for (i = 0; i < n; i++) {
+      arrayset[i] = first + i;
+   }
+
+   /* Allocate new array objects */
+   for (i = 0; i < n; i++) {
+      struct gl_array_object *arrayObj;
+      GLuint name = first + i;
+      arrayObj = _mesa_alloc_vertex_array_object(ctx, name);
+      if (!arrayObj) {
+         gl_error(ctx, GL_OUT_OF_MEMORY, "glGenArraySetsEXT");
+         break;
+      }
+   }
+
+   /*XXX _glthread_UNLOCK_MUTEX(GenTexturesLock);*/
+}
+
+
+void
+glBindArraySetEXT(GLuint arraySet)
+{
+   struct gl_array_object *arrayObj;
+   GET_CURRENT_CONTEXT(ctx);
+
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glBindArraySetEXT");
+
+   if (arraySet < 0) {
+      gl_error(ctx, GL_INVALID_OPERATION, "glBindArraySetEXT");
+      return;
+   }
+
+   ctx->Array.Current->RefCount--;
+   if (ctx->Array.Current->RefCount == 0) {
+      _mesa_HashRemove(ctx->Shared->ArrayObjects, arraySet);
+      FREE(ctx->Array.Current);
+   }
+
+   arrayObj = (struct gl_array_object *) _mesa_HashLookup(ctx->Shared->ArrayObjects, arraySet);
+   if (arrayObj) {
+      ctx->Array.Current = arrayObj;
+   }
+   else {
+      /* create the array object and insert into hash table */
+      arrayObj = _mesa_alloc_vertex_array_object(ctx, arraySet);
+      if (!arrayObj) {
+         gl_error(ctx, GL_OUT_OF_MEMORY, "glBindArraySetEXT");
+         return;
+      }
+      ctx->Array.Current = (struct gl_array_object *) _mesa_HashLookup(ctx->Shared->ArrayObjects, 0);
+   }
+
+   ctx->Array.Current->RefCount++;
+
+   /* Signal new state */
+   /*   ctx->Array.NewArrayState = ~0;*/
+   ctx->NewState |= NEW_CLIENT_STATE;
+
+#if 0
+   printf("Bind %d\n", ctx->Array.Current->Name);
+   printf("Vertex array size: %d\n", ctx->Array.Current->Vertex.Size);
+   printf("Vertex array enable: %d\n", ctx->Array.Current->Vertex.Enabled);
+
+   printf("Normal array size: %d\n", ctx->Array.Current->Normal.Size);
+   printf("Normal array enable: %d\n", ctx->Array.Current->Normal.Enabled);
+   printf("Lock first %d  count %d\n", ctx->Array.Current->LockFirst,
+          ctx->Array.Current->LockCount);
+#endif
+}
+
+
+void
+glDeleteArraySetsEXT(GLsizei n, const GLuint *arraySet)
+{
+   GLint i;
+   GET_CURRENT_CONTEXT(ctx);
+   
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glDeleteArraySetsEXT");
+
+   if (n < 0) {
+      gl_error(ctx, GL_INVALID_OPERATION, "glDeleteArraySetEXT");
+      return;
+   }
+
+   for (i = 0; i < n; i++) {
+      if (arraySet[i] > 0) {
+         struct gl_array_object *arrayObj;
+         arrayObj = (struct gl_array_object *) _mesa_HashLookup(ctx->Shared->ArrayObjects, arraySet[i]);
+         if (arrayObj) {
+            arrayObj->RefCount--;
+            if (arrayObj->RefCount == 0) {
+               _mesa_HashRemove(ctx->Shared->ArrayObjects, arraySet[i]);
+               FREE(arrayObj);
+            }
+         }
+      }
+   }
+}
+
+
+GLboolean
+glIsArraySetEXT(GLuint arraySet)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH_WITH_RETVAL(ctx, "glIsArraySetEXT",
+						  GL_FALSE);
+
+   if (arraySet > 0 && _mesa_HashLookup(ctx->Shared->ArrayObjects, arraySet)) {
+      return GL_TRUE;
+   }
+   else {
+      return GL_FALSE;
+   }
+}
+
+#endif
diff --git a/xc/extras/Mesa/src/vbxform.c b/xc/extras/Mesa/src/vbxform.c
index 13d47a398..dc3e3e709 100644
--- a/xc/extras/Mesa/src/vbxform.c
+++ b/xc/extras/Mesa/src/vbxform.c
@@ -269,8 +269,13 @@ void gl_reset_input( GLcontext *ctx )
 	   VERT_BEGIN_0,
 	   IM->Start, gl_lookup_enum_by_nr(ctx->Current.Primitive));
 
+#ifdef VAO
+   IM->ArrayAndFlags = ~ctx->Array.Current->Flags;
+   IM->ArrayIncr = ctx->Array.Current->Vertex.Enabled;
+#else
    IM->ArrayAndFlags = ~ctx->Array.Flags;
    IM->ArrayIncr = ctx->Array.Vertex.Enabled;
+#endif
    IM->ArrayEltFlush = !(ctx->CompileCVAFlag);
 }