mesa pixman xkeyboard-config git update 1 Jun 2011

12 files changed, 3955 insertions, 3897 deletions

diff --git a/mesalib/Makefile b/mesalib/Makefile
index 4b12dba40..7a5dae762 100644
--- a/mesalib/Makefile
+++ b/mesalib/Makefile
@@ -1,519 +1,521 @@
-# Top-level Mesa makefile

-

-TOP = .

-

-SUBDIRS = src

-

-

-# The git command below generates an empty string when we're not

-# building in a GIT tree (i.e., building from a release tarball).

-default: $(TOP)/configs/current

-	@$(TOP)/bin/extract_git_sha1

-	@for dir in $(SUBDIRS) ; do \

-		if [ -d $$dir ] ; then \

-			(cd $$dir && $(MAKE)) || exit 1 ; \

-		fi \

-	done

-

-all: default

-

-

-doxygen:

-	cd doxygen && $(MAKE)

-

-clean:

-	-@touch $(TOP)/configs/current

-	-@for dir in $(SUBDIRS) ; do \

-		if [ -d $$dir ] ; then \

-			(cd $$dir && $(MAKE) clean) ; \

-		fi \

-	done

-	-@test -s $(TOP)/configs/current || rm -f $(TOP)/configs/current

-

-

-realclean: clean

-	-rm -rf lib*

-	-rm -f $(TOP)/configs/current

-	-rm -f $(TOP)/configs/autoconf

-	-rm -rf autom4te.cache

-	-find . '(' -name '*.o' -o -name '*.a' -o -name '*.so' -o \

-	  -name depend -o -name depend.bak ')' -exec rm -f '{}' ';'

-

-

-distclean: realclean

-

-

-install:

-	@for dir in $(SUBDIRS) ; do \

-		if [ -d $$dir ] ; then \

-			(cd $$dir && $(MAKE) install) || exit 1 ; \

-		fi \

-	done

-

-

-.PHONY: default doxygen clean realclean distclean install

-

-# If there's no current configuration file

-$(TOP)/configs/current:

-	@echo

-	@echo

-	@echo "Please choose a configuration from the following list:"

-	@ls -1 $(TOP)/configs | grep -v "current\|default\|CVS\|autoconf.*"

-	@echo

-	@echo "Then type 'make <config>' (ex: 'make linux-x86')"

-	@echo

-	@echo "Or, run './configure' then 'make'"

-	@echo "See './configure --help' for details"

-	@echo

-	@echo "(ignore the following error message)"

-	@exit 1

-

-

-# Rules to set/install a specific build configuration

-aix \

-aix-64 \

-aix-64-static \

-aix-gcc \

-aix-static \

-autoconf \

-bluegene-osmesa \

-bluegene-xlc-osmesa \

-beos \

-catamount-osmesa-pgi \

-darwin \

-darwin-fat-32bit \

-darwin-fat-all \

-freebsd \

-freebsd-dri \

-freebsd-dri-amd64 \

-freebsd-dri-x86 \

-hpux10 \

-hpux10-gcc \

-hpux10-static \

-hpux11-32 \

-hpux11-32-static \

-hpux11-32-static-nothreads \

-hpux11-64 \

-hpux11-64-static \

-hpux11-ia64 \

-hpux11-ia64-static \

-hpux9 \

-hpux9-gcc \

-irix6-64 \

-irix6-64-static \

-irix6-n32 \

-irix6-n32-static \

-irix6-o32 \

-irix6-o32-static \

-linux \

-linux-i965 \

-linux-alpha \

-linux-alpha-static \

-linux-cell \

-linux-cell-debug \

-linux-debug \

-linux-dri \

-linux-dri-debug \

-linux-dri-x86 \

-linux-dri-x86-64 \

-linux-dri-ppc \

-linux-dri-xcb \

-linux-egl \

-linux-indirect \

-linux-fbdev \

-linux-ia64-icc \

-linux-ia64-icc-static \

-linux-icc \

-linux-icc-static \

-linux-llvm \

-linux-llvm-debug \

-linux-opengl-es \

-linux-osmesa \

-linux-osmesa-static \

-linux-osmesa16 \

-linux-osmesa16-static \

-linux-osmesa32 \

-linux-ppc \

-linux-ppc-static \

-linux-profile \

-linux-sparc \

-linux-sparc5 \

-linux-static \

-linux-ultrasparc \

-linux-tcc \

-linux-x86 \

-linux-x86-debug \

-linux-x86-32 \

-linux-x86-64 \

-linux-x86-64-debug \

-linux-x86-64-profile \

-linux-x86-64-static \

-linux-x86-profile \

-linux-x86-static \

-netbsd \

-openbsd \

-osf1 \

-osf1-static \

-solaris-x86 \

-solaris-x86-gcc \

-solaris-x86-gcc-static \

-sunos4 \

-sunos4-gcc \

-sunos4-static \

-sunos5 \

-sunos5-gcc \

-sunos5-64-gcc \

-sunos5-smp \

-sunos5-v8 \

-sunos5-v8-static \

-sunos5-v9 \

-sunos5-v9-static \

-sunos5-v9-cc-g++ \

-ultrix-gcc:

-	@ if test -f configs/current -o -L configs/current; then \

-		if ! cmp configs/$@ configs/current > /dev/null; then \

-			echo "Please run 'make realclean' before changing configs" ; \

-			exit 1 ; \

-		fi ; \

-	else \

-		cd configs && rm -f current && ln -s $@ current ; \

-	fi

-	$(MAKE) default

-

-

-# Rules for making release tarballs

-

-VERSION=7.11-devel

-DIRECTORY = Mesa-$(VERSION)

-LIB_NAME = MesaLib-$(VERSION)

-GLUT_NAME = MesaGLUT-$(VERSION)

-

-# This is part of MAIN_FILES

-MAIN_ES_FILES = \

-	$(DIRECTORY)/src/mesa/main/*.xml				\

-	$(DIRECTORY)/src/mesa/main/*.py					\

-	$(DIRECTORY)/src/mesa/main/*.dtd

-

-MAIN_FILES = \

-	$(DIRECTORY)/Makefile*						\

-	$(DIRECTORY)/configure						\

-	$(DIRECTORY)/configure.ac					\

-	$(DIRECTORY)/acinclude.m4					\

-	$(DIRECTORY)/aclocal.m4						\

-	$(DIRECTORY)/SConstruct						\

-	$(DIRECTORY)/common.py						\

-	$(DIRECTORY)/scons/*py						\

-	$(DIRECTORY)/bin/config.guess					\

-	$(DIRECTORY)/bin/config.sub					\

-	$(DIRECTORY)/bin/extract_git_sha1				\

-	$(DIRECTORY)/bin/install-sh					\

-	$(DIRECTORY)/bin/mklib						\

-	$(DIRECTORY)/bin/minstall					\

-	$(DIRECTORY)/bin/version.mk					\

-	$(DIRECTORY)/configs/[a-z]*					\

-	$(DIRECTORY)/docs/*.html					\

-	$(DIRECTORY)/docs/COPYING					\

-	$(DIRECTORY)/docs/README.*					\

-	$(DIRECTORY)/docs/RELNOTES*					\

-	$(DIRECTORY)/docs/*.spec					\

-	$(DIRECTORY)/include/GL/gl.h					\

-	$(DIRECTORY)/include/GL/glext.h					\

-	$(DIRECTORY)/include/GL/gl_mangle.h				\

-	$(DIRECTORY)/include/GL/glu.h					\

-	$(DIRECTORY)/include/GL/glu_mangle.h				\

-	$(DIRECTORY)/include/GL/glx.h					\

-	$(DIRECTORY)/include/GL/glxext.h				\

-	$(DIRECTORY)/include/GL/glx_mangle.h				\

-	$(DIRECTORY)/include/GL/glfbdev.h				\

-	$(DIRECTORY)/include/GL/mesa_wgl.h				\

-	$(DIRECTORY)/include/GL/osmesa.h				\

-	$(DIRECTORY)/include/GL/vms_x_fix.h				\

-	$(DIRECTORY)/include/GL/wglext.h				\

-	$(DIRECTORY)/include/GL/wmesa.h					\

-	$(DIRECTORY)/src/getopt/SConscript				\

-	$(DIRECTORY)/src/getopt/getopt*.[ch]				\

-	$(DIRECTORY)/src/glsl/Makefile					\

-	$(DIRECTORY)/src/glsl/Makefile.template				\

-	$(DIRECTORY)/src/glsl/SConscript				\

-	$(DIRECTORY)/src/glsl/*.[ch]					\

-	$(DIRECTORY)/src/glsl/*.ll					\

-	$(DIRECTORY)/src/glsl/*.yy					\

-	$(DIRECTORY)/src/glsl/*.[cly]pp					\

-	$(DIRECTORY)/src/glsl/README					\

-	$(DIRECTORY)/src/glsl/glcpp/*.[chly]				\

-	$(DIRECTORY)/src/glsl/glcpp/README				\

-	$(DIRECTORY)/src/glsl/builtins					\

-	$(DIRECTORY)/src/Makefile					\

-	$(DIRECTORY)/src/SConscript					\

-	$(DIRECTORY)/src/mesa/Makefile*					\

-	$(DIRECTORY)/src/mesa/SConscript				\

-	$(DIRECTORY)/src/mesa/sources.mak				\

-	$(DIRECTORY)/src/mesa/descrip.mms				\

-	$(DIRECTORY)/src/mesa/gl.pc.in					\

-	$(DIRECTORY)/src/mesa/osmesa.pc.in				\

-	$(DIRECTORY)/src/mesa/depend					\

-	$(MAIN_ES_FILES)						\

-	$(DIRECTORY)/src/mesa/main/*.[chS]				\

-	$(DIRECTORY)/src/mesa/main/*.cpp				\

-	$(DIRECTORY)/src/mesa/main/descrip.mms				\

-	$(DIRECTORY)/src/mesa/math/*.[ch]				\

-	$(DIRECTORY)/src/mesa/math/descrip.mms				\

-	$(DIRECTORY)/src/mesa/program/*.[chly]				\

-	$(DIRECTORY)/src/mesa/program/*.cpp				\

-	$(DIRECTORY)/src/mesa/program/descrip.mms			\

-	$(DIRECTORY)/src/mesa/swrast/*.[ch]				\

-	$(DIRECTORY)/src/mesa/swrast/descrip.mms			\

-	$(DIRECTORY)/src/mesa/swrast_setup/*.[ch]			\

-	$(DIRECTORY)/src/mesa/swrast_setup/descrip.mms			\

-	$(DIRECTORY)/src/mesa/vbo/*.[chS]				\

-	$(DIRECTORY)/src/mesa/vbo/descrip.mms				\

-	$(DIRECTORY)/src/mesa/tnl/*.[chS]				\

-	$(DIRECTORY)/src/mesa/tnl/descrip.mms				\

-	$(DIRECTORY)/src/mesa/tnl_dd/*.[ch]				\

-	$(DIRECTORY)/src/mesa/tnl_dd/imm/*.[ch]				\

-	$(DIRECTORY)/src/mesa/tnl_dd/imm/NOTES.imm			\

-	$(DIRECTORY)/src/mesa/drivers/Makefile				\

-	$(DIRECTORY)/src/mesa/drivers/beos/*.cpp			\

-	$(DIRECTORY)/src/mesa/drivers/beos/Makefile			\

-	$(DIRECTORY)/src/mesa/drivers/common/*.[ch]			\

-	$(DIRECTORY)/src/mesa/drivers/common/descrip.mms		\

-	$(DIRECTORY)/src/mesa/drivers/fbdev/Makefile			\

-	$(DIRECTORY)/src/mesa/drivers/fbdev/glfbdev.c			\

-	$(DIRECTORY)/src/mesa/drivers/osmesa/Makefile			\

-	$(DIRECTORY)/src/mesa/drivers/osmesa/Makefile.win		\

-	$(DIRECTORY)/src/mesa/drivers/osmesa/descrip.mms		\

-	$(DIRECTORY)/src/mesa/drivers/osmesa/osmesa.def			\

-	$(DIRECTORY)/src/mesa/drivers/osmesa/*.[ch]			\

-	$(DIRECTORY)/src/mesa/drivers/dri/r300/compiler/*.[ch]		\

-	$(DIRECTORY)/src/mesa/drivers/dri/r300/compiler/Makefile	\

-	$(DIRECTORY)/src/mesa/drivers/dri/r300/compiler/SConscript	\

-	$(DIRECTORY)/src/mesa/drivers/windows/*/*.[ch]			\

-	$(DIRECTORY)/src/mesa/drivers/windows/*/*.def			\

-	$(DIRECTORY)/src/mesa/drivers/x11/Makefile			\

-	$(DIRECTORY)/src/mesa/drivers/x11/descrip.mms			\

-	$(DIRECTORY)/src/mesa/drivers/x11/*.[ch]			\

-	$(DIRECTORY)/src/mesa/ppc/*.[ch]				\

-	$(DIRECTORY)/src/mesa/sparc/*.[chS]				\

-	$(DIRECTORY)/src/mesa/x86/Makefile				\

-	$(DIRECTORY)/src/mesa/x86/*.[ch]				\

-	$(DIRECTORY)/src/mesa/x86/*.S					\

-	$(DIRECTORY)/src/mesa/x86/rtasm/*.[ch]				\

-	$(DIRECTORY)/src/mesa/x86-64/*.[chS]				\

-	$(DIRECTORY)/src/mesa/x86-64/Makefile

-

-MAPI_FILES = \

-	$(DIRECTORY)/include/GLES/*.h					\

-	$(DIRECTORY)/include/GLES2/*.h					\

-	$(DIRECTORY)/include/VG/*.h					\

-	$(DIRECTORY)/src/mapi/es?api/Makefile				\

-	$(DIRECTORY)/src/mapi/es?api/*.pc.in				\

-	$(DIRECTORY)/src/mapi/glapi/gen/Makefile			\

-	$(DIRECTORY)/src/mapi/glapi/gen/*.xml				\

-	$(DIRECTORY)/src/mapi/glapi/gen/*.py				\

-	$(DIRECTORY)/src/mapi/glapi/gen/*.dtd				\

-	$(DIRECTORY)/src/mapi/glapi/gen-es/Makefile			\

-	$(DIRECTORY)/src/mapi/glapi/gen-es/*.xml			\

-	$(DIRECTORY)/src/mapi/glapi/gen-es/*.py				\

-	$(DIRECTORY)/src/mapi/glapi/Makefile				\

-	$(DIRECTORY)/src/mapi/glapi/SConscript				\

-	$(DIRECTORY)/src/mapi/glapi/sources.mak				\

-	$(DIRECTORY)/src/mapi/glapi/*.[chS]				\

-	$(DIRECTORY)/src/mapi/mapi/mapi_abi.py				\

-	$(DIRECTORY)/src/mapi/mapi/sources.mak				\

-	$(DIRECTORY)/src/mapi/mapi/*.[ch]				\

-	$(DIRECTORY)/src/mapi/shared-glapi/SConscript			\

-	$(DIRECTORY)/src/mapi/shared-glapi/Makefile			\

-	$(DIRECTORY)/src/mapi/vgapi/Makefile				\

-	$(DIRECTORY)/src/mapi/vgapi/SConscript				\

-	$(DIRECTORY)/src/mapi/vgapi/vgapi.csv				\

-	$(DIRECTORY)/src/mapi/vgapi/vg.pc.in

-

-EGL_FILES = \

-	$(DIRECTORY)/include/KHR/*.h					\

-	$(DIRECTORY)/include/EGL/*.h					\

-	$(DIRECTORY)/src/egl/Makefile					\

-	$(DIRECTORY)/src/egl/*/Makefile					\

-	$(DIRECTORY)/src/egl/*/Makefile.template			\

-	$(DIRECTORY)/src/egl/*/*.[ch]					\

-	$(DIRECTORY)/src/egl/*/*/Makefile				\

-	$(DIRECTORY)/src/egl/*/*/*.[ch]					\

-	$(DIRECTORY)/src/egl/main/SConscript				\

-	$(DIRECTORY)/src/egl/main/*.pc.in				\

-	$(DIRECTORY)/src/egl/main/*.def

-

-GALLIUM_FILES = \

-	$(DIRECTORY)/src/mesa/state_tracker/*[ch]			\

-	$(DIRECTORY)/src/gallium/Makefile				\

-	$(DIRECTORY)/src/gallium/Makefile.template			\

-	$(DIRECTORY)/src/gallium/SConscript				\

-	$(DIRECTORY)/src/gallium/targets/Makefile.dri			\

-	$(DIRECTORY)/src/gallium/targets/Makefile.xorg			\

-	$(DIRECTORY)/src/gallium/targets/SConscript.dri			\

-	$(DIRECTORY)/src/gallium/*/Makefile				\

-	$(DIRECTORY)/src/gallium/*/SConscript				\

-	$(DIRECTORY)/src/gallium/*/*/Makefile				\

-	$(DIRECTORY)/src/gallium/*/*/SConscript				\

-	$(DIRECTORY)/src/gallium/*/*/*.[ch]				\

-	$(DIRECTORY)/src/gallium/auxiliary/gallivm/*.cpp		\

-	$(DIRECTORY)/src/gallium/*/*/*.py				\

-	$(DIRECTORY)/src/gallium/*/*/*.csv				\

-	$(DIRECTORY)/src/gallium/*/*/*/Makefile				\

-	$(DIRECTORY)/src/gallium/*/*/*/SConscript			\

-	$(DIRECTORY)/src/gallium/*/*/*/*.[ch]				\

-	$(DIRECTORY)/src/gallium/*/*/*/*.py

-

-

-DRI_FILES = \

-	$(DIRECTORY)/include/GL/internal/dri_interface.h		\

-	$(DIRECTORY)/include/GL/internal/sarea.h			\

-	$(DIRECTORY)/src/glx/Makefile					\

-	$(DIRECTORY)/src/glx/*.[ch]					\

-	$(DIRECTORY)/src/mesa/drivers/dri/Makefile			\

-	$(DIRECTORY)/src/mesa/drivers/dri/Makefile.template		\

-	$(DIRECTORY)/src/mesa/drivers/dri/dri.pc.in			\

-	$(DIRECTORY)/src/mesa/drivers/dri/common/xmlpool/*.po		\

-	$(DIRECTORY)/src/mesa/drivers/dri/*/*.[chS]			\

-	$(DIRECTORY)/src/mesa/drivers/dri/*/*.cpp			\

-	$(DIRECTORY)/src/mesa/drivers/dri/*/*/*.[chS]			\

-	$(DIRECTORY)/src/mesa/drivers/dri/*/Makefile			\

-	$(DIRECTORY)/src/mesa/drivers/dri/*/*/Makefile			\

-	$(DIRECTORY)/src/mesa/drivers/dri/*/Doxyfile

-

-SGI_GLU_FILES = \

-	$(DIRECTORY)/src/glu/Makefile					\

-	$(DIRECTORY)/src/glu/glu.pc.in					\

-	$(DIRECTORY)/src/glu/sgi/Makefile				\

-	$(DIRECTORY)/src/glu/sgi/Makefile.mgw				\

-	$(DIRECTORY)/src/glu/sgi/Makefile.win				\

-	$(DIRECTORY)/src/glu/sgi/glu.def				\

-	$(DIRECTORY)/src/glu/sgi/dummy.cc				\

-	$(DIRECTORY)/src/glu/sgi/glu.exports				\

-	$(DIRECTORY)/src/glu/sgi/glu.exports.darwin			\

-	$(DIRECTORY)/src/glu/sgi/mesaglu.opt				\

-	$(DIRECTORY)/src/glu/sgi/include/gluos.h			\

-	$(DIRECTORY)/src/glu/sgi/libnurbs/interface/*.h			\

-	$(DIRECTORY)/src/glu/sgi/libnurbs/interface/*.cc		\

-	$(DIRECTORY)/src/glu/sgi/libnurbs/internals/*.h			\

-	$(DIRECTORY)/src/glu/sgi/libnurbs/internals/*.cc		\

-	$(DIRECTORY)/src/glu/sgi/libnurbs/nurbtess/*.h			\

-	$(DIRECTORY)/src/glu/sgi/libnurbs/nurbtess/*.cc			\

-	$(DIRECTORY)/src/glu/sgi/libtess/README				\

-	$(DIRECTORY)/src/glu/sgi/libtess/alg-outline			\

-	$(DIRECTORY)/src/glu/sgi/libtess/*.[ch]				\

-	$(DIRECTORY)/src/glu/sgi/libutil/*.[ch]

-

-GLW_FILES = \

-	$(DIRECTORY)/src/glw/*.[ch]			\

-	$(DIRECTORY)/src/glw/Makefile*			\

-	$(DIRECTORY)/src/glw/README			\

-	$(DIRECTORY)/src/glw/glw.pc.in			\

-	$(DIRECTORY)/src/glw/depend

-

-GLUT_FILES = \

-	$(DIRECTORY)/include/GL/glut.h			\

-	$(DIRECTORY)/include/GL/glutf90.h		\

-	$(DIRECTORY)/src/glut/glx/Makefile*		\

-	$(DIRECTORY)/src/glut/glx/SConscript		\

-	$(DIRECTORY)/src/glut/glx/depend		\

-	$(DIRECTORY)/src/glut/glx/glut.pc.in		\

-	$(DIRECTORY)/src/glut/glx/*def			\

-	$(DIRECTORY)/src/glut/glx/*.[ch]		\

-	$(DIRECTORY)/src/glut/beos/*.[ch]		\

-	$(DIRECTORY)/src/glut/beos/*.cpp		\

-	$(DIRECTORY)/src/glut/beos/Makefile

-

-DEPEND_FILES = \

-	$(TOP)/src/mesa/depend		\

-	$(TOP)/src/glx/depend		\

-	$(TOP)/src/glw/depend		\

-	$(TOP)/src/glut/glx/depend	\

-	$(TOP)/src/glu/sgi/depend

-

-

-LIB_FILES = \

-	$(MAIN_FILES)		\

-	$(MAPI_FILES)		\

-	$(ES_FILES)		\

-	$(EGL_FILES)		\

-	$(GALLIUM_FILES)	\

-	$(DRI_FILES)		\

-	$(SGI_GLU_FILES)	\

-	$(GLW_FILES)

-

-

-parsers: configure

-	-@touch $(TOP)/configs/current

-	$(MAKE) -C src/glsl glsl_parser.cpp glsl_parser.h glsl_lexer.cpp

-	$(MAKE) -C src/glsl/glcpp glcpp-lex.c glcpp-parse.c glcpp-parse.h

-	$(MAKE) -C src/mesa/program lex.yy.c program_parse.tab.c program_parse.tab.h

-

-# Everything for new a Mesa release:

-ARCHIVES = $(LIB_NAME).tar.gz \

-	$(LIB_NAME).tar.bz2 \

-	$(LIB_NAME).zip \

-	$(GLUT_NAME).tar.gz \

-	$(GLUT_NAME).tar.bz2 \

-	$(GLUT_NAME).zip

-

-tarballs: md5

-	rm -f ../$(LIB_NAME).tar

-

-# Helper for autoconf builds

-ACLOCAL = aclocal

-ACLOCAL_FLAGS =

-AUTOCONF = autoconf

-AC_FLAGS =

-aclocal.m4: configure.ac acinclude.m4

-	$(ACLOCAL) $(ACLOCAL_FLAGS)

-configure: rm_depend configure.ac aclocal.m4 acinclude.m4

-	$(AUTOCONF) $(AC_FLAGS)

-

-rm_depend:

-	@for dep in $(DEPEND_FILES) ; do \

-		rm -f $$dep ; \

-		touch $$dep ; \

-	done

-

-rm_config: parsers

-	rm -f configs/current

-	rm -f configs/autoconf

-

-$(LIB_NAME).tar: rm_config

-	cd .. ; tar -cf $(DIRECTORY)/$(LIB_NAME).tar $(LIB_FILES)

-

-$(LIB_NAME).tar.gz: $(LIB_NAME).tar

-	gzip --stdout --best $(LIB_NAME).tar > $(LIB_NAME).tar.gz

-

-$(GLUT_NAME).tar: rm_depend

-	cd .. ; tar -cf $(DIRECTORY)/$(GLUT_NAME).tar $(GLUT_FILES)

-

-$(GLUT_NAME).tar.gz: $(GLUT_NAME).tar

-	gzip --stdout --best $(GLUT_NAME).tar > $(GLUT_NAME).tar.gz

-

-$(LIB_NAME).tar.bz2: $(LIB_NAME).tar

-	bzip2 --stdout --best $(LIB_NAME).tar > $(LIB_NAME).tar.bz2

-

-$(GLUT_NAME).tar.bz2: $(GLUT_NAME).tar

-	bzip2 --stdout --best $(GLUT_NAME).tar > $(GLUT_NAME).tar.bz2

-

-$(LIB_NAME).zip: rm_config

-	rm -f $(LIB_NAME).zip ; \

-	cd .. ; \

-	zip -qr $(LIB_NAME).zip $(LIB_FILES) ; \

-	mv $(LIB_NAME).zip $(DIRECTORY)

-

-$(GLUT_NAME).zip:

-	rm -f $(GLUT_NAME).zip ; \

-	cd .. ; \

-	zip -qr $(GLUT_NAME).zip $(GLUT_FILES) ; \

-	mv $(GLUT_NAME).zip $(DIRECTORY)

-

-md5: $(ARCHIVES)

-	@-md5sum $(LIB_NAME).tar.gz

-	@-md5sum $(LIB_NAME).tar.bz2

-	@-md5sum $(LIB_NAME).zip

-	@-md5sum $(GLUT_NAME).tar.gz

-	@-md5sum $(GLUT_NAME).tar.bz2

-	@-md5sum $(GLUT_NAME).zip

-

-.PHONY: tarballs rm_depend rm_config md5

+# Top-level Mesa makefile
+
+TOP = .
+
+SUBDIRS = src
+
+
+# The git command below generates an empty string when we're not
+# building in a GIT tree (i.e., building from a release tarball).
+default: $(TOP)/configs/current
+	@$(TOP)/bin/extract_git_sha1
+	@for dir in $(SUBDIRS) ; do \
+		if [ -d $$dir ] ; then \
+			(cd $$dir && $(MAKE)) || exit 1 ; \
+		fi \
+	done
+
+all: default
+
+
+doxygen:
+	cd doxygen && $(MAKE)
+
+clean:
+	-@touch $(TOP)/configs/current
+	-@for dir in $(SUBDIRS) ; do \
+		if [ -d $$dir ] ; then \
+			(cd $$dir && $(MAKE) clean) ; \
+		fi \
+	done
+	-@test -s $(TOP)/configs/current || rm -f $(TOP)/configs/current
+
+
+realclean: clean
+	-rm -rf lib*
+	-rm -f $(TOP)/configs/current
+	-rm -f $(TOP)/configs/autoconf
+	-rm -rf autom4te.cache
+	-find . '(' -name '*.o' -o -name '*.a' -o -name '*.so' -o \
+	  -name depend -o -name depend.bak ')' -exec rm -f '{}' ';'
+
+
+distclean: realclean
+
+
+install:
+	@for dir in $(SUBDIRS) ; do \
+		if [ -d $$dir ] ; then \
+			(cd $$dir && $(MAKE) install) || exit 1 ; \
+		fi \
+	done
+
+
+.PHONY: default doxygen clean realclean distclean install
+
+# If there's no current configuration file
+$(TOP)/configs/current:
+	@echo
+	@echo
+	@echo "Please choose a configuration from the following list:"
+	@ls -1 $(TOP)/configs | grep -v "current\|default\|CVS\|autoconf.*"
+	@echo
+	@echo "Then type 'make <config>' (ex: 'make linux-x86')"
+	@echo
+	@echo "Or, run './configure' then 'make'"
+	@echo "See './configure --help' for details"
+	@echo
+	@echo "(ignore the following error message)"
+	@exit 1
+
+
+# Rules to set/install a specific build configuration
+aix \
+aix-64 \
+aix-64-static \
+aix-gcc \
+aix-static \
+autoconf \
+bluegene-osmesa \
+bluegene-xlc-osmesa \
+beos \
+catamount-osmesa-pgi \
+darwin \
+darwin-fat-32bit \
+darwin-fat-all \
+freebsd \
+freebsd-dri \
+freebsd-dri-amd64 \
+freebsd-dri-x86 \
+hpux10 \
+hpux10-gcc \
+hpux10-static \
+hpux11-32 \
+hpux11-32-static \
+hpux11-32-static-nothreads \
+hpux11-64 \
+hpux11-64-static \
+hpux11-ia64 \
+hpux11-ia64-static \
+hpux9 \
+hpux9-gcc \
+irix6-64 \
+irix6-64-static \
+irix6-n32 \
+irix6-n32-static \
+irix6-o32 \
+irix6-o32-static \
+linux \
+linux-i965 \
+linux-alpha \
+linux-alpha-static \
+linux-cell \
+linux-cell-debug \
+linux-debug \
+linux-dri \
+linux-dri-debug \
+linux-dri-x86 \
+linux-dri-x86-64 \
+linux-dri-ppc \
+linux-dri-xcb \
+linux-egl \
+linux-indirect \
+linux-fbdev \
+linux-ia64-icc \
+linux-ia64-icc-static \
+linux-icc \
+linux-icc-static \
+linux-llvm \
+linux-llvm-debug \
+linux-opengl-es \
+linux-osmesa \
+linux-osmesa-static \
+linux-osmesa16 \
+linux-osmesa16-static \
+linux-osmesa32 \
+linux-ppc \
+linux-ppc-static \
+linux-profile \
+linux-sparc \
+linux-sparc5 \
+linux-static \
+linux-ultrasparc \
+linux-tcc \
+linux-x86 \
+linux-x86-debug \
+linux-x86-32 \
+linux-x86-64 \
+linux-x86-64-debug \
+linux-x86-64-profile \
+linux-x86-64-static \
+linux-x86-profile \
+linux-x86-static \
+netbsd \
+openbsd \
+osf1 \
+osf1-static \
+solaris-x86 \
+solaris-x86-gcc \
+solaris-x86-gcc-static \
+sunos4 \
+sunos4-gcc \
+sunos4-static \
+sunos5 \
+sunos5-gcc \
+sunos5-64-gcc \
+sunos5-smp \
+sunos5-v8 \
+sunos5-v8-static \
+sunos5-v9 \
+sunos5-v9-static \
+sunos5-v9-cc-g++ \
+ultrix-gcc:
+	@ if test -f configs/current -o -L configs/current; then \
+		if ! cmp configs/$@ configs/current > /dev/null; then \
+			echo "Please run 'make realclean' before changing configs" ; \
+			exit 1 ; \
+		fi ; \
+	else \
+		cd configs && rm -f current && ln -s $@ current ; \
+	fi
+	$(MAKE) default
+
+
+# Rules for making release tarballs
+
+VERSION=7.11-devel
+DIRECTORY = Mesa-$(VERSION)
+LIB_NAME = MesaLib-$(VERSION)
+GLUT_NAME = MesaGLUT-$(VERSION)
+
+# This is part of MAIN_FILES
+MAIN_ES_FILES = \
+	$(DIRECTORY)/src/mesa/main/*.xml				\
+	$(DIRECTORY)/src/mesa/main/*.py					\
+	$(DIRECTORY)/src/mesa/main/*.dtd
+
+MAIN_FILES = \
+	$(DIRECTORY)/Makefile*						\
+	$(DIRECTORY)/configure						\
+	$(DIRECTORY)/configure.ac					\
+	$(DIRECTORY)/acinclude.m4					\
+	$(DIRECTORY)/aclocal.m4						\
+	$(DIRECTORY)/SConstruct						\
+	$(DIRECTORY)/common.py						\
+	$(DIRECTORY)/scons/*py						\
+	$(DIRECTORY)/bin/config.guess					\
+	$(DIRECTORY)/bin/config.sub					\
+	$(DIRECTORY)/bin/extract_git_sha1				\
+	$(DIRECTORY)/bin/install-sh					\
+	$(DIRECTORY)/bin/mklib						\
+	$(DIRECTORY)/bin/minstall					\
+	$(DIRECTORY)/bin/version.mk					\
+	$(DIRECTORY)/configs/[a-z]*					\
+	$(DIRECTORY)/docs/*.html					\
+	$(DIRECTORY)/docs/COPYING					\
+	$(DIRECTORY)/docs/README.*					\
+	$(DIRECTORY)/docs/RELNOTES*					\
+	$(DIRECTORY)/docs/*.spec					\
+	$(DIRECTORY)/include/GL/gl.h					\
+	$(DIRECTORY)/include/GL/glext.h					\
+	$(DIRECTORY)/include/GL/gl_mangle.h				\
+	$(DIRECTORY)/include/GL/glu.h					\
+	$(DIRECTORY)/include/GL/glu_mangle.h				\
+	$(DIRECTORY)/include/GL/glx.h					\
+	$(DIRECTORY)/include/GL/glxext.h				\
+	$(DIRECTORY)/include/GL/glx_mangle.h				\
+	$(DIRECTORY)/include/GL/glfbdev.h				\
+	$(DIRECTORY)/include/GL/mesa_wgl.h				\
+	$(DIRECTORY)/include/GL/osmesa.h				\
+	$(DIRECTORY)/include/GL/vms_x_fix.h				\
+	$(DIRECTORY)/include/GL/wglext.h				\
+	$(DIRECTORY)/include/GL/wmesa.h					\
+	$(DIRECTORY)/src/getopt/SConscript				\
+	$(DIRECTORY)/src/getopt/getopt*.[ch]				\
+	$(DIRECTORY)/src/glsl/Makefile					\
+	$(DIRECTORY)/src/glsl/Makefile.template				\
+	$(DIRECTORY)/src/glsl/SConscript				\
+	$(DIRECTORY)/src/glsl/*.[ch]					\
+	$(DIRECTORY)/src/glsl/*.ll					\
+	$(DIRECTORY)/src/glsl/*.yy					\
+	$(DIRECTORY)/src/glsl/*.[cly]pp					\
+	$(DIRECTORY)/src/glsl/README					\
+	$(DIRECTORY)/src/glsl/glcpp/*.[chly]				\
+	$(DIRECTORY)/src/glsl/glcpp/README				\
+	$(DIRECTORY)/src/glsl/builtins					\
+	$(DIRECTORY)/src/Makefile					\
+	$(DIRECTORY)/src/SConscript					\
+	$(DIRECTORY)/src/mesa/Makefile*					\
+	$(DIRECTORY)/src/mesa/SConscript				\
+	$(DIRECTORY)/src/mesa/sources.mak				\
+	$(DIRECTORY)/src/mesa/descrip.mms				\
+	$(DIRECTORY)/src/mesa/gl.pc.in					\
+	$(DIRECTORY)/src/mesa/osmesa.pc.in				\
+	$(DIRECTORY)/src/mesa/depend					\
+	$(MAIN_ES_FILES)						\
+	$(DIRECTORY)/src/mesa/main/*.[chS]				\
+	$(DIRECTORY)/src/mesa/main/*.cpp				\
+	$(DIRECTORY)/src/mesa/main/descrip.mms				\
+	$(DIRECTORY)/src/mesa/math/*.[ch]				\
+	$(DIRECTORY)/src/mesa/math/descrip.mms				\
+	$(DIRECTORY)/src/mesa/program/*.[chly]				\
+	$(DIRECTORY)/src/mesa/program/*.cpp				\
+	$(DIRECTORY)/src/mesa/program/descrip.mms			\
+	$(DIRECTORY)/src/mesa/swrast/*.[ch]				\
+	$(DIRECTORY)/src/mesa/swrast/descrip.mms			\
+	$(DIRECTORY)/src/mesa/swrast_setup/*.[ch]			\
+	$(DIRECTORY)/src/mesa/swrast_setup/descrip.mms			\
+	$(DIRECTORY)/src/mesa/vbo/*.[chS]				\
+	$(DIRECTORY)/src/mesa/vbo/descrip.mms				\
+	$(DIRECTORY)/src/mesa/tnl/*.[chS]				\
+	$(DIRECTORY)/src/mesa/tnl/descrip.mms				\
+	$(DIRECTORY)/src/mesa/tnl_dd/*.[ch]				\
+	$(DIRECTORY)/src/mesa/tnl_dd/imm/*.[ch]				\
+	$(DIRECTORY)/src/mesa/tnl_dd/imm/NOTES.imm			\
+	$(DIRECTORY)/src/mesa/drivers/Makefile				\
+	$(DIRECTORY)/src/mesa/drivers/beos/*.cpp			\
+	$(DIRECTORY)/src/mesa/drivers/beos/Makefile			\
+	$(DIRECTORY)/src/mesa/drivers/common/*.[ch]			\
+	$(DIRECTORY)/src/mesa/drivers/common/descrip.mms		\
+	$(DIRECTORY)/src/mesa/drivers/fbdev/Makefile			\
+	$(DIRECTORY)/src/mesa/drivers/fbdev/glfbdev.c			\
+	$(DIRECTORY)/src/mesa/drivers/osmesa/Makefile			\
+	$(DIRECTORY)/src/mesa/drivers/osmesa/Makefile.win		\
+	$(DIRECTORY)/src/mesa/drivers/osmesa/descrip.mms		\
+	$(DIRECTORY)/src/mesa/drivers/osmesa/osmesa.def			\
+	$(DIRECTORY)/src/mesa/drivers/osmesa/*.[ch]			\
+	$(DIRECTORY)/src/mesa/drivers/dri/r300/compiler/*.[ch]		\
+	$(DIRECTORY)/src/mesa/drivers/dri/r300/compiler/Makefile	\
+	$(DIRECTORY)/src/mesa/drivers/dri/r300/compiler/SConscript	\
+	$(DIRECTORY)/src/mesa/drivers/windows/*/*.[ch]			\
+	$(DIRECTORY)/src/mesa/drivers/windows/*/*.def			\
+	$(DIRECTORY)/src/mesa/drivers/x11/Makefile			\
+	$(DIRECTORY)/src/mesa/drivers/x11/descrip.mms			\
+	$(DIRECTORY)/src/mesa/drivers/x11/*.[ch]			\
+	$(DIRECTORY)/src/mesa/ppc/*.[ch]				\
+	$(DIRECTORY)/src/mesa/sparc/*.[chS]				\
+	$(DIRECTORY)/src/mesa/x86/Makefile				\
+	$(DIRECTORY)/src/mesa/x86/*.[ch]				\
+	$(DIRECTORY)/src/mesa/x86/*.S					\
+	$(DIRECTORY)/src/mesa/x86/rtasm/*.[ch]				\
+	$(DIRECTORY)/src/mesa/x86-64/*.[chS]				\
+	$(DIRECTORY)/src/mesa/x86-64/Makefile
+
+MAPI_FILES = \
+	$(DIRECTORY)/include/GLES/*.h					\
+	$(DIRECTORY)/include/GLES2/*.h					\
+	$(DIRECTORY)/include/VG/*.h					\
+	$(DIRECTORY)/src/mapi/es?api/Makefile				\
+	$(DIRECTORY)/src/mapi/es?api/*.pc.in				\
+	$(DIRECTORY)/src/mapi/glapi/gen/Makefile			\
+	$(DIRECTORY)/src/mapi/glapi/gen/*.xml				\
+	$(DIRECTORY)/src/mapi/glapi/gen/*.py				\
+	$(DIRECTORY)/src/mapi/glapi/gen/*.dtd				\
+	$(DIRECTORY)/src/mapi/glapi/gen-es/Makefile			\
+	$(DIRECTORY)/src/mapi/glapi/gen-es/*.xml			\
+	$(DIRECTORY)/src/mapi/glapi/gen-es/*.py				\
+	$(DIRECTORY)/src/mapi/glapi/Makefile				\
+	$(DIRECTORY)/src/mapi/glapi/SConscript				\
+	$(DIRECTORY)/src/mapi/glapi/sources.mak				\
+	$(DIRECTORY)/src/mapi/glapi/*.[chS]				\
+	$(DIRECTORY)/src/mapi/mapi/mapi_abi.py				\
+	$(DIRECTORY)/src/mapi/mapi/sources.mak				\
+	$(DIRECTORY)/src/mapi/mapi/*.[ch]				\
+	$(DIRECTORY)/src/mapi/shared-glapi/SConscript			\
+	$(DIRECTORY)/src/mapi/shared-glapi/Makefile			\
+	$(DIRECTORY)/src/mapi/vgapi/Makefile				\
+	$(DIRECTORY)/src/mapi/vgapi/SConscript				\
+	$(DIRECTORY)/src/mapi/vgapi/vgapi.csv				\
+	$(DIRECTORY)/src/mapi/vgapi/vg.pc.in
+
+EGL_FILES = \
+	$(DIRECTORY)/include/KHR/*.h					\
+	$(DIRECTORY)/include/EGL/*.h					\
+	$(DIRECTORY)/src/egl/Makefile					\
+	$(DIRECTORY)/src/egl/*/Makefile					\
+	$(DIRECTORY)/src/egl/*/Makefile.template			\
+	$(DIRECTORY)/src/egl/*/*.[ch]					\
+	$(DIRECTORY)/src/egl/*/*/Makefile				\
+	$(DIRECTORY)/src/egl/*/*/*.[ch]					\
+	$(DIRECTORY)/src/egl/wayland/wayland-drm/protocol/*.xml		\
+	$(DIRECTORY)/src/egl/wayland/wayland-egl/*.pc.in		\
+	$(DIRECTORY)/src/egl/main/SConscript				\
+	$(DIRECTORY)/src/egl/main/*.pc.in				\
+	$(DIRECTORY)/src/egl/main/*.def
+
+GALLIUM_FILES = \
+	$(DIRECTORY)/src/mesa/state_tracker/*[ch]			\
+	$(DIRECTORY)/src/gallium/Makefile				\
+	$(DIRECTORY)/src/gallium/Makefile.template			\
+	$(DIRECTORY)/src/gallium/SConscript				\
+	$(DIRECTORY)/src/gallium/targets/Makefile.dri			\
+	$(DIRECTORY)/src/gallium/targets/Makefile.xorg			\
+	$(DIRECTORY)/src/gallium/targets/SConscript.dri			\
+	$(DIRECTORY)/src/gallium/*/Makefile				\
+	$(DIRECTORY)/src/gallium/*/SConscript				\
+	$(DIRECTORY)/src/gallium/*/*/Makefile				\
+	$(DIRECTORY)/src/gallium/*/*/SConscript				\
+	$(DIRECTORY)/src/gallium/*/*/*.[ch]				\
+	$(DIRECTORY)/src/gallium/auxiliary/gallivm/*.cpp		\
+	$(DIRECTORY)/src/gallium/*/*/*.py				\
+	$(DIRECTORY)/src/gallium/*/*/*.csv				\
+	$(DIRECTORY)/src/gallium/*/*/*/Makefile				\
+	$(DIRECTORY)/src/gallium/*/*/*/SConscript			\
+	$(DIRECTORY)/src/gallium/*/*/*/*.[ch]				\
+	$(DIRECTORY)/src/gallium/*/*/*/*.py
+
+
+DRI_FILES = \
+	$(DIRECTORY)/include/GL/internal/dri_interface.h		\
+	$(DIRECTORY)/include/GL/internal/sarea.h			\
+	$(DIRECTORY)/src/glx/Makefile					\
+	$(DIRECTORY)/src/glx/*.[ch]					\
+	$(DIRECTORY)/src/mesa/drivers/dri/Makefile			\
+	$(DIRECTORY)/src/mesa/drivers/dri/Makefile.template		\
+	$(DIRECTORY)/src/mesa/drivers/dri/dri.pc.in			\
+	$(DIRECTORY)/src/mesa/drivers/dri/common/xmlpool/*.po		\
+	$(DIRECTORY)/src/mesa/drivers/dri/*/*.[chS]			\
+	$(DIRECTORY)/src/mesa/drivers/dri/*/*.cpp			\
+	$(DIRECTORY)/src/mesa/drivers/dri/*/*/*.[chS]			\
+	$(DIRECTORY)/src/mesa/drivers/dri/*/Makefile			\
+	$(DIRECTORY)/src/mesa/drivers/dri/*/*/Makefile			\
+	$(DIRECTORY)/src/mesa/drivers/dri/*/Doxyfile
+
+SGI_GLU_FILES = \
+	$(DIRECTORY)/src/glu/Makefile					\
+	$(DIRECTORY)/src/glu/glu.pc.in					\
+	$(DIRECTORY)/src/glu/sgi/Makefile				\
+	$(DIRECTORY)/src/glu/sgi/Makefile.mgw				\
+	$(DIRECTORY)/src/glu/sgi/Makefile.win				\
+	$(DIRECTORY)/src/glu/sgi/glu.def				\
+	$(DIRECTORY)/src/glu/sgi/dummy.cc				\
+	$(DIRECTORY)/src/glu/sgi/glu.exports				\
+	$(DIRECTORY)/src/glu/sgi/glu.exports.darwin			\
+	$(DIRECTORY)/src/glu/sgi/mesaglu.opt				\
+	$(DIRECTORY)/src/glu/sgi/include/gluos.h			\
+	$(DIRECTORY)/src/glu/sgi/libnurbs/interface/*.h			\
+	$(DIRECTORY)/src/glu/sgi/libnurbs/interface/*.cc		\
+	$(DIRECTORY)/src/glu/sgi/libnurbs/internals/*.h			\
+	$(DIRECTORY)/src/glu/sgi/libnurbs/internals/*.cc		\
+	$(DIRECTORY)/src/glu/sgi/libnurbs/nurbtess/*.h			\
+	$(DIRECTORY)/src/glu/sgi/libnurbs/nurbtess/*.cc			\
+	$(DIRECTORY)/src/glu/sgi/libtess/README				\
+	$(DIRECTORY)/src/glu/sgi/libtess/alg-outline			\
+	$(DIRECTORY)/src/glu/sgi/libtess/*.[ch]				\
+	$(DIRECTORY)/src/glu/sgi/libutil/*.[ch]
+
+GLW_FILES = \
+	$(DIRECTORY)/src/glw/*.[ch]			\
+	$(DIRECTORY)/src/glw/Makefile*			\
+	$(DIRECTORY)/src/glw/README			\
+	$(DIRECTORY)/src/glw/glw.pc.in			\
+	$(DIRECTORY)/src/glw/depend
+
+GLUT_FILES = \
+	$(DIRECTORY)/include/GL/glut.h			\
+	$(DIRECTORY)/include/GL/glutf90.h		\
+	$(DIRECTORY)/src/glut/glx/Makefile*		\
+	$(DIRECTORY)/src/glut/glx/SConscript		\
+	$(DIRECTORY)/src/glut/glx/depend		\
+	$(DIRECTORY)/src/glut/glx/glut.pc.in		\
+	$(DIRECTORY)/src/glut/glx/*def			\
+	$(DIRECTORY)/src/glut/glx/*.[ch]		\
+	$(DIRECTORY)/src/glut/beos/*.[ch]		\
+	$(DIRECTORY)/src/glut/beos/*.cpp		\
+	$(DIRECTORY)/src/glut/beos/Makefile
+
+DEPEND_FILES = \
+	$(TOP)/src/mesa/depend		\
+	$(TOP)/src/glx/depend		\
+	$(TOP)/src/glw/depend		\
+	$(TOP)/src/glut/glx/depend	\
+	$(TOP)/src/glu/sgi/depend
+
+
+LIB_FILES = \
+	$(MAIN_FILES)		\
+	$(MAPI_FILES)		\
+	$(ES_FILES)		\
+	$(EGL_FILES)		\
+	$(GALLIUM_FILES)	\
+	$(DRI_FILES)		\
+	$(SGI_GLU_FILES)	\
+	$(GLW_FILES)
+
+
+parsers: configure
+	-@touch $(TOP)/configs/current
+	$(MAKE) -C src/glsl glsl_parser.cpp glsl_parser.h glsl_lexer.cpp
+	$(MAKE) -C src/glsl/glcpp glcpp-lex.c glcpp-parse.c glcpp-parse.h
+	$(MAKE) -C src/mesa/program lex.yy.c program_parse.tab.c program_parse.tab.h
+
+# Everything for new a Mesa release:
+ARCHIVES = $(LIB_NAME).tar.gz \
+	$(LIB_NAME).tar.bz2 \
+	$(LIB_NAME).zip \
+	$(GLUT_NAME).tar.gz \
+	$(GLUT_NAME).tar.bz2 \
+	$(GLUT_NAME).zip
+
+tarballs: md5
+	rm -f ../$(LIB_NAME).tar
+
+# Helper for autoconf builds
+ACLOCAL = aclocal
+ACLOCAL_FLAGS =
+AUTOCONF = autoconf
+AC_FLAGS =
+aclocal.m4: configure.ac acinclude.m4
+	$(ACLOCAL) $(ACLOCAL_FLAGS)
+configure: rm_depend configure.ac aclocal.m4 acinclude.m4
+	$(AUTOCONF) $(AC_FLAGS)
+
+rm_depend:
+	@for dep in $(DEPEND_FILES) ; do \
+		rm -f $$dep ; \
+		touch $$dep ; \
+	done
+
+rm_config: parsers
+	rm -f configs/current
+	rm -f configs/autoconf
+
+$(LIB_NAME).tar: rm_config
+	cd .. ; tar -cf $(DIRECTORY)/$(LIB_NAME).tar $(LIB_FILES)
+
+$(LIB_NAME).tar.gz: $(LIB_NAME).tar
+	gzip --stdout --best $(LIB_NAME).tar > $(LIB_NAME).tar.gz
+
+$(GLUT_NAME).tar: rm_depend
+	cd .. ; tar -cf $(DIRECTORY)/$(GLUT_NAME).tar $(GLUT_FILES)
+
+$(GLUT_NAME).tar.gz: $(GLUT_NAME).tar
+	gzip --stdout --best $(GLUT_NAME).tar > $(GLUT_NAME).tar.gz
+
+$(LIB_NAME).tar.bz2: $(LIB_NAME).tar
+	bzip2 --stdout --best $(LIB_NAME).tar > $(LIB_NAME).tar.bz2
+
+$(GLUT_NAME).tar.bz2: $(GLUT_NAME).tar
+	bzip2 --stdout --best $(GLUT_NAME).tar > $(GLUT_NAME).tar.bz2
+
+$(LIB_NAME).zip: rm_config
+	rm -f $(LIB_NAME).zip ; \
+	cd .. ; \
+	zip -qr $(LIB_NAME).zip $(LIB_FILES) ; \
+	mv $(LIB_NAME).zip $(DIRECTORY)
+
+$(GLUT_NAME).zip:
+	rm -f $(GLUT_NAME).zip ; \
+	cd .. ; \
+	zip -qr $(GLUT_NAME).zip $(GLUT_FILES) ; \
+	mv $(GLUT_NAME).zip $(DIRECTORY)
+
+md5: $(ARCHIVES)
+	@-md5sum $(LIB_NAME).tar.gz
+	@-md5sum $(LIB_NAME).tar.bz2
+	@-md5sum $(LIB_NAME).zip
+	@-md5sum $(GLUT_NAME).tar.gz
+	@-md5sum $(GLUT_NAME).tar.bz2
+	@-md5sum $(GLUT_NAME).zip
+
+.PHONY: tarballs rm_depend rm_config md5
diff --git a/mesalib/configure.ac b/mesalib/configure.ac
index a201c31ae..510d23f41 100644
--- a/mesalib/configure.ac
+++ b/mesalib/configure.ac
@@ -1,1977 +1,1977 @@
-dnl Process this file with autoconf to create configure.

-

-AC_PREREQ([2.59])

-

-dnl Versioning - scrape the version from configs/default

-m4_define([mesa_version],

-    [m4_esyscmd([${MAKE-make} -s -f bin/version.mk version | tr -d '\n' | tr -d '\r'])])

-m4_ifval(mesa_version,,

-    [m4_fatal([Failed to get the Mesa version from `make -f bin/version.mk version`])])

-

-dnl Tell the user about autoconf.html in the --help output

-m4_divert_once([HELP_END], [

-See docs/autoconf.html for more details on the options for Mesa.])

-

-AC_INIT([Mesa],[mesa_version],

-    [https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa])

-AC_CONFIG_AUX_DIR([bin])

-AC_CANONICAL_HOST

-

-dnl Versions for external dependencies

-LIBDRM_REQUIRED=2.4.24

-LIBDRM_RADEON_REQUIRED=2.4.24

-LIBDRM_INTEL_REQUIRED=2.4.24

-DRI2PROTO_REQUIRED=2.1

-GLPROTO_REQUIRED=1.4.11

-LIBDRM_XORG_REQUIRED=2.4.24

-LIBKMS_XORG_REQUIRED=1.0.0

-

-dnl Check for progs

-AC_PROG_CPP

-AC_PROG_CC

-AC_PROG_CXX

-AC_CHECK_PROGS([MAKE], [gmake make])

-AC_CHECK_PROGS([PYTHON2], [python2 python])

-AC_PATH_PROG([MKDEP], [makedepend])

-AC_PATH_PROG([SED], [sed])

-

-if test "x$MKDEP" = "x"; then

-    AC_MSG_ERROR([makedepend is required to build Mesa])

-fi

-

-AC_PATH_PROG([FLEX], [flex])

-test "x$FLEX" = "x" && AC_MSG_ERROR([flex is needed to build Mesa])

-

-AC_PATH_PROG([BISON], [bison])

-test "x$BISON" = "x" && AC_MSG_ERROR([bison is needed to build Mesa])

-

-dnl Our fallback install-sh is a symlink to minstall. Use the existing

-dnl configuration in that case.

-AC_PROG_INSTALL

-test "x$INSTALL" = "x$ac_install_sh" && INSTALL='$(MINSTALL)'

-

-dnl We need a POSIX shell for parts of the build. Assume we have one

-dnl in most cases.

-case "$host_os" in

-solaris*)

-    # Solaris /bin/sh is too old/non-POSIX compliant

-    AC_PATH_PROGS(POSIX_SHELL, [ksh93 ksh sh])

-    SHELL="$POSIX_SHELL"

-    ;;

-esac

-

-dnl clang is mostly GCC-compatible, but its version is much lower,

-dnl so we have to check for it.

-AC_MSG_CHECKING([if compiling with clang])

-

-AC_COMPILE_IFELSE(

-[AC_LANG_PROGRAM([], [[

-#ifndef __clang__

-       not clang

-#endif

-]])],

-[CLANG=yes], [CLANG=no])

-

-AC_MSG_RESULT([$CLANG])

-

-dnl If we're using GCC, make sure that it is at least version 3.3.0.  Older

-dnl versions are explictly not supported.

-if test "x$GCC" = xyes -a "x$CLANG" = xno; then

-    AC_MSG_CHECKING([whether gcc version is sufficient])

-    major=0

-    minor=0

-

-    GCC_VERSION=`$CC -dumpversion`

-    if test $? -eq 0; then

-        major=`echo $GCC_VERSION | cut -d. -f1`

-        minor=`echo $GCC_VERSION | cut -d. -f1`

-    fi

-

-    if test $major -lt 3 -o $major -eq 3 -a $minor -lt 3 ; then

-        AC_MSG_RESULT([no])

-        AC_MSG_ERROR([If using GCC, version 3.3.0 or later is required.])

-    else

-        AC_MSG_RESULT([yes])

-    fi

-fi

-

-

-MKDEP_OPTIONS=-fdepend

-dnl Ask gcc where it's keeping its secret headers

-if test "x$GCC" = xyes; then

-    for dir in include include-fixed; do

-        GCC_INCLUDES=`$CC -print-file-name=$dir`

-        if test "x$GCC_INCLUDES" != x && \

-           test "$GCC_INCLUDES" != "$dir" && \

-           test -d "$GCC_INCLUDES"; then

-            MKDEP_OPTIONS="$MKDEP_OPTIONS -I$GCC_INCLUDES"

-        fi

-    done

-fi

-AC_SUBST([MKDEP_OPTIONS])

-

-dnl Make sure the pkg-config macros are defined

-m4_ifndef([PKG_PROG_PKG_CONFIG],

-    [m4_fatal([Could not locate the pkg-config autoconf macros.

-  These are usually located in /usr/share/aclocal/pkg.m4. If your macros

-  are in a different location, try setting the environment variable

-  ACLOCAL="aclocal -I/other/macro/dir" before running autoreconf.])])

-PKG_PROG_PKG_CONFIG()

-

-dnl LIB_DIR - library basename

-LIB_DIR=`echo $libdir | $SED 's%.*/%%'`

-AC_SUBST([LIB_DIR])

-

-dnl Cache LDFLAGS so we can add EXTRA_LIB_PATH and restore it later

-_SAVE_LDFLAGS="$LDFLAGS"

-AC_ARG_VAR([EXTRA_LIB_PATH],[Extra -L paths for the linker])

-AC_SUBST([EXTRA_LIB_PATH])

-

-dnl Cache CPPFLAGS so we can add *_INCLUDES and restore it later

-_SAVE_CPPFLAGS="$CPPFLAGS"

-AC_ARG_VAR([X11_INCLUDES],[Extra -I paths for X11 headers])

-AC_SUBST([X11_INCLUDES])

-

-dnl Compiler macros

-DEFINES=""

-AC_SUBST([DEFINES])

-case "$host_os" in

-linux*|*-gnu*|gnu*)

-    DEFINES="$DEFINES -D_GNU_SOURCE -DPTHREADS"

-    ;;

-solaris*)

-    DEFINES="$DEFINES -DPTHREADS -DSVR4"

-    ;;

-cygwin*)

-    DEFINES="$DEFINES -DPTHREADS"

-    ;;

-esac

-

-dnl Add flags for gcc and g++

-if test "x$GCC" = xyes; then

-    CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -std=c99"

-    if test "x$CLANG" = "xno"; then

-       CFLAGS="$CFLAGS -ffast-math"

-    fi

-

-    # Enable -fvisibility=hidden if using a gcc that supports it

-    save_CFLAGS="$CFLAGS"

-    AC_MSG_CHECKING([whether $CC supports -fvisibility=hidden])

-    VISIBILITY_CFLAGS="-fvisibility=hidden"

-    CFLAGS="$CFLAGS $VISIBILITY_CFLAGS"

-    AC_LINK_IFELSE([AC_LANG_PROGRAM()], AC_MSG_RESULT([yes]),

-		   [VISIBILITY_CFLAGS=""; AC_MSG_RESULT([no])]);

-

-    # Restore CFLAGS; VISIBILITY_CFLAGS are added to it where needed.

-    CFLAGS=$save_CFLAGS

-

-    # Work around aliasing bugs - developers should comment this out

-    CFLAGS="$CFLAGS -fno-strict-aliasing"

-fi

-if test "x$GXX" = xyes; then

-    CXXFLAGS="$CXXFLAGS -Wall"

-

-    # Enable -fvisibility=hidden if using a gcc that supports it

-    save_CXXFLAGS="$CXXFLAGS"

-    AC_MSG_CHECKING([whether $CXX supports -fvisibility=hidden])

-    VISIBILITY_CXXFLAGS="-fvisibility=hidden"

-    CXXFLAGS="$CXXFLAGS $VISIBILITY_CXXFLAGS"

-    AC_LINK_IFELSE([AC_LANG_PROGRAM()], AC_MSG_RESULT([yes]),

-		   [VISIBILITY_CXXFLAGS="" ; AC_MSG_RESULT([no])]);

-

-    # Restore CXXFLAGS; VISIBILITY_CXXFLAGS are added to it where needed.

-    CXXFLAGS=$save_CXXFLAGS

-

-    # Work around aliasing bugs - developers should comment this out

-    CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"

-fi

-

-AC_SUBST([VISIBILITY_CFLAGS])

-AC_SUBST([VISIBILITY_CXXFLAGS])

-

-dnl These should be unnecessary, but let the user set them if they want

-AC_ARG_VAR([OPT_FLAGS], [Additional optimization flags for the compiler.

-    Default is to use CFLAGS.])

-AC_ARG_VAR([ARCH_FLAGS], [Additional architecture specific flags for the

-    compiler. Default is to use CFLAGS.])

-AC_SUBST([OPT_FLAGS])

-AC_SUBST([ARCH_FLAGS])

-

-dnl

-dnl Hacks to enable 32 or 64 bit build

-dnl

-AC_ARG_ENABLE([32-bit],

-    [AS_HELP_STRING([--enable-32-bit],

-        [build 32-bit libraries @<:@default=auto@:>@])],

-    [enable_32bit="$enableval"],

-    [enable_32bit=auto]

-)

-if test "x$enable_32bit" = xyes; then

-    if test "x$GCC" = xyes; then

-        CFLAGS="$CFLAGS -m32"

-        ARCH_FLAGS="$ARCH_FLAGS -m32"

-    fi

-    if test "x$GXX" = xyes; then

-        CXXFLAGS="$CXXFLAGS -m32"

-    fi

-fi

-AC_ARG_ENABLE([64-bit],

-    [AS_HELP_STRING([--enable-64-bit],

-        [build 64-bit libraries @<:@default=auto@:>@])],

-    [enable_64bit="$enableval"],

-    [enable_64bit=auto]

-)

-if test "x$enable_64bit" = xyes; then

-    if test "x$GCC" = xyes; then

-        CFLAGS="$CFLAGS -m64"

-    fi

-    if test "x$GXX" = xyes; then

-        CXXFLAGS="$CXXFLAGS -m64"

-    fi

-fi

-

-dnl

-dnl shared/static libraries, mimic libtool options

-dnl

-AC_ARG_ENABLE([static],

-    [AS_HELP_STRING([--enable-static],

-        [build static libraries @<:@default=disabled@:>@])],

-    [enable_static="$enableval"],

-    [enable_static=no]

-)

-case "x$enable_static" in

-xyes|xno ) ;;

-x ) enable_static=no ;;

-* )

-    AC_MSG_ERROR([Static library option '$enable_static' is not a valid])

-    ;;

-esac

-AC_ARG_ENABLE([shared],

-    [AS_HELP_STRING([--disable-shared],

-        [build shared libraries @<:@default=enabled@:>@])],

-    [enable_shared="$enableval"],

-    [enable_shared=yes]

-)

-case "x$enable_shared" in

-xyes|xno ) ;;

-x ) enable_shared=yes ;;

-* )

-    AC_MSG_ERROR([Shared library option '$enable_shared' is not a valid])

-    ;;

-esac

-

-dnl Can't have static and shared libraries, default to static if user

-dnl explicitly requested. If both disabled, set to static since shared

-dnl was explicitly requirested.

-case "x$enable_static$enable_shared" in

-xyesyes )

-    AC_MSG_WARN([Can't build static and shared libraries, disabling shared])

-    enable_shared=no

-    ;;

-xnono )

-    AC_MSG_WARN([Can't disable both static and shared libraries, enabling static])

-    enable_static=yes

-    ;;

-esac

-

-dnl

-dnl mklib options

-dnl

-AC_ARG_VAR([MKLIB_OPTIONS],[Options for the Mesa library script, mklib])

-if test "$enable_static" = yes; then

-    MKLIB_OPTIONS="$MKLIB_OPTIONS -static"

-fi

-AC_SUBST([MKLIB_OPTIONS])

-

-dnl

-dnl other compiler options

-dnl

-AC_ARG_ENABLE([debug],

-    [AS_HELP_STRING([--enable-debug],

-        [use debug compiler flags and macros @<:@default=disabled@:>@])],

-    [enable_debug="$enableval"],

-    [enable_debug=no]

-)

-if test "x$enable_debug" = xyes; then

-    DEFINES="$DEFINES -DDEBUG"

-    if test "x$GCC" = xyes; then

-        CFLAGS="$CFLAGS -g"

-    fi

-    if test "x$GXX" = xyes; then

-        CXXFLAGS="$CXXFLAGS -g"

-    fi

-fi

-

-dnl

-dnl library names

-dnl

-LIB_PREFIX_GLOB='lib'

-LIB_VERSION_SEPARATOR='.'

-if test "$enable_static" = yes; then

-    LIB_EXTENSION='a'

-else

-    case "$host_os" in

-    darwin* )

-        LIB_EXTENSION='dylib' ;;

-    cygwin* )

-        dnl prefix can be 'cyg' or 'lib'

-        LIB_PREFIX_GLOB='???'

-        LIB_VERSION_SEPARATOR='-'

-        LIB_EXTENSION='dll' ;;

-    aix* )

-        LIB_EXTENSION='a' ;;

-    * )

-        LIB_EXTENSION='so' ;;

-    esac

-fi

-

-dnl

-dnl potentially-infringing-but-nobody-knows-for-sure stuff

-dnl

-AC_ARG_ENABLE([texture-float],

-    [AS_HELP_STRING([--enable-texture-float],

-        [enable floating-point textures and renderbuffers @<:@default=disabled@:>@])],

-    [enable_texture_float="$enableval"],

-    [enable_texture_float=no]

-)

-if test "x$enable_texture_float" = xyes; then

-    AC_MSG_WARN([Floating-point textures enabled.])

-    AC_MSG_WARN([Please consult docs/patents.txt with your lawyer before building Mesa.])

-    DEFINES="$DEFINES -DTEXTURE_FLOAT_ENABLED"

-fi

-

-GL_LIB_NAME='lib$(GL_LIB).'${LIB_EXTENSION}

-GLU_LIB_NAME='lib$(GLU_LIB).'${LIB_EXTENSION}

-GLUT_LIB_NAME='lib$(GLUT_LIB).'${LIB_EXTENSION}

-GLW_LIB_NAME='lib$(GLW_LIB).'${LIB_EXTENSION}

-OSMESA_LIB_NAME='lib$(OSMESA_LIB).'${LIB_EXTENSION}

-EGL_LIB_NAME='lib$(EGL_LIB).'${LIB_EXTENSION}

-GLESv1_CM_LIB_NAME='lib$(GLESv1_CM_LIB).'${LIB_EXTENSION}

-GLESv2_LIB_NAME='lib$(GLESv2_LIB).'${LIB_EXTENSION}

-VG_LIB_NAME='lib$(VG_LIB).'${LIB_EXTENSION}

-GLAPI_LIB_NAME='lib$(GLAPI_LIB).'${LIB_EXTENSION}

-WAYLAND_EGL_LIB_NAME='lib$(WAYLAND_EGL_LIB).'${LIB_EXTENSION}

-

-GL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'

-GLU_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLU_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'

-GLUT_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLUT_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'

-GLW_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLW_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'

-OSMESA_LIB_GLOB=${LIB_PREFIX_GLOB}'$(OSMESA_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'

-EGL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(EGL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'

-EGL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(EGL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'

-GLESv1_CM_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLESv1_CM_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'

-GLESv2_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLESv2_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'

-VG_LIB_GLOB=${LIB_PREFIX_GLOB}'$(VG_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'

-GLAPI_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLAPI_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'

-WAYLAND_EGL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(WAYLAND_EGL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'

-

-AC_SUBST([GL_LIB_NAME])

-AC_SUBST([GLU_LIB_NAME])

-AC_SUBST([GLUT_LIB_NAME])

-AC_SUBST([GLW_LIB_NAME])

-AC_SUBST([OSMESA_LIB_NAME])

-AC_SUBST([EGL_LIB_NAME])

-AC_SUBST([GLESv1_CM_LIB_NAME])

-AC_SUBST([GLESv2_LIB_NAME])

-AC_SUBST([VG_LIB_NAME])

-AC_SUBST([GLAPI_LIB_NAME])

-AC_SUBST([WAYLAND_EGL_LIB_NAME])

-

-AC_SUBST([GL_LIB_GLOB])

-AC_SUBST([GLU_LIB_GLOB])

-AC_SUBST([GLUT_LIB_GLOB])

-AC_SUBST([GLW_LIB_GLOB])

-AC_SUBST([OSMESA_LIB_GLOB])

-AC_SUBST([EGL_LIB_GLOB])

-AC_SUBST([GLESv1_CM_LIB_GLOB])

-AC_SUBST([GLESv2_LIB_GLOB])

-AC_SUBST([VG_LIB_GLOB])

-AC_SUBST([GLAPI_LIB_GLOB])

-AC_SUBST([WAYLAND_EGL_LIB_GLOB])

-

-dnl

-dnl Arch/platform-specific settings

-dnl

-AC_ARG_ENABLE([asm],

-    [AS_HELP_STRING([--disable-asm],

-        [disable assembly usage @<:@default=enabled on supported plaforms@:>@])],

-    [enable_asm="$enableval"],

-    [enable_asm=yes]

-)

-asm_arch=""

-ASM_FLAGS=""

-MESA_ASM_SOURCES=""

-GLAPI_ASM_SOURCES=""

-AC_MSG_CHECKING([whether to enable assembly])

-test "x$enable_asm" = xno && AC_MSG_RESULT([no])

-# disable if cross compiling on x86/x86_64 since we must run gen_matypes

-if test "x$enable_asm" = xyes && test "x$cross_compiling" = xyes; then

-    case "$host_cpu" in

-    i?86 | x86_64)

-        enable_asm=no

-        AC_MSG_RESULT([no, cross compiling])

-        ;;

-    esac

-fi

-# check for supported arches

-if test "x$enable_asm" = xyes; then

-    case "$host_cpu" in

-    i?86)

-        case "$host_os" in

-        linux* | *freebsd* | dragonfly* | *netbsd*)

-            test "x$enable_64bit" = xyes && asm_arch=x86_64 || asm_arch=x86

-            ;;

-        esac

-        ;;

-    x86_64)

-        case "$host_os" in

-        linux* | *freebsd* | dragonfly* | *netbsd*)

-            test "x$enable_32bit" = xyes && asm_arch=x86 || asm_arch=x86_64

-            ;;

-        esac

-        ;;

-    powerpc)

-        case "$host_os" in

-        linux*)

-            asm_arch=ppc

-            ;;

-        esac

-        ;;

-    sparc*)

-        case "$host_os" in

-        linux*)

-            asm_arch=sparc

-            ;;

-        esac

-        ;;

-    esac

-

-    case "$asm_arch" in

-    x86)

-        ASM_FLAGS="-DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM"

-        MESA_ASM_SOURCES='$(X86_SOURCES)'

-        GLAPI_ASM_SOURCES='$(X86_API)'

-        AC_MSG_RESULT([yes, x86])

-        ;;

-    x86_64)

-        ASM_FLAGS="-DUSE_X86_64_ASM"

-        MESA_ASM_SOURCES='$(X86-64_SOURCES)'

-        GLAPI_ASM_SOURCES='$(X86-64_API)'

-        AC_MSG_RESULT([yes, x86_64])

-        ;;

-    ppc)

-        ASM_FLAGS="-DUSE_PPC_ASM -DUSE_VMX_ASM"

-        MESA_ASM_SOURCES='$(PPC_SOURCES)'

-        AC_MSG_RESULT([yes, ppc])

-        ;;

-    sparc)

-        ASM_FLAGS="-DUSE_SPARC_ASM"

-        MESA_ASM_SOURCES='$(SPARC_SOURCES)'

-        GLAPI_ASM_SOURCES='$(SPARC_API)'

-        AC_MSG_RESULT([yes, sparc])

-        ;;

-    *)

-        AC_MSG_RESULT([no, platform not supported])

-        ;;

-    esac

-fi

-AC_SUBST([ASM_FLAGS])

-AC_SUBST([MESA_ASM_SOURCES])

-AC_SUBST([GLAPI_ASM_SOURCES])

-

-dnl PIC code macro

-MESA_PIC_FLAGS

-

-dnl Check to see if dlopen is in default libraries (like Solaris, which

-dnl has it in libc), or if libdl is needed to get it.

-AC_CHECK_FUNC([dlopen], [],

-    [AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"])])

-AC_SUBST([DLOPEN_LIBS])

-

-dnl See if posix_memalign is available

-AC_CHECK_FUNC([posix_memalign], [DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"])

-

-dnl SELinux awareness.

-AC_ARG_ENABLE([selinux],

-    [AS_HELP_STRING([--enable-selinux],

-        [Build SELinux-aware Mesa @<:@default=disabled@:>@])],

-    [MESA_SELINUX="$enableval"],

-    [MESA_SELINUX=no])

-if test "x$enable_selinux" = "xyes"; then

-    AC_CHECK_HEADER([selinux/selinux.h],[],

-                    [AC_MSG_ERROR([SELinux headers not found])])

-    AC_CHECK_LIB([selinux],[is_selinux_enabled],[],

-                 [AC_MSG_ERROR([SELinux library not found])])

-    SELINUX_LIBS="-lselinux"

-    DEFINES="$DEFINES -DMESA_SELINUX"

-fi

-

-dnl Determine which APIs to support

-AC_ARG_ENABLE([opengl],

-    [AS_HELP_STRING([--disable-opengl],

-        [disable support for standard OpenGL API @<:@default=no@:>@])],

-    [enable_opengl="$enableval"],

-    [enable_opengl=yes])

-AC_ARG_ENABLE([gles1],

-    [AS_HELP_STRING([--enable-gles1],

-        [enable support for OpenGL ES 1.x API @<:@default=no@:>@])],

-    [enable_gles1="$enableval"],

-    [enable_gles1=no])

-AC_ARG_ENABLE([gles2],

-    [AS_HELP_STRING([--enable-gles2],

-        [enable support for OpenGL ES 2.x API @<:@default=no@:>@])],

-    [enable_gles2="$enableval"],

-    [enable_gles2=no])

-AC_ARG_ENABLE([gles-overlay],

-    [AS_HELP_STRING([--enable-gles-overlay],

-        [DEPRECATED.  Same as --enable-gles1 and --enable-gles2])],

-    [enable_gles1="$enableval"; enable_gles2="$enableval"],

-    [])

-

-AC_ARG_ENABLE([openvg],

-    [AS_HELP_STRING([--enable-openvg],

-        [enable support for OpenVG API @<:@default=no@:>@])],

-    [enable_openvg="$enableval"],

-    [enable_openvg=no])

-

-dnl smooth the transition; should be removed eventually

-if test "x$enable_openvg" = xno; then

-    case "x$with_state_trackers" in

-    x*vega*)

-        AC_MSG_WARN([vega state tracker is enabled without --enable-openvg])

-        enable_openvg=yes

-        ;;

-    esac

-fi

-

-if test "x$enable_opengl" = xno -a \

-        "x$enable_gles1" = xno -a \

-        "x$enable_gles2" = xno -a \

-        "x$enable_openvg" = xno; then

-    AC_MSG_ERROR([at least one API should be enabled])

-fi

-

-API_DEFINES=""

-if test "x$enable_opengl" = xno; then

-    API_DEFINES="$API_DEFINES -DFEATURE_GL=0"

-else

-    API_DEFINES="$API_DEFINES -DFEATURE_GL=1"

-fi

-if test "x$enable_gles1" = xyes; then

-    API_DEFINES="$API_DEFINES -DFEATURE_ES1=1"

-fi

-if test "x$enable_gles2" = xyes; then

-    API_DEFINES="$API_DEFINES -DFEATURE_ES2=1"

-fi

-AC_SUBST([API_DEFINES])

-

-AC_ARG_ENABLE([shared-glapi],

-    [AS_HELP_STRING([--enable-shared-glapi],

-        [EXPERIMENTAL.  Enable shared glapi for OpenGL @<:@default=no@:>@])],

-    [enable_shared_glapi="$enableval"],

-    [enable_shared_glapi=no])

-

-SHARED_GLAPI="0"

-if test "x$enable_shared_glapi" = xyes; then

-    SHARED_GLAPI="1"

-fi

-AC_SUBST([SHARED_GLAPI])

-

-dnl

-dnl Driver configuration. Options are xlib, dri and osmesa right now.

-dnl More later: fbdev, ...

-dnl

-default_driver="xlib"

-

-case "$host_os" in

-linux*)

-    case "$host_cpu" in

-    i*86|x86_64|powerpc*|sparc*) default_driver="dri";;

-    esac

-    ;;

-*freebsd* | dragonfly* | *netbsd*)

-    case "$host_cpu" in

-    i*86|x86_64|powerpc*|sparc*) default_driver="dri";;

-    esac

-    ;;

-esac

-

-if test "x$enable_opengl" = xno; then

-    default_driver="no"

-fi

-

-AC_ARG_WITH([driver],

-    [AS_HELP_STRING([--with-driver=DRIVER],

-        [driver for Mesa: xlib,dri,osmesa @<:@default=dri when available, or xlib@:>@])],

-    [mesa_driver="$withval"],

-    [mesa_driver="$default_driver"])

-dnl Check for valid option

-case "x$mesa_driver" in

-xxlib|xdri|xosmesa)

-    if test "x$enable_opengl" = xno; then

-        AC_MSG_ERROR([Driver '$mesa_driver' requires OpenGL enabled])

-    fi

-    ;;

-xno)

-    ;;

-*)

-    AC_MSG_ERROR([Driver '$mesa_driver' is not a valid option])

-    ;;

-esac

-

-dnl

-dnl Driver specific build directories

-dnl

-

-dnl this variable will be prepended to SRC_DIRS and is not exported

-CORE_DIRS=""

-

-SRC_DIRS=""

-GLU_DIRS="sgi"

-GALLIUM_DIRS="auxiliary drivers state_trackers"

-GALLIUM_TARGET_DIRS=""

-GALLIUM_WINSYS_DIRS="sw"

-GALLIUM_DRIVERS_DIRS="softpipe failover galahad trace rbug noop identity"

-GALLIUM_STATE_TRACKERS_DIRS=""

-

-# build shared-glapi if enabled for OpenGL or if OpenGL ES is enabled

-case "x$enable_shared_glapi$enable_gles1$enable_gles2" in

-x*yes*)

-    CORE_DIRS="$CORE_DIRS mapi/shared-glapi"

-    ;;

-esac

-

-# build glapi if OpenGL is enabled

-if test "x$enable_opengl" = xyes; then

-    CORE_DIRS="$CORE_DIRS mapi/glapi"

-fi

-

-# build es1api if OpenGL ES 1.x is enabled

-if test "x$enable_gles1" = xyes; then

-    CORE_DIRS="$CORE_DIRS mapi/es1api"

-fi

-

-# build es2api if OpenGL ES 2.x is enabled

-if test "x$enable_gles2" = xyes; then

-    CORE_DIRS="$CORE_DIRS mapi/es2api"

-fi

-

-# build vgapi if OpenVG is enabled

-if test "x$enable_openvg" = xyes; then

-    CORE_DIRS="$CORE_DIRS mapi/vgapi"

-fi

-

-# build glsl and mesa if OpenGL or OpenGL ES is enabled

-case "x$enable_opengl$enable_gles1$enable_gles2" in

-x*yes*)

-    CORE_DIRS="$CORE_DIRS glsl mesa"

-    ;;

-esac

-

-case "$mesa_driver" in

-xlib)

-    DRIVER_DIRS="x11"

-    GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/xlib"

-    GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS libgl-xlib"

-    ;;

-dri)

-    SRC_DIRS="$SRC_DIRS glx"

-    DRIVER_DIRS="dri"

-    GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/xlib sw/dri"

-    ;;

-osmesa)

-    DRIVER_DIRS="osmesa"

-    ;;

-no)

-    DRIVER_DRIS=""

-    ;;

-esac

-AC_SUBST([SRC_DIRS])

-AC_SUBST([GLU_DIRS])

-AC_SUBST([DRIVER_DIRS])

-AC_SUBST([GALLIUM_DIRS])

-AC_SUBST([GALLIUM_TARGET_DIRS])

-AC_SUBST([GALLIUM_WINSYS_DIRS])

-AC_SUBST([GALLIUM_DRIVERS_DIRS])

-AC_SUBST([GALLIUM_STATE_TRACKERS_DIRS])

-AC_SUBST([MESA_LLVM])

-

-dnl

-dnl Find out if X is available. The variable have_x is set if libX11 is

-dnl found to mimic AC_PATH_XTRA.

-dnl

-if test -n "$PKG_CONFIG"; then

-    AC_MSG_CHECKING([pkg-config files for X11 are available])

-    PKG_CHECK_EXISTS([x11],[

-        x11_pkgconfig=yes

-        have_x=yes

-        ],[

-        x11_pkgconfig=no

-    ])

-    AC_MSG_RESULT([$x11_pkgconfig])

-else

-    x11_pkgconfig=no

-fi

-dnl Use the autoconf macro if no pkg-config files

-if test "$x11_pkgconfig" = yes; then

-    PKG_CHECK_MODULES([X11], [x11])

-else

-    AC_PATH_XTRA

-    test -z "$X11_CFLAGS" && X11_CFLAGS="$X_CFLAGS"

-    test -z "$X11_LIBS" && X11_LIBS="$X_LIBS -lX11"

-    AC_SUBST([X11_CFLAGS])

-    AC_SUBST([X11_LIBS])

-fi

-

-dnl Try to tell the user that the --x-* options are only used when

-dnl pkg-config is not available. This must be right after AC_PATH_XTRA.

-m4_divert_once([HELP_BEGIN],

-[These options are only used when the X libraries cannot be found by the

-pkg-config utility.])

-

-dnl We need X for xlib and dri, so bomb now if it's not found

-case "$mesa_driver" in

-xlib|dri)

-    if test "$no_x" = yes; then

-        AC_MSG_ERROR([X11 development libraries needed for $mesa_driver driver])

-    fi

-    ;;

-esac

-

-dnl XCB - this is only used for GLX right now

-AC_ARG_ENABLE([xcb],

-    [AS_HELP_STRING([--enable-xcb],

-        [use XCB for GLX @<:@default=disabled@:>@])],

-    [enable_xcb="$enableval"],

-    [enable_xcb=no])

-if test "x$enable_xcb" = xyes; then

-    DEFINES="$DEFINES -DUSE_XCB"

-else

-    enable_xcb=no

-fi

-

-dnl Direct rendering or just indirect rendering

-case "$host_os" in

-gnu*)

-    dnl Disable by default on GNU/Hurd

-    driglx_direct_default="no"

-    ;;

-cygwin*)

-    dnl Disable by default on cygwin

-    driglx_direct_default="no"

-    ;;

-*)

-    driglx_direct_default="yes"

-    ;;

-esac

-AC_ARG_ENABLE([driglx-direct],

-    [AS_HELP_STRING([--disable-driglx-direct],

-        [enable direct rendering in GLX and EGL for DRI \

-            @<:@default=auto@:>@])],

-    [driglx_direct="$enableval"],

-    [driglx_direct="$driglx_direct_default"])

-

-dnl

-dnl libGL configuration per driver

-dnl

-case "$mesa_driver" in

-xlib)

-    if test "$x11_pkgconfig" = yes; then

-        PKG_CHECK_MODULES([XLIBGL], [x11 xext])

-        GL_PC_REQ_PRIV="x11 xext"

-        X11_INCLUDES="$X11_INCLUDES $XLIBGL_CFLAGS"

-        GL_LIB_DEPS="$XLIBGL_LIBS"

-    else

-        # should check these...

-        X11_INCLUDES="$X11_INCLUDES $X_CFLAGS"

-        GL_LIB_DEPS="$X_LIBS -lX11 -lXext"

-        GL_PC_LIB_PRIV="$GL_LIB_DEPS"

-        GL_PC_CFLAGS="$X11_INCLUDES"

-    fi

-    GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS -lm -lpthread"

-    GL_PC_LIB_PRIV="$GL_PC_LIB_PRIV $SELINUX_LIBS -lm -lpthread"

-

-    # if static, move the external libraries to the programs

-    # and empty the libraries for libGL

-    if test "$enable_static" = yes; then

-        APP_LIB_DEPS="$APP_LIB_DEPS $GL_LIB_DEPS"

-        GL_LIB_DEPS=""

-    fi

-    ;;

-dri|no) # these checks are still desired when there is no mesa_driver

-    # DRI must be shared, I think

-    if test "$enable_static" = yes; then

-        AC_MSG_ERROR([Can't use static libraries for DRI drivers])

-    fi

-

-    PKG_CHECK_MODULES([GLPROTO], [glproto >= $GLPROTO_REQUIRED])

-    GL_PC_REQ_PRIV="glproto >= $GLPROTO_REQUIRED"

-    DRI_PC_REQ_PRIV=""

-

-    if test x"$driglx_direct" = xyes; then

-        # Check for libdrm

-        PKG_CHECK_MODULES([LIBDRM], [libdrm >= $LIBDRM_REQUIRED])

-        PKG_CHECK_MODULES([DRI2PROTO], [dri2proto >= $DRI2PROTO_REQUIRED])

-        GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV libdrm >= $LIBDRM_REQUIRED dri2proto >= $DRI2PROTO_REQUIRED"

-        DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED"

-    fi

-

-    # find the DRI deps for libGL

-    if test "$x11_pkgconfig" = yes; then

-        dri_modules="x11 xext xdamage xfixes"

-

-        # add xf86vidmode if available

-        PKG_CHECK_MODULES([XF86VIDMODE], [xxf86vm], HAVE_XF86VIDMODE=yes, HAVE_XF86VIDMODE=no)

-        if test "$HAVE_XF86VIDMODE" = yes ; then

-            dri_modules="$dri_modules xxf86vm"

-        fi

-

-        # add xcb modules if necessary

-        if test "$enable_xcb" = yes; then

-            dri_modules="$dri_modules x11-xcb xcb-glx"

-        fi

-

-        PKG_CHECK_MODULES([DRIGL], [$dri_modules])

-        GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV $dri_modules"

-        X11_INCLUDES="$X11_INCLUDES $DRIGL_CFLAGS"

-        GL_LIB_DEPS="$DRIGL_LIBS"

-    else

-        # should check these...

-        X11_INCLUDES="$X11_INCLUDES $X_CFLAGS"

-        GL_LIB_DEPS="$X_LIBS -lX11 -lXext -lXxf86vm -lXdamage -lXfixes"

-        GL_PC_LIB_PRIV="$GL_LIB_DEPS"

-        GL_PC_CFLAGS="$X11_INCLUDES"

-

-        # XCB can only be used from pkg-config

-        if test "$enable_xcb" = yes; then

-            PKG_CHECK_MODULES([XCB],[x11-xcb xcb-glx])

-            GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV x11-xcb xcb-glx"

-            X11_INCLUDES="$X11_INCLUDES $XCB_CFLAGS"

-            GL_LIB_DEPS="$GL_LIB_DEPS $XCB_LIBS"

-        fi

-    fi

-

-    # need DRM libs, -lpthread, etc.

-    GL_LIB_DEPS="$GL_LIB_DEPS $LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS"

-    GL_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS"

-    GLESv1_CM_LIB_DEPS="$LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS"

-    GLESv1_CM_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS"

-    GLESv2_LIB_DEPS="$LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS"

-    GLESv2_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS"

-    ;;

-osmesa)

-    # No libGL for osmesa

-    GL_LIB_DEPS=""

-    ;;

-esac

-AC_SUBST([GL_LIB_DEPS])

-AC_SUBST([GL_PC_REQ_PRIV])

-AC_SUBST([GL_PC_LIB_PRIV])

-AC_SUBST([GL_PC_CFLAGS])

-AC_SUBST([DRI_PC_REQ_PRIV])

-AC_SUBST([GLESv1_CM_LIB_DEPS])

-AC_SUBST([GLESv1_CM_PC_LIB_PRIV])

-AC_SUBST([GLESv2_LIB_DEPS])

-AC_SUBST([GLESv2_PC_LIB_PRIV])

-

-GLAPI_LIB_DEPS="-lpthread"

-AC_SUBST([GLAPI_LIB_DEPS])

-

-

-dnl Setup default DRI CFLAGS

-DRI_CFLAGS='$(CFLAGS)'

-DRI_CXXFLAGS='$(CXXFLAGS)'

-DRI_LIB_DEPS='$(TOP)/src/mesa/libmesa.a'

-MESA_MODULES='$(TOP)/src/mesa/libmesa.a'

-

-AC_ARG_ENABLE([shared-dricore],

-    [AS_HELP_STRING([--enable-shared-dricore],

-        [link DRI modules with shared core DRI routines @<:@default=disabled@:>@])],

-    [enable_dricore="$enableval"],

-    [enable_dricore=no])

-if test "$mesa_driver" = dri ; then

-   if test "$enable_dricore" = yes ; then

-      if test "$GCC$GXX" != yesyes ; then

-      	 AC_MSG_WARN([Shared dricore requires GCC-compatible rpath handling.  Disabling shared dricore])

-	 enable_dricore=no

-      else

-	 DRICORE_GLSL_LIBS='$(TOP)/$(LIB_DIR)/libglsl.so'

-	 DRICORE_LIBS='$(TOP)/$(LIB_DIR)/libdricore.so'

-	 DRICORE_LIB_DEPS='-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -lglsl'

-      	 DRI_LIB_DEPS='-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore -lglsl'

-      	 DRI_CFLAGS='$(CFLAGS_NOVISIBILITY) -DUSE_DRICORE'

-      	 DRI_CXXFLAGS='$(CXXFLAGS_NOVISIBILITY) -DUSE_DRICORE'

-      	 MESA_MODULES='$(DRICORE_LIBS) $(DRICORE_GLSL_LIBS)'

-      fi

-   fi

-fi

-AC_SUBST([DRICORE_LIBS])

-AC_SUBST([DRICORE_GLSL_LIBS])

-AC_SUBST([DRICORE_LIB_DEPS])

-AC_SUBST([DRI_CXXFLAGS])

-AC_SUBST([DRI_CFLAGS])

-AC_SUBST([MESA_MODULES])

-

-AC_SUBST([HAVE_XF86VIDMODE])

-

-PKG_CHECK_MODULES([LIBDRM_RADEON],

-		  [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED],

-		  HAVE_LIBDRM_RADEON=yes,

-		  HAVE_LIBDRM_RADEON=no)

-

-dnl

-dnl More X11 setup

-dnl

-if test "$mesa_driver" = xlib; then

-    DEFINES="$DEFINES -DUSE_XSHM"

-fi

-

-dnl

-dnl TLS detection

-dnl

-

-AC_ARG_ENABLE([glx-tls],

-    [AS_HELP_STRING([--enable-glx-tls],

-        [enable TLS support in GLX @<:@default=disabled@:>@])],

-    [GLX_USE_TLS="$enableval"],

-    [GLX_USE_TLS=no])

-AC_SUBST(GLX_TLS, ${GLX_USE_TLS})

-

-AS_IF([test "x$GLX_USE_TLS" = xyes],

-      [DEFINES="${DEFINES} -DGLX_USE_TLS -DPTHREADS"])

-

-dnl

-dnl More DRI setup

-dnl

-dnl Directory for DRI drivers

-AC_ARG_WITH([dri-driverdir],

-    [AS_HELP_STRING([--with-dri-driverdir=DIR],

-        [directory for the DRI drivers @<:@${libdir}/dri@:>@])],

-    [DRI_DRIVER_INSTALL_DIR="$withval"],

-    [DRI_DRIVER_INSTALL_DIR='${libdir}/dri'])

-AC_SUBST([DRI_DRIVER_INSTALL_DIR])

-dnl Extra search path for DRI drivers

-AC_ARG_WITH([dri-searchpath],

-    [AS_HELP_STRING([--with-dri-searchpath=DIRS...],

-        [semicolon delimited DRI driver search directories @<:@${libdir}/dri@:>@])],

-    [DRI_DRIVER_SEARCH_DIR="$withval"],

-    [DRI_DRIVER_SEARCH_DIR='${DRI_DRIVER_INSTALL_DIR}'])

-AC_SUBST([DRI_DRIVER_SEARCH_DIR])

-dnl Which drivers to build - default is chosen by platform

-AC_ARG_WITH([dri-drivers],

-    [AS_HELP_STRING([--with-dri-drivers@<:@=DIRS...@:>@],

-        [comma delimited DRI drivers list, e.g.

-        "swrast,i965,radeon" @<:@default=auto@:>@])],

-    [with_dri_drivers="$withval"],

-    [with_dri_drivers=yes])

-if test "x$with_dri_drivers" = x; then

-    with_dri_drivers=no

-fi

-

-dnl If $with_dri_drivers is yes, directories will be added through

-dnl platform checks

-DRI_DIRS=""

-case "$with_dri_drivers" in

-no) ;;

-yes)

-    DRI_DIRS="yes"

-    ;;

-*)

-    # verify the requested driver directories exist

-    dri_drivers=`IFS=', '; echo $with_dri_drivers`

-    for driver in $dri_drivers; do

-        test -d "$srcdir/src/mesa/drivers/dri/$driver" || \

-            AC_MSG_ERROR([DRI driver directory '$driver' doesn't exist])

-    done

-    DRI_DIRS="$dri_drivers"

-    ;;

-esac

-

-dnl Set DRI_DIRS, DEFINES and LIB_DEPS

-if test "$mesa_driver" = dri -o "$mesa_driver" = no; then

-    # Platform specific settings and drivers to build

-    case "$host_os" in

-    linux*)

-        DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"

-        if test "x$driglx_direct" = xyes; then

-            DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"

-        fi

-        DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING -DHAVE_ALIAS"

-

-        case "$host_cpu" in

-        x86_64)

-            # sis is missing because they have not be converted to use

-            # the new interface.  i810 are missing because there is no

-            # x86-64 system where they could *ever* be used.

-            if test "x$DRI_DIRS" = "xyes"; then

-                DRI_DIRS="i915 i965 mach64 mga r128 r200 r300 r600 radeon \

-                    savage tdfx unichrome swrast"

-            fi

-            ;;

-        powerpc*)

-            # Build only the drivers for cards that exist on PowerPC.

-            # At some point MGA will be added, but not yet.

-            if test "x$DRI_DIRS" = "xyes"; then

-                DRI_DIRS="mach64 r128 r200 r300 r600 radeon tdfx swrast"

-            fi

-            ;;

-        sparc*)

-            # Build only the drivers for cards that exist on sparc`

-            if test "x$DRI_DIRS" = "xyes"; then

-                DRI_DIRS="mach64 r128 r200 r300 r600 radeon swrast"

-            fi

-            ;;

-        esac

-        ;;

-    freebsd* | dragonfly* | *netbsd*)

-        DEFINES="$DEFINES -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1"

-        DEFINES="$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS"

-        DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING"

-        if test "x$driglx_direct" = xyes; then

-            DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"

-        fi

-

-        if test "x$DRI_DIRS" = "xyes"; then

-            DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon tdfx \

-                unichrome savage sis swrast"

-        fi

-        ;;

-    gnu*)

-        DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"

-        DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING -DHAVE_ALIAS"

-	;;

-    solaris*)

-        DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"

-        DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING"

-        if test "x$driglx_direct" = xyes; then

-            DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"

-        fi

-        ;;

-    cygwin*)

-        DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"

-        DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING"

-        if test "x$driglx_direct" = xyes; then

-            DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"

-        fi

-        if test "x$DRI_DIRS" = "xyes"; then

-            DRI_DIRS="swrast"

-        fi

-        ;;

-    esac

-

-    # default drivers

-    if test "x$DRI_DIRS" = "xyes"; then

-        DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon \

-            savage sis tdfx unichrome swrast"

-    fi

-

-    DRI_DIRS=`echo "$DRI_DIRS" | $SED 's/  */ /g'`

-

-    # Check for expat

-    if test "$mesa_driver" = dri; then

-        EXPAT_INCLUDES=""

-        EXPAT_LIB=-lexpat

-        AC_ARG_WITH([expat],

-            [AS_HELP_STRING([--with-expat=DIR],

-                [expat install directory])],[

-            EXPAT_INCLUDES="-I$withval/include"

-            CPPFLAGS="$CPPFLAGS $EXPAT_INCLUDES"

-            LDFLAGS="$LDFLAGS -L$withval/$LIB_DIR"

-            EXPAT_LIB="-L$withval/$LIB_DIR -lexpat"

-            ])

-        AC_CHECK_HEADER([expat.h],[],[AC_MSG_ERROR([Expat required for DRI.])])

-        AC_CHECK_LIB([expat],[XML_ParserCreate],[],

-            [AC_MSG_ERROR([Expat required for DRI.])])

-    fi

-

-    # put all the necessary libs together, including possibly libdricore

-    DRI_LIB_DEPS="$DRI_LIB_DEPS $SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIB -lm -lpthread $DLOPEN_LIBS"

-fi

-AC_SUBST([DRI_DIRS])

-AC_SUBST([EXPAT_INCLUDES])

-AC_SUBST([DRI_LIB_DEPS])

-

-case $DRI_DIRS in

-*i915*|*i965*)

-    PKG_CHECK_MODULES([INTEL], [libdrm_intel >= $LIBDRM_INTEL_REQUIRED])

-    ;;

-esac

-

-case $DRI_DIRS in

-*radeon*|*r200*|*r300*|*r600*)

-    if test "x$HAVE_LIBDRM_RADEON" = xyes; then

-	RADEON_CFLAGS="-DHAVE_LIBDRM_RADEON=1 $LIBDRM_RADEON_CFLAGS"

-	RADEON_LDFLAGS=$LIBDRM_RADEON_LIBS

-    fi

-    ;;

-esac

-AC_SUBST([RADEON_CFLAGS])

-AC_SUBST([RADEON_LDFLAGS])

-

-

-dnl

-dnl OSMesa configuration

-dnl

-if test "$mesa_driver" = xlib; then

-    default_gl_osmesa=yes

-else

-    default_gl_osmesa=no

-fi

-AC_ARG_ENABLE([gl-osmesa],

-    [AS_HELP_STRING([--enable-gl-osmesa],

-        [enable OSMesa with libGL @<:@default=enabled for xlib driver@:>@])],

-    [gl_osmesa="$enableval"],

-    [gl_osmesa="$default_gl_osmesa"])

-if test "x$gl_osmesa" = xyes; then

-    if test "x$enable_opengl" = xno; then

-        AC_MSG_ERROR([OpenGL is not available for OSMesa driver])

-    fi

-    if test "$mesa_driver" = osmesa; then

-        AC_MSG_ERROR([libGL is not available for OSMesa driver])

-    else

-        DRIVER_DIRS="$DRIVER_DIRS osmesa"

-    fi

-fi

-

-dnl Configure the channel bits for OSMesa (libOSMesa, libOSMesa16, ...)

-AC_ARG_WITH([osmesa-bits],

-    [AS_HELP_STRING([--with-osmesa-bits=BITS],

-        [OSMesa channel bits and library name: 8, 16, 32 @<:@default=8@:>@])],

-    [osmesa_bits="$withval"],

-    [osmesa_bits=8])

-if test "$mesa_driver" != osmesa && test "x$osmesa_bits" != x8; then

-    AC_MSG_WARN([Ignoring OSMesa channel bits for non-OSMesa driver])

-    osmesa_bits=8

-fi

-case "x$osmesa_bits" in

-x8)

-    OSMESA_LIB=OSMesa

-    ;;

-x16|x32)

-    OSMESA_LIB="OSMesa$osmesa_bits"

-    DEFINES="$DEFINES -DCHAN_BITS=$osmesa_bits -DDEFAULT_SOFTWARE_DEPTH_BITS=31"

-    ;;

-*)

-    AC_MSG_ERROR([OSMesa bits '$osmesa_bits' is not a valid option])

-    ;;

-esac

-AC_SUBST([OSMESA_LIB])

-

-case "$DRIVER_DIRS" in

-*osmesa*)

-    # only link libraries with osmesa if shared

-    if test "$enable_static" = no; then

-        OSMESA_LIB_DEPS="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS"

-    else

-        OSMESA_LIB_DEPS=""

-    fi

-    OSMESA_MESA_DEPS=""

-    OSMESA_PC_LIB_PRIV="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS"

-    ;;

-esac

-AC_SUBST([OSMESA_LIB_DEPS])

-AC_SUBST([OSMESA_MESA_DEPS])

-AC_SUBST([OSMESA_PC_REQ])

-AC_SUBST([OSMESA_PC_LIB_PRIV])

-

-dnl

-dnl EGL configuration

-dnl

-AC_ARG_ENABLE([egl],

-    [AS_HELP_STRING([--disable-egl],

-        [disable EGL library @<:@default=enabled@:>@])],

-    [enable_egl="$enableval"],

-    [enable_egl=yes])

-if test "x$enable_egl" = xno; then

-    if test "x$mesa_driver" = xno; then

-        AC_MSG_ERROR([cannot disable EGL when there is no mesa driver])

-    fi

-    if test "x$enable_openvg" = xyes; then

-        AC_MSG_ERROR([cannot enable OpenVG without EGL])

-    fi

-fi

-if test "x$enable_egl" = xyes; then

-    SRC_DIRS="$SRC_DIRS egl"

-    EGL_LIB_DEPS="$DLOPEN_LIBS $SELINUX_LIBS -lpthread"

-    EGL_DRIVERS_DIRS=""

-    if test "$enable_static" != yes; then

-        # build egl_glx when libGL is built

-        if test "$mesa_driver" = xlib -o "$mesa_driver" = dri; then

-            EGL_DRIVERS_DIRS="glx"

-        fi

-

-        PKG_CHECK_MODULES([LIBUDEV], [libudev > 150],

-                          [have_libudev=yes],[have_libudev=no])

-        if test "$mesa_driver" = dri; then

-            # build egl_dri2 when xcb-dri2 is available

-            PKG_CHECK_MODULES([XCB_DRI2], [x11-xcb xcb-dri2 xcb-xfixes],

-            		  [have_xcb_dri2=yes],[have_xcb_dri2=no])

-            

-            if test "$have_xcb_dri2" = yes; then

-                EGL_DRIVER_DRI2=dri2

-                DEFINES="$DEFINES -DHAVE_XCB_DRI2"

-                if test "$have_libudev" = yes; then

-                    DEFINES="$DEFINES -DHAVE_LIBUDEV"

-                fi

-                # workaround a bug in xcb-dri2 generated by xcb-proto 1.6

-                AC_CHECK_LIB(xcb-dri2, xcb_dri2_connect_alignment_pad, [],

-                          [DEFINES="$DEFINES -DXCB_DRI2_CONNECT_DEVICE_NAME_BROKEN"])

-            fi

-	fi

-

-        EGL_DRIVERS_DIRS="$EGL_DRIVERS_DIRS $EGL_DRIVER_DRI2"

-    fi

-fi

-AC_SUBST([EGL_LIB_DEPS])

-AC_SUBST([EGL_DRIVERS_DIRS])

-

-dnl

-dnl GLU configuration

-dnl

-AC_ARG_ENABLE([glu],

-    [AS_HELP_STRING([--disable-glu],

-        [enable OpenGL Utility library @<:@default=enabled@:>@])],

-    [enable_glu="$enableval"],

-    [enable_glu=yes])

-

-if test "x$enable_glu" = xyes -a "x$mesa_driver" = xno; then

-    AC_MSG_NOTICE([Disabling GLU since there is no OpenGL driver])

-    enable_glu=no

-fi

-

-if test "x$enable_glu" = xyes; then

-    SRC_DIRS="$SRC_DIRS glu"

-

-    case "$mesa_driver" in

-    osmesa)

-        # Link libGLU to libOSMesa instead of libGL

-        GLU_LIB_DEPS=""

-        GLU_PC_REQ="osmesa"

-        if test "$enable_static" = no; then

-            GLU_MESA_DEPS='-l$(OSMESA_LIB)'

-        else

-            GLU_MESA_DEPS=""

-        fi

-        ;;

-    *)

-        # If static, empty GLU_LIB_DEPS and add libs for programs to link

-        GLU_PC_REQ="gl"

-        GLU_PC_LIB_PRIV="-lm"

-        if test "$enable_static" = no; then

-            GLU_LIB_DEPS="-lm"

-            GLU_MESA_DEPS='-l$(GL_LIB)'

-        else

-            GLU_LIB_DEPS=""

-            GLU_MESA_DEPS=""

-            APP_LIB_DEPS="$APP_LIB_DEPS -lstdc++"

-        fi

-        ;;

-    esac

-fi

-if test "$enable_static" = no; then

-    GLU_LIB_DEPS="$GLU_LIB_DEPS $OS_CPLUSPLUS_LIBS"

-fi

-GLU_PC_LIB_PRIV="$GLU_PC_LIB_PRIV $OS_CPLUSPLUS_LIBS"

-AC_SUBST([GLU_LIB_DEPS])

-AC_SUBST([GLU_MESA_DEPS])

-AC_SUBST([GLU_PC_REQ])

-AC_SUBST([GLU_PC_REQ_PRIV])

-AC_SUBST([GLU_PC_LIB_PRIV])

-AC_SUBST([GLU_PC_CFLAGS])

-

-dnl

-dnl GLw configuration

-dnl

-AC_ARG_ENABLE([glw],

-    [AS_HELP_STRING([--disable-glw],

-        [enable Xt/Motif widget library @<:@default=enabled@:>@])],

-    [enable_glw="$enableval"],

-    [enable_glw=yes])

-dnl Don't build GLw on osmesa

-if test "x$enable_glw" = xyes; then

-    case "$mesa_driver" in

-    osmesa|no)

-        AC_MSG_NOTICE([Disabling GLw since there is no OpenGL driver])

-        enable_glw=no

-        ;;

-    esac

-fi

-AC_ARG_ENABLE([motif],

-    [AS_HELP_STRING([--enable-motif],

-        [use Motif widgets in GLw @<:@default=disabled@:>@])],

-    [enable_motif="$enableval"],

-    [enable_motif=no])

-

-if test "x$enable_glw" = xyes; then

-    SRC_DIRS="$SRC_DIRS glw"

-    if test "$x11_pkgconfig" = yes; then

-        PKG_CHECK_MODULES([GLW],[x11 xt])

-        GLW_PC_REQ_PRIV="x11 xt"

-        GLW_LIB_DEPS="$GLW_LIBS"

-    else

-        # should check these...

-        GLW_LIB_DEPS="$X_LIBS -lXt -lX11"

-        GLW_PC_LIB_PRIV="$GLW_LIB_DEPS"

-        GLW_PC_CFLAGS="$X11_INCLUDES"

-    fi

-

-    GLW_SOURCES="GLwDrawA.c"

-    MOTIF_CFLAGS=

-    if test "x$enable_motif" = xyes; then

-        GLW_SOURCES="$GLW_SOURCES GLwMDrawA.c"

-        AC_PATH_PROG([MOTIF_CONFIG], [motif-config], [no])

-        if test "x$MOTIF_CONFIG" != xno; then

-            MOTIF_CFLAGS=`$MOTIF_CONFIG --cflags`

-            MOTIF_LIBS=`$MOTIF_CONFIG --libs`

-        else

-            AC_CHECK_HEADER([Xm/PrimitiveP.h], [],

-                [AC_MSG_ERROR([Can't locate Motif headers])])

-            AC_CHECK_LIB([Xm], [XmGetPixmap], [MOTIF_LIBS="-lXm"],

-                [AC_MSG_ERROR([Can't locate Motif Xm library])])

-        fi

-        # MOTIF_LIBS is prepended to GLW_LIB_DEPS since Xm needs Xt/X11

-        GLW_LIB_DEPS="$MOTIF_LIBS $GLW_LIB_DEPS"

-        GLW_PC_LIB_PRIV="$MOTIF_LIBS $GLW_PC_LIB_PRIV"

-        GLW_PC_CFLAGS="$MOTIF_CFLAGS $GLW_PC_CFLAGS"

-    fi

-

-    # If static, empty GLW_LIB_DEPS and add libs for programs to link

-    GLW_PC_LIB_PRIV="$GLW_PC_LIB_PRIV"

-    if test "$enable_static" = no; then

-        GLW_MESA_DEPS='-l$(GL_LIB)'

-        GLW_LIB_DEPS="$GLW_LIB_DEPS"

-    else

-        APP_LIB_DEPS="$APP_LIB_DEPS $GLW_LIB_DEPS"

-        GLW_LIB_DEPS=""

-        GLW_MESA_DEPS=""

-    fi

-fi

-AC_SUBST([GLW_LIB_DEPS])

-AC_SUBST([GLW_MESA_DEPS])

-AC_SUBST([GLW_SOURCES])

-AC_SUBST([MOTIF_CFLAGS])

-AC_SUBST([GLW_PC_REQ_PRIV])

-AC_SUBST([GLW_PC_LIB_PRIV])

-AC_SUBST([GLW_PC_CFLAGS])

-

-dnl

-dnl GLUT configuration

-dnl

-if test -f "$srcdir/include/GL/glut.h"; then

-    default_glut=yes

-else

-    default_glut=no

-fi

-AC_ARG_ENABLE([glut],

-    [AS_HELP_STRING([--disable-glut],

-        [enable GLUT library @<:@default=enabled if source available@:>@])],

-    [enable_glut="$enableval"],

-    [enable_glut="$default_glut"])

-

-dnl Don't build glut on osmesa

-if test "x$enable_glut" = xyes; then

-    case "$mesa_driver" in

-    osmesa|no)

-        AC_MSG_NOTICE([Disabling glut since there is no OpenGL driver])

-        enable_glut=no

-        ;;

-    esac

-fi

-dnl Can't build glut if GLU not available

-if test "x$enable_glu$enable_glut" = xnoyes; then

-    AC_MSG_WARN([Disabling glut since GLU is disabled])

-    enable_glut=no

-fi

-

-if test "x$enable_glut" = xyes; then

-    SRC_DIRS="$SRC_DIRS glut/glx"

-    if test "$x11_pkgconfig" = yes; then

-        PKG_CHECK_MODULES([GLUT],[x11 xmu xi])

-        GLUT_PC_REQ_PRIV="x11 xmu xi"

-        GLUT_LIB_DEPS="$GLUT_LIBS"

-    else

-        # should check these...

-        GLUT_LIB_DEPS="$X_LIBS -lX11 -lXmu -lXi"

-        GLUT_PC_LIB_PRIV="$GLUT_LIB_DEPS"

-        GLUT_PC_CFLAGS="$X11_INCLUDES"

-    fi

-    if test "x$GCC" = xyes; then

-        GLUT_CFLAGS="$GLUT_CFLAGS -fexceptions"

-    fi

-    GLUT_LIB_DEPS="$GLUT_LIB_DEPS -lm"

-    GLUT_PC_LIB_PRIV="$GLUT_PC_LIB_PRIV -lm"

-

-    # If static, empty GLUT_LIB_DEPS and add libs for programs to link

-    if test "$enable_static" = no; then

-        GLUT_MESA_DEPS='-l$(GLU_LIB) -l$(GL_LIB)'

-    else

-        APP_LIB_DEPS="$APP_LIB_DEPS $GLUT_LIB_DEPS"

-        GLUT_LIB_DEPS=""

-        GLUT_MESA_DEPS=""

-    fi

-fi

-AC_SUBST([GLUT_LIB_DEPS])

-AC_SUBST([GLUT_MESA_DEPS])

-AC_SUBST([GLUT_CFLAGS])

-AC_SUBST([GLUT_PC_REQ_PRIV])

-AC_SUBST([GLUT_PC_LIB_PRIV])

-AC_SUBST([GLUT_PC_CFLAGS])

-

-dnl

-dnl Program library dependencies

-dnl    Only libm is added here if necessary as the libraries should

-dnl    be pulled in by the linker

-dnl

-if test "x$APP_LIB_DEPS" = x; then

-    case "$host_os" in

-    solaris*)

-        APP_LIB_DEPS="-lX11 -lsocket -lnsl -lm"

-        ;;

-    cygwin*)

-        APP_LIB_DEPS="-lX11"

-        ;;

-    *)

-        APP_LIB_DEPS="-lm"

-        ;;

-    esac

-fi

-AC_SUBST([APP_LIB_DEPS])

-AC_SUBST([PROGRAM_DIRS])

-

-dnl

-dnl Gallium configuration

-dnl

-AC_ARG_ENABLE([gallium],

-    [AS_HELP_STRING([--disable-gallium],

-        [build gallium @<:@default=enabled@:>@])],

-    [enable_gallium="$enableval"],

-    [enable_gallium=yes])

-if test "x$enable_gallium" = xno -a "x$enable_openvg" = xyes; then

-    AC_MSG_ERROR([cannot enable OpenVG without Gallium])

-fi

-if test "x$enable_gallium" = xyes; then

-    SRC_DIRS="$SRC_DIRS gallium gallium/winsys gallium/targets"

-    AC_PATH_PROG([LLVM_CONFIG], [llvm-config], [no])

-fi

-

-AC_SUBST([LLVM_CFLAGS])

-AC_SUBST([LLVM_LIBS])

-AC_SUBST([LLVM_LDFLAGS])

-AC_SUBST([LLVM_VERSION])

-

-dnl

-dnl Gallium state trackers configuration

-dnl

-

-AC_ARG_ENABLE([gallium-egl],

-    [AS_HELP_STRING([--enable-gallium-egl],

-        [enable gallium EGL state tracker @<:@default=auto@:>@])],

-    [enable_gallium_egl="$enableval"],

-    [enable_gallium_egl=auto])

-if test "x$enable_gallium_egl" = xauto; then

-    case "$mesa_driver" in

-    dri|no)

-        enable_gallium_egl=$enable_egl

-        ;;

-    *)

-        enable_gallium_egl=$enable_openvg

-        ;;

-    esac

-fi

-case "x$enable_egl$enable_gallium_egl" in

-xnoyes)

-    AC_MSG_ERROR([cannot build Gallium EGL state tracker without EGL])

-esac

-

-AC_ARG_WITH([state-trackers],

-    [AS_HELP_STRING([--with-state-trackers@<:@=DIRS...@:>@],

-        [comma delimited state_trackers list, e.g.

-        "egl,glx" @<:@default=auto@:>@])],

-    [with_state_trackers="$withval"],

-    [with_state_trackers=yes])

-

-case "$with_state_trackers" in

-no)

-    GALLIUM_STATE_TRACKERS_DIRS=""

-    ;;

-yes)

-    # look at what else is built

-    case "$mesa_driver" in

-    xlib)

-        GALLIUM_STATE_TRACKERS_DIRS=glx

-        ;;

-    dri)

-        GALLIUM_STATE_TRACKERS_DIRS="dri"

-        HAVE_ST_DRI="yes"

-        # Have only tested st/xorg on 1.6.0 servers

-        PKG_CHECK_MODULES(XORG, [xorg-server >= 1.6.0 libdrm >= $LIBDRM_XORG_REQUIRED libkms >= $LIBKMS_XORG_REQUIRED],

-            HAVE_ST_XORG="yes"; GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS xorg",

-            HAVE_ST_XORG="no")

-        ;;

-    esac

-

-    if test "x$enable_egl" = xyes; then

-        if test "$enable_openvg" = yes; then

-            GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS vega"

-            st_egl="yes"

-        fi

-

-        if test "$enable_gallium_egl" = yes; then

-            GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS egl"

-            HAVE_ST_EGL="yes"

-        fi

-    fi

-    ;;

-*)

-    # verify the requested state tracker exist

-    state_trackers=""

-    _state_trackers=`IFS=', '; echo $with_state_trackers`

-    for tracker in $_state_trackers; do

-        case "$tracker" in

-        dri)

-            if test "x$mesa_driver" != xdri; then

-                AC_MSG_ERROR([cannot build dri state tracker without mesa driver set to dri])

-            fi

-            HAVE_ST_DRI="yes"

-            ;;

-        egl)

-            if test "x$enable_egl" != xyes; then

-                AC_MSG_ERROR([cannot build egl state tracker without EGL library])

-            fi

-            HAVE_ST_EGL="yes"

-            ;;

-        xorg)

-            PKG_CHECK_MODULES([XORG], [xorg-server >= 1.6.0])

-            PKG_CHECK_MODULES([LIBDRM_XORG], [libdrm >= $LIBDRM_XORG_REQUIRED])

-            PKG_CHECK_MODULES([LIBKMS_XORG], [libkms >= $LIBKMS_XORG_REQUIRED])

-            HAVE_ST_XORG="yes"

-            ;;

-        vega)

-            if test "x$enable_openvg" != xyes; then

-                AC_MSG_ERROR([cannot build vega state tracker without --enable-openvg])

-            fi

-            have_st_vega="yes"

-            ;;

-        esac

-

-	if test -n "$tracker"; then

-            test -d "$srcdir/src/gallium/state_trackers/$tracker" || \

-                AC_MSG_ERROR([state tracker '$tracker' doesn't exist])

-            if test -n "$state_trackers"; then

-                state_trackers="$state_trackers $tracker"

-            else

-                state_trackers="$tracker"

-            fi

-        fi

-    done

-    GALLIUM_STATE_TRACKERS_DIRS="$state_trackers"

-

-    # append --enable-openvg/--enable-gallium-egl to --with-state-trackers

-    if test "x$have_st_vega" != xyes -a "x$enable_openvg" = xyes; then

-        AC_MSG_ERROR([--with-state-trackers specified but vega is missing])

-    fi

-    if test "x$HAVE_ST_EGL" != xyes -a "x$enable_gallium_egl" = xyes; then

-        AC_MSG_ERROR([--with-state-trackers specified but egl is missing])

-    fi

-    ;;

-esac

-

-

-EGL_CLIENT_APIS=""

-VG_LIB_DEPS=""

-

-case "x$enable_opengl$enable_gles1$enable_gles2" in

-x*yes*)

-    EGL_CLIENT_APIS="$EGL_CLIENT_APIS "'$(GL_LIB)'

-    ;;

-esac

-if test "x$enable_openvg" = xyes; then

-    EGL_CLIENT_APIS="$EGL_CLIENT_APIS "'$(VG_LIB)'

-    VG_LIB_DEPS="$VG_LIB_DEPS $SELINUX_LIBS -lpthread"

-fi

-

-AC_SUBST([VG_LIB_DEPS])

-AC_SUBST([EGL_CLIENT_APIS])

-

-if test "x$HAVE_ST_EGL" = xyes; then

-	GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS egl"

-fi

-

-if test "x$HAVE_ST_XORG" = xyes; then

-    PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],

-        HAVE_XEXTPROTO_71="yes"; DEFINES="$DEFINES -DHAVE_XEXTPROTO_71",

-        HAVE_XEXTPROTO_71="no")

-fi

-

-AC_ARG_WITH([egl-platforms],

-    [AS_HELP_STRING([--with-egl-platforms@<:@=DIRS...@:>@],

-        [comma delimited native platforms libEGL supports, e.g.

-        "x11,drm" @<:@default=auto@:>@])],

-    [with_egl_platforms="$withval"],

-    [with_egl_platforms=yes])

-AC_ARG_WITH([egl-displays],

-    [AS_HELP_STRING([--with-egl-displays@<:@=DIRS...@:>@],

-        [DEPRECATED.  Use --with-egl-platforms instead])],

-    [with_egl_platforms="$withval"])

-

-EGL_PLATFORMS=""

-WAYLAND_EGL_LIB_DEPS=""

-

-case "$with_egl_platforms" in

-yes)

-    if test "x$enable_egl" = xyes && test "x$mesa_driver" != xosmesa; then

-        EGL_PLATFORMS="x11"

-        if test "$mesa_driver" = dri; then

-            EGL_PLATFORMS="$EGL_PLATFORMS drm"

-        fi

-    fi

-    ;;

-*)

-    if test "x$enable_egl" != xyes; then

-        AC_MSG_ERROR([cannot build egl state tracker without EGL library])

-    fi

-    # verify the requested driver directories exist

-    egl_platforms=`IFS=', '; echo $with_egl_platforms`

-    for plat in $egl_platforms; do

-        test -d "$srcdir/src/gallium/state_trackers/egl/$plat" || \

-            AC_MSG_ERROR([EGL platform '$plat' doesn't exist])

-        if test "$plat" = "fbdev"; then

-                GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/fbdev"

-        fi

-	if test "$plat" = "wayland"; then

-		PKG_CHECK_MODULES([WAYLAND], [wayland-client wayland-server],, \

-				  [AC_MSG_ERROR([cannot find libwayland-client])])

-		WAYLAND_EGL_LIB_DEPS="$WAYLAND_LIBS $LIBDRM_LIBS"

-                GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/wayland"

-	fi

-    done

-    EGL_PLATFORMS="$egl_platforms"

-    ;;

-esac

-AC_SUBST([EGL_PLATFORMS])

-

-AC_SUBST([WAYLAND_EGL_LIB_DEPS])

-WAYLAND_EGL_PC_REQ_PRIV="wayland-client libdrm"

-WAYLAND_EGL_PC_LIB_PRIV=

-WAYLAND_EGL_PC_CFLAGS=

-

-AC_SUBST([WAYLAND_EGL_PC_REQ_PRIV])

-AC_SUBST([WAYLAND_EGL_PC_LIB_PRIV])

-AC_SUBST([WAYLAND_EGL_PC_CFLAGS])

-

-

-AC_ARG_WITH([egl-driver-dir],

-    [AS_HELP_STRING([--with-egl-driver-dir=DIR],

-                    [directory for EGL drivers [[default=${libdir}/egl]]])],

-    [EGL_DRIVER_INSTALL_DIR="$withval"],

-    [EGL_DRIVER_INSTALL_DIR='${libdir}/egl'])

-AC_SUBST([EGL_DRIVER_INSTALL_DIR])

-

-AC_ARG_WITH([xorg-driver-dir],

-    [AS_HELP_STRING([--with-xorg-driver-dir=DIR],

-                    [Default xorg driver directory[[default=${libdir}/xorg/modules/drivers]]])],

-    [XORG_DRIVER_INSTALL_DIR="$withval"],

-    [XORG_DRIVER_INSTALL_DIR="${libdir}/xorg/modules/drivers"])

-AC_SUBST([XORG_DRIVER_INSTALL_DIR])

-

-AC_ARG_WITH([max-width],

-    [AS_HELP_STRING([--with-max-width=N],

-                    [Maximum framebuffer width (4096)])],

-    [DEFINES="${DEFINES} -DMAX_WIDTH=${withval}";

-     AS_IF([test "${withval}" -gt "4096"],

-           [AC_MSG_WARN([Large framebuffer: see s_tritemp.h comments.])])]

-)

-AC_ARG_WITH([max-height],

-    [AS_HELP_STRING([--with-max-height=N],

-                    [Maximum framebuffer height (4096)])],

-    [DEFINES="${DEFINES} -DMAX_HEIGHT=${withval}";

-     AS_IF([test "${withval}" -gt "4096"],

-           [AC_MSG_WARN([Large framebuffer: see s_tritemp.h comments.])])]

-)

-

-dnl

-dnl Gallium LLVM

-dnl

-AC_ARG_ENABLE([gallium-llvm],

-    [AS_HELP_STRING([--enable-gallium-llvm],

-        [build gallium LLVM support @<:@default=enabled on x86/x86_64@:>@])],

-    [enable_gallium_llvm="$enableval"],

-    [enable_gallium_llvm=auto])

-if test "x$enable_gallium_llvm" = xauto; then

-    case "$host_cpu" in

-    i*86|x86_64) enable_gallium_llvm=yes;;

-    esac

-fi

-if test "x$enable_gallium_llvm" = xyes; then

-    if test "x$LLVM_CONFIG" != xno; then

-	LLVM_VERSION=`$LLVM_CONFIG --version`

-	LLVM_CFLAGS=`$LLVM_CONFIG --cppflags`

-	LLVM_LIBS="`$LLVM_CONFIG --libs` -lstdc++"

-

-	LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`

-	GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS llvmpipe"

-	DEFINES="$DEFINES -DGALLIUM_LLVMPIPE -D__STDC_CONSTANT_MACROS"

-	MESA_LLVM=1

-    else

-	MESA_LLVM=0

-    fi

-else

-    MESA_LLVM=0

-fi

-

-dnl

-dnl Gallium helper functions

-dnl

-gallium_check_st() {

-    if test "x$HAVE_ST_DRI" = xyes || test "x$HAVE_ST_XORG" = xyes; then

-         GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS $1"

-    fi

-    if test "x$HAVE_ST_DRI" = xyes && test "x$2" != x; then

-         GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $2"

-    fi

-    if test "x$HAVE_ST_XORG" = xyes && test "x$3" != x; then

-         GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $3"

-    fi

-}

-

-

-dnl

-dnl Gallium SVGA configuration

-dnl

-AC_ARG_ENABLE([gallium-svga],

-    [AS_HELP_STRING([--enable-gallium-svga],

-        [build gallium SVGA @<:@default=disabled@:>@])],

-    [enable_gallium_svga="$enableval"],

-    [enable_gallium_svga=auto])

-if test "x$enable_gallium_svga" = xyes; then

-    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS svga"

-    gallium_check_st "svga/drm" "dri-vmwgfx" "xorg-vmwgfx"

-elif test "x$enable_gallium_svga" = xauto; then

-    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS svga"

-fi

-

-dnl

-dnl Gallium i915 configuration

-dnl

-AC_ARG_ENABLE([gallium-i915],

-    [AS_HELP_STRING([--enable-gallium-i915],

-        [build gallium i915 @<:@default=disabled@:>@])],

-    [enable_gallium_i915="$enableval"],

-    [enable_gallium_i915=auto])

-if test "x$enable_gallium_i915" = xyes; then

-    GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS i915/sw"

-    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915"

-    gallium_check_st "i915/drm" "dri-i915" "xorg-i915"

-elif test "x$enable_gallium_i915" = xauto; then

-    GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS i915/sw"

-    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915"

-fi

-

-dnl

-dnl Gallium i965 configuration

-dnl

-AC_ARG_ENABLE([gallium-i965],

-    [AS_HELP_STRING([--enable-gallium-i965],

-        [build gallium i965 @<:@default=disabled@:>@])],

-    [enable_gallium_i965="$enableval"],

-    [enable_gallium_i965=auto])

-if test "x$enable_gallium_i965" = xyes; then

-    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i965"

-    gallium_check_st "i965/drm" "dri-i965" "xorg-i965"

-elif test "x$enable_gallium_i965" = xauto; then

-    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i965"

-fi

-

-dnl

-dnl Gallium Radeon r300g configuration

-dnl

-AC_ARG_ENABLE([gallium-r300],

-    [AS_HELP_STRING([--enable-gallium-r300],

-        [build gallium r300 @<:@default=build DRI driver only@:>@])],

-    [enable_gallium_r300="$enableval"],

-    [enable_gallium_r300=auto])

-

-if test "$mesa_driver" != dri ; then

-    if test "x$enable_gallium_r300" = xauto; then

-      enable_gallium_r300=no

-    fi

-fi

-

-if test "x$enable_gallium_r300" != xno; then

-    if test "x$MESA_LLVM" = x0; then

-        case "$host_cpu" in

-        i*86|x86_64) AC_MSG_ERROR([LLVM is required to build Gallium R300 on x86 and x86_64]);;

-        esac

-    fi

-fi

-if test "x$enable_gallium_r300" = xauto; then

-    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"

-    gallium_check_st "radeon/drm" "dri-r300"

-elif test "x$enable_gallium_r300" = xyes; then

-    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"

-    gallium_check_st "radeon/drm" "dri-r300" "xorg-radeon"

-fi

-

-dnl

-dnl Gallium Radeon r600g configuration

-dnl

-AC_ARG_ENABLE([gallium-r600],

-    [AS_HELP_STRING([--enable-gallium-r600],

-        [build gallium r600 @<:@default=disabled@:>@])],

-    [enable_gallium_r600="$enableval"],

-    [enable_gallium_r600=auto])

-if test "x$enable_gallium_r600" = xyes; then

-    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r600"

-    gallium_check_st "r600/drm" "dri-r600"

-fi

-

-dnl

-dnl Gallium Nouveau configuration

-dnl

-AC_ARG_ENABLE([gallium-nouveau],

-    [AS_HELP_STRING([--enable-gallium-nouveau],

-        [build gallium nouveau @<:@default=disabled@:>@])],

-    [enable_gallium_nouveau="$enableval"],

-    [enable_gallium_nouveau=no])

-if test "x$enable_gallium_nouveau" = xyes; then

-    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau nvfx nv50 nvc0"

-    gallium_check_st "nouveau/drm" "dri-nouveau" "xorg-nouveau"

-fi

-

-dnl

-dnl Gallium swrast configuration

-dnl

-AC_ARG_ENABLE([gallium-swrast],

-    [AS_HELP_STRING([--enable-gallium-swrast],

-        [build gallium swrast @<:@default=auto@:>@])],

-    [enable_gallium_swrast="$enableval"],

-    [enable_gallium_swrast=auto])

-if test "x$enable_gallium_swrast" = xyes || test "x$enable_gallium_swrast" = xauto; then

-    if test "x$HAVE_ST_DRI" = xyes; then

-        GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS dri-swrast"

-    fi

-fi

-

-dnl prepend CORE_DIRS to SRC_DIRS

-SRC_DIRS="$CORE_DIRS $SRC_DIRS"

-

-dnl Restore LDFLAGS and CPPFLAGS

-LDFLAGS="$_SAVE_LDFLAGS"

-CPPFLAGS="$_SAVE_CPPFLAGS"

-

-dnl Substitute the config

-AC_CONFIG_FILES([configs/autoconf])

-

-dnl Replace the configs/current symlink

-AC_CONFIG_COMMANDS([configs],[

-if test -f configs/current || test -L configs/current; then

-    rm -f configs/current

-fi

-ln -s autoconf configs/current

-])

-

-AC_OUTPUT

-

-dnl

-dnl Output some configuration info for the user

-dnl

-echo ""

-echo "        prefix:          $prefix"

-echo "        exec_prefix:     $exec_prefix"

-echo "        libdir:          $libdir"

-echo "        includedir:      $includedir"

-

-dnl API info

-echo ""

-echo "        OpenGL:          $enable_opengl (ES1: $enable_gles1 ES2: $enable_gles2)"

-echo "        OpenVG:          $enable_openvg"

-

-dnl Driver info

-echo ""

-echo "        Driver:          $mesa_driver"

-if test "$mesa_driver" != no; then

-    if echo "$DRIVER_DIRS" | grep 'osmesa' >/dev/null 2>&1; then

-        echo "        OSMesa:          lib$OSMESA_LIB"

-    else

-        echo "        OSMesa:          no"

-    fi

-    if test "$mesa_driver" = dri; then

-        # cleanup the drivers var

-        dri_dirs=`echo $DRI_DIRS | $SED 's/^ *//;s/  */ /;s/ *$//'`

-        if test "x$DRI_DIRS" = x; then

-            echo "        DRI drivers:     no"

-        else

-            echo "        DRI drivers:     $dri_dirs"

-        fi

-        echo "        DRI driver dir:  $DRI_DRIVER_INSTALL_DIR"

-        echo "        Use XCB:         $enable_xcb"

-        echo "        Shared dricore:  $enable_dricore"

-    fi

-fi

-echo ""

-echo "        GLU:             $enable_glu"

-echo "        GLw:             $enable_glw (Motif: $enable_motif)"

-echo "        glut:            $enable_glut"

-

-dnl EGL

-echo ""

-echo "        EGL:             $enable_egl"

-if test "$enable_egl" = yes; then

-    echo "        EGL platforms:   $EGL_PLATFORMS"

-

-    egl_drivers=""

-    for d in $EGL_DRIVERS_DIRS; do

-        egl_drivers="$egl_drivers builtin:egl_$d"

-    done

-

-    if test "$enable_gallium" = yes -a "$HAVE_ST_EGL" = yes; then

-        echo "        EGL drivers:    ${egl_drivers} egl_gallium"

-        echo "        EGL Gallium STs:$EGL_CLIENT_APIS"

-    else

-        echo "        EGL drivers:    $egl_drivers"

-    fi

-fi

-

-echo ""

-if test "x$MESA_LLVM" = x1; then

-    echo "        llvm:            yes"

-    echo "        llvm-config:     $LLVM_CONFIG"

-    echo "        llvm-version:    $LLVM_VERSION"

-else

-    echo "        llvm:            no"

-fi

-

-echo ""

-if echo "$SRC_DIRS" | grep 'gallium' >/dev/null 2>&1; then

-    echo "        Gallium:         yes"

-    echo "        Gallium dirs:    $GALLIUM_DIRS"

-    echo "        Target dirs:     $GALLIUM_TARGET_DIRS"

-    echo "        Winsys dirs:     $GALLIUM_WINSYS_DIRS"

-    echo "        Driver dirs:     $GALLIUM_DRIVERS_DIRS"

-    echo "        Trackers dirs:   $GALLIUM_STATE_TRACKERS_DIRS"

-else

-    echo "        Gallium:         no"

-fi

-

-dnl Libraries

-echo ""

-echo "        Shared libs:     $enable_shared"

-echo "        Static libs:     $enable_static"

-

-dnl Compiler options

-# cleanup the CFLAGS/CXXFLAGS/DEFINES vars

-cflags=`echo $CFLAGS $OPT_FLAGS $PIC_FLAGS $ARCH_FLAGS | \

-    $SED 's/^ *//;s/  */ /;s/ *$//'`

-cxxflags=`echo $CXXFLAGS $OPT_FLAGS $PIC_FLAGS $ARCH_FLAGS | \

-    $SED 's/^ *//;s/  */ /;s/ *$//'`

-defines=`echo $DEFINES $ASM_FLAGS | $SED 's/^ *//;s/  */ /;s/ *$//'`

-echo ""

-echo "        CFLAGS:          $cflags"

-echo "        CXXFLAGS:        $cxxflags"

-echo "        Macros:          $defines"

-echo ""

-echo "        PYTHON2:         $PYTHON2"

-

-echo ""

-echo "        Run '${MAKE-make}' to build Mesa"

-echo ""

+dnl Process this file with autoconf to create configure.
+
+AC_PREREQ([2.59])
+
+dnl Versioning - scrape the version from configs/default
+m4_define([mesa_version],
+    [m4_esyscmd([${MAKE-make} -s -f bin/version.mk version | tr -d '\n' | tr -d '\r'])])
+m4_ifval(mesa_version,,
+    [m4_fatal([Failed to get the Mesa version from `make -f bin/version.mk version`])])
+
+dnl Tell the user about autoconf.html in the --help output
+m4_divert_once([HELP_END], [
+See docs/autoconf.html for more details on the options for Mesa.])
+
+AC_INIT([Mesa],[mesa_version],
+    [https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa])
+AC_CONFIG_AUX_DIR([bin])
+AC_CANONICAL_HOST
+
+dnl Versions for external dependencies
+LIBDRM_REQUIRED=2.4.24
+LIBDRM_RADEON_REQUIRED=2.4.24
+LIBDRM_INTEL_REQUIRED=2.4.24
+DRI2PROTO_REQUIRED=2.1
+GLPROTO_REQUIRED=1.4.11
+LIBDRM_XORG_REQUIRED=2.4.24
+LIBKMS_XORG_REQUIRED=1.0.0
+
+dnl Check for progs
+AC_PROG_CPP
+AC_PROG_CC
+AC_PROG_CXX
+AC_CHECK_PROGS([MAKE], [gmake make])
+AC_CHECK_PROGS([PYTHON2], [python2 python])
+AC_PATH_PROG([MKDEP], [makedepend])
+AC_PATH_PROG([SED], [sed])
+
+if test "x$MKDEP" = "x"; then
+    AC_MSG_ERROR([makedepend is required to build Mesa])
+fi
+
+AC_PATH_PROG([FLEX], [flex])
+test "x$FLEX" = "x" && AC_MSG_ERROR([flex is needed to build Mesa])
+
+AC_PATH_PROG([BISON], [bison])
+test "x$BISON" = "x" && AC_MSG_ERROR([bison is needed to build Mesa])
+
+dnl Our fallback install-sh is a symlink to minstall. Use the existing
+dnl configuration in that case.
+AC_PROG_INSTALL
+test "x$INSTALL" = "x$ac_install_sh" && INSTALL='$(MINSTALL)'
+
+dnl We need a POSIX shell for parts of the build. Assume we have one
+dnl in most cases.
+case "$host_os" in
+solaris*)
+    # Solaris /bin/sh is too old/non-POSIX compliant
+    AC_PATH_PROGS(POSIX_SHELL, [ksh93 ksh sh])
+    SHELL="$POSIX_SHELL"
+    ;;
+esac
+
+dnl clang is mostly GCC-compatible, but its version is much lower,
+dnl so we have to check for it.
+AC_MSG_CHECKING([if compiling with clang])
+
+AC_COMPILE_IFELSE(
+[AC_LANG_PROGRAM([], [[
+#ifndef __clang__
+       not clang
+#endif
+]])],
+[CLANG=yes], [CLANG=no])
+
+AC_MSG_RESULT([$CLANG])
+
+dnl If we're using GCC, make sure that it is at least version 3.3.0.  Older
+dnl versions are explictly not supported.
+if test "x$GCC" = xyes -a "x$CLANG" = xno; then
+    AC_MSG_CHECKING([whether gcc version is sufficient])
+    major=0
+    minor=0
+
+    GCC_VERSION=`$CC -dumpversion`
+    if test $? -eq 0; then
+        major=`echo $GCC_VERSION | cut -d. -f1`
+        minor=`echo $GCC_VERSION | cut -d. -f1`
+    fi
+
+    if test $major -lt 3 -o $major -eq 3 -a $minor -lt 3 ; then
+        AC_MSG_RESULT([no])
+        AC_MSG_ERROR([If using GCC, version 3.3.0 or later is required.])
+    else
+        AC_MSG_RESULT([yes])
+    fi
+fi
+
+
+MKDEP_OPTIONS=-fdepend
+dnl Ask gcc where it's keeping its secret headers
+if test "x$GCC" = xyes; then
+    for dir in include include-fixed; do
+        GCC_INCLUDES=`$CC -print-file-name=$dir`
+        if test "x$GCC_INCLUDES" != x && \
+           test "$GCC_INCLUDES" != "$dir" && \
+           test -d "$GCC_INCLUDES"; then
+            MKDEP_OPTIONS="$MKDEP_OPTIONS -I$GCC_INCLUDES"
+        fi
+    done
+fi
+AC_SUBST([MKDEP_OPTIONS])
+
+dnl Make sure the pkg-config macros are defined
+m4_ifndef([PKG_PROG_PKG_CONFIG],
+    [m4_fatal([Could not locate the pkg-config autoconf macros.
+  These are usually located in /usr/share/aclocal/pkg.m4. If your macros
+  are in a different location, try setting the environment variable
+  ACLOCAL="aclocal -I/other/macro/dir" before running autoreconf.])])
+PKG_PROG_PKG_CONFIG()
+
+dnl LIB_DIR - library basename
+LIB_DIR=`echo $libdir | $SED 's%.*/%%'`
+AC_SUBST([LIB_DIR])
+
+dnl Cache LDFLAGS so we can add EXTRA_LIB_PATH and restore it later
+_SAVE_LDFLAGS="$LDFLAGS"
+AC_ARG_VAR([EXTRA_LIB_PATH],[Extra -L paths for the linker])
+AC_SUBST([EXTRA_LIB_PATH])
+
+dnl Cache CPPFLAGS so we can add *_INCLUDES and restore it later
+_SAVE_CPPFLAGS="$CPPFLAGS"
+AC_ARG_VAR([X11_INCLUDES],[Extra -I paths for X11 headers])
+AC_SUBST([X11_INCLUDES])
+
+dnl Compiler macros
+DEFINES=""
+AC_SUBST([DEFINES])
+case "$host_os" in
+linux*|*-gnu*|gnu*)
+    DEFINES="$DEFINES -D_GNU_SOURCE -DPTHREADS"
+    ;;
+solaris*)
+    DEFINES="$DEFINES -DPTHREADS -DSVR4"
+    ;;
+cygwin*)
+    DEFINES="$DEFINES -DPTHREADS"
+    ;;
+esac
+
+dnl Add flags for gcc and g++
+if test "x$GCC" = xyes; then
+    CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -std=c99"
+    if test "x$CLANG" = "xno"; then
+       CFLAGS="$CFLAGS -ffast-math"
+    fi
+
+    # Enable -fvisibility=hidden if using a gcc that supports it
+    save_CFLAGS="$CFLAGS"
+    AC_MSG_CHECKING([whether $CC supports -fvisibility=hidden])
+    VISIBILITY_CFLAGS="-fvisibility=hidden"
+    CFLAGS="$CFLAGS $VISIBILITY_CFLAGS"
+    AC_LINK_IFELSE([AC_LANG_PROGRAM()], AC_MSG_RESULT([yes]),
+		   [VISIBILITY_CFLAGS=""; AC_MSG_RESULT([no])]);
+
+    # Restore CFLAGS; VISIBILITY_CFLAGS are added to it where needed.
+    CFLAGS=$save_CFLAGS
+
+    # Work around aliasing bugs - developers should comment this out
+    CFLAGS="$CFLAGS -fno-strict-aliasing"
+fi
+if test "x$GXX" = xyes; then
+    CXXFLAGS="$CXXFLAGS -Wall"
+
+    # Enable -fvisibility=hidden if using a gcc that supports it
+    save_CXXFLAGS="$CXXFLAGS"
+    AC_MSG_CHECKING([whether $CXX supports -fvisibility=hidden])
+    VISIBILITY_CXXFLAGS="-fvisibility=hidden"
+    CXXFLAGS="$CXXFLAGS $VISIBILITY_CXXFLAGS"
+    AC_LINK_IFELSE([AC_LANG_PROGRAM()], AC_MSG_RESULT([yes]),
+		   [VISIBILITY_CXXFLAGS="" ; AC_MSG_RESULT([no])]);
+
+    # Restore CXXFLAGS; VISIBILITY_CXXFLAGS are added to it where needed.
+    CXXFLAGS=$save_CXXFLAGS
+
+    # Work around aliasing bugs - developers should comment this out
+    CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
+fi
+
+AC_SUBST([VISIBILITY_CFLAGS])
+AC_SUBST([VISIBILITY_CXXFLAGS])
+
+dnl These should be unnecessary, but let the user set them if they want
+AC_ARG_VAR([OPT_FLAGS], [Additional optimization flags for the compiler.
+    Default is to use CFLAGS.])
+AC_ARG_VAR([ARCH_FLAGS], [Additional architecture specific flags for the
+    compiler. Default is to use CFLAGS.])
+AC_SUBST([OPT_FLAGS])
+AC_SUBST([ARCH_FLAGS])
+
+dnl
+dnl Hacks to enable 32 or 64 bit build
+dnl
+AC_ARG_ENABLE([32-bit],
+    [AS_HELP_STRING([--enable-32-bit],
+        [build 32-bit libraries @<:@default=auto@:>@])],
+    [enable_32bit="$enableval"],
+    [enable_32bit=auto]
+)
+if test "x$enable_32bit" = xyes; then
+    if test "x$GCC" = xyes; then
+        CFLAGS="$CFLAGS -m32"
+        ARCH_FLAGS="$ARCH_FLAGS -m32"
+    fi
+    if test "x$GXX" = xyes; then
+        CXXFLAGS="$CXXFLAGS -m32"
+    fi
+fi
+AC_ARG_ENABLE([64-bit],
+    [AS_HELP_STRING([--enable-64-bit],
+        [build 64-bit libraries @<:@default=auto@:>@])],
+    [enable_64bit="$enableval"],
+    [enable_64bit=auto]
+)
+if test "x$enable_64bit" = xyes; then
+    if test "x$GCC" = xyes; then
+        CFLAGS="$CFLAGS -m64"
+    fi
+    if test "x$GXX" = xyes; then
+        CXXFLAGS="$CXXFLAGS -m64"
+    fi
+fi
+
+dnl
+dnl shared/static libraries, mimic libtool options
+dnl
+AC_ARG_ENABLE([static],
+    [AS_HELP_STRING([--enable-static],
+        [build static libraries @<:@default=disabled@:>@])],
+    [enable_static="$enableval"],
+    [enable_static=no]
+)
+case "x$enable_static" in
+xyes|xno ) ;;
+x ) enable_static=no ;;
+* )
+    AC_MSG_ERROR([Static library option '$enable_static' is not a valid])
+    ;;
+esac
+AC_ARG_ENABLE([shared],
+    [AS_HELP_STRING([--disable-shared],
+        [build shared libraries @<:@default=enabled@:>@])],
+    [enable_shared="$enableval"],
+    [enable_shared=yes]
+)
+case "x$enable_shared" in
+xyes|xno ) ;;
+x ) enable_shared=yes ;;
+* )
+    AC_MSG_ERROR([Shared library option '$enable_shared' is not a valid])
+    ;;
+esac
+
+dnl Can't have static and shared libraries, default to static if user
+dnl explicitly requested. If both disabled, set to static since shared
+dnl was explicitly requirested.
+case "x$enable_static$enable_shared" in
+xyesyes )
+    AC_MSG_WARN([Can't build static and shared libraries, disabling shared])
+    enable_shared=no
+    ;;
+xnono )
+    AC_MSG_WARN([Can't disable both static and shared libraries, enabling static])
+    enable_static=yes
+    ;;
+esac
+
+dnl
+dnl mklib options
+dnl
+AC_ARG_VAR([MKLIB_OPTIONS],[Options for the Mesa library script, mklib])
+if test "$enable_static" = yes; then
+    MKLIB_OPTIONS="$MKLIB_OPTIONS -static"
+fi
+AC_SUBST([MKLIB_OPTIONS])
+
+dnl
+dnl other compiler options
+dnl
+AC_ARG_ENABLE([debug],
+    [AS_HELP_STRING([--enable-debug],
+        [use debug compiler flags and macros @<:@default=disabled@:>@])],
+    [enable_debug="$enableval"],
+    [enable_debug=no]
+)
+if test "x$enable_debug" = xyes; then
+    DEFINES="$DEFINES -DDEBUG"
+    if test "x$GCC" = xyes; then
+        CFLAGS="$CFLAGS -g"
+    fi
+    if test "x$GXX" = xyes; then
+        CXXFLAGS="$CXXFLAGS -g"
+    fi
+fi
+
+dnl
+dnl library names
+dnl
+LIB_PREFIX_GLOB='lib'
+LIB_VERSION_SEPARATOR='.'
+if test "$enable_static" = yes; then
+    LIB_EXTENSION='a'
+else
+    case "$host_os" in
+    darwin* )
+        LIB_EXTENSION='dylib' ;;
+    cygwin* )
+        dnl prefix can be 'cyg' or 'lib'
+        LIB_PREFIX_GLOB='???'
+        LIB_VERSION_SEPARATOR='-'
+        LIB_EXTENSION='dll' ;;
+    aix* )
+        LIB_EXTENSION='a' ;;
+    * )
+        LIB_EXTENSION='so' ;;
+    esac
+fi
+
+dnl
+dnl potentially-infringing-but-nobody-knows-for-sure stuff
+dnl
+AC_ARG_ENABLE([texture-float],
+    [AS_HELP_STRING([--enable-texture-float],
+        [enable floating-point textures and renderbuffers @<:@default=disabled@:>@])],
+    [enable_texture_float="$enableval"],
+    [enable_texture_float=no]
+)
+if test "x$enable_texture_float" = xyes; then
+    AC_MSG_WARN([Floating-point textures enabled.])
+    AC_MSG_WARN([Please consult docs/patents.txt with your lawyer before building Mesa.])
+    DEFINES="$DEFINES -DTEXTURE_FLOAT_ENABLED"
+fi
+
+GL_LIB_NAME='lib$(GL_LIB).'${LIB_EXTENSION}
+GLU_LIB_NAME='lib$(GLU_LIB).'${LIB_EXTENSION}
+GLUT_LIB_NAME='lib$(GLUT_LIB).'${LIB_EXTENSION}
+GLW_LIB_NAME='lib$(GLW_LIB).'${LIB_EXTENSION}
+OSMESA_LIB_NAME='lib$(OSMESA_LIB).'${LIB_EXTENSION}
+EGL_LIB_NAME='lib$(EGL_LIB).'${LIB_EXTENSION}
+GLESv1_CM_LIB_NAME='lib$(GLESv1_CM_LIB).'${LIB_EXTENSION}
+GLESv2_LIB_NAME='lib$(GLESv2_LIB).'${LIB_EXTENSION}
+VG_LIB_NAME='lib$(VG_LIB).'${LIB_EXTENSION}
+GLAPI_LIB_NAME='lib$(GLAPI_LIB).'${LIB_EXTENSION}
+WAYLAND_EGL_LIB_NAME='lib$(WAYLAND_EGL_LIB).'${LIB_EXTENSION}
+
+GL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+GLU_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLU_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+GLUT_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLUT_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+GLW_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLW_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+OSMESA_LIB_GLOB=${LIB_PREFIX_GLOB}'$(OSMESA_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+EGL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(EGL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+EGL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(EGL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+GLESv1_CM_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLESv1_CM_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+GLESv2_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLESv2_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+VG_LIB_GLOB=${LIB_PREFIX_GLOB}'$(VG_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+GLAPI_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLAPI_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+WAYLAND_EGL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(WAYLAND_EGL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+
+AC_SUBST([GL_LIB_NAME])
+AC_SUBST([GLU_LIB_NAME])
+AC_SUBST([GLUT_LIB_NAME])
+AC_SUBST([GLW_LIB_NAME])
+AC_SUBST([OSMESA_LIB_NAME])
+AC_SUBST([EGL_LIB_NAME])
+AC_SUBST([GLESv1_CM_LIB_NAME])
+AC_SUBST([GLESv2_LIB_NAME])
+AC_SUBST([VG_LIB_NAME])
+AC_SUBST([GLAPI_LIB_NAME])
+AC_SUBST([WAYLAND_EGL_LIB_NAME])
+
+AC_SUBST([GL_LIB_GLOB])
+AC_SUBST([GLU_LIB_GLOB])
+AC_SUBST([GLUT_LIB_GLOB])
+AC_SUBST([GLW_LIB_GLOB])
+AC_SUBST([OSMESA_LIB_GLOB])
+AC_SUBST([EGL_LIB_GLOB])
+AC_SUBST([GLESv1_CM_LIB_GLOB])
+AC_SUBST([GLESv2_LIB_GLOB])
+AC_SUBST([VG_LIB_GLOB])
+AC_SUBST([GLAPI_LIB_GLOB])
+AC_SUBST([WAYLAND_EGL_LIB_GLOB])
+
+dnl
+dnl Arch/platform-specific settings
+dnl
+AC_ARG_ENABLE([asm],
+    [AS_HELP_STRING([--disable-asm],
+        [disable assembly usage @<:@default=enabled on supported plaforms@:>@])],
+    [enable_asm="$enableval"],
+    [enable_asm=yes]
+)
+asm_arch=""
+ASM_FLAGS=""
+MESA_ASM_SOURCES=""
+GLAPI_ASM_SOURCES=""
+AC_MSG_CHECKING([whether to enable assembly])
+test "x$enable_asm" = xno && AC_MSG_RESULT([no])
+# disable if cross compiling on x86/x86_64 since we must run gen_matypes
+if test "x$enable_asm" = xyes && test "x$cross_compiling" = xyes; then
+    case "$host_cpu" in
+    i?86 | x86_64)
+        enable_asm=no
+        AC_MSG_RESULT([no, cross compiling])
+        ;;
+    esac
+fi
+# check for supported arches
+if test "x$enable_asm" = xyes; then
+    case "$host_cpu" in
+    i?86)
+        case "$host_os" in
+        linux* | *freebsd* | dragonfly* | *netbsd*)
+            test "x$enable_64bit" = xyes && asm_arch=x86_64 || asm_arch=x86
+            ;;
+        esac
+        ;;
+    x86_64)
+        case "$host_os" in
+        linux* | *freebsd* | dragonfly* | *netbsd*)
+            test "x$enable_32bit" = xyes && asm_arch=x86 || asm_arch=x86_64
+            ;;
+        esac
+        ;;
+    powerpc)
+        case "$host_os" in
+        linux*)
+            asm_arch=ppc
+            ;;
+        esac
+        ;;
+    sparc*)
+        case "$host_os" in
+        linux*)
+            asm_arch=sparc
+            ;;
+        esac
+        ;;
+    esac
+
+    case "$asm_arch" in
+    x86)
+        ASM_FLAGS="-DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM"
+        MESA_ASM_SOURCES='$(X86_SOURCES)'
+        GLAPI_ASM_SOURCES='$(X86_API)'
+        AC_MSG_RESULT([yes, x86])
+        ;;
+    x86_64)
+        ASM_FLAGS="-DUSE_X86_64_ASM"
+        MESA_ASM_SOURCES='$(X86-64_SOURCES)'
+        GLAPI_ASM_SOURCES='$(X86-64_API)'
+        AC_MSG_RESULT([yes, x86_64])
+        ;;
+    ppc)
+        ASM_FLAGS="-DUSE_PPC_ASM -DUSE_VMX_ASM"
+        MESA_ASM_SOURCES='$(PPC_SOURCES)'
+        AC_MSG_RESULT([yes, ppc])
+        ;;
+    sparc)
+        ASM_FLAGS="-DUSE_SPARC_ASM"
+        MESA_ASM_SOURCES='$(SPARC_SOURCES)'
+        GLAPI_ASM_SOURCES='$(SPARC_API)'
+        AC_MSG_RESULT([yes, sparc])
+        ;;
+    *)
+        AC_MSG_RESULT([no, platform not supported])
+        ;;
+    esac
+fi
+AC_SUBST([ASM_FLAGS])
+AC_SUBST([MESA_ASM_SOURCES])
+AC_SUBST([GLAPI_ASM_SOURCES])
+
+dnl PIC code macro
+MESA_PIC_FLAGS
+
+dnl Check to see if dlopen is in default libraries (like Solaris, which
+dnl has it in libc), or if libdl is needed to get it.
+AC_CHECK_FUNC([dlopen], [],
+    [AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"])])
+AC_SUBST([DLOPEN_LIBS])
+
+dnl See if posix_memalign is available
+AC_CHECK_FUNC([posix_memalign], [DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"])
+
+dnl SELinux awareness.
+AC_ARG_ENABLE([selinux],
+    [AS_HELP_STRING([--enable-selinux],
+        [Build SELinux-aware Mesa @<:@default=disabled@:>@])],
+    [MESA_SELINUX="$enableval"],
+    [MESA_SELINUX=no])
+if test "x$enable_selinux" = "xyes"; then
+    AC_CHECK_HEADER([selinux/selinux.h],[],
+                    [AC_MSG_ERROR([SELinux headers not found])])
+    AC_CHECK_LIB([selinux],[is_selinux_enabled],[],
+                 [AC_MSG_ERROR([SELinux library not found])])
+    SELINUX_LIBS="-lselinux"
+    DEFINES="$DEFINES -DMESA_SELINUX"
+fi
+
+dnl Determine which APIs to support
+AC_ARG_ENABLE([opengl],
+    [AS_HELP_STRING([--disable-opengl],
+        [disable support for standard OpenGL API @<:@default=no@:>@])],
+    [enable_opengl="$enableval"],
+    [enable_opengl=yes])
+AC_ARG_ENABLE([gles1],
+    [AS_HELP_STRING([--enable-gles1],
+        [enable support for OpenGL ES 1.x API @<:@default=no@:>@])],
+    [enable_gles1="$enableval"],
+    [enable_gles1=no])
+AC_ARG_ENABLE([gles2],
+    [AS_HELP_STRING([--enable-gles2],
+        [enable support for OpenGL ES 2.x API @<:@default=no@:>@])],
+    [enable_gles2="$enableval"],
+    [enable_gles2=no])
+AC_ARG_ENABLE([gles-overlay],
+    [AS_HELP_STRING([--enable-gles-overlay],
+        [DEPRECATED.  Same as --enable-gles1 and --enable-gles2])],
+    [enable_gles1="$enableval"; enable_gles2="$enableval"],
+    [])
+
+AC_ARG_ENABLE([openvg],
+    [AS_HELP_STRING([--enable-openvg],
+        [enable support for OpenVG API @<:@default=no@:>@])],
+    [enable_openvg="$enableval"],
+    [enable_openvg=no])
+
+dnl smooth the transition; should be removed eventually
+if test "x$enable_openvg" = xno; then
+    case "x$with_state_trackers" in
+    x*vega*)
+        AC_MSG_WARN([vega state tracker is enabled without --enable-openvg])
+        enable_openvg=yes
+        ;;
+    esac
+fi
+
+if test "x$enable_opengl" = xno -a \
+        "x$enable_gles1" = xno -a \
+        "x$enable_gles2" = xno -a \
+        "x$enable_openvg" = xno; then
+    AC_MSG_ERROR([at least one API should be enabled])
+fi
+
+API_DEFINES=""
+if test "x$enable_opengl" = xno; then
+    API_DEFINES="$API_DEFINES -DFEATURE_GL=0"
+else
+    API_DEFINES="$API_DEFINES -DFEATURE_GL=1"
+fi
+if test "x$enable_gles1" = xyes; then
+    API_DEFINES="$API_DEFINES -DFEATURE_ES1=1"
+fi
+if test "x$enable_gles2" = xyes; then
+    API_DEFINES="$API_DEFINES -DFEATURE_ES2=1"
+fi
+AC_SUBST([API_DEFINES])
+
+AC_ARG_ENABLE([shared-glapi],
+    [AS_HELP_STRING([--enable-shared-glapi],
+        [EXPERIMENTAL.  Enable shared glapi for OpenGL @<:@default=no@:>@])],
+    [enable_shared_glapi="$enableval"],
+    [enable_shared_glapi=no])
+
+SHARED_GLAPI="0"
+if test "x$enable_shared_glapi" = xyes; then
+    SHARED_GLAPI="1"
+fi
+AC_SUBST([SHARED_GLAPI])
+
+dnl
+dnl Driver configuration. Options are xlib, dri and osmesa right now.
+dnl More later: fbdev, ...
+dnl
+default_driver="xlib"
+
+case "$host_os" in
+linux*)
+    case "$host_cpu" in
+    i*86|x86_64|powerpc*|sparc*) default_driver="dri";;
+    esac
+    ;;
+*freebsd* | dragonfly* | *netbsd*)
+    case "$host_cpu" in
+    i*86|x86_64|powerpc*|sparc*) default_driver="dri";;
+    esac
+    ;;
+esac
+
+if test "x$enable_opengl" = xno; then
+    default_driver="no"
+fi
+
+AC_ARG_WITH([driver],
+    [AS_HELP_STRING([--with-driver=DRIVER],
+        [driver for Mesa: xlib,dri,osmesa @<:@default=dri when available, or xlib@:>@])],
+    [mesa_driver="$withval"],
+    [mesa_driver="$default_driver"])
+dnl Check for valid option
+case "x$mesa_driver" in
+xxlib|xdri|xosmesa)
+    if test "x$enable_opengl" = xno; then
+        AC_MSG_ERROR([Driver '$mesa_driver' requires OpenGL enabled])
+    fi
+    ;;
+xno)
+    ;;
+*)
+    AC_MSG_ERROR([Driver '$mesa_driver' is not a valid option])
+    ;;
+esac
+
+dnl
+dnl Driver specific build directories
+dnl
+
+dnl this variable will be prepended to SRC_DIRS and is not exported
+CORE_DIRS=""
+
+SRC_DIRS=""
+GLU_DIRS="sgi"
+GALLIUM_DIRS="auxiliary drivers state_trackers"
+GALLIUM_TARGET_DIRS=""
+GALLIUM_WINSYS_DIRS="sw"
+GALLIUM_DRIVERS_DIRS="softpipe failover galahad trace rbug noop identity"
+GALLIUM_STATE_TRACKERS_DIRS=""
+
+# build shared-glapi if enabled for OpenGL or if OpenGL ES is enabled
+case "x$enable_shared_glapi$enable_gles1$enable_gles2" in
+x*yes*)
+    CORE_DIRS="$CORE_DIRS mapi/shared-glapi"
+    ;;
+esac
+
+# build glapi if OpenGL is enabled
+if test "x$enable_opengl" = xyes; then
+    CORE_DIRS="$CORE_DIRS mapi/glapi"
+fi
+
+# build es1api if OpenGL ES 1.x is enabled
+if test "x$enable_gles1" = xyes; then
+    CORE_DIRS="$CORE_DIRS mapi/es1api"
+fi
+
+# build es2api if OpenGL ES 2.x is enabled
+if test "x$enable_gles2" = xyes; then
+    CORE_DIRS="$CORE_DIRS mapi/es2api"
+fi
+
+# build vgapi if OpenVG is enabled
+if test "x$enable_openvg" = xyes; then
+    CORE_DIRS="$CORE_DIRS mapi/vgapi"
+fi
+
+# build glsl and mesa if OpenGL or OpenGL ES is enabled
+case "x$enable_opengl$enable_gles1$enable_gles2" in
+x*yes*)
+    CORE_DIRS="$CORE_DIRS glsl mesa"
+    ;;
+esac
+
+case "$mesa_driver" in
+xlib)
+    DRIVER_DIRS="x11"
+    GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/xlib"
+    GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS libgl-xlib"
+    ;;
+dri)
+    SRC_DIRS="$SRC_DIRS glx"
+    DRIVER_DIRS="dri"
+    GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/xlib sw/dri"
+    ;;
+osmesa)
+    DRIVER_DIRS="osmesa"
+    ;;
+no)
+    DRIVER_DRIS=""
+    ;;
+esac
+AC_SUBST([SRC_DIRS])
+AC_SUBST([GLU_DIRS])
+AC_SUBST([DRIVER_DIRS])
+AC_SUBST([GALLIUM_DIRS])
+AC_SUBST([GALLIUM_TARGET_DIRS])
+AC_SUBST([GALLIUM_WINSYS_DIRS])
+AC_SUBST([GALLIUM_DRIVERS_DIRS])
+AC_SUBST([GALLIUM_STATE_TRACKERS_DIRS])
+AC_SUBST([MESA_LLVM])
+
+dnl
+dnl Find out if X is available. The variable have_x is set if libX11 is
+dnl found to mimic AC_PATH_XTRA.
+dnl
+if test -n "$PKG_CONFIG"; then
+    AC_MSG_CHECKING([pkg-config files for X11 are available])
+    PKG_CHECK_EXISTS([x11],[
+        x11_pkgconfig=yes
+        have_x=yes
+        ],[
+        x11_pkgconfig=no
+    ])
+    AC_MSG_RESULT([$x11_pkgconfig])
+else
+    x11_pkgconfig=no
+fi
+dnl Use the autoconf macro if no pkg-config files
+if test "$x11_pkgconfig" = yes; then
+    PKG_CHECK_MODULES([X11], [x11])
+else
+    AC_PATH_XTRA
+    test -z "$X11_CFLAGS" && X11_CFLAGS="$X_CFLAGS"
+    test -z "$X11_LIBS" && X11_LIBS="$X_LIBS -lX11"
+    AC_SUBST([X11_CFLAGS])
+    AC_SUBST([X11_LIBS])
+fi
+
+dnl Try to tell the user that the --x-* options are only used when
+dnl pkg-config is not available. This must be right after AC_PATH_XTRA.
+m4_divert_once([HELP_BEGIN],
+[These options are only used when the X libraries cannot be found by the
+pkg-config utility.])
+
+dnl We need X for xlib and dri, so bomb now if it's not found
+case "$mesa_driver" in
+xlib|dri)
+    if test "$no_x" = yes; then
+        AC_MSG_ERROR([X11 development libraries needed for $mesa_driver driver])
+    fi
+    ;;
+esac
+
+dnl XCB - this is only used for GLX right now
+AC_ARG_ENABLE([xcb],
+    [AS_HELP_STRING([--enable-xcb],
+        [use XCB for GLX @<:@default=disabled@:>@])],
+    [enable_xcb="$enableval"],
+    [enable_xcb=no])
+if test "x$enable_xcb" = xyes; then
+    DEFINES="$DEFINES -DUSE_XCB"
+else
+    enable_xcb=no
+fi
+
+dnl Direct rendering or just indirect rendering
+case "$host_os" in
+gnu*)
+    dnl Disable by default on GNU/Hurd
+    driglx_direct_default="no"
+    ;;
+cygwin*)
+    dnl Disable by default on cygwin
+    driglx_direct_default="no"
+    ;;
+*)
+    driglx_direct_default="yes"
+    ;;
+esac
+AC_ARG_ENABLE([driglx-direct],
+    [AS_HELP_STRING([--disable-driglx-direct],
+        [enable direct rendering in GLX and EGL for DRI \
+            @<:@default=auto@:>@])],
+    [driglx_direct="$enableval"],
+    [driglx_direct="$driglx_direct_default"])
+
+dnl
+dnl libGL configuration per driver
+dnl
+case "$mesa_driver" in
+xlib)
+    if test "$x11_pkgconfig" = yes; then
+        PKG_CHECK_MODULES([XLIBGL], [x11 xext])
+        GL_PC_REQ_PRIV="x11 xext"
+        X11_INCLUDES="$X11_INCLUDES $XLIBGL_CFLAGS"
+        GL_LIB_DEPS="$XLIBGL_LIBS"
+    else
+        # should check these...
+        X11_INCLUDES="$X11_INCLUDES $X_CFLAGS"
+        GL_LIB_DEPS="$X_LIBS -lX11 -lXext"
+        GL_PC_LIB_PRIV="$GL_LIB_DEPS"
+        GL_PC_CFLAGS="$X11_INCLUDES"
+    fi
+    GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS -lm -lpthread"
+    GL_PC_LIB_PRIV="$GL_PC_LIB_PRIV $SELINUX_LIBS -lm -lpthread"
+
+    # if static, move the external libraries to the programs
+    # and empty the libraries for libGL
+    if test "$enable_static" = yes; then
+        APP_LIB_DEPS="$APP_LIB_DEPS $GL_LIB_DEPS"
+        GL_LIB_DEPS=""
+    fi
+    ;;
+dri|no) # these checks are still desired when there is no mesa_driver
+    # DRI must be shared, I think
+    if test "$enable_static" = yes; then
+        AC_MSG_ERROR([Can't use static libraries for DRI drivers])
+    fi
+
+    PKG_CHECK_MODULES([GLPROTO], [glproto >= $GLPROTO_REQUIRED])
+    GL_PC_REQ_PRIV="glproto >= $GLPROTO_REQUIRED"
+    DRI_PC_REQ_PRIV=""
+
+    if test x"$driglx_direct" = xyes; then
+        # Check for libdrm
+        PKG_CHECK_MODULES([LIBDRM], [libdrm >= $LIBDRM_REQUIRED])
+        PKG_CHECK_MODULES([DRI2PROTO], [dri2proto >= $DRI2PROTO_REQUIRED])
+        GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV libdrm >= $LIBDRM_REQUIRED dri2proto >= $DRI2PROTO_REQUIRED"
+        DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED"
+    fi
+
+    # find the DRI deps for libGL
+    if test "$x11_pkgconfig" = yes; then
+        dri_modules="x11 xext xdamage xfixes"
+
+        # add xf86vidmode if available
+        PKG_CHECK_MODULES([XF86VIDMODE], [xxf86vm], HAVE_XF86VIDMODE=yes, HAVE_XF86VIDMODE=no)
+        if test "$HAVE_XF86VIDMODE" = yes ; then
+            dri_modules="$dri_modules xxf86vm"
+        fi
+
+        # add xcb modules if necessary
+        if test "$enable_xcb" = yes; then
+            dri_modules="$dri_modules x11-xcb xcb-glx"
+        fi
+
+        PKG_CHECK_MODULES([DRIGL], [$dri_modules])
+        GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV $dri_modules"
+        X11_INCLUDES="$X11_INCLUDES $DRIGL_CFLAGS"
+        GL_LIB_DEPS="$DRIGL_LIBS"
+    else
+        # should check these...
+        X11_INCLUDES="$X11_INCLUDES $X_CFLAGS"
+        GL_LIB_DEPS="$X_LIBS -lX11 -lXext -lXxf86vm -lXdamage -lXfixes"
+        GL_PC_LIB_PRIV="$GL_LIB_DEPS"
+        GL_PC_CFLAGS="$X11_INCLUDES"
+
+        # XCB can only be used from pkg-config
+        if test "$enable_xcb" = yes; then
+            PKG_CHECK_MODULES([XCB],[x11-xcb xcb-glx])
+            GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV x11-xcb xcb-glx"
+            X11_INCLUDES="$X11_INCLUDES $XCB_CFLAGS"
+            GL_LIB_DEPS="$GL_LIB_DEPS $XCB_LIBS"
+        fi
+    fi
+
+    # need DRM libs, -lpthread, etc.
+    GL_LIB_DEPS="$GL_LIB_DEPS $LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS"
+    GL_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS"
+    GLESv1_CM_LIB_DEPS="$LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS"
+    GLESv1_CM_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS"
+    GLESv2_LIB_DEPS="$LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS"
+    GLESv2_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS"
+    ;;
+osmesa)
+    # No libGL for osmesa
+    GL_LIB_DEPS=""
+    ;;
+esac
+AC_SUBST([GL_LIB_DEPS])
+AC_SUBST([GL_PC_REQ_PRIV])
+AC_SUBST([GL_PC_LIB_PRIV])
+AC_SUBST([GL_PC_CFLAGS])
+AC_SUBST([DRI_PC_REQ_PRIV])
+AC_SUBST([GLESv1_CM_LIB_DEPS])
+AC_SUBST([GLESv1_CM_PC_LIB_PRIV])
+AC_SUBST([GLESv2_LIB_DEPS])
+AC_SUBST([GLESv2_PC_LIB_PRIV])
+
+GLAPI_LIB_DEPS="-lpthread"
+AC_SUBST([GLAPI_LIB_DEPS])
+
+
+dnl Setup default DRI CFLAGS
+DRI_CFLAGS='$(CFLAGS)'
+DRI_CXXFLAGS='$(CXXFLAGS)'
+DRI_LIB_DEPS='$(TOP)/src/mesa/libmesa.a'
+MESA_MODULES='$(TOP)/src/mesa/libmesa.a'
+
+AC_ARG_ENABLE([shared-dricore],
+    [AS_HELP_STRING([--enable-shared-dricore],
+        [link DRI modules with shared core DRI routines @<:@default=disabled@:>@])],
+    [enable_dricore="$enableval"],
+    [enable_dricore=no])
+if test "$mesa_driver" = dri ; then
+   if test "$enable_dricore" = yes ; then
+      if test "$GCC$GXX" != yesyes ; then
+      	 AC_MSG_WARN([Shared dricore requires GCC-compatible rpath handling.  Disabling shared dricore])
+	 enable_dricore=no
+      else
+	 DRICORE_GLSL_LIBS='$(TOP)/$(LIB_DIR)/libglsl.so'
+	 DRICORE_LIBS='$(TOP)/$(LIB_DIR)/libdricore.so'
+	 DRICORE_LIB_DEPS='-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -lglsl'
+      	 DRI_LIB_DEPS='-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore -lglsl'
+      	 DRI_CFLAGS='$(CFLAGS_NOVISIBILITY) -DUSE_DRICORE'
+      	 DRI_CXXFLAGS='$(CXXFLAGS_NOVISIBILITY) -DUSE_DRICORE'
+      	 MESA_MODULES='$(DRICORE_LIBS) $(DRICORE_GLSL_LIBS)'
+      fi
+   fi
+fi
+AC_SUBST([DRICORE_LIBS])
+AC_SUBST([DRICORE_GLSL_LIBS])
+AC_SUBST([DRICORE_LIB_DEPS])
+AC_SUBST([DRI_CXXFLAGS])
+AC_SUBST([DRI_CFLAGS])
+AC_SUBST([MESA_MODULES])
+
+AC_SUBST([HAVE_XF86VIDMODE])
+
+PKG_CHECK_MODULES([LIBDRM_RADEON],
+		  [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED],
+		  HAVE_LIBDRM_RADEON=yes,
+		  HAVE_LIBDRM_RADEON=no)
+
+dnl
+dnl More X11 setup
+dnl
+if test "$mesa_driver" = xlib; then
+    DEFINES="$DEFINES -DUSE_XSHM"
+fi
+
+dnl
+dnl TLS detection
+dnl
+
+AC_ARG_ENABLE([glx-tls],
+    [AS_HELP_STRING([--enable-glx-tls],
+        [enable TLS support in GLX @<:@default=disabled@:>@])],
+    [GLX_USE_TLS="$enableval"],
+    [GLX_USE_TLS=no])
+AC_SUBST(GLX_TLS, ${GLX_USE_TLS})
+
+AS_IF([test "x$GLX_USE_TLS" = xyes],
+      [DEFINES="${DEFINES} -DGLX_USE_TLS -DPTHREADS"])
+
+dnl
+dnl More DRI setup
+dnl
+dnl Directory for DRI drivers
+AC_ARG_WITH([dri-driverdir],
+    [AS_HELP_STRING([--with-dri-driverdir=DIR],
+        [directory for the DRI drivers @<:@${libdir}/dri@:>@])],
+    [DRI_DRIVER_INSTALL_DIR="$withval"],
+    [DRI_DRIVER_INSTALL_DIR='${libdir}/dri'])
+AC_SUBST([DRI_DRIVER_INSTALL_DIR])
+dnl Extra search path for DRI drivers
+AC_ARG_WITH([dri-searchpath],
+    [AS_HELP_STRING([--with-dri-searchpath=DIRS...],
+        [semicolon delimited DRI driver search directories @<:@${libdir}/dri@:>@])],
+    [DRI_DRIVER_SEARCH_DIR="$withval"],
+    [DRI_DRIVER_SEARCH_DIR='${DRI_DRIVER_INSTALL_DIR}'])
+AC_SUBST([DRI_DRIVER_SEARCH_DIR])
+dnl Which drivers to build - default is chosen by platform
+AC_ARG_WITH([dri-drivers],
+    [AS_HELP_STRING([--with-dri-drivers@<:@=DIRS...@:>@],
+        [comma delimited DRI drivers list, e.g.
+        "swrast,i965,radeon" @<:@default=auto@:>@])],
+    [with_dri_drivers="$withval"],
+    [with_dri_drivers=yes])
+if test "x$with_dri_drivers" = x; then
+    with_dri_drivers=no
+fi
+
+dnl If $with_dri_drivers is yes, directories will be added through
+dnl platform checks
+DRI_DIRS=""
+case "$with_dri_drivers" in
+no) ;;
+yes)
+    DRI_DIRS="yes"
+    ;;
+*)
+    # verify the requested driver directories exist
+    dri_drivers=`IFS=', '; echo $with_dri_drivers`
+    for driver in $dri_drivers; do
+        test -d "$srcdir/src/mesa/drivers/dri/$driver" || \
+            AC_MSG_ERROR([DRI driver directory '$driver' doesn't exist])
+    done
+    DRI_DIRS="$dri_drivers"
+    ;;
+esac
+
+dnl Set DRI_DIRS, DEFINES and LIB_DEPS
+if test "$mesa_driver" = dri -o "$mesa_driver" = no; then
+    # Platform specific settings and drivers to build
+    case "$host_os" in
+    linux*)
+        DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"
+        if test "x$driglx_direct" = xyes; then
+            DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"
+        fi
+        DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING -DHAVE_ALIAS"
+
+        case "$host_cpu" in
+        x86_64)
+            # sis is missing because they have not be converted to use
+            # the new interface.  i810 are missing because there is no
+            # x86-64 system where they could *ever* be used.
+            if test "x$DRI_DIRS" = "xyes"; then
+                DRI_DIRS="i915 i965 mach64 mga r128 r200 r300 r600 radeon \
+                    savage tdfx unichrome swrast"
+            fi
+            ;;
+        powerpc*)
+            # Build only the drivers for cards that exist on PowerPC.
+            # At some point MGA will be added, but not yet.
+            if test "x$DRI_DIRS" = "xyes"; then
+                DRI_DIRS="mach64 r128 r200 r300 r600 radeon tdfx swrast"
+            fi
+            ;;
+        sparc*)
+            # Build only the drivers for cards that exist on sparc`
+            if test "x$DRI_DIRS" = "xyes"; then
+                DRI_DIRS="mach64 r128 r200 r300 r600 radeon swrast"
+            fi
+            ;;
+        esac
+        ;;
+    freebsd* | dragonfly* | *netbsd*)
+        DEFINES="$DEFINES -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1"
+        DEFINES="$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS"
+        DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING"
+        if test "x$driglx_direct" = xyes; then
+            DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"
+        fi
+
+        if test "x$DRI_DIRS" = "xyes"; then
+            DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon tdfx \
+                unichrome savage sis swrast"
+        fi
+        ;;
+    gnu*)
+        DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"
+        DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING -DHAVE_ALIAS"
+	;;
+    solaris*)
+        DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"
+        DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING"
+        if test "x$driglx_direct" = xyes; then
+            DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"
+        fi
+        ;;
+    cygwin*)
+        DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"
+        DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING"
+        if test "x$driglx_direct" = xyes; then
+            DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"
+        fi
+        if test "x$DRI_DIRS" = "xyes"; then
+            DRI_DIRS="swrast"
+        fi
+        ;;
+    esac
+
+    # default drivers
+    if test "x$DRI_DIRS" = "xyes"; then
+        DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon \
+            savage sis tdfx unichrome swrast"
+    fi
+
+    DRI_DIRS=`echo "$DRI_DIRS" | $SED 's/  */ /g'`
+
+    # Check for expat
+    if test "$mesa_driver" = dri; then
+        EXPAT_INCLUDES=""
+        EXPAT_LIB=-lexpat
+        AC_ARG_WITH([expat],
+            [AS_HELP_STRING([--with-expat=DIR],
+                [expat install directory])],[
+            EXPAT_INCLUDES="-I$withval/include"
+            CPPFLAGS="$CPPFLAGS $EXPAT_INCLUDES"
+            LDFLAGS="$LDFLAGS -L$withval/$LIB_DIR"
+            EXPAT_LIB="-L$withval/$LIB_DIR -lexpat"
+            ])
+        AC_CHECK_HEADER([expat.h],[],[AC_MSG_ERROR([Expat required for DRI.])])
+        AC_CHECK_LIB([expat],[XML_ParserCreate],[],
+            [AC_MSG_ERROR([Expat required for DRI.])])
+    fi
+
+    # put all the necessary libs together, including possibly libdricore
+    DRI_LIB_DEPS="$DRI_LIB_DEPS $SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIB -lm -lpthread $DLOPEN_LIBS"
+fi
+AC_SUBST([DRI_DIRS])
+AC_SUBST([EXPAT_INCLUDES])
+AC_SUBST([DRI_LIB_DEPS])
+
+case $DRI_DIRS in
+*i915*|*i965*)
+    PKG_CHECK_MODULES([INTEL], [libdrm_intel >= $LIBDRM_INTEL_REQUIRED])
+    ;;
+esac
+
+case $DRI_DIRS in
+*radeon*|*r200*|*r300*|*r600*)
+    if test "x$HAVE_LIBDRM_RADEON" = xyes; then
+	RADEON_CFLAGS="-DHAVE_LIBDRM_RADEON=1 $LIBDRM_RADEON_CFLAGS"
+	RADEON_LDFLAGS=$LIBDRM_RADEON_LIBS
+    fi
+    ;;
+esac
+AC_SUBST([RADEON_CFLAGS])
+AC_SUBST([RADEON_LDFLAGS])
+
+
+dnl
+dnl OSMesa configuration
+dnl
+if test "$mesa_driver" = xlib; then
+    default_gl_osmesa=yes
+else
+    default_gl_osmesa=no
+fi
+AC_ARG_ENABLE([gl-osmesa],
+    [AS_HELP_STRING([--enable-gl-osmesa],
+        [enable OSMesa with libGL @<:@default=enabled for xlib driver@:>@])],
+    [gl_osmesa="$enableval"],
+    [gl_osmesa="$default_gl_osmesa"])
+if test "x$gl_osmesa" = xyes; then
+    if test "x$enable_opengl" = xno; then
+        AC_MSG_ERROR([OpenGL is not available for OSMesa driver])
+    fi
+    if test "$mesa_driver" = osmesa; then
+        AC_MSG_ERROR([libGL is not available for OSMesa driver])
+    else
+        DRIVER_DIRS="$DRIVER_DIRS osmesa"
+    fi
+fi
+
+dnl Configure the channel bits for OSMesa (libOSMesa, libOSMesa16, ...)
+AC_ARG_WITH([osmesa-bits],
+    [AS_HELP_STRING([--with-osmesa-bits=BITS],
+        [OSMesa channel bits and library name: 8, 16, 32 @<:@default=8@:>@])],
+    [osmesa_bits="$withval"],
+    [osmesa_bits=8])
+if test "$mesa_driver" != osmesa && test "x$osmesa_bits" != x8; then
+    AC_MSG_WARN([Ignoring OSMesa channel bits for non-OSMesa driver])
+    osmesa_bits=8
+fi
+case "x$osmesa_bits" in
+x8)
+    OSMESA_LIB=OSMesa
+    ;;
+x16|x32)
+    OSMESA_LIB="OSMesa$osmesa_bits"
+    DEFINES="$DEFINES -DCHAN_BITS=$osmesa_bits -DDEFAULT_SOFTWARE_DEPTH_BITS=31"
+    ;;
+*)
+    AC_MSG_ERROR([OSMesa bits '$osmesa_bits' is not a valid option])
+    ;;
+esac
+AC_SUBST([OSMESA_LIB])
+
+case "$DRIVER_DIRS" in
+*osmesa*)
+    # only link libraries with osmesa if shared
+    if test "$enable_static" = no; then
+        OSMESA_LIB_DEPS="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS"
+    else
+        OSMESA_LIB_DEPS=""
+    fi
+    OSMESA_MESA_DEPS=""
+    OSMESA_PC_LIB_PRIV="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS"
+    ;;
+esac
+AC_SUBST([OSMESA_LIB_DEPS])
+AC_SUBST([OSMESA_MESA_DEPS])
+AC_SUBST([OSMESA_PC_REQ])
+AC_SUBST([OSMESA_PC_LIB_PRIV])
+
+dnl
+dnl EGL configuration
+dnl
+AC_ARG_ENABLE([egl],
+    [AS_HELP_STRING([--disable-egl],
+        [disable EGL library @<:@default=enabled@:>@])],
+    [enable_egl="$enableval"],
+    [enable_egl=yes])
+if test "x$enable_egl" = xno; then
+    if test "x$mesa_driver" = xno; then
+        AC_MSG_ERROR([cannot disable EGL when there is no mesa driver])
+    fi
+    if test "x$enable_openvg" = xyes; then
+        AC_MSG_ERROR([cannot enable OpenVG without EGL])
+    fi
+fi
+if test "x$enable_egl" = xyes; then
+    SRC_DIRS="$SRC_DIRS egl"
+    EGL_LIB_DEPS="$DLOPEN_LIBS $SELINUX_LIBS -lpthread"
+    EGL_DRIVERS_DIRS=""
+    if test "$enable_static" != yes; then
+        # build egl_glx when libGL is built
+        if test "$mesa_driver" = xlib -o "$mesa_driver" = dri; then
+            EGL_DRIVERS_DIRS="glx"
+        fi
+
+        PKG_CHECK_MODULES([LIBUDEV], [libudev > 150],
+                          [have_libudev=yes],[have_libudev=no])
+        if test "$have_libudev" = yes; then
+            DEFINES="$DEFINES -DHAVE_LIBUDEV"
+        fi
+        if test "$mesa_driver" = dri; then
+            # build egl_dri2 when xcb-dri2 is available
+            PKG_CHECK_MODULES([XCB_DRI2], [x11-xcb xcb-dri2 xcb-xfixes],
+            		  [have_xcb_dri2=yes],[have_xcb_dri2=no])
+            
+            if test "$have_xcb_dri2" = yes; then
+                EGL_DRIVER_DRI2=dri2
+                DEFINES="$DEFINES -DHAVE_XCB_DRI2"
+                # workaround a bug in xcb-dri2 generated by xcb-proto 1.6
+                AC_CHECK_LIB(xcb-dri2, xcb_dri2_connect_alignment_pad, [],
+                          [DEFINES="$DEFINES -DXCB_DRI2_CONNECT_DEVICE_NAME_BROKEN"])
+            fi
+	fi
+
+        EGL_DRIVERS_DIRS="$EGL_DRIVERS_DIRS $EGL_DRIVER_DRI2"
+    fi
+fi
+AC_SUBST([EGL_LIB_DEPS])
+AC_SUBST([EGL_DRIVERS_DIRS])
+
+dnl
+dnl GLU configuration
+dnl
+AC_ARG_ENABLE([glu],
+    [AS_HELP_STRING([--disable-glu],
+        [enable OpenGL Utility library @<:@default=enabled@:>@])],
+    [enable_glu="$enableval"],
+    [enable_glu=yes])
+
+if test "x$enable_glu" = xyes -a "x$mesa_driver" = xno; then
+    AC_MSG_NOTICE([Disabling GLU since there is no OpenGL driver])
+    enable_glu=no
+fi
+
+if test "x$enable_glu" = xyes; then
+    SRC_DIRS="$SRC_DIRS glu"
+
+    case "$mesa_driver" in
+    osmesa)
+        # Link libGLU to libOSMesa instead of libGL
+        GLU_LIB_DEPS=""
+        GLU_PC_REQ="osmesa"
+        if test "$enable_static" = no; then
+            GLU_MESA_DEPS='-l$(OSMESA_LIB)'
+        else
+            GLU_MESA_DEPS=""
+        fi
+        ;;
+    *)
+        # If static, empty GLU_LIB_DEPS and add libs for programs to link
+        GLU_PC_REQ="gl"
+        GLU_PC_LIB_PRIV="-lm"
+        if test "$enable_static" = no; then
+            GLU_LIB_DEPS="-lm"
+            GLU_MESA_DEPS='-l$(GL_LIB)'
+        else
+            GLU_LIB_DEPS=""
+            GLU_MESA_DEPS=""
+            APP_LIB_DEPS="$APP_LIB_DEPS -lstdc++"
+        fi
+        ;;
+    esac
+fi
+if test "$enable_static" = no; then
+    GLU_LIB_DEPS="$GLU_LIB_DEPS $OS_CPLUSPLUS_LIBS"
+fi
+GLU_PC_LIB_PRIV="$GLU_PC_LIB_PRIV $OS_CPLUSPLUS_LIBS"
+AC_SUBST([GLU_LIB_DEPS])
+AC_SUBST([GLU_MESA_DEPS])
+AC_SUBST([GLU_PC_REQ])
+AC_SUBST([GLU_PC_REQ_PRIV])
+AC_SUBST([GLU_PC_LIB_PRIV])
+AC_SUBST([GLU_PC_CFLAGS])
+
+dnl
+dnl GLw configuration
+dnl
+AC_ARG_ENABLE([glw],
+    [AS_HELP_STRING([--disable-glw],
+        [enable Xt/Motif widget library @<:@default=enabled@:>@])],
+    [enable_glw="$enableval"],
+    [enable_glw=yes])
+dnl Don't build GLw on osmesa
+if test "x$enable_glw" = xyes; then
+    case "$mesa_driver" in
+    osmesa|no)
+        AC_MSG_NOTICE([Disabling GLw since there is no OpenGL driver])
+        enable_glw=no
+        ;;
+    esac
+fi
+AC_ARG_ENABLE([motif],
+    [AS_HELP_STRING([--enable-motif],
+        [use Motif widgets in GLw @<:@default=disabled@:>@])],
+    [enable_motif="$enableval"],
+    [enable_motif=no])
+
+if test "x$enable_glw" = xyes; then
+    SRC_DIRS="$SRC_DIRS glw"
+    if test "$x11_pkgconfig" = yes; then
+        PKG_CHECK_MODULES([GLW],[x11 xt])
+        GLW_PC_REQ_PRIV="x11 xt"
+        GLW_LIB_DEPS="$GLW_LIBS"
+    else
+        # should check these...
+        GLW_LIB_DEPS="$X_LIBS -lXt -lX11"
+        GLW_PC_LIB_PRIV="$GLW_LIB_DEPS"
+        GLW_PC_CFLAGS="$X11_INCLUDES"
+    fi
+
+    GLW_SOURCES="GLwDrawA.c"
+    MOTIF_CFLAGS=
+    if test "x$enable_motif" = xyes; then
+        GLW_SOURCES="$GLW_SOURCES GLwMDrawA.c"
+        AC_PATH_PROG([MOTIF_CONFIG], [motif-config], [no])
+        if test "x$MOTIF_CONFIG" != xno; then
+            MOTIF_CFLAGS=`$MOTIF_CONFIG --cflags`
+            MOTIF_LIBS=`$MOTIF_CONFIG --libs`
+        else
+            AC_CHECK_HEADER([Xm/PrimitiveP.h], [],
+                [AC_MSG_ERROR([Can't locate Motif headers])])
+            AC_CHECK_LIB([Xm], [XmGetPixmap], [MOTIF_LIBS="-lXm"],
+                [AC_MSG_ERROR([Can't locate Motif Xm library])])
+        fi
+        # MOTIF_LIBS is prepended to GLW_LIB_DEPS since Xm needs Xt/X11
+        GLW_LIB_DEPS="$MOTIF_LIBS $GLW_LIB_DEPS"
+        GLW_PC_LIB_PRIV="$MOTIF_LIBS $GLW_PC_LIB_PRIV"
+        GLW_PC_CFLAGS="$MOTIF_CFLAGS $GLW_PC_CFLAGS"
+    fi
+
+    # If static, empty GLW_LIB_DEPS and add libs for programs to link
+    GLW_PC_LIB_PRIV="$GLW_PC_LIB_PRIV"
+    if test "$enable_static" = no; then
+        GLW_MESA_DEPS='-l$(GL_LIB)'
+        GLW_LIB_DEPS="$GLW_LIB_DEPS"
+    else
+        APP_LIB_DEPS="$APP_LIB_DEPS $GLW_LIB_DEPS"
+        GLW_LIB_DEPS=""
+        GLW_MESA_DEPS=""
+    fi
+fi
+AC_SUBST([GLW_LIB_DEPS])
+AC_SUBST([GLW_MESA_DEPS])
+AC_SUBST([GLW_SOURCES])
+AC_SUBST([MOTIF_CFLAGS])
+AC_SUBST([GLW_PC_REQ_PRIV])
+AC_SUBST([GLW_PC_LIB_PRIV])
+AC_SUBST([GLW_PC_CFLAGS])
+
+dnl
+dnl GLUT configuration
+dnl
+if test -f "$srcdir/include/GL/glut.h"; then
+    default_glut=yes
+else
+    default_glut=no
+fi
+AC_ARG_ENABLE([glut],
+    [AS_HELP_STRING([--disable-glut],
+        [enable GLUT library @<:@default=enabled if source available@:>@])],
+    [enable_glut="$enableval"],
+    [enable_glut="$default_glut"])
+
+dnl Don't build glut on osmesa
+if test "x$enable_glut" = xyes; then
+    case "$mesa_driver" in
+    osmesa|no)
+        AC_MSG_NOTICE([Disabling glut since there is no OpenGL driver])
+        enable_glut=no
+        ;;
+    esac
+fi
+dnl Can't build glut if GLU not available
+if test "x$enable_glu$enable_glut" = xnoyes; then
+    AC_MSG_WARN([Disabling glut since GLU is disabled])
+    enable_glut=no
+fi
+
+if test "x$enable_glut" = xyes; then
+    SRC_DIRS="$SRC_DIRS glut/glx"
+    if test "$x11_pkgconfig" = yes; then
+        PKG_CHECK_MODULES([GLUT],[x11 xmu xi])
+        GLUT_PC_REQ_PRIV="x11 xmu xi"
+        GLUT_LIB_DEPS="$GLUT_LIBS"
+    else
+        # should check these...
+        GLUT_LIB_DEPS="$X_LIBS -lX11 -lXmu -lXi"
+        GLUT_PC_LIB_PRIV="$GLUT_LIB_DEPS"
+        GLUT_PC_CFLAGS="$X11_INCLUDES"
+    fi
+    if test "x$GCC" = xyes; then
+        GLUT_CFLAGS="$GLUT_CFLAGS -fexceptions"
+    fi
+    GLUT_LIB_DEPS="$GLUT_LIB_DEPS -lm"
+    GLUT_PC_LIB_PRIV="$GLUT_PC_LIB_PRIV -lm"
+
+    # If static, empty GLUT_LIB_DEPS and add libs for programs to link
+    if test "$enable_static" = no; then
+        GLUT_MESA_DEPS='-l$(GLU_LIB) -l$(GL_LIB)'
+    else
+        APP_LIB_DEPS="$APP_LIB_DEPS $GLUT_LIB_DEPS"
+        GLUT_LIB_DEPS=""
+        GLUT_MESA_DEPS=""
+    fi
+fi
+AC_SUBST([GLUT_LIB_DEPS])
+AC_SUBST([GLUT_MESA_DEPS])
+AC_SUBST([GLUT_CFLAGS])
+AC_SUBST([GLUT_PC_REQ_PRIV])
+AC_SUBST([GLUT_PC_LIB_PRIV])
+AC_SUBST([GLUT_PC_CFLAGS])
+
+dnl
+dnl Program library dependencies
+dnl    Only libm is added here if necessary as the libraries should
+dnl    be pulled in by the linker
+dnl
+if test "x$APP_LIB_DEPS" = x; then
+    case "$host_os" in
+    solaris*)
+        APP_LIB_DEPS="-lX11 -lsocket -lnsl -lm"
+        ;;
+    cygwin*)
+        APP_LIB_DEPS="-lX11"
+        ;;
+    *)
+        APP_LIB_DEPS="-lm"
+        ;;
+    esac
+fi
+AC_SUBST([APP_LIB_DEPS])
+AC_SUBST([PROGRAM_DIRS])
+
+dnl
+dnl Gallium configuration
+dnl
+AC_ARG_ENABLE([gallium],
+    [AS_HELP_STRING([--disable-gallium],
+        [build gallium @<:@default=enabled@:>@])],
+    [enable_gallium="$enableval"],
+    [enable_gallium=yes])
+if test "x$enable_gallium" = xno -a "x$enable_openvg" = xyes; then
+    AC_MSG_ERROR([cannot enable OpenVG without Gallium])
+fi
+if test "x$enable_gallium" = xyes; then
+    SRC_DIRS="$SRC_DIRS gallium gallium/winsys gallium/targets"
+    AC_PATH_PROG([LLVM_CONFIG], [llvm-config], [no])
+fi
+
+AC_SUBST([LLVM_CFLAGS])
+AC_SUBST([LLVM_LIBS])
+AC_SUBST([LLVM_LDFLAGS])
+AC_SUBST([LLVM_VERSION])
+
+dnl
+dnl Gallium state trackers configuration
+dnl
+
+AC_ARG_ENABLE([gallium-egl],
+    [AS_HELP_STRING([--enable-gallium-egl],
+        [enable gallium EGL state tracker @<:@default=auto@:>@])],
+    [enable_gallium_egl="$enableval"],
+    [enable_gallium_egl=auto])
+if test "x$enable_gallium_egl" = xauto; then
+    case "$mesa_driver" in
+    dri|no)
+        enable_gallium_egl=$enable_egl
+        ;;
+    *)
+        enable_gallium_egl=$enable_openvg
+        ;;
+    esac
+fi
+case "x$enable_egl$enable_gallium_egl" in
+xnoyes)
+    AC_MSG_ERROR([cannot build Gallium EGL state tracker without EGL])
+esac
+
+AC_ARG_WITH([state-trackers],
+    [AS_HELP_STRING([--with-state-trackers@<:@=DIRS...@:>@],
+        [comma delimited state_trackers list, e.g.
+        "egl,glx" @<:@default=auto@:>@])],
+    [with_state_trackers="$withval"],
+    [with_state_trackers=yes])
+
+case "$with_state_trackers" in
+no)
+    GALLIUM_STATE_TRACKERS_DIRS=""
+    ;;
+yes)
+    # look at what else is built
+    case "$mesa_driver" in
+    xlib)
+        GALLIUM_STATE_TRACKERS_DIRS=glx
+        ;;
+    dri)
+        GALLIUM_STATE_TRACKERS_DIRS="dri"
+        HAVE_ST_DRI="yes"
+        # Have only tested st/xorg on 1.6.0 servers
+        PKG_CHECK_MODULES(XORG, [xorg-server >= 1.6.0 libdrm >= $LIBDRM_XORG_REQUIRED libkms >= $LIBKMS_XORG_REQUIRED],
+            HAVE_ST_XORG="yes"; GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS xorg",
+            HAVE_ST_XORG="no")
+        ;;
+    esac
+
+    if test "x$enable_egl" = xyes; then
+        if test "$enable_openvg" = yes; then
+            GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS vega"
+            st_egl="yes"
+        fi
+
+        if test "$enable_gallium_egl" = yes; then
+            GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS egl"
+            HAVE_ST_EGL="yes"
+        fi
+    fi
+    ;;
+*)
+    # verify the requested state tracker exist
+    state_trackers=""
+    _state_trackers=`IFS=', '; echo $with_state_trackers`
+    for tracker in $_state_trackers; do
+        case "$tracker" in
+        dri)
+            if test "x$mesa_driver" != xdri; then
+                AC_MSG_ERROR([cannot build dri state tracker without mesa driver set to dri])
+            fi
+            HAVE_ST_DRI="yes"
+            ;;
+        egl)
+            if test "x$enable_egl" != xyes; then
+                AC_MSG_ERROR([cannot build egl state tracker without EGL library])
+            fi
+            HAVE_ST_EGL="yes"
+            ;;
+        xorg)
+            PKG_CHECK_MODULES([XORG], [xorg-server >= 1.6.0])
+            PKG_CHECK_MODULES([LIBDRM_XORG], [libdrm >= $LIBDRM_XORG_REQUIRED])
+            PKG_CHECK_MODULES([LIBKMS_XORG], [libkms >= $LIBKMS_XORG_REQUIRED])
+            HAVE_ST_XORG="yes"
+            ;;
+        vega)
+            if test "x$enable_openvg" != xyes; then
+                AC_MSG_ERROR([cannot build vega state tracker without --enable-openvg])
+            fi
+            have_st_vega="yes"
+            ;;
+        esac
+
+	if test -n "$tracker"; then
+            test -d "$srcdir/src/gallium/state_trackers/$tracker" || \
+                AC_MSG_ERROR([state tracker '$tracker' doesn't exist])
+            if test -n "$state_trackers"; then
+                state_trackers="$state_trackers $tracker"
+            else
+                state_trackers="$tracker"
+            fi
+        fi
+    done
+    GALLIUM_STATE_TRACKERS_DIRS="$state_trackers"
+
+    # append --enable-openvg/--enable-gallium-egl to --with-state-trackers
+    if test "x$have_st_vega" != xyes -a "x$enable_openvg" = xyes; then
+        AC_MSG_ERROR([--with-state-trackers specified but vega is missing])
+    fi
+    if test "x$HAVE_ST_EGL" != xyes -a "x$enable_gallium_egl" = xyes; then
+        AC_MSG_ERROR([--with-state-trackers specified but egl is missing])
+    fi
+    ;;
+esac
+
+
+EGL_CLIENT_APIS=""
+VG_LIB_DEPS=""
+
+case "x$enable_opengl$enable_gles1$enable_gles2" in
+x*yes*)
+    EGL_CLIENT_APIS="$EGL_CLIENT_APIS "'$(GL_LIB)'
+    ;;
+esac
+if test "x$enable_openvg" = xyes; then
+    EGL_CLIENT_APIS="$EGL_CLIENT_APIS "'$(VG_LIB)'
+    VG_LIB_DEPS="$VG_LIB_DEPS $SELINUX_LIBS -lpthread"
+fi
+
+AC_SUBST([VG_LIB_DEPS])
+AC_SUBST([EGL_CLIENT_APIS])
+
+if test "x$HAVE_ST_EGL" = xyes; then
+	GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS egl"
+fi
+
+if test "x$HAVE_ST_XORG" = xyes; then
+    PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
+        HAVE_XEXTPROTO_71="yes"; DEFINES="$DEFINES -DHAVE_XEXTPROTO_71",
+        HAVE_XEXTPROTO_71="no")
+fi
+
+AC_ARG_WITH([egl-platforms],
+    [AS_HELP_STRING([--with-egl-platforms@<:@=DIRS...@:>@],
+        [comma delimited native platforms libEGL supports, e.g.
+        "x11,drm" @<:@default=auto@:>@])],
+    [with_egl_platforms="$withval"],
+    [with_egl_platforms=yes])
+AC_ARG_WITH([egl-displays],
+    [AS_HELP_STRING([--with-egl-displays@<:@=DIRS...@:>@],
+        [DEPRECATED.  Use --with-egl-platforms instead])],
+    [with_egl_platforms="$withval"])
+
+EGL_PLATFORMS=""
+WAYLAND_EGL_LIB_DEPS=""
+
+case "$with_egl_platforms" in
+yes)
+    if test "x$enable_egl" = xyes && test "x$mesa_driver" != xosmesa; then
+        EGL_PLATFORMS="x11"
+        if test "$mesa_driver" = dri; then
+            EGL_PLATFORMS="$EGL_PLATFORMS drm"
+        fi
+    fi
+    ;;
+*)
+    if test "x$enable_egl" != xyes; then
+        AC_MSG_ERROR([cannot build egl state tracker without EGL library])
+    fi
+    # verify the requested driver directories exist
+    egl_platforms=`IFS=', '; echo $with_egl_platforms`
+    for plat in $egl_platforms; do
+        test -d "$srcdir/src/gallium/state_trackers/egl/$plat" || \
+            AC_MSG_ERROR([EGL platform '$plat' doesn't exist])
+        if test "$plat" = "fbdev"; then
+                GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/fbdev"
+        fi
+	if test "$plat" = "wayland"; then
+		PKG_CHECK_MODULES([WAYLAND], [wayland-client wayland-server],, \
+				  [AC_MSG_ERROR([cannot find libwayland-client])])
+		WAYLAND_EGL_LIB_DEPS="$WAYLAND_LIBS $LIBDRM_LIBS"
+                GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/wayland"
+	fi
+    done
+    EGL_PLATFORMS="$egl_platforms"
+    ;;
+esac
+AC_SUBST([EGL_PLATFORMS])
+
+AC_SUBST([WAYLAND_EGL_LIB_DEPS])
+WAYLAND_EGL_PC_REQ_PRIV="wayland-client libdrm"
+WAYLAND_EGL_PC_LIB_PRIV=
+WAYLAND_EGL_PC_CFLAGS=
+
+AC_SUBST([WAYLAND_EGL_PC_REQ_PRIV])
+AC_SUBST([WAYLAND_EGL_PC_LIB_PRIV])
+AC_SUBST([WAYLAND_EGL_PC_CFLAGS])
+
+
+AC_ARG_WITH([egl-driver-dir],
+    [AS_HELP_STRING([--with-egl-driver-dir=DIR],
+                    [directory for EGL drivers [[default=${libdir}/egl]]])],
+    [EGL_DRIVER_INSTALL_DIR="$withval"],
+    [EGL_DRIVER_INSTALL_DIR='${libdir}/egl'])
+AC_SUBST([EGL_DRIVER_INSTALL_DIR])
+
+AC_ARG_WITH([xorg-driver-dir],
+    [AS_HELP_STRING([--with-xorg-driver-dir=DIR],
+                    [Default xorg driver directory[[default=${libdir}/xorg/modules/drivers]]])],
+    [XORG_DRIVER_INSTALL_DIR="$withval"],
+    [XORG_DRIVER_INSTALL_DIR="${libdir}/xorg/modules/drivers"])
+AC_SUBST([XORG_DRIVER_INSTALL_DIR])
+
+AC_ARG_WITH([max-width],
+    [AS_HELP_STRING([--with-max-width=N],
+                    [Maximum framebuffer width (4096)])],
+    [DEFINES="${DEFINES} -DMAX_WIDTH=${withval}";
+     AS_IF([test "${withval}" -gt "4096"],
+           [AC_MSG_WARN([Large framebuffer: see s_tritemp.h comments.])])]
+)
+AC_ARG_WITH([max-height],
+    [AS_HELP_STRING([--with-max-height=N],
+                    [Maximum framebuffer height (4096)])],
+    [DEFINES="${DEFINES} -DMAX_HEIGHT=${withval}";
+     AS_IF([test "${withval}" -gt "4096"],
+           [AC_MSG_WARN([Large framebuffer: see s_tritemp.h comments.])])]
+)
+
+dnl
+dnl Gallium LLVM
+dnl
+AC_ARG_ENABLE([gallium-llvm],
+    [AS_HELP_STRING([--enable-gallium-llvm],
+        [build gallium LLVM support @<:@default=enabled on x86/x86_64@:>@])],
+    [enable_gallium_llvm="$enableval"],
+    [enable_gallium_llvm=auto])
+if test "x$enable_gallium_llvm" = xauto; then
+    case "$host_cpu" in
+    i*86|x86_64) enable_gallium_llvm=yes;;
+    esac
+fi
+if test "x$enable_gallium_llvm" = xyes; then
+    if test "x$LLVM_CONFIG" != xno; then
+	LLVM_VERSION=`$LLVM_CONFIG --version`
+	LLVM_CFLAGS=`$LLVM_CONFIG --cppflags`
+	LLVM_LIBS="`$LLVM_CONFIG --libs` -lstdc++"
+
+	LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
+	GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS llvmpipe"
+	DEFINES="$DEFINES -DGALLIUM_LLVMPIPE -D__STDC_CONSTANT_MACROS"
+	MESA_LLVM=1
+    else
+	MESA_LLVM=0
+    fi
+else
+    MESA_LLVM=0
+fi
+
+dnl
+dnl Gallium helper functions
+dnl
+gallium_check_st() {
+    if test "x$HAVE_ST_DRI" = xyes || test "x$HAVE_ST_XORG" = xyes; then
+         GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS $1"
+    fi
+    if test "x$HAVE_ST_DRI" = xyes && test "x$2" != x; then
+         GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $2"
+    fi
+    if test "x$HAVE_ST_XORG" = xyes && test "x$3" != x; then
+         GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $3"
+    fi
+}
+
+
+dnl
+dnl Gallium SVGA configuration
+dnl
+AC_ARG_ENABLE([gallium-svga],
+    [AS_HELP_STRING([--enable-gallium-svga],
+        [build gallium SVGA @<:@default=disabled@:>@])],
+    [enable_gallium_svga="$enableval"],
+    [enable_gallium_svga=auto])
+if test "x$enable_gallium_svga" = xyes; then
+    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS svga"
+    gallium_check_st "svga/drm" "dri-vmwgfx" "xorg-vmwgfx"
+elif test "x$enable_gallium_svga" = xauto; then
+    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS svga"
+fi
+
+dnl
+dnl Gallium i915 configuration
+dnl
+AC_ARG_ENABLE([gallium-i915],
+    [AS_HELP_STRING([--enable-gallium-i915],
+        [build gallium i915 @<:@default=disabled@:>@])],
+    [enable_gallium_i915="$enableval"],
+    [enable_gallium_i915=auto])
+if test "x$enable_gallium_i915" = xyes; then
+    GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS i915/sw"
+    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915"
+    gallium_check_st "i915/drm" "dri-i915" "xorg-i915"
+elif test "x$enable_gallium_i915" = xauto; then
+    GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS i915/sw"
+    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915"
+fi
+
+dnl
+dnl Gallium i965 configuration
+dnl
+AC_ARG_ENABLE([gallium-i965],
+    [AS_HELP_STRING([--enable-gallium-i965],
+        [build gallium i965 @<:@default=disabled@:>@])],
+    [enable_gallium_i965="$enableval"],
+    [enable_gallium_i965=auto])
+if test "x$enable_gallium_i965" = xyes; then
+    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i965"
+    gallium_check_st "i965/drm" "dri-i965" "xorg-i965"
+elif test "x$enable_gallium_i965" = xauto; then
+    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i965"
+fi
+
+dnl
+dnl Gallium Radeon r300g configuration
+dnl
+AC_ARG_ENABLE([gallium-r300],
+    [AS_HELP_STRING([--enable-gallium-r300],
+        [build gallium r300 @<:@default=build DRI driver only@:>@])],
+    [enable_gallium_r300="$enableval"],
+    [enable_gallium_r300=auto])
+
+if test "$mesa_driver" != dri ; then
+    if test "x$enable_gallium_r300" = xauto; then
+      enable_gallium_r300=no
+    fi
+fi
+
+if test "x$enable_gallium_r300" != xno; then
+    if test "x$MESA_LLVM" = x0; then
+        case "$host_cpu" in
+        i*86|x86_64) AC_MSG_ERROR([LLVM is required to build Gallium R300 on x86 and x86_64]);;
+        esac
+    fi
+fi
+if test "x$enable_gallium_r300" = xauto; then
+    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
+    gallium_check_st "radeon/drm" "dri-r300"
+elif test "x$enable_gallium_r300" = xyes; then
+    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
+    gallium_check_st "radeon/drm" "dri-r300" "xorg-radeon"
+fi
+
+dnl
+dnl Gallium Radeon r600g configuration
+dnl
+AC_ARG_ENABLE([gallium-r600],
+    [AS_HELP_STRING([--enable-gallium-r600],
+        [build gallium r600 @<:@default=disabled@:>@])],
+    [enable_gallium_r600="$enableval"],
+    [enable_gallium_r600=auto])
+if test "x$enable_gallium_r600" = xyes; then
+    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r600"
+    gallium_check_st "r600/drm" "dri-r600"
+fi
+
+dnl
+dnl Gallium Nouveau configuration
+dnl
+AC_ARG_ENABLE([gallium-nouveau],
+    [AS_HELP_STRING([--enable-gallium-nouveau],
+        [build gallium nouveau @<:@default=disabled@:>@])],
+    [enable_gallium_nouveau="$enableval"],
+    [enable_gallium_nouveau=no])
+if test "x$enable_gallium_nouveau" = xyes; then
+    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau nvfx nv50 nvc0"
+    gallium_check_st "nouveau/drm" "dri-nouveau" "xorg-nouveau"
+fi
+
+dnl
+dnl Gallium swrast configuration
+dnl
+AC_ARG_ENABLE([gallium-swrast],
+    [AS_HELP_STRING([--enable-gallium-swrast],
+        [build gallium swrast @<:@default=auto@:>@])],
+    [enable_gallium_swrast="$enableval"],
+    [enable_gallium_swrast=auto])
+if test "x$enable_gallium_swrast" = xyes || test "x$enable_gallium_swrast" = xauto; then
+    if test "x$HAVE_ST_DRI" = xyes; then
+        GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS dri-swrast"
+    fi
+fi
+
+dnl prepend CORE_DIRS to SRC_DIRS
+SRC_DIRS="$CORE_DIRS $SRC_DIRS"
+
+dnl Restore LDFLAGS and CPPFLAGS
+LDFLAGS="$_SAVE_LDFLAGS"
+CPPFLAGS="$_SAVE_CPPFLAGS"
+
+dnl Substitute the config
+AC_CONFIG_FILES([configs/autoconf])
+
+dnl Replace the configs/current symlink
+AC_CONFIG_COMMANDS([configs],[
+if test -f configs/current || test -L configs/current; then
+    rm -f configs/current
+fi
+ln -s autoconf configs/current
+])
+
+AC_OUTPUT
+
+dnl
+dnl Output some configuration info for the user
+dnl
+echo ""
+echo "        prefix:          $prefix"
+echo "        exec_prefix:     $exec_prefix"
+echo "        libdir:          $libdir"
+echo "        includedir:      $includedir"
+
+dnl API info
+echo ""
+echo "        OpenGL:          $enable_opengl (ES1: $enable_gles1 ES2: $enable_gles2)"
+echo "        OpenVG:          $enable_openvg"
+
+dnl Driver info
+echo ""
+echo "        Driver:          $mesa_driver"
+if test "$mesa_driver" != no; then
+    if echo "$DRIVER_DIRS" | grep 'osmesa' >/dev/null 2>&1; then
+        echo "        OSMesa:          lib$OSMESA_LIB"
+    else
+        echo "        OSMesa:          no"
+    fi
+    if test "$mesa_driver" = dri; then
+        # cleanup the drivers var
+        dri_dirs=`echo $DRI_DIRS | $SED 's/^ *//;s/  */ /;s/ *$//'`
+        if test "x$DRI_DIRS" = x; then
+            echo "        DRI drivers:     no"
+        else
+            echo "        DRI drivers:     $dri_dirs"
+        fi
+        echo "        DRI driver dir:  $DRI_DRIVER_INSTALL_DIR"
+        echo "        Use XCB:         $enable_xcb"
+        echo "        Shared dricore:  $enable_dricore"
+    fi
+fi
+echo ""
+echo "        GLU:             $enable_glu"
+echo "        GLw:             $enable_glw (Motif: $enable_motif)"
+echo "        glut:            $enable_glut"
+
+dnl EGL
+echo ""
+echo "        EGL:             $enable_egl"
+if test "$enable_egl" = yes; then
+    echo "        EGL platforms:   $EGL_PLATFORMS"
+
+    egl_drivers=""
+    for d in $EGL_DRIVERS_DIRS; do
+        egl_drivers="$egl_drivers builtin:egl_$d"
+    done
+
+    if test "$enable_gallium" = yes -a "$HAVE_ST_EGL" = yes; then
+        echo "        EGL drivers:    ${egl_drivers} egl_gallium"
+        echo "        EGL Gallium STs:$EGL_CLIENT_APIS"
+    else
+        echo "        EGL drivers:    $egl_drivers"
+    fi
+fi
+
+echo ""
+if test "x$MESA_LLVM" = x1; then
+    echo "        llvm:            yes"
+    echo "        llvm-config:     $LLVM_CONFIG"
+    echo "        llvm-version:    $LLVM_VERSION"
+else
+    echo "        llvm:            no"
+fi
+
+echo ""
+if echo "$SRC_DIRS" | grep 'gallium' >/dev/null 2>&1; then
+    echo "        Gallium:         yes"
+    echo "        Gallium dirs:    $GALLIUM_DIRS"
+    echo "        Target dirs:     $GALLIUM_TARGET_DIRS"
+    echo "        Winsys dirs:     $GALLIUM_WINSYS_DIRS"
+    echo "        Driver dirs:     $GALLIUM_DRIVERS_DIRS"
+    echo "        Trackers dirs:   $GALLIUM_STATE_TRACKERS_DIRS"
+else
+    echo "        Gallium:         no"
+fi
+
+dnl Libraries
+echo ""
+echo "        Shared libs:     $enable_shared"
+echo "        Static libs:     $enable_static"
+
+dnl Compiler options
+# cleanup the CFLAGS/CXXFLAGS/DEFINES vars
+cflags=`echo $CFLAGS $OPT_FLAGS $PIC_FLAGS $ARCH_FLAGS | \
+    $SED 's/^ *//;s/  */ /;s/ *$//'`
+cxxflags=`echo $CXXFLAGS $OPT_FLAGS $PIC_FLAGS $ARCH_FLAGS | \
+    $SED 's/^ *//;s/  */ /;s/ *$//'`
+defines=`echo $DEFINES $ASM_FLAGS | $SED 's/^ *//;s/  */ /;s/ *$//'`
+echo ""
+echo "        CFLAGS:          $cflags"
+echo "        CXXFLAGS:        $cxxflags"
+echo "        Macros:          $defines"
+echo ""
+echo "        PYTHON2:         $PYTHON2"
+
+echo ""
+echo "        Run '${MAKE-make}' to build Mesa"
+echo ""
diff --git a/mesalib/src/mesa/main/shaderapi.c b/mesalib/src/mesa/main/shaderapi.c
index 03155b7ac..1e237a95d 100644
--- a/mesalib/src/mesa/main/shaderapi.c
+++ b/mesalib/src/mesa/main/shaderapi.c
@@ -1593,6 +1593,8 @@ _mesa_UseProgramObjectARB(GLhandleARB program)
    struct gl_transform_feedback_object *obj =
       ctx->TransformFeedback.CurrentObject;
 
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
    if (obj->Active) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
                   "glUseProgram(transform feedback active)");
diff --git a/mesalib/src/mesa/state_tracker/st_cb_blit.c b/mesalib/src/mesa/state_tracker/st_cb_blit.c
index 25c95c7b9..416be194d 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_blit.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_blit.c
@@ -109,6 +109,11 @@ st_BlitFramebuffer(struct gl_context *ctx,
       dstY1 = tmp;
    }
 
+   /* Disable conditional rendering. */
+   if (st->render_condition) {
+      st->pipe->render_condition(st->pipe, NULL, 0);
+   }
+
    if (mask & GL_COLOR_BUFFER_BIT) {
       struct gl_renderbuffer_attachment *srcAtt =
          &readFB->Attachment[readFB->_ColorReadBufferIndex];
@@ -121,7 +126,7 @@ st_BlitFramebuffer(struct gl_context *ctx,
          struct pipe_surface *dstSurf = dstRb->surface;
 
          if (!srcObj->pt)
-            return;
+            goto done;
 
          util_blit_pixels(st->blit, srcObj->pt, srcAtt->TextureLevel,
                           srcX0, srcY0, srcX1, srcY1,
@@ -199,6 +204,13 @@ st_BlitFramebuffer(struct gl_context *ctx,
          }
       }
    }
+
+done:
+   /* Restore conditional rendering state. */
+   if (st->render_condition) {
+      st->pipe->render_condition(st->pipe, st->render_condition,
+                                 st->condition_mode);
+   }
 }
 
 
diff --git a/mesalib/src/mesa/state_tracker/st_cb_condrender.c b/mesalib/src/mesa/state_tracker/st_cb_condrender.c
index 679527569..64c6c117f 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_condrender.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_condrender.c
@@ -1,96 +1,103 @@
-/**************************************************************************

- * 

- * Copyright 2009 VMware, Inc.

- * All Rights Reserved.

- * 

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the

- * "Software"), to deal in the Software without restriction, including

- * without limitation the rights to use, copy, modify, merge, publish,

- * distribute, sub license, and/or sell copies of the Software, and to

- * permit persons to whom the Software is furnished to do so, subject to

- * the following conditions:

- * 

- * The above copyright notice and this permission notice (including the

- * next paragraph) shall be included in all copies or substantial portions

- * of the Software.

- * 

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.

- * IN NO EVENT SHALL THE AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR

- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- * 

- **************************************************************************/

-

-

-/**

- * glBegin/EndCondtionalRender functions

- *

- * \author Brian Paul

- */

-

-

-#include "main/imports.h"

-#include "main/context.h"

-

-#include "pipe/p_context.h"

-#include "pipe/p_defines.h"

-#include "st_context.h"

-#include "st_cb_queryobj.h"

-#include "st_cb_condrender.h"

-

-

-/**

- * Called via ctx->Driver.BeginConditionalRender()

- */

-static void

-st_BeginConditionalRender(struct gl_context *ctx, struct gl_query_object *q,

-                          GLenum mode)

-{

-   struct st_query_object *stq = st_query_object(q);

-   struct pipe_context *pipe = st_context(ctx)->pipe;

-   uint m;

-

-   switch (mode) {

-   case GL_QUERY_WAIT:

-      m = PIPE_RENDER_COND_WAIT;

-      break;

-   case GL_QUERY_NO_WAIT:

-      m = PIPE_RENDER_COND_NO_WAIT;

-      break;

-   case GL_QUERY_BY_REGION_WAIT:

-      m = PIPE_RENDER_COND_BY_REGION_WAIT;

-      break;

-   case GL_QUERY_BY_REGION_NO_WAIT:

-      m = PIPE_RENDER_COND_BY_REGION_NO_WAIT;

-      break;

-   default:

-      assert(0 && "bad mode in st_BeginConditionalRender");

-      m = PIPE_RENDER_COND_WAIT;

-   }

-

-   pipe->render_condition(pipe, stq->pq, m);

-}

-

-

-/**

- * Called via ctx->Driver.BeginConditionalRender()

- */

-static void

-st_EndConditionalRender(struct gl_context *ctx, struct gl_query_object *q)

-{

-   struct pipe_context *pipe = st_context(ctx)->pipe;

-   (void) q;

-   pipe->render_condition(pipe, NULL, 0);

-}

-

-

-

-void st_init_cond_render_functions(struct dd_function_table *functions)

-{

-   functions->BeginConditionalRender = st_BeginConditionalRender;

-   functions->EndConditionalRender = st_EndConditionalRender;

-}

+/**************************************************************************
+ * 
+ * Copyright 2009 VMware, Inc.
+ * All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ **************************************************************************/
+
+
+/**
+ * glBegin/EndCondtionalRender functions
+ *
+ * \author Brian Paul
+ */
+
+
+#include "main/imports.h"
+#include "main/context.h"
+
+#include "pipe/p_context.h"
+#include "pipe/p_defines.h"
+#include "st_context.h"
+#include "st_cb_queryobj.h"
+#include "st_cb_condrender.h"
+
+
+/**
+ * Called via ctx->Driver.BeginConditionalRender()
+ */
+static void
+st_BeginConditionalRender(struct gl_context *ctx, struct gl_query_object *q,
+                          GLenum mode)
+{
+   struct st_query_object *stq = st_query_object(q);
+   struct st_context *st = st_context(ctx);
+   struct pipe_context *pipe = st->pipe;
+   uint m;
+
+   switch (mode) {
+   case GL_QUERY_WAIT:
+      m = PIPE_RENDER_COND_WAIT;
+      break;
+   case GL_QUERY_NO_WAIT:
+      m = PIPE_RENDER_COND_NO_WAIT;
+      break;
+   case GL_QUERY_BY_REGION_WAIT:
+      m = PIPE_RENDER_COND_BY_REGION_WAIT;
+      break;
+   case GL_QUERY_BY_REGION_NO_WAIT:
+      m = PIPE_RENDER_COND_BY_REGION_NO_WAIT;
+      break;
+   default:
+      assert(0 && "bad mode in st_BeginConditionalRender");
+      m = PIPE_RENDER_COND_WAIT;
+   }
+
+   st->render_condition = stq->pq;
+   st->condition_mode = m;
+
+   pipe->render_condition(pipe, stq->pq, m);
+}
+
+
+/**
+ * Called via ctx->Driver.BeginConditionalRender()
+ */
+static void
+st_EndConditionalRender(struct gl_context *ctx, struct gl_query_object *q)
+{
+   struct st_context *st = st_context(ctx);
+   struct pipe_context *pipe = st->pipe;
+   (void) q;
+
+   pipe->render_condition(pipe, NULL, 0);
+   st->render_condition = NULL;
+}
+
+
+
+void st_init_cond_render_functions(struct dd_function_table *functions)
+{
+   functions->BeginConditionalRender = st_BeginConditionalRender;
+   functions->EndConditionalRender = st_EndConditionalRender;
+}
diff --git a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
index 29c1df4ae..965fbcd1d 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -1247,7 +1247,8 @@ blit_copy_pixels(struct gl_context *ctx, GLint srcx, GLint srcy,
        !ctx->VertexProgram.Enabled &&
        !ctx->Shader.CurrentFragmentProgram &&
        st_fb_orientation(ctx->ReadBuffer) == st_fb_orientation(ctx->DrawBuffer) &&
-       ctx->DrawBuffer->_NumColorDrawBuffers == 1) {
+       ctx->DrawBuffer->_NumColorDrawBuffers == 1 &&
+       !ctx->Query.CondRenderQuery) {
       struct st_renderbuffer *rbRead, *rbDraw;
       GLint drawX, drawY;
 
diff --git a/mesalib/src/mesa/state_tracker/st_cb_fbo.c b/mesalib/src/mesa/state_tracker/st_cb_fbo.c
index 2e87d202c..64424f776 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_fbo.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_fbo.c
@@ -1,665 +1,662 @@
-/**************************************************************************

- * 

- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.

- * All Rights Reserved.

- * 

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the

- * "Software"), to deal in the Software without restriction, including

- * without limitation the rights to use, copy, modify, merge, publish,

- * distribute, sub license, and/or sell copies of the Software, and to

- * permit persons to whom the Software is furnished to do so, subject to

- * the following conditions:

- * 

- * The above copyright notice and this permission notice (including the

- * next paragraph) shall be included in all copies or substantial portions

- * of the Software.

- * 

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.

- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR

- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- * 

- **************************************************************************/

-

-

-/**

- * Framebuffer/renderbuffer functions.

- *

- * \author Brian Paul

- */

-

-

-#include "main/imports.h"

-#include "main/context.h"

-#include "main/fbobject.h"

-#include "main/framebuffer.h"

-#include "main/macros.h"

-#include "main/mfeatures.h"

-#include "main/renderbuffer.h"

-

-#include "pipe/p_context.h"

-#include "pipe/p_defines.h"

-#include "pipe/p_screen.h"

-#include "st_context.h"

-#include "st_cb_fbo.h"

-#include "st_cb_flush.h"

-#include "st_format.h"

-#include "st_texture.h"

-#include "st_manager.h"

-

-#include "util/u_format.h"

-#include "util/u_inlines.h"

-#include "util/u_surface.h"

-

-

-/**

- * gl_renderbuffer::AllocStorage()

- * This is called to allocate the original drawing surface, and

- * during window resize.

- */

-static GLboolean

-st_renderbuffer_alloc_storage(struct gl_context * ctx,

-                              struct gl_renderbuffer *rb,

-                              GLenum internalFormat,

-                              GLuint width, GLuint height)

-{

-   struct st_context *st = st_context(ctx);

-   struct pipe_context *pipe = st->pipe;

-   struct pipe_screen *screen = st->pipe->screen;

-   struct st_renderbuffer *strb = st_renderbuffer(rb);

-   enum pipe_format format;

-   struct pipe_surface surf_tmpl;

-

-   if (strb->format != PIPE_FORMAT_NONE)

-      format = strb->format;

-   else

-      format = st_choose_renderbuffer_format(screen, internalFormat,

-                                             rb->NumSamples);

-

-   if (format == PIPE_FORMAT_NONE) {

-      return FALSE;

-   }

-

-   /* init renderbuffer fields */

-   strb->Base.Width  = width;

-   strb->Base.Height = height;

-   strb->Base.Format = st_pipe_format_to_mesa_format(format);

-   strb->Base._BaseFormat = _mesa_base_fbo_format(ctx, internalFormat);

-   strb->Base.DataType = st_format_datatype(format);

-   strb->format = format;

-

-   strb->defined = GL_FALSE;  /* undefined contents now */

-

-   if (strb->software) {

-      size_t size;

-      

-      free(strb->data);

-

-      assert(strb->format != PIPE_FORMAT_NONE);

-      

-      strb->stride = util_format_get_stride(strb->format, width);

-      size = util_format_get_2d_size(strb->format, strb->stride, height);

-      

-      strb->data = malloc(size);

-      

-      return strb->data != NULL;

-   }

-   else {

-      struct pipe_resource template;

-    

-      /* Free the old surface and texture

-       */

-      pipe_surface_reference( &strb->surface, NULL );

-      pipe_resource_reference( &strb->texture, NULL );

-      pipe_sampler_view_reference(&strb->sampler_view, NULL);

-

-      /* Setup new texture template.

-       */

-      memset(&template, 0, sizeof(template));

-      template.target = st->internal_target;

-      template.format = format;

-      template.width0 = width;

-      template.height0 = height;

-      template.depth0 = 1;

-      template.array_size = 1;

-      template.last_level = 0;

-      template.nr_samples = rb->NumSamples;

-      if (util_format_is_depth_or_stencil(format)) {

-         template.bind = PIPE_BIND_DEPTH_STENCIL;

-      }

-      else {

-         template.bind = (PIPE_BIND_DISPLAY_TARGET |

-                          PIPE_BIND_RENDER_TARGET);

-      }

-

-      strb->texture = screen->resource_create(screen, &template);

-

-      if (!strb->texture) 

-         return FALSE;

-

-      memset(&surf_tmpl, 0, sizeof(surf_tmpl));

-      u_surface_default_template(&surf_tmpl, strb->texture, template.bind);

-      strb->surface = pipe->create_surface(pipe,

-                                           strb->texture,

-                                           &surf_tmpl);

-      if (strb->surface) {

-         assert(strb->surface->texture);

-         assert(strb->surface->format);

-         assert(strb->surface->width == width);

-         assert(strb->surface->height == height);

-      }

-

-      return strb->surface != NULL;

-   }

-}

-

-

-/**

- * gl_renderbuffer::Delete()

- */

-static void

-st_renderbuffer_delete(struct gl_renderbuffer *rb)

-{

-   struct st_renderbuffer *strb = st_renderbuffer(rb);

-   ASSERT(strb);

-   pipe_surface_reference(&strb->surface, NULL);

-   pipe_resource_reference(&strb->texture, NULL);

-   pipe_sampler_view_reference(&strb->sampler_view, NULL);

-   free(strb->data);

-   free(strb);

-}

-

-

-/**

- * gl_renderbuffer::GetPointer()

- */

-static void *

-null_get_pointer(struct gl_context * ctx, struct gl_renderbuffer *rb,

-                 GLint x, GLint y)

-{

-   /* By returning NULL we force all software rendering to go through

-    * the span routines.

-    */

-#if 0

-   assert(0);  /* Should never get called with softpipe */

-#endif

-   return NULL;

-}

-

-

-/**

- * Called via ctx->Driver.NewFramebuffer()

- */

-static struct gl_framebuffer *

-st_new_framebuffer(struct gl_context *ctx, GLuint name)

-{

-   /* XXX not sure we need to subclass gl_framebuffer for pipe */

-   return _mesa_new_framebuffer(ctx, name);

-}

-

-

-/**

- * Called via ctx->Driver.NewRenderbuffer()

- */

-static struct gl_renderbuffer *

-st_new_renderbuffer(struct gl_context *ctx, GLuint name)

-{

-   struct st_renderbuffer *strb = ST_CALLOC_STRUCT(st_renderbuffer);

-   if (strb) {

-      _mesa_init_renderbuffer(&strb->Base, name);

-      strb->Base.Delete = st_renderbuffer_delete;

-      strb->Base.AllocStorage = st_renderbuffer_alloc_storage;

-      strb->Base.GetPointer = null_get_pointer;

-      strb->format = PIPE_FORMAT_NONE;

-      return &strb->Base;

-   }

-   return NULL;

-}

-

-

-/**

- * Allocate a renderbuffer for a an on-screen window (not a user-created

- * renderbuffer).  The window system code determines the format.

- */

-struct gl_renderbuffer *

-st_new_renderbuffer_fb(enum pipe_format format, int samples, boolean sw)

-{

-   struct st_renderbuffer *strb;

-

-   strb = ST_CALLOC_STRUCT(st_renderbuffer);

-   if (!strb) {

-      _mesa_error(NULL, GL_OUT_OF_MEMORY, "creating renderbuffer");

-      return NULL;

-   }

-

-   _mesa_init_renderbuffer(&strb->Base, 0);

-   strb->Base.ClassID = 0x4242; /* just a unique value */

-   strb->Base.NumSamples = samples;

-   strb->Base.Format = st_pipe_format_to_mesa_format(format);

-   strb->Base._BaseFormat = _mesa_get_format_base_format(strb->Base.Format);

-   strb->Base.DataType = st_format_datatype(format);

-   strb->format = format;

-   strb->software = sw;

-   

-   switch (format) {

-   case PIPE_FORMAT_R8G8B8A8_UNORM:

-   case PIPE_FORMAT_B8G8R8A8_UNORM:

-   case PIPE_FORMAT_A8R8G8B8_UNORM:

-   case PIPE_FORMAT_R8G8B8X8_UNORM:

-   case PIPE_FORMAT_B8G8R8X8_UNORM:

-   case PIPE_FORMAT_X8R8G8B8_UNORM:

-   case PIPE_FORMAT_B5G5R5A1_UNORM:

-   case PIPE_FORMAT_B4G4R4A4_UNORM:

-   case PIPE_FORMAT_B5G6R5_UNORM:

-      strb->Base.InternalFormat = GL_RGBA;

-      break;

-   case PIPE_FORMAT_Z16_UNORM:

-      strb->Base.InternalFormat = GL_DEPTH_COMPONENT16;

-      break;

-   case PIPE_FORMAT_Z32_UNORM:

-      strb->Base.InternalFormat = GL_DEPTH_COMPONENT32;

-      break;

-   case PIPE_FORMAT_Z24_UNORM_S8_USCALED:

-   case PIPE_FORMAT_S8_USCALED_Z24_UNORM:

-   case PIPE_FORMAT_Z24X8_UNORM:

-   case PIPE_FORMAT_X8Z24_UNORM:

-      strb->Base.InternalFormat = GL_DEPTH24_STENCIL8_EXT;

-      break;

-   case PIPE_FORMAT_S8_USCALED:

-      strb->Base.InternalFormat = GL_STENCIL_INDEX8_EXT;

-      break;

-   case PIPE_FORMAT_R16G16B16A16_SNORM:

-      strb->Base.InternalFormat = GL_RGBA16;

-      break;

-   case PIPE_FORMAT_R8_UNORM:

-      strb->Base.InternalFormat = GL_R8;

-      break;

-   case PIPE_FORMAT_R8G8_UNORM:

-      strb->Base.InternalFormat = GL_RG8;

-      break;

-   case PIPE_FORMAT_R16_UNORM:

-      strb->Base.InternalFormat = GL_R16;

-      break;

-   case PIPE_FORMAT_R16G16_UNORM:

-      strb->Base.InternalFormat = GL_RG16;

-      break;

-   default:

-      _mesa_problem(NULL,

-		    "Unexpected format in st_new_renderbuffer_fb");

-      free(strb);

-      return NULL;

-   }

-

-   /* st-specific methods */

-   strb->Base.Delete = st_renderbuffer_delete;

-   strb->Base.AllocStorage = st_renderbuffer_alloc_storage;

-   strb->Base.GetPointer = null_get_pointer;

-

-   /* surface is allocated in st_renderbuffer_alloc_storage() */

-   strb->surface = NULL;

-

-   return &strb->Base;

-}

-

-

-

-

-/**

- * Called via ctx->Driver.BindFramebufferEXT().

- */

-static void

-st_bind_framebuffer(struct gl_context *ctx, GLenum target,

-                    struct gl_framebuffer *fb, struct gl_framebuffer *fbread)

-{

-

-}

-

-/**

- * Called by ctx->Driver.FramebufferRenderbuffer

- */

-static void

-st_framebuffer_renderbuffer(struct gl_context *ctx, 

-                            struct gl_framebuffer *fb,

-                            GLenum attachment,

-                            struct gl_renderbuffer *rb)

-{

-   /* XXX no need for derivation? */

-   _mesa_framebuffer_renderbuffer(ctx, fb, attachment, rb);

-}

-

-

-/**

- * Called by ctx->Driver.RenderTexture

- */

-static void

-st_render_texture(struct gl_context *ctx,

-                  struct gl_framebuffer *fb,

-                  struct gl_renderbuffer_attachment *att)

-{

-   struct st_context *st = st_context(ctx);

-   struct pipe_context *pipe = st->pipe;

-   struct st_renderbuffer *strb;

-   struct gl_renderbuffer *rb;

-   struct pipe_resource *pt = st_get_texobj_resource(att->Texture);

-   struct st_texture_object *stObj;

-   const struct gl_texture_image *texImage;

-   struct pipe_surface surf_tmpl;

-

-   /* When would this fail?  Perhaps assert? */

-   if (!pt) 

-      return;

-

-   /* get pointer to texture image we're rendeing to */

-   texImage = _mesa_get_attachment_teximage(att);

-

-   /* create new renderbuffer which wraps the texture image */

-   rb = st_new_renderbuffer(ctx, 0);

-   if (!rb) {

-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glFramebufferTexture()");

-      return;

-   }

-

-   _mesa_reference_renderbuffer(&att->Renderbuffer, rb);

-   assert(rb->RefCount == 1);

-   rb->AllocStorage = NULL; /* should not get called */

-   strb = st_renderbuffer(rb);

-

-   assert(strb->Base.RefCount > 0);

-

-   /* get the texture for the texture object */

-   stObj = st_texture_object(att->Texture);

-

-   /* point renderbuffer at texobject */

-   strb->rtt = stObj;

-   strb->rtt_level = att->TextureLevel;

-   strb->rtt_face = att->CubeMapFace;

-   strb->rtt_slice = att->Zoffset;

-

-   rb->Width = texImage->Width2;

-   rb->Height = texImage->Height2;

-   rb->_BaseFormat = texImage->_BaseFormat;

-   /*printf("***** render to texture level %d: %d x %d\n", att->TextureLevel, rb->Width, rb->Height);*/

-

-   /*printf("***** pipe texture %d x %d\n", pt->width0, pt->height0);*/

-

-   pipe_resource_reference( &strb->texture, pt );

-

-   pipe_surface_reference(&strb->surface, NULL);

-

-   pipe_sampler_view_reference(&strb->sampler_view,

-                               st_get_texture_sampler_view(stObj, pipe));

-

-   assert(strb->rtt_level <= strb->texture->last_level);

-

-   /* new surface for rendering into the texture */

-   memset(&surf_tmpl, 0, sizeof(surf_tmpl));

-   surf_tmpl.format = ctx->Color.sRGBEnabled ? strb->texture->format : util_format_linear(strb->texture->format);

-   surf_tmpl.usage = PIPE_BIND_RENDER_TARGET;

-   surf_tmpl.u.tex.level = strb->rtt_level;

-   surf_tmpl.u.tex.first_layer = strb->rtt_face + strb->rtt_slice;

-   surf_tmpl.u.tex.last_layer = strb->rtt_face + strb->rtt_slice;

-   strb->surface = pipe->create_surface(pipe,

-                                        strb->texture,

-                                        &surf_tmpl);

-

-   strb->format = pt->format;

-

-   strb->Base.Format = st_pipe_format_to_mesa_format(pt->format);

-   strb->Base.DataType = st_format_datatype(pt->format);

-

-   /*

-   printf("RENDER TO TEXTURE obj=%p pt=%p surf=%p  %d x %d\n",

-          att->Texture, pt, strb->surface, rb->Width, rb->Height);

-   */

-

-   /* Invalidate buffer state so that the pipe's framebuffer state

-    * gets updated.

-    * That's where the new renderbuffer (which we just created) gets

-    * passed to the pipe as a (color/depth) render target.

-    */

-   st_invalidate_state(ctx, _NEW_BUFFERS);

-}

-

-

-/**

- * Called via ctx->Driver.FinishRenderTexture.

- */

-static void

-st_finish_render_texture(struct gl_context *ctx,

-                         struct gl_renderbuffer_attachment *att)

-{

-   struct st_renderbuffer *strb = st_renderbuffer(att->Renderbuffer);

-

-   if (!strb)

-      return;

-

-   strb->rtt = NULL;

-

-   /*

-   printf("FINISH RENDER TO TEXTURE surf=%p\n", strb->surface);

-   */

-

-   /* restore previous framebuffer state */

-   st_invalidate_state(ctx, _NEW_BUFFERS);

-}

-

-

-/**

- * Validate a renderbuffer attachment for a particular set of bindings.

- */

-static GLboolean

-st_validate_attachment(struct gl_context *ctx,

-		       struct pipe_screen *screen,

-		       const struct gl_renderbuffer_attachment *att,

-		       unsigned bindings)

-{

-   const struct st_texture_object *stObj = st_texture_object(att->Texture);

-   enum pipe_format format;

-   gl_format texFormat;

-

-   /* Only validate texture attachments for now, since

-    * st_renderbuffer_alloc_storage makes sure that

-    * the format is supported.

-    */

-   if (att->Type != GL_TEXTURE)

-      return GL_TRUE;

-

-   if (!stObj)

-      return GL_FALSE;

-

-   format = stObj->pt->format;

-   texFormat = _mesa_get_attachment_teximage_const(att)->TexFormat;

-

-   /* If the encoding is sRGB and sRGB rendering cannot be enabled,

-    * check for linear format support instead.

-    * Later when we create a surface, we change the format to a linear one. */

-   if (!ctx->Const.sRGBCapable &&

-       _mesa_get_format_color_encoding(texFormat) == GL_SRGB) {

-      const gl_format linearFormat = _mesa_get_srgb_format_linear(texFormat);

-      format = st_mesa_format_to_pipe_format(linearFormat);

-   }

-

-   return screen->is_format_supported(screen, format,

-                                      PIPE_TEXTURE_2D,

-                                      stObj->pt->nr_samples, bindings);

-}

-

-

-/**

- * Check if two renderbuffer attachments name a combined depth/stencil

- * renderbuffer.

- */

-GLboolean

-st_is_depth_stencil_combined(const struct gl_renderbuffer_attachment *depth,

-                             const struct gl_renderbuffer_attachment *stencil)

-{

-   assert(depth && stencil);

-

-   if (depth->Type == stencil->Type) {

-      if (depth->Type == GL_RENDERBUFFER_EXT &&

-          depth->Renderbuffer == stencil->Renderbuffer)

-         return GL_TRUE;

-

-      if (depth->Type == GL_TEXTURE &&

-          depth->Texture == stencil->Texture)

-         return GL_TRUE;

-   }

-

-   return GL_FALSE;

-}

- 

-

-/**

- * Check that the framebuffer configuration is valid in terms of what

- * the driver can support.

- *

- * For Gallium we only supports combined Z+stencil, not separate buffers.

- */

-static void

-st_validate_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb)

-{

-   struct st_context *st = st_context(ctx);

-   struct pipe_screen *screen = st->pipe->screen;

-   const struct gl_renderbuffer_attachment *depth =

-         &fb->Attachment[BUFFER_DEPTH];

-   const struct gl_renderbuffer_attachment *stencil =

-         &fb->Attachment[BUFFER_STENCIL];

-   GLuint i;

-   enum pipe_format first_format = PIPE_FORMAT_NONE;

-   boolean mixed_formats =

-         screen->get_param(screen, PIPE_CAP_MIXED_COLORBUFFER_FORMATS) != 0;

-

-   if (depth->Type && stencil->Type && depth->Type != stencil->Type) {

-      fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;

-      return;

-   }

-   if (depth->Type == GL_RENDERBUFFER_EXT &&

-       stencil->Type == GL_RENDERBUFFER_EXT &&

-       depth->Renderbuffer != stencil->Renderbuffer) {

-      fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;

-      return;

-   }

-   if (depth->Type == GL_TEXTURE &&

-       stencil->Type == GL_TEXTURE &&

-       depth->Texture != stencil->Texture) {

-      fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;

-      return;

-   }

-

-   if (!st_validate_attachment(ctx,

-                               screen,

-                               depth,

-			       PIPE_BIND_DEPTH_STENCIL)) {

-      fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;

-      return;

-   }

-   if (!st_validate_attachment(ctx,

-                               screen,

-                               stencil,

-			       PIPE_BIND_DEPTH_STENCIL)) {

-      fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;

-      return;

-   }

-   for (i = 0; i < ctx->Const.MaxColorAttachments; i++) {

-      struct gl_renderbuffer_attachment *att =

-            &fb->Attachment[BUFFER_COLOR0 + i];

-      enum pipe_format format;

-

-      if (!st_validate_attachment(ctx,

-                                  screen,

-				  att,

-				  PIPE_BIND_RENDER_TARGET)) {

-	 fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;

-	 return;

-      }

-

-      if (!mixed_formats) {

-         /* Disallow mixed formats. */

-         if (att->Type != GL_NONE) {

-            format = st_renderbuffer(att->Renderbuffer)->surface->format;

-         } else {

-            continue;

-         }

-

-         if (first_format == PIPE_FORMAT_NONE) {

-            first_format = format;

-         } else if (format != first_format) {

-            fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;

-            return;

-         }

-      }

-   }

-}

-

-

-/**

- * Called via glDrawBuffer.

- */

-static void

-st_DrawBuffers(struct gl_context *ctx, GLsizei count, const GLenum *buffers)

-{

-   struct st_context *st = st_context(ctx);

-   struct gl_framebuffer *fb = ctx->DrawBuffer;

-   GLuint i;

-

-   (void) count;

-   (void) buffers;

-

-   /* add the renderbuffers on demand */

-   for (i = 0; i < fb->_NumColorDrawBuffers; i++) {

-      gl_buffer_index idx = fb->_ColorDrawBufferIndexes[i];

-      st_manager_add_color_renderbuffer(st, fb, idx);

-   }

-}

-

-

-/**

- * Called via glReadBuffer.

- */

-static void

-st_ReadBuffer(struct gl_context *ctx, GLenum buffer)

-{

-   struct st_context *st = st_context(ctx);

-   struct gl_framebuffer *fb = ctx->ReadBuffer;

-

-   (void) buffer;

-

-   /* add the renderbuffer on demand */

-   st_manager_add_color_renderbuffer(st, fb, fb->_ColorReadBufferIndex);

-}

-

-

-void st_init_fbo_functions(struct dd_function_table *functions)

-{

-#if FEATURE_EXT_framebuffer_object

-   functions->NewFramebuffer = st_new_framebuffer;

-   functions->NewRenderbuffer = st_new_renderbuffer;

-   functions->BindFramebuffer = st_bind_framebuffer;

-   functions->FramebufferRenderbuffer = st_framebuffer_renderbuffer;

-   functions->RenderTexture = st_render_texture;

-   functions->FinishRenderTexture = st_finish_render_texture;

-   functions->ValidateFramebuffer = st_validate_framebuffer;

-#endif

-   /* no longer needed by core Mesa, drivers handle resizes...

-   functions->ResizeBuffers = st_resize_buffers;

-   */

-

-   functions->DrawBuffers = st_DrawBuffers;

-   functions->ReadBuffer = st_ReadBuffer;

-}

-

-/* XXX unused ? */

-struct pipe_sampler_view *

-st_get_renderbuffer_sampler_view(struct st_renderbuffer *rb,

-                                 struct pipe_context *pipe)

-{

-   if (!rb->sampler_view) {

-      rb->sampler_view = st_create_texture_sampler_view(pipe, rb->texture);

-   }

-

-   return rb->sampler_view;

-}

+/**************************************************************************
+ * 
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ **************************************************************************/
+
+
+/**
+ * Framebuffer/renderbuffer functions.
+ *
+ * \author Brian Paul
+ */
+
+
+#include "main/imports.h"
+#include "main/context.h"
+#include "main/fbobject.h"
+#include "main/framebuffer.h"
+#include "main/macros.h"
+#include "main/mfeatures.h"
+#include "main/renderbuffer.h"
+
+#include "pipe/p_context.h"
+#include "pipe/p_defines.h"
+#include "pipe/p_screen.h"
+#include "st_context.h"
+#include "st_cb_fbo.h"
+#include "st_cb_flush.h"
+#include "st_format.h"
+#include "st_texture.h"
+#include "st_manager.h"
+
+#include "util/u_format.h"
+#include "util/u_inlines.h"
+#include "util/u_surface.h"
+
+
+/**
+ * gl_renderbuffer::AllocStorage()
+ * This is called to allocate the original drawing surface, and
+ * during window resize.
+ */
+static GLboolean
+st_renderbuffer_alloc_storage(struct gl_context * ctx,
+                              struct gl_renderbuffer *rb,
+                              GLenum internalFormat,
+                              GLuint width, GLuint height)
+{
+   struct st_context *st = st_context(ctx);
+   struct pipe_context *pipe = st->pipe;
+   struct pipe_screen *screen = st->pipe->screen;
+   struct st_renderbuffer *strb = st_renderbuffer(rb);
+   enum pipe_format format;
+   struct pipe_surface surf_tmpl;
+
+   format = st_choose_renderbuffer_format(screen, internalFormat,
+                                          rb->NumSamples);
+
+   if (format == PIPE_FORMAT_NONE) {
+      return FALSE;
+   }
+
+   /* init renderbuffer fields */
+   strb->Base.Width  = width;
+   strb->Base.Height = height;
+   strb->Base.Format = st_pipe_format_to_mesa_format(format);
+   strb->Base._BaseFormat = _mesa_base_fbo_format(ctx, internalFormat);
+   strb->Base.DataType = st_format_datatype(format);
+   strb->format = format;
+
+   strb->defined = GL_FALSE;  /* undefined contents now */
+
+   if (strb->software) {
+      size_t size;
+      
+      free(strb->data);
+
+      assert(strb->format != PIPE_FORMAT_NONE);
+      
+      strb->stride = util_format_get_stride(strb->format, width);
+      size = util_format_get_2d_size(strb->format, strb->stride, height);
+      
+      strb->data = malloc(size);
+      
+      return strb->data != NULL;
+   }
+   else {
+      struct pipe_resource template;
+    
+      /* Free the old surface and texture
+       */
+      pipe_surface_reference( &strb->surface, NULL );
+      pipe_resource_reference( &strb->texture, NULL );
+      pipe_sampler_view_reference(&strb->sampler_view, NULL);
+
+      /* Setup new texture template.
+       */
+      memset(&template, 0, sizeof(template));
+      template.target = st->internal_target;
+      template.format = format;
+      template.width0 = width;
+      template.height0 = height;
+      template.depth0 = 1;
+      template.array_size = 1;
+      template.last_level = 0;
+      template.nr_samples = rb->NumSamples;
+      if (util_format_is_depth_or_stencil(format)) {
+         template.bind = PIPE_BIND_DEPTH_STENCIL;
+      }
+      else {
+         template.bind = (PIPE_BIND_DISPLAY_TARGET |
+                          PIPE_BIND_RENDER_TARGET);
+      }
+
+      strb->texture = screen->resource_create(screen, &template);
+
+      if (!strb->texture) 
+         return FALSE;
+
+      memset(&surf_tmpl, 0, sizeof(surf_tmpl));
+      u_surface_default_template(&surf_tmpl, strb->texture, template.bind);
+      strb->surface = pipe->create_surface(pipe,
+                                           strb->texture,
+                                           &surf_tmpl);
+      if (strb->surface) {
+         assert(strb->surface->texture);
+         assert(strb->surface->format);
+         assert(strb->surface->width == width);
+         assert(strb->surface->height == height);
+      }
+
+      return strb->surface != NULL;
+   }
+}
+
+
+/**
+ * gl_renderbuffer::Delete()
+ */
+static void
+st_renderbuffer_delete(struct gl_renderbuffer *rb)
+{
+   struct st_renderbuffer *strb = st_renderbuffer(rb);
+   ASSERT(strb);
+   pipe_surface_reference(&strb->surface, NULL);
+   pipe_resource_reference(&strb->texture, NULL);
+   pipe_sampler_view_reference(&strb->sampler_view, NULL);
+   free(strb->data);
+   free(strb);
+}
+
+
+/**
+ * gl_renderbuffer::GetPointer()
+ */
+static void *
+null_get_pointer(struct gl_context * ctx, struct gl_renderbuffer *rb,
+                 GLint x, GLint y)
+{
+   /* By returning NULL we force all software rendering to go through
+    * the span routines.
+    */
+#if 0
+   assert(0);  /* Should never get called with softpipe */
+#endif
+   return NULL;
+}
+
+
+/**
+ * Called via ctx->Driver.NewFramebuffer()
+ */
+static struct gl_framebuffer *
+st_new_framebuffer(struct gl_context *ctx, GLuint name)
+{
+   /* XXX not sure we need to subclass gl_framebuffer for pipe */
+   return _mesa_new_framebuffer(ctx, name);
+}
+
+
+/**
+ * Called via ctx->Driver.NewRenderbuffer()
+ */
+static struct gl_renderbuffer *
+st_new_renderbuffer(struct gl_context *ctx, GLuint name)
+{
+   struct st_renderbuffer *strb = ST_CALLOC_STRUCT(st_renderbuffer);
+   if (strb) {
+      _mesa_init_renderbuffer(&strb->Base, name);
+      strb->Base.Delete = st_renderbuffer_delete;
+      strb->Base.AllocStorage = st_renderbuffer_alloc_storage;
+      strb->Base.GetPointer = null_get_pointer;
+      strb->format = PIPE_FORMAT_NONE;
+      return &strb->Base;
+   }
+   return NULL;
+}
+
+
+/**
+ * Allocate a renderbuffer for a an on-screen window (not a user-created
+ * renderbuffer).  The window system code determines the format.
+ */
+struct gl_renderbuffer *
+st_new_renderbuffer_fb(enum pipe_format format, int samples, boolean sw)
+{
+   struct st_renderbuffer *strb;
+
+   strb = ST_CALLOC_STRUCT(st_renderbuffer);
+   if (!strb) {
+      _mesa_error(NULL, GL_OUT_OF_MEMORY, "creating renderbuffer");
+      return NULL;
+   }
+
+   _mesa_init_renderbuffer(&strb->Base, 0);
+   strb->Base.ClassID = 0x4242; /* just a unique value */
+   strb->Base.NumSamples = samples;
+   strb->Base.Format = st_pipe_format_to_mesa_format(format);
+   strb->Base._BaseFormat = _mesa_get_format_base_format(strb->Base.Format);
+   strb->Base.DataType = st_format_datatype(format);
+   strb->format = format;
+   strb->software = sw;
+   
+   switch (format) {
+   case PIPE_FORMAT_R8G8B8A8_UNORM:
+   case PIPE_FORMAT_B8G8R8A8_UNORM:
+   case PIPE_FORMAT_A8R8G8B8_UNORM:
+   case PIPE_FORMAT_R8G8B8X8_UNORM:
+   case PIPE_FORMAT_B8G8R8X8_UNORM:
+   case PIPE_FORMAT_X8R8G8B8_UNORM:
+   case PIPE_FORMAT_B5G5R5A1_UNORM:
+   case PIPE_FORMAT_B4G4R4A4_UNORM:
+   case PIPE_FORMAT_B5G6R5_UNORM:
+      strb->Base.InternalFormat = GL_RGBA;
+      break;
+   case PIPE_FORMAT_Z16_UNORM:
+      strb->Base.InternalFormat = GL_DEPTH_COMPONENT16;
+      break;
+   case PIPE_FORMAT_Z32_UNORM:
+      strb->Base.InternalFormat = GL_DEPTH_COMPONENT32;
+      break;
+   case PIPE_FORMAT_Z24_UNORM_S8_USCALED:
+   case PIPE_FORMAT_S8_USCALED_Z24_UNORM:
+   case PIPE_FORMAT_Z24X8_UNORM:
+   case PIPE_FORMAT_X8Z24_UNORM:
+      strb->Base.InternalFormat = GL_DEPTH24_STENCIL8_EXT;
+      break;
+   case PIPE_FORMAT_S8_USCALED:
+      strb->Base.InternalFormat = GL_STENCIL_INDEX8_EXT;
+      break;
+   case PIPE_FORMAT_R16G16B16A16_SNORM:
+      strb->Base.InternalFormat = GL_RGBA16;
+      break;
+   case PIPE_FORMAT_R8_UNORM:
+      strb->Base.InternalFormat = GL_R8;
+      break;
+   case PIPE_FORMAT_R8G8_UNORM:
+      strb->Base.InternalFormat = GL_RG8;
+      break;
+   case PIPE_FORMAT_R16_UNORM:
+      strb->Base.InternalFormat = GL_R16;
+      break;
+   case PIPE_FORMAT_R16G16_UNORM:
+      strb->Base.InternalFormat = GL_RG16;
+      break;
+   default:
+      _mesa_problem(NULL,
+		    "Unexpected format in st_new_renderbuffer_fb");
+      free(strb);
+      return NULL;
+   }
+
+   /* st-specific methods */
+   strb->Base.Delete = st_renderbuffer_delete;
+   strb->Base.AllocStorage = st_renderbuffer_alloc_storage;
+   strb->Base.GetPointer = null_get_pointer;
+
+   /* surface is allocated in st_renderbuffer_alloc_storage() */
+   strb->surface = NULL;
+
+   return &strb->Base;
+}
+
+
+
+
+/**
+ * Called via ctx->Driver.BindFramebufferEXT().
+ */
+static void
+st_bind_framebuffer(struct gl_context *ctx, GLenum target,
+                    struct gl_framebuffer *fb, struct gl_framebuffer *fbread)
+{
+
+}
+
+/**
+ * Called by ctx->Driver.FramebufferRenderbuffer
+ */
+static void
+st_framebuffer_renderbuffer(struct gl_context *ctx, 
+                            struct gl_framebuffer *fb,
+                            GLenum attachment,
+                            struct gl_renderbuffer *rb)
+{
+   /* XXX no need for derivation? */
+   _mesa_framebuffer_renderbuffer(ctx, fb, attachment, rb);
+}
+
+
+/**
+ * Called by ctx->Driver.RenderTexture
+ */
+static void
+st_render_texture(struct gl_context *ctx,
+                  struct gl_framebuffer *fb,
+                  struct gl_renderbuffer_attachment *att)
+{
+   struct st_context *st = st_context(ctx);
+   struct pipe_context *pipe = st->pipe;
+   struct st_renderbuffer *strb;
+   struct gl_renderbuffer *rb;
+   struct pipe_resource *pt = st_get_texobj_resource(att->Texture);
+   struct st_texture_object *stObj;
+   const struct gl_texture_image *texImage;
+   struct pipe_surface surf_tmpl;
+
+   /* When would this fail?  Perhaps assert? */
+   if (!pt) 
+      return;
+
+   /* get pointer to texture image we're rendeing to */
+   texImage = _mesa_get_attachment_teximage(att);
+
+   /* create new renderbuffer which wraps the texture image */
+   rb = st_new_renderbuffer(ctx, 0);
+   if (!rb) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glFramebufferTexture()");
+      return;
+   }
+
+   _mesa_reference_renderbuffer(&att->Renderbuffer, rb);
+   assert(rb->RefCount == 1);
+   rb->AllocStorage = NULL; /* should not get called */
+   strb = st_renderbuffer(rb);
+
+   assert(strb->Base.RefCount > 0);
+
+   /* get the texture for the texture object */
+   stObj = st_texture_object(att->Texture);
+
+   /* point renderbuffer at texobject */
+   strb->rtt = stObj;
+   strb->rtt_level = att->TextureLevel;
+   strb->rtt_face = att->CubeMapFace;
+   strb->rtt_slice = att->Zoffset;
+
+   rb->Width = texImage->Width2;
+   rb->Height = texImage->Height2;
+   rb->_BaseFormat = texImage->_BaseFormat;
+   /*printf("***** render to texture level %d: %d x %d\n", att->TextureLevel, rb->Width, rb->Height);*/
+
+   /*printf("***** pipe texture %d x %d\n", pt->width0, pt->height0);*/
+
+   pipe_resource_reference( &strb->texture, pt );
+
+   pipe_surface_reference(&strb->surface, NULL);
+
+   pipe_sampler_view_reference(&strb->sampler_view,
+                               st_get_texture_sampler_view(stObj, pipe));
+
+   assert(strb->rtt_level <= strb->texture->last_level);
+
+   /* new surface for rendering into the texture */
+   memset(&surf_tmpl, 0, sizeof(surf_tmpl));
+   surf_tmpl.format = ctx->Color.sRGBEnabled ? strb->texture->format : util_format_linear(strb->texture->format);
+   surf_tmpl.usage = PIPE_BIND_RENDER_TARGET;
+   surf_tmpl.u.tex.level = strb->rtt_level;
+   surf_tmpl.u.tex.first_layer = strb->rtt_face + strb->rtt_slice;
+   surf_tmpl.u.tex.last_layer = strb->rtt_face + strb->rtt_slice;
+   strb->surface = pipe->create_surface(pipe,
+                                        strb->texture,
+                                        &surf_tmpl);
+
+   strb->format = pt->format;
+
+   strb->Base.Format = st_pipe_format_to_mesa_format(pt->format);
+   strb->Base.DataType = st_format_datatype(pt->format);
+
+   /*
+   printf("RENDER TO TEXTURE obj=%p pt=%p surf=%p  %d x %d\n",
+          att->Texture, pt, strb->surface, rb->Width, rb->Height);
+   */
+
+   /* Invalidate buffer state so that the pipe's framebuffer state
+    * gets updated.
+    * That's where the new renderbuffer (which we just created) gets
+    * passed to the pipe as a (color/depth) render target.
+    */
+   st_invalidate_state(ctx, _NEW_BUFFERS);
+}
+
+
+/**
+ * Called via ctx->Driver.FinishRenderTexture.
+ */
+static void
+st_finish_render_texture(struct gl_context *ctx,
+                         struct gl_renderbuffer_attachment *att)
+{
+   struct st_renderbuffer *strb = st_renderbuffer(att->Renderbuffer);
+
+   if (!strb)
+      return;
+
+   strb->rtt = NULL;
+
+   /*
+   printf("FINISH RENDER TO TEXTURE surf=%p\n", strb->surface);
+   */
+
+   /* restore previous framebuffer state */
+   st_invalidate_state(ctx, _NEW_BUFFERS);
+}
+
+
+/**
+ * Validate a renderbuffer attachment for a particular set of bindings.
+ */
+static GLboolean
+st_validate_attachment(struct gl_context *ctx,
+		       struct pipe_screen *screen,
+		       const struct gl_renderbuffer_attachment *att,
+		       unsigned bindings)
+{
+   const struct st_texture_object *stObj = st_texture_object(att->Texture);
+   enum pipe_format format;
+   gl_format texFormat;
+
+   /* Only validate texture attachments for now, since
+    * st_renderbuffer_alloc_storage makes sure that
+    * the format is supported.
+    */
+   if (att->Type != GL_TEXTURE)
+      return GL_TRUE;
+
+   if (!stObj)
+      return GL_FALSE;
+
+   format = stObj->pt->format;
+   texFormat = _mesa_get_attachment_teximage_const(att)->TexFormat;
+
+   /* If the encoding is sRGB and sRGB rendering cannot be enabled,
+    * check for linear format support instead.
+    * Later when we create a surface, we change the format to a linear one. */
+   if (!ctx->Const.sRGBCapable &&
+       _mesa_get_format_color_encoding(texFormat) == GL_SRGB) {
+      const gl_format linearFormat = _mesa_get_srgb_format_linear(texFormat);
+      format = st_mesa_format_to_pipe_format(linearFormat);
+   }
+
+   return screen->is_format_supported(screen, format,
+                                      PIPE_TEXTURE_2D,
+                                      stObj->pt->nr_samples, bindings);
+}
+
+
+/**
+ * Check if two renderbuffer attachments name a combined depth/stencil
+ * renderbuffer.
+ */
+GLboolean
+st_is_depth_stencil_combined(const struct gl_renderbuffer_attachment *depth,
+                             const struct gl_renderbuffer_attachment *stencil)
+{
+   assert(depth && stencil);
+
+   if (depth->Type == stencil->Type) {
+      if (depth->Type == GL_RENDERBUFFER_EXT &&
+          depth->Renderbuffer == stencil->Renderbuffer)
+         return GL_TRUE;
+
+      if (depth->Type == GL_TEXTURE &&
+          depth->Texture == stencil->Texture)
+         return GL_TRUE;
+   }
+
+   return GL_FALSE;
+}
+ 
+
+/**
+ * Check that the framebuffer configuration is valid in terms of what
+ * the driver can support.
+ *
+ * For Gallium we only supports combined Z+stencil, not separate buffers.
+ */
+static void
+st_validate_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb)
+{
+   struct st_context *st = st_context(ctx);
+   struct pipe_screen *screen = st->pipe->screen;
+   const struct gl_renderbuffer_attachment *depth =
+         &fb->Attachment[BUFFER_DEPTH];
+   const struct gl_renderbuffer_attachment *stencil =
+         &fb->Attachment[BUFFER_STENCIL];
+   GLuint i;
+   enum pipe_format first_format = PIPE_FORMAT_NONE;
+   boolean mixed_formats =
+         screen->get_param(screen, PIPE_CAP_MIXED_COLORBUFFER_FORMATS) != 0;
+
+   if (depth->Type && stencil->Type && depth->Type != stencil->Type) {
+      fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;
+      return;
+   }
+   if (depth->Type == GL_RENDERBUFFER_EXT &&
+       stencil->Type == GL_RENDERBUFFER_EXT &&
+       depth->Renderbuffer != stencil->Renderbuffer) {
+      fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;
+      return;
+   }
+   if (depth->Type == GL_TEXTURE &&
+       stencil->Type == GL_TEXTURE &&
+       depth->Texture != stencil->Texture) {
+      fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;
+      return;
+   }
+
+   if (!st_validate_attachment(ctx,
+                               screen,
+                               depth,
+			       PIPE_BIND_DEPTH_STENCIL)) {
+      fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;
+      return;
+   }
+   if (!st_validate_attachment(ctx,
+                               screen,
+                               stencil,
+			       PIPE_BIND_DEPTH_STENCIL)) {
+      fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;
+      return;
+   }
+   for (i = 0; i < ctx->Const.MaxColorAttachments; i++) {
+      struct gl_renderbuffer_attachment *att =
+            &fb->Attachment[BUFFER_COLOR0 + i];
+      enum pipe_format format;
+
+      if (!st_validate_attachment(ctx,
+                                  screen,
+				  att,
+				  PIPE_BIND_RENDER_TARGET)) {
+	 fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;
+	 return;
+      }
+
+      if (!mixed_formats) {
+         /* Disallow mixed formats. */
+         if (att->Type != GL_NONE) {
+            format = st_renderbuffer(att->Renderbuffer)->surface->format;
+         } else {
+            continue;
+         }
+
+         if (first_format == PIPE_FORMAT_NONE) {
+            first_format = format;
+         } else if (format != first_format) {
+            fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;
+            return;
+         }
+      }
+   }
+}
+
+
+/**
+ * Called via glDrawBuffer.
+ */
+static void
+st_DrawBuffers(struct gl_context *ctx, GLsizei count, const GLenum *buffers)
+{
+   struct st_context *st = st_context(ctx);
+   struct gl_framebuffer *fb = ctx->DrawBuffer;
+   GLuint i;
+
+   (void) count;
+   (void) buffers;
+
+   /* add the renderbuffers on demand */
+   for (i = 0; i < fb->_NumColorDrawBuffers; i++) {
+      gl_buffer_index idx = fb->_ColorDrawBufferIndexes[i];
+      st_manager_add_color_renderbuffer(st, fb, idx);
+   }
+}
+
+
+/**
+ * Called via glReadBuffer.
+ */
+static void
+st_ReadBuffer(struct gl_context *ctx, GLenum buffer)
+{
+   struct st_context *st = st_context(ctx);
+   struct gl_framebuffer *fb = ctx->ReadBuffer;
+
+   (void) buffer;
+
+   /* add the renderbuffer on demand */
+   st_manager_add_color_renderbuffer(st, fb, fb->_ColorReadBufferIndex);
+}
+
+
+void st_init_fbo_functions(struct dd_function_table *functions)
+{
+#if FEATURE_EXT_framebuffer_object
+   functions->NewFramebuffer = st_new_framebuffer;
+   functions->NewRenderbuffer = st_new_renderbuffer;
+   functions->BindFramebuffer = st_bind_framebuffer;
+   functions->FramebufferRenderbuffer = st_framebuffer_renderbuffer;
+   functions->RenderTexture = st_render_texture;
+   functions->FinishRenderTexture = st_finish_render_texture;
+   functions->ValidateFramebuffer = st_validate_framebuffer;
+#endif
+   /* no longer needed by core Mesa, drivers handle resizes...
+   functions->ResizeBuffers = st_resize_buffers;
+   */
+
+   functions->DrawBuffers = st_DrawBuffers;
+   functions->ReadBuffer = st_ReadBuffer;
+}
+
+/* XXX unused ? */
+struct pipe_sampler_view *
+st_get_renderbuffer_sampler_view(struct st_renderbuffer *rb,
+                                 struct pipe_context *pipe)
+{
+   if (!rb->sampler_view) {
+      rb->sampler_view = st_create_texture_sampler_view(pipe, rb->texture);
+   }
+
+   return rb->sampler_view;
+}
diff --git a/mesalib/src/mesa/state_tracker/st_cb_texture.c b/mesalib/src/mesa/state_tracker/st_cb_texture.c
index 9d824b46c..88f62902b 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_texture.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_texture.c
@@ -795,6 +795,11 @@ decompress_with_blit(struct gl_context * ctx, GLenum target, GLint level,
       return;
    }
 
+   /* Disable conditional rendering. */
+   if (st->render_condition) {
+      pipe->render_condition(pipe, NULL, 0);
+   }
+
    /* blit/render/decompress */
    util_blit_pixels_tex(st->blit,
                         src_view,      /* pipe_resource (src) */
@@ -806,6 +811,12 @@ decompress_with_blit(struct gl_context * ctx, GLenum target, GLint level,
                         0.0,              /* z */
                         PIPE_TEX_MIPFILTER_NEAREST);
 
+   /* Restore conditional rendering state. */
+   if (st->render_condition) {
+      pipe->render_condition(pipe, st->render_condition,
+                             st->condition_mode);
+   }
+
    /* map the dst_surface so we can read from it */
    tex_xfer = pipe_get_transfer(pipe,
                                 dst_texture, 0, 0,
@@ -1556,6 +1567,11 @@ st_copy_texsubimage(struct gl_context *ctx,
             srcY1 = srcY0 + height;
          }
 
+         /* Disable conditional rendering. */
+         if (st->render_condition) {
+            pipe->render_condition(pipe, NULL, 0);
+         }
+
          util_blit_pixels_writemask(st->blit,
                                     strb->texture,
                                     strb->surface->u.tex.level,
@@ -1567,6 +1583,13 @@ st_copy_texsubimage(struct gl_context *ctx,
                                     destX + width, destY + height,
                                     0.0, PIPE_TEX_MIPFILTER_NEAREST,
                                     format_writemask);
+
+         /* Restore conditional rendering state. */
+         if (st->render_condition) {
+            pipe->render_condition(pipe, st->render_condition,
+                                   st->condition_mode);
+         }
+
          use_fallback = GL_FALSE;
       }
 
diff --git a/mesalib/src/mesa/state_tracker/st_context.h b/mesalib/src/mesa/state_tracker/st_context.h
index c6fc31801..ff207039d 100644
--- a/mesalib/src/mesa/state_tracker/st_context.h
+++ b/mesalib/src/mesa/state_tracker/st_context.h
@@ -200,6 +200,10 @@ struct st_context
       GLsizei stride;
    } user_attrib[PIPE_MAX_ATTRIBS];
    unsigned num_user_attribs;
+
+   /* Active render condition. */
+   struct pipe_query *render_condition;
+   unsigned condition_mode;
 };
 
 
diff --git a/mesalib/src/mesa/state_tracker/st_format.c b/mesalib/src/mesa/state_tracker/st_format.c
index de30b4fc6..dc8551dfe 100644
--- a/mesalib/src/mesa/state_tracker/st_format.c
+++ b/mesalib/src/mesa/state_tracker/st_format.c
@@ -595,6 +595,14 @@ struct format_mapping
       PIPE_FORMAT_A8B8G8R8_SRGB, \
       0
 
+#define DEFAULT_DEPTH_FORMATS \
+      PIPE_FORMAT_Z24X8_UNORM, \
+      PIPE_FORMAT_X8Z24_UNORM, \
+      PIPE_FORMAT_Z16_UNORM, \
+      PIPE_FORMAT_Z24_UNORM_S8_USCALED, \
+      PIPE_FORMAT_S8_USCALED_Z24_UNORM, \
+      0
+
 /**
  * This table maps OpenGL texture format enums to Gallium pipe_format enums.
  * Multiple GL enums might map to multiple pipe_formats.
@@ -604,7 +612,7 @@ static struct format_mapping format_map[] = {
    /* Basic RGB, RGBA formats */
    {
       { GL_RGB10, GL_RGB10_A2, 0 },
-      { PIPE_FORMAT_B10G10R10A2_UNORM, 0 }
+      { PIPE_FORMAT_B10G10R10A2_UNORM, DEFAULT_RGBA_FORMATS }
    },
    {
       { 4, GL_RGBA, GL_RGBA8, 0 },
@@ -612,7 +620,7 @@ static struct format_mapping format_map[] = {
    },
    {
       { GL_BGRA, 0 },
-      { PIPE_FORMAT_B8G8R8A8_UNORM, DEFAULT_RGB_FORMATS, 0 }
+      { PIPE_FORMAT_B8G8R8A8_UNORM, DEFAULT_RGBA_FORMATS }
    },
    {
       { 3, GL_RGB, GL_RGB8, 0 },
@@ -620,7 +628,7 @@ static struct format_mapping format_map[] = {
    },
    {
       { GL_RGB12, GL_RGB16, GL_RGBA12, GL_RGBA16, 0 },
-      { PIPE_FORMAT_R16G16B16A16_UNORM, DEFAULT_RGB_FORMATS, 0 }
+      { PIPE_FORMAT_R16G16B16A16_UNORM, DEFAULT_RGBA_FORMATS }
    },
    {
       { GL_RGBA4, GL_RGBA2, 0 },
@@ -628,7 +636,7 @@ static struct format_mapping format_map[] = {
    },
    {
       { GL_RGB5_A1, 0 },
-      { PIPE_FORMAT_B5G5R5A1_UNORM, DEFAULT_RGBA_FORMATS, 0 }
+      { PIPE_FORMAT_B5G5R5A1_UNORM, DEFAULT_RGBA_FORMATS }
    },
    {
       { GL_R3_G3_B2, 0 },
@@ -655,11 +663,11 @@ static struct format_mapping format_map[] = {
    /* basic Luminance formats */
    {
       { GL_LUMINANCE12, GL_LUMINANCE16, 0 },
-      { PIPE_FORMAT_L16_UNORM, PIPE_FORMAT_L8_UNORM, DEFAULT_RGBA_FORMATS, 0 }
+      { PIPE_FORMAT_L16_UNORM, PIPE_FORMAT_L8_UNORM, DEFAULT_RGB_FORMATS }
    },
    {
       { 1, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, 0 },
-      { PIPE_FORMAT_L8_UNORM, DEFAULT_RGBA_FORMATS }
+      { PIPE_FORMAT_L8_UNORM, DEFAULT_RGB_FORMATS }
    },
 
    /* basic Luminance/Alpha formats */
@@ -667,7 +675,7 @@ static struct format_mapping format_map[] = {
       { GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12,
         GL_LUMINANCE16_ALPHA16, 0},
       { PIPE_FORMAT_L16A16_UNORM, PIPE_FORMAT_L8A8_UNORM,
-        PIPE_FORMAT_L8A8_UNORM, DEFAULT_RGBA_FORMATS }
+        DEFAULT_RGBA_FORMATS }
    },
    {
       { 2, GL_LUMINANCE_ALPHA, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, 0 },
@@ -675,7 +683,7 @@ static struct format_mapping format_map[] = {
    },
    {
       { GL_LUMINANCE4_ALPHA4, 0 },
-      { PIPE_FORMAT_L4A4_UNORM, PIPE_FORMAT_L4A4_UNORM,
+      { PIPE_FORMAT_L4A4_UNORM, PIPE_FORMAT_L8A8_UNORM,
         DEFAULT_RGBA_FORMATS }
    },
 
@@ -699,11 +707,11 @@ static struct format_mapping format_map[] = {
    /* compressed formats */ /* XXX PIPE_BIND_SAMPLER_VIEW only */
    {
       { GL_COMPRESSED_RGB, 0 },
-      { PIPE_FORMAT_DXT1_RGB, 0 }
+      { PIPE_FORMAT_DXT1_RGB, DEFAULT_RGB_FORMATS }
    },
    {
       { GL_COMPRESSED_RGBA, 0 },
-      { PIPE_FORMAT_DXT5_RGBA, 0 }
+      { PIPE_FORMAT_DXT5_RGBA, DEFAULT_RGBA_FORMATS }
    },
    {
       { GL_RGB_S3TC, GL_RGB4_S3TC, GL_COMPRESSED_RGB_S3TC_DXT1_EXT, 0 },
@@ -729,31 +737,27 @@ static struct format_mapping format_map[] = {
    },
    {
       { GL_COMPRESSED_RGBA_FXT1_3DFX, 0 },
-      { PIPE_FORMAT_RGB_FXT1, 0 }
+      { PIPE_FORMAT_RGBA_FXT1, 0 }
    },
 #endif
 
    /* Depth formats */
    {
       { GL_DEPTH_COMPONENT16, 0 },
-      { PIPE_FORMAT_Z16_UNORM, PIPE_FORMAT_Z24_UNORM_S8_USCALED,
-        PIPE_FORMAT_S8_USCALED_Z24_UNORM, PIPE_FORMAT_Z32_UNORM, 0 }
+      { PIPE_FORMAT_Z16_UNORM, DEFAULT_DEPTH_FORMATS }
    },
    {
       { GL_DEPTH_COMPONENT24, 0 },
       { PIPE_FORMAT_Z24X8_UNORM, PIPE_FORMAT_X8Z24_UNORM,
-        PIPE_FORMAT_Z24_UNORM_S8_USCALED, PIPE_FORMAT_S8_USCALED_Z24_UNORM,
-        PIPE_FORMAT_Z32_UNORM, 0 }
+        DEFAULT_DEPTH_FORMATS }
    },
    {
       { GL_DEPTH_COMPONENT32, 0 },
-      { PIPE_FORMAT_Z32_UNORM, 0 }
+      { PIPE_FORMAT_Z32_UNORM, DEFAULT_DEPTH_FORMATS }
    },
    {
       { GL_DEPTH_COMPONENT, 0 },
-      { PIPE_FORMAT_Z24X8_UNORM, PIPE_FORMAT_X8Z24_UNORM,
-        PIPE_FORMAT_Z32_UNORM, PIPE_FORMAT_Z16_UNORM,
-        PIPE_FORMAT_Z24_UNORM_S8_USCALED, PIPE_FORMAT_S8_USCALED_Z24_UNORM, 0 }
+      { DEFAULT_DEPTH_FORMATS }
    },
 
    /* stencil formats */
diff --git a/mesalib/src/mesa/state_tracker/st_gen_mipmap.c b/mesalib/src/mesa/state_tracker/st_gen_mipmap.c
index b34794f1b..b0911294a 100644
--- a/mesalib/src/mesa/state_tracker/st_gen_mipmap.c
+++ b/mesalib/src/mesa/state_tracker/st_gen_mipmap.c
@@ -91,9 +91,18 @@ st_render_mipmap(struct st_context *st,
       return FALSE;
    }
 
+   /* Disable conditional rendering. */
+   if (st->render_condition) {
+      pipe->render_condition(pipe, NULL, 0);
+   }
+
    util_gen_mipmap(st->gen_mipmap, psv, face, baseLevel, lastLevel,
                    PIPE_TEX_FILTER_LINEAR);
 
+   if (st->render_condition) {
+      pipe->render_condition(pipe, st->render_condition, st->condition_mode);
+   }
+
    return TRUE;
 }
 
diff --git a/mesalib/src/mesa/swrast/s_blit.c b/mesalib/src/mesa/swrast/s_blit.c
index 2dd11399f..3516a41bf 100644
--- a/mesalib/src/mesa/swrast/s_blit.c
+++ b/mesalib/src/mesa/swrast/s_blit.c
@@ -1,619 +1,616 @@
-/*

- * Mesa 3-D graphics library

- * Version:  6.5

- *

- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be included

- * in all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- */

-

-

-#include "main/glheader.h"

-#include "main/condrender.h"

-#include "main/image.h"

-#include "main/macros.h"

-#include "s_context.h"

-

-

-#define ABS(X)   ((X) < 0 ? -(X) : (X))

-

-

-/**

- * Generate a row resampler function for GL_NEAREST mode.

- */

-#define RESAMPLE(NAME, PIXELTYPE, SIZE)			\

-static void						\

-NAME(GLint srcWidth, GLint dstWidth,			\

-     const GLvoid *srcBuffer, GLvoid *dstBuffer,	\

-     GLboolean flip)					\

-{							\

-   const PIXELTYPE *src = (const PIXELTYPE *) srcBuffer;\

-   PIXELTYPE *dst = (PIXELTYPE *) dstBuffer;		\

-   GLint dstCol;					\

-							\

-   if (flip) {						\

-      for (dstCol = 0; dstCol < dstWidth; dstCol++) {	\

-         GLint srcCol = (dstCol * srcWidth) / dstWidth;	\

-         ASSERT(srcCol >= 0);				\

-         ASSERT(srcCol < srcWidth);			\

-         srcCol = srcWidth - 1 - srcCol; /* flip */	\

-         if (SIZE == 1) {				\

-            dst[dstCol] = src[srcCol];			\

-         }						\

-         else if (SIZE == 2) {				\

-            dst[dstCol*2+0] = src[srcCol*2+0];		\

-            dst[dstCol*2+1] = src[srcCol*2+1];		\

-         }						\

-         else if (SIZE == 4) {				\

-            dst[dstCol*4+0] = src[srcCol*4+0];		\

-            dst[dstCol*4+1] = src[srcCol*4+1];		\

-            dst[dstCol*4+2] = src[srcCol*4+2];		\

-            dst[dstCol*4+3] = src[srcCol*4+3];		\

-         }						\

-      }							\

-   }							\

-   else {						\

-      for (dstCol = 0; dstCol < dstWidth; dstCol++) {	\

-         GLint srcCol = (dstCol * srcWidth) / dstWidth;	\

-         ASSERT(srcCol >= 0);				\

-         ASSERT(srcCol < srcWidth);			\

-         if (SIZE == 1) {				\

-            dst[dstCol] = src[srcCol];			\

-         }						\

-         else if (SIZE == 2) {				\

-            dst[dstCol*2+0] = src[srcCol*2+0];		\

-            dst[dstCol*2+1] = src[srcCol*2+1];		\

-         }						\

-         else if (SIZE == 4) {				\

-            dst[dstCol*4+0] = src[srcCol*4+0];		\

-            dst[dstCol*4+1] = src[srcCol*4+1];		\

-            dst[dstCol*4+2] = src[srcCol*4+2];		\

-            dst[dstCol*4+3] = src[srcCol*4+3];		\

-         }						\

-      }							\

-   }							\

-}

-

-/**

- * Resamplers for 1, 2, 4, 8 and 16-byte pixels.

- */

-RESAMPLE(resample_row_1, GLubyte, 1)

-RESAMPLE(resample_row_2, GLushort, 1)

-RESAMPLE(resample_row_4, GLuint, 1)

-RESAMPLE(resample_row_8, GLuint, 2)

-RESAMPLE(resample_row_16, GLuint, 4)

-

-

-/**

- * Blit color, depth or stencil with GL_NEAREST filtering.

- */

-static void

-blit_nearest(struct gl_context *ctx,

-             GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,

-             GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,

-             GLbitfield buffer)

-{

-   struct gl_renderbuffer *readRb, *drawRb;

-

-   const GLint srcWidth = ABS(srcX1 - srcX0);

-   const GLint dstWidth = ABS(dstX1 - dstX0);

-   const GLint srcHeight = ABS(srcY1 - srcY0);

-   const GLint dstHeight = ABS(dstY1 - dstY0);

-

-   const GLint srcXpos = MIN2(srcX0, srcX1);

-   const GLint srcYpos = MIN2(srcY0, srcY1);

-   const GLint dstXpos = MIN2(dstX0, dstX1);

-   const GLint dstYpos = MIN2(dstY0, dstY1);

-

-   const GLboolean invertX = (srcX1 < srcX0) ^ (dstX1 < dstX0);

-   const GLboolean invertY = (srcY1 < srcY0) ^ (dstY1 < dstY0);

-

-   GLint dstRow;

-

-   GLint comps, pixelSize;

-   GLvoid *srcBuffer, *dstBuffer;

-   GLint prevY = -1;

-

-   typedef void (*resample_func)(GLint srcWidth, GLint dstWidth,

-                                 const GLvoid *srcBuffer, GLvoid *dstBuffer,

-                                 GLboolean flip);

-   resample_func resampleRow;

-

-   switch (buffer) {

-   case GL_COLOR_BUFFER_BIT:

-      readRb = ctx->ReadBuffer->_ColorReadBuffer;

-      drawRb = ctx->DrawBuffer->_ColorDrawBuffers[0];

-      comps = 4;

-      break;

-   case GL_DEPTH_BUFFER_BIT:

-      readRb = ctx->ReadBuffer->_DepthBuffer;

-      drawRb = ctx->DrawBuffer->_DepthBuffer;

-      comps = 1;

-      break;

-   case GL_STENCIL_BUFFER_BIT:

-      readRb = ctx->ReadBuffer->_StencilBuffer;

-      drawRb = ctx->DrawBuffer->_StencilBuffer;

-      comps = 1;

-      break;

-   default:

-      _mesa_problem(ctx, "unexpected buffer in blit_nearest()");

-      return;

-   }

-

-   switch (readRb->DataType) {

-   case GL_UNSIGNED_BYTE:

-      pixelSize = comps * sizeof(GLubyte);

-      break;

-   case GL_UNSIGNED_SHORT:

-      pixelSize = comps * sizeof(GLushort);

-      break;

-   case GL_UNSIGNED_INT:

-      pixelSize = comps * sizeof(GLuint);

-      break;

-   case GL_FLOAT:

-      pixelSize = comps * sizeof(GLfloat);

-      break;

-   default:

-      _mesa_problem(ctx, "unexpected buffer type (0x%x) in blit_nearest",

-                    readRb->DataType);

-      return;

-   }

-

-   /* choose row resampler */

-   switch (pixelSize) {

-   case 1:

-      resampleRow = resample_row_1;

-      break;

-   case 2:

-      resampleRow = resample_row_2;

-      break;

-   case 4:

-      resampleRow = resample_row_4;

-      break;

-   case 8:

-      resampleRow = resample_row_8;

-      break;

-   case 16:

-      resampleRow = resample_row_16;

-      break;

-   default:

-      _mesa_problem(ctx, "unexpected pixel size (%d) in blit_nearest",

-                    pixelSize);

-      return;

-   }

-

-   /* allocate the src/dst row buffers */

-   srcBuffer = malloc(pixelSize * srcWidth);

-   if (!srcBuffer) {

-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");

-      return;

-   }

-   dstBuffer = malloc(pixelSize * dstWidth);

-   if (!dstBuffer) {

-      free(srcBuffer);

-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");

-      return;

-   }

-

-   for (dstRow = 0; dstRow < dstHeight; dstRow++) {

-      const GLint dstY = dstYpos + dstRow;

-      GLint srcRow = (dstRow * srcHeight) / dstHeight;

-      GLint srcY;

-

-      ASSERT(srcRow >= 0);

-      ASSERT(srcRow < srcHeight);

-

-      if (invertY) {

-         srcRow = srcHeight - 1 - srcRow;

-      }

-

-      srcY = srcYpos + srcRow;

-

-      /* get pixel row from source and resample to match dest width */

-      if (prevY != srcY) {

-         readRb->GetRow(ctx, readRb, srcWidth, srcXpos, srcY, srcBuffer);

-         (*resampleRow)(srcWidth, dstWidth, srcBuffer, dstBuffer, invertX);

-         prevY = srcY;

-      }

-

-      /* store pixel row in destination */

-      drawRb->PutRow(ctx, drawRb, dstWidth, dstXpos, dstY, dstBuffer, NULL);

-   }

-

-   free(srcBuffer);

-   free(dstBuffer);

-}

-

-

-

-#define LERP(T, A, B)  ( (A) + (T) * ((B) - (A)) )

-

-static INLINE GLfloat

-lerp_2d(GLfloat a, GLfloat b,

-        GLfloat v00, GLfloat v10, GLfloat v01, GLfloat v11)

-{

-   const GLfloat temp0 = LERP(a, v00, v10);

-   const GLfloat temp1 = LERP(a, v01, v11);

-   return LERP(b, temp0, temp1);

-}

-

-

-/**

- * Bilinear interpolation of two source rows.

- * GLubyte pixels.

- */

-static void

-resample_linear_row_ub(GLint srcWidth, GLint dstWidth,

-                       const GLvoid *srcBuffer0, const GLvoid *srcBuffer1,

-                       GLvoid *dstBuffer, GLboolean flip, GLfloat rowWeight)

-{

-   const GLubyte (*srcColor0)[4] = (const GLubyte (*)[4]) srcBuffer0;

-   const GLubyte (*srcColor1)[4] = (const GLubyte (*)[4]) srcBuffer1;

-   GLubyte (*dstColor)[4] = (GLubyte (*)[4]) dstBuffer;

-   const GLfloat dstWidthF = (GLfloat) dstWidth;

-   GLint dstCol;

-

-   for (dstCol = 0; dstCol < dstWidth; dstCol++) {

-      const GLfloat srcCol = (dstCol * srcWidth) / dstWidthF;

-      GLint srcCol0 = IFLOOR(srcCol);

-      GLint srcCol1 = srcCol0 + 1;

-      GLfloat colWeight = srcCol - srcCol0; /* fractional part of srcCol */

-      GLfloat red, green, blue, alpha;

-

-      ASSERT(srcCol0 >= 0);

-      ASSERT(srcCol0 < srcWidth);

-      ASSERT(srcCol1 <= srcWidth);

-

-      if (srcCol1 == srcWidth) {

-         /* last column fudge */

-         srcCol1--;

-         colWeight = 0.0;

-      }

-

-      if (flip) {

-         srcCol0 = srcWidth - 1 - srcCol0;

-         srcCol1 = srcWidth - 1 - srcCol1;

-      }

-

-      red = lerp_2d(colWeight, rowWeight,

-                    srcColor0[srcCol0][RCOMP], srcColor0[srcCol1][RCOMP],

-                    srcColor1[srcCol0][RCOMP], srcColor1[srcCol1][RCOMP]);

-      green = lerp_2d(colWeight, rowWeight,

-                    srcColor0[srcCol0][GCOMP], srcColor0[srcCol1][GCOMP],

-                    srcColor1[srcCol0][GCOMP], srcColor1[srcCol1][GCOMP]);

-      blue = lerp_2d(colWeight, rowWeight,

-                    srcColor0[srcCol0][BCOMP], srcColor0[srcCol1][BCOMP],

-                    srcColor1[srcCol0][BCOMP], srcColor1[srcCol1][BCOMP]);

-      alpha = lerp_2d(colWeight, rowWeight,

-                    srcColor0[srcCol0][ACOMP], srcColor0[srcCol1][ACOMP],

-                    srcColor1[srcCol0][ACOMP], srcColor1[srcCol1][ACOMP]);

-      

-      dstColor[dstCol][RCOMP] = IFLOOR(red);

-      dstColor[dstCol][GCOMP] = IFLOOR(green);

-      dstColor[dstCol][BCOMP] = IFLOOR(blue);

-      dstColor[dstCol][ACOMP] = IFLOOR(alpha);

-   }

-}

-

-

-

-/**

- * Bilinear filtered blit (color only).

- */

-static void

-blit_linear(struct gl_context *ctx,

-            GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,

-            GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1)

-{

-   struct gl_renderbuffer *readRb = ctx->ReadBuffer->_ColorReadBuffer;

-   struct gl_renderbuffer *drawRb = ctx->DrawBuffer->_ColorDrawBuffers[0];

-

-   const GLint srcWidth = ABS(srcX1 - srcX0);

-   const GLint dstWidth = ABS(dstX1 - dstX0);

-   const GLint srcHeight = ABS(srcY1 - srcY0);

-   const GLint dstHeight = ABS(dstY1 - dstY0);

-   const GLfloat dstHeightF = (GLfloat) dstHeight;

-

-   const GLint srcXpos = MIN2(srcX0, srcX1);

-   const GLint srcYpos = MIN2(srcY0, srcY1);

-   const GLint dstXpos = MIN2(dstX0, dstX1);

-   const GLint dstYpos = MIN2(dstY0, dstY1);

-

-   const GLboolean invertX = (srcX1 < srcX0) ^ (dstX1 < dstX0);

-   const GLboolean invertY = (srcY1 < srcY0) ^ (dstY1 < dstY0);

-

-   GLint dstRow;

-

-   GLint pixelSize;

-   GLvoid *srcBuffer0, *srcBuffer1;

-   GLint srcBufferY0 = -1, srcBufferY1 = -1;

-   GLvoid *dstBuffer;

-

-   switch (readRb->DataType) {

-   case GL_UNSIGNED_BYTE:

-      pixelSize = 4 * sizeof(GLubyte);

-      break;

-   case GL_UNSIGNED_SHORT:

-      pixelSize = 4 * sizeof(GLushort);

-      break;

-   case GL_UNSIGNED_INT:

-      pixelSize = 4 * sizeof(GLuint);

-      break;

-   case GL_FLOAT:

-      pixelSize = 4 * sizeof(GLfloat);

-      break;

-   default:

-      _mesa_problem(ctx, "unexpected buffer type (0x%x) in blit_nearest",

-                    readRb->DataType);

-      return;

-   }

-

-   /* Allocate the src/dst row buffers.

-    * Keep two adjacent src rows around for bilinear sampling.

-    */

-   srcBuffer0 = malloc(pixelSize * srcWidth);

-   if (!srcBuffer0) {

-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");

-      return;

-   }

-   srcBuffer1 = malloc(pixelSize * srcWidth);

-   if (!srcBuffer1) {

-      free(srcBuffer0);

-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");

-      return;

-   }

-   dstBuffer = malloc(pixelSize * dstWidth);

-   if (!dstBuffer) {

-      free(srcBuffer0);

-      free(srcBuffer1);

-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");

-      return;

-   }

-

-   for (dstRow = 0; dstRow < dstHeight; dstRow++) {

-      const GLint dstY = dstYpos + dstRow;

-      const GLfloat srcRow = (dstRow * srcHeight) / dstHeightF;

-      GLint srcRow0 = IFLOOR(srcRow);

-      GLint srcRow1 = srcRow0 + 1;

-      GLfloat rowWeight = srcRow - srcRow0; /* fractional part of srcRow */

-

-      ASSERT(srcRow >= 0);

-      ASSERT(srcRow < srcHeight);

-

-      if (srcRow1 == srcHeight) {

-         /* last row fudge */

-         srcRow1 = srcRow0;

-         rowWeight = 0.0;

-      }

-

-      if (invertY) {

-         srcRow0 = srcHeight - 1 - srcRow0;

-         srcRow1 = srcHeight - 1 - srcRow1;

-      }

-

-      srcY0 = srcYpos + srcRow0;

-      srcY1 = srcYpos + srcRow1;

-

-      /* get the two source rows */

-      if (srcY0 == srcBufferY0 && srcY1 == srcBufferY1) {

-         /* use same source row buffers again */

-      }

-      else if (srcY0 == srcBufferY1) {

-         /* move buffer1 into buffer0 by swapping pointers */

-         GLvoid *tmp = srcBuffer0;

-         srcBuffer0 = srcBuffer1;

-         srcBuffer1 = tmp;

-         /* get y1 row */

-         readRb->GetRow(ctx, readRb, srcWidth, srcXpos, srcY1, srcBuffer1);

-         srcBufferY0 = srcY0;

-         srcBufferY1 = srcY1;

-      }

-      else {

-         /* get both new rows */

-         readRb->GetRow(ctx, readRb, srcWidth, srcXpos, srcY0, srcBuffer0);

-         readRb->GetRow(ctx, readRb, srcWidth, srcXpos, srcY1, srcBuffer1);

-         srcBufferY0 = srcY0;

-         srcBufferY1 = srcY1;

-      }

-

-      if (readRb->DataType == GL_UNSIGNED_BYTE) {

-         resample_linear_row_ub(srcWidth, dstWidth, srcBuffer0, srcBuffer1,

-                                dstBuffer, invertX, rowWeight);

-      }

-      else {

-         _mesa_problem(ctx, "Unsupported color channel type in sw blit");

-         break;

-      }

-

-      /* store pixel row in destination */

-      drawRb->PutRow(ctx, drawRb, dstWidth, dstXpos, dstY, dstBuffer, NULL);

-   }

-

-   free(srcBuffer0);

-   free(srcBuffer1);

-   free(dstBuffer);

-}

-

-

-/**

- * Simple case:  Blit color, depth or stencil with no scaling or flipping.

- * XXX we could easily support vertical flipping here.

- */

-static void

-simple_blit(struct gl_context *ctx,

-            GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,

-            GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,

-            GLbitfield buffer)

-{

-   struct gl_renderbuffer *readRb, *drawRb;

-   const GLint width = srcX1 - srcX0;

-   const GLint height = srcY1 - srcY0;

-   GLint row, srcY, dstY, yStep;

-   GLint comps, bytesPerRow;

-   void *rowBuffer;

-

-   /* only one buffer */

-   ASSERT(_mesa_bitcount(buffer) == 1);

-   /* no flipping checks */

-   ASSERT(srcX0 < srcX1);

-   ASSERT(srcY0 < srcY1);

-   ASSERT(dstX0 < dstX1);

-   ASSERT(dstY0 < dstY1);

-   /* size checks */

-   ASSERT(srcX1 - srcX0 == dstX1 - dstX0);

-   ASSERT(srcY1 - srcY0 == dstY1 - dstY0);

-

-   /* determine if copy should be bottom-to-top or top-to-bottom */

-   if (srcY0 > dstY0) {

-      /* src above dst: copy bottom-to-top */

-      yStep = 1;

-      srcY = srcY0;

-      dstY = dstY0;

-   }

-   else {

-      /* src below dst: copy top-to-bottom */

-      yStep = -1;

-      srcY = srcY1 - 1;

-      dstY = dstY1 - 1;

-   }

-

-   switch (buffer) {

-   case GL_COLOR_BUFFER_BIT:

-      readRb = ctx->ReadBuffer->_ColorReadBuffer;

-      drawRb = ctx->DrawBuffer->_ColorDrawBuffers[0];

-      comps = 4;

-      break;

-   case GL_DEPTH_BUFFER_BIT:

-      readRb = ctx->ReadBuffer->_DepthBuffer;

-      drawRb = ctx->DrawBuffer->_DepthBuffer;

-      comps = 1;

-      break;

-   case GL_STENCIL_BUFFER_BIT:

-      readRb = ctx->ReadBuffer->_StencilBuffer;

-      drawRb = ctx->DrawBuffer->_StencilBuffer;

-      comps = 1;

-      break;

-   default:

-      _mesa_problem(ctx, "unexpected buffer in simple_blit()");

-      return;

-   }

-

-   ASSERT(readRb->DataType == drawRb->DataType);

-

-   /* compute bytes per row */

-   switch (readRb->DataType) {

-   case GL_UNSIGNED_BYTE:

-      bytesPerRow = comps * width * sizeof(GLubyte);

-      break;

-   case GL_UNSIGNED_SHORT:

-      bytesPerRow = comps * width * sizeof(GLushort);

-      break;

-   case GL_UNSIGNED_INT:

-      bytesPerRow = comps * width * sizeof(GLuint);

-      break;

-   case GL_FLOAT:

-      bytesPerRow = comps * width * sizeof(GLfloat);

-      break;

-   default:

-      _mesa_problem(ctx, "unexpected buffer type in simple_blit");

-      return;

-   }

-

-   /* allocate the row buffer */

-   rowBuffer = malloc(bytesPerRow);

-   if (!rowBuffer) {

-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");

-      return;

-   }

-

-   for (row = 0; row < height; row++) {

-      readRb->GetRow(ctx, readRb, width, srcX0, srcY, rowBuffer);

-      drawRb->PutRow(ctx, drawRb, width, dstX0, dstY, rowBuffer, NULL);

-      srcY += yStep;

-      dstY += yStep;

-   }

-

-   free(rowBuffer);

-}

-

-

-/**

- * Software fallback for glBlitFramebufferEXT().

- */

-void

-_swrast_BlitFramebuffer(struct gl_context *ctx,

-                        GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,

-                        GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,

-                        GLbitfield mask, GLenum filter)

-{

-   static const GLbitfield buffers[3] = {

-      GL_COLOR_BUFFER_BIT,

-      GL_DEPTH_BUFFER_BIT,

-      GL_STENCIL_BUFFER_BIT

-   };

-   GLint i;

-

-   if (!_mesa_check_conditional_render(ctx))

-      return; /* don't clear */

-

-   if (!ctx->DrawBuffer->_NumColorDrawBuffers)

-      return;

-

-   if (!_mesa_clip_blit(ctx, &srcX0, &srcY0, &srcX1, &srcY1,

-                        &dstX0, &dstY0, &dstX1, &dstY1)) {

-      return;

-   }

-

-   swrast_render_start(ctx);

-

-   if (srcX1 - srcX0 == dstX1 - dstX0 &&

-       srcY1 - srcY0 == dstY1 - dstY0 &&

-       srcX0 < srcX1 &&

-       srcY0 < srcY1 &&

-       dstX0 < dstX1 &&

-       dstY0 < dstY1) {

-      /* no stretching or flipping.

-       * filter doesn't matter.

-       */

-      for (i = 0; i < 3; i++) {

-         if (mask & buffers[i]) {

-            simple_blit(ctx, srcX0, srcY0, srcX1, srcY1,

-                        dstX0, dstY0, dstX1, dstY1, buffers[i]);

-         }

-      }

-   }

-   else {

-      if (filter == GL_NEAREST) {

-         for (i = 0; i < 3; i++) {

-            if (mask & buffers[i]) {

-               blit_nearest(ctx,  srcX0, srcY0, srcX1, srcY1,

-                            dstX0, dstY0, dstX1, dstY1, buffers[i]);

-            }

-         }

-      }

-      else {

-         ASSERT(filter == GL_LINEAR);

-         if (mask & GL_COLOR_BUFFER_BIT) {  /* depth/stencil not allowed */

-            blit_linear(ctx,  srcX0, srcY0, srcX1, srcY1,

-                        dstX0, dstY0, dstX1, dstY1);

-         }

-      }

-   }

-

-   swrast_render_finish(ctx);

-}

+/*
+ * Mesa 3-D graphics library
+ * Version:  6.5
+ *
+ * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "main/glheader.h"
+#include "main/condrender.h"
+#include "main/image.h"
+#include "main/macros.h"
+#include "s_context.h"
+
+
+#define ABS(X)   ((X) < 0 ? -(X) : (X))
+
+
+/**
+ * Generate a row resampler function for GL_NEAREST mode.
+ */
+#define RESAMPLE(NAME, PIXELTYPE, SIZE)			\
+static void						\
+NAME(GLint srcWidth, GLint dstWidth,			\
+     const GLvoid *srcBuffer, GLvoid *dstBuffer,	\
+     GLboolean flip)					\
+{							\
+   const PIXELTYPE *src = (const PIXELTYPE *) srcBuffer;\
+   PIXELTYPE *dst = (PIXELTYPE *) dstBuffer;		\
+   GLint dstCol;					\
+							\
+   if (flip) {						\
+      for (dstCol = 0; dstCol < dstWidth; dstCol++) {	\
+         GLint srcCol = (dstCol * srcWidth) / dstWidth;	\
+         ASSERT(srcCol >= 0);				\
+         ASSERT(srcCol < srcWidth);			\
+         srcCol = srcWidth - 1 - srcCol; /* flip */	\
+         if (SIZE == 1) {				\
+            dst[dstCol] = src[srcCol];			\
+         }						\
+         else if (SIZE == 2) {				\
+            dst[dstCol*2+0] = src[srcCol*2+0];		\
+            dst[dstCol*2+1] = src[srcCol*2+1];		\
+         }						\
+         else if (SIZE == 4) {				\
+            dst[dstCol*4+0] = src[srcCol*4+0];		\
+            dst[dstCol*4+1] = src[srcCol*4+1];		\
+            dst[dstCol*4+2] = src[srcCol*4+2];		\
+            dst[dstCol*4+3] = src[srcCol*4+3];		\
+         }						\
+      }							\
+   }							\
+   else {						\
+      for (dstCol = 0; dstCol < dstWidth; dstCol++) {	\
+         GLint srcCol = (dstCol * srcWidth) / dstWidth;	\
+         ASSERT(srcCol >= 0);				\
+         ASSERT(srcCol < srcWidth);			\
+         if (SIZE == 1) {				\
+            dst[dstCol] = src[srcCol];			\
+         }						\
+         else if (SIZE == 2) {				\
+            dst[dstCol*2+0] = src[srcCol*2+0];		\
+            dst[dstCol*2+1] = src[srcCol*2+1];		\
+         }						\
+         else if (SIZE == 4) {				\
+            dst[dstCol*4+0] = src[srcCol*4+0];		\
+            dst[dstCol*4+1] = src[srcCol*4+1];		\
+            dst[dstCol*4+2] = src[srcCol*4+2];		\
+            dst[dstCol*4+3] = src[srcCol*4+3];		\
+         }						\
+      }							\
+   }							\
+}
+
+/**
+ * Resamplers for 1, 2, 4, 8 and 16-byte pixels.
+ */
+RESAMPLE(resample_row_1, GLubyte, 1)
+RESAMPLE(resample_row_2, GLushort, 1)
+RESAMPLE(resample_row_4, GLuint, 1)
+RESAMPLE(resample_row_8, GLuint, 2)
+RESAMPLE(resample_row_16, GLuint, 4)
+
+
+/**
+ * Blit color, depth or stencil with GL_NEAREST filtering.
+ */
+static void
+blit_nearest(struct gl_context *ctx,
+             GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
+             GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
+             GLbitfield buffer)
+{
+   struct gl_renderbuffer *readRb, *drawRb;
+
+   const GLint srcWidth = ABS(srcX1 - srcX0);
+   const GLint dstWidth = ABS(dstX1 - dstX0);
+   const GLint srcHeight = ABS(srcY1 - srcY0);
+   const GLint dstHeight = ABS(dstY1 - dstY0);
+
+   const GLint srcXpos = MIN2(srcX0, srcX1);
+   const GLint srcYpos = MIN2(srcY0, srcY1);
+   const GLint dstXpos = MIN2(dstX0, dstX1);
+   const GLint dstYpos = MIN2(dstY0, dstY1);
+
+   const GLboolean invertX = (srcX1 < srcX0) ^ (dstX1 < dstX0);
+   const GLboolean invertY = (srcY1 < srcY0) ^ (dstY1 < dstY0);
+
+   GLint dstRow;
+
+   GLint comps, pixelSize;
+   GLvoid *srcBuffer, *dstBuffer;
+   GLint prevY = -1;
+
+   typedef void (*resample_func)(GLint srcWidth, GLint dstWidth,
+                                 const GLvoid *srcBuffer, GLvoid *dstBuffer,
+                                 GLboolean flip);
+   resample_func resampleRow;
+
+   switch (buffer) {
+   case GL_COLOR_BUFFER_BIT:
+      readRb = ctx->ReadBuffer->_ColorReadBuffer;
+      drawRb = ctx->DrawBuffer->_ColorDrawBuffers[0];
+      comps = 4;
+      break;
+   case GL_DEPTH_BUFFER_BIT:
+      readRb = ctx->ReadBuffer->_DepthBuffer;
+      drawRb = ctx->DrawBuffer->_DepthBuffer;
+      comps = 1;
+      break;
+   case GL_STENCIL_BUFFER_BIT:
+      readRb = ctx->ReadBuffer->_StencilBuffer;
+      drawRb = ctx->DrawBuffer->_StencilBuffer;
+      comps = 1;
+      break;
+   default:
+      _mesa_problem(ctx, "unexpected buffer in blit_nearest()");
+      return;
+   }
+
+   switch (readRb->DataType) {
+   case GL_UNSIGNED_BYTE:
+      pixelSize = comps * sizeof(GLubyte);
+      break;
+   case GL_UNSIGNED_SHORT:
+      pixelSize = comps * sizeof(GLushort);
+      break;
+   case GL_UNSIGNED_INT:
+      pixelSize = comps * sizeof(GLuint);
+      break;
+   case GL_FLOAT:
+      pixelSize = comps * sizeof(GLfloat);
+      break;
+   default:
+      _mesa_problem(ctx, "unexpected buffer type (0x%x) in blit_nearest",
+                    readRb->DataType);
+      return;
+   }
+
+   /* choose row resampler */
+   switch (pixelSize) {
+   case 1:
+      resampleRow = resample_row_1;
+      break;
+   case 2:
+      resampleRow = resample_row_2;
+      break;
+   case 4:
+      resampleRow = resample_row_4;
+      break;
+   case 8:
+      resampleRow = resample_row_8;
+      break;
+   case 16:
+      resampleRow = resample_row_16;
+      break;
+   default:
+      _mesa_problem(ctx, "unexpected pixel size (%d) in blit_nearest",
+                    pixelSize);
+      return;
+   }
+
+   /* allocate the src/dst row buffers */
+   srcBuffer = malloc(pixelSize * srcWidth);
+   if (!srcBuffer) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");
+      return;
+   }
+   dstBuffer = malloc(pixelSize * dstWidth);
+   if (!dstBuffer) {
+      free(srcBuffer);
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");
+      return;
+   }
+
+   for (dstRow = 0; dstRow < dstHeight; dstRow++) {
+      const GLint dstY = dstYpos + dstRow;
+      GLint srcRow = (dstRow * srcHeight) / dstHeight;
+      GLint srcY;
+
+      ASSERT(srcRow >= 0);
+      ASSERT(srcRow < srcHeight);
+
+      if (invertY) {
+         srcRow = srcHeight - 1 - srcRow;
+      }
+
+      srcY = srcYpos + srcRow;
+
+      /* get pixel row from source and resample to match dest width */
+      if (prevY != srcY) {
+         readRb->GetRow(ctx, readRb, srcWidth, srcXpos, srcY, srcBuffer);
+         (*resampleRow)(srcWidth, dstWidth, srcBuffer, dstBuffer, invertX);
+         prevY = srcY;
+      }
+
+      /* store pixel row in destination */
+      drawRb->PutRow(ctx, drawRb, dstWidth, dstXpos, dstY, dstBuffer, NULL);
+   }
+
+   free(srcBuffer);
+   free(dstBuffer);
+}
+
+
+
+#define LERP(T, A, B)  ( (A) + (T) * ((B) - (A)) )
+
+static INLINE GLfloat
+lerp_2d(GLfloat a, GLfloat b,
+        GLfloat v00, GLfloat v10, GLfloat v01, GLfloat v11)
+{
+   const GLfloat temp0 = LERP(a, v00, v10);
+   const GLfloat temp1 = LERP(a, v01, v11);
+   return LERP(b, temp0, temp1);
+}
+
+
+/**
+ * Bilinear interpolation of two source rows.
+ * GLubyte pixels.
+ */
+static void
+resample_linear_row_ub(GLint srcWidth, GLint dstWidth,
+                       const GLvoid *srcBuffer0, const GLvoid *srcBuffer1,
+                       GLvoid *dstBuffer, GLboolean flip, GLfloat rowWeight)
+{
+   const GLubyte (*srcColor0)[4] = (const GLubyte (*)[4]) srcBuffer0;
+   const GLubyte (*srcColor1)[4] = (const GLubyte (*)[4]) srcBuffer1;
+   GLubyte (*dstColor)[4] = (GLubyte (*)[4]) dstBuffer;
+   const GLfloat dstWidthF = (GLfloat) dstWidth;
+   GLint dstCol;
+
+   for (dstCol = 0; dstCol < dstWidth; dstCol++) {
+      const GLfloat srcCol = (dstCol * srcWidth) / dstWidthF;
+      GLint srcCol0 = IFLOOR(srcCol);
+      GLint srcCol1 = srcCol0 + 1;
+      GLfloat colWeight = srcCol - srcCol0; /* fractional part of srcCol */
+      GLfloat red, green, blue, alpha;
+
+      ASSERT(srcCol0 >= 0);
+      ASSERT(srcCol0 < srcWidth);
+      ASSERT(srcCol1 <= srcWidth);
+
+      if (srcCol1 == srcWidth) {
+         /* last column fudge */
+         srcCol1--;
+         colWeight = 0.0;
+      }
+
+      if (flip) {
+         srcCol0 = srcWidth - 1 - srcCol0;
+         srcCol1 = srcWidth - 1 - srcCol1;
+      }
+
+      red = lerp_2d(colWeight, rowWeight,
+                    srcColor0[srcCol0][RCOMP], srcColor0[srcCol1][RCOMP],
+                    srcColor1[srcCol0][RCOMP], srcColor1[srcCol1][RCOMP]);
+      green = lerp_2d(colWeight, rowWeight,
+                    srcColor0[srcCol0][GCOMP], srcColor0[srcCol1][GCOMP],
+                    srcColor1[srcCol0][GCOMP], srcColor1[srcCol1][GCOMP]);
+      blue = lerp_2d(colWeight, rowWeight,
+                    srcColor0[srcCol0][BCOMP], srcColor0[srcCol1][BCOMP],
+                    srcColor1[srcCol0][BCOMP], srcColor1[srcCol1][BCOMP]);
+      alpha = lerp_2d(colWeight, rowWeight,
+                    srcColor0[srcCol0][ACOMP], srcColor0[srcCol1][ACOMP],
+                    srcColor1[srcCol0][ACOMP], srcColor1[srcCol1][ACOMP]);
+      
+      dstColor[dstCol][RCOMP] = IFLOOR(red);
+      dstColor[dstCol][GCOMP] = IFLOOR(green);
+      dstColor[dstCol][BCOMP] = IFLOOR(blue);
+      dstColor[dstCol][ACOMP] = IFLOOR(alpha);
+   }
+}
+
+
+
+/**
+ * Bilinear filtered blit (color only).
+ */
+static void
+blit_linear(struct gl_context *ctx,
+            GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
+            GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1)
+{
+   struct gl_renderbuffer *readRb = ctx->ReadBuffer->_ColorReadBuffer;
+   struct gl_renderbuffer *drawRb = ctx->DrawBuffer->_ColorDrawBuffers[0];
+
+   const GLint srcWidth = ABS(srcX1 - srcX0);
+   const GLint dstWidth = ABS(dstX1 - dstX0);
+   const GLint srcHeight = ABS(srcY1 - srcY0);
+   const GLint dstHeight = ABS(dstY1 - dstY0);
+   const GLfloat dstHeightF = (GLfloat) dstHeight;
+
+   const GLint srcXpos = MIN2(srcX0, srcX1);
+   const GLint srcYpos = MIN2(srcY0, srcY1);
+   const GLint dstXpos = MIN2(dstX0, dstX1);
+   const GLint dstYpos = MIN2(dstY0, dstY1);
+
+   const GLboolean invertX = (srcX1 < srcX0) ^ (dstX1 < dstX0);
+   const GLboolean invertY = (srcY1 < srcY0) ^ (dstY1 < dstY0);
+
+   GLint dstRow;
+
+   GLint pixelSize;
+   GLvoid *srcBuffer0, *srcBuffer1;
+   GLint srcBufferY0 = -1, srcBufferY1 = -1;
+   GLvoid *dstBuffer;
+
+   switch (readRb->DataType) {
+   case GL_UNSIGNED_BYTE:
+      pixelSize = 4 * sizeof(GLubyte);
+      break;
+   case GL_UNSIGNED_SHORT:
+      pixelSize = 4 * sizeof(GLushort);
+      break;
+   case GL_UNSIGNED_INT:
+      pixelSize = 4 * sizeof(GLuint);
+      break;
+   case GL_FLOAT:
+      pixelSize = 4 * sizeof(GLfloat);
+      break;
+   default:
+      _mesa_problem(ctx, "unexpected buffer type (0x%x) in blit_nearest",
+                    readRb->DataType);
+      return;
+   }
+
+   /* Allocate the src/dst row buffers.
+    * Keep two adjacent src rows around for bilinear sampling.
+    */
+   srcBuffer0 = malloc(pixelSize * srcWidth);
+   if (!srcBuffer0) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");
+      return;
+   }
+   srcBuffer1 = malloc(pixelSize * srcWidth);
+   if (!srcBuffer1) {
+      free(srcBuffer0);
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");
+      return;
+   }
+   dstBuffer = malloc(pixelSize * dstWidth);
+   if (!dstBuffer) {
+      free(srcBuffer0);
+      free(srcBuffer1);
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");
+      return;
+   }
+
+   for (dstRow = 0; dstRow < dstHeight; dstRow++) {
+      const GLint dstY = dstYpos + dstRow;
+      const GLfloat srcRow = (dstRow * srcHeight) / dstHeightF;
+      GLint srcRow0 = IFLOOR(srcRow);
+      GLint srcRow1 = srcRow0 + 1;
+      GLfloat rowWeight = srcRow - srcRow0; /* fractional part of srcRow */
+
+      ASSERT(srcRow >= 0);
+      ASSERT(srcRow < srcHeight);
+
+      if (srcRow1 == srcHeight) {
+         /* last row fudge */
+         srcRow1 = srcRow0;
+         rowWeight = 0.0;
+      }
+
+      if (invertY) {
+         srcRow0 = srcHeight - 1 - srcRow0;
+         srcRow1 = srcHeight - 1 - srcRow1;
+      }
+
+      srcY0 = srcYpos + srcRow0;
+      srcY1 = srcYpos + srcRow1;
+
+      /* get the two source rows */
+      if (srcY0 == srcBufferY0 && srcY1 == srcBufferY1) {
+         /* use same source row buffers again */
+      }
+      else if (srcY0 == srcBufferY1) {
+         /* move buffer1 into buffer0 by swapping pointers */
+         GLvoid *tmp = srcBuffer0;
+         srcBuffer0 = srcBuffer1;
+         srcBuffer1 = tmp;
+         /* get y1 row */
+         readRb->GetRow(ctx, readRb, srcWidth, srcXpos, srcY1, srcBuffer1);
+         srcBufferY0 = srcY0;
+         srcBufferY1 = srcY1;
+      }
+      else {
+         /* get both new rows */
+         readRb->GetRow(ctx, readRb, srcWidth, srcXpos, srcY0, srcBuffer0);
+         readRb->GetRow(ctx, readRb, srcWidth, srcXpos, srcY1, srcBuffer1);
+         srcBufferY0 = srcY0;
+         srcBufferY1 = srcY1;
+      }
+
+      if (readRb->DataType == GL_UNSIGNED_BYTE) {
+         resample_linear_row_ub(srcWidth, dstWidth, srcBuffer0, srcBuffer1,
+                                dstBuffer, invertX, rowWeight);
+      }
+      else {
+         _mesa_problem(ctx, "Unsupported color channel type in sw blit");
+         break;
+      }
+
+      /* store pixel row in destination */
+      drawRb->PutRow(ctx, drawRb, dstWidth, dstXpos, dstY, dstBuffer, NULL);
+   }
+
+   free(srcBuffer0);
+   free(srcBuffer1);
+   free(dstBuffer);
+}
+
+
+/**
+ * Simple case:  Blit color, depth or stencil with no scaling or flipping.
+ * XXX we could easily support vertical flipping here.
+ */
+static void
+simple_blit(struct gl_context *ctx,
+            GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
+            GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
+            GLbitfield buffer)
+{
+   struct gl_renderbuffer *readRb, *drawRb;
+   const GLint width = srcX1 - srcX0;
+   const GLint height = srcY1 - srcY0;
+   GLint row, srcY, dstY, yStep;
+   GLint comps, bytesPerRow;
+   void *rowBuffer;
+
+   /* only one buffer */
+   ASSERT(_mesa_bitcount(buffer) == 1);
+   /* no flipping checks */
+   ASSERT(srcX0 < srcX1);
+   ASSERT(srcY0 < srcY1);
+   ASSERT(dstX0 < dstX1);
+   ASSERT(dstY0 < dstY1);
+   /* size checks */
+   ASSERT(srcX1 - srcX0 == dstX1 - dstX0);
+   ASSERT(srcY1 - srcY0 == dstY1 - dstY0);
+
+   /* determine if copy should be bottom-to-top or top-to-bottom */
+   if (srcY0 > dstY0) {
+      /* src above dst: copy bottom-to-top */
+      yStep = 1;
+      srcY = srcY0;
+      dstY = dstY0;
+   }
+   else {
+      /* src below dst: copy top-to-bottom */
+      yStep = -1;
+      srcY = srcY1 - 1;
+      dstY = dstY1 - 1;
+   }
+
+   switch (buffer) {
+   case GL_COLOR_BUFFER_BIT:
+      readRb = ctx->ReadBuffer->_ColorReadBuffer;
+      drawRb = ctx->DrawBuffer->_ColorDrawBuffers[0];
+      comps = 4;
+      break;
+   case GL_DEPTH_BUFFER_BIT:
+      readRb = ctx->ReadBuffer->_DepthBuffer;
+      drawRb = ctx->DrawBuffer->_DepthBuffer;
+      comps = 1;
+      break;
+   case GL_STENCIL_BUFFER_BIT:
+      readRb = ctx->ReadBuffer->_StencilBuffer;
+      drawRb = ctx->DrawBuffer->_StencilBuffer;
+      comps = 1;
+      break;
+   default:
+      _mesa_problem(ctx, "unexpected buffer in simple_blit()");
+      return;
+   }
+
+   ASSERT(readRb->DataType == drawRb->DataType);
+
+   /* compute bytes per row */
+   switch (readRb->DataType) {
+   case GL_UNSIGNED_BYTE:
+      bytesPerRow = comps * width * sizeof(GLubyte);
+      break;
+   case GL_UNSIGNED_SHORT:
+      bytesPerRow = comps * width * sizeof(GLushort);
+      break;
+   case GL_UNSIGNED_INT:
+      bytesPerRow = comps * width * sizeof(GLuint);
+      break;
+   case GL_FLOAT:
+      bytesPerRow = comps * width * sizeof(GLfloat);
+      break;
+   default:
+      _mesa_problem(ctx, "unexpected buffer type in simple_blit");
+      return;
+   }
+
+   /* allocate the row buffer */
+   rowBuffer = malloc(bytesPerRow);
+   if (!rowBuffer) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");
+      return;
+   }
+
+   for (row = 0; row < height; row++) {
+      readRb->GetRow(ctx, readRb, width, srcX0, srcY, rowBuffer);
+      drawRb->PutRow(ctx, drawRb, width, dstX0, dstY, rowBuffer, NULL);
+      srcY += yStep;
+      dstY += yStep;
+   }
+
+   free(rowBuffer);
+}
+
+
+/**
+ * Software fallback for glBlitFramebufferEXT().
+ */
+void
+_swrast_BlitFramebuffer(struct gl_context *ctx,
+                        GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
+                        GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
+                        GLbitfield mask, GLenum filter)
+{
+   static const GLbitfield buffers[3] = {
+      GL_COLOR_BUFFER_BIT,
+      GL_DEPTH_BUFFER_BIT,
+      GL_STENCIL_BUFFER_BIT
+   };
+   GLint i;
+
+   if (!ctx->DrawBuffer->_NumColorDrawBuffers)
+      return;
+
+   if (!_mesa_clip_blit(ctx, &srcX0, &srcY0, &srcX1, &srcY1,
+                        &dstX0, &dstY0, &dstX1, &dstY1)) {
+      return;
+   }
+
+   swrast_render_start(ctx);
+
+   if (srcX1 - srcX0 == dstX1 - dstX0 &&
+       srcY1 - srcY0 == dstY1 - dstY0 &&
+       srcX0 < srcX1 &&
+       srcY0 < srcY1 &&
+       dstX0 < dstX1 &&
+       dstY0 < dstY1) {
+      /* no stretching or flipping.
+       * filter doesn't matter.
+       */
+      for (i = 0; i < 3; i++) {
+         if (mask & buffers[i]) {
+            simple_blit(ctx, srcX0, srcY0, srcX1, srcY1,
+                        dstX0, dstY0, dstX1, dstY1, buffers[i]);
+         }
+      }
+   }
+   else {
+      if (filter == GL_NEAREST) {
+         for (i = 0; i < 3; i++) {
+            if (mask & buffers[i]) {
+               blit_nearest(ctx,  srcX0, srcY0, srcX1, srcY1,
+                            dstX0, dstY0, dstX1, dstY1, buffers[i]);
+            }
+         }
+      }
+      else {
+         ASSERT(filter == GL_LINEAR);
+         if (mask & GL_COLOR_BUFFER_BIT) {  /* depth/stencil not allowed */
+            blit_linear(ctx,  srcX0, srcY0, srcX1, srcY1,
+                        dstX0, dstY0, dstX1, dstY1);
+         }
+      }
+   }
+
+   swrast_render_finish(ctx);
+}