xkeyboard-config mesa git update 2 Mar 2011

36 files changed, 6833 insertions, 32401 deletions

diff --git a/mesalib/Makefile b/mesalib/Makefile
index 726dd5554..a1ab65ef0 100644
--- a/mesalib/Makefile
+++ b/mesalib/Makefile
@@ -1,497 +1,498 @@
-# Top-level Mesa makefile

-

-TOP = .

-

-SUBDIRS = src

-

-

-default: $(TOP)/configs/current

-	@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)/bin/config.guess					\

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

-	$(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/internal/glcore.h			\

-	$(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/glsl/Makefile					\

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

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

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

-	$(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/mesa/Makefile*					\

-	$(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/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/Makefile				\

-	$(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/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/vgapi/Makefile				\

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

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

-	$(DIRECTORY)/src/mapi/vgapi/*.h

-

-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/*.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/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)

-

-

-# Everything for new a Mesa release:

-tarballs: rm_depend configure aclocal.m4 lib_gz glut_gz \

-	lib_bz2 glut_bz2 lib_zip glut_zip md5

-

-

-# Helper for autoconf builds

-ACLOCAL = aclocal

-ACLOCAL_FLAGS =

-AUTOCONF = autoconf

-AC_FLAGS =

-aclocal.m4: configure.ac acinclude.m4

-	$(ACLOCAL) $(ACLOCAL_FLAGS)

-configure: 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:

-	rm -f configs/current

-	rm -f configs/autoconf

-

-lib_gz: rm_config

-	cd .. ; \

-	tar -cf $(LIB_NAME).tar $(LIB_FILES) ; \

-	gzip $(LIB_NAME).tar ; \

-	mv $(LIB_NAME).tar.gz $(DIRECTORY)

-

-glut_gz:

-	cd .. ; \

-	tar -cf $(GLUT_NAME).tar $(GLUT_FILES) ; \

-	gzip $(GLUT_NAME).tar ; \

-	mv $(GLUT_NAME).tar.gz $(DIRECTORY)

-

-lib_bz2: rm_config

-	cd .. ; \

-	tar -cf $(LIB_NAME).tar $(LIB_FILES) ; \

-	bzip2 $(LIB_NAME).tar ; \

-	mv $(LIB_NAME).tar.bz2 $(DIRECTORY)

-

-glut_bz2:

-	cd .. ; \

-	tar -cf $(GLUT_NAME).tar $(GLUT_FILES) ; \

-	bzip2 $(GLUT_NAME).tar ; \

-	mv $(GLUT_NAME).tar.bz2 $(DIRECTORY)

-

-lib_zip: rm_config

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

-	cd .. ; \

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

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

-

-glut_zip:

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

-	cd .. ; \

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

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

-

-md5:

-	@-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 \

-	lib_gz glut_gz \

-	lib_bz2 glut_bz2 \

-	lib_zip glut_zip

+# Top-level Mesa makefile
+
+TOP = .
+
+SUBDIRS = src
+
+
+default: $(TOP)/configs/current
+	@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)/bin/config.guess					\
+	$(DIRECTORY)/bin/config.sub					\
+	$(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/glsl/Makefile					\
+	$(DIRECTORY)/src/glsl/Makefile.template				\
+	$(DIRECTORY)/src/glsl/SConscript				\
+	$(DIRECTORY)/src/glsl/*.[ch]					\
+	$(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/mesa/Makefile*					\
+	$(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/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/Makefile				\
+	$(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/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/vgapi/Makefile				\
+	$(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/*.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/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 fbc743650..9fa5eeea1 100644
--- a/mesalib/configure.ac
+++ b/mesalib/configure.ac
@@ -18,12 +18,12 @@ AC_CONFIG_AUX_DIR([bin])
 AC_CANONICAL_HOST
 
 dnl Versions for external dependencies
-LIBDRM_REQUIRED=2.4.23
-LIBDRM_RADEON_REQUIRED=2.4.23
-LIBDRM_INTEL_REQUIRED=2.4.23
+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.23
+LIBDRM_XORG_REQUIRED=2.4.24
 LIBKMS_XORG_REQUIRED=1.0.0
 
 dnl Check for progs
@@ -1587,7 +1587,7 @@ yes)
                 GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/fbdev"
         fi
 	if test "$plat" = "wayland"; then
-		PKG_CHECK_MODULES([WAYLAND], [wayland-client],, \
+		PKG_CHECK_MODULES([WAYLAND], [wayland-client wayland-server],, \
 				  [AC_MSG_ERROR([cannot find libwayland-client])])
 		WAYLAND_EGL_LIB_DEPS="$WAYLAND_LIBS $LIBDRM_LIBS"
 	fi
diff --git a/mesalib/docs/WL_bind_wayland_display.spec b/mesalib/docs/WL_bind_wayland_display.spec
new file mode 100644
index 000000000..0ff49d6a7
--- /dev/null
+++ b/mesalib/docs/WL_bind_wayland_display.spec
@@ -0,0 +1,92 @@
+Name
+
+    WL_bind_wayland_display
+
+Name Strings
+
+    EGL_WL_bind_wayland_display
+
+Contact
+
+    Kristian Høgsberg <krh@bitplanet.net>
+    Benjamin Franzke <benjaminfranzke@googlemail.com>
+
+Status
+
+    Proposal
+
+Version
+
+    Version 1, March 1, 2011
+
+Number
+
+    EGL Extension #not assigned
+
+Dependencies
+
+    Reguires EGL 1.4 or later.  This extension is written against the
+    wording of the EGL 1.4 specification.
+
+    EGL_KHR_base_image is required.
+
+Overview
+
+    This extension provides entry points for binding and unbinding the
+    wl_display of a Wayland compositor to an EGLDisplay.  Binding a
+    wl_display means that the EGL implementation should provide one or
+    more interfaces in the Wayland protocol to allow clients to create
+    wl_buffer objects.  On the server side, this extension also
+    provides a new target for eglCreateImageKHR, to create an EGLImage
+    from a wl_buffer
+
+    Adding a implementation specific wayland interface, allows the
+    EGL implementation to define specific wayland requests and events,
+    needed for buffer sharing in a EGL wayland platform.
+
+IP Status
+
+    Open-source; freely implementable.
+
+New Procedures and Functions
+
+    EGLBoolean eglBindWaylandDisplayWL(EGLDisplay dpy,
+                                       struct wl_display *display);
+
+    EGLBoolean eglUnbindWaylandDisplayWL(EGLDisplay dpy,
+                                         struct wl_display *display);
+
+New Tokens
+
+    Accepted as <target> in eglCreateImageKHR
+
+        EGL_WAYLAND_BUFFER_WL                   0x31D5
+
+Additions to the EGL 1.4 Specification:
+
+    To bind a server side wl_display to an EGLDisplay, call
+
+        EGLBoolean eglBindWaylandDisplayWL(EGLDisplay dpy,
+                                           struct wl_display *display);
+
+    To unbind a server side wl_display from an EGLDisplay, call
+    
+        EGLBoolean eglUnbindWaylandDisplayWL(EGLDisplay dpy,
+                                             struct wl_display *display);
+
+    eglBindWaylandDisplayWL returns EGL_FALSE when there is already a
+    wl_display bound to EGLDisplay otherwise EGL_TRUE.
+
+    eglUnbindWaylandDisplayWL returns EGL_FALSE when there is no
+    wl_display bound to the EGLDisplay currently otherwise EGL_TRUE.
+
+    Import a wl_buffer by calling eglCreateImageKHR with
+    wl_buffer as EGLClientBuffer, EGL_WAYLAND_BUFFER_WL as the target,
+    and an empty attribute_list.
+
+Issues
+
+Revision History
+
+    Version 1, March 1, 2011
+        Initial draft (Benjamin Franzke)
diff --git a/mesalib/include/EGL/eglext.h b/mesalib/include/EGL/eglext.h
index 48c75edca..bae966f1e 100644
--- a/mesalib/include/EGL/eglext.h
+++ b/mesalib/include/EGL/eglext.h
@@ -1,384 +1,398 @@
-#ifndef __eglext_h_

-#define __eglext_h_

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-/*

-** Copyright (c) 2007-2010 The Khronos Group Inc.

-**

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

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

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

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

-** distribute, sublicense, and/or sell copies of the Materials, and to

-** permit persons to whom the Materials are 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 Materials.

-**

-** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

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

-** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY

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

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

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

-*/

-

-#include <EGL/eglplatform.h>

-

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

-

-/* Header file version number */

-/* Current version at http://www.khronos.org/registry/egl/ */

-/* $Revision$ on $Date: 2010-07-27 20:12:35 -0700 (Tue, 27 Jul 2010) $ */

-#define EGL_EGLEXT_VERSION 7

-

-#ifndef EGL_KHR_config_attribs

-#define EGL_KHR_config_attribs 1

-#define EGL_CONFORMANT_KHR			0x3042	/* EGLConfig attribute */

-#define EGL_VG_COLORSPACE_LINEAR_BIT_KHR	0x0020	/* EGL_SURFACE_TYPE bitfield */

-#define EGL_VG_ALPHA_FORMAT_PRE_BIT_KHR		0x0040	/* EGL_SURFACE_TYPE bitfield */

-#endif

-

-#ifndef EGL_KHR_lock_surface

-#define EGL_KHR_lock_surface 1

-#define EGL_READ_SURFACE_BIT_KHR		0x0001	/* EGL_LOCK_USAGE_HINT_KHR bitfield */

-#define EGL_WRITE_SURFACE_BIT_KHR		0x0002	/* EGL_LOCK_USAGE_HINT_KHR bitfield */

-#define EGL_LOCK_SURFACE_BIT_KHR		0x0080	/* EGL_SURFACE_TYPE bitfield */

-#define EGL_OPTIMAL_FORMAT_BIT_KHR		0x0100	/* EGL_SURFACE_TYPE bitfield */

-#define EGL_MATCH_FORMAT_KHR			0x3043	/* EGLConfig attribute */

-#define EGL_FORMAT_RGB_565_EXACT_KHR		0x30C0	/* EGL_MATCH_FORMAT_KHR value */

-#define EGL_FORMAT_RGB_565_KHR			0x30C1	/* EGL_MATCH_FORMAT_KHR value */

-#define EGL_FORMAT_RGBA_8888_EXACT_KHR		0x30C2	/* EGL_MATCH_FORMAT_KHR value */

-#define EGL_FORMAT_RGBA_8888_KHR		0x30C3	/* EGL_MATCH_FORMAT_KHR value */

-#define EGL_MAP_PRESERVE_PIXELS_KHR		0x30C4	/* eglLockSurfaceKHR attribute */

-#define EGL_LOCK_USAGE_HINT_KHR			0x30C5	/* eglLockSurfaceKHR attribute */

-#define EGL_BITMAP_POINTER_KHR			0x30C6	/* eglQuerySurface attribute */

-#define EGL_BITMAP_PITCH_KHR			0x30C7	/* eglQuerySurface attribute */

-#define EGL_BITMAP_ORIGIN_KHR			0x30C8	/* eglQuerySurface attribute */

-#define EGL_BITMAP_PIXEL_RED_OFFSET_KHR		0x30C9	/* eglQuerySurface attribute */

-#define EGL_BITMAP_PIXEL_GREEN_OFFSET_KHR	0x30CA	/* eglQuerySurface attribute */

-#define EGL_BITMAP_PIXEL_BLUE_OFFSET_KHR	0x30CB	/* eglQuerySurface attribute */

-#define EGL_BITMAP_PIXEL_ALPHA_OFFSET_KHR	0x30CC	/* eglQuerySurface attribute */

-#define EGL_BITMAP_PIXEL_LUMINANCE_OFFSET_KHR	0x30CD	/* eglQuerySurface attribute */

-#define EGL_LOWER_LEFT_KHR			0x30CE	/* EGL_BITMAP_ORIGIN_KHR value */

-#define EGL_UPPER_LEFT_KHR			0x30CF	/* EGL_BITMAP_ORIGIN_KHR value */

-#ifdef EGL_EGLEXT_PROTOTYPES

-EGLAPI EGLBoolean EGLAPIENTRY eglLockSurfaceKHR (EGLDisplay display, EGLSurface surface, const EGLint *attrib_list);

-EGLAPI EGLBoolean EGLAPIENTRY eglUnlockSurfaceKHR (EGLDisplay display, EGLSurface surface);

-#endif /* EGL_EGLEXT_PROTOTYPES */

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLLOCKSURFACEKHRPROC) (EGLDisplay display, EGLSurface surface, const EGLint *attrib_list);

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLUNLOCKSURFACEKHRPROC) (EGLDisplay display, EGLSurface surface);

-#endif

-

-#ifndef EGL_KHR_image

-#define EGL_KHR_image 1

-#define EGL_NATIVE_PIXMAP_KHR			0x30B0	/* eglCreateImageKHR target */

-typedef void *EGLImageKHR;

-#define EGL_NO_IMAGE_KHR			((EGLImageKHR)0)

-#ifdef EGL_EGLEXT_PROTOTYPES

-EGLAPI EGLImageKHR EGLAPIENTRY eglCreateImageKHR (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list);

-EGLAPI EGLBoolean EGLAPIENTRY eglDestroyImageKHR (EGLDisplay dpy, EGLImageKHR image);

-#endif /* EGL_EGLEXT_PROTOTYPES */

-typedef EGLImageKHR (EGLAPIENTRYP PFNEGLCREATEIMAGEKHRPROC) (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list);

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYIMAGEKHRPROC) (EGLDisplay dpy, EGLImageKHR image);

-#endif

-

-#ifndef EGL_KHR_vg_parent_image

-#define EGL_KHR_vg_parent_image 1

-#define EGL_VG_PARENT_IMAGE_KHR			0x30BA	/* eglCreateImageKHR target */

-#endif

-

-#ifndef EGL_KHR_gl_texture_2D_image

-#define EGL_KHR_gl_texture_2D_image 1

-#define EGL_GL_TEXTURE_2D_KHR			0x30B1	/* eglCreateImageKHR target */

-#define EGL_GL_TEXTURE_LEVEL_KHR		0x30BC	/* eglCreateImageKHR attribute */

-#endif

-

-#ifndef EGL_KHR_gl_texture_cubemap_image

-#define EGL_KHR_gl_texture_cubemap_image 1

-#define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_X_KHR	0x30B3	/* eglCreateImageKHR target */

-#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_X_KHR	0x30B4	/* eglCreateImageKHR target */

-#define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Y_KHR	0x30B5	/* eglCreateImageKHR target */

-#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_KHR	0x30B6	/* eglCreateImageKHR target */

-#define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Z_KHR	0x30B7	/* eglCreateImageKHR target */

-#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_KHR	0x30B8	/* eglCreateImageKHR target */

-#endif

-

-#ifndef EGL_KHR_gl_texture_3D_image

-#define EGL_KHR_gl_texture_3D_image 1

-#define EGL_GL_TEXTURE_3D_KHR			0x30B2	/* eglCreateImageKHR target */

-#define EGL_GL_TEXTURE_ZOFFSET_KHR		0x30BD	/* eglCreateImageKHR attribute */

-#endif

-

-#ifndef EGL_KHR_gl_renderbuffer_image

-#define EGL_KHR_gl_renderbuffer_image 1

-#define EGL_GL_RENDERBUFFER_KHR			0x30B9	/* eglCreateImageKHR target */

-#endif

-

-#ifndef EGL_MESA_drm_image

-#define EGL_MESA_drm_image 1

-#define EGL_DRM_BUFFER_FORMAT_MESA		0x31D0	/* eglCreateImageKHR attribute */

-#define EGL_DRM_BUFFER_USE_MESA			0x31D1

-

-/* EGL_DRM_BUFFER_FORMAT_MESA tokens */

-#define EGL_DRM_BUFFER_FORMAT_ARGB32_MESA	0x31D2

-

-/* EGL_DRM_BUFFER_USE_MESA bits */

-#define EGL_DRM_BUFFER_USE_SCANOUT_MESA		0x0001

-#define EGL_DRM_BUFFER_USE_SHARE_MESA		0x0002

-

-#define EGL_DRM_BUFFER_MESA			0x31D3  /* eglCreateImageKHR target */

-#define EGL_DRM_BUFFER_STRIDE_MESA		0x31D4	/* eglCreateImageKHR attribute */

-

-#ifdef EGL_EGLEXT_PROTOTYPES

-EGLAPI EGLImageKHR EGLAPIENTRY eglCreateDRMImageMESA(EGLDisplay dpy, const EGLint *attrib_list);

-EGLAPI EGLBoolean EGLAPIENTRY eglExportDRMImageMESA(EGLDisplay dpy, EGLImageKHR image, EGLint *name, EGLint *handle, EGLint *stride);

-#endif

-typedef EGLImageKHR (EGLAPIENTRYP PFNEGLCREATEDRMIMAGEMESA) (EGLDisplay dpy, const EGLint *attrib_list);

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLEXPORTDRMIMAGEMESA) (EGLDisplay dpy, EGLImageKHR image, EGLint *name, EGLint *handle, EGLint *stride);

-#endif

-

-#if KHRONOS_SUPPORT_INT64   /* EGLTimeKHR requires 64-bit uint support */

-#ifndef EGL_KHR_reusable_sync

-#define EGL_KHR_reusable_sync 1

-

-typedef void* EGLSyncKHR;

-typedef khronos_utime_nanoseconds_t EGLTimeKHR;

-

-#define EGL_SYNC_STATUS_KHR			0x30F1

-#define EGL_SIGNALED_KHR			0x30F2

-#define EGL_UNSIGNALED_KHR			0x30F3

-#define EGL_TIMEOUT_EXPIRED_KHR			0x30F5

-#define EGL_CONDITION_SATISFIED_KHR		0x30F6

-#define EGL_SYNC_TYPE_KHR			0x30F7

-#define EGL_SYNC_REUSABLE_KHR			0x30FA

-#define EGL_SYNC_FLUSH_COMMANDS_BIT_KHR		0x0001	/* eglClientWaitSyncKHR <flags> bitfield */

-#define EGL_FOREVER_KHR				0xFFFFFFFFFFFFFFFFull

-#define EGL_NO_SYNC_KHR				((EGLSyncKHR)0)

-#ifdef EGL_EGLEXT_PROTOTYPES

-EGLAPI EGLSyncKHR EGLAPIENTRY eglCreateSyncKHR(EGLDisplay dpy, EGLenum type, const EGLint *attrib_list);

-EGLAPI EGLBoolean EGLAPIENTRY eglDestroySyncKHR(EGLDisplay dpy, EGLSyncKHR sync);

-EGLAPI EGLint EGLAPIENTRY eglClientWaitSyncKHR(EGLDisplay dpy, EGLSyncKHR sync, EGLint flags, EGLTimeKHR timeout);

-EGLAPI EGLBoolean EGLAPIENTRY eglSignalSyncKHR(EGLDisplay dpy, EGLSyncKHR sync, EGLenum mode);

-EGLAPI EGLBoolean EGLAPIENTRY eglGetSyncAttribKHR(EGLDisplay dpy, EGLSyncKHR sync, EGLint attribute, EGLint *value);

-#endif /* EGL_EGLEXT_PROTOTYPES */

-typedef EGLSyncKHR (EGLAPIENTRYP PFNEGLCREATESYNCKHRPROC) (EGLDisplay dpy, EGLenum type, const EGLint *attrib_list);

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYSYNCKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync);

-typedef EGLint (EGLAPIENTRYP PFNEGLCLIENTWAITSYNCKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLint flags, EGLTimeKHR timeout);

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLSIGNALSYNCKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLenum mode);

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLint attribute, EGLint *value);

-#endif

-#endif

-

-/* EGL_MESA_screen extension  >>> PRELIMINARY <<< */

-#ifndef EGL_MESA_screen_surface

-#define EGL_MESA_screen_surface 1

-

-#define EGL_BAD_SCREEN_MESA                    0x4000

-#define EGL_BAD_MODE_MESA                      0x4001

-#define EGL_SCREEN_COUNT_MESA                  0x4002

-#define EGL_SCREEN_POSITION_MESA               0x4003

-#define EGL_SCREEN_POSITION_GRANULARITY_MESA   0x4004

-#define EGL_MODE_ID_MESA                       0x4005

-#define EGL_REFRESH_RATE_MESA                  0x4006

-#define EGL_OPTIMAL_MESA                       0x4007

-#define EGL_INTERLACED_MESA                    0x4008

-#define EGL_SCREEN_BIT_MESA                    0x08

-

-typedef khronos_uint32_t EGLScreenMESA;

-typedef khronos_uint32_t EGLModeMESA;

-

-#ifdef EGL_EGLEXT_PROTOTYPES

-EGLAPI EGLBoolean EGLAPIENTRY eglChooseModeMESA(EGLDisplay dpy, EGLScreenMESA screen, const EGLint *attrib_list, EGLModeMESA *modes, EGLint modes_size, EGLint *num_modes);

-EGLAPI EGLBoolean EGLAPIENTRY eglGetModesMESA(EGLDisplay dpy, EGLScreenMESA screen, EGLModeMESA *modes, EGLint modes_size, EGLint *num_modes);

-EGLAPI EGLBoolean EGLAPIENTRY eglGetModeAttribMESA(EGLDisplay dpy, EGLModeMESA mode, EGLint attribute, EGLint *value);

-EGLAPI EGLBoolean EGLAPIENTRY eglGetScreensMESA(EGLDisplay dpy, EGLScreenMESA *screens, EGLint max_screens, EGLint *num_screens);

-EGLAPI EGLSurface EGLAPIENTRY eglCreateScreenSurfaceMESA(EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list);

-EGLAPI EGLBoolean EGLAPIENTRY eglShowScreenSurfaceMESA(EGLDisplay dpy, EGLint screen, EGLSurface surface, EGLModeMESA mode);

-EGLAPI EGLBoolean EGLAPIENTRY eglScreenPositionMESA(EGLDisplay dpy, EGLScreenMESA screen, EGLint x, EGLint y);

-EGLAPI EGLBoolean EGLAPIENTRY eglQueryScreenMESA(EGLDisplay dpy, EGLScreenMESA screen, EGLint attribute, EGLint *value);

-EGLAPI EGLBoolean EGLAPIENTRY eglQueryScreenSurfaceMESA(EGLDisplay dpy, EGLScreenMESA screen, EGLSurface *surface);

-EGLAPI EGLBoolean EGLAPIENTRY eglQueryScreenModeMESA(EGLDisplay dpy, EGLScreenMESA screen, EGLModeMESA *mode);

-EGLAPI const char * EGLAPIENTRY eglQueryModeStringMESA(EGLDisplay dpy, EGLModeMESA mode);

-#endif /* EGL_EGLEXT_PROTOTYPES */

-

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLCHOOSEMODEMESA) (EGLDisplay dpy, EGLScreenMESA screen, const EGLint *attrib_list, EGLModeMESA *modes, EGLint modes_size, EGLint *num_modes);

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETMODESMESA) (EGLDisplay dpy, EGLScreenMESA screen, EGLModeMESA *modes, EGLint modes_size, EGLint *num_modes);

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLGetModeATTRIBMESA) (EGLDisplay dpy, EGLModeMESA mode, EGLint attribute, EGLint *value);

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSCRREENSMESA) (EGLDisplay dpy, EGLScreenMESA *screens, EGLint max_screens, EGLint *num_screens);

-typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATESCREENSURFACEMESA) (EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list);

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLSHOWSCREENSURFACEMESA) (EGLDisplay dpy, EGLint screen, EGLSurface surface, EGLModeMESA mode);

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLSCREENPOSIITONMESA) (EGLDisplay dpy, EGLScreenMESA screen, EGLint x, EGLint y);

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSCREENMESA) (EGLDisplay dpy, EGLScreenMESA screen, EGLint attribute, EGLint *value);

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSCREENSURFACEMESA) (EGLDisplay dpy, EGLScreenMESA screen, EGLSurface *surface);

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSCREENMODEMESA) (EGLDisplay dpy, EGLScreenMESA screen, EGLModeMESA *mode);

-typedef const char * (EGLAPIENTRYP PFNEGLQUERYMODESTRINGMESA) (EGLDisplay dpy, EGLModeMESA mode);

-

-#endif /* EGL_MESA_screen_surface */

-

-

-#ifndef EGL_MESA_copy_context

-#define EGL_MESA_copy_context 1

-

-#ifdef EGL_EGLEXT_PROTOTYPES

-EGLAPI EGLBoolean EGLAPIENTRY eglCopyContextMESA(EGLDisplay dpy, EGLContext source, EGLContext dest, EGLint mask);

-#endif /* EGL_EGLEXT_PROTOTYPES */

-

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLCOPYCONTEXTMESA) (EGLDisplay dpy, EGLContext source, EGLContext dest, EGLint mask);

-

-#endif /* EGL_MESA_copy_context */

-

-#ifndef EGL_MESA_drm_display

-#define EGL_MESA_drm_display 1

-

-#ifdef EGL_EGLEXT_PROTOTYPES

-EGLAPI EGLDisplay EGLAPIENTRY eglGetDRMDisplayMESA(int fd);

-#endif /* EGL_EGLEXT_PROTOTYPES */

-

-typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETDRMDISPLAYMESA) (int fd);

-

-#endif /* EGL_MESA_drm_display */

-

-#ifndef EGL_KHR_image_base

-#define EGL_KHR_image_base 1

-/* Most interfaces defined by EGL_KHR_image_pixmap above */

-#define EGL_IMAGE_PRESERVED_KHR			0x30D2	/* eglCreateImageKHR attribute */

-#endif

-

-#ifndef EGL_KHR_image_pixmap

-#define EGL_KHR_image_pixmap 1

-/* Interfaces defined by EGL_KHR_image above */

-#endif

-

-#ifndef EGL_IMG_context_priority

-#define EGL_IMG_context_priority 1

-#define EGL_CONTEXT_PRIORITY_LEVEL_IMG		0x3100

-#define EGL_CONTEXT_PRIORITY_HIGH_IMG		0x3101

-#define EGL_CONTEXT_PRIORITY_MEDIUM_IMG		0x3102

-#define EGL_CONTEXT_PRIORITY_LOW_IMG		0x3103

-#endif

-

-#ifndef EGL_KHR_lock_surface2

-#define EGL_KHR_lock_surface2 1

-#define EGL_BITMAP_PIXEL_SIZE_KHR		0x3110

-#endif

-

-#ifndef EGL_NV_coverage_sample

-#define EGL_NV_coverage_sample 1

-#define EGL_COVERAGE_BUFFERS_NV 0x30E0

-#define EGL_COVERAGE_SAMPLES_NV 0x30E1

-#endif

-

-#ifndef EGL_NV_depth_nonlinear

-#define EGL_NV_depth_nonlinear 1

-#define EGL_DEPTH_ENCODING_NV 0x30E2

-#define EGL_DEPTH_ENCODING_NONE_NV 0

-#define EGL_DEPTH_ENCODING_NONLINEAR_NV 0x30E3

-#endif

-

-#if KHRONOS_SUPPORT_INT64   /* EGLTimeNV requires 64-bit uint support */

-#ifndef EGL_NV_sync

-#define EGL_NV_sync 1

-#define EGL_SYNC_PRIOR_COMMANDS_COMPLETE_NV	0x30E6

-#define EGL_SYNC_STATUS_NV			0x30E7

-#define EGL_SIGNALED_NV				0x30E8

-#define EGL_UNSIGNALED_NV			0x30E9

-#define EGL_SYNC_FLUSH_COMMANDS_BIT_NV		0x0001

-#define EGL_FOREVER_NV				0xFFFFFFFFFFFFFFFFull

-#define EGL_ALREADY_SIGNALED_NV			0x30EA

-#define EGL_TIMEOUT_EXPIRED_NV			0x30EB

-#define EGL_CONDITION_SATISFIED_NV		0x30EC

-#define EGL_SYNC_TYPE_NV			0x30ED

-#define EGL_SYNC_CONDITION_NV			0x30EE

-#define EGL_SYNC_FENCE_NV			0x30EF

-#define EGL_NO_SYNC_NV				((EGLSyncNV)0)

-typedef void* EGLSyncNV;

-typedef khronos_utime_nanoseconds_t EGLTimeNV;

-#ifdef EGL_EGLEXT_PROTOTYPES

-EGLSyncNV eglCreateFenceSyncNV (EGLDisplay dpy, EGLenum condition, const EGLint *attrib_list);

-EGLBoolean eglDestroySyncNV (EGLSyncNV sync);

-EGLBoolean eglFenceNV (EGLSyncNV sync);

-EGLint eglClientWaitSyncNV (EGLSyncNV sync, EGLint flags, EGLTimeNV timeout);

-EGLBoolean eglSignalSyncNV (EGLSyncNV sync, EGLenum mode);

-EGLBoolean eglGetSyncAttribNV (EGLSyncNV sync, EGLint attribute, EGLint *value);

-#endif /* EGL_EGLEXT_PROTOTYPES */

-typedef EGLSyncNV (EGLAPIENTRYP PFNEGLCREATEFENCESYNCNVPROC) (EGLDisplay dpy, EGLenum condition, const EGLint *attrib_list);

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYSYNCNVPROC) (EGLSyncNV sync);

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLFENCENVPROC) (EGLSyncNV sync);

-typedef EGLint (EGLAPIENTRYP PFNEGLCLIENTWAITSYNCNVPROC) (EGLSyncNV sync, EGLint flags, EGLTimeNV timeout);

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLSIGNALSYNCNVPROC) (EGLSyncNV sync, EGLenum mode);

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBNVPROC) (EGLSyncNV sync, EGLint attribute, EGLint *value);

-#endif

-#endif

-

-#if KHRONOS_SUPPORT_INT64   /* Dependent on EGL_KHR_reusable_sync which requires 64-bit uint support */

-#ifndef EGL_KHR_fence_sync

-#define EGL_KHR_fence_sync 1

-/* Reuses most tokens and entry points from EGL_KHR_reusable_sync */

-#define EGL_SYNC_PRIOR_COMMANDS_COMPLETE_KHR	0x30F0

-#define EGL_SYNC_CONDITION_KHR			0x30F8

-#define EGL_SYNC_FENCE_KHR			0x30F9

-#endif

-#endif

-

-#ifndef EGL_HI_clientpixmap

-#define EGL_HI_clientpixmap 1

-

-/* Surface Attribute */

-#define EGL_CLIENT_PIXMAP_POINTER_HI		0x8F74

-/*

- * Structure representing a client pixmap

- * (pixmap's data is in client-space memory).

- */

-struct EGLClientPixmapHI

-{

-	void*		pData;

-	EGLint		iWidth;

-	EGLint		iHeight;

-	EGLint		iStride;

-};

-

-#ifdef EGL_EGLEXT_PROTOTYPES

-EGLAPI EGLSurface EGLAPIENTRY eglCreatePixmapSurfaceHI(EGLDisplay dpy, EGLConfig config, struct EGLClientPixmapHI* pixmap);

-#endif /* EGL_EGLEXT_PROTOTYPES */

-typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPIXMAPSURFACEHIPROC) (EGLDisplay dpy, EGLConfig config, struct EGLClientPixmapHI* pixmap);

-#endif	/* EGL_HI_clientpixmap */

-

-#ifndef EGL_HI_colorformats

-#define EGL_HI_colorformats 1

-/* Config Attribute */

-#define EGL_COLOR_FORMAT_HI			0x8F70

-/* Color Formats */

-#define EGL_COLOR_RGB_HI			0x8F71

-#define EGL_COLOR_RGBA_HI			0x8F72

-#define EGL_COLOR_ARGB_HI			0x8F73

-#endif /* EGL_HI_colorformats */

-

-#ifndef EGL_NOK_swap_region

-#define EGL_NOK_swap_region 1

-

-#ifdef EGL_EGLEXT_PROTOTYPES

-EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffersRegionNOK(EGLDisplay dpy, EGLSurface surface, EGLint numRects, const EGLint* rects);

-#endif

-

-typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSREGIONNOK) (EGLDisplay dpy, EGLSurface surface, EGLint numRects, const EGLint* rects);

-#endif

-

-

-#ifndef EGL_NOK_texture_from_pixmap

-#define EGL_NOK_texture_from_pixmap 1

-

-#define EGL_Y_INVERTED_NOK			0x307F

-#endif /* EGL_NOK_texture_from_pixmap */

-

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif

+#ifndef __eglext_h_
+#define __eglext_h_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+** Copyright (c) 2007-2010 The Khronos Group Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are 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 Materials.
+**
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+#include <EGL/eglplatform.h>
+
+/*************************************************************/
+
+/* Header file version number */
+/* Current version at http://www.khronos.org/registry/egl/ */
+/* $Revision$ on $Date: 2010-07-27 20:12:35 -0700 (Tue, 27 Jul 2010) $ */
+#define EGL_EGLEXT_VERSION 7
+
+#ifndef EGL_KHR_config_attribs
+#define EGL_KHR_config_attribs 1
+#define EGL_CONFORMANT_KHR			0x3042	/* EGLConfig attribute */
+#define EGL_VG_COLORSPACE_LINEAR_BIT_KHR	0x0020	/* EGL_SURFACE_TYPE bitfield */
+#define EGL_VG_ALPHA_FORMAT_PRE_BIT_KHR		0x0040	/* EGL_SURFACE_TYPE bitfield */
+#endif
+
+#ifndef EGL_KHR_lock_surface
+#define EGL_KHR_lock_surface 1
+#define EGL_READ_SURFACE_BIT_KHR		0x0001	/* EGL_LOCK_USAGE_HINT_KHR bitfield */
+#define EGL_WRITE_SURFACE_BIT_KHR		0x0002	/* EGL_LOCK_USAGE_HINT_KHR bitfield */
+#define EGL_LOCK_SURFACE_BIT_KHR		0x0080	/* EGL_SURFACE_TYPE bitfield */
+#define EGL_OPTIMAL_FORMAT_BIT_KHR		0x0100	/* EGL_SURFACE_TYPE bitfield */
+#define EGL_MATCH_FORMAT_KHR			0x3043	/* EGLConfig attribute */
+#define EGL_FORMAT_RGB_565_EXACT_KHR		0x30C0	/* EGL_MATCH_FORMAT_KHR value */
+#define EGL_FORMAT_RGB_565_KHR			0x30C1	/* EGL_MATCH_FORMAT_KHR value */
+#define EGL_FORMAT_RGBA_8888_EXACT_KHR		0x30C2	/* EGL_MATCH_FORMAT_KHR value */
+#define EGL_FORMAT_RGBA_8888_KHR		0x30C3	/* EGL_MATCH_FORMAT_KHR value */
+#define EGL_MAP_PRESERVE_PIXELS_KHR		0x30C4	/* eglLockSurfaceKHR attribute */
+#define EGL_LOCK_USAGE_HINT_KHR			0x30C5	/* eglLockSurfaceKHR attribute */
+#define EGL_BITMAP_POINTER_KHR			0x30C6	/* eglQuerySurface attribute */
+#define EGL_BITMAP_PITCH_KHR			0x30C7	/* eglQuerySurface attribute */
+#define EGL_BITMAP_ORIGIN_KHR			0x30C8	/* eglQuerySurface attribute */
+#define EGL_BITMAP_PIXEL_RED_OFFSET_KHR		0x30C9	/* eglQuerySurface attribute */
+#define EGL_BITMAP_PIXEL_GREEN_OFFSET_KHR	0x30CA	/* eglQuerySurface attribute */
+#define EGL_BITMAP_PIXEL_BLUE_OFFSET_KHR	0x30CB	/* eglQuerySurface attribute */
+#define EGL_BITMAP_PIXEL_ALPHA_OFFSET_KHR	0x30CC	/* eglQuerySurface attribute */
+#define EGL_BITMAP_PIXEL_LUMINANCE_OFFSET_KHR	0x30CD	/* eglQuerySurface attribute */
+#define EGL_LOWER_LEFT_KHR			0x30CE	/* EGL_BITMAP_ORIGIN_KHR value */
+#define EGL_UPPER_LEFT_KHR			0x30CF	/* EGL_BITMAP_ORIGIN_KHR value */
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglLockSurfaceKHR (EGLDisplay display, EGLSurface surface, const EGLint *attrib_list);
+EGLAPI EGLBoolean EGLAPIENTRY eglUnlockSurfaceKHR (EGLDisplay display, EGLSurface surface);
+#endif /* EGL_EGLEXT_PROTOTYPES */
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLLOCKSURFACEKHRPROC) (EGLDisplay display, EGLSurface surface, const EGLint *attrib_list);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLUNLOCKSURFACEKHRPROC) (EGLDisplay display, EGLSurface surface);
+#endif
+
+#ifndef EGL_KHR_image
+#define EGL_KHR_image 1
+#define EGL_NATIVE_PIXMAP_KHR			0x30B0	/* eglCreateImageKHR target */
+typedef void *EGLImageKHR;
+#define EGL_NO_IMAGE_KHR			((EGLImageKHR)0)
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLImageKHR EGLAPIENTRY eglCreateImageKHR (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list);
+EGLAPI EGLBoolean EGLAPIENTRY eglDestroyImageKHR (EGLDisplay dpy, EGLImageKHR image);
+#endif /* EGL_EGLEXT_PROTOTYPES */
+typedef EGLImageKHR (EGLAPIENTRYP PFNEGLCREATEIMAGEKHRPROC) (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYIMAGEKHRPROC) (EGLDisplay dpy, EGLImageKHR image);
+#endif
+
+#ifndef EGL_KHR_vg_parent_image
+#define EGL_KHR_vg_parent_image 1
+#define EGL_VG_PARENT_IMAGE_KHR			0x30BA	/* eglCreateImageKHR target */
+#endif
+
+#ifndef EGL_KHR_gl_texture_2D_image
+#define EGL_KHR_gl_texture_2D_image 1
+#define EGL_GL_TEXTURE_2D_KHR			0x30B1	/* eglCreateImageKHR target */
+#define EGL_GL_TEXTURE_LEVEL_KHR		0x30BC	/* eglCreateImageKHR attribute */
+#endif
+
+#ifndef EGL_KHR_gl_texture_cubemap_image
+#define EGL_KHR_gl_texture_cubemap_image 1
+#define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_X_KHR	0x30B3	/* eglCreateImageKHR target */
+#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_X_KHR	0x30B4	/* eglCreateImageKHR target */
+#define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Y_KHR	0x30B5	/* eglCreateImageKHR target */
+#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_KHR	0x30B6	/* eglCreateImageKHR target */
+#define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Z_KHR	0x30B7	/* eglCreateImageKHR target */
+#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_KHR	0x30B8	/* eglCreateImageKHR target */
+#endif
+
+#ifndef EGL_KHR_gl_texture_3D_image
+#define EGL_KHR_gl_texture_3D_image 1
+#define EGL_GL_TEXTURE_3D_KHR			0x30B2	/* eglCreateImageKHR target */
+#define EGL_GL_TEXTURE_ZOFFSET_KHR		0x30BD	/* eglCreateImageKHR attribute */
+#endif
+
+#ifndef EGL_KHR_gl_renderbuffer_image
+#define EGL_KHR_gl_renderbuffer_image 1
+#define EGL_GL_RENDERBUFFER_KHR			0x30B9	/* eglCreateImageKHR target */
+#endif
+
+#ifndef EGL_MESA_drm_image
+#define EGL_MESA_drm_image 1
+#define EGL_DRM_BUFFER_FORMAT_MESA		0x31D0	/* eglCreateImageKHR attribute */
+#define EGL_DRM_BUFFER_USE_MESA			0x31D1
+
+/* EGL_DRM_BUFFER_FORMAT_MESA tokens */
+#define EGL_DRM_BUFFER_FORMAT_ARGB32_MESA	0x31D2
+
+/* EGL_DRM_BUFFER_USE_MESA bits */
+#define EGL_DRM_BUFFER_USE_SCANOUT_MESA		0x0001
+#define EGL_DRM_BUFFER_USE_SHARE_MESA		0x0002
+
+#define EGL_DRM_BUFFER_MESA			0x31D3  /* eglCreateImageKHR target */
+#define EGL_DRM_BUFFER_STRIDE_MESA		0x31D4	/* eglCreateImageKHR attribute */
+
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLImageKHR EGLAPIENTRY eglCreateDRMImageMESA(EGLDisplay dpy, const EGLint *attrib_list);
+EGLAPI EGLBoolean EGLAPIENTRY eglExportDRMImageMESA(EGLDisplay dpy, EGLImageKHR image, EGLint *name, EGLint *handle, EGLint *stride);
+#endif
+typedef EGLImageKHR (EGLAPIENTRYP PFNEGLCREATEDRMIMAGEMESA) (EGLDisplay dpy, const EGLint *attrib_list);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLEXPORTDRMIMAGEMESA) (EGLDisplay dpy, EGLImageKHR image, EGLint *name, EGLint *handle, EGLint *stride);
+#endif
+
+#ifndef EGL_WL_bind_wayland_display
+#define EGL_WL_bind_wayland_display 1
+
+#define EGL_WAYLAND_BUFFER_WL			0x31D5 /* eglCreateImageKHR target */
+struct wl_display;
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglBindWaylandDisplayWL(EGLDisplay dpy, struct wl_display *display);
+EGLAPI EGLBoolean EGLAPIENTRY eglUnbindWaylandDisplayWL(EGLDisplay dpy, struct wl_display *display);
+#else
+typedef EGLBoolean (EGLAPIENTRY PFNEGLBINDWAYLANDDISPLAYWL) (EGLDisplay dpy, struct wl_display *display);
+typedef EGLBoolean (EGLAPIENTRY PFNEGLUNBINDWAYLANDDISPLAYWL) (EGLDisplay dpy, struct wl_display *display);
+#endif
+#endif
+
+#if KHRONOS_SUPPORT_INT64   /* EGLTimeKHR requires 64-bit uint support */
+#ifndef EGL_KHR_reusable_sync
+#define EGL_KHR_reusable_sync 1
+
+typedef void* EGLSyncKHR;
+typedef khronos_utime_nanoseconds_t EGLTimeKHR;
+
+#define EGL_SYNC_STATUS_KHR			0x30F1
+#define EGL_SIGNALED_KHR			0x30F2
+#define EGL_UNSIGNALED_KHR			0x30F3
+#define EGL_TIMEOUT_EXPIRED_KHR			0x30F5
+#define EGL_CONDITION_SATISFIED_KHR		0x30F6
+#define EGL_SYNC_TYPE_KHR			0x30F7
+#define EGL_SYNC_REUSABLE_KHR			0x30FA
+#define EGL_SYNC_FLUSH_COMMANDS_BIT_KHR		0x0001	/* eglClientWaitSyncKHR <flags> bitfield */
+#define EGL_FOREVER_KHR				0xFFFFFFFFFFFFFFFFull
+#define EGL_NO_SYNC_KHR				((EGLSyncKHR)0)
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLSyncKHR EGLAPIENTRY eglCreateSyncKHR(EGLDisplay dpy, EGLenum type, const EGLint *attrib_list);
+EGLAPI EGLBoolean EGLAPIENTRY eglDestroySyncKHR(EGLDisplay dpy, EGLSyncKHR sync);
+EGLAPI EGLint EGLAPIENTRY eglClientWaitSyncKHR(EGLDisplay dpy, EGLSyncKHR sync, EGLint flags, EGLTimeKHR timeout);
+EGLAPI EGLBoolean EGLAPIENTRY eglSignalSyncKHR(EGLDisplay dpy, EGLSyncKHR sync, EGLenum mode);
+EGLAPI EGLBoolean EGLAPIENTRY eglGetSyncAttribKHR(EGLDisplay dpy, EGLSyncKHR sync, EGLint attribute, EGLint *value);
+#endif /* EGL_EGLEXT_PROTOTYPES */
+typedef EGLSyncKHR (EGLAPIENTRYP PFNEGLCREATESYNCKHRPROC) (EGLDisplay dpy, EGLenum type, const EGLint *attrib_list);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYSYNCKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync);
+typedef EGLint (EGLAPIENTRYP PFNEGLCLIENTWAITSYNCKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLint flags, EGLTimeKHR timeout);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLSIGNALSYNCKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLenum mode);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLint attribute, EGLint *value);
+#endif
+#endif
+
+/* EGL_MESA_screen extension  >>> PRELIMINARY <<< */
+#ifndef EGL_MESA_screen_surface
+#define EGL_MESA_screen_surface 1
+
+#define EGL_BAD_SCREEN_MESA                    0x4000
+#define EGL_BAD_MODE_MESA                      0x4001
+#define EGL_SCREEN_COUNT_MESA                  0x4002
+#define EGL_SCREEN_POSITION_MESA               0x4003
+#define EGL_SCREEN_POSITION_GRANULARITY_MESA   0x4004
+#define EGL_MODE_ID_MESA                       0x4005
+#define EGL_REFRESH_RATE_MESA                  0x4006
+#define EGL_OPTIMAL_MESA                       0x4007
+#define EGL_INTERLACED_MESA                    0x4008
+#define EGL_SCREEN_BIT_MESA                    0x08
+
+typedef khronos_uint32_t EGLScreenMESA;
+typedef khronos_uint32_t EGLModeMESA;
+
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglChooseModeMESA(EGLDisplay dpy, EGLScreenMESA screen, const EGLint *attrib_list, EGLModeMESA *modes, EGLint modes_size, EGLint *num_modes);
+EGLAPI EGLBoolean EGLAPIENTRY eglGetModesMESA(EGLDisplay dpy, EGLScreenMESA screen, EGLModeMESA *modes, EGLint modes_size, EGLint *num_modes);
+EGLAPI EGLBoolean EGLAPIENTRY eglGetModeAttribMESA(EGLDisplay dpy, EGLModeMESA mode, EGLint attribute, EGLint *value);
+EGLAPI EGLBoolean EGLAPIENTRY eglGetScreensMESA(EGLDisplay dpy, EGLScreenMESA *screens, EGLint max_screens, EGLint *num_screens);
+EGLAPI EGLSurface EGLAPIENTRY eglCreateScreenSurfaceMESA(EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list);
+EGLAPI EGLBoolean EGLAPIENTRY eglShowScreenSurfaceMESA(EGLDisplay dpy, EGLint screen, EGLSurface surface, EGLModeMESA mode);
+EGLAPI EGLBoolean EGLAPIENTRY eglScreenPositionMESA(EGLDisplay dpy, EGLScreenMESA screen, EGLint x, EGLint y);
+EGLAPI EGLBoolean EGLAPIENTRY eglQueryScreenMESA(EGLDisplay dpy, EGLScreenMESA screen, EGLint attribute, EGLint *value);
+EGLAPI EGLBoolean EGLAPIENTRY eglQueryScreenSurfaceMESA(EGLDisplay dpy, EGLScreenMESA screen, EGLSurface *surface);
+EGLAPI EGLBoolean EGLAPIENTRY eglQueryScreenModeMESA(EGLDisplay dpy, EGLScreenMESA screen, EGLModeMESA *mode);
+EGLAPI const char * EGLAPIENTRY eglQueryModeStringMESA(EGLDisplay dpy, EGLModeMESA mode);
+#endif /* EGL_EGLEXT_PROTOTYPES */
+
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLCHOOSEMODEMESA) (EGLDisplay dpy, EGLScreenMESA screen, const EGLint *attrib_list, EGLModeMESA *modes, EGLint modes_size, EGLint *num_modes);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETMODESMESA) (EGLDisplay dpy, EGLScreenMESA screen, EGLModeMESA *modes, EGLint modes_size, EGLint *num_modes);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLGetModeATTRIBMESA) (EGLDisplay dpy, EGLModeMESA mode, EGLint attribute, EGLint *value);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSCRREENSMESA) (EGLDisplay dpy, EGLScreenMESA *screens, EGLint max_screens, EGLint *num_screens);
+typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATESCREENSURFACEMESA) (EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLSHOWSCREENSURFACEMESA) (EGLDisplay dpy, EGLint screen, EGLSurface surface, EGLModeMESA mode);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLSCREENPOSIITONMESA) (EGLDisplay dpy, EGLScreenMESA screen, EGLint x, EGLint y);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSCREENMESA) (EGLDisplay dpy, EGLScreenMESA screen, EGLint attribute, EGLint *value);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSCREENSURFACEMESA) (EGLDisplay dpy, EGLScreenMESA screen, EGLSurface *surface);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSCREENMODEMESA) (EGLDisplay dpy, EGLScreenMESA screen, EGLModeMESA *mode);
+typedef const char * (EGLAPIENTRYP PFNEGLQUERYMODESTRINGMESA) (EGLDisplay dpy, EGLModeMESA mode);
+
+#endif /* EGL_MESA_screen_surface */
+
+
+#ifndef EGL_MESA_copy_context
+#define EGL_MESA_copy_context 1
+
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglCopyContextMESA(EGLDisplay dpy, EGLContext source, EGLContext dest, EGLint mask);
+#endif /* EGL_EGLEXT_PROTOTYPES */
+
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLCOPYCONTEXTMESA) (EGLDisplay dpy, EGLContext source, EGLContext dest, EGLint mask);
+
+#endif /* EGL_MESA_copy_context */
+
+#ifndef EGL_MESA_drm_display
+#define EGL_MESA_drm_display 1
+
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLDisplay EGLAPIENTRY eglGetDRMDisplayMESA(int fd);
+#endif /* EGL_EGLEXT_PROTOTYPES */
+
+typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETDRMDISPLAYMESA) (int fd);
+
+#endif /* EGL_MESA_drm_display */
+
+#ifndef EGL_KHR_image_base
+#define EGL_KHR_image_base 1
+/* Most interfaces defined by EGL_KHR_image_pixmap above */
+#define EGL_IMAGE_PRESERVED_KHR			0x30D2	/* eglCreateImageKHR attribute */
+#endif
+
+#ifndef EGL_KHR_image_pixmap
+#define EGL_KHR_image_pixmap 1
+/* Interfaces defined by EGL_KHR_image above */
+#endif
+
+#ifndef EGL_IMG_context_priority
+#define EGL_IMG_context_priority 1
+#define EGL_CONTEXT_PRIORITY_LEVEL_IMG		0x3100
+#define EGL_CONTEXT_PRIORITY_HIGH_IMG		0x3101
+#define EGL_CONTEXT_PRIORITY_MEDIUM_IMG		0x3102
+#define EGL_CONTEXT_PRIORITY_LOW_IMG		0x3103
+#endif
+
+#ifndef EGL_KHR_lock_surface2
+#define EGL_KHR_lock_surface2 1
+#define EGL_BITMAP_PIXEL_SIZE_KHR		0x3110
+#endif
+
+#ifndef EGL_NV_coverage_sample
+#define EGL_NV_coverage_sample 1
+#define EGL_COVERAGE_BUFFERS_NV 0x30E0
+#define EGL_COVERAGE_SAMPLES_NV 0x30E1
+#endif
+
+#ifndef EGL_NV_depth_nonlinear
+#define EGL_NV_depth_nonlinear 1
+#define EGL_DEPTH_ENCODING_NV 0x30E2
+#define EGL_DEPTH_ENCODING_NONE_NV 0
+#define EGL_DEPTH_ENCODING_NONLINEAR_NV 0x30E3
+#endif
+
+#if KHRONOS_SUPPORT_INT64   /* EGLTimeNV requires 64-bit uint support */
+#ifndef EGL_NV_sync
+#define EGL_NV_sync 1
+#define EGL_SYNC_PRIOR_COMMANDS_COMPLETE_NV	0x30E6
+#define EGL_SYNC_STATUS_NV			0x30E7
+#define EGL_SIGNALED_NV				0x30E8
+#define EGL_UNSIGNALED_NV			0x30E9
+#define EGL_SYNC_FLUSH_COMMANDS_BIT_NV		0x0001
+#define EGL_FOREVER_NV				0xFFFFFFFFFFFFFFFFull
+#define EGL_ALREADY_SIGNALED_NV			0x30EA
+#define EGL_TIMEOUT_EXPIRED_NV			0x30EB
+#define EGL_CONDITION_SATISFIED_NV		0x30EC
+#define EGL_SYNC_TYPE_NV			0x30ED
+#define EGL_SYNC_CONDITION_NV			0x30EE
+#define EGL_SYNC_FENCE_NV			0x30EF
+#define EGL_NO_SYNC_NV				((EGLSyncNV)0)
+typedef void* EGLSyncNV;
+typedef khronos_utime_nanoseconds_t EGLTimeNV;
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLSyncNV eglCreateFenceSyncNV (EGLDisplay dpy, EGLenum condition, const EGLint *attrib_list);
+EGLBoolean eglDestroySyncNV (EGLSyncNV sync);
+EGLBoolean eglFenceNV (EGLSyncNV sync);
+EGLint eglClientWaitSyncNV (EGLSyncNV sync, EGLint flags, EGLTimeNV timeout);
+EGLBoolean eglSignalSyncNV (EGLSyncNV sync, EGLenum mode);
+EGLBoolean eglGetSyncAttribNV (EGLSyncNV sync, EGLint attribute, EGLint *value);
+#endif /* EGL_EGLEXT_PROTOTYPES */
+typedef EGLSyncNV (EGLAPIENTRYP PFNEGLCREATEFENCESYNCNVPROC) (EGLDisplay dpy, EGLenum condition, const EGLint *attrib_list);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYSYNCNVPROC) (EGLSyncNV sync);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLFENCENVPROC) (EGLSyncNV sync);
+typedef EGLint (EGLAPIENTRYP PFNEGLCLIENTWAITSYNCNVPROC) (EGLSyncNV sync, EGLint flags, EGLTimeNV timeout);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLSIGNALSYNCNVPROC) (EGLSyncNV sync, EGLenum mode);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBNVPROC) (EGLSyncNV sync, EGLint attribute, EGLint *value);
+#endif
+#endif
+
+#if KHRONOS_SUPPORT_INT64   /* Dependent on EGL_KHR_reusable_sync which requires 64-bit uint support */
+#ifndef EGL_KHR_fence_sync
+#define EGL_KHR_fence_sync 1
+/* Reuses most tokens and entry points from EGL_KHR_reusable_sync */
+#define EGL_SYNC_PRIOR_COMMANDS_COMPLETE_KHR	0x30F0
+#define EGL_SYNC_CONDITION_KHR			0x30F8
+#define EGL_SYNC_FENCE_KHR			0x30F9
+#endif
+#endif
+
+#ifndef EGL_HI_clientpixmap
+#define EGL_HI_clientpixmap 1
+
+/* Surface Attribute */
+#define EGL_CLIENT_PIXMAP_POINTER_HI		0x8F74
+/*
+ * Structure representing a client pixmap
+ * (pixmap's data is in client-space memory).
+ */
+struct EGLClientPixmapHI
+{
+	void*		pData;
+	EGLint		iWidth;
+	EGLint		iHeight;
+	EGLint		iStride;
+};
+
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLSurface EGLAPIENTRY eglCreatePixmapSurfaceHI(EGLDisplay dpy, EGLConfig config, struct EGLClientPixmapHI* pixmap);
+#endif /* EGL_EGLEXT_PROTOTYPES */
+typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPIXMAPSURFACEHIPROC) (EGLDisplay dpy, EGLConfig config, struct EGLClientPixmapHI* pixmap);
+#endif	/* EGL_HI_clientpixmap */
+
+#ifndef EGL_HI_colorformats
+#define EGL_HI_colorformats 1
+/* Config Attribute */
+#define EGL_COLOR_FORMAT_HI			0x8F70
+/* Color Formats */
+#define EGL_COLOR_RGB_HI			0x8F71
+#define EGL_COLOR_RGBA_HI			0x8F72
+#define EGL_COLOR_ARGB_HI			0x8F73
+#endif /* EGL_HI_colorformats */
+
+#ifndef EGL_NOK_swap_region
+#define EGL_NOK_swap_region 1
+
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffersRegionNOK(EGLDisplay dpy, EGLSurface surface, EGLint numRects, const EGLint* rects);
+#endif
+
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSREGIONNOK) (EGLDisplay dpy, EGLSurface surface, EGLint numRects, const EGLint* rects);
+#endif
+
+
+#ifndef EGL_NOK_texture_from_pixmap
+#define EGL_NOK_texture_from_pixmap 1
+
+#define EGL_Y_INVERTED_NOK			0x307F
+#endif /* EGL_NOK_texture_from_pixmap */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/mesalib/src/glsl/Makefile b/mesalib/src/glsl/Makefile
index df031d2d5..cd7c41a2a 100644
--- a/mesalib/src/glsl/Makefile
+++ b/mesalib/src/glsl/Makefile
@@ -191,10 +191,10 @@ $(DRICORE_OBJ_DIR)/%.o : %.c
 	@mkdir -p $(dir $@)
 	$(CC) -c $(INCLUDES) $(DRI_CFLAGS) $(DEFINES) $< -o $@
 
-glsl_lexer.cpp: glsl_lexer.lpp
+glsl_lexer.cpp: glsl_lexer.ll
 	flex --nounistd -o$@  $<
 
-glsl_parser.cpp: glsl_parser.ypp
+glsl_parser.cpp: glsl_parser.yy
 	bison -v -o "$@" -p "_mesa_glsl_" --defines=glsl_parser.h $<
 
 glcpp/glcpp-lex.c: glcpp/glcpp-lex.l
diff --git a/mesalib/src/glsl/SConscript b/mesalib/src/glsl/SConscript
index 3e1d0a84e..10abab6f9 100644
--- a/mesalib/src/glsl/SConscript
+++ b/mesalib/src/glsl/SConscript
@@ -1,145 +1,156 @@
-import common

-

-Import('*')

-

-from sys import executable as python_cmd

-

-env = env.Clone()

-

-env.Prepend(CPPPATH = [

-    '#include',

-    '#src/mapi',

-    '#src/mesa',

-    '#src/glsl',

-])

-

-sources = [

-    'glcpp/glcpp-lex.c',

-    'glcpp/glcpp-parse.c',

-    'glcpp/pp.c',

-    'ast_expr.cpp',

-    'ast_function.cpp',

-    'ast_to_hir.cpp',

-    'ast_type.cpp',

-    'glsl_lexer.cpp',

-    'glsl_parser.cpp',

-    'glsl_parser_extras.cpp',

-    'glsl_types.cpp',

-    'glsl_symbol_table.cpp',

-    'hir_field_selection.cpp',

-    'ir_basic_block.cpp',

-    'ir_clone.cpp',

-    'ir_constant_expression.cpp',

-    'ir.cpp',

-    'ir_expression_flattening.cpp',

-    'ir_function_can_inline.cpp',

-    'ir_function.cpp',

-    'ir_hierarchical_visitor.cpp',

-    'ir_hv_accept.cpp',

-    'ir_import_prototypes.cpp',

-    'ir_print_visitor.cpp',

-    'ir_reader.cpp',

-    'ir_rvalue_visitor.cpp',

-    'ir_set_program_inouts.cpp',

-    'ir_validate.cpp',

-    'ir_variable.cpp',

-    'ir_variable_refcount.cpp',

-    'linker.cpp',

-    'link_functions.cpp',

-    'loop_analysis.cpp',

-    'loop_controls.cpp',

-    'loop_unroll.cpp',

-    'lower_discard.cpp',

-    'lower_if_to_cond_assign.cpp',

-    'lower_instructions.cpp',

-    'lower_jumps.cpp',

-    'lower_mat_op_to_vec.cpp',

-    'lower_noise.cpp',

-    'lower_variable_index_to_cond_assign.cpp',

-    'lower_vec_index_to_cond_assign.cpp',

-    'lower_vec_index_to_swizzle.cpp',

-    'lower_vector.cpp',

-    'opt_algebraic.cpp',

-    'opt_constant_folding.cpp',

-    'opt_constant_propagation.cpp',

-    'opt_constant_variable.cpp',

-    'opt_copy_propagation.cpp',

-    'opt_copy_propagation_elements.cpp',

-    'opt_dead_code.cpp',

-    'opt_dead_code_local.cpp',

-    'opt_dead_functions.cpp',

-    'opt_discard_simplification.cpp',

-    'opt_function_inlining.cpp',

-    'opt_if_simplification.cpp',

-    'opt_noop_swizzle.cpp',

-    'opt_redundant_jumps.cpp',

-    'opt_structure_splitting.cpp',

-    'opt_swizzle_swizzle.cpp',

-    'opt_tree_grafting.cpp',

-    'ralloc.c',

-    's_expression.cpp',

-    'strtod.c',

-] 

-

-

-if env['crosscompile'] and env['platform'] != 'embedded':

-    Import('builtin_glsl_function')

-else:

-    if env['msvc']:

-        env.Prepend(CPPPATH = ['#/src/getopt'])

-        env.PrependUnique(LIBS = [getopt])

-

-    builtin_compiler = env.Program(

-        target = 'builtin_compiler',

-        source = sources + ['main.cpp', 'builtin_stubs.cpp',

-                            '#src/mesa/program/hash_table.c',

-                            '#src/mesa/program/symbol_table.c'],

-    )

-

-    builtin_glsl_function = env.CodeGenerate(

-        target = 'builtin_function.cpp',

-        script = 'builtins/tools/generate_builtins.py',

-        source = builtin_compiler,

-        command = python_cmd + ' $SCRIPT $SOURCE > $TARGET'

-    )

-

-    env.Depends(builtin_glsl_function, ['builtins/tools/generate_builtins.py', 'builtins/tools/texture_builtins.py'] + Glob('builtins/ir/*'))

-

-    Export('builtin_glsl_function')

-

-    if env['hostonly']:

-        Return()

-

-

-sources += builtin_glsl_function

-

-glsl = env.ConvenienceLibrary(

-    target = 'glsl',

-    source = sources,

-)

-

-Export('glsl')

-

-# FIXME: We can't build the programs because there's a cyclic dependency between tis directory and src/mesa

-Return()

-

-env = env.Clone()

-

-if env['platform'] == 'windows':

-    env.PrependUnique(LIBS = [

-        'user32',

-    ])

-

-env.Prepend(LIBS = [glsl])

-

-env.Program(

-    target = 'glsl2',

-    source = [

-        'main.cpp',

-    ]

-)

-

-env.Program(

-    target = 'glcpp',

-    source = ['glcpp/glcpp.c'],

-)

+import common
+
+Import('*')
+
+from sys import executable as python_cmd
+
+env = env.Clone()
+
+env.Prepend(CPPPATH = [
+    '#include',
+    '#src/mapi',
+    '#src/mesa',
+    '#src/glsl',
+    '#src/glsl/glcpp',
+])
+
+env.Append(YACCFLAGS = '-d')
+
+parser_env = env.Clone();
+parser_env.Append(YACCFLAGS = ['--defines=src/glsl/glsl_parser.h', '-p', '_mesa_glsl_'])
+
+glcpp_lexer = env.CFile('glcpp/glcpp-lex.c', 'glcpp/glcpp-lex.l')
+glcpp_parser = env.CFile('glcpp/glcpp-parse.c', 'glcpp/glcpp-parse.y')
+glsl_lexer = parser_env.CXXFile('glsl_lexer.cpp', 'glsl_lexer.ll')
+glsl_parser = parser_env.CXXFile('glsl_parser.cpp', 'glsl_parser.yy')
+
+sources = [
+    glcpp_lexer,
+    glcpp_parser[0],
+    'glcpp/pp.c',
+    'ast_expr.cpp',
+    'ast_function.cpp',
+    'ast_to_hir.cpp',
+    'ast_type.cpp',
+    glsl_lexer,
+    glsl_parser[0],
+    'glsl_parser_extras.cpp',
+    'glsl_types.cpp',
+    'glsl_symbol_table.cpp',
+    'hir_field_selection.cpp',
+    'ir_basic_block.cpp',
+    'ir_clone.cpp',
+    'ir_constant_expression.cpp',
+    'ir.cpp',
+    'ir_expression_flattening.cpp',
+    'ir_function_can_inline.cpp',
+    'ir_function.cpp',
+    'ir_hierarchical_visitor.cpp',
+    'ir_hv_accept.cpp',
+    'ir_import_prototypes.cpp',
+    'ir_print_visitor.cpp',
+    'ir_reader.cpp',
+    'ir_rvalue_visitor.cpp',
+    'ir_set_program_inouts.cpp',
+    'ir_validate.cpp',
+    'ir_variable.cpp',
+    'ir_variable_refcount.cpp',
+    'linker.cpp',
+    'link_functions.cpp',
+    'loop_analysis.cpp',
+    'loop_controls.cpp',
+    'loop_unroll.cpp',
+    'lower_discard.cpp',
+    'lower_if_to_cond_assign.cpp',
+    'lower_instructions.cpp',
+    'lower_jumps.cpp',
+    'lower_mat_op_to_vec.cpp',
+    'lower_noise.cpp',
+    'lower_variable_index_to_cond_assign.cpp',
+    'lower_vec_index_to_cond_assign.cpp',
+    'lower_vec_index_to_swizzle.cpp',
+    'lower_vector.cpp',
+    'opt_algebraic.cpp',
+    'opt_constant_folding.cpp',
+    'opt_constant_propagation.cpp',
+    'opt_constant_variable.cpp',
+    'opt_copy_propagation.cpp',
+    'opt_copy_propagation_elements.cpp',
+    'opt_dead_code.cpp',
+    'opt_dead_code_local.cpp',
+    'opt_dead_functions.cpp',
+    'opt_discard_simplification.cpp',
+    'opt_function_inlining.cpp',
+    'opt_if_simplification.cpp',
+    'opt_noop_swizzle.cpp',
+    'opt_redundant_jumps.cpp',
+    'opt_structure_splitting.cpp',
+    'opt_swizzle_swizzle.cpp',
+    'opt_tree_grafting.cpp',
+    'ralloc.c',
+    's_expression.cpp',
+    'strtod.c',
+] 
+
+
+if env['crosscompile'] and env['platform'] != 'embedded':
+    Import('builtin_glsl_function')
+else:
+    if env['msvc']:
+        env.Prepend(CPPPATH = ['#/src/getopt'])
+        env.PrependUnique(LIBS = [getopt])
+
+    builtin_compiler = env.Program(
+        target = 'builtin_compiler',
+        source = sources + ['main.cpp', 'builtin_stubs.cpp',
+                            '#src/mesa/program/hash_table.c',
+                            '#src/mesa/program/symbol_table.c'],
+    )
+
+    builtin_glsl_function = env.CodeGenerate(
+        target = 'builtin_function.cpp',
+        script = 'builtins/tools/generate_builtins.py',
+        source = builtin_compiler,
+        command = python_cmd + ' $SCRIPT $SOURCE > $TARGET'
+    )
+
+    env.Depends(builtin_glsl_function, ['builtins/tools/generate_builtins.py', 'builtins/tools/texture_builtins.py'] + Glob('builtins/ir/*'))
+
+    Export('builtin_glsl_function')
+
+    if env['hostonly']:
+        Return()
+
+
+sources += builtin_glsl_function
+
+glsl = env.ConvenienceLibrary(
+    target = 'glsl',
+    source = sources,
+)
+
+Export('glsl')
+
+# FIXME: We can't build the programs because there's a cyclic dependency between tis directory and src/mesa
+Return()
+
+env = env.Clone()
+
+if env['platform'] == 'windows':
+    env.PrependUnique(LIBS = [
+        'user32',
+    ])
+
+env.Prepend(LIBS = [glsl])
+
+env.Program(
+    target = 'glsl2',
+    source = [
+        'main.cpp',
+    ]
+)
+
+env.Program(
+    target = 'glcpp',
+    source = ['glcpp/glcpp.c'],
+)
diff --git a/mesalib/src/glsl/glcpp/glcpp-lex.c b/mesalib/src/glsl/glcpp/glcpp-lex.c
deleted file mode 100644
index b53bea627..000000000
--- a/mesalib/src/glsl/glcpp/glcpp-lex.c
+++ /dev/null
@@ -1,2681 +0,0 @@
-#line 2 "glcpp/glcpp-lex.c"
-
-#line 4 "glcpp/glcpp-lex.c"
-
-#define  YY_INT_ALIGNED short int
-
-/* A lexical scanner generated by flex */
-
-#define FLEX_SCANNER
-#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 35
-#if YY_FLEX_SUBMINOR_VERSION > 0
-#define FLEX_BETA
-#endif
-
-/* First, we deal with  platform-specific or compiler-specific issues. */
-
-/* begin standard C headers. */
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-
-/* end standard C headers. */
-
-/* flex integer type definitions */
-
-#ifndef FLEXINT_H
-#define FLEXINT_H
-
-/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
-
-#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-
-/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
- * if you want the limit (max/min) macros for int types. 
- */
-#ifndef __STDC_LIMIT_MACROS
-#define __STDC_LIMIT_MACROS 1
-#endif
-
-#include <inttypes.h>
-typedef int8_t flex_int8_t;
-typedef uint8_t flex_uint8_t;
-typedef int16_t flex_int16_t;
-typedef uint16_t flex_uint16_t;
-typedef int32_t flex_int32_t;
-typedef uint32_t flex_uint32_t;
-#else
-typedef signed char flex_int8_t;
-typedef short int flex_int16_t;
-typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t; 
-typedef unsigned short int flex_uint16_t;
-typedef unsigned int flex_uint32_t;
-#endif /* ! C99 */
-
-/* Limits of integral types. */
-#ifndef INT8_MIN
-#define INT8_MIN               (-128)
-#endif
-#ifndef INT16_MIN
-#define INT16_MIN              (-32767-1)
-#endif
-#ifndef INT32_MIN
-#define INT32_MIN              (-2147483647-1)
-#endif
-#ifndef INT8_MAX
-#define INT8_MAX               (127)
-#endif
-#ifndef INT16_MAX
-#define INT16_MAX              (32767)
-#endif
-#ifndef INT32_MAX
-#define INT32_MAX              (2147483647)
-#endif
-#ifndef UINT8_MAX
-#define UINT8_MAX              (255U)
-#endif
-#ifndef UINT16_MAX
-#define UINT16_MAX             (65535U)
-#endif
-#ifndef UINT32_MAX
-#define UINT32_MAX             (4294967295U)
-#endif
-
-#endif /* ! FLEXINT_H */
-
-#ifdef __cplusplus
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else	/* ! __cplusplus */
-
-/* C99 requires __STDC__ to be defined as 1. */
-#if defined (__STDC__)
-
-#define YY_USE_CONST
-
-#endif	/* defined (__STDC__) */
-#endif	/* ! __cplusplus */
-
-#ifdef YY_USE_CONST
-#define yyconst const
-#else
-#define yyconst
-#endif
-
-/* Returned upon end-of-file. */
-#define YY_NULL 0
-
-/* Promotes a possibly negative, possibly signed char to an unsigned
- * integer for use as an array index.  If the signed char is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
- */
-#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
-
-/* An opaque pointer. */
-#ifndef YY_TYPEDEF_YY_SCANNER_T
-#define YY_TYPEDEF_YY_SCANNER_T
-typedef void* yyscan_t;
-#endif
-
-/* For convenience, these vars (plus the bison vars far below)
-   are macros in the reentrant scanner. */
-#define yyin yyg->yyin_r
-#define yyout yyg->yyout_r
-#define yyextra yyg->yyextra_r
-#define yyleng yyg->yyleng_r
-#define yytext yyg->yytext_r
-#define yylineno (YY_CURRENT_BUFFER_LVALUE->yy_bs_lineno)
-#define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column)
-#define yy_flex_debug yyg->yy_flex_debug_r
-
-/* Enter a start condition.  This macro really ought to take a parameter,
- * but we do it the disgusting crufty way forced on us by the ()-less
- * definition of BEGIN.
- */
-#define BEGIN yyg->yy_start = 1 + 2 *
-
-/* Translate the current start state into a value that can be later handed
- * to BEGIN to return to the state.  The YYSTATE alias is for lex
- * compatibility.
- */
-#define YY_START ((yyg->yy_start - 1) / 2)
-#define YYSTATE YY_START
-
-/* Action number for EOF rule of a given start state. */
-#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
-/* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE glcpp_restart(yyin ,yyscanner )
-
-#define YY_END_OF_BUFFER_CHAR 0
-
-/* Size of default input buffer. */
-#ifndef YY_BUF_SIZE
-#define YY_BUF_SIZE 16384
-#endif
-
-/* The state buf must be large enough to hold one state per character in the main buffer.
- */
-#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
-
-#ifndef YY_TYPEDEF_YY_BUFFER_STATE
-#define YY_TYPEDEF_YY_BUFFER_STATE
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-#endif
-
-#define EOB_ACT_CONTINUE_SCAN 0
-#define EOB_ACT_END_OF_FILE 1
-#define EOB_ACT_LAST_MATCH 2
-
-    #define YY_LESS_LINENO(n)
-    
-/* Return all but the first "n" matched characters back to the input stream. */
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-        int yyless_macro_arg = (n); \
-        YY_LESS_LINENO(yyless_macro_arg);\
-		*yy_cp = yyg->yy_hold_char; \
-		YY_RESTORE_YY_MORE_OFFSET \
-		yyg->yy_c_buf_p = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
-		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
-		} \
-	while ( 0 )
-
-#define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner )
-
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
-#endif
-
-#ifndef YY_STRUCT_YY_BUFFER_STATE
-#define YY_STRUCT_YY_BUFFER_STATE
-struct yy_buffer_state
-	{
-	FILE *yy_input_file;
-
-	char *yy_ch_buf;		/* input buffer */
-	char *yy_buf_pos;		/* current position in input buffer */
-
-	/* Size of input buffer in bytes, not including room for EOB
-	 * characters.
-	 */
-	yy_size_t yy_buf_size;
-
-	/* Number of characters read into yy_ch_buf, not including EOB
-	 * characters.
-	 */
-	int yy_n_chars;
-
-	/* Whether we "own" the buffer - i.e., we know we created it,
-	 * and can realloc() it to grow it, and should free() it to
-	 * delete it.
-	 */
-	int yy_is_our_buffer;
-
-	/* Whether this is an "interactive" input source; if so, and
-	 * if we're using stdio for input, then we want to use getc()
-	 * instead of fread(), to make sure we stop fetching input after
-	 * each newline.
-	 */
-	int yy_is_interactive;
-
-	/* Whether we're considered to be at the beginning of a line.
-	 * If so, '^' rules will be active on the next match, otherwise
-	 * not.
-	 */
-	int yy_at_bol;
-
-    int yy_bs_lineno; /**< The line count. */
-    int yy_bs_column; /**< The column count. */
-    
-	/* Whether to try to fill the input buffer when we reach the
-	 * end of it.
-	 */
-	int yy_fill_buffer;
-
-	int yy_buffer_status;
-
-#define YY_BUFFER_NEW 0
-#define YY_BUFFER_NORMAL 1
-	/* When an EOF's been seen but there's still some text to process
-	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
-	 * shouldn't try reading from the input source any more.  We might
-	 * still have a bunch of tokens to match, though, because of
-	 * possible backing-up.
-	 *
-	 * When we actually see the EOF, we change the status to "new"
-	 * (via glcpp_restart()), so that the user can continue scanning by
-	 * just pointing yyin at a new input file.
-	 */
-#define YY_BUFFER_EOF_PENDING 2
-
-	};
-#endif /* !YY_STRUCT_YY_BUFFER_STATE */
-
-/* We provide macros for accessing buffer states in case in the
- * future we want to put the buffer states in a more general
- * "scanner state".
- *
- * Returns the top of the stack, or NULL.
- */
-#define YY_CURRENT_BUFFER ( yyg->yy_buffer_stack \
-                          ? yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] \
-                          : NULL)
-
-/* Same as previous macro, but useful when we know that the buffer stack is not
- * NULL or when we need an lvalue. For internal use only.
- */
-#define YY_CURRENT_BUFFER_LVALUE yyg->yy_buffer_stack[yyg->yy_buffer_stack_top]
-
-void glcpp_restart (FILE *input_file ,yyscan_t yyscanner );
-void glcpp__switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
-YY_BUFFER_STATE glcpp__create_buffer (FILE *file,int size ,yyscan_t yyscanner );
-void glcpp__delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
-void glcpp__flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
-void glcpp_push_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
-void glcpp_pop_buffer_state (yyscan_t yyscanner );
-
-static void glcpp_ensure_buffer_stack (yyscan_t yyscanner );
-static void glcpp__load_buffer_state (yyscan_t yyscanner );
-static void glcpp__init_buffer (YY_BUFFER_STATE b,FILE *file ,yyscan_t yyscanner );
-
-#define YY_FLUSH_BUFFER glcpp__flush_buffer(YY_CURRENT_BUFFER ,yyscanner)
-
-YY_BUFFER_STATE glcpp__scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner );
-YY_BUFFER_STATE glcpp__scan_string (yyconst char *yy_str ,yyscan_t yyscanner );
-YY_BUFFER_STATE glcpp__scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner );
-
-void *glcpp_alloc (yy_size_t ,yyscan_t yyscanner );
-void *glcpp_realloc (void *,yy_size_t ,yyscan_t yyscanner );
-void glcpp_free (void * ,yyscan_t yyscanner );
-
-#define yy_new_buffer glcpp__create_buffer
-
-#define yy_set_interactive(is_interactive) \
-	{ \
-	if ( ! YY_CURRENT_BUFFER ){ \
-        glcpp_ensure_buffer_stack (yyscanner); \
-		YY_CURRENT_BUFFER_LVALUE =    \
-            glcpp__create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \
-	} \
-	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
-	}
-
-#define yy_set_bol(at_bol) \
-	{ \
-	if ( ! YY_CURRENT_BUFFER ){\
-        glcpp_ensure_buffer_stack (yyscanner); \
-		YY_CURRENT_BUFFER_LVALUE =    \
-            glcpp__create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \
-	} \
-	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
-	}
-
-#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
-
-/* Begin user sect3 */
-
-#define glcpp_wrap(n) 1
-#define YY_SKIP_YYWRAP
-
-typedef unsigned char YY_CHAR;
-
-typedef int yy_state_type;
-
-#define yytext_ptr yytext_r
-
-static yy_state_type yy_get_previous_state (yyscan_t yyscanner );
-static yy_state_type yy_try_NUL_trans (yy_state_type current_state  ,yyscan_t yyscanner);
-static int yy_get_next_buffer (yyscan_t yyscanner );
-static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner );
-
-/* Done after the current pattern has been matched and before the
- * corresponding action - sets up yytext.
- */
-#define YY_DO_BEFORE_ACTION \
-	yyg->yytext_ptr = yy_bp; \
-	yyleng = (size_t) (yy_cp - yy_bp); \
-	yyg->yy_hold_char = *yy_cp; \
-	*yy_cp = '\0'; \
-	yyg->yy_c_buf_p = yy_cp;
-
-#define YY_NUM_RULES 43
-#define YY_END_OF_BUFFER 44
-/* This struct is not used in this scanner,
-   but its presence is necessary. */
-struct yy_trans_info
-	{
-	flex_int32_t yy_verify;
-	flex_int32_t yy_nxt;
-	};
-static yyconst flex_int16_t yy_acclist[137] =
-    {   0,
-        3,    3,   44,   39,   43,   40,   43,   41,   43,   43,
-       38,   43,   43,   38,   43,   38,   43,   38,   43,   25,
-       39,   43,   24,   39,   43,   38,   43,   38,   43,   38,
-       43,   37,   39,   43,   37,   39,   43,   38,   43,   40,
-       43,   23,   43,   43,    3,   43,    4,   43,    5,   43,
-       42,   43,   39,   18,   40,   32,   35,   33,    2,    1,
-       25,   39,   25,   39,   39,   24,   39,   24,   39,   27,
-       29,   31,   30,   28,   37,   39,   37,   39,   34,   40,
-       23,   23,    3,    4,    5,    6,    5,    7,    1,   26,
-       39,   37,   39,16398,   26,   39,   37,   39,   18,   37,
-
-       39,16399,16400, 8206,   18, 8206,   37,   39, 8207,   18,
-     8208,   18,16401,   19,16396,   22,   36,   37,   39,   21,
-     8209,   18,   19, 8204,   18,16397,16404, 8205,   18,   11,
-       18,    9,    8, 8212,   10,   18
-    } ;
-
-static yyconst flex_int16_t yy_accept[164] =
-    {   0,
-        1,    1,    1,    1,    1,    2,    3,    3,    3,    4,
-        6,    8,   10,   11,   13,   14,   16,   18,   20,   23,
-       26,   28,   30,   32,   35,   38,   40,   42,   44,   45,
-       47,   49,   51,   53,   54,   54,   55,   56,   57,   58,
-       59,   60,   61,   63,   65,   66,   68,   70,   71,   72,
-       73,   74,   75,   77,   79,   80,   81,   82,   83,   83,
-       83,   83,   83,   83,   83,   83,   84,   85,   86,   87,
-       88,   89,   90,   92,   94,   94,   94,   94,   94,   94,
-       95,   95,   95,   95,   95,   97,   99,   99,   99,   99,
-       99,   99,   99,   99,  100,  100,  100,  100,  100,  100,
-
-      100,  102,  102,  103,  104,  104,  104,  104,  104,  106,
-      106,  107,  107,  107,  107,  107,  107,  107,  109,  109,
-      109,  111,  111,  113,  114,  115,  115,  116,  116,  116,
-      116,  117,  117,  120,  121,  121,  123,  124,  124,  124,
-      126,  127,  127,  127,  127,  128,  128,  128,  130,  130,
-      132,  132,  133,  134,  134,  134,  134,  135,  135,  135,
-      137,  137,  137
-    } ;
-
-static yyconst flex_int32_t yy_ec[256] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
-        4,    4,    4,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    2,    5,    1,    6,    1,    7,    8,    1,    9,
-        7,   10,    7,    7,    7,    7,   11,   12,   13,   13,
-       13,   13,   13,   13,   13,   14,   14,    1,    7,   15,
-       16,   17,    1,    1,   18,   18,   18,   18,   18,   18,
-       19,   19,   19,   19,   19,   19,   19,   19,   19,   19,
-       19,   19,   19,   19,   20,   19,   19,   21,   19,   19,
-        7,    1,    7,    7,   19,    1,   22,   18,   18,   23,
-
-       24,   25,   26,   19,   27,   19,   19,   28,   29,   30,
-       31,   32,   19,   33,   34,   35,   36,   37,   19,   38,
-       19,   19,    7,   39,    7,    7,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1
-    } ;
-
-static yyconst flex_int32_t yy_meta[40] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    2,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1
-    } ;
-
-static yyconst flex_int16_t yy_base[182] =
-    {   0,
-        0,   38,    0,    0,   38,   39,  499,  498,  500,   48,
-       43,  552,  496,   44,   63,  495,   59,   65,   87,  125,
-       58,   67,   68,  164,  203,   40,   75,  241,  552,  494,
-      552,  140,  552,  140,  493,  552,  144,  492,  491,  487,
-      486,  485,  156,  179,  267,    0,  209,  472,  471,  470,
-      469,  468,  446,  124,  466,  153,  462,  458,  154,  198,
-      159,  155,  183,  160,  193,  460,  552,  222,  552,  227,
-      552,  459,  204,  161,  231,  232,  238,  243,  236,  303,
-      245,  180,  247,  249,  281,   56,  257,  271,  248,  259,
-      252,  264,  455,  454,  297,  299,  312,  313,  320,  294,
-
-      407,  295,  427,  426,  321,  296,  324,  425,  552,  424,
-      552,  327,  329,  195,  328,  331,  332,  230,  334,  378,
-      552,  377,  552,  371,  370,  335,  365,  337,  358,  342,
-      360,  344,  326,  255,  340,  552,  260,  338,  246,  552,
-      197,  364,  192,  352,  382,  348,  186,  552,  420,  552,
-      423,  184,  141,  437,  421,  447,   79,  476,  346,  552,
-      453,  552,  515,  517,  519,  521,  523,  525,   71,  527,
-      529,  531,  533,  535,  537,  539,  541,  543,  545,  547,
-      549
-    } ;
-
-static yyconst flex_int16_t yy_def[182] =
-    {   0,
-      162,    1,  163,  163,  164,  164,  165,  165,  162,  166,
-      167,  162,  167,  167,  167,  167,  167,  167,  162,  166,
-      167,  167,  167,  168,  168,  167,  167,  167,  162,  169,
-      162,  170,  162,   20,  167,  162,  167,  167,  167,  167,
-      167,  171,   19,   20,   20,   20,   20,  167,  167,  167,
-      167,  167,   25,   25,  167,  167,   28,   28,  167,  167,
-      167,  167,  167,  167,  167,  169,  162,  170,  162,  170,
-      162,  171,   45,   25,  167,  167,  167,  167,  167,  167,
-      167,  167,  167,  167,   20,   25,  167,  167,  167,  167,
-      167,  167,  172,  173,  167,  167,  167,  167,  167,  167,
-
-       25,  167,  174,  175,  167,  167,  167,  172,  162,  173,
-      162,  167,  167,  167,  167,  167,  167,   25,  167,  174,
-      162,  175,  162,  176,  177,  167,  178,  167,  167,  167,
-      167,  167,   25,  167,  176,  162,  177,  167,  178,  162,
-      179,  167,  180,  167,  162,  167,  179,  162,  167,  162,
-      167,  180,  167,  181,  167,  167,  167,  181,  167,  162,
-      167,    0,  162,  162,  162,  162,  162,  162,  162,  162,
-      162,  162,  162,  162,  162,  162,  162,  162,  162,  162,
-      162
-    } ;
-
-static yyconst flex_int16_t yy_nxt[592] =
-    {   0,
-       10,   11,   12,   13,   14,   15,   16,   17,   16,   16,
-       18,   19,   20,   20,   21,   22,   23,   24,   24,   24,
-       24,   24,   25,   24,   24,   24,   24,   24,   24,   24,
-       24,   24,   24,   24,   24,   24,   24,   24,   26,   27,
-       31,   31,   36,   28,   37,   36,   36,   32,   32,   35,
-       36,   35,   35,   35,   35,   35,   35,   35,   35,   38,
-       36,   36,   35,   35,   35,   36,   40,   36,   39,   36,
-       36,   66,   48,   49,   41,   42,   56,   36,   55,   53,
-       57,   36,   50,   51,   52,  101,   35,   34,   35,   36,
-       35,   35,   35,   35,   35,   35,   35,   35,   43,   43,
-
-       34,   35,   35,   35,   34,   34,   44,   45,   34,   34,
-       34,   34,   34,   34,   34,   34,   34,   34,   34,   34,
-       34,   34,   44,   34,   45,   35,   35,   36,   35,   35,
-       35,   35,   35,   35,   35,   35,   46,   46,   46,   35,
-       35,   35,   69,   36,   47,   37,   36,   53,   74,   70,
-       71,   34,   34,   34,   56,   36,   36,   36,   57,   34,
-       47,   36,   36,   35,   34,   35,   36,   35,   35,   35,
-       35,   35,   35,   35,   35,   34,   34,   75,   35,   35,
-       35,   81,   36,   80,   53,   36,   36,   86,  148,   83,
-       34,   34,   34,   34,   36,   36,  129,   36,   34,  148,
-
-       36,   98,   35,   34,   35,   36,   35,   35,   35,   35,
-       35,   35,   35,   35,   34,   82,   84,   35,   35,   35,
-       34,   34,   34,   85,   69,   76,   54,   77,   34,   69,
-       78,  162,  162,   36,   36,   79,   70,   71,   36,   85,
-       36,   35,   58,   36,   34,   36,   39,   36,  140,   36,
-       36,   36,  133,   53,   36,   87,  145,   36,   88,   36,
-       90,   36,   36,   59,   60,   89,   36,   61,   62,   99,
-       92,  104,   63,   36,   97,   91,   64,   65,   73,   73,
-       73,  100,  106,  102,   73,  105,   34,  107,   73,   73,
-       73,   73,   34,   34,   34,  103,   36,   36,   36,   36,
-
-       34,   36,   34,   93,   93,   94,   93,   93,   93,   93,
-       93,   93,   93,   93,   36,   36,   34,   93,   93,   93,
-      112,  113,   36,   36,  119,   95,   36,  117,  125,   36,
-       36,   36,   96,   36,   36,  114,   36,   36,  115,   36,
-       36,   93,  136,  116,   36,  124,   36,  159,  160,   53,
-       36,  127,  128,  126,   36,  131,  130,  134,  132,  129,
-       36,  141,   36,  143,  146,  149,  150,  140,  138,  142,
-      142,  142,   36,  136,  144,  151,  151,  151,  155,  123,
-      121,  153,   35,  145,   36,   35,   35,   35,   35,   35,
-       35,   35,   35,   35,   35,   35,   35,   35,   35,  154,
-
-      154,  154,  154,  154,  154,  154,  154,  154,  154,  154,
-      154,  154,  154,  154,  154,  154,  154,  154,  154,  154,
-       35,  149,  150,   36,  149,  150,  111,  109,  123,  121,
-      118,  156,  156,  156,  151,  151,  151,   35,   35,   36,
-       35,   35,   35,   35,   35,  157,   35,   35,  159,  160,
-      143,   35,   35,   35,  159,  160,  111,  109,  161,  161,
-      161,   36,   67,   35,  161,  161,  161,   35,   36,   53,
-       36,   36,   36,   36,   36,   35,   35,   35,   36,   35,
-       35,   35,   35,   35,  157,   35,   35,   36,   36,   36,
-       35,   35,   35,   36,   36,   36,   67,   36,   36,  162,
-
-       29,   29,  162,  162,  162,  162,  162,  162,  162,  162,
-      162,  162,  162,  162,   35,   29,   29,   30,   30,   33,
-       33,   34,   34,   35,   35,   53,   53,   68,   68,   72,
-       72,  108,  108,  110,  110,  120,  120,  122,  122,  135,
-      135,  137,  137,  139,  139,  147,  147,  152,  152,  158,
-      158,    9,  162,  162,  162,  162,  162,  162,  162,  162,
-      162,  162,  162,  162,  162,  162,  162,  162,  162,  162,
-      162,  162,  162,  162,  162,  162,  162,  162,  162,  162,
-      162,  162,  162,  162,  162,  162,  162,  162,  162,  162,
-      162
-
-    } ;
-
-static yyconst flex_int16_t yy_chk[592] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    2,
-        5,    6,   26,    2,   11,   11,   14,    5,    6,   10,
-       10,   10,   10,   10,   10,   10,   10,   10,   10,   14,
-       21,   17,   10,   10,   10,   15,   17,   18,   15,   22,
-       23,  169,   21,   21,   18,   18,   27,   27,   26,   86,
-       27,  157,   22,   23,   23,   86,   10,   19,   19,   19,
-       19,   19,   19,   19,   19,   19,   19,   19,   19,   19,
-
-       19,   19,   19,   19,   19,   19,   19,   19,   19,   19,
-       19,   19,   19,   19,   19,   19,   19,   19,   19,   19,
-       19,   19,   19,   19,   19,   19,   20,   20,   20,   20,
-       20,   20,   20,   20,   20,   20,   20,   20,   20,   20,
-       20,   20,   32,  153,   20,   37,   37,   54,   54,   32,
-       32,   34,   34,   34,   56,   56,   59,   62,   56,   34,
-       20,   61,   64,   20,   24,   24,   24,   24,   24,   24,
-       24,   24,   24,   24,   24,   34,   43,   59,   24,   24,
-       24,   62,   82,   61,   74,   63,  152,   74,  147,   64,
-       44,   44,   44,   43,  143,   65,  114,  114,   44,  141,
-
-       60,   82,   24,   25,   25,   25,   25,   25,   25,   25,
-       25,   25,   25,   25,   44,   63,   65,   25,   25,   25,
-       47,   47,   47,   73,   68,   60,   25,   60,   47,   70,
-       60,   68,   68,   75,   76,   60,   70,   70,   79,   73,
-       77,   25,   28,   28,   47,   78,   28,   81,  139,   83,
-       89,   84,  118,  118,   91,   75,  134,  134,   76,   87,
-       77,   90,  137,   28,   28,   76,   92,   28,   28,   83,
-       79,   89,   28,   88,   81,   78,   28,   28,   45,   45,
-       45,   84,   91,   87,   45,   90,   45,   92,   45,   45,
-       45,   45,   85,   85,   85,   88,  100,  102,  106,   95,
-
-       85,   96,   45,   80,   80,   80,   80,   80,   80,   80,
-       80,   80,   80,   80,   97,   98,   85,   80,   80,   80,
-       95,   96,   99,  105,  102,   80,  107,  100,  106,  112,
-      115,  113,   80,  116,  117,   97,  119,  126,   98,  128,
-      138,   80,  135,   99,  130,  105,  132,  159,  159,  133,
-      146,  112,  113,  107,  144,  116,  115,  119,  117,  129,
-      129,  128,  131,  130,  138,  142,  142,  127,  126,  129,
-      129,  129,  125,  124,  132,  142,  142,  142,  146,  122,
-      120,  144,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  149,  149,  155,  151,  151,  110,  108,  104,  103,
-      101,  149,  149,  149,  151,  151,  151,  154,  154,  154,
-      154,  154,  154,  154,  154,  154,  154,  154,  156,  156,
-      155,  154,  154,  154,  161,  161,   94,   93,  156,  156,
-      156,   72,   66,   58,  161,  161,  161,   57,   55,   53,
-       52,   51,   50,   49,   48,  154,  158,  158,  158,  158,
-      158,  158,  158,  158,  158,  158,  158,   42,   41,   40,
-      158,  158,  158,   39,   38,   35,   30,   16,   13,    9,
-
-        8,    7,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,  158,  163,  163,  164,  164,  165,
-      165,  166,  166,  167,  167,  168,  168,  170,  170,  171,
-      171,  172,  172,  173,  173,  174,  174,  175,  175,  176,
-      176,  177,  177,  178,  178,  179,  179,  180,  180,  181,
-      181,  162,  162,  162,  162,  162,  162,  162,  162,  162,
-      162,  162,  162,  162,  162,  162,  162,  162,  162,  162,
-      162,  162,  162,  162,  162,  162,  162,  162,  162,  162,
-      162,  162,  162,  162,  162,  162,  162,  162,  162,  162,
-      162
-
-    } ;
-
-#define YY_TRAILING_MASK 0x2000
-#define YY_TRAILING_HEAD_MASK 0x4000
-#define REJECT \
-{ \
-*yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */ \
-yy_cp = yyg->yy_full_match; /* restore poss. backed-over text */ \
-yyg->yy_lp = yyg->yy_full_lp; /* restore orig. accepting pos. */ \
-yyg->yy_state_ptr = yyg->yy_full_state; /* restore orig. state */ \
-yy_current_state = *yyg->yy_state_ptr; /* restore curr. state */ \
-++yyg->yy_lp; \
-goto find_rule; \
-}
-
-#define yymore() yymore_used_but_not_detected
-#define YY_MORE_ADJ 0
-#define YY_RESTORE_YY_MORE_OFFSET
-#line 1 "glcpp/glcpp-lex.l"
-#line 2 "glcpp/glcpp-lex.l"
-/*
- * Copyright © 2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-
-#include "glcpp.h"
-#include "glcpp-parse.h"
-
-/* Flex annoyingly generates some functions without making them
- * static. Let's declare them here. */
-int glcpp_get_column  (yyscan_t yyscanner);
-void glcpp_set_column (int  column_no , yyscan_t yyscanner);
-
-#define YY_NO_INPUT
-
-#define YY_USER_ACTION                                          \
-   do {                                                         \
-      yylloc->first_column = yycolumn + 1;                      \
-      yylloc->first_line = yylineno;                            \
-      yycolumn += yyleng;                                       \
-   } while(0);
-
-#define YY_USER_INIT			\
-	do {				\
-		yylineno = 1;		\
-		yycolumn = 1;		\
-		yylloc->source = 0;	\
-	} while(0)
-
-#line 700 "glcpp/glcpp-lex.c"
-
-#define INITIAL 0
-#define DONE 1
-#define COMMENT 2
-#define UNREACHABLE 3
-
-#define YY_EXTRA_TYPE glcpp_parser_t *
-
-/* Holds the entire state of the reentrant scanner. */
-struct yyguts_t
-    {
-
-    /* User-defined. Not touched by flex. */
-    YY_EXTRA_TYPE yyextra_r;
-
-    /* The rest are the same as the globals declared in the non-reentrant scanner. */
-    FILE *yyin_r, *yyout_r;
-    size_t yy_buffer_stack_top; /**< index of top of stack. */
-    size_t yy_buffer_stack_max; /**< capacity of stack. */
-    YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */
-    char yy_hold_char;
-    int yy_n_chars;
-    int yyleng_r;
-    char *yy_c_buf_p;
-    int yy_init;
-    int yy_start;
-    int yy_did_buffer_switch_on_eof;
-    int yy_start_stack_ptr;
-    int yy_start_stack_depth;
-    int *yy_start_stack;
-    yy_state_type yy_last_accepting_state;
-    char* yy_last_accepting_cpos;
-
-    int yylineno_r;
-    int yy_flex_debug_r;
-
-    yy_state_type *yy_state_buf;
-    yy_state_type *yy_state_ptr;
-    char *yy_full_match;
-    int yy_lp;
-
-    /* These are only needed for trailing context rules,
-     * but there's no conditional variable for that yet. */
-    int yy_looking_for_trail_begin;
-    int yy_full_lp;
-    int *yy_full_state;
-
-    char *yytext_r;
-    int yy_more_flag;
-    int yy_more_len;
-
-    YYSTYPE * yylval_r;
-
-    YYLTYPE * yylloc_r;
-
-    }; /* end struct yyguts_t */
-
-static int yy_init_globals (yyscan_t yyscanner );
-
-    /* This must go here because YYSTYPE and YYLTYPE are included
-     * from bison output in section 1.*/
-    #    define yylval yyg->yylval_r
-    
-    #    define yylloc yyg->yylloc_r
-    
-int glcpp_lex_init (yyscan_t* scanner);
-
-int glcpp_lex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner);
-
-/* Accessor methods to globals.
-   These are made visible to non-reentrant scanners for convenience. */
-
-int glcpp_lex_destroy (yyscan_t yyscanner );
-
-int glcpp_get_debug (yyscan_t yyscanner );
-
-void glcpp_set_debug (int debug_flag ,yyscan_t yyscanner );
-
-YY_EXTRA_TYPE glcpp_get_extra (yyscan_t yyscanner );
-
-void glcpp_set_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner );
-
-FILE *glcpp_get_in (yyscan_t yyscanner );
-
-void glcpp_set_in  (FILE * in_str ,yyscan_t yyscanner );
-
-FILE *glcpp_get_out (yyscan_t yyscanner );
-
-void glcpp_set_out  (FILE * out_str ,yyscan_t yyscanner );
-
-int glcpp_get_leng (yyscan_t yyscanner );
-
-char *glcpp_get_text (yyscan_t yyscanner );
-
-int glcpp_get_lineno (yyscan_t yyscanner );
-
-void glcpp_set_lineno (int line_number ,yyscan_t yyscanner );
-
-int glcpp_get_column  (yyscan_t yyscanner );
-
-void glcpp_set_column (int column_no ,yyscan_t yyscanner );
-
-YYSTYPE * glcpp_get_lval (yyscan_t yyscanner );
-
-void glcpp_set_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner );
-
-       YYLTYPE *glcpp_get_lloc (yyscan_t yyscanner );
-    
-        void glcpp_set_lloc (YYLTYPE * yylloc_param ,yyscan_t yyscanner );
-    
-/* Macros after this point can all be overridden by user definitions in
- * section 1.
- */
-
-#ifndef YY_SKIP_YYWRAP
-#ifdef __cplusplus
-extern "C" int glcpp_wrap (yyscan_t yyscanner );
-#else
-extern int glcpp_wrap (yyscan_t yyscanner );
-#endif
-#endif
-
-    static void yyunput (int c,char *buf_ptr  ,yyscan_t yyscanner);
-    
-#ifndef yytext_ptr
-static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner);
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner);
-#endif
-
-#ifndef YY_NO_INPUT
-
-#ifdef __cplusplus
-static int yyinput (yyscan_t yyscanner );
-#else
-static int input (yyscan_t yyscanner );
-#endif
-
-#endif
-
-    static void yy_push_state (int new_state ,yyscan_t yyscanner);
-    
-    static void yy_pop_state (yyscan_t yyscanner );
-    
-    static int yy_top_state (yyscan_t yyscanner );
-    
-/* Amount of stuff to slurp up with each read. */
-#ifndef YY_READ_BUF_SIZE
-#define YY_READ_BUF_SIZE 8192
-#endif
-
-/* Copy whatever the last rule matched to the standard output. */
-#ifndef ECHO
-/* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
-#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
-#endif
-
-/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
- * is returned in "result".
- */
-#ifndef YY_INPUT
-#define YY_INPUT(buf,result,max_size) \
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
-		{ \
-		int c = '*'; \
-		unsigned n; \
-		for ( n = 0; n < max_size && \
-			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
-			buf[n] = (char) c; \
-		if ( c == '\n' ) \
-			buf[n++] = (char) c; \
-		if ( c == EOF && ferror( yyin ) ) \
-			YY_FATAL_ERROR( "input in flex scanner failed" ); \
-		result = n; \
-		} \
-	else \
-		{ \
-		errno=0; \
-		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
-			{ \
-			if( errno != EINTR) \
-				{ \
-				YY_FATAL_ERROR( "input in flex scanner failed" ); \
-				break; \
-				} \
-			errno=0; \
-			clearerr(yyin); \
-			} \
-		}\
-\
-
-#endif
-
-/* No semi-colon after return; correct usage is to write "yyterminate();" -
- * we don't want an extra ';' after the "return" because that will cause
- * some compilers to complain about unreachable statements.
- */
-#ifndef yyterminate
-#define yyterminate() return YY_NULL
-#endif
-
-/* Number of entries by which start-condition stack grows. */
-#ifndef YY_START_STACK_INCR
-#define YY_START_STACK_INCR 25
-#endif
-
-/* Report a fatal error. */
-#ifndef YY_FATAL_ERROR
-#define YY_FATAL_ERROR(msg) yy_fatal_error( msg , yyscanner)
-#endif
-
-/* end tables serialization structures and prototypes */
-
-/* Default declaration of generated scanner - a define so the user can
- * easily add parameters.
- */
-#ifndef YY_DECL
-#define YY_DECL_IS_OURS 1
-
-extern int glcpp_lex \
-               (YYSTYPE * yylval_param,YYLTYPE * yylloc_param ,yyscan_t yyscanner);
-
-#define YY_DECL int glcpp_lex \
-               (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner)
-#endif /* !YY_DECL */
-
-/* Code executed at the beginning of each rule, after yytext and yyleng
- * have been set up.
- */
-#ifndef YY_USER_ACTION
-#define YY_USER_ACTION
-#endif
-
-/* Code executed at the end of each rule. */
-#ifndef YY_BREAK
-#define YY_BREAK break;
-#endif
-
-#define YY_RULE_SETUP \
-	if ( yyleng > 0 ) \
-		YY_CURRENT_BUFFER_LVALUE->yy_at_bol = \
-				(yytext[yyleng - 1] == '\n'); \
-	YY_USER_ACTION
-
-/** The main scanner function which does all the work.
- */
-YY_DECL
-{
-	register yy_state_type yy_current_state;
-	register char *yy_cp, *yy_bp;
-	register int yy_act;
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-#line 76 "glcpp/glcpp-lex.l"
-
-
-	/* Single-line comments */
-#line 962 "glcpp/glcpp-lex.c"
-
-    yylval = yylval_param;
-
-    yylloc = yylloc_param;
-
-	if ( !yyg->yy_init )
-		{
-		yyg->yy_init = 1;
-
-#ifdef YY_USER_INIT
-		YY_USER_INIT;
-#endif
-
-        /* Create the reject buffer large enough to save one state per allowed character. */
-        if ( ! yyg->yy_state_buf )
-            yyg->yy_state_buf = (yy_state_type *)glcpp_alloc(YY_STATE_BUF_SIZE  ,yyscanner);
-            if ( ! yyg->yy_state_buf )
-                YY_FATAL_ERROR( "out of dynamic memory in glcpp_lex()" );
-
-		if ( ! yyg->yy_start )
-			yyg->yy_start = 1;	/* first start state */
-
-		if ( ! yyin )
-			yyin = stdin;
-
-		if ( ! yyout )
-			yyout = stdout;
-
-		if ( ! YY_CURRENT_BUFFER ) {
-			glcpp_ensure_buffer_stack (yyscanner);
-			YY_CURRENT_BUFFER_LVALUE =
-				glcpp__create_buffer(yyin,YY_BUF_SIZE ,yyscanner);
-		}
-
-		glcpp__load_buffer_state(yyscanner );
-		}
-
-	while ( 1 )		/* loops until end-of-file is reached */
-		{
-		yy_cp = yyg->yy_c_buf_p;
-
-		/* Support of yytext. */
-		*yy_cp = yyg->yy_hold_char;
-
-		/* yy_bp points to the position in yy_ch_buf of the start of
-		 * the current run.
-		 */
-		yy_bp = yy_cp;
-
-		yy_current_state = yyg->yy_start;
-		yy_current_state += YY_AT_BOL();
-
-		yyg->yy_state_ptr = yyg->yy_state_buf;
-		*yyg->yy_state_ptr++ = yy_current_state;
-
-yy_match:
-		do
-			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
-			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-				{
-				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 163 )
-					yy_c = yy_meta[(unsigned int) yy_c];
-				}
-			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-			*yyg->yy_state_ptr++ = yy_current_state;
-			++yy_cp;
-			}
-		while ( yy_current_state != 162 );
-
-yy_find_action:
-		yy_current_state = *--yyg->yy_state_ptr;
-		yyg->yy_lp = yy_accept[yy_current_state];
-find_rule: /* we branch to this label when backing up */
-		for ( ; ; ) /* until we find what rule we matched */
-			{
-			if ( yyg->yy_lp && yyg->yy_lp < yy_accept[yy_current_state + 1] )
-				{
-				yy_act = yy_acclist[yyg->yy_lp];
-				if ( yy_act & YY_TRAILING_HEAD_MASK ||
-				     yyg->yy_looking_for_trail_begin )
-					{
-					if ( yy_act == yyg->yy_looking_for_trail_begin )
-						{
-						yyg->yy_looking_for_trail_begin = 0;
-						yy_act &= ~YY_TRAILING_HEAD_MASK;
-						break;
-						}
-					}
-				else if ( yy_act & YY_TRAILING_MASK )
-					{
-					yyg->yy_looking_for_trail_begin = yy_act & ~YY_TRAILING_MASK;
-					yyg->yy_looking_for_trail_begin |= YY_TRAILING_HEAD_MASK;
-					yyg->yy_full_match = yy_cp;
-					yyg->yy_full_state = yyg->yy_state_ptr;
-					yyg->yy_full_lp = yyg->yy_lp;
-					}
-				else
-					{
-					yyg->yy_full_match = yy_cp;
-					yyg->yy_full_state = yyg->yy_state_ptr;
-					yyg->yy_full_lp = yyg->yy_lp;
-					break;
-					}
-				++yyg->yy_lp;
-				goto find_rule;
-				}
-			--yy_cp;
-			yy_current_state = *--yyg->yy_state_ptr;
-			yyg->yy_lp = yy_accept[yy_current_state];
-			}
-
-		YY_DO_BEFORE_ACTION;
-
-do_action:	/* This label is used only to access EOF actions. */
-
-		switch ( yy_act )
-	{ /* beginning of action switch */
-case 1:
-YY_RULE_SETUP
-#line 79 "glcpp/glcpp-lex.l"
-{
-}
-	YY_BREAK
-/* Multi-line comments */
-case 2:
-YY_RULE_SETUP
-#line 83 "glcpp/glcpp-lex.l"
-{ yy_push_state(COMMENT, yyscanner); }
-	YY_BREAK
-case 3:
-YY_RULE_SETUP
-#line 84 "glcpp/glcpp-lex.l"
-
-	YY_BREAK
-case 4:
-/* rule 4 can match eol */
-YY_RULE_SETUP
-#line 85 "glcpp/glcpp-lex.l"
-{ yylineno++; yycolumn = 0; return NEWLINE; }
-	YY_BREAK
-case 5:
-YY_RULE_SETUP
-#line 86 "glcpp/glcpp-lex.l"
-
-	YY_BREAK
-case 6:
-/* rule 6 can match eol */
-YY_RULE_SETUP
-#line 87 "glcpp/glcpp-lex.l"
-{ yylineno++; yycolumn = 0; return NEWLINE; }
-	YY_BREAK
-case 7:
-YY_RULE_SETUP
-#line 88 "glcpp/glcpp-lex.l"
-{
-	yy_pop_state(yyscanner);
-	if (yyextra->space_tokens)
-		return SPACE;
-}
-	YY_BREAK
-case 8:
-YY_RULE_SETUP
-#line 94 "glcpp/glcpp-lex.l"
-{
-	yylval->str = ralloc_strdup (yyextra, yytext);
-	yyextra->space_tokens = 0;
-	return HASH_VERSION;
-}
-	YY_BREAK
-/* glcpp doesn't handle #extension, #version, or #pragma directives.
-	 * Simply pass them through to the main compiler's lexer/parser. */
-case 9:
-YY_RULE_SETUP
-#line 102 "glcpp/glcpp-lex.l"
-{
-	yylval->str = ralloc_strdup (yyextra, yytext);
-	yylineno++;
-	yycolumn = 0;
-	return OTHER;
-}
-	YY_BREAK
-case 10:
-*yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */
-yyg->yy_c_buf_p = yy_cp -= 1;
-YY_DO_BEFORE_ACTION; /* set up yytext again */
-YY_RULE_SETUP
-#line 109 "glcpp/glcpp-lex.l"
-{
-	/* Eat characters until the first digit is
-	 * encountered
-	 */
-	char *ptr = yytext;
-	while (!isdigit(*ptr))
-		ptr++;
-
-	/* Subtract one from the line number because
-	 * yylineno is zero-based instead of
-	 * one-based.
-	 */
-	yylineno = strtol(ptr, &ptr, 0) - 1;
-	yylloc->source = strtol(ptr, NULL, 0);
-}
-	YY_BREAK
-case 11:
-*yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */
-yyg->yy_c_buf_p = yy_cp -= 1;
-YY_DO_BEFORE_ACTION; /* set up yytext again */
-YY_RULE_SETUP
-#line 125 "glcpp/glcpp-lex.l"
-{
-	/* Eat characters until the first digit is
-	 * encountered
-	 */
-	char *ptr = yytext;
-	while (!isdigit(*ptr))
-		ptr++;
-
-	/* Subtract one from the line number because
-	 * yylineno is zero-based instead of
-	 * one-based.
-	 */
-	yylineno = strtol(ptr, &ptr, 0) - 1;
-}
-	YY_BREAK
-case 12:
-/* rule 12 can match eol */
-YY_RULE_SETUP
-#line 140 "glcpp/glcpp-lex.l"
-{
-	yyextra->lexing_if = 1;
-	yyextra->space_tokens = 0;
-	return HASH_IFDEF;
-}
-	YY_BREAK
-case 13:
-/* rule 13 can match eol */
-YY_RULE_SETUP
-#line 146 "glcpp/glcpp-lex.l"
-{
-	yyextra->lexing_if = 1;
-	yyextra->space_tokens = 0;
-	return HASH_IFNDEF;
-}
-	YY_BREAK
-case 14:
-/* rule 14 can match eol */
-YY_RULE_SETUP
-#line 152 "glcpp/glcpp-lex.l"
-{
-	yyextra->lexing_if = 1;
-	yyextra->space_tokens = 0;
-	return HASH_IF;
-}
-	YY_BREAK
-case 15:
-/* rule 15 can match eol */
-YY_RULE_SETUP
-#line 158 "glcpp/glcpp-lex.l"
-{
-	yyextra->lexing_if = 1;
-	yyextra->space_tokens = 0;
-	return HASH_ELIF;
-}
-	YY_BREAK
-case 16:
-/* rule 16 can match eol */
-YY_RULE_SETUP
-#line 164 "glcpp/glcpp-lex.l"
-{
-	yyextra->space_tokens = 0;
-	return HASH_ELSE;
-}
-	YY_BREAK
-case 17:
-/* rule 17 can match eol */
-YY_RULE_SETUP
-#line 169 "glcpp/glcpp-lex.l"
-{
-	yyextra->space_tokens = 0;
-	return HASH_ENDIF;
-}
-	YY_BREAK
-/* When skipping (due to an #if 0 or similar) consume anything
-	 * up to a newline. We do this with less priority than any
-	 * #if-related directive (#if, #elif, #else, #endif), but with
-	 * more priority than any other directive or token to avoid
-	 * any side-effects from skipped content.
-	 *
-	 * We use the lexing_if flag to avoid skipping any part of an
-	 * if conditional expression. */
-case 18:
-/* rule 18 can match eol */
-*yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */
-yyg->yy_c_buf_p = yy_cp -= 1;
-YY_DO_BEFORE_ACTION; /* set up yytext again */
-YY_RULE_SETUP
-#line 182 "glcpp/glcpp-lex.l"
-{
-	/* Since this rule always matches, YY_USER_ACTION gets called for it,
-	 * wrongly incrementing yycolumn.  We undo that effect here. */
-	yycolumn -= yyleng;
-	if (yyextra->lexing_if ||
-	    yyextra->skip_stack == NULL ||
-	    yyextra->skip_stack->type == SKIP_NO_SKIP)
-	{
-		REJECT;
-	}
-}
-	YY_BREAK
-case 19:
-YY_RULE_SETUP
-#line 194 "glcpp/glcpp-lex.l"
-{
-	char *p;
-	for (p = yytext; !isalpha(p[0]); p++); /* skip "  #   " */
-	p += 5; /* skip "error" */
-	glcpp_error(yylloc, yyextra, "#error%s", p);
-}
-	YY_BREAK
-case 20:
-YY_RULE_SETUP
-#line 201 "glcpp/glcpp-lex.l"
-{
-	yyextra->space_tokens = 0;
-	return HASH_DEFINE_FUNC;
-}
-	YY_BREAK
-case 21:
-YY_RULE_SETUP
-#line 206 "glcpp/glcpp-lex.l"
-{
-	yyextra->space_tokens = 0;
-	return HASH_DEFINE_OBJ;
-}
-	YY_BREAK
-case 22:
-YY_RULE_SETUP
-#line 211 "glcpp/glcpp-lex.l"
-{
-	yyextra->space_tokens = 0;
-	return HASH_UNDEF;
-}
-	YY_BREAK
-case 23:
-YY_RULE_SETUP
-#line 216 "glcpp/glcpp-lex.l"
-{
-	yyextra->space_tokens = 0;
-	return HASH;
-}
-	YY_BREAK
-case 24:
-YY_RULE_SETUP
-#line 221 "glcpp/glcpp-lex.l"
-{
-	yylval->str = ralloc_strdup (yyextra, yytext);
-	return INTEGER_STRING;
-}
-	YY_BREAK
-case 25:
-YY_RULE_SETUP
-#line 226 "glcpp/glcpp-lex.l"
-{
-	yylval->str = ralloc_strdup (yyextra, yytext);
-	return INTEGER_STRING;
-}
-	YY_BREAK
-case 26:
-YY_RULE_SETUP
-#line 231 "glcpp/glcpp-lex.l"
-{
-	yylval->str = ralloc_strdup (yyextra, yytext);
-	return INTEGER_STRING;
-}
-	YY_BREAK
-case 27:
-YY_RULE_SETUP
-#line 236 "glcpp/glcpp-lex.l"
-{
-	return LEFT_SHIFT;
-}
-	YY_BREAK
-case 28:
-YY_RULE_SETUP
-#line 240 "glcpp/glcpp-lex.l"
-{
-	return RIGHT_SHIFT;
-}
-	YY_BREAK
-case 29:
-YY_RULE_SETUP
-#line 244 "glcpp/glcpp-lex.l"
-{
-	return LESS_OR_EQUAL;
-}
-	YY_BREAK
-case 30:
-YY_RULE_SETUP
-#line 248 "glcpp/glcpp-lex.l"
-{
-	return GREATER_OR_EQUAL;
-}
-	YY_BREAK
-case 31:
-YY_RULE_SETUP
-#line 252 "glcpp/glcpp-lex.l"
-{
-	return EQUAL;
-}
-	YY_BREAK
-case 32:
-YY_RULE_SETUP
-#line 256 "glcpp/glcpp-lex.l"
-{
-	return NOT_EQUAL;
-}
-	YY_BREAK
-case 33:
-YY_RULE_SETUP
-#line 260 "glcpp/glcpp-lex.l"
-{
-	return AND;
-}
-	YY_BREAK
-case 34:
-YY_RULE_SETUP
-#line 264 "glcpp/glcpp-lex.l"
-{
-	return OR;
-}
-	YY_BREAK
-case 35:
-YY_RULE_SETUP
-#line 268 "glcpp/glcpp-lex.l"
-{
-	return PASTE;
-}
-	YY_BREAK
-case 36:
-YY_RULE_SETUP
-#line 272 "glcpp/glcpp-lex.l"
-{
-	return DEFINED;
-}
-	YY_BREAK
-case 37:
-YY_RULE_SETUP
-#line 276 "glcpp/glcpp-lex.l"
-{
-	yylval->str = ralloc_strdup (yyextra, yytext);
-	return IDENTIFIER;
-}
-	YY_BREAK
-case 38:
-YY_RULE_SETUP
-#line 281 "glcpp/glcpp-lex.l"
-{
-	return yytext[0];
-}
-	YY_BREAK
-case 39:
-YY_RULE_SETUP
-#line 285 "glcpp/glcpp-lex.l"
-{
-	yylval->str = ralloc_strdup (yyextra, yytext);
-	return OTHER;
-}
-	YY_BREAK
-case 40:
-YY_RULE_SETUP
-#line 290 "glcpp/glcpp-lex.l"
-{
-	if (yyextra->space_tokens) {
-		return SPACE;
-	}
-}
-	YY_BREAK
-case 41:
-/* rule 41 can match eol */
-YY_RULE_SETUP
-#line 296 "glcpp/glcpp-lex.l"
-{
-	yyextra->lexing_if = 0;
-	yylineno++;
-	yycolumn = 0;
-	return NEWLINE;
-}
-	YY_BREAK
-/* Handle missing newline at EOF. */
-case YY_STATE_EOF(INITIAL):
-#line 304 "glcpp/glcpp-lex.l"
-{
-	BEGIN DONE; /* Don't keep matching this rule forever. */
-	yyextra->lexing_if = 0;
-	return NEWLINE;
-}
-	YY_BREAK
-/* We don't actually use the UNREACHABLE start condition. We
-	only have this action here so that we can pretend to call some
-	generated functions, (to avoid "defined but not used"
-	warnings. */
-case 42:
-YY_RULE_SETUP
-#line 314 "glcpp/glcpp-lex.l"
-{
-	unput('.');
-	yy_top_state(yyextra);
-}
-	YY_BREAK
-case 43:
-YY_RULE_SETUP
-#line 319 "glcpp/glcpp-lex.l"
-ECHO;
-	YY_BREAK
-#line 1479 "glcpp/glcpp-lex.c"
-			case YY_STATE_EOF(DONE):
-			case YY_STATE_EOF(COMMENT):
-			case YY_STATE_EOF(UNREACHABLE):
-				yyterminate();
-
-	case YY_END_OF_BUFFER:
-		{
-		/* Amount of text matched not including the EOB char. */
-		int yy_amount_of_matched_text = (int) (yy_cp - yyg->yytext_ptr) - 1;
-
-		/* Undo the effects of YY_DO_BEFORE_ACTION. */
-		*yy_cp = yyg->yy_hold_char;
-		YY_RESTORE_YY_MORE_OFFSET
-
-		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
-			{
-			/* We're scanning a new file or input source.  It's
-			 * possible that this happened because the user
-			 * just pointed yyin at a new source and called
-			 * glcpp_lex().  If so, then we have to assure
-			 * consistency between YY_CURRENT_BUFFER and our
-			 * globals.  Here is the right place to do so, because
-			 * this is the first action (other than possibly a
-			 * back-up) that will match for the new input source.
-			 */
-			yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
-			}
-
-		/* Note that here we test for yy_c_buf_p "<=" to the position
-		 * of the first EOB in the buffer, since yy_c_buf_p will
-		 * already have been incremented past the NUL character
-		 * (since all states make transitions on EOB to the
-		 * end-of-buffer state).  Contrast this with the test
-		 * in input().
-		 */
-		if ( yyg->yy_c_buf_p <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] )
-			{ /* This was really a NUL. */
-			yy_state_type yy_next_state;
-
-			yyg->yy_c_buf_p = yyg->yytext_ptr + yy_amount_of_matched_text;
-
-			yy_current_state = yy_get_previous_state( yyscanner );
-
-			/* Okay, we're now positioned to make the NUL
-			 * transition.  We couldn't have
-			 * yy_get_previous_state() go ahead and do it
-			 * for us because it doesn't know how to deal
-			 * with the possibility of jamming (and we don't
-			 * want to build jamming into it because then it
-			 * will run more slowly).
-			 */
-
-			yy_next_state = yy_try_NUL_trans( yy_current_state , yyscanner);
-
-			yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
-
-			if ( yy_next_state )
-				{
-				/* Consume the NUL. */
-				yy_cp = ++yyg->yy_c_buf_p;
-				yy_current_state = yy_next_state;
-				goto yy_match;
-				}
-
-			else
-				{
-				yy_cp = yyg->yy_c_buf_p;
-				goto yy_find_action;
-				}
-			}
-
-		else switch ( yy_get_next_buffer( yyscanner ) )
-			{
-			case EOB_ACT_END_OF_FILE:
-				{
-				yyg->yy_did_buffer_switch_on_eof = 0;
-
-				if ( glcpp_wrap(yyscanner ) )
-					{
-					/* Note: because we've taken care in
-					 * yy_get_next_buffer() to have set up
-					 * yytext, we can now set up
-					 * yy_c_buf_p so that if some total
-					 * hoser (like flex itself) wants to
-					 * call the scanner after we return the
-					 * YY_NULL, it'll still work - another
-					 * YY_NULL will get returned.
-					 */
-					yyg->yy_c_buf_p = yyg->yytext_ptr + YY_MORE_ADJ;
-
-					yy_act = YY_STATE_EOF(YY_START);
-					goto do_action;
-					}
-
-				else
-					{
-					if ( ! yyg->yy_did_buffer_switch_on_eof )
-						YY_NEW_FILE;
-					}
-				break;
-				}
-
-			case EOB_ACT_CONTINUE_SCAN:
-				yyg->yy_c_buf_p =
-					yyg->yytext_ptr + yy_amount_of_matched_text;
-
-				yy_current_state = yy_get_previous_state( yyscanner );
-
-				yy_cp = yyg->yy_c_buf_p;
-				yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
-				goto yy_match;
-
-			case EOB_ACT_LAST_MATCH:
-				yyg->yy_c_buf_p =
-				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars];
-
-				yy_current_state = yy_get_previous_state( yyscanner );
-
-				yy_cp = yyg->yy_c_buf_p;
-				yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
-				goto yy_find_action;
-			}
-		break;
-		}
-
-	default:
-		YY_FATAL_ERROR(
-			"fatal flex scanner internal error--no action found" );
-	} /* end of action switch */
-		} /* end of scanning one token */
-} /* end of glcpp_lex */
-
-/* yy_get_next_buffer - try to read in a new buffer
- *
- * Returns a code representing an action:
- *	EOB_ACT_LAST_MATCH -
- *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- *	EOB_ACT_END_OF_FILE - end of file
- */
-static int yy_get_next_buffer (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-	register char *source = yyg->yytext_ptr;
-	register int number_to_move, i;
-	int ret_val;
-
-	if ( yyg->yy_c_buf_p > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] )
-		YY_FATAL_ERROR(
-		"fatal flex scanner internal error--end of buffer missed" );
-
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
-		{ /* Don't try to fill the buffer, so this is an EOF. */
-		if ( yyg->yy_c_buf_p - yyg->yytext_ptr - YY_MORE_ADJ == 1 )
-			{
-			/* We matched a single character, the EOB, so
-			 * treat this as a final EOF.
-			 */
-			return EOB_ACT_END_OF_FILE;
-			}
-
-		else
-			{
-			/* We matched some text prior to the EOB, first
-			 * process it.
-			 */
-			return EOB_ACT_LAST_MATCH;
-			}
-		}
-
-	/* Try to read more data. */
-
-	/* First move last chars to start of buffer. */
-	number_to_move = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr) - 1;
-
-	for ( i = 0; i < number_to_move; ++i )
-		*(dest++) = *(source++);
-
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
-		/* don't do the read, it's not guaranteed to return an EOF,
-		 * just force an EOF
-		 */
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars = 0;
-
-	else
-		{
-			int num_to_read =
-			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
-
-		while ( num_to_read <= 0 )
-			{ /* Not enough room in the buffer - grow it. */
-
-			YY_FATAL_ERROR(
-"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
-
-			}
-
-		if ( num_to_read > YY_READ_BUF_SIZE )
-			num_to_read = YY_READ_BUF_SIZE;
-
-		/* Read in more data. */
-		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-			yyg->yy_n_chars, (size_t) num_to_read );
-
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
-		}
-
-	if ( yyg->yy_n_chars == 0 )
-		{
-		if ( number_to_move == YY_MORE_ADJ )
-			{
-			ret_val = EOB_ACT_END_OF_FILE;
-			glcpp_restart(yyin  ,yyscanner);
-			}
-
-		else
-			{
-			ret_val = EOB_ACT_LAST_MATCH;
-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
-				YY_BUFFER_EOF_PENDING;
-			}
-		}
-
-	else
-		ret_val = EOB_ACT_CONTINUE_SCAN;
-
-	if ((yy_size_t) (yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
-		/* Extend the array by 50%, plus the number we really need. */
-		yy_size_t new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1);
-		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) glcpp_realloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ,yyscanner );
-		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
-			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
-	}
-
-	yyg->yy_n_chars += number_to_move;
-	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] = YY_END_OF_BUFFER_CHAR;
-	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
-
-	yyg->yytext_ptr = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
-
-	return ret_val;
-}
-
-/* yy_get_previous_state - get the state just before the EOB char was reached */
-
-    static yy_state_type yy_get_previous_state (yyscan_t yyscanner)
-{
-	register yy_state_type yy_current_state;
-	register char *yy_cp;
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-	yy_current_state = yyg->yy_start;
-	yy_current_state += YY_AT_BOL();
-
-	yyg->yy_state_ptr = yyg->yy_state_buf;
-	*yyg->yy_state_ptr++ = yy_current_state;
-
-	for ( yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p; ++yy_cp )
-		{
-		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
-		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-			{
-			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 163 )
-				yy_c = yy_meta[(unsigned int) yy_c];
-			}
-		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-		*yyg->yy_state_ptr++ = yy_current_state;
-		}
-
-	return yy_current_state;
-}
-
-/* yy_try_NUL_trans - try to make a transition on the NUL character
- *
- * synopsis
- *	next_state = yy_try_NUL_trans( current_state );
- */
-    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state , yyscan_t yyscanner)
-{
-	register int yy_is_jam;
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* This var may be unused depending upon options. */
-
-	register YY_CHAR yy_c = 1;
-	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-		{
-		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 163 )
-			yy_c = yy_meta[(unsigned int) yy_c];
-		}
-	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 162);
-	if ( ! yy_is_jam )
-		*yyg->yy_state_ptr++ = yy_current_state;
-
-	return yy_is_jam ? 0 : yy_current_state;
-}
-
-    static void yyunput (int c, register char * yy_bp , yyscan_t yyscanner)
-{
-	register char *yy_cp;
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-    yy_cp = yyg->yy_c_buf_p;
-
-	/* undo effects of setting up yytext */
-	*yy_cp = yyg->yy_hold_char;
-
-	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
-		{ /* need to shift things up to make room */
-		/* +2 for EOB chars. */
-		register int number_to_move = yyg->yy_n_chars + 2;
-		register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
-					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
-		register char *source =
-				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
-
-		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
-			*--dest = *--source;
-
-		yy_cp += (int) (dest - source);
-		yy_bp += (int) (dest - source);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
-			yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
-
-		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
-			YY_FATAL_ERROR( "flex scanner push-back overflow" );
-		}
-
-	*--yy_cp = (char) c;
-
-	yyg->yytext_ptr = yy_bp;
-	yyg->yy_hold_char = *yy_cp;
-	yyg->yy_c_buf_p = yy_cp;
-}
-
-#ifndef YY_NO_INPUT
-#ifdef __cplusplus
-    static int yyinput (yyscan_t yyscanner)
-#else
-    static int input  (yyscan_t yyscanner)
-#endif
-
-{
-	int c;
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-	*yyg->yy_c_buf_p = yyg->yy_hold_char;
-
-	if ( *yyg->yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
-		{
-		/* yy_c_buf_p now points to the character we want to return.
-		 * If this occurs *before* the EOB characters, then it's a
-		 * valid NUL; if not, then we've hit the end of the buffer.
-		 */
-		if ( yyg->yy_c_buf_p < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] )
-			/* This was really a NUL. */
-			*yyg->yy_c_buf_p = '\0';
-
-		else
-			{ /* need more input */
-			int offset = yyg->yy_c_buf_p - yyg->yytext_ptr;
-			++yyg->yy_c_buf_p;
-
-			switch ( yy_get_next_buffer( yyscanner ) )
-				{
-				case EOB_ACT_LAST_MATCH:
-					/* This happens because yy_g_n_b()
-					 * sees that we've accumulated a
-					 * token and flags that we need to
-					 * try matching the token before
-					 * proceeding.  But for input(),
-					 * there's no matching to consider.
-					 * So convert the EOB_ACT_LAST_MATCH
-					 * to EOB_ACT_END_OF_FILE.
-					 */
-
-					/* Reset buffer status. */
-					glcpp_restart(yyin ,yyscanner);
-
-					/*FALLTHROUGH*/
-
-				case EOB_ACT_END_OF_FILE:
-					{
-					if ( glcpp_wrap(yyscanner ) )
-						return EOF;
-
-					if ( ! yyg->yy_did_buffer_switch_on_eof )
-						YY_NEW_FILE;
-#ifdef __cplusplus
-					return yyinput(yyscanner);
-#else
-					return input(yyscanner);
-#endif
-					}
-
-				case EOB_ACT_CONTINUE_SCAN:
-					yyg->yy_c_buf_p = yyg->yytext_ptr + offset;
-					break;
-				}
-			}
-		}
-
-	c = *(unsigned char *) yyg->yy_c_buf_p;	/* cast for 8-bit char's */
-	*yyg->yy_c_buf_p = '\0';	/* preserve yytext */
-	yyg->yy_hold_char = *++yyg->yy_c_buf_p;
-
-	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = (c == '\n');
-
-	return c;
-}
-#endif	/* ifndef YY_NO_INPUT */
-
-/** Immediately switch to a different input stream.
- * @param input_file A readable stream.
- * @param yyscanner The scanner object.
- * @note This function does not reset the start condition to @c INITIAL .
- */
-    void glcpp_restart  (FILE * input_file , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-	if ( ! YY_CURRENT_BUFFER ){
-        glcpp_ensure_buffer_stack (yyscanner);
-		YY_CURRENT_BUFFER_LVALUE =
-            glcpp__create_buffer(yyin,YY_BUF_SIZE ,yyscanner);
-	}
-
-	glcpp__init_buffer(YY_CURRENT_BUFFER,input_file ,yyscanner);
-	glcpp__load_buffer_state(yyscanner );
-}
-
-/** Switch to a different input buffer.
- * @param new_buffer The new input buffer.
- * @param yyscanner The scanner object.
- */
-    void glcpp__switch_to_buffer  (YY_BUFFER_STATE  new_buffer , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-	/* TODO. We should be able to replace this entire function body
-	 * with
-	 *		glcpp_pop_buffer_state();
-	 *		glcpp_push_buffer_state(new_buffer);
-     */
-	glcpp_ensure_buffer_stack (yyscanner);
-	if ( YY_CURRENT_BUFFER == new_buffer )
-		return;
-
-	if ( YY_CURRENT_BUFFER )
-		{
-		/* Flush out information for old buffer. */
-		*yyg->yy_c_buf_p = yyg->yy_hold_char;
-		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p;
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
-		}
-
-	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-	glcpp__load_buffer_state(yyscanner );
-
-	/* We don't actually know whether we did this switch during
-	 * EOF (glcpp_wrap()) processing, but the only time this flag
-	 * is looked at is after glcpp_wrap() is called, so it's safe
-	 * to go ahead and always set it.
-	 */
-	yyg->yy_did_buffer_switch_on_eof = 1;
-}
-
-static void glcpp__load_buffer_state  (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-	yyg->yytext_ptr = yyg->yy_c_buf_p = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
-	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
-	yyg->yy_hold_char = *yyg->yy_c_buf_p;
-}
-
-/** Allocate and initialize an input buffer state.
- * @param file A readable stream.
- * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
- * @param yyscanner The scanner object.
- * @return the allocated buffer state.
- */
-    YY_BUFFER_STATE glcpp__create_buffer  (FILE * file, int  size , yyscan_t yyscanner)
-{
-	YY_BUFFER_STATE b;
-    
-	b = (YY_BUFFER_STATE) glcpp_alloc(sizeof( struct yy_buffer_state ) ,yyscanner );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in glcpp__create_buffer()" );
-
-	b->yy_buf_size = size;
-
-	/* yy_ch_buf has to be 2 characters longer than the size given because
-	 * we need to put in 2 end-of-buffer characters.
-	 */
-	b->yy_ch_buf = (char *) glcpp_alloc(b->yy_buf_size + 2 ,yyscanner );
-	if ( ! b->yy_ch_buf )
-		YY_FATAL_ERROR( "out of dynamic memory in glcpp__create_buffer()" );
-
-	b->yy_is_our_buffer = 1;
-
-	glcpp__init_buffer(b,file ,yyscanner);
-
-	return b;
-}
-
-/** Destroy the buffer.
- * @param b a buffer created with glcpp__create_buffer()
- * @param yyscanner The scanner object.
- */
-    void glcpp__delete_buffer (YY_BUFFER_STATE  b , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-	if ( ! b )
-		return;
-
-	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
-		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
-
-	if ( b->yy_is_our_buffer )
-		glcpp_free((void *) b->yy_ch_buf ,yyscanner );
-
-	glcpp_free((void *) b ,yyscanner );
-}
-
-/* Initializes or reinitializes a buffer.
- * This function is sometimes called more than once on the same buffer,
- * such as during a glcpp_restart() or at EOF.
- */
-    static void glcpp__init_buffer  (YY_BUFFER_STATE  b, FILE * file , yyscan_t yyscanner)
-
-{
-	int oerrno = errno;
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-	glcpp__flush_buffer(b ,yyscanner);
-
-	b->yy_input_file = file;
-	b->yy_fill_buffer = 1;
-
-    /* If b is the current buffer, then glcpp__init_buffer was _probably_
-     * called from glcpp_restart() or through yy_get_next_buffer.
-     * In that case, we don't want to reset the lineno or column.
-     */
-    if (b != YY_CURRENT_BUFFER){
-        b->yy_bs_lineno = 1;
-        b->yy_bs_column = 0;
-    }
-
-        b->yy_is_interactive = 0;
-    
-	errno = oerrno;
-}
-
-/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
- * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
- * @param yyscanner The scanner object.
- */
-    void glcpp__flush_buffer (YY_BUFFER_STATE  b , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	if ( ! b )
-		return;
-
-	b->yy_n_chars = 0;
-
-	/* We always need two end-of-buffer characters.  The first causes
-	 * a transition to the end-of-buffer state.  The second causes
-	 * a jam in that state.
-	 */
-	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
-	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
-
-	b->yy_buf_pos = &b->yy_ch_buf[0];
-
-	b->yy_at_bol = 1;
-	b->yy_buffer_status = YY_BUFFER_NEW;
-
-	if ( b == YY_CURRENT_BUFFER )
-		glcpp__load_buffer_state(yyscanner );
-}
-
-/** Pushes the new state onto the stack. The new state becomes
- *  the current state. This function will allocate the stack
- *  if necessary.
- *  @param new_buffer The new state.
- *  @param yyscanner The scanner object.
- */
-void glcpp_push_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	if (new_buffer == NULL)
-		return;
-
-	glcpp_ensure_buffer_stack(yyscanner);
-
-	/* This block is copied from glcpp__switch_to_buffer. */
-	if ( YY_CURRENT_BUFFER )
-		{
-		/* Flush out information for old buffer. */
-		*yyg->yy_c_buf_p = yyg->yy_hold_char;
-		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p;
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
-		}
-
-	/* Only push if top exists. Otherwise, replace top. */
-	if (YY_CURRENT_BUFFER)
-		yyg->yy_buffer_stack_top++;
-	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-
-	/* copied from glcpp__switch_to_buffer. */
-	glcpp__load_buffer_state(yyscanner );
-	yyg->yy_did_buffer_switch_on_eof = 1;
-}
-
-/** Removes and deletes the top of the stack, if present.
- *  The next element becomes the new top.
- *  @param yyscanner The scanner object.
- */
-void glcpp_pop_buffer_state (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	if (!YY_CURRENT_BUFFER)
-		return;
-
-	glcpp__delete_buffer(YY_CURRENT_BUFFER ,yyscanner);
-	YY_CURRENT_BUFFER_LVALUE = NULL;
-	if (yyg->yy_buffer_stack_top > 0)
-		--yyg->yy_buffer_stack_top;
-
-	if (YY_CURRENT_BUFFER) {
-		glcpp__load_buffer_state(yyscanner );
-		yyg->yy_did_buffer_switch_on_eof = 1;
-	}
-}
-
-/* Allocates the stack if it does not exist.
- *  Guarantees space for at least one push.
- */
-static void glcpp_ensure_buffer_stack (yyscan_t yyscanner)
-{
-	int num_to_alloc;
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-	if (!yyg->yy_buffer_stack) {
-
-		/* First allocation is just for 2 elements, since we don't know if this
-		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
-		 * immediate realloc on the next call.
-         */
-		num_to_alloc = 1;
-		yyg->yy_buffer_stack = (struct yy_buffer_state**)glcpp_alloc
-								(num_to_alloc * sizeof(struct yy_buffer_state*)
-								, yyscanner);
-		if ( ! yyg->yy_buffer_stack )
-			YY_FATAL_ERROR( "out of dynamic memory in glcpp_ensure_buffer_stack()" );
-								  
-		memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-				
-		yyg->yy_buffer_stack_max = num_to_alloc;
-		yyg->yy_buffer_stack_top = 0;
-		return;
-	}
-
-	if (yyg->yy_buffer_stack_top >= (yyg->yy_buffer_stack_max) - 1){
-
-		/* Increase the buffer to prepare for a possible push. */
-		int grow_size = 8 /* arbitrary grow size */;
-
-		num_to_alloc = yyg->yy_buffer_stack_max + grow_size;
-		yyg->yy_buffer_stack = (struct yy_buffer_state**)glcpp_realloc
-								(yyg->yy_buffer_stack,
-								num_to_alloc * sizeof(struct yy_buffer_state*)
-								, yyscanner);
-		if ( ! yyg->yy_buffer_stack )
-			YY_FATAL_ERROR( "out of dynamic memory in glcpp_ensure_buffer_stack()" );
-
-		/* zero only the new slots.*/
-		memset(yyg->yy_buffer_stack + yyg->yy_buffer_stack_max, 0, grow_size * sizeof(struct yy_buffer_state*));
-		yyg->yy_buffer_stack_max = num_to_alloc;
-	}
-}
-
-/** Setup the input buffer state to scan directly from a user-specified character buffer.
- * @param base the character buffer
- * @param size the size in bytes of the character buffer
- * @param yyscanner The scanner object.
- * @return the newly allocated buffer state object. 
- */
-YY_BUFFER_STATE glcpp__scan_buffer  (char * base, yy_size_t  size , yyscan_t yyscanner)
-{
-	YY_BUFFER_STATE b;
-    
-	if ( size < 2 ||
-	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
-	     base[size-1] != YY_END_OF_BUFFER_CHAR )
-		/* They forgot to leave room for the EOB's. */
-		return 0;
-
-	b = (YY_BUFFER_STATE) glcpp_alloc(sizeof( struct yy_buffer_state ) ,yyscanner );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in glcpp__scan_buffer()" );
-
-	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
-	b->yy_buf_pos = b->yy_ch_buf = base;
-	b->yy_is_our_buffer = 0;
-	b->yy_input_file = 0;
-	b->yy_n_chars = b->yy_buf_size;
-	b->yy_is_interactive = 0;
-	b->yy_at_bol = 1;
-	b->yy_fill_buffer = 0;
-	b->yy_buffer_status = YY_BUFFER_NEW;
-
-	glcpp__switch_to_buffer(b ,yyscanner );
-
-	return b;
-}
-
-/** Setup the input buffer state to scan a string. The next call to glcpp_lex() will
- * scan from a @e copy of @a str.
- * @param yystr a NUL-terminated string to scan
- * @param yyscanner The scanner object.
- * @return the newly allocated buffer state object.
- * @note If you want to scan bytes that may contain NUL values, then use
- *       glcpp__scan_bytes() instead.
- */
-YY_BUFFER_STATE glcpp__scan_string (yyconst char * yystr , yyscan_t yyscanner)
-{
-    
-	return glcpp__scan_bytes(yystr,strlen(yystr) ,yyscanner);
-}
-
-/** Setup the input buffer state to scan the given bytes. The next call to glcpp_lex() will
- * scan from a @e copy of @a bytes.
- * @param bytes the byte buffer to scan
- * @param len the number of bytes in the buffer pointed to by @a bytes.
- * @param yyscanner The scanner object.
- * @return the newly allocated buffer state object.
- */
-YY_BUFFER_STATE glcpp__scan_bytes  (yyconst char * yybytes, int  _yybytes_len , yyscan_t yyscanner)
-{
-	YY_BUFFER_STATE b;
-	char *buf;
-	yy_size_t n;
-	int i;
-    
-	/* Get memory for full buffer, including space for trailing EOB's. */
-	n = _yybytes_len + 2;
-	buf = (char *) glcpp_alloc(n ,yyscanner );
-	if ( ! buf )
-		YY_FATAL_ERROR( "out of dynamic memory in glcpp__scan_bytes()" );
-
-	for ( i = 0; i < _yybytes_len; ++i )
-		buf[i] = yybytes[i];
-
-	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
-
-	b = glcpp__scan_buffer(buf,n ,yyscanner);
-	if ( ! b )
-		YY_FATAL_ERROR( "bad buffer in glcpp__scan_bytes()" );
-
-	/* It's okay to grow etc. this buffer, and we should throw it
-	 * away when we're done.
-	 */
-	b->yy_is_our_buffer = 1;
-
-	return b;
-}
-
-    static void yy_push_state (int  new_state , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	if ( yyg->yy_start_stack_ptr >= yyg->yy_start_stack_depth )
-		{
-		yy_size_t new_size;
-
-		yyg->yy_start_stack_depth += YY_START_STACK_INCR;
-		new_size = yyg->yy_start_stack_depth * sizeof( int );
-
-		if ( ! yyg->yy_start_stack )
-			yyg->yy_start_stack = (int *) glcpp_alloc(new_size ,yyscanner );
-
-		else
-			yyg->yy_start_stack = (int *) glcpp_realloc((void *) yyg->yy_start_stack,new_size ,yyscanner );
-
-		if ( ! yyg->yy_start_stack )
-			YY_FATAL_ERROR( "out of memory expanding start-condition stack" );
-		}
-
-	yyg->yy_start_stack[yyg->yy_start_stack_ptr++] = YY_START;
-
-	BEGIN(new_state);
-}
-
-    static void yy_pop_state  (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	if ( --yyg->yy_start_stack_ptr < 0 )
-		YY_FATAL_ERROR( "start-condition stack underflow" );
-
-	BEGIN(yyg->yy_start_stack[yyg->yy_start_stack_ptr]);
-}
-
-    static int yy_top_state  (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	return yyg->yy_start_stack[yyg->yy_start_stack_ptr - 1];
-}
-
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
-#endif
-
-static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner)
-{
-    	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
-}
-
-/* Redefine yyless() so it works in section 3 code. */
-
-#undef yyless
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-        int yyless_macro_arg = (n); \
-        YY_LESS_LINENO(yyless_macro_arg);\
-		yytext[yyleng] = yyg->yy_hold_char; \
-		yyg->yy_c_buf_p = yytext + yyless_macro_arg; \
-		yyg->yy_hold_char = *yyg->yy_c_buf_p; \
-		*yyg->yy_c_buf_p = '\0'; \
-		yyleng = yyless_macro_arg; \
-		} \
-	while ( 0 )
-
-/* Accessor  methods (get/set functions) to struct members. */
-
-/** Get the user-defined data for this scanner.
- * @param yyscanner The scanner object.
- */
-YY_EXTRA_TYPE glcpp_get_extra  (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    return yyextra;
-}
-
-/** Get the current line number.
- * @param yyscanner The scanner object.
- */
-int glcpp_get_lineno  (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    
-        if (! YY_CURRENT_BUFFER)
-            return 0;
-    
-    return yylineno;
-}
-
-/** Get the current column number.
- * @param yyscanner The scanner object.
- */
-int glcpp_get_column  (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    
-        if (! YY_CURRENT_BUFFER)
-            return 0;
-    
-    return yycolumn;
-}
-
-/** Get the input stream.
- * @param yyscanner The scanner object.
- */
-FILE *glcpp_get_in  (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    return yyin;
-}
-
-/** Get the output stream.
- * @param yyscanner The scanner object.
- */
-FILE *glcpp_get_out  (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    return yyout;
-}
-
-/** Get the length of the current token.
- * @param yyscanner The scanner object.
- */
-int glcpp_get_leng  (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    return yyleng;
-}
-
-/** Get the current token.
- * @param yyscanner The scanner object.
- */
-
-char *glcpp_get_text  (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    return yytext;
-}
-
-/** Set the user-defined data. This data is never touched by the scanner.
- * @param user_defined The data to be associated with this scanner.
- * @param yyscanner The scanner object.
- */
-void glcpp_set_extra (YY_EXTRA_TYPE  user_defined , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    yyextra = user_defined ;
-}
-
-/** Set the current line number.
- * @param line_number
- * @param yyscanner The scanner object.
- */
-void glcpp_set_lineno (int  line_number , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-        /* lineno is only valid if an input buffer exists. */
-        if (! YY_CURRENT_BUFFER )
-           yy_fatal_error( "glcpp_set_lineno called with no buffer" , yyscanner); 
-    
-    yylineno = line_number;
-}
-
-/** Set the current column.
- * @param line_number
- * @param yyscanner The scanner object.
- */
-void glcpp_set_column (int  column_no , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-        /* column is only valid if an input buffer exists. */
-        if (! YY_CURRENT_BUFFER )
-           yy_fatal_error( "glcpp_set_column called with no buffer" , yyscanner); 
-    
-    yycolumn = column_no;
-}
-
-/** Set the input stream. This does not discard the current
- * input buffer.
- * @param in_str A readable stream.
- * @param yyscanner The scanner object.
- * @see glcpp__switch_to_buffer
- */
-void glcpp_set_in (FILE *  in_str , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    yyin = in_str ;
-}
-
-void glcpp_set_out (FILE *  out_str , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    yyout = out_str ;
-}
-
-int glcpp_get_debug  (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    return yy_flex_debug;
-}
-
-void glcpp_set_debug (int  bdebug , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    yy_flex_debug = bdebug ;
-}
-
-/* Accessor methods for yylval and yylloc */
-
-YYSTYPE * glcpp_get_lval  (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    return yylval;
-}
-
-void glcpp_set_lval (YYSTYPE *  yylval_param , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    yylval = yylval_param;
-}
-
-YYLTYPE *glcpp_get_lloc  (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    return yylloc;
-}
-    
-void glcpp_set_lloc (YYLTYPE *  yylloc_param , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    yylloc = yylloc_param;
-}
-    
-/* User-visible API */
-
-/* glcpp_lex_init is special because it creates the scanner itself, so it is
- * the ONLY reentrant function that doesn't take the scanner as the last argument.
- * That's why we explicitly handle the declaration, instead of using our macros.
- */
-
-int glcpp_lex_init(yyscan_t* ptr_yy_globals)
-
-{
-    if (ptr_yy_globals == NULL){
-        errno = EINVAL;
-        return 1;
-    }
-
-    *ptr_yy_globals = (yyscan_t) glcpp_alloc ( sizeof( struct yyguts_t ), NULL );
-
-    if (*ptr_yy_globals == NULL){
-        errno = ENOMEM;
-        return 1;
-    }
-
-    /* By setting to 0xAA, we expose bugs in yy_init_globals. Leave at 0x00 for releases. */
-    memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t));
-
-    return yy_init_globals ( *ptr_yy_globals );
-}
-
-/* glcpp_lex_init_extra has the same functionality as glcpp_lex_init, but follows the
- * convention of taking the scanner as the last argument. Note however, that
- * this is a *pointer* to a scanner, as it will be allocated by this call (and
- * is the reason, too, why this function also must handle its own declaration).
- * The user defined value in the first argument will be available to glcpp_alloc in
- * the yyextra field.
- */
-
-int glcpp_lex_init_extra(YY_EXTRA_TYPE yy_user_defined,yyscan_t* ptr_yy_globals )
-
-{
-    struct yyguts_t dummy_yyguts;
-
-    glcpp_set_extra (yy_user_defined, &dummy_yyguts);
-
-    if (ptr_yy_globals == NULL){
-        errno = EINVAL;
-        return 1;
-    }
-	
-    *ptr_yy_globals = (yyscan_t) glcpp_alloc ( sizeof( struct yyguts_t ), &dummy_yyguts );
-	
-    if (*ptr_yy_globals == NULL){
-        errno = ENOMEM;
-        return 1;
-    }
-    
-    /* By setting to 0xAA, we expose bugs in
-    yy_init_globals. Leave at 0x00 for releases. */
-    memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t));
-    
-    glcpp_set_extra (yy_user_defined, *ptr_yy_globals);
-    
-    return yy_init_globals ( *ptr_yy_globals );
-}
-
-static int yy_init_globals (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    /* Initialization is the same as for the non-reentrant scanner.
-     * This function is called from glcpp_lex_destroy(), so don't allocate here.
-     */
-
-    yyg->yy_buffer_stack = 0;
-    yyg->yy_buffer_stack_top = 0;
-    yyg->yy_buffer_stack_max = 0;
-    yyg->yy_c_buf_p = (char *) 0;
-    yyg->yy_init = 0;
-    yyg->yy_start = 0;
-
-    yyg->yy_start_stack_ptr = 0;
-    yyg->yy_start_stack_depth = 0;
-    yyg->yy_start_stack =  NULL;
-
-    yyg->yy_state_buf = 0;
-    yyg->yy_state_ptr = 0;
-    yyg->yy_full_match = 0;
-    yyg->yy_lp = 0;
-
-/* Defined in main.c */
-#ifdef YY_STDINIT
-    yyin = stdin;
-    yyout = stdout;
-#else
-    yyin = (FILE *) 0;
-    yyout = (FILE *) 0;
-#endif
-
-    /* For future reference: Set errno on error, since we are called by
-     * glcpp_lex_init()
-     */
-    return 0;
-}
-
-/* glcpp_lex_destroy is for both reentrant and non-reentrant scanners. */
-int glcpp_lex_destroy  (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-    /* Pop the buffer stack, destroying each element. */
-	while(YY_CURRENT_BUFFER){
-		glcpp__delete_buffer(YY_CURRENT_BUFFER ,yyscanner );
-		YY_CURRENT_BUFFER_LVALUE = NULL;
-		glcpp_pop_buffer_state(yyscanner);
-	}
-
-	/* Destroy the stack itself. */
-	glcpp_free(yyg->yy_buffer_stack ,yyscanner);
-	yyg->yy_buffer_stack = NULL;
-
-    /* Destroy the start condition stack. */
-        glcpp_free(yyg->yy_start_stack ,yyscanner );
-        yyg->yy_start_stack = NULL;
-
-    glcpp_free ( yyg->yy_state_buf , yyscanner);
-    yyg->yy_state_buf  = NULL;
-
-    /* Reset the globals. This is important in a non-reentrant scanner so the next time
-     * glcpp_lex() is called, initialization will occur. */
-    yy_init_globals( yyscanner);
-
-    /* Destroy the main struct (reentrant only). */
-    glcpp_free ( yyscanner , yyscanner );
-    yyscanner = NULL;
-    return 0;
-}
-
-/*
- * Internal utility routines.
- */
-
-#ifndef yytext_ptr
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yyscanner)
-{
-	register int i;
-	for ( i = 0; i < n; ++i )
-		s1[i] = s2[i];
-}
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner)
-{
-	register int n;
-	for ( n = 0; s[n]; ++n )
-		;
-
-	return n;
-}
-#endif
-
-void *glcpp_alloc (yy_size_t  size , yyscan_t yyscanner)
-{
-	return (void *) malloc( size );
-}
-
-void *glcpp_realloc  (void * ptr, yy_size_t  size , yyscan_t yyscanner)
-{
-	/* The cast to (char *) in the following accommodates both
-	 * implementations that use char* generic pointers, and those
-	 * that use void* generic pointers.  It works with the latter
-	 * because both ANSI C and C++ allow castless assignment from
-	 * any pointer type to void*, and deal with argument conversions
-	 * as though doing an assignment.
-	 */
-	return (void *) realloc( (char *) ptr, size );
-}
-
-void glcpp_free (void * ptr , yyscan_t yyscanner)
-{
-	free( (char *) ptr );	/* see glcpp_realloc() for (char *) cast */
-}
-
-#define YYTABLES_NAME "yytables"
-
-#line 319 "glcpp/glcpp-lex.l"
-
-
-
-void
-glcpp_lex_set_source_string(glcpp_parser_t *parser, const char *shader)
-{
-	glcpp__scan_string(shader,parser->scanner);
-}
-
diff --git a/mesalib/src/glsl/glcpp/glcpp-parse.c b/mesalib/src/glsl/glcpp/glcpp-parse.c
deleted file mode 100644
index 0be33a645..000000000
--- a/mesalib/src/glsl/glcpp/glcpp-parse.c
+++ /dev/null
@@ -1,4222 +0,0 @@
-/* A Bison parser, made by GNU Bison 2.4.3.  */

-

-/* Skeleton implementation for Bison's Yacc-like parsers in C

-   

-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,

-   2009, 2010 Free Software Foundation, Inc.

-   

-   This program is free software: you can redistribute it and/or modify

-   it under the terms of the GNU General Public License as published by

-   the Free Software Foundation, either version 3 of the License, or

-   (at your option) any later version.

-   

-   This program is distributed in the hope that it will be useful,

-   but WITHOUT ANY WARRANTY; without even the implied warranty of

-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-   GNU General Public License for more details.

-   

-   You should have received a copy of the GNU General Public License

-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

-

-/* As a special exception, you may create a larger work that contains

-   part or all of the Bison parser skeleton and distribute that work

-   under terms of your choice, so long as that work isn't itself a

-   parser generator using the skeleton or a modified version thereof

-   as a parser skeleton.  Alternatively, if you modify or redistribute

-   the parser skeleton itself, you may (at your option) remove this

-   special exception, which will cause the skeleton and the resulting

-   Bison output files to be licensed under the GNU General Public

-   License without this special exception.

-   

-   This special exception was added by the Free Software Foundation in

-   version 2.2 of Bison.  */

-

-/* C LALR(1) parser skeleton written by Richard Stallman, by

-   simplifying the original so-called "semantic" parser.  */

-

-/* All symbols defined below should begin with yy or YY, to avoid

-   infringing on user name space.  This should be done even for local

-   variables, as they might otherwise be expanded by user macros.

-   There are some unavoidable exceptions within include files to

-   define necessary library symbols; they are noted "INFRINGES ON

-   USER NAME SPACE" below.  */

-

-/* Identify Bison output.  */

-#define YYBISON 1

-

-/* Bison version.  */

-#define YYBISON_VERSION "2.4.3"

-

-/* Skeleton name.  */

-#define YYSKELETON_NAME "yacc.c"

-

-/* Pure parsers.  */

-#define YYPURE 1

-

-/* Push parsers.  */

-#define YYPUSH 0

-

-/* Pull parsers.  */

-#define YYPULL 1

-

-/* Using locations.  */

-#define YYLSP_NEEDED 1

-

-

-

-/* Copy the first part of user declarations.  */

-

-/* Line 189 of yacc.c  */

-#line 1 "glcpp/glcpp-parse.y"

-

-/*

- * Copyright © 2010 Intel Corporation

- *

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

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

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

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

- * Software.

- *

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

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

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

- * DEALINGS IN THE SOFTWARE.

- */

-

-#include <stdio.h>

-#include <stdlib.h>

-#include <string.h>

-#include <assert.h>

-#include <inttypes.h>

-

-#include "glcpp.h"

-#include "main/core.h" /* for struct gl_extensions */

-#include "main/mtypes.h" /* for gl_api enum */

-

-static void

-yyerror (YYLTYPE *locp, glcpp_parser_t *parser, const char *error);

-

-static void

-_define_object_macro (glcpp_parser_t *parser,

-		      YYLTYPE *loc,

-		      const char *macro,

-		      token_list_t *replacements);

-

-static void

-_define_function_macro (glcpp_parser_t *parser,

-			YYLTYPE *loc,

-			const char *macro,

-			string_list_t *parameters,

-			token_list_t *replacements);

-

-static string_list_t *

-_string_list_create (void *ctx);

-

-static void

-_string_list_append_item (string_list_t *list, const char *str);

-

-static int

-_string_list_contains (string_list_t *list, const char *member, int *index);

-

-static int

-_string_list_length (string_list_t *list);

-

-static int

-_string_list_equal (string_list_t *a, string_list_t *b);

-

-static argument_list_t *

-_argument_list_create (void *ctx);

-

-static void

-_argument_list_append (argument_list_t *list, token_list_t *argument);

-

-static int

-_argument_list_length (argument_list_t *list);

-

-static token_list_t *

-_argument_list_member_at (argument_list_t *list, int index);

-

-/* Note: This function ralloc_steal()s the str pointer. */

-static token_t *

-_token_create_str (void *ctx, int type, char *str);

-

-static token_t *

-_token_create_ival (void *ctx, int type, int ival);

-

-static token_list_t *

-_token_list_create (void *ctx);

-

-/* Note: This function calls ralloc_steal on token. */

-static void

-_token_list_append (token_list_t *list, token_t *token);

-

-static void

-_token_list_append_list (token_list_t *list, token_list_t *tail);

-

-static int

-_token_list_equal_ignoring_space (token_list_t *a, token_list_t *b);

-

-static active_list_t *

-_active_list_push (active_list_t *list,

-		   const char *identifier,

-		   token_node_t *marker);

-

-static active_list_t *

-_active_list_pop (active_list_t *list);

-

-int

-_active_list_contains (active_list_t *list, const char *identifier);

-

-static void

-_glcpp_parser_expand_if (glcpp_parser_t *parser, int type, token_list_t *list);

-

-static void

-_glcpp_parser_expand_token_list (glcpp_parser_t *parser,

-				 token_list_t *list);

-

-static void

-_glcpp_parser_print_expanded_token_list (glcpp_parser_t *parser,

-					 token_list_t *list);

-

-static void

-_glcpp_parser_skip_stack_push_if (glcpp_parser_t *parser, YYLTYPE *loc,

-				  int condition);

-

-static void

-_glcpp_parser_skip_stack_change_if (glcpp_parser_t *parser, YYLTYPE *loc,

-				    const char *type, int condition);

-

-static void

-_glcpp_parser_skip_stack_pop (glcpp_parser_t *parser, YYLTYPE *loc);

-

-#define yylex glcpp_parser_lex

-

-static int

-glcpp_parser_lex (YYSTYPE *yylval, YYLTYPE *yylloc, glcpp_parser_t *parser);

-

-static void

-glcpp_parser_lex_from (glcpp_parser_t *parser, token_list_t *list);

-

-static void

-add_builtin_define(glcpp_parser_t *parser, const char *name, int value);

-

-

-

-/* Line 189 of yacc.c  */

-#line 216 "glcpp/glcpp-parse.c"

-

-/* Enabling traces.  */

-#ifndef YYDEBUG

-# define YYDEBUG 0

-#endif

-

-/* Enabling verbose error messages.  */

-#ifdef YYERROR_VERBOSE

-# undef YYERROR_VERBOSE

-# define YYERROR_VERBOSE 1

-#else

-# define YYERROR_VERBOSE 1

-#endif

-

-/* Enabling the token table.  */

-#ifndef YYTOKEN_TABLE

-# define YYTOKEN_TABLE 0

-#endif

-

-

-/* Tokens.  */

-#ifndef YYTOKENTYPE

-# define YYTOKENTYPE

-   /* Put the tokens into the symbol table, so that GDB and other debuggers

-      know about them.  */

-   enum yytokentype {

-     COMMA_FINAL = 258,

-     DEFINED = 259,

-     ELIF_EXPANDED = 260,

-     HASH = 261,

-     HASH_DEFINE_FUNC = 262,

-     HASH_DEFINE_OBJ = 263,

-     HASH_ELIF = 264,

-     HASH_ELSE = 265,

-     HASH_ENDIF = 266,

-     HASH_IF = 267,

-     HASH_IFDEF = 268,

-     HASH_IFNDEF = 269,

-     HASH_UNDEF = 270,

-     HASH_VERSION = 271,

-     IDENTIFIER = 272,

-     IF_EXPANDED = 273,

-     INTEGER = 274,

-     INTEGER_STRING = 275,

-     NEWLINE = 276,

-     OTHER = 277,

-     PLACEHOLDER = 278,

-     SPACE = 279,

-     PASTE = 280,

-     OR = 281,

-     AND = 282,

-     NOT_EQUAL = 283,

-     EQUAL = 284,

-     GREATER_OR_EQUAL = 285,

-     LESS_OR_EQUAL = 286,

-     RIGHT_SHIFT = 287,

-     LEFT_SHIFT = 288,

-     UNARY = 289

-   };

-#endif

-

-

-

-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED

-

-# define yystype YYSTYPE /* obsolescent; will be withdrawn */

-# define YYSTYPE_IS_DECLARED 1

-#endif

-

-#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED

-typedef struct YYLTYPE

-{

-  int first_line;

-  int first_column;

-  int last_line;

-  int last_column;

-} YYLTYPE;

-# define yyltype YYLTYPE /* obsolescent; will be withdrawn */

-# define YYLTYPE_IS_DECLARED 1

-# define YYLTYPE_IS_TRIVIAL 1

-#endif

-

-

-/* Copy the second part of user declarations.  */

-

-

-/* Line 264 of yacc.c  */

-#line 304 "glcpp/glcpp-parse.c"

-

-#ifdef short

-# undef short

-#endif

-

-#ifdef YYTYPE_UINT8

-typedef YYTYPE_UINT8 yytype_uint8;

-#else

-typedef unsigned char yytype_uint8;

-#endif

-

-#ifdef YYTYPE_INT8

-typedef YYTYPE_INT8 yytype_int8;

-#elif (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-typedef signed char yytype_int8;

-#else

-typedef short int yytype_int8;

-#endif

-

-#ifdef YYTYPE_UINT16

-typedef YYTYPE_UINT16 yytype_uint16;

-#else

-typedef unsigned short int yytype_uint16;

-#endif

-

-#ifdef YYTYPE_INT16

-typedef YYTYPE_INT16 yytype_int16;

-#else

-typedef short int yytype_int16;

-#endif

-

-#ifndef YYSIZE_T

-# ifdef __SIZE_TYPE__

-#  define YYSIZE_T __SIZE_TYPE__

-# elif defined size_t

-#  define YYSIZE_T size_t

-# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */

-#  define YYSIZE_T size_t

-# else

-#  define YYSIZE_T unsigned int

-# endif

-#endif

-

-#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)

-

-#ifndef YY_

-# if defined YYENABLE_NLS && YYENABLE_NLS

-#  if ENABLE_NLS

-#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */

-#   define YY_(msgid) dgettext ("bison-runtime", msgid)

-#  endif

-# endif

-# ifndef YY_

-#  define YY_(msgid) msgid

-# endif

-#endif

-

-/* Suppress unused-variable warnings by "using" E.  */

-#if ! defined lint || defined __GNUC__

-# define YYUSE(e) ((void) (e))

-#else

-# define YYUSE(e) /* empty */

-#endif

-

-/* Identity function, used to suppress warnings about constant conditions.  */

-#ifndef lint

-# define YYID(n) (n)

-#else

-#if (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-static int

-YYID (int yyi)

-#else

-static int

-YYID (yyi)

-    int yyi;

-#endif

-{

-  return yyi;

-}

-#endif

-

-#if ! defined yyoverflow || YYERROR_VERBOSE

-

-/* The parser invokes alloca or malloc; define the necessary symbols.  */

-

-# ifdef YYSTACK_USE_ALLOCA

-#  if YYSTACK_USE_ALLOCA

-#   ifdef __GNUC__

-#    define YYSTACK_ALLOC __builtin_alloca

-#   elif defined __BUILTIN_VA_ARG_INCR

-#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */

-#   elif defined _AIX

-#    define YYSTACK_ALLOC __alloca

-#   elif defined _MSC_VER

-#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */

-#    define alloca _alloca

-#   else

-#    define YYSTACK_ALLOC alloca

-#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */

-#     ifndef _STDLIB_H

-#      define _STDLIB_H 1

-#     endif

-#    endif

-#   endif

-#  endif

-# endif

-

-# ifdef YYSTACK_ALLOC

-   /* Pacify GCC's `empty if-body' warning.  */

-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))

-#  ifndef YYSTACK_ALLOC_MAXIMUM

-    /* The OS might guarantee only one guard page at the bottom of the stack,

-       and a page size can be as small as 4096 bytes.  So we cannot safely

-       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number

-       to allow for a few compiler-allocated temporary stack slots.  */

-#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */

-#  endif

-# else

-#  define YYSTACK_ALLOC YYMALLOC

-#  define YYSTACK_FREE YYFREE

-#  ifndef YYSTACK_ALLOC_MAXIMUM

-#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM

-#  endif

-#  if (defined __cplusplus && ! defined _STDLIB_H \

-       && ! ((defined YYMALLOC || defined malloc) \

-	     && (defined YYFREE || defined free)))

-#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */

-#   ifndef _STDLIB_H

-#    define _STDLIB_H 1

-#   endif

-#  endif

-#  ifndef YYMALLOC

-#   define YYMALLOC malloc

-#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */

-#   endif

-#  endif

-#  ifndef YYFREE

-#   define YYFREE free

-#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-void free (void *); /* INFRINGES ON USER NAME SPACE */

-#   endif

-#  endif

-# endif

-#endif /* ! defined yyoverflow || YYERROR_VERBOSE */

-

-

-#if (! defined yyoverflow \

-     && (! defined __cplusplus \

-	 || (defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \

-	     && defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))

-

-/* A type that is properly aligned for any stack member.  */

-union yyalloc

-{

-  yytype_int16 yyss_alloc;

-  YYSTYPE yyvs_alloc;

-  YYLTYPE yyls_alloc;

-};

-

-/* The size of the maximum gap between one aligned stack and the next.  */

-# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)

-

-/* The size of an array large to enough to hold all stacks, each with

-   N elements.  */

-# define YYSTACK_BYTES(N) \

-     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \

-      + 2 * YYSTACK_GAP_MAXIMUM)

-

-/* Copy COUNT objects from FROM to TO.  The source and destination do

-   not overlap.  */

-# ifndef YYCOPY

-#  if defined __GNUC__ && 1 < __GNUC__

-#   define YYCOPY(To, From, Count) \

-      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))

-#  else

-#   define YYCOPY(To, From, Count)		\

-      do					\

-	{					\

-	  YYSIZE_T yyi;				\

-	  for (yyi = 0; yyi < (Count); yyi++)	\

-	    (To)[yyi] = (From)[yyi];		\

-	}					\

-      while (YYID (0))

-#  endif

-# endif

-

-/* Relocate STACK from its old location to the new one.  The

-   local variables YYSIZE and YYSTACKSIZE give the old and new number of

-   elements in the stack, and YYPTR gives the new location of the

-   stack.  Advance YYPTR to a properly aligned location for the next

-   stack.  */

-# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\

-    do									\

-      {									\

-	YYSIZE_T yynewbytes;						\

-	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\

-	Stack = &yyptr->Stack_alloc;					\

-	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \

-	yyptr += yynewbytes / sizeof (*yyptr);				\

-      }									\

-    while (YYID (0))

-

-#endif

-

-/* YYFINAL -- State number of the termination state.  */

-#define YYFINAL  2

-/* YYLAST -- Last index in YYTABLE.  */

-#define YYLAST   606

-

-/* YYNTOKENS -- Number of terminals.  */

-#define YYNTOKENS  57

-/* YYNNTS -- Number of nonterminals.  */

-#define YYNNTS  17

-/* YYNRULES -- Number of rules.  */

-#define YYNRULES  101

-/* YYNRULES -- Number of states.  */

-#define YYNSTATES  162

-

-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */

-#define YYUNDEFTOK  2

-#define YYMAXUTOK   289

-

-#define YYTRANSLATE(YYX)						\

-  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)

-

-/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */

-static const yytype_uint8 yytranslate[] =

-{

-       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,    47,     2,     2,     2,    43,    30,     2,

-      45,    46,    41,    39,    49,    40,    54,    42,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,    55,

-      33,    56,    34,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,    50,     2,    51,    29,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,    52,    28,    53,    48,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,

-       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,

-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,

-      25,    26,    27,    31,    32,    35,    36,    37,    38,    44

-};

-

-#if YYDEBUG

-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in

-   YYRHS.  */

-static const yytype_uint16 yyprhs[] =

-{

-       0,     0,     3,     4,     7,     9,    11,    13,    16,    20,

-      24,    29,    36,    44,    48,    52,    55,    60,    65,    69,

-      72,    75,    78,    82,    85,    87,    89,    91,    95,    99,

-     103,   107,   111,   115,   119,   123,   127,   131,   135,   139,

-     143,   147,   151,   155,   159,   163,   166,   169,   172,   175,

-     179,   181,   185,   187,   190,   193,   194,   196,   197,   199,

-     202,   207,   209,   211,   214,   216,   219,   221,   223,   225,

-     227,   229,   231,   233,   235,   237,   239,   241,   243,   245,

-     247,   249,   251,   253,   255,   257,   259,   261,   263,   265,

-     267,   269,   271,   273,   275,   277,   279,   281,   283,   285,

-     287,   289

-};

-

-/* YYRHS -- A `-1'-separated list of the rules' RHS.  */

-static const yytype_int8 yyrhs[] =

-{

-      58,     0,    -1,    -1,    58,    59,    -1,    61,    -1,    65,

-      -1,    60,    -1,     6,    66,    -1,    18,    63,    21,    -1,

-       5,    63,    21,    -1,     8,    17,    67,    21,    -1,     7,

-      17,    45,    46,    67,    21,    -1,     7,    17,    45,    64,

-      46,    67,    21,    -1,    15,    17,    21,    -1,    12,    70,

-      21,    -1,    12,    21,    -1,    13,    17,    68,    21,    -1,

-      14,    17,    68,    21,    -1,     9,    70,    21,    -1,     9,

-      21,    -1,    10,    21,    -1,    11,    21,    -1,    16,    62,

-      21,    -1,     6,    21,    -1,    20,    -1,    19,    -1,    62,

-      -1,    63,    26,    63,    -1,    63,    27,    63,    -1,    63,

-      28,    63,    -1,    63,    29,    63,    -1,    63,    30,    63,

-      -1,    63,    31,    63,    -1,    63,    32,    63,    -1,    63,

-      35,    63,    -1,    63,    36,    63,    -1,    63,    34,    63,

-      -1,    63,    33,    63,    -1,    63,    37,    63,    -1,    63,

-      38,    63,    -1,    63,    40,    63,    -1,    63,    39,    63,

-      -1,    63,    43,    63,    -1,    63,    42,    63,    -1,    63,

-      41,    63,    -1,    47,    63,    -1,    48,    63,    -1,    40,

-      63,    -1,    39,    63,    -1,    45,    63,    46,    -1,    17,

-      -1,    64,    49,    17,    -1,    21,    -1,    71,    21,    -1,

-      71,    21,    -1,    -1,    71,    -1,    -1,    71,    -1,     4,

-      17,    -1,     4,    45,    17,    46,    -1,    72,    -1,    69,

-      -1,    70,    69,    -1,    72,    -1,    71,    72,    -1,    17,

-      -1,    20,    -1,    73,    -1,    22,    -1,    24,    -1,    50,

-      -1,    51,    -1,    45,    -1,    46,    -1,    52,    -1,    53,

-      -1,    54,    -1,    30,    -1,    41,    -1,    39,    -1,    40,

-      -1,    48,    -1,    47,    -1,    42,    -1,    43,    -1,    38,

-      -1,    37,    -1,    33,    -1,    34,    -1,    36,    -1,    35,

-      -1,    32,    -1,    31,    -1,    29,    -1,    28,    -1,    27,

-      -1,    26,    -1,    55,    -1,    49,    -1,    56,    -1,    25,

-      -1

-};

-

-/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */

-static const yytype_uint16 yyrline[] =

-{

-       0,   181,   181,   183,   187,   190,   195,   196,   200,   203,

-     209,   212,   215,   218,   226,   245,   255,   260,   265,   284,

-     299,   302,   305,   326,   330,   339,   344,   345,   348,   351,

-     354,   357,   360,   363,   366,   369,   372,   375,   378,   381,

-     384,   387,   390,   398,   406,   409,   412,   415,   418,   421,

-     427,   432,   440,   441,   445,   451,   452,   455,   457,   464,

-     468,   472,   477,   481,   488,   493,   500,   504,   508,   512,

-     516,   523,   524,   525,   526,   527,   528,   529,   530,   531,

-     532,   533,   534,   535,   536,   537,   538,   539,   540,   541,

-     542,   543,   544,   545,   546,   547,   548,   549,   550,   551,

-     552,   553

-};

-#endif

-

-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE

-/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.

-   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */

-static const char *const yytname[] =

-{

-  "$end", "error", "$undefined", "COMMA_FINAL", "DEFINED",

-  "ELIF_EXPANDED", "HASH", "HASH_DEFINE_FUNC", "HASH_DEFINE_OBJ",

-  "HASH_ELIF", "HASH_ELSE", "HASH_ENDIF", "HASH_IF", "HASH_IFDEF",

-  "HASH_IFNDEF", "HASH_UNDEF", "HASH_VERSION", "IDENTIFIER", "IF_EXPANDED",

-  "INTEGER", "INTEGER_STRING", "NEWLINE", "OTHER", "PLACEHOLDER", "SPACE",

-  "PASTE", "OR", "AND", "'|'", "'^'", "'&'", "NOT_EQUAL", "EQUAL", "'<'",

-  "'>'", "GREATER_OR_EQUAL", "LESS_OR_EQUAL", "RIGHT_SHIFT", "LEFT_SHIFT",

-  "'+'", "'-'", "'*'", "'/'", "'%'", "UNARY", "'('", "')'", "'!'", "'~'",

-  "','", "'['", "']'", "'{'", "'}'", "'.'", "';'", "'='", "$accept",

-  "input", "line", "expanded_line", "control_line", "integer_constant",

-  "expression", "identifier_list", "text_line", "non_directive",

-  "replacement_list", "junk", "conditional_token", "conditional_tokens",

-  "pp_tokens", "preprocessing_token", "operator", 0

-};

-#endif

-

-# ifdef YYPRINT

-/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to

-   token YYLEX-NUM.  */

-static const yytype_uint16 yytoknum[] =

-{

-       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,

-     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,

-     275,   276,   277,   278,   279,   280,   281,   282,   124,    94,

-      38,   283,   284,    60,    62,   285,   286,   287,   288,    43,

-      45,    42,    47,    37,   289,    40,    41,    33,   126,    44,

-      91,    93,   123,   125,    46,    59,    61

-};

-# endif

-

-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */

-static const yytype_uint8 yyr1[] =

-{

-       0,    57,    58,    58,    59,    59,    59,    59,    60,    60,

-      61,    61,    61,    61,    61,    61,    61,    61,    61,    61,

-      61,    61,    61,    61,    62,    62,    63,    63,    63,    63,

-      63,    63,    63,    63,    63,    63,    63,    63,    63,    63,

-      63,    63,    63,    63,    63,    63,    63,    63,    63,    63,

-      64,    64,    65,    65,    66,    67,    67,    68,    68,    69,

-      69,    69,    70,    70,    71,    71,    72,    72,    72,    72,

-      72,    73,    73,    73,    73,    73,    73,    73,    73,    73,

-      73,    73,    73,    73,    73,    73,    73,    73,    73,    73,

-      73,    73,    73,    73,    73,    73,    73,    73,    73,    73,

-      73,    73

-};

-

-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */

-static const yytype_uint8 yyr2[] =

-{

-       0,     2,     0,     2,     1,     1,     1,     2,     3,     3,

-       4,     6,     7,     3,     3,     2,     4,     4,     3,     2,

-       2,     2,     3,     2,     1,     1,     1,     3,     3,     3,

-       3,     3,     3,     3,     3,     3,     3,     3,     3,     3,

-       3,     3,     3,     3,     3,     2,     2,     2,     2,     3,

-       1,     3,     1,     2,     2,     0,     1,     0,     1,     2,

-       4,     1,     1,     2,     1,     2,     1,     1,     1,     1,

-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,

-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,

-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,

-       1,     1

-};

-

-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state

-   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero

-   means the default is an error.  */

-static const yytype_uint8 yydefact[] =

-{

-       2,     0,     1,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,    66,     0,    67,    52,    69,

-      70,   101,    97,    96,    95,    94,    78,    93,    92,    88,

-      89,    91,    90,    87,    86,    80,    81,    79,    84,    85,

-      73,    74,    83,    82,    99,    71,    72,    75,    76,    77,

-      98,   100,     3,     6,     4,     5,     0,    64,    68,    25,

-      24,     0,     0,     0,     0,     0,    26,     0,    23,     7,

-       0,     0,    55,     0,    19,    62,     0,    61,    20,    21,

-      15,     0,    57,    57,     0,     0,     0,    53,    65,    48,

-      47,     0,    45,    46,     9,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,    54,     0,     0,    56,    59,     0,    18,

-      63,    14,     0,    58,     0,    13,    22,     8,    49,    27,

-      28,    29,    30,    31,    32,    33,    37,    36,    34,    35,

-      38,    39,    41,    40,    44,    43,    42,    50,    55,     0,

-      10,     0,    16,    17,     0,    55,     0,    60,    11,     0,

-      51,    12

-};

-

-/* YYDEFGOTO[NTERM-NUM].  */

-static const yytype_int16 yydefgoto[] =

-{

-      -1,     1,    52,    53,    54,    66,    67,   149,    55,    69,

-     115,   122,    75,    76,   116,    57,    58

-};

-

-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing

-   STATE-NUM.  */

-#define YYPACT_NINF -147

-static const yytype_int16 yypact[] =

-{

-    -147,   112,  -147,    28,   -10,    55,    62,   152,   -15,    59,

-     192,    85,    86,    87,    51,  -147,    28,  -147,  -147,  -147,

-    -147,  -147,  -147,  -147,  -147,  -147,  -147,  -147,  -147,  -147,

-    -147,  -147,  -147,  -147,  -147,  -147,  -147,  -147,  -147,  -147,

-    -147,  -147,  -147,  -147,  -147,  -147,  -147,  -147,  -147,  -147,

-    -147,  -147,  -147,  -147,  -147,  -147,   312,  -147,  -147,  -147,

-    -147,    28,    28,    28,    28,    28,  -147,   428,  -147,  -147,

-     352,    63,   392,    17,  -147,  -147,   232,  -147,  -147,  -147,

-    -147,   272,   392,   392,    84,    89,   451,  -147,  -147,  -147,

-    -147,   469,  -147,  -147,  -147,    28,    28,    28,    28,    28,

-      28,    28,    28,    28,    28,    28,    28,    28,    28,    28,

-      28,    28,    28,  -147,    60,    90,   392,  -147,    96,  -147,

-    -147,  -147,    93,   392,    94,  -147,  -147,  -147,  -147,   489,

-     505,   520,   534,   547,   558,   558,    18,    18,    18,    18,

-     563,   563,    23,    23,  -147,  -147,  -147,  -147,   392,    32,

-    -147,    61,  -147,  -147,   110,   392,   118,  -147,  -147,   149,

-    -147,  -147

-};

-

-/* YYPGOTO[NTERM-NUM].  */

-static const yytype_int16 yypgoto[] =

-{

-    -147,  -147,  -147,  -147,  -147,   157,   -11,  -147,  -147,  -147,

-    -146,    92,   -68,   200,     0,    -7,  -147

-};

-

-/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If

-   positive, shift that token.  If negative, reduce the rule which

-   number is the opposite.  If zero, do what YYDEFACT says.

-   If YYTABLE_NINF, syntax error.  */

-#define YYTABLE_NINF -1

-static const yytype_uint8 yytable[] =

-{

-      77,    56,   154,    77,    70,    86,    78,    15,   120,   159,

-      17,    68,    19,   120,    20,    21,    22,    23,    24,    25,

-      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,

-      36,    37,    38,    39,   117,    40,    41,    42,    43,    44,

-      45,    46,    47,    48,    49,    50,    51,    59,    60,    88,

-      89,    90,    91,    92,    93,   106,   107,   108,   109,   110,

-     111,   112,   118,    88,   110,   111,   112,    61,    62,    77,

-      59,    60,    71,    63,    77,    64,    65,   147,   155,    72,

-      79,   156,   123,   123,   129,   130,   131,   132,   133,   134,

-     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,

-     145,   146,    82,    83,    84,   125,   148,   157,   114,    88,

-     126,   150,     2,   151,   152,   153,    88,     3,     4,     5,

-       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,

-      16,   158,    17,    18,    19,   160,    20,    21,    22,    23,

-      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,

-      34,    35,    36,    37,    38,    39,    73,    40,    41,    42,

-      43,    44,    45,    46,    47,    48,    49,    50,    51,    15,

-     161,    85,    17,    74,    19,   124,    20,    21,    22,    23,

-      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,

-      34,    35,    36,    37,    38,    39,    73,    40,    41,    42,

-      43,    44,    45,    46,    47,    48,    49,    50,    51,    15,

-      81,     0,    17,    80,    19,     0,    20,    21,    22,    23,

-      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,

-      34,    35,    36,    37,    38,    39,    73,    40,    41,    42,

-      43,    44,    45,    46,    47,    48,    49,    50,    51,    15,

-       0,     0,    17,   119,    19,     0,    20,    21,    22,    23,

-      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,

-      34,    35,    36,    37,    38,    39,    73,    40,    41,    42,

-      43,    44,    45,    46,    47,    48,    49,    50,    51,    15,

-       0,     0,    17,   121,    19,     0,    20,    21,    22,    23,

-      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,

-      34,    35,    36,    37,    38,    39,     0,    40,    41,    42,

-      43,    44,    45,    46,    47,    48,    49,    50,    51,    15,

-       0,     0,    17,    87,    19,     0,    20,    21,    22,    23,

-      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,

-      34,    35,    36,    37,    38,    39,     0,    40,    41,    42,

-      43,    44,    45,    46,    47,    48,    49,    50,    51,    15,

-       0,     0,    17,   113,    19,     0,    20,    21,    22,    23,

-      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,

-      34,    35,    36,    37,    38,    39,     0,    40,    41,    42,

-      43,    44,    45,    46,    47,    48,    49,    50,    51,    15,

-       0,     0,    17,     0,    19,     0,    20,    21,    22,    23,

-      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,

-      34,    35,    36,    37,    38,    39,     0,    40,    41,    42,

-      43,    44,    45,    46,    47,    48,    49,    50,    51,    94,

-       0,     0,     0,     0,    95,    96,    97,    98,    99,   100,

-     101,   102,   103,   104,   105,   106,   107,   108,   109,   110,

-     111,   112,   127,     0,     0,     0,     0,    95,    96,    97,

-      98,    99,   100,   101,   102,   103,   104,   105,   106,   107,

-     108,   109,   110,   111,   112,    95,    96,    97,    98,    99,

-     100,   101,   102,   103,   104,   105,   106,   107,   108,   109,

-     110,   111,   112,     0,     0,   128,    96,    97,    98,    99,

-     100,   101,   102,   103,   104,   105,   106,   107,   108,   109,

-     110,   111,   112,    97,    98,    99,   100,   101,   102,   103,

-     104,   105,   106,   107,   108,   109,   110,   111,   112,    98,

-      99,   100,   101,   102,   103,   104,   105,   106,   107,   108,

-     109,   110,   111,   112,    99,   100,   101,   102,   103,   104,

-     105,   106,   107,   108,   109,   110,   111,   112,   100,   101,

-     102,   103,   104,   105,   106,   107,   108,   109,   110,   111,

-     112,   102,   103,   104,   105,   106,   107,   108,   109,   110,

-     111,   112,   108,   109,   110,   111,   112

-};

-

-static const yytype_int16 yycheck[] =

-{

-       7,     1,   148,    10,     4,    16,    21,    17,    76,   155,

-      20,    21,    22,    81,    24,    25,    26,    27,    28,    29,

-      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,

-      40,    41,    42,    43,    17,    45,    46,    47,    48,    49,

-      50,    51,    52,    53,    54,    55,    56,    19,    20,    56,

-      61,    62,    63,    64,    65,    37,    38,    39,    40,    41,

-      42,    43,    45,    70,    41,    42,    43,    39,    40,    76,

-      19,    20,    17,    45,    81,    47,    48,    17,    46,    17,

-      21,    49,    82,    83,    95,    96,    97,    98,    99,   100,

-     101,   102,   103,   104,   105,   106,   107,   108,   109,   110,

-     111,   112,    17,    17,    17,    21,    46,    46,    45,   116,

-      21,    21,     0,    17,    21,    21,   123,     5,     6,     7,

-       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,

-      18,    21,    20,    21,    22,    17,    24,    25,    26,    27,

-      28,    29,    30,    31,    32,    33,    34,    35,    36,    37,

-      38,    39,    40,    41,    42,    43,     4,    45,    46,    47,

-      48,    49,    50,    51,    52,    53,    54,    55,    56,    17,

-      21,    14,    20,    21,    22,    83,    24,    25,    26,    27,

-      28,    29,    30,    31,    32,    33,    34,    35,    36,    37,

-      38,    39,    40,    41,    42,    43,     4,    45,    46,    47,

-      48,    49,    50,    51,    52,    53,    54,    55,    56,    17,

-      10,    -1,    20,    21,    22,    -1,    24,    25,    26,    27,

-      28,    29,    30,    31,    32,    33,    34,    35,    36,    37,

-      38,    39,    40,    41,    42,    43,     4,    45,    46,    47,

-      48,    49,    50,    51,    52,    53,    54,    55,    56,    17,

-      -1,    -1,    20,    21,    22,    -1,    24,    25,    26,    27,

-      28,    29,    30,    31,    32,    33,    34,    35,    36,    37,

-      38,    39,    40,    41,    42,    43,     4,    45,    46,    47,

-      48,    49,    50,    51,    52,    53,    54,    55,    56,    17,

-      -1,    -1,    20,    21,    22,    -1,    24,    25,    26,    27,

-      28,    29,    30,    31,    32,    33,    34,    35,    36,    37,

-      38,    39,    40,    41,    42,    43,    -1,    45,    46,    47,

-      48,    49,    50,    51,    52,    53,    54,    55,    56,    17,

-      -1,    -1,    20,    21,    22,    -1,    24,    25,    26,    27,

-      28,    29,    30,    31,    32,    33,    34,    35,    36,    37,

-      38,    39,    40,    41,    42,    43,    -1,    45,    46,    47,

-      48,    49,    50,    51,    52,    53,    54,    55,    56,    17,

-      -1,    -1,    20,    21,    22,    -1,    24,    25,    26,    27,

-      28,    29,    30,    31,    32,    33,    34,    35,    36,    37,

-      38,    39,    40,    41,    42,    43,    -1,    45,    46,    47,

-      48,    49,    50,    51,    52,    53,    54,    55,    56,    17,

-      -1,    -1,    20,    -1,    22,    -1,    24,    25,    26,    27,

-      28,    29,    30,    31,    32,    33,    34,    35,    36,    37,

-      38,    39,    40,    41,    42,    43,    -1,    45,    46,    47,

-      48,    49,    50,    51,    52,    53,    54,    55,    56,    21,

-      -1,    -1,    -1,    -1,    26,    27,    28,    29,    30,    31,

-      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,

-      42,    43,    21,    -1,    -1,    -1,    -1,    26,    27,    28,

-      29,    30,    31,    32,    33,    34,    35,    36,    37,    38,

-      39,    40,    41,    42,    43,    26,    27,    28,    29,    30,

-      31,    32,    33,    34,    35,    36,    37,    38,    39,    40,

-      41,    42,    43,    -1,    -1,    46,    27,    28,    29,    30,

-      31,    32,    33,    34,    35,    36,    37,    38,    39,    40,

-      41,    42,    43,    28,    29,    30,    31,    32,    33,    34,

-      35,    36,    37,    38,    39,    40,    41,    42,    43,    29,

-      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,

-      40,    41,    42,    43,    30,    31,    32,    33,    34,    35,

-      36,    37,    38,    39,    40,    41,    42,    43,    31,    32,

-      33,    34,    35,    36,    37,    38,    39,    40,    41,    42,

-      43,    33,    34,    35,    36,    37,    38,    39,    40,    41,

-      42,    43,    39,    40,    41,    42,    43

-};

-

-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing

-   symbol of state STATE-NUM.  */

-static const yytype_uint8 yystos[] =

-{

-       0,    58,     0,     5,     6,     7,     8,     9,    10,    11,

-      12,    13,    14,    15,    16,    17,    18,    20,    21,    22,

-      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,

-      34,    35,    36,    37,    38,    39,    40,    41,    42,    43,

-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,

-      55,    56,    59,    60,    61,    65,    71,    72,    73,    19,

-      20,    39,    40,    45,    47,    48,    62,    63,    21,    66,

-      71,    17,    17,     4,    21,    69,    70,    72,    21,    21,

-      21,    70,    17,    17,    17,    62,    63,    21,    72,    63,

-      63,    63,    63,    63,    21,    26,    27,    28,    29,    30,

-      31,    32,    33,    34,    35,    36,    37,    38,    39,    40,

-      41,    42,    43,    21,    45,    67,    71,    17,    45,    21,

-      69,    21,    68,    71,    68,    21,    21,    21,    46,    63,

-      63,    63,    63,    63,    63,    63,    63,    63,    63,    63,

-      63,    63,    63,    63,    63,    63,    63,    17,    46,    64,

-      21,    17,    21,    21,    67,    46,    49,    46,    21,    67,

-      17,    21

-};

-

-#define yyerrok		(yyerrstatus = 0)

-#define yyclearin	(yychar = YYEMPTY)

-#define YYEMPTY		(-2)

-#define YYEOF		0

-

-#define YYACCEPT	goto yyacceptlab

-#define YYABORT		goto yyabortlab

-#define YYERROR		goto yyerrorlab

-

-

-/* Like YYERROR except do call yyerror.  This remains here temporarily

-   to ease the transition to the new meaning of YYERROR, for GCC.

-   Once GCC version 2 has supplanted version 1, this can go.  However,

-   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated

-   in Bison 2.4.2's NEWS entry, where a plan to phase it out is

-   discussed.  */

-

-#define YYFAIL		goto yyerrlab

-#if defined YYFAIL

-  /* This is here to suppress warnings from the GCC cpp's

-     -Wunused-macros.  Normally we don't worry about that warning, but

-     some users do, and we want to make it easy for users to remove

-     YYFAIL uses, which will produce warnings from Bison 2.5.  */

-#endif

-

-#define YYRECOVERING()  (!!yyerrstatus)

-

-#define YYBACKUP(Token, Value)					\

-do								\

-  if (yychar == YYEMPTY && yylen == 1)				\

-    {								\

-      yychar = (Token);						\

-      yylval = (Value);						\

-      yytoken = YYTRANSLATE (yychar);				\

-      YYPOPSTACK (1);						\

-      goto yybackup;						\

-    }								\

-  else								\

-    {								\

-      yyerror (&yylloc, parser, YY_("syntax error: cannot back up")); \

-      YYERROR;							\

-    }								\

-while (YYID (0))

-

-

-#define YYTERROR	1

-#define YYERRCODE	256

-

-

-/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].

-   If N is 0, then set CURRENT to the empty location which ends

-   the previous symbol: RHS[0] (always defined).  */

-

-#define YYRHSLOC(Rhs, K) ((Rhs)[K])

-#ifndef YYLLOC_DEFAULT

-# define YYLLOC_DEFAULT(Current, Rhs, N)				\

-    do									\

-      if (YYID (N))                                                    \

-	{								\

-	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\

-	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\

-	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\

-	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\

-	}								\

-      else								\

-	{								\

-	  (Current).first_line   = (Current).last_line   =		\

-	    YYRHSLOC (Rhs, 0).last_line;				\

-	  (Current).first_column = (Current).last_column =		\

-	    YYRHSLOC (Rhs, 0).last_column;				\

-	}								\

-    while (YYID (0))

-#endif

-

-

-/* YY_LOCATION_PRINT -- Print the location on the stream.

-   This macro was not mandated originally: define only if we know

-   we won't break user code: when these are the locations we know.  */

-

-#ifndef YY_LOCATION_PRINT

-# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL

-#  define YY_LOCATION_PRINT(File, Loc)			\

-     fprintf (File, "%d.%d-%d.%d",			\

-	      (Loc).first_line, (Loc).first_column,	\

-	      (Loc).last_line,  (Loc).last_column)

-# else

-#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)

-# endif

-#endif

-

-

-/* YYLEX -- calling `yylex' with the right arguments.  */

-

-#ifdef YYLEX_PARAM

-# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM)

-#else

-# define YYLEX yylex (&yylval, &yylloc, parser)

-#endif

-

-/* Enable debugging if requested.  */

-#if YYDEBUG

-

-# ifndef YYFPRINTF

-#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */

-#  define YYFPRINTF fprintf

-# endif

-

-# define YYDPRINTF(Args)			\

-do {						\

-  if (yydebug)					\

-    YYFPRINTF Args;				\

-} while (YYID (0))

-

-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \

-do {									  \

-  if (yydebug)								  \

-    {									  \

-      YYFPRINTF (stderr, "%s ", Title);					  \

-      yy_symbol_print (stderr,						  \

-		  Type, Value, Location, parser); \

-      YYFPRINTF (stderr, "\n");						  \

-    }									  \

-} while (YYID (0))

-

-

-/*--------------------------------.

-| Print this symbol on YYOUTPUT.  |

-`--------------------------------*/

-

-/*ARGSUSED*/

-#if (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-static void

-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, glcpp_parser_t *parser)

-#else

-static void

-yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp, parser)

-    FILE *yyoutput;

-    int yytype;

-    YYSTYPE const * const yyvaluep;

-    YYLTYPE const * const yylocationp;

-    glcpp_parser_t *parser;

-#endif

-{

-  if (!yyvaluep)

-    return;

-  YYUSE (yylocationp);

-  YYUSE (parser);

-# ifdef YYPRINT

-  if (yytype < YYNTOKENS)

-    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);

-# else

-  YYUSE (yyoutput);

-# endif

-  switch (yytype)

-    {

-      default:

-	break;

-    }

-}

-

-

-/*--------------------------------.

-| Print this symbol on YYOUTPUT.  |

-`--------------------------------*/

-

-#if (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-static void

-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, glcpp_parser_t *parser)

-#else

-static void

-yy_symbol_print (yyoutput, yytype, yyvaluep, yylocationp, parser)

-    FILE *yyoutput;

-    int yytype;

-    YYSTYPE const * const yyvaluep;

-    YYLTYPE const * const yylocationp;

-    glcpp_parser_t *parser;

-#endif

-{

-  if (yytype < YYNTOKENS)

-    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);

-  else

-    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);

-

-  YY_LOCATION_PRINT (yyoutput, *yylocationp);

-  YYFPRINTF (yyoutput, ": ");

-  yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp, parser);

-  YYFPRINTF (yyoutput, ")");

-}

-

-/*------------------------------------------------------------------.

-| yy_stack_print -- Print the state stack from its BOTTOM up to its |

-| TOP (included).                                                   |

-`------------------------------------------------------------------*/

-

-#if (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-static void

-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)

-#else

-static void

-yy_stack_print (yybottom, yytop)

-    yytype_int16 *yybottom;

-    yytype_int16 *yytop;

-#endif

-{

-  YYFPRINTF (stderr, "Stack now");

-  for (; yybottom <= yytop; yybottom++)

-    {

-      int yybot = *yybottom;

-      YYFPRINTF (stderr, " %d", yybot);

-    }

-  YYFPRINTF (stderr, "\n");

-}

-

-# define YY_STACK_PRINT(Bottom, Top)				\

-do {								\

-  if (yydebug)							\

-    yy_stack_print ((Bottom), (Top));				\

-} while (YYID (0))

-

-

-/*------------------------------------------------.

-| Report that the YYRULE is going to be reduced.  |

-`------------------------------------------------*/

-

-#if (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-static void

-yy_reduce_print (YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule, glcpp_parser_t *parser)

-#else

-static void

-yy_reduce_print (yyvsp, yylsp, yyrule, parser)

-    YYSTYPE *yyvsp;

-    YYLTYPE *yylsp;

-    int yyrule;

-    glcpp_parser_t *parser;

-#endif

-{

-  int yynrhs = yyr2[yyrule];

-  int yyi;

-  unsigned long int yylno = yyrline[yyrule];

-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",

-	     yyrule - 1, yylno);

-  /* The symbols being reduced.  */

-  for (yyi = 0; yyi < yynrhs; yyi++)

-    {

-      YYFPRINTF (stderr, "   $%d = ", yyi + 1);

-      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],

-		       &(yyvsp[(yyi + 1) - (yynrhs)])

-		       , &(yylsp[(yyi + 1) - (yynrhs)])		       , parser);

-      YYFPRINTF (stderr, "\n");

-    }

-}

-

-# define YY_REDUCE_PRINT(Rule)		\

-do {					\

-  if (yydebug)				\

-    yy_reduce_print (yyvsp, yylsp, Rule, parser); \

-} while (YYID (0))

-

-/* Nonzero means print parse trace.  It is left uninitialized so that

-   multiple parsers can coexist.  */

-int yydebug;

-#else /* !YYDEBUG */

-# define YYDPRINTF(Args)

-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)

-# define YY_STACK_PRINT(Bottom, Top)

-# define YY_REDUCE_PRINT(Rule)

-#endif /* !YYDEBUG */

-

-

-/* YYINITDEPTH -- initial size of the parser's stacks.  */

-#ifndef	YYINITDEPTH

-# define YYINITDEPTH 200

-#endif

-

-/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only

-   if the built-in stack extension method is used).

-

-   Do not make this value too large; the results are undefined if

-   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)

-   evaluated with infinite-precision integer arithmetic.  */

-

-#ifndef YYMAXDEPTH

-# define YYMAXDEPTH 10000

-#endif

-

-

-

-#if YYERROR_VERBOSE

-

-# ifndef yystrlen

-#  if defined __GLIBC__ && defined _STRING_H

-#   define yystrlen strlen

-#  else

-/* Return the length of YYSTR.  */

-#if (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-static YYSIZE_T

-yystrlen (const char *yystr)

-#else

-static YYSIZE_T

-yystrlen (yystr)

-    const char *yystr;

-#endif

-{

-  YYSIZE_T yylen;

-  for (yylen = 0; yystr[yylen]; yylen++)

-    continue;

-  return yylen;

-}

-#  endif

-# endif

-

-# ifndef yystpcpy

-#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE

-#   define yystpcpy stpcpy

-#  else

-/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in

-   YYDEST.  */

-#if (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-static char *

-yystpcpy (char *yydest, const char *yysrc)

-#else

-static char *

-yystpcpy (yydest, yysrc)

-    char *yydest;

-    const char *yysrc;

-#endif

-{

-  char *yyd = yydest;

-  const char *yys = yysrc;

-

-  while ((*yyd++ = *yys++) != '\0')

-    continue;

-

-  return yyd - 1;

-}

-#  endif

-# endif

-

-# ifndef yytnamerr

-/* Copy to YYRES the contents of YYSTR after stripping away unnecessary

-   quotes and backslashes, so that it's suitable for yyerror.  The

-   heuristic is that double-quoting is unnecessary unless the string

-   contains an apostrophe, a comma, or backslash (other than

-   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is

-   null, do not copy; instead, return the length of what the result

-   would have been.  */

-static YYSIZE_T

-yytnamerr (char *yyres, const char *yystr)

-{

-  if (*yystr == '"')

-    {

-      YYSIZE_T yyn = 0;

-      char const *yyp = yystr;

-

-      for (;;)

-	switch (*++yyp)

-	  {

-	  case '\'':

-	  case ',':

-	    goto do_not_strip_quotes;

-

-	  case '\\':

-	    if (*++yyp != '\\')

-	      goto do_not_strip_quotes;

-	    /* Fall through.  */

-	  default:

-	    if (yyres)

-	      yyres[yyn] = *yyp;

-	    yyn++;

-	    break;

-

-	  case '"':

-	    if (yyres)

-	      yyres[yyn] = '\0';

-	    return yyn;

-	  }

-    do_not_strip_quotes: ;

-    }

-

-  if (! yyres)

-    return yystrlen (yystr);

-

-  return yystpcpy (yyres, yystr) - yyres;

-}

-# endif

-

-/* Copy into YYRESULT an error message about the unexpected token

-   YYCHAR while in state YYSTATE.  Return the number of bytes copied,

-   including the terminating null byte.  If YYRESULT is null, do not

-   copy anything; just return the number of bytes that would be

-   copied.  As a special case, return 0 if an ordinary "syntax error"

-   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during

-   size calculation.  */

-static YYSIZE_T

-yysyntax_error (char *yyresult, int yystate, int yychar)

-{

-  int yyn = yypact[yystate];

-

-  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))

-    return 0;

-  else

-    {

-      int yytype = YYTRANSLATE (yychar);

-      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);

-      YYSIZE_T yysize = yysize0;

-      YYSIZE_T yysize1;

-      int yysize_overflow = 0;

-      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };

-      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];

-      int yyx;

-

-# if 0

-      /* This is so xgettext sees the translatable formats that are

-	 constructed on the fly.  */

-      YY_("syntax error, unexpected %s");

-      YY_("syntax error, unexpected %s, expecting %s");

-      YY_("syntax error, unexpected %s, expecting %s or %s");

-      YY_("syntax error, unexpected %s, expecting %s or %s or %s");

-      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");

-# endif

-      char *yyfmt;

-      char const *yyf;

-      static char const yyunexpected[] = "syntax error, unexpected %s";

-      static char const yyexpecting[] = ", expecting %s";

-      static char const yyor[] = " or %s";

-      char yyformat[sizeof yyunexpected

-		    + sizeof yyexpecting - 1

-		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)

-		       * (sizeof yyor - 1))];

-      char const *yyprefix = yyexpecting;

-

-      /* Start YYX at -YYN if negative to avoid negative indexes in

-	 YYCHECK.  */

-      int yyxbegin = yyn < 0 ? -yyn : 0;

-

-      /* Stay within bounds of both yycheck and yytname.  */

-      int yychecklim = YYLAST - yyn + 1;

-      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;

-      int yycount = 1;

-

-      yyarg[0] = yytname[yytype];

-      yyfmt = yystpcpy (yyformat, yyunexpected);

-

-      for (yyx = yyxbegin; yyx < yyxend; ++yyx)

-	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)

-	  {

-	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)

-	      {

-		yycount = 1;

-		yysize = yysize0;

-		yyformat[sizeof yyunexpected - 1] = '\0';

-		break;

-	      }

-	    yyarg[yycount++] = yytname[yyx];

-	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);

-	    yysize_overflow |= (yysize1 < yysize);

-	    yysize = yysize1;

-	    yyfmt = yystpcpy (yyfmt, yyprefix);

-	    yyprefix = yyor;

-	  }

-

-      yyf = YY_(yyformat);

-      yysize1 = yysize + yystrlen (yyf);

-      yysize_overflow |= (yysize1 < yysize);

-      yysize = yysize1;

-

-      if (yysize_overflow)

-	return YYSIZE_MAXIMUM;

-

-      if (yyresult)

-	{

-	  /* Avoid sprintf, as that infringes on the user's name space.

-	     Don't have undefined behavior even if the translation

-	     produced a string with the wrong number of "%s"s.  */

-	  char *yyp = yyresult;

-	  int yyi = 0;

-	  while ((*yyp = *yyf) != '\0')

-	    {

-	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)

-		{

-		  yyp += yytnamerr (yyp, yyarg[yyi++]);

-		  yyf += 2;

-		}

-	      else

-		{

-		  yyp++;

-		  yyf++;

-		}

-	    }

-	}

-      return yysize;

-    }

-}

-#endif /* YYERROR_VERBOSE */

-

-

-/*-----------------------------------------------.

-| Release the memory associated to this symbol.  |

-`-----------------------------------------------*/

-

-/*ARGSUSED*/

-#if (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-static void

-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp, glcpp_parser_t *parser)

-#else

-static void

-yydestruct (yymsg, yytype, yyvaluep, yylocationp, parser)

-    const char *yymsg;

-    int yytype;

-    YYSTYPE *yyvaluep;

-    YYLTYPE *yylocationp;

-    glcpp_parser_t *parser;

-#endif

-{

-  YYUSE (yyvaluep);

-  YYUSE (yylocationp);

-  YYUSE (parser);

-

-  if (!yymsg)

-    yymsg = "Deleting";

-  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);

-

-  switch (yytype)

-    {

-

-      default:

-	break;

-    }

-}

-

-/* Prevent warnings from -Wmissing-prototypes.  */

-#ifdef YYPARSE_PARAM

-#if defined __STDC__ || defined __cplusplus

-int yyparse (void *YYPARSE_PARAM);

-#else

-int yyparse ();

-#endif

-#else /* ! YYPARSE_PARAM */

-#if defined __STDC__ || defined __cplusplus

-int yyparse (glcpp_parser_t *parser);

-#else

-int yyparse ();

-#endif

-#endif /* ! YYPARSE_PARAM */

-

-

-

-

-

-/*-------------------------.

-| yyparse or yypush_parse.  |

-`-------------------------*/

-

-#ifdef YYPARSE_PARAM

-#if (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-int

-yyparse (void *YYPARSE_PARAM)

-#else

-int

-yyparse (YYPARSE_PARAM)

-    void *YYPARSE_PARAM;

-#endif

-#else /* ! YYPARSE_PARAM */

-#if (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-int

-yyparse (glcpp_parser_t *parser)

-#else

-int

-yyparse (parser)

-    glcpp_parser_t *parser;

-#endif

-#endif

-{

-/* The lookahead symbol.  */

-int yychar;

-

-/* The semantic value of the lookahead symbol.  */

-YYSTYPE yylval;

-

-/* Location data for the lookahead symbol.  */

-YYLTYPE yylloc;

-

-    /* Number of syntax errors so far.  */

-    int yynerrs;

-

-    int yystate;

-    /* Number of tokens to shift before error messages enabled.  */

-    int yyerrstatus;

-

-    /* The stacks and their tools:

-       `yyss': related to states.

-       `yyvs': related to semantic values.

-       `yyls': related to locations.

-

-       Refer to the stacks thru separate pointers, to allow yyoverflow

-       to reallocate them elsewhere.  */

-

-    /* The state stack.  */

-    yytype_int16 yyssa[YYINITDEPTH];

-    yytype_int16 *yyss;

-    yytype_int16 *yyssp;

-

-    /* The semantic value stack.  */

-    YYSTYPE yyvsa[YYINITDEPTH];

-    YYSTYPE *yyvs;

-    YYSTYPE *yyvsp;

-

-    /* The location stack.  */

-    YYLTYPE yylsa[YYINITDEPTH];

-    YYLTYPE *yyls;

-    YYLTYPE *yylsp;

-

-    /* The locations where the error started and ended.  */

-    YYLTYPE yyerror_range[3];

-

-    YYSIZE_T yystacksize;

-

-  int yyn;

-  int yyresult;

-  /* Lookahead token as an internal (translated) token number.  */

-  int yytoken;

-  /* The variables used to return semantic value and location from the

-     action routines.  */

-  YYSTYPE yyval;

-  YYLTYPE yyloc;

-

-#if YYERROR_VERBOSE

-  /* Buffer for error messages, and its allocated size.  */

-  char yymsgbuf[128];

-  char *yymsg = yymsgbuf;

-  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;

-#endif

-

-#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N), yylsp -= (N))

-

-  /* The number of symbols on the RHS of the reduced rule.

-     Keep to zero when no symbol should be popped.  */

-  int yylen = 0;

-

-  yytoken = 0;

-  yyss = yyssa;

-  yyvs = yyvsa;

-  yyls = yylsa;

-  yystacksize = YYINITDEPTH;

-

-  YYDPRINTF ((stderr, "Starting parse\n"));

-

-  yystate = 0;

-  yyerrstatus = 0;

-  yynerrs = 0;

-  yychar = YYEMPTY; /* Cause a token to be read.  */

-

-  /* Initialize stack pointers.

-     Waste one element of value and location stack

-     so that they stay on the same level as the state stack.

-     The wasted elements are never initialized.  */

-  yyssp = yyss;

-  yyvsp = yyvs;

-  yylsp = yyls;

-

-#if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL

-  /* Initialize the default location before parsing starts.  */

-  yylloc.first_line   = yylloc.last_line   = 1;

-  yylloc.first_column = yylloc.last_column = 1;

-#endif

-

-/* User initialization code.  */

-

-/* Line 1251 of yacc.c  */

-#line 148 "glcpp/glcpp-parse.y"

-{

-	yylloc.first_line = 1;

-	yylloc.first_column = 1;

-	yylloc.last_line = 1;

-	yylloc.last_column = 1;

-	yylloc.source = 0;

-}

-

-/* Line 1251 of yacc.c  */

-#line 1618 "glcpp/glcpp-parse.c"

-  yylsp[0] = yylloc;

-

-  goto yysetstate;

-

-/*------------------------------------------------------------.

-| yynewstate -- Push a new state, which is found in yystate.  |

-`------------------------------------------------------------*/

- yynewstate:

-  /* In all cases, when you get here, the value and location stacks

-     have just been pushed.  So pushing a state here evens the stacks.  */

-  yyssp++;

-

- yysetstate:

-  *yyssp = yystate;

-

-  if (yyss + yystacksize - 1 <= yyssp)

-    {

-      /* Get the current used size of the three stacks, in elements.  */

-      YYSIZE_T yysize = yyssp - yyss + 1;

-

-#ifdef yyoverflow

-      {

-	/* Give user a chance to reallocate the stack.  Use copies of

-	   these so that the &'s don't force the real ones into

-	   memory.  */

-	YYSTYPE *yyvs1 = yyvs;

-	yytype_int16 *yyss1 = yyss;

-	YYLTYPE *yyls1 = yyls;

-

-	/* Each stack pointer address is followed by the size of the

-	   data in use in that stack, in bytes.  This used to be a

-	   conditional around just the two extra args, but that might

-	   be undefined if yyoverflow is a macro.  */

-	yyoverflow (YY_("memory exhausted"),

-		    &yyss1, yysize * sizeof (*yyssp),

-		    &yyvs1, yysize * sizeof (*yyvsp),

-		    &yyls1, yysize * sizeof (*yylsp),

-		    &yystacksize);

-

-	yyls = yyls1;

-	yyss = yyss1;

-	yyvs = yyvs1;

-      }

-#else /* no yyoverflow */

-# ifndef YYSTACK_RELOCATE

-      goto yyexhaustedlab;

-# else

-      /* Extend the stack our own way.  */

-      if (YYMAXDEPTH <= yystacksize)

-	goto yyexhaustedlab;

-      yystacksize *= 2;

-      if (YYMAXDEPTH < yystacksize)

-	yystacksize = YYMAXDEPTH;

-

-      {

-	yytype_int16 *yyss1 = yyss;

-	union yyalloc *yyptr =

-	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));

-	if (! yyptr)

-	  goto yyexhaustedlab;

-	YYSTACK_RELOCATE (yyss_alloc, yyss);

-	YYSTACK_RELOCATE (yyvs_alloc, yyvs);

-	YYSTACK_RELOCATE (yyls_alloc, yyls);

-#  undef YYSTACK_RELOCATE

-	if (yyss1 != yyssa)

-	  YYSTACK_FREE (yyss1);

-      }

-# endif

-#endif /* no yyoverflow */

-

-      yyssp = yyss + yysize - 1;

-      yyvsp = yyvs + yysize - 1;

-      yylsp = yyls + yysize - 1;

-

-      YYDPRINTF ((stderr, "Stack size increased to %lu\n",

-		  (unsigned long int) yystacksize));

-

-      if (yyss + yystacksize - 1 <= yyssp)

-	YYABORT;

-    }

-

-  YYDPRINTF ((stderr, "Entering state %d\n", yystate));

-

-  if (yystate == YYFINAL)

-    YYACCEPT;

-

-  goto yybackup;

-

-/*-----------.

-| yybackup.  |

-`-----------*/

-yybackup:

-

-  /* Do appropriate processing given the current state.  Read a

-     lookahead token if we need one and don't already have one.  */

-

-  /* First try to decide what to do without reference to lookahead token.  */

-  yyn = yypact[yystate];

-  if (yyn == YYPACT_NINF)

-    goto yydefault;

-

-  /* Not known => get a lookahead token if don't already have one.  */

-

-  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */

-  if (yychar == YYEMPTY)

-    {

-      YYDPRINTF ((stderr, "Reading a token: "));

-      yychar = YYLEX;

-    }

-

-  if (yychar <= YYEOF)

-    {

-      yychar = yytoken = YYEOF;

-      YYDPRINTF ((stderr, "Now at end of input.\n"));

-    }

-  else

-    {

-      yytoken = YYTRANSLATE (yychar);

-      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);

-    }

-

-  /* If the proper action on seeing token YYTOKEN is to reduce or to

-     detect an error, take that action.  */

-  yyn += yytoken;

-  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)

-    goto yydefault;

-  yyn = yytable[yyn];

-  if (yyn <= 0)

-    {

-      if (yyn == 0 || yyn == YYTABLE_NINF)

-	goto yyerrlab;

-      yyn = -yyn;

-      goto yyreduce;

-    }

-

-  /* Count tokens shifted since error; after three, turn off error

-     status.  */

-  if (yyerrstatus)

-    yyerrstatus--;

-

-  /* Shift the lookahead token.  */

-  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);

-

-  /* Discard the shifted token.  */

-  yychar = YYEMPTY;

-

-  yystate = yyn;

-  *++yyvsp = yylval;

-  *++yylsp = yylloc;

-  goto yynewstate;

-

-

-/*-----------------------------------------------------------.

-| yydefault -- do the default action for the current state.  |

-`-----------------------------------------------------------*/

-yydefault:

-  yyn = yydefact[yystate];

-  if (yyn == 0)

-    goto yyerrlab;

-  goto yyreduce;

-

-

-/*-----------------------------.

-| yyreduce -- Do a reduction.  |

-`-----------------------------*/

-yyreduce:

-  /* yyn is the number of a rule to reduce with.  */

-  yylen = yyr2[yyn];

-

-  /* If YYLEN is nonzero, implement the default value of the action:

-     `$$ = $1'.

-

-     Otherwise, the following line sets YYVAL to garbage.

-     This behavior is undocumented and Bison

-     users should not rely upon it.  Assigning to YYVAL

-     unconditionally makes the parser a bit smaller, and it avoids a

-     GCC warning that YYVAL may be used uninitialized.  */

-  yyval = yyvsp[1-yylen];

-

-  /* Default location.  */

-  YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);

-  YY_REDUCE_PRINT (yyn);

-  switch (yyn)

-    {

-        case 4:

-

-/* Line 1464 of yacc.c  */

-#line 187 "glcpp/glcpp-parse.y"

-    {

-		ralloc_strcat (&parser->output, "\n");

-	;}

-    break;

-

-  case 5:

-

-/* Line 1464 of yacc.c  */

-#line 190 "glcpp/glcpp-parse.y"

-    {

-		_glcpp_parser_print_expanded_token_list (parser, (yyvsp[(1) - (1)].token_list));

-		ralloc_strcat (&parser->output, "\n");

-		ralloc_free ((yyvsp[(1) - (1)].token_list));

-	;}

-    break;

-

-  case 8:

-

-/* Line 1464 of yacc.c  */

-#line 200 "glcpp/glcpp-parse.y"

-    {

-		_glcpp_parser_skip_stack_push_if (parser, & (yylsp[(1) - (3)]), (yyvsp[(2) - (3)].ival));

-	;}

-    break;

-

-  case 9:

-

-/* Line 1464 of yacc.c  */

-#line 203 "glcpp/glcpp-parse.y"

-    {

-		_glcpp_parser_skip_stack_change_if (parser, & (yylsp[(1) - (3)]), "elif", (yyvsp[(2) - (3)].ival));

-	;}

-    break;

-

-  case 10:

-

-/* Line 1464 of yacc.c  */

-#line 209 "glcpp/glcpp-parse.y"

-    {

-		_define_object_macro (parser, & (yylsp[(2) - (4)]), (yyvsp[(2) - (4)].str), (yyvsp[(3) - (4)].token_list));

-	;}

-    break;

-

-  case 11:

-

-/* Line 1464 of yacc.c  */

-#line 212 "glcpp/glcpp-parse.y"

-    {

-		_define_function_macro (parser, & (yylsp[(2) - (6)]), (yyvsp[(2) - (6)].str), NULL, (yyvsp[(5) - (6)].token_list));

-	;}

-    break;

-

-  case 12:

-

-/* Line 1464 of yacc.c  */

-#line 215 "glcpp/glcpp-parse.y"

-    {

-		_define_function_macro (parser, & (yylsp[(2) - (7)]), (yyvsp[(2) - (7)].str), (yyvsp[(4) - (7)].string_list), (yyvsp[(6) - (7)].token_list));

-	;}

-    break;

-

-  case 13:

-

-/* Line 1464 of yacc.c  */

-#line 218 "glcpp/glcpp-parse.y"

-    {

-		macro_t *macro = hash_table_find (parser->defines, (yyvsp[(2) - (3)].str));

-		if (macro) {

-			hash_table_remove (parser->defines, (yyvsp[(2) - (3)].str));

-			ralloc_free (macro);

-		}

-		ralloc_free ((yyvsp[(2) - (3)].str));

-	;}

-    break;

-

-  case 14:

-

-/* Line 1464 of yacc.c  */

-#line 226 "glcpp/glcpp-parse.y"

-    {

-		/* Be careful to only evaluate the 'if' expression if

-		 * we are not skipping. When we are skipping, we

-		 * simply push a new 0-valued 'if' onto the skip

-		 * stack.

-		 *

-		 * This avoids generating diagnostics for invalid

-		 * expressions that are being skipped. */

-		if (parser->skip_stack == NULL ||

-		    parser->skip_stack->type == SKIP_NO_SKIP)

-		{

-			_glcpp_parser_expand_if (parser, IF_EXPANDED, (yyvsp[(2) - (3)].token_list));

-		}	

-		else

-		{

-			_glcpp_parser_skip_stack_push_if (parser, & (yylsp[(1) - (3)]), 0);

-			parser->skip_stack->type = SKIP_TO_ENDIF;

-		}

-	;}

-    break;

-

-  case 15:

-

-/* Line 1464 of yacc.c  */

-#line 245 "glcpp/glcpp-parse.y"

-    {

-		/* #if without an expression is only an error if we

-		 *  are not skipping */

-		if (parser->skip_stack == NULL ||

-		    parser->skip_stack->type == SKIP_NO_SKIP)

-		{

-			glcpp_error(& (yylsp[(1) - (2)]), parser, "#if with no expression");

-		}	

-		_glcpp_parser_skip_stack_push_if (parser, & (yylsp[(1) - (2)]), 0);

-	;}

-    break;

-

-  case 16:

-

-/* Line 1464 of yacc.c  */

-#line 255 "glcpp/glcpp-parse.y"

-    {

-		macro_t *macro = hash_table_find (parser->defines, (yyvsp[(2) - (4)].str));

-		ralloc_free ((yyvsp[(2) - (4)].str));

-		_glcpp_parser_skip_stack_push_if (parser, & (yylsp[(1) - (4)]), macro != NULL);

-	;}

-    break;

-

-  case 17:

-

-/* Line 1464 of yacc.c  */

-#line 260 "glcpp/glcpp-parse.y"

-    {

-		macro_t *macro = hash_table_find (parser->defines, (yyvsp[(2) - (4)].str));

-		ralloc_free ((yyvsp[(2) - (4)].str));

-		_glcpp_parser_skip_stack_push_if (parser, & (yylsp[(1) - (4)]), macro == NULL);

-	;}

-    break;

-

-  case 18:

-

-/* Line 1464 of yacc.c  */

-#line 265 "glcpp/glcpp-parse.y"

-    {

-		/* Be careful to only evaluate the 'elif' expression

-		 * if we are not skipping. When we are skipping, we

-		 * simply change to a 0-valued 'elif' on the skip

-		 * stack.

-		 *

-		 * This avoids generating diagnostics for invalid

-		 * expressions that are being skipped. */

-		if (parser->skip_stack &&

-		    parser->skip_stack->type == SKIP_TO_ELSE)

-		{

-			_glcpp_parser_expand_if (parser, ELIF_EXPANDED, (yyvsp[(2) - (3)].token_list));

-		}

-		else

-		{

-			_glcpp_parser_skip_stack_change_if (parser, & (yylsp[(1) - (3)]),

-							    "elif", 0);

-		}

-	;}

-    break;

-

-  case 19:

-

-/* Line 1464 of yacc.c  */

-#line 284 "glcpp/glcpp-parse.y"

-    {

-		/* #elif without an expression is an error unless we

-		 * are skipping. */

-		if (parser->skip_stack &&

-		    parser->skip_stack->type == SKIP_TO_ELSE)

-		{

-			glcpp_error(& (yylsp[(1) - (2)]), parser, "#elif with no expression");

-		}

-		else

-		{

-			_glcpp_parser_skip_stack_change_if (parser, & (yylsp[(1) - (2)]),

-							    "elif", 0);

-			glcpp_warning(& (yylsp[(1) - (2)]), parser, "ignoring illegal #elif without expression");

-		}

-	;}

-    break;

-

-  case 20:

-

-/* Line 1464 of yacc.c  */

-#line 299 "glcpp/glcpp-parse.y"

-    {

-		_glcpp_parser_skip_stack_change_if (parser, & (yylsp[(1) - (2)]), "else", 1);

-	;}

-    break;

-

-  case 21:

-

-/* Line 1464 of yacc.c  */

-#line 302 "glcpp/glcpp-parse.y"

-    {

-		_glcpp_parser_skip_stack_pop (parser, & (yylsp[(1) - (2)]));

-	;}

-    break;

-

-  case 22:

-

-/* Line 1464 of yacc.c  */

-#line 305 "glcpp/glcpp-parse.y"

-    {

-		macro_t *macro = hash_table_find (parser->defines, "__VERSION__");

-		if (macro) {

-			hash_table_remove (parser->defines, "__VERSION__");

-			ralloc_free (macro);

-		}

-		add_builtin_define (parser, "__VERSION__", (yyvsp[(2) - (3)].ival));

-

-		if ((yyvsp[(2) - (3)].ival) == 100)

-			add_builtin_define (parser, "GL_ES", 1);

-

-		/* Currently, all ES2 implementations support highp in the

-		 * fragment shader, so we always define this macro in ES2.

-		 * If we ever get a driver that doesn't support highp, we'll

-		 * need to add a flag to the gl_context and check that here.

-		 */

-		if ((yyvsp[(2) - (3)].ival) >= 130 || (yyvsp[(2) - (3)].ival) == 100)

-			add_builtin_define (parser, "GL_FRAGMENT_PRECISION_HIGH", 1);

-

-		ralloc_asprintf_append (&parser->output, "#version %" PRIiMAX, (yyvsp[(2) - (3)].ival));

-	;}

-    break;

-

-  case 24:

-

-/* Line 1464 of yacc.c  */

-#line 330 "glcpp/glcpp-parse.y"

-    {

-		if (strlen ((yyvsp[(1) - (1)].str)) >= 3 && strncmp ((yyvsp[(1) - (1)].str), "0x", 2) == 0) {

-			(yyval.ival) = strtoll ((yyvsp[(1) - (1)].str) + 2, NULL, 16);

-		} else if ((yyvsp[(1) - (1)].str)[0] == '0') {

-			(yyval.ival) = strtoll ((yyvsp[(1) - (1)].str), NULL, 8);

-		} else {

-			(yyval.ival) = strtoll ((yyvsp[(1) - (1)].str), NULL, 10);

-		}

-	;}

-    break;

-

-  case 25:

-

-/* Line 1464 of yacc.c  */

-#line 339 "glcpp/glcpp-parse.y"

-    {

-		(yyval.ival) = (yyvsp[(1) - (1)].ival);

-	;}

-    break;

-

-  case 27:

-

-/* Line 1464 of yacc.c  */

-#line 345 "glcpp/glcpp-parse.y"

-    {

-		(yyval.ival) = (yyvsp[(1) - (3)].ival) || (yyvsp[(3) - (3)].ival);

-	;}

-    break;

-

-  case 28:

-

-/* Line 1464 of yacc.c  */

-#line 348 "glcpp/glcpp-parse.y"

-    {

-		(yyval.ival) = (yyvsp[(1) - (3)].ival) && (yyvsp[(3) - (3)].ival);

-	;}

-    break;

-

-  case 29:

-

-/* Line 1464 of yacc.c  */

-#line 351 "glcpp/glcpp-parse.y"

-    {

-		(yyval.ival) = (yyvsp[(1) - (3)].ival) | (yyvsp[(3) - (3)].ival);

-	;}

-    break;

-

-  case 30:

-

-/* Line 1464 of yacc.c  */

-#line 354 "glcpp/glcpp-parse.y"

-    {

-		(yyval.ival) = (yyvsp[(1) - (3)].ival) ^ (yyvsp[(3) - (3)].ival);

-	;}

-    break;

-

-  case 31:

-

-/* Line 1464 of yacc.c  */

-#line 357 "glcpp/glcpp-parse.y"

-    {

-		(yyval.ival) = (yyvsp[(1) - (3)].ival) & (yyvsp[(3) - (3)].ival);

-	;}

-    break;

-

-  case 32:

-

-/* Line 1464 of yacc.c  */

-#line 360 "glcpp/glcpp-parse.y"

-    {

-		(yyval.ival) = (yyvsp[(1) - (3)].ival) != (yyvsp[(3) - (3)].ival);

-	;}

-    break;

-

-  case 33:

-

-/* Line 1464 of yacc.c  */

-#line 363 "glcpp/glcpp-parse.y"

-    {

-		(yyval.ival) = (yyvsp[(1) - (3)].ival) == (yyvsp[(3) - (3)].ival);

-	;}

-    break;

-

-  case 34:

-

-/* Line 1464 of yacc.c  */

-#line 366 "glcpp/glcpp-parse.y"

-    {

-		(yyval.ival) = (yyvsp[(1) - (3)].ival) >= (yyvsp[(3) - (3)].ival);

-	;}

-    break;

-

-  case 35:

-

-/* Line 1464 of yacc.c  */

-#line 369 "glcpp/glcpp-parse.y"

-    {

-		(yyval.ival) = (yyvsp[(1) - (3)].ival) <= (yyvsp[(3) - (3)].ival);

-	;}

-    break;

-

-  case 36:

-

-/* Line 1464 of yacc.c  */

-#line 372 "glcpp/glcpp-parse.y"

-    {

-		(yyval.ival) = (yyvsp[(1) - (3)].ival) > (yyvsp[(3) - (3)].ival);

-	;}

-    break;

-

-  case 37:

-

-/* Line 1464 of yacc.c  */

-#line 375 "glcpp/glcpp-parse.y"

-    {

-		(yyval.ival) = (yyvsp[(1) - (3)].ival) < (yyvsp[(3) - (3)].ival);

-	;}

-    break;

-

-  case 38:

-

-/* Line 1464 of yacc.c  */

-#line 378 "glcpp/glcpp-parse.y"

-    {

-		(yyval.ival) = (yyvsp[(1) - (3)].ival) >> (yyvsp[(3) - (3)].ival);

-	;}

-    break;

-

-  case 39:

-

-/* Line 1464 of yacc.c  */

-#line 381 "glcpp/glcpp-parse.y"

-    {

-		(yyval.ival) = (yyvsp[(1) - (3)].ival) << (yyvsp[(3) - (3)].ival);

-	;}

-    break;

-

-  case 40:

-

-/* Line 1464 of yacc.c  */

-#line 384 "glcpp/glcpp-parse.y"

-    {

-		(yyval.ival) = (yyvsp[(1) - (3)].ival) - (yyvsp[(3) - (3)].ival);

-	;}

-    break;

-

-  case 41:

-

-/* Line 1464 of yacc.c  */

-#line 387 "glcpp/glcpp-parse.y"

-    {

-		(yyval.ival) = (yyvsp[(1) - (3)].ival) + (yyvsp[(3) - (3)].ival);

-	;}

-    break;

-

-  case 42:

-

-/* Line 1464 of yacc.c  */

-#line 390 "glcpp/glcpp-parse.y"

-    {

-		if ((yyvsp[(3) - (3)].ival) == 0) {

-			yyerror (& (yylsp[(1) - (3)]), parser,

-				 "zero modulus in preprocessor directive");

-		} else {

-			(yyval.ival) = (yyvsp[(1) - (3)].ival) % (yyvsp[(3) - (3)].ival);

-		}

-	;}

-    break;

-

-  case 43:

-

-/* Line 1464 of yacc.c  */

-#line 398 "glcpp/glcpp-parse.y"

-    {

-		if ((yyvsp[(3) - (3)].ival) == 0) {

-			yyerror (& (yylsp[(1) - (3)]), parser,

-				 "division by 0 in preprocessor directive");

-		} else {

-			(yyval.ival) = (yyvsp[(1) - (3)].ival) / (yyvsp[(3) - (3)].ival);

-		}

-	;}

-    break;

-

-  case 44:

-

-/* Line 1464 of yacc.c  */

-#line 406 "glcpp/glcpp-parse.y"

-    {

-		(yyval.ival) = (yyvsp[(1) - (3)].ival) * (yyvsp[(3) - (3)].ival);

-	;}

-    break;

-

-  case 45:

-

-/* Line 1464 of yacc.c  */

-#line 409 "glcpp/glcpp-parse.y"

-    {

-		(yyval.ival) = ! (yyvsp[(2) - (2)].ival);

-	;}

-    break;

-

-  case 46:

-

-/* Line 1464 of yacc.c  */

-#line 412 "glcpp/glcpp-parse.y"

-    {

-		(yyval.ival) = ~ (yyvsp[(2) - (2)].ival);

-	;}

-    break;

-

-  case 47:

-

-/* Line 1464 of yacc.c  */

-#line 415 "glcpp/glcpp-parse.y"

-    {

-		(yyval.ival) = - (yyvsp[(2) - (2)].ival);

-	;}

-    break;

-

-  case 48:

-

-/* Line 1464 of yacc.c  */

-#line 418 "glcpp/glcpp-parse.y"

-    {

-		(yyval.ival) = + (yyvsp[(2) - (2)].ival);

-	;}

-    break;

-

-  case 49:

-

-/* Line 1464 of yacc.c  */

-#line 421 "glcpp/glcpp-parse.y"

-    {

-		(yyval.ival) = (yyvsp[(2) - (3)].ival);

-	;}

-    break;

-

-  case 50:

-

-/* Line 1464 of yacc.c  */

-#line 427 "glcpp/glcpp-parse.y"

-    {

-		(yyval.string_list) = _string_list_create (parser);

-		_string_list_append_item ((yyval.string_list), (yyvsp[(1) - (1)].str));

-		ralloc_steal ((yyval.string_list), (yyvsp[(1) - (1)].str));

-	;}

-    break;

-

-  case 51:

-

-/* Line 1464 of yacc.c  */

-#line 432 "glcpp/glcpp-parse.y"

-    {

-		(yyval.string_list) = (yyvsp[(1) - (3)].string_list);	

-		_string_list_append_item ((yyval.string_list), (yyvsp[(3) - (3)].str));

-		ralloc_steal ((yyval.string_list), (yyvsp[(3) - (3)].str));

-	;}

-    break;

-

-  case 52:

-

-/* Line 1464 of yacc.c  */

-#line 440 "glcpp/glcpp-parse.y"

-    { (yyval.token_list) = NULL; ;}

-    break;

-

-  case 54:

-

-/* Line 1464 of yacc.c  */

-#line 445 "glcpp/glcpp-parse.y"

-    {

-		yyerror (& (yylsp[(1) - (2)]), parser, "Invalid tokens after #");

-	;}

-    break;

-

-  case 55:

-

-/* Line 1464 of yacc.c  */

-#line 451 "glcpp/glcpp-parse.y"

-    { (yyval.token_list) = NULL; ;}

-    break;

-

-  case 58:

-

-/* Line 1464 of yacc.c  */

-#line 457 "glcpp/glcpp-parse.y"

-    {

-		glcpp_warning(&(yylsp[(1) - (1)]), parser, "extra tokens at end of directive");

-	;}

-    break;

-

-  case 59:

-

-/* Line 1464 of yacc.c  */

-#line 464 "glcpp/glcpp-parse.y"

-    {

-		int v = hash_table_find (parser->defines, (yyvsp[(2) - (2)].str)) ? 1 : 0;

-		(yyval.token) = _token_create_ival (parser, INTEGER, v);

-	;}

-    break;

-

-  case 60:

-

-/* Line 1464 of yacc.c  */

-#line 468 "glcpp/glcpp-parse.y"

-    {

-		int v = hash_table_find (parser->defines, (yyvsp[(3) - (4)].str)) ? 1 : 0;

-		(yyval.token) = _token_create_ival (parser, INTEGER, v);

-	;}

-    break;

-

-  case 62:

-

-/* Line 1464 of yacc.c  */

-#line 477 "glcpp/glcpp-parse.y"

-    {

-		(yyval.token_list) = _token_list_create (parser);

-		_token_list_append ((yyval.token_list), (yyvsp[(1) - (1)].token));

-	;}

-    break;

-

-  case 63:

-

-/* Line 1464 of yacc.c  */

-#line 481 "glcpp/glcpp-parse.y"

-    {

-		(yyval.token_list) = (yyvsp[(1) - (2)].token_list);

-		_token_list_append ((yyval.token_list), (yyvsp[(2) - (2)].token));

-	;}

-    break;

-

-  case 64:

-

-/* Line 1464 of yacc.c  */

-#line 488 "glcpp/glcpp-parse.y"

-    {

-		parser->space_tokens = 1;

-		(yyval.token_list) = _token_list_create (parser);

-		_token_list_append ((yyval.token_list), (yyvsp[(1) - (1)].token));

-	;}

-    break;

-

-  case 65:

-

-/* Line 1464 of yacc.c  */

-#line 493 "glcpp/glcpp-parse.y"

-    {

-		(yyval.token_list) = (yyvsp[(1) - (2)].token_list);

-		_token_list_append ((yyval.token_list), (yyvsp[(2) - (2)].token));

-	;}

-    break;

-

-  case 66:

-

-/* Line 1464 of yacc.c  */

-#line 500 "glcpp/glcpp-parse.y"

-    {

-		(yyval.token) = _token_create_str (parser, IDENTIFIER, (yyvsp[(1) - (1)].str));

-		(yyval.token)->location = yylloc;

-	;}

-    break;

-

-  case 67:

-

-/* Line 1464 of yacc.c  */

-#line 504 "glcpp/glcpp-parse.y"

-    {

-		(yyval.token) = _token_create_str (parser, INTEGER_STRING, (yyvsp[(1) - (1)].str));

-		(yyval.token)->location = yylloc;

-	;}

-    break;

-

-  case 68:

-

-/* Line 1464 of yacc.c  */

-#line 508 "glcpp/glcpp-parse.y"

-    {

-		(yyval.token) = _token_create_ival (parser, (yyvsp[(1) - (1)].ival), (yyvsp[(1) - (1)].ival));

-		(yyval.token)->location = yylloc;

-	;}

-    break;

-

-  case 69:

-

-/* Line 1464 of yacc.c  */

-#line 512 "glcpp/glcpp-parse.y"

-    {

-		(yyval.token) = _token_create_str (parser, OTHER, (yyvsp[(1) - (1)].str));

-		(yyval.token)->location = yylloc;

-	;}

-    break;

-

-  case 70:

-

-/* Line 1464 of yacc.c  */

-#line 516 "glcpp/glcpp-parse.y"

-    {

-		(yyval.token) = _token_create_ival (parser, SPACE, SPACE);

-		(yyval.token)->location = yylloc;

-	;}

-    break;

-

-  case 71:

-

-/* Line 1464 of yacc.c  */

-#line 523 "glcpp/glcpp-parse.y"

-    { (yyval.ival) = '['; ;}

-    break;

-

-  case 72:

-

-/* Line 1464 of yacc.c  */

-#line 524 "glcpp/glcpp-parse.y"

-    { (yyval.ival) = ']'; ;}

-    break;

-

-  case 73:

-

-/* Line 1464 of yacc.c  */

-#line 525 "glcpp/glcpp-parse.y"

-    { (yyval.ival) = '('; ;}

-    break;

-

-  case 74:

-

-/* Line 1464 of yacc.c  */

-#line 526 "glcpp/glcpp-parse.y"

-    { (yyval.ival) = ')'; ;}

-    break;

-

-  case 75:

-

-/* Line 1464 of yacc.c  */

-#line 527 "glcpp/glcpp-parse.y"

-    { (yyval.ival) = '{'; ;}

-    break;

-

-  case 76:

-

-/* Line 1464 of yacc.c  */

-#line 528 "glcpp/glcpp-parse.y"

-    { (yyval.ival) = '}'; ;}

-    break;

-

-  case 77:

-

-/* Line 1464 of yacc.c  */

-#line 529 "glcpp/glcpp-parse.y"

-    { (yyval.ival) = '.'; ;}

-    break;

-

-  case 78:

-

-/* Line 1464 of yacc.c  */

-#line 530 "glcpp/glcpp-parse.y"

-    { (yyval.ival) = '&'; ;}

-    break;

-

-  case 79:

-

-/* Line 1464 of yacc.c  */

-#line 531 "glcpp/glcpp-parse.y"

-    { (yyval.ival) = '*'; ;}

-    break;

-

-  case 80:

-

-/* Line 1464 of yacc.c  */

-#line 532 "glcpp/glcpp-parse.y"

-    { (yyval.ival) = '+'; ;}

-    break;

-

-  case 81:

-

-/* Line 1464 of yacc.c  */

-#line 533 "glcpp/glcpp-parse.y"

-    { (yyval.ival) = '-'; ;}

-    break;

-

-  case 82:

-

-/* Line 1464 of yacc.c  */

-#line 534 "glcpp/glcpp-parse.y"

-    { (yyval.ival) = '~'; ;}

-    break;

-

-  case 83:

-

-/* Line 1464 of yacc.c  */

-#line 535 "glcpp/glcpp-parse.y"

-    { (yyval.ival) = '!'; ;}

-    break;

-

-  case 84:

-

-/* Line 1464 of yacc.c  */

-#line 536 "glcpp/glcpp-parse.y"

-    { (yyval.ival) = '/'; ;}

-    break;

-

-  case 85:

-

-/* Line 1464 of yacc.c  */

-#line 537 "glcpp/glcpp-parse.y"

-    { (yyval.ival) = '%'; ;}

-    break;

-

-  case 86:

-

-/* Line 1464 of yacc.c  */

-#line 538 "glcpp/glcpp-parse.y"

-    { (yyval.ival) = LEFT_SHIFT; ;}

-    break;

-

-  case 87:

-

-/* Line 1464 of yacc.c  */

-#line 539 "glcpp/glcpp-parse.y"

-    { (yyval.ival) = RIGHT_SHIFT; ;}

-    break;

-

-  case 88:

-

-/* Line 1464 of yacc.c  */

-#line 540 "glcpp/glcpp-parse.y"

-    { (yyval.ival) = '<'; ;}

-    break;

-

-  case 89:

-

-/* Line 1464 of yacc.c  */

-#line 541 "glcpp/glcpp-parse.y"

-    { (yyval.ival) = '>'; ;}

-    break;

-

-  case 90:

-

-/* Line 1464 of yacc.c  */

-#line 542 "glcpp/glcpp-parse.y"

-    { (yyval.ival) = LESS_OR_EQUAL; ;}

-    break;

-

-  case 91:

-

-/* Line 1464 of yacc.c  */

-#line 543 "glcpp/glcpp-parse.y"

-    { (yyval.ival) = GREATER_OR_EQUAL; ;}

-    break;

-

-  case 92:

-

-/* Line 1464 of yacc.c  */

-#line 544 "glcpp/glcpp-parse.y"

-    { (yyval.ival) = EQUAL; ;}

-    break;

-

-  case 93:

-

-/* Line 1464 of yacc.c  */

-#line 545 "glcpp/glcpp-parse.y"

-    { (yyval.ival) = NOT_EQUAL; ;}

-    break;

-

-  case 94:

-

-/* Line 1464 of yacc.c  */

-#line 546 "glcpp/glcpp-parse.y"

-    { (yyval.ival) = '^'; ;}

-    break;

-

-  case 95:

-

-/* Line 1464 of yacc.c  */

-#line 547 "glcpp/glcpp-parse.y"

-    { (yyval.ival) = '|'; ;}

-    break;

-

-  case 96:

-

-/* Line 1464 of yacc.c  */

-#line 548 "glcpp/glcpp-parse.y"

-    { (yyval.ival) = AND; ;}

-    break;

-

-  case 97:

-

-/* Line 1464 of yacc.c  */

-#line 549 "glcpp/glcpp-parse.y"

-    { (yyval.ival) = OR; ;}

-    break;

-

-  case 98:

-

-/* Line 1464 of yacc.c  */

-#line 550 "glcpp/glcpp-parse.y"

-    { (yyval.ival) = ';'; ;}

-    break;

-

-  case 99:

-

-/* Line 1464 of yacc.c  */

-#line 551 "glcpp/glcpp-parse.y"

-    { (yyval.ival) = ','; ;}

-    break;

-

-  case 100:

-

-/* Line 1464 of yacc.c  */

-#line 552 "glcpp/glcpp-parse.y"

-    { (yyval.ival) = '='; ;}

-    break;

-

-  case 101:

-

-/* Line 1464 of yacc.c  */

-#line 553 "glcpp/glcpp-parse.y"

-    { (yyval.ival) = PASTE; ;}

-    break;

-

-

-

-/* Line 1464 of yacc.c  */

-#line 2662 "glcpp/glcpp-parse.c"

-      default: break;

-    }

-  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);

-

-  YYPOPSTACK (yylen);

-  yylen = 0;

-  YY_STACK_PRINT (yyss, yyssp);

-

-  *++yyvsp = yyval;

-  *++yylsp = yyloc;

-

-  /* Now `shift' the result of the reduction.  Determine what state

-     that goes to, based on the state we popped back to and the rule

-     number reduced by.  */

-

-  yyn = yyr1[yyn];

-

-  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;

-  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)

-    yystate = yytable[yystate];

-  else

-    yystate = yydefgoto[yyn - YYNTOKENS];

-

-  goto yynewstate;

-

-

-/*------------------------------------.

-| yyerrlab -- here on detecting error |

-`------------------------------------*/

-yyerrlab:

-  /* If not already recovering from an error, report this error.  */

-  if (!yyerrstatus)

-    {

-      ++yynerrs;

-#if ! YYERROR_VERBOSE

-      yyerror (&yylloc, parser, YY_("syntax error"));

-#else

-      {

-	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);

-	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)

-	  {

-	    YYSIZE_T yyalloc = 2 * yysize;

-	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))

-	      yyalloc = YYSTACK_ALLOC_MAXIMUM;

-	    if (yymsg != yymsgbuf)

-	      YYSTACK_FREE (yymsg);

-	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);

-	    if (yymsg)

-	      yymsg_alloc = yyalloc;

-	    else

-	      {

-		yymsg = yymsgbuf;

-		yymsg_alloc = sizeof yymsgbuf;

-	      }

-	  }

-

-	if (0 < yysize && yysize <= yymsg_alloc)

-	  {

-	    (void) yysyntax_error (yymsg, yystate, yychar);

-	    yyerror (&yylloc, parser, yymsg);

-	  }

-	else

-	  {

-	    yyerror (&yylloc, parser, YY_("syntax error"));

-	    if (yysize != 0)

-	      goto yyexhaustedlab;

-	  }

-      }

-#endif

-    }

-

-  yyerror_range[1] = yylloc;

-

-  if (yyerrstatus == 3)

-    {

-      /* If just tried and failed to reuse lookahead token after an

-	 error, discard it.  */

-

-      if (yychar <= YYEOF)

-	{

-	  /* Return failure if at end of input.  */

-	  if (yychar == YYEOF)

-	    YYABORT;

-	}

-      else

-	{

-	  yydestruct ("Error: discarding",

-		      yytoken, &yylval, &yylloc, parser);

-	  yychar = YYEMPTY;

-	}

-    }

-

-  /* Else will try to reuse lookahead token after shifting the error

-     token.  */

-  goto yyerrlab1;

-

-

-/*---------------------------------------------------.

-| yyerrorlab -- error raised explicitly by YYERROR.  |

-`---------------------------------------------------*/

-yyerrorlab:

-

-  /* Pacify compilers like GCC when the user code never invokes

-     YYERROR and the label yyerrorlab therefore never appears in user

-     code.  */

-  if (/*CONSTCOND*/ 0)

-     goto yyerrorlab;

-

-  yyerror_range[1] = yylsp[1-yylen];

-  /* Do not reclaim the symbols of the rule which action triggered

-     this YYERROR.  */

-  YYPOPSTACK (yylen);

-  yylen = 0;

-  YY_STACK_PRINT (yyss, yyssp);

-  yystate = *yyssp;

-  goto yyerrlab1;

-

-

-/*-------------------------------------------------------------.

-| yyerrlab1 -- common code for both syntax error and YYERROR.  |

-`-------------------------------------------------------------*/

-yyerrlab1:

-  yyerrstatus = 3;	/* Each real token shifted decrements this.  */

-

-  for (;;)

-    {

-      yyn = yypact[yystate];

-      if (yyn != YYPACT_NINF)

-	{

-	  yyn += YYTERROR;

-	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)

-	    {

-	      yyn = yytable[yyn];

-	      if (0 < yyn)

-		break;

-	    }

-	}

-

-      /* Pop the current state because it cannot handle the error token.  */

-      if (yyssp == yyss)

-	YYABORT;

-

-      yyerror_range[1] = *yylsp;

-      yydestruct ("Error: popping",

-		  yystos[yystate], yyvsp, yylsp, parser);

-      YYPOPSTACK (1);

-      yystate = *yyssp;

-      YY_STACK_PRINT (yyss, yyssp);

-    }

-

-  *++yyvsp = yylval;

-

-  yyerror_range[2] = yylloc;

-  /* Using YYLLOC is tempting, but would change the location of

-     the lookahead.  YYLOC is available though.  */

-  YYLLOC_DEFAULT (yyloc, yyerror_range, 2);

-  *++yylsp = yyloc;

-

-  /* Shift the error token.  */

-  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);

-

-  yystate = yyn;

-  goto yynewstate;

-

-

-/*-------------------------------------.

-| yyacceptlab -- YYACCEPT comes here.  |

-`-------------------------------------*/

-yyacceptlab:

-  yyresult = 0;

-  goto yyreturn;

-

-/*-----------------------------------.

-| yyabortlab -- YYABORT comes here.  |

-`-----------------------------------*/

-yyabortlab:

-  yyresult = 1;

-  goto yyreturn;

-

-#if !defined(yyoverflow) || YYERROR_VERBOSE

-/*-------------------------------------------------.

-| yyexhaustedlab -- memory exhaustion comes here.  |

-`-------------------------------------------------*/

-yyexhaustedlab:

-  yyerror (&yylloc, parser, YY_("memory exhausted"));

-  yyresult = 2;

-  /* Fall through.  */

-#endif

-

-yyreturn:

-  if (yychar != YYEMPTY)

-     yydestruct ("Cleanup: discarding lookahead",

-		 yytoken, &yylval, &yylloc, parser);

-  /* Do not reclaim the symbols of the rule which action triggered

-     this YYABORT or YYACCEPT.  */

-  YYPOPSTACK (yylen);

-  YY_STACK_PRINT (yyss, yyssp);

-  while (yyssp != yyss)

-    {

-      yydestruct ("Cleanup: popping",

-		  yystos[*yyssp], yyvsp, yylsp, parser);

-      YYPOPSTACK (1);

-    }

-#ifndef yyoverflow

-  if (yyss != yyssa)

-    YYSTACK_FREE (yyss);

-#endif

-#if YYERROR_VERBOSE

-  if (yymsg != yymsgbuf)

-    YYSTACK_FREE (yymsg);

-#endif

-  /* Make sure YYID is used.  */

-  return YYID (yyresult);

-}

-

-

-

-/* Line 1684 of yacc.c  */

-#line 556 "glcpp/glcpp-parse.y"

-

-

-string_list_t *

-_string_list_create (void *ctx)

-{

-	string_list_t *list;

-

-	list = ralloc (ctx, string_list_t);

-	list->head = NULL;

-	list->tail = NULL;

-

-	return list;

-}

-

-void

-_string_list_append_item (string_list_t *list, const char *str)

-{

-	string_node_t *node;

-

-	node = ralloc (list, string_node_t);

-	node->str = ralloc_strdup (node, str);

-

-	node->next = NULL;

-

-	if (list->head == NULL) {

-		list->head = node;

-	} else {

-		list->tail->next = node;

-	}

-

-	list->tail = node;

-}

-

-int

-_string_list_contains (string_list_t *list, const char *member, int *index)

-{

-	string_node_t *node;

-	int i;

-

-	if (list == NULL)

-		return 0;

-

-	for (i = 0, node = list->head; node; i++, node = node->next) {

-		if (strcmp (node->str, member) == 0) {

-			if (index)

-				*index = i;

-			return 1;

-		}

-	}

-

-	return 0;

-}

-

-int

-_string_list_length (string_list_t *list)

-{

-	int length = 0;

-	string_node_t *node;

-

-	if (list == NULL)

-		return 0;

-

-	for (node = list->head; node; node = node->next)

-		length++;

-

-	return length;

-}

-

-int

-_string_list_equal (string_list_t *a, string_list_t *b)

-{

-	string_node_t *node_a, *node_b;

-

-	if (a == NULL && b == NULL)

-		return 1;

-

-	if (a == NULL || b == NULL)

-		return 0;

-

-	for (node_a = a->head, node_b = b->head;

-	     node_a && node_b;

-	     node_a = node_a->next, node_b = node_b->next)

-	{

-		if (strcmp (node_a->str, node_b->str))

-			return 0;

-	}

-

-	/* Catch the case of lists being different lengths, (which

-	 * would cause the loop above to terminate after the shorter

-	 * list). */

-	return node_a == node_b;

-}

-

-argument_list_t *

-_argument_list_create (void *ctx)

-{

-	argument_list_t *list;

-

-	list = ralloc (ctx, argument_list_t);

-	list->head = NULL;

-	list->tail = NULL;

-

-	return list;

-}

-

-void

-_argument_list_append (argument_list_t *list, token_list_t *argument)

-{

-	argument_node_t *node;

-

-	node = ralloc (list, argument_node_t);

-	node->argument = argument;

-

-	node->next = NULL;

-

-	if (list->head == NULL) {

-		list->head = node;

-	} else {

-		list->tail->next = node;

-	}

-

-	list->tail = node;

-}

-

-int

-_argument_list_length (argument_list_t *list)

-{

-	int length = 0;

-	argument_node_t *node;

-

-	if (list == NULL)

-		return 0;

-

-	for (node = list->head; node; node = node->next)

-		length++;

-

-	return length;

-}

-

-token_list_t *

-_argument_list_member_at (argument_list_t *list, int index)

-{

-	argument_node_t *node;

-	int i;

-

-	if (list == NULL)

-		return NULL;

-

-	node = list->head;

-	for (i = 0; i < index; i++) {

-		node = node->next;

-		if (node == NULL)

-			break;

-	}

-

-	if (node)

-		return node->argument;

-

-	return NULL;

-}

-

-/* Note: This function ralloc_steal()s the str pointer. */

-token_t *

-_token_create_str (void *ctx, int type, char *str)

-{

-	token_t *token;

-

-	token = ralloc (ctx, token_t);

-	token->type = type;

-	token->value.str = str;

-

-	ralloc_steal (token, str);

-

-	return token;

-}

-

-token_t *

-_token_create_ival (void *ctx, int type, int ival)

-{

-	token_t *token;

-

-	token = ralloc (ctx, token_t);

-	token->type = type;

-	token->value.ival = ival;

-

-	return token;

-}

-

-token_list_t *

-_token_list_create (void *ctx)

-{

-	token_list_t *list;

-

-	list = ralloc (ctx, token_list_t);

-	list->head = NULL;

-	list->tail = NULL;

-	list->non_space_tail = NULL;

-

-	return list;

-}

-

-void

-_token_list_append (token_list_t *list, token_t *token)

-{

-	token_node_t *node;

-

-	node = ralloc (list, token_node_t);

-	node->token = token;

-	node->next = NULL;

-

-	ralloc_steal (list, token);

-

-	if (list->head == NULL) {

-		list->head = node;

-	} else {

-		list->tail->next = node;

-	}

-

-	list->tail = node;

-	if (token->type != SPACE)

-		list->non_space_tail = node;

-}

-

-void

-_token_list_append_list (token_list_t *list, token_list_t *tail)

-{

-	if (tail == NULL || tail->head == NULL)

-		return;

-

-	if (list->head == NULL) {

-		list->head = tail->head;

-	} else {

-		list->tail->next = tail->head;

-	}

-

-	list->tail = tail->tail;

-	list->non_space_tail = tail->non_space_tail;

-}

-

-static token_list_t *

-_token_list_copy (void *ctx, token_list_t *other)

-{

-	token_list_t *copy;

-	token_node_t *node;

-

-	if (other == NULL)

-		return NULL;

-

-	copy = _token_list_create (ctx);

-	for (node = other->head; node; node = node->next) {

-		token_t *new_token = ralloc (copy, token_t);

-		*new_token = *node->token;

-		_token_list_append (copy, new_token);

-	}

-

-	return copy;

-}

-

-static void

-_token_list_trim_trailing_space (token_list_t *list)

-{

-	token_node_t *tail, *next;

-

-	if (list->non_space_tail) {

-		tail = list->non_space_tail->next;

-		list->non_space_tail->next = NULL;

-		list->tail = list->non_space_tail;

-

-		while (tail) {

-			next = tail->next;

-			ralloc_free (tail);

-			tail = next;

-		}

-	}

-}

-

-static int

-_token_list_is_empty_ignoring_space (token_list_t *l)

-{

-	token_node_t *n;

-

-	if (l == NULL)

-		return 1;

-

-	n = l->head;

-	while (n != NULL && n->token->type == SPACE)

-		n = n->next;

-

-	return n == NULL;

-}

-

-int

-_token_list_equal_ignoring_space (token_list_t *a, token_list_t *b)

-{

-	token_node_t *node_a, *node_b;

-

-	if (a == NULL || b == NULL) {

-		int a_empty = _token_list_is_empty_ignoring_space(a);

-		int b_empty = _token_list_is_empty_ignoring_space(b);

-		return a_empty == b_empty;

-	}

-

-	node_a = a->head;

-	node_b = b->head;

-

-	while (1)

-	{

-		if (node_a == NULL && node_b == NULL)

-			break;

-

-		if (node_a == NULL || node_b == NULL)

-			return 0;

-

-		if (node_a->token->type == SPACE) {

-			node_a = node_a->next;

-			continue;

-		}

-

-		if (node_b->token->type == SPACE) {

-			node_b = node_b->next;

-			continue;

-		}

-

-		if (node_a->token->type != node_b->token->type)

-			return 0;

-

-		switch (node_a->token->type) {

-		case INTEGER:

-			if (node_a->token->value.ival != 

-			    node_b->token->value.ival)

-			{

-				return 0;

-			}

-			break;

-		case IDENTIFIER:

-		case INTEGER_STRING:

-		case OTHER:

-			if (strcmp (node_a->token->value.str,

-				    node_b->token->value.str))

-			{

-				return 0;

-			}

-			break;

-		}

-

-		node_a = node_a->next;

-		node_b = node_b->next;

-	}

-

-	return 1;

-}

-

-static void

-_token_print (char **out, token_t *token)

-{

-	if (token->type < 256) {

-		ralloc_asprintf_append (out, "%c", token->type);

-		return;

-	}

-

-	switch (token->type) {

-	case INTEGER:

-		ralloc_asprintf_append (out, "%" PRIiMAX, token->value.ival);

-		break;

-	case IDENTIFIER:

-	case INTEGER_STRING:

-	case OTHER:

-		ralloc_strcat (out, token->value.str);

-		break;

-	case SPACE:

-		ralloc_strcat (out, " ");

-		break;

-	case LEFT_SHIFT:

-		ralloc_strcat (out, "<<");

-		break;

-	case RIGHT_SHIFT:

-		ralloc_strcat (out, ">>");

-		break;

-	case LESS_OR_EQUAL:

-		ralloc_strcat (out, "<=");

-		break;

-	case GREATER_OR_EQUAL:

-		ralloc_strcat (out, ">=");

-		break;

-	case EQUAL:

-		ralloc_strcat (out, "==");

-		break;

-	case NOT_EQUAL:

-		ralloc_strcat (out, "!=");

-		break;

-	case AND:

-		ralloc_strcat (out, "&&");

-		break;

-	case OR:

-		ralloc_strcat (out, "||");

-		break;

-	case PASTE:

-		ralloc_strcat (out, "##");

-		break;

-	case COMMA_FINAL:

-		ralloc_strcat (out, ",");

-		break;

-	case PLACEHOLDER:

-		/* Nothing to print. */

-		break;

-	default:

-		assert(!"Error: Don't know how to print token.");

-		break;

-	}

-}

-

-/* Return a new token (ralloc()ed off of 'token') formed by pasting

- * 'token' and 'other'. Note that this function may return 'token' or

- * 'other' directly rather than allocating anything new.

- *

- * Caution: Only very cursory error-checking is performed to see if

- * the final result is a valid single token. */

-static token_t *

-_token_paste (glcpp_parser_t *parser, token_t *token, token_t *other)

-{

-	token_t *combined = NULL;

-

-	/* Pasting a placeholder onto anything makes no change. */

-	if (other->type == PLACEHOLDER)

-		return token;

-

-	/* When 'token' is a placeholder, just return 'other'. */

-	if (token->type == PLACEHOLDER)

-		return other;

-

-	/* A very few single-character punctuators can be combined

-	 * with another to form a multi-character punctuator. */

-	switch (token->type) {

-	case '<':

-		if (other->type == '<')

-			combined = _token_create_ival (token, LEFT_SHIFT, LEFT_SHIFT);

-		else if (other->type == '=')

-			combined = _token_create_ival (token, LESS_OR_EQUAL, LESS_OR_EQUAL);

-		break;

-	case '>':

-		if (other->type == '>')

-			combined = _token_create_ival (token, RIGHT_SHIFT, RIGHT_SHIFT);

-		else if (other->type == '=')

-			combined = _token_create_ival (token, GREATER_OR_EQUAL, GREATER_OR_EQUAL);

-		break;

-	case '=':

-		if (other->type == '=')

-			combined = _token_create_ival (token, EQUAL, EQUAL);

-		break;

-	case '!':

-		if (other->type == '=')

-			combined = _token_create_ival (token, NOT_EQUAL, NOT_EQUAL);

-		break;

-	case '&':

-		if (other->type == '&')

-			combined = _token_create_ival (token, AND, AND);

-		break;

-	case '|':

-		if (other->type == '|')

-			combined = _token_create_ival (token, OR, OR);

-		break;

-	}

-

-	if (combined != NULL) {

-		/* Inherit the location from the first token */

-		combined->location = token->location;

-		return combined;

-	}

-

-	/* Two string-valued tokens can usually just be mashed

-	 * together.

-	 *

-	 * XXX: This isn't actually legitimate. Several things here

-	 * should result in a diagnostic since the result cannot be a

-	 * valid, single pre-processing token. For example, pasting

-	 * "123" and "abc" is not legal, but we don't catch that

-	 * here. */

-	if ((token->type == IDENTIFIER || token->type == OTHER || token->type == INTEGER_STRING) &&

-	    (other->type == IDENTIFIER || other->type == OTHER || other->type == INTEGER_STRING))

-	{

-		char *str;

-

-		str = ralloc_asprintf (token, "%s%s", token->value.str,

-				       other->value.str);

-		combined = _token_create_str (token, token->type, str);

-		combined->location = token->location;

-		return combined;

-	}

-

-	glcpp_error (&token->location, parser, "");

-	ralloc_strcat (&parser->info_log, "Pasting \"");

-	_token_print (&parser->info_log, token);

-	ralloc_strcat (&parser->info_log, "\" and \"");

-	_token_print (&parser->info_log, other);

-	ralloc_strcat (&parser->info_log, "\" does not give a valid preprocessing token.\n");

-

-	return token;

-}

-

-static void

-_token_list_print (glcpp_parser_t *parser, token_list_t *list)

-{

-	token_node_t *node;

-

-	if (list == NULL)

-		return;

-

-	for (node = list->head; node; node = node->next)

-		_token_print (&parser->output, node->token);

-}

-

-void

-yyerror (YYLTYPE *locp, glcpp_parser_t *parser, const char *error)

-{

-	glcpp_error(locp, parser, "%s", error);

-}

-

-static void add_builtin_define(glcpp_parser_t *parser,

-			       const char *name, int value)

-{

-   token_t *tok;

-   token_list_t *list;

-

-   tok = _token_create_ival (parser, INTEGER, value);

-

-   list = _token_list_create(parser);

-   _token_list_append(list, tok);

-   _define_object_macro(parser, NULL, name, list);

-}

-

-glcpp_parser_t *

-glcpp_parser_create (const struct gl_extensions *extensions, int api)

-{

-	glcpp_parser_t *parser;

-	int language_version;

-

-	parser = ralloc (NULL, glcpp_parser_t);

-

-	glcpp_lex_init_extra (parser, &parser->scanner);

-	parser->defines = hash_table_ctor (32, hash_table_string_hash,

-					   hash_table_string_compare);

-	parser->active = NULL;

-	parser->lexing_if = 0;

-	parser->space_tokens = 1;

-	parser->newline_as_space = 0;

-	parser->in_control_line = 0;

-	parser->paren_count = 0;

-

-	parser->skip_stack = NULL;

-

-	parser->lex_from_list = NULL;

-	parser->lex_from_node = NULL;

-

-	parser->output = ralloc_strdup(parser, "");

-	parser->info_log = ralloc_strdup(parser, "");

-	parser->error = 0;

-

-	/* Add pre-defined macros. */

-	add_builtin_define(parser, "GL_ARB_draw_buffers", 1);

-	add_builtin_define(parser, "GL_ARB_texture_rectangle", 1);

-

-	if (api == API_OPENGLES2)

-		add_builtin_define(parser, "GL_ES", 1);

-

-	if (extensions != NULL) {

-	   if (extensions->EXT_texture_array) {

-	      add_builtin_define(parser, "GL_EXT_texture_array", 1);

-	   }

-

-	   if (extensions->ARB_fragment_coord_conventions)

-	      add_builtin_define(parser, "GL_ARB_fragment_coord_conventions",

-				 1);

-

-	   if (extensions->ARB_explicit_attrib_location)

-	      add_builtin_define(parser, "GL_ARB_explicit_attrib_location", 1);

-	   if (extensions->AMD_conservative_depth)

-	      add_builtin_define(parser, "GL_AMD_conservative_depth", 1);

-	}

-

-	language_version = 110;

-	add_builtin_define(parser, "__VERSION__", language_version);

-

-	return parser;

-}

-

-int

-glcpp_parser_parse (glcpp_parser_t *parser)

-{

-	return yyparse (parser);

-}

-

-void

-glcpp_parser_destroy (glcpp_parser_t *parser)

-{

-	glcpp_lex_destroy (parser->scanner);

-	hash_table_dtor (parser->defines);

-	ralloc_free (parser);

-}

-

-typedef enum function_status

-{

-	FUNCTION_STATUS_SUCCESS,

-	FUNCTION_NOT_A_FUNCTION,

-	FUNCTION_UNBALANCED_PARENTHESES

-} function_status_t;

-

-/* Find a set of function-like macro arguments by looking for a

- * balanced set of parentheses.

- *

- * When called, 'node' should be the opening-parenthesis token, (or

- * perhaps preceeding SPACE tokens). Upon successful return *last will

- * be the last consumed node, (corresponding to the closing right

- * parenthesis).

- *

- * Return values:

- *

- *   FUNCTION_STATUS_SUCCESS:

- *

- *	Successfully parsed a set of function arguments.	

- *

- *   FUNCTION_NOT_A_FUNCTION:

- *

- *	Macro name not followed by a '('. This is not an error, but

- *	simply that the macro name should be treated as a non-macro.

- *

- *   FUNCTION_UNBALANCED_PARENTHESES

- *

- *	Macro name is not followed by a balanced set of parentheses.

- */

-static function_status_t

-_arguments_parse (argument_list_t *arguments,

-		  token_node_t *node,

-		  token_node_t **last)

-{

-	token_list_t *argument;

-	int paren_count;

-

-	node = node->next;

-

-	/* Ignore whitespace before first parenthesis. */

-	while (node && node->token->type == SPACE)

-		node = node->next;

-

-	if (node == NULL || node->token->type != '(')

-		return FUNCTION_NOT_A_FUNCTION;

-

-	node = node->next;

-

-	argument = _token_list_create (arguments);

-	_argument_list_append (arguments, argument);

-

-	for (paren_count = 1; node; node = node->next) {

-		if (node->token->type == '(')

-		{

-			paren_count++;

-		}

-		else if (node->token->type == ')')

-		{

-			paren_count--;

-			if (paren_count == 0)

-				break;

-		}

-

-		if (node->token->type == ',' &&

-			 paren_count == 1)

-		{

-			_token_list_trim_trailing_space (argument);

-			argument = _token_list_create (arguments);

-			_argument_list_append (arguments, argument);

-		}

-		else {

-			if (argument->head == NULL) {

-				/* Don't treat initial whitespace as

-				 * part of the arguement. */

-				if (node->token->type == SPACE)

-					continue;

-			}

-			_token_list_append (argument, node->token);

-		}

-	}

-

-	if (paren_count)

-		return FUNCTION_UNBALANCED_PARENTHESES;

-

-	*last = node;

-

-	return FUNCTION_STATUS_SUCCESS;

-}

-

-static token_list_t *

-_token_list_create_with_one_space (void *ctx)

-{

-	token_list_t *list;

-	token_t *space;

-

-	list = _token_list_create (ctx);

-	space = _token_create_ival (list, SPACE, SPACE);

-	_token_list_append (list, space);

-

-	return list;

-}

-

-static void

-_glcpp_parser_expand_if (glcpp_parser_t *parser, int type, token_list_t *list)

-{

-	token_list_t *expanded;

-	token_t *token;

-

-	expanded = _token_list_create (parser);

-	token = _token_create_ival (parser, type, type);

-	_token_list_append (expanded, token);

-	_glcpp_parser_expand_token_list (parser, list);

-	_token_list_append_list (expanded, list);

-	glcpp_parser_lex_from (parser, expanded);

-}

-

-/* This is a helper function that's essentially part of the

- * implementation of _glcpp_parser_expand_node. It shouldn't be called

- * except for by that function.

- *

- * Returns NULL if node is a simple token with no expansion, (that is,

- * although 'node' corresponds to an identifier defined as a

- * function-like macro, it is not followed with a parenthesized

- * argument list).

- *

- * Compute the complete expansion of node (which is a function-like

- * macro) and subsequent nodes which are arguments.

- *

- * Returns the token list that results from the expansion and sets

- * *last to the last node in the list that was consumed by the

- * expansion. Specifically, *last will be set as follows: as the

- * token of the closing right parenthesis.

- */

-static token_list_t *

-_glcpp_parser_expand_function (glcpp_parser_t *parser,

-			       token_node_t *node,

-			       token_node_t **last)

-			       

-{

-	macro_t *macro;

-	const char *identifier;

-	argument_list_t *arguments;

-	function_status_t status;

-	token_list_t *substituted;

-	int parameter_index;

-

-	identifier = node->token->value.str;

-

-	macro = hash_table_find (parser->defines, identifier);

-

-	assert (macro->is_function);

-

-	arguments = _argument_list_create (parser);

-	status = _arguments_parse (arguments, node, last);

-

-	switch (status) {

-	case FUNCTION_STATUS_SUCCESS:

-		break;

-	case FUNCTION_NOT_A_FUNCTION:

-		return NULL;

-	case FUNCTION_UNBALANCED_PARENTHESES:

-		glcpp_error (&node->token->location, parser, "Macro %s call has unbalanced parentheses\n", identifier);

-		return NULL;

-	}

-

-	/* Replace a macro defined as empty with a SPACE token. */

-	if (macro->replacements == NULL) {

-		ralloc_free (arguments);

-		return _token_list_create_with_one_space (parser);

-	}

-

-	if (! ((_argument_list_length (arguments) == 

-		_string_list_length (macro->parameters)) ||

-	       (_string_list_length (macro->parameters) == 0 &&

-		_argument_list_length (arguments) == 1 &&

-		arguments->head->argument->head == NULL)))

-	{

-		glcpp_error (&node->token->location, parser,

-			      "Error: macro %s invoked with %d arguments (expected %d)\n",

-			      identifier,

-			      _argument_list_length (arguments),

-			      _string_list_length (macro->parameters));

-		return NULL;

-	}

-

-	/* Perform argument substitution on the replacement list. */

-	substituted = _token_list_create (arguments);

-

-	for (node = macro->replacements->head; node; node = node->next)

-	{

-		if (node->token->type == IDENTIFIER &&

-		    _string_list_contains (macro->parameters,

-					   node->token->value.str,

-					   &parameter_index))

-		{

-			token_list_t *argument;

-			argument = _argument_list_member_at (arguments,

-							     parameter_index);

-			/* Before substituting, we expand the argument

-			 * tokens, or append a placeholder token for

-			 * an empty argument. */

-			if (argument->head) {

-				token_list_t *expanded_argument;

-				expanded_argument = _token_list_copy (parser,

-								      argument);

-				_glcpp_parser_expand_token_list (parser,

-								 expanded_argument);

-				_token_list_append_list (substituted,

-							 expanded_argument);

-			} else {

-				token_t *new_token;

-

-				new_token = _token_create_ival (substituted,

-								PLACEHOLDER,

-								PLACEHOLDER);

-				_token_list_append (substituted, new_token);

-			}

-		} else {

-			_token_list_append (substituted, node->token);

-		}

-	}

-

-	/* After argument substitution, and before further expansion

-	 * below, implement token pasting. */

-

-	_token_list_trim_trailing_space (substituted);

-

-	node = substituted->head;

-	while (node)

-	{

-		token_node_t *next_non_space;

-

-		/* Look ahead for a PASTE token, skipping space. */

-		next_non_space = node->next;

-		while (next_non_space && next_non_space->token->type == SPACE)

-			next_non_space = next_non_space->next;

-

-		if (next_non_space == NULL)

-			break;

-

-		if (next_non_space->token->type != PASTE) {

-			node = next_non_space;

-			continue;

-		}

-

-		/* Now find the next non-space token after the PASTE. */

-		next_non_space = next_non_space->next;

-		while (next_non_space && next_non_space->token->type == SPACE)

-			next_non_space = next_non_space->next;

-

-		if (next_non_space == NULL) {

-			yyerror (&node->token->location, parser, "'##' cannot appear at either end of a macro expansion\n");

-			return NULL;

-		}

-

-		node->token = _token_paste (parser, node->token, next_non_space->token);

-		node->next = next_non_space->next;

-		if (next_non_space == substituted->tail)

-			substituted->tail = node;

-

-		node = node->next;

-	}

-

-	substituted->non_space_tail = substituted->tail;

-

-	return substituted;

-}

-

-/* Compute the complete expansion of node, (and subsequent nodes after

- * 'node' in the case that 'node' is a function-like macro and

- * subsequent nodes are arguments).

- *

- * Returns NULL if node is a simple token with no expansion.

- *

- * Otherwise, returns the token list that results from the expansion

- * and sets *last to the last node in the list that was consumed by

- * the expansion. Specifically, *last will be set as follows:

- *

- *	As 'node' in the case of object-like macro expansion.

- *

- *	As the token of the closing right parenthesis in the case of

- *	function-like macro expansion.

- */

-static token_list_t *

-_glcpp_parser_expand_node (glcpp_parser_t *parser,

-			   token_node_t *node,

-			   token_node_t **last)

-{

-	token_t *token = node->token;

-	const char *identifier;

-	macro_t *macro;

-

-	/* We only expand identifiers */

-	if (token->type != IDENTIFIER) {

-		/* We change any COMMA into a COMMA_FINAL to prevent

-		 * it being mistaken for an argument separator

-		 * later. */

-		if (token->type == ',') {

-			token->type = COMMA_FINAL;

-			token->value.ival = COMMA_FINAL;

-		}

-

-		return NULL;

-	}

-

-	/* Look up this identifier in the hash table. */

-	identifier = token->value.str;

-	macro = hash_table_find (parser->defines, identifier);

-

-	/* Not a macro, so no expansion needed. */

-	if (macro == NULL)

-		return NULL;

-

-	/* Finally, don't expand this macro if we're already actively

-	 * expanding it, (to avoid infinite recursion). */

-	if (_active_list_contains (parser->active, identifier)) {

-		/* We change the token type here from IDENTIFIER to

-		 * OTHER to prevent any future expansion of this

-		 * unexpanded token. */

-		char *str;

-		token_list_t *expansion;

-		token_t *final;

-

-		str = ralloc_strdup (parser, token->value.str);

-		final = _token_create_str (parser, OTHER, str);

-		expansion = _token_list_create (parser);

-		_token_list_append (expansion, final);

-		*last = node;

-		return expansion;

-	}

-

-	if (! macro->is_function)

-	{

-		*last = node;

-

-		/* Replace a macro defined as empty with a SPACE token. */

-		if (macro->replacements == NULL)

-			return _token_list_create_with_one_space (parser);

-

-		return _token_list_copy (parser, macro->replacements);

-	}

-

-	return _glcpp_parser_expand_function (parser, node, last);

-}

-

-/* Push a new identifier onto the active list, returning the new list.

- *

- * Here, 'marker' is the token node that appears in the list after the

- * expansion of 'identifier'. That is, when the list iterator begins

- * examinging 'marker', then it is time to pop this node from the

- * active stack.

- */

-active_list_t *

-_active_list_push (active_list_t *list,

-		   const char *identifier,

-		   token_node_t *marker)

-{

-	active_list_t *node;

-

-	node = ralloc (list, active_list_t);

-	node->identifier = ralloc_strdup (node, identifier);

-	node->marker = marker;

-	node->next = list;

-

-	return node;

-}

-

-active_list_t *

-_active_list_pop (active_list_t *list)

-{

-	active_list_t *node = list;

-

-	if (node == NULL)

-		return NULL;

-

-	node = list->next;

-	ralloc_free (list);

-

-	return node;

-}

-

-int

-_active_list_contains (active_list_t *list, const char *identifier)

-{

-	active_list_t *node;

-

-	if (list == NULL)

-		return 0;

-

-	for (node = list; node; node = node->next)

-		if (strcmp (node->identifier, identifier) == 0)

-			return 1;

-

-	return 0;

-}

-

-/* Walk over the token list replacing nodes with their expansion.

- * Whenever nodes are expanded the walking will walk over the new

- * nodes, continuing to expand as necessary. The results are placed in

- * 'list' itself;

- */

-static void

-_glcpp_parser_expand_token_list (glcpp_parser_t *parser,

-				 token_list_t *list)

-{

-	token_node_t *node_prev;

-	token_node_t *node, *last = NULL;

-	token_list_t *expansion;

-

-	if (list == NULL)

-		return;

-

-	_token_list_trim_trailing_space (list);

-

-	node_prev = NULL;

-	node = list->head;

-

-	while (node) {

-

-		while (parser->active && parser->active->marker == node)

-			parser->active = _active_list_pop (parser->active);

-

-		/* Find the expansion for node, which will replace all

-		 * nodes from node to last, inclusive. */

-		expansion = _glcpp_parser_expand_node (parser, node, &last);

-		if (expansion) {

-			token_node_t *n;

-

-			for (n = node; n != last->next; n = n->next)

-				while (parser->active &&

-				       parser->active->marker == n)

-				{

-					parser->active = _active_list_pop (parser->active);

-				}

-

-			parser->active = _active_list_push (parser->active,

-							    node->token->value.str,

-							    last->next);

-			

-			/* Splice expansion into list, supporting a

-			 * simple deletion if the expansion is

-			 * empty. */

-			if (expansion->head) {

-				if (node_prev)

-					node_prev->next = expansion->head;

-				else

-					list->head = expansion->head;

-				expansion->tail->next = last->next;

-				if (last == list->tail)

-					list->tail = expansion->tail;

-			} else {

-				if (node_prev)

-					node_prev->next = last->next;

-				else

-					list->head = last->next;

-				if (last == list->tail)

-					list->tail = NULL;

-			}

-		} else {

-			node_prev = node;

-		}

-		node = node_prev ? node_prev->next : list->head;

-	}

-

-	while (parser->active)

-		parser->active = _active_list_pop (parser->active);

-

-	list->non_space_tail = list->tail;

-}

-

-void

-_glcpp_parser_print_expanded_token_list (glcpp_parser_t *parser,

-					 token_list_t *list)

-{

-	if (list == NULL)

-		return;

-

-	_glcpp_parser_expand_token_list (parser, list);

-

-	_token_list_trim_trailing_space (list);

-

-	_token_list_print (parser, list);

-}

-

-static void

-_check_for_reserved_macro_name (glcpp_parser_t *parser, YYLTYPE *loc,

-				const char *identifier)

-{

-	/* According to the GLSL specification, macro names starting with "__"

-	 * or "GL_" are reserved for future use.  So, don't allow them.

-	 */

-	if (strncmp(identifier, "__", 2) == 0) {

-		glcpp_error (loc, parser, "Macro names starting with \"__\" are reserved.\n");

-	}

-	if (strncmp(identifier, "GL_", 3) == 0) {

-		glcpp_error (loc, parser, "Macro names starting with \"GL_\" are reserved.\n");

-	}

-}

-

-static int

-_macro_equal (macro_t *a, macro_t *b)

-{

-	if (a->is_function != b->is_function)

-		return 0;

-

-	if (a->is_function) {

-		if (! _string_list_equal (a->parameters, b->parameters))

-			return 0;

-	}

-

-	return _token_list_equal_ignoring_space (a->replacements,

-						 b->replacements);

-}

-

-void

-_define_object_macro (glcpp_parser_t *parser,

-		      YYLTYPE *loc,

-		      const char *identifier,

-		      token_list_t *replacements)

-{

-	macro_t *macro, *previous;

-

-	if (loc != NULL)

-		_check_for_reserved_macro_name(parser, loc, identifier);

-

-	macro = ralloc (parser, macro_t);

-

-	macro->is_function = 0;

-	macro->parameters = NULL;

-	macro->identifier = ralloc_strdup (macro, identifier);

-	macro->replacements = replacements;

-	ralloc_steal (macro, replacements);

-

-	previous = hash_table_find (parser->defines, identifier);

-	if (previous) {

-		if (_macro_equal (macro, previous)) {

-			ralloc_free (macro);

-			return;

-		}

-		glcpp_error (loc, parser, "Redefinition of macro %s\n",

-			     identifier);

-	}

-

-	hash_table_insert (parser->defines, macro, identifier);

-}

-

-void

-_define_function_macro (glcpp_parser_t *parser,

-			YYLTYPE *loc,

-			const char *identifier,

-			string_list_t *parameters,

-			token_list_t *replacements)

-{

-	macro_t *macro, *previous;

-

-	_check_for_reserved_macro_name(parser, loc, identifier);

-

-	macro = ralloc (parser, macro_t);

-	ralloc_steal (macro, parameters);

-	ralloc_steal (macro, replacements);

-

-	macro->is_function = 1;

-	macro->parameters = parameters;

-	macro->identifier = ralloc_strdup (macro, identifier);

-	macro->replacements = replacements;

-	previous = hash_table_find (parser->defines, identifier);

-	if (previous) {

-		if (_macro_equal (macro, previous)) {

-			ralloc_free (macro);

-			return;

-		}

-		glcpp_error (loc, parser, "Redefinition of macro %s\n",

-			     identifier);

-	}

-

-	hash_table_insert (parser->defines, macro, identifier);

-}

-

-static int

-glcpp_parser_lex (YYSTYPE *yylval, YYLTYPE *yylloc, glcpp_parser_t *parser)

-{

-	token_node_t *node;

-	int ret;

-

-	if (parser->lex_from_list == NULL) {

-		ret = glcpp_lex (yylval, yylloc, parser->scanner);

-

-		/* XXX: This ugly block of code exists for the sole

-		 * purpose of converting a NEWLINE token into a SPACE

-		 * token, but only in the case where we have seen a

-		 * function-like macro name, but have not yet seen its

-		 * closing parenthesis.

-		 *

-		 * There's perhaps a more compact way to do this with

-		 * mid-rule actions in the grammar.

-		 *

-		 * I'm definitely not pleased with the complexity of

-		 * this code here.

-		 */

-		if (parser->newline_as_space)

-		{

-			if (ret == '(') {

-				parser->paren_count++;

-			} else if (ret == ')') {

-				parser->paren_count--;

-				if (parser->paren_count == 0)

-					parser->newline_as_space = 0;

-			} else if (ret == NEWLINE) {

-				ret = SPACE;

-			} else if (ret != SPACE) {

-				if (parser->paren_count == 0)

-					parser->newline_as_space = 0;

-			}

-		}

-		else if (parser->in_control_line)

-		{

-			if (ret == NEWLINE)

-				parser->in_control_line = 0;

-		}

-		else if (ret == HASH_DEFINE_OBJ || ret == HASH_DEFINE_FUNC ||

-			   ret == HASH_UNDEF || ret == HASH_IF ||

-			   ret == HASH_IFDEF || ret == HASH_IFNDEF ||

-			   ret == HASH_ELIF || ret == HASH_ELSE ||

-			   ret == HASH_ENDIF || ret == HASH)

-		{

-			parser->in_control_line = 1;

-		}

-		else if (ret == IDENTIFIER)

-		{

-			macro_t *macro;

-			macro = hash_table_find (parser->defines,

-						 yylval->str);

-			if (macro && macro->is_function) {

-				parser->newline_as_space = 1;

-				parser->paren_count = 0;

-			}

-		}

-

-		return ret;

-	}

-

-	node = parser->lex_from_node;

-

-	if (node == NULL) {

-		ralloc_free (parser->lex_from_list);

-		parser->lex_from_list = NULL;

-		return NEWLINE;

-	}

-

-	*yylval = node->token->value;

-	ret = node->token->type;

-

-	parser->lex_from_node = node->next;

-

-	return ret;

-}

-

-static void

-glcpp_parser_lex_from (glcpp_parser_t *parser, token_list_t *list)

-{

-	token_node_t *node;

-

-	assert (parser->lex_from_list == NULL);

-

-	/* Copy list, eliminating any space tokens. */

-	parser->lex_from_list = _token_list_create (parser);

-

-	for (node = list->head; node; node = node->next) {

-		if (node->token->type == SPACE)

-			continue;

-		_token_list_append (parser->lex_from_list, node->token);

-	}

-

-	ralloc_free (list);

-

-	parser->lex_from_node = parser->lex_from_list->head;

-

-	/* It's possible the list consisted of nothing but whitespace. */

-	if (parser->lex_from_node == NULL) {

-		ralloc_free (parser->lex_from_list);

-		parser->lex_from_list = NULL;

-	}

-}

-

-static void

-_glcpp_parser_skip_stack_push_if (glcpp_parser_t *parser, YYLTYPE *loc,

-				  int condition)

-{

-	skip_type_t current = SKIP_NO_SKIP;

-	skip_node_t *node;

-

-	if (parser->skip_stack)

-		current = parser->skip_stack->type;

-

-	node = ralloc (parser, skip_node_t);

-	node->loc = *loc;

-

-	if (current == SKIP_NO_SKIP) {

-		if (condition)

-			node->type = SKIP_NO_SKIP;

-		else

-			node->type = SKIP_TO_ELSE;

-	} else {

-		node->type = SKIP_TO_ENDIF;

-	}

-

-	node->next = parser->skip_stack;

-	parser->skip_stack = node;

-}

-

-static void

-_glcpp_parser_skip_stack_change_if (glcpp_parser_t *parser, YYLTYPE *loc,

-				    const char *type, int condition)

-{

-	if (parser->skip_stack == NULL) {

-		glcpp_error (loc, parser, "%s without #if\n", type);

-		return;

-	}

-

-	if (parser->skip_stack->type == SKIP_TO_ELSE) {

-		if (condition)

-			parser->skip_stack->type = SKIP_NO_SKIP;

-	} else {

-		parser->skip_stack->type = SKIP_TO_ENDIF;

-	}

-}

-

-static void

-_glcpp_parser_skip_stack_pop (glcpp_parser_t *parser, YYLTYPE *loc)

-{

-	skip_node_t *node;

-

-	if (parser->skip_stack == NULL) {

-		glcpp_error (loc, parser, "#endif without #if\n");

-		return;

-	}

-

-	node = parser->skip_stack;

-	parser->skip_stack = node->next;

-	ralloc_free (node);

-}

-

diff --git a/mesalib/src/glsl/glcpp/glcpp-parse.h b/mesalib/src/glsl/glcpp/glcpp-parse.h
deleted file mode 100644
index e51f0bcf0..000000000
--- a/mesalib/src/glsl/glcpp/glcpp-parse.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* A Bison parser, made by GNU Bison 2.4.3.  */

-

-/* Skeleton interface for Bison's Yacc-like parsers in C

-   

-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,

-   2009, 2010 Free Software Foundation, Inc.

-   

-   This program is free software: you can redistribute it and/or modify

-   it under the terms of the GNU General Public License as published by

-   the Free Software Foundation, either version 3 of the License, or

-   (at your option) any later version.

-   

-   This program is distributed in the hope that it will be useful,

-   but WITHOUT ANY WARRANTY; without even the implied warranty of

-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-   GNU General Public License for more details.

-   

-   You should have received a copy of the GNU General Public License

-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

-

-/* As a special exception, you may create a larger work that contains

-   part or all of the Bison parser skeleton and distribute that work

-   under terms of your choice, so long as that work isn't itself a

-   parser generator using the skeleton or a modified version thereof

-   as a parser skeleton.  Alternatively, if you modify or redistribute

-   the parser skeleton itself, you may (at your option) remove this

-   special exception, which will cause the skeleton and the resulting

-   Bison output files to be licensed under the GNU General Public

-   License without this special exception.

-   

-   This special exception was added by the Free Software Foundation in

-   version 2.2 of Bison.  */

-

-

-/* Tokens.  */

-#ifndef YYTOKENTYPE

-# define YYTOKENTYPE

-   /* Put the tokens into the symbol table, so that GDB and other debuggers

-      know about them.  */

-   enum yytokentype {

-     COMMA_FINAL = 258,

-     DEFINED = 259,

-     ELIF_EXPANDED = 260,

-     HASH = 261,

-     HASH_DEFINE_FUNC = 262,

-     HASH_DEFINE_OBJ = 263,

-     HASH_ELIF = 264,

-     HASH_ELSE = 265,

-     HASH_ENDIF = 266,

-     HASH_IF = 267,

-     HASH_IFDEF = 268,

-     HASH_IFNDEF = 269,

-     HASH_UNDEF = 270,

-     HASH_VERSION = 271,

-     IDENTIFIER = 272,

-     IF_EXPANDED = 273,

-     INTEGER = 274,

-     INTEGER_STRING = 275,

-     NEWLINE = 276,

-     OTHER = 277,

-     PLACEHOLDER = 278,

-     SPACE = 279,

-     PASTE = 280,

-     OR = 281,

-     AND = 282,

-     NOT_EQUAL = 283,

-     EQUAL = 284,

-     GREATER_OR_EQUAL = 285,

-     LESS_OR_EQUAL = 286,

-     RIGHT_SHIFT = 287,

-     LEFT_SHIFT = 288,

-     UNARY = 289

-   };

-#endif

-

-

-

-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED

-

-# define yystype YYSTYPE /* obsolescent; will be withdrawn */

-# define YYSTYPE_IS_DECLARED 1

-#endif

-

-

-

-#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED

-typedef struct YYLTYPE

-{

-  int first_line;

-  int first_column;

-  int last_line;

-  int last_column;

-} YYLTYPE;

-# define yyltype YYLTYPE /* obsolescent; will be withdrawn */

-# define YYLTYPE_IS_DECLARED 1

-# define YYLTYPE_IS_TRIVIAL 1

-#endif

-

-

-

diff --git a/mesalib/src/glsl/glsl_lexer.cpp b/mesalib/src/glsl/glsl_lexer.cpp
deleted file mode 100644
index ef9d0178f..000000000
--- a/mesalib/src/glsl/glsl_lexer.cpp
+++ /dev/null
@@ -1,3726 +0,0 @@
-#line 2 "glsl_lexer.cpp"

-

-#line 4 "glsl_lexer.cpp"

-

-#define  YY_INT_ALIGNED short int

-

-/* A lexical scanner generated by flex */

-

-#define FLEX_SCANNER

-#define YY_FLEX_MAJOR_VERSION 2

-#define YY_FLEX_MINOR_VERSION 5

-#define YY_FLEX_SUBMINOR_VERSION 35

-#if YY_FLEX_SUBMINOR_VERSION > 0

-#define FLEX_BETA

-#endif

-

-/* First, we deal with  platform-specific or compiler-specific issues. */

-

-/* begin standard C headers. */

-#include <stdio.h>

-#include <string.h>

-#include <errno.h>

-#include <stdlib.h>

-

-/* end standard C headers. */

-

-/* flex integer type definitions */

-

-#ifndef FLEXINT_H

-#define FLEXINT_H

-

-/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */

-

-#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L

-

-/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,

- * if you want the limit (max/min) macros for int types. 

- */

-#ifndef __STDC_LIMIT_MACROS

-#define __STDC_LIMIT_MACROS 1

-#endif

-

-#include <inttypes.h>

-typedef int8_t flex_int8_t;

-typedef uint8_t flex_uint8_t;

-typedef int16_t flex_int16_t;

-typedef uint16_t flex_uint16_t;

-typedef int32_t flex_int32_t;

-typedef uint32_t flex_uint32_t;

-#else

-typedef signed char flex_int8_t;

-typedef short int flex_int16_t;

-typedef int flex_int32_t;

-typedef unsigned char flex_uint8_t; 

-typedef unsigned short int flex_uint16_t;

-typedef unsigned int flex_uint32_t;

-#endif /* ! C99 */

-

-/* Limits of integral types. */

-#ifndef INT8_MIN

-#define INT8_MIN               (-128)

-#endif

-#ifndef INT16_MIN

-#define INT16_MIN              (-32767-1)

-#endif

-#ifndef INT32_MIN

-#define INT32_MIN              (-2147483647-1)

-#endif

-#ifndef INT8_MAX

-#define INT8_MAX               (127)

-#endif

-#ifndef INT16_MAX

-#define INT16_MAX              (32767)

-#endif

-#ifndef INT32_MAX

-#define INT32_MAX              (2147483647)

-#endif

-#ifndef UINT8_MAX

-#define UINT8_MAX              (255U)

-#endif

-#ifndef UINT16_MAX

-#define UINT16_MAX             (65535U)

-#endif

-#ifndef UINT32_MAX

-#define UINT32_MAX             (4294967295U)

-#endif

-

-#endif /* ! FLEXINT_H */

-

-#ifdef __cplusplus

-

-/* The "const" storage-class-modifier is valid. */

-#define YY_USE_CONST

-

-#else	/* ! __cplusplus */

-

-/* C99 requires __STDC__ to be defined as 1. */

-#if defined (__STDC__)

-

-#define YY_USE_CONST

-

-#endif	/* defined (__STDC__) */

-#endif	/* ! __cplusplus */

-

-#ifdef YY_USE_CONST

-#define yyconst const

-#else

-#define yyconst

-#endif

-

-/* Returned upon end-of-file. */

-#define YY_NULL 0

-

-/* Promotes a possibly negative, possibly signed char to an unsigned

- * integer for use as an array index.  If the signed char is negative,

- * we want to instead treat it as an 8-bit unsigned char, hence the

- * double cast.

- */

-#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)

-

-/* An opaque pointer. */

-#ifndef YY_TYPEDEF_YY_SCANNER_T

-#define YY_TYPEDEF_YY_SCANNER_T

-typedef void* yyscan_t;

-#endif

-

-/* For convenience, these vars (plus the bison vars far below)

-   are macros in the reentrant scanner. */

-#define yyin yyg->yyin_r

-#define yyout yyg->yyout_r

-#define yyextra yyg->yyextra_r

-#define yyleng yyg->yyleng_r

-#define yytext yyg->yytext_r

-#define yylineno (YY_CURRENT_BUFFER_LVALUE->yy_bs_lineno)

-#define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column)

-#define yy_flex_debug yyg->yy_flex_debug_r

-

-/* Enter a start condition.  This macro really ought to take a parameter,

- * but we do it the disgusting crufty way forced on us by the ()-less

- * definition of BEGIN.

- */

-#define BEGIN yyg->yy_start = 1 + 2 *

-

-/* Translate the current start state into a value that can be later handed

- * to BEGIN to return to the state.  The YYSTATE alias is for lex

- * compatibility.

- */

-#define YY_START ((yyg->yy_start - 1) / 2)

-#define YYSTATE YY_START

-

-/* Action number for EOF rule of a given start state. */

-#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)

-

-/* Special action meaning "start processing a new file". */

-#define YY_NEW_FILE _mesa_glsl_restart(yyin ,yyscanner )

-

-#define YY_END_OF_BUFFER_CHAR 0

-

-/* Size of default input buffer. */

-#ifndef YY_BUF_SIZE

-#define YY_BUF_SIZE 16384

-#endif

-

-/* The state buf must be large enough to hold one state per character in the main buffer.

- */

-#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))

-

-#ifndef YY_TYPEDEF_YY_BUFFER_STATE

-#define YY_TYPEDEF_YY_BUFFER_STATE

-typedef struct yy_buffer_state *YY_BUFFER_STATE;

-#endif

-

-#define EOB_ACT_CONTINUE_SCAN 0

-#define EOB_ACT_END_OF_FILE 1

-#define EOB_ACT_LAST_MATCH 2

-

-    #define YY_LESS_LINENO(n)

-    

-/* Return all but the first "n" matched characters back to the input stream. */

-#define yyless(n) \

-	do \

-		{ \

-		/* Undo effects of setting up yytext. */ \

-        int yyless_macro_arg = (n); \

-        YY_LESS_LINENO(yyless_macro_arg);\

-		*yy_cp = yyg->yy_hold_char; \

-		YY_RESTORE_YY_MORE_OFFSET \

-		yyg->yy_c_buf_p = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \

-		YY_DO_BEFORE_ACTION; /* set up yytext again */ \

-		} \

-	while ( 0 )

-

-#define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner )

-

-#ifndef YY_TYPEDEF_YY_SIZE_T

-#define YY_TYPEDEF_YY_SIZE_T

-typedef size_t yy_size_t;

-#endif

-

-#ifndef YY_STRUCT_YY_BUFFER_STATE

-#define YY_STRUCT_YY_BUFFER_STATE

-struct yy_buffer_state

-	{

-	FILE *yy_input_file;

-

-	char *yy_ch_buf;		/* input buffer */

-	char *yy_buf_pos;		/* current position in input buffer */

-

-	/* Size of input buffer in bytes, not including room for EOB

-	 * characters.

-	 */

-	yy_size_t yy_buf_size;

-

-	/* Number of characters read into yy_ch_buf, not including EOB

-	 * characters.

-	 */

-	int yy_n_chars;

-

-	/* Whether we "own" the buffer - i.e., we know we created it,

-	 * and can realloc() it to grow it, and should free() it to

-	 * delete it.

-	 */

-	int yy_is_our_buffer;

-

-	/* Whether this is an "interactive" input source; if so, and

-	 * if we're using stdio for input, then we want to use getc()

-	 * instead of fread(), to make sure we stop fetching input after

-	 * each newline.

-	 */

-	int yy_is_interactive;

-

-	/* Whether we're considered to be at the beginning of a line.

-	 * If so, '^' rules will be active on the next match, otherwise

-	 * not.

-	 */

-	int yy_at_bol;

-

-    int yy_bs_lineno; /**< The line count. */

-    int yy_bs_column; /**< The column count. */

-    

-	/* Whether to try to fill the input buffer when we reach the

-	 * end of it.

-	 */

-	int yy_fill_buffer;

-

-	int yy_buffer_status;

-

-#define YY_BUFFER_NEW 0

-#define YY_BUFFER_NORMAL 1

-	/* When an EOF's been seen but there's still some text to process

-	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we

-	 * shouldn't try reading from the input source any more.  We might

-	 * still have a bunch of tokens to match, though, because of

-	 * possible backing-up.

-	 *

-	 * When we actually see the EOF, we change the status to "new"

-	 * (via _mesa_glsl_restart()), so that the user can continue scanning by

-	 * just pointing yyin at a new input file.

-	 */

-#define YY_BUFFER_EOF_PENDING 2

-

-	};

-#endif /* !YY_STRUCT_YY_BUFFER_STATE */

-

-/* We provide macros for accessing buffer states in case in the

- * future we want to put the buffer states in a more general

- * "scanner state".

- *

- * Returns the top of the stack, or NULL.

- */

-#define YY_CURRENT_BUFFER ( yyg->yy_buffer_stack \

-                          ? yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] \

-                          : NULL)

-

-/* Same as previous macro, but useful when we know that the buffer stack is not

- * NULL or when we need an lvalue. For internal use only.

- */

-#define YY_CURRENT_BUFFER_LVALUE yyg->yy_buffer_stack[yyg->yy_buffer_stack_top]

-

-void _mesa_glsl_restart (FILE *input_file ,yyscan_t yyscanner );

-void _mesa_glsl__switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );

-YY_BUFFER_STATE _mesa_glsl__create_buffer (FILE *file,int size ,yyscan_t yyscanner );

-void _mesa_glsl__delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );

-void _mesa_glsl__flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );

-void _mesa_glsl_push_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );

-void _mesa_glsl_pop_buffer_state (yyscan_t yyscanner );

-

-static void _mesa_glsl_ensure_buffer_stack (yyscan_t yyscanner );

-static void _mesa_glsl__load_buffer_state (yyscan_t yyscanner );

-static void _mesa_glsl__init_buffer (YY_BUFFER_STATE b,FILE *file ,yyscan_t yyscanner );

-

-#define YY_FLUSH_BUFFER _mesa_glsl__flush_buffer(YY_CURRENT_BUFFER ,yyscanner)

-

-YY_BUFFER_STATE _mesa_glsl__scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner );

-YY_BUFFER_STATE _mesa_glsl__scan_string (yyconst char *yy_str ,yyscan_t yyscanner );

-YY_BUFFER_STATE _mesa_glsl__scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner );

-

-void *_mesa_glsl_alloc (yy_size_t ,yyscan_t yyscanner );

-void *_mesa_glsl_realloc (void *,yy_size_t ,yyscan_t yyscanner );

-void _mesa_glsl_free (void * ,yyscan_t yyscanner );

-

-#define yy_new_buffer _mesa_glsl__create_buffer

-

-#define yy_set_interactive(is_interactive) \

-	{ \

-	if ( ! YY_CURRENT_BUFFER ){ \

-        _mesa_glsl_ensure_buffer_stack (yyscanner); \

-		YY_CURRENT_BUFFER_LVALUE =    \

-            _mesa_glsl__create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \

-	} \

-	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \

-	}

-

-#define yy_set_bol(at_bol) \

-	{ \

-	if ( ! YY_CURRENT_BUFFER ){\

-        _mesa_glsl_ensure_buffer_stack (yyscanner); \

-		YY_CURRENT_BUFFER_LVALUE =    \

-            _mesa_glsl__create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \

-	} \

-	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \

-	}

-

-#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)

-

-/* Begin user sect3 */

-

-#define _mesa_glsl_wrap(n) 1

-#define YY_SKIP_YYWRAP

-

-typedef unsigned char YY_CHAR;

-

-typedef int yy_state_type;

-

-#define yytext_ptr yytext_r

-

-static yy_state_type yy_get_previous_state (yyscan_t yyscanner );

-static yy_state_type yy_try_NUL_trans (yy_state_type current_state  ,yyscan_t yyscanner);

-static int yy_get_next_buffer (yyscan_t yyscanner );

-static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner );

-

-/* Done after the current pattern has been matched and before the

- * corresponding action - sets up yytext.

- */

-#define YY_DO_BEFORE_ACTION \

-	yyg->yytext_ptr = yy_bp; \

-	yyleng = (size_t) (yy_cp - yy_bp); \

-	yyg->yy_hold_char = *yy_cp; \

-	*yy_cp = '\0'; \

-	yyg->yy_c_buf_p = yy_cp;

-

-#define YY_NUM_RULES 210

-#define YY_END_OF_BUFFER 211

-/* This struct is not used in this scanner,

-   but its presence is necessary. */

-struct yy_trans_info

-	{

-	flex_int32_t yy_verify;

-	flex_int32_t yy_nxt;

-	};

-static yyconst flex_int16_t yy_accept[836] =

-    {   0,

-        0,    0,   16,   16,    0,    0,  211,  209,    1,   21,

-      209,  209,  209,  209,  209,  209,  209,  209,  120,  118,

-      209,  209,  209,  208,  209,  208,  208,  208,  208,  208,

-      208,  208,  208,  208,  208,  208,  208,  208,  208,  208,

-      208,  208,  208,  208,  208,  209,    1,  209,  210,   16,

-       20,  210,   19,   17,   18,   14,   13,    1,  102,  111,

-      103,  114,  108,   97,  110,   98,  117,  122,  109,  123,

-      120,    0,    0,  125,  120,    0,  118,  118,  106,   99,

-      101,  100,  107,  208,  115,  105,  208,  208,  208,  208,

-      208,  208,  208,  208,  208,  208,  208,  208,   30,  208,

-

-      208,  208,  208,  208,  208,  208,  208,  208,  208,  208,

-      208,  208,   34,  208,  208,   61,  208,  208,  208,  208,

-      208,  208,  208,  208,  208,  208,  208,  208,  208,  208,

-      208,  208,  208,  208,  208,  208,  208,  208,  208,  208,

-      208,  208,  208,  208,  208,  208,  208,  208,  208,  116,

-      104,    1,    0,    0,    2,    0,    0,    0,    0,   16,

-       15,   19,   18,    0,  122,  121,    0,  123,    0,  124,

-      119,  112,  113,  208,  128,  208,  208,  208,  208,  208,

-      208,  208,  208,  208,  208,  208,  208,  208,  208,  208,

-      208,  208,  208,  208,  208,  208,   33,  208,  208,  208,

-

-      208,  208,  208,  208,  208,  208,  208,   26,  208,  208,

-      208,  208,  208,  208,  208,  208,  208,  208,  208,   62,

-      208,  208,  208,  208,  208,  208,  208,  208,  208,  208,

-      208,  208,  208,  208,  208,  208,  208,  208,  208,  208,

-      208,  208,  208,  208,  208,  208,  208,  208,  208,  208,

-        0,    0,    0,    0,   15,    0,  122,    0,  121,    0,

-      123,  124,  119,  208,  208,   24,  208,  208,  175,  168,

-      208,  208,  208,  208,  208,  208,  208,  208,  208,   32,

-      131,  208,  208,  208,  208,   68,  208,  208,  136,  150,

-      208,  208,  208,  208,  208,  208,  208,  208,  208,  208,

-

-      208,  208,  147,  171,   49,   50,   51,  208,  208,  208,

-      208,  208,  208,  208,  208,  208,  208,  208,  208,  208,

-      208,  208,  208,  208,  208,  208,  208,  134,  126,  208,

-      208,   27,  208,  208,  208,  208,  208,  208,  208,   46,

-       47,   48,   95,  208,  208,    0,    0,    0,    0,    0,

-      121,  208,  208,   28,   37,   38,   39,  208,  129,  208,

-       23,  208,  208,  208,  208,  158,  159,  160,  208,  127,

-      208,  151,   25,  161,  162,  163,  173,  155,  156,  157,

-      208,  208,  208,   63,  153,  208,  208,  208,   40,   41,

-       42,  208,  208,  208,  208,  208,  208,  208,  208,  208,

-

-      208,  208,  208,  208,  208,  208,  208,  148,  208,  208,

-      208,  208,  208,  208,  208,  208,  208,  208,  130,  208,

-      208,  170,   43,   44,   45,  208,  208,   31,    0,    0,

-        0,    0,  178,  208,  208,  176,  208,  208,  208,  149,

-      144,  181,  208,  208,  208,  208,  208,  208,  139,  208,

-      208,  208,   96,   52,   53,   54,   55,   56,   57,   58,

-       59,   60,  208,  208,  208,  208,  154,  135,  208,  208,

-      142,   36,  208,  208,  167,   69,  143,   94,  179,  137,

-      208,  208,  208,  208,  208,  208,  208,  208,    0,    0,

-        0,    0,  208,  208,  208,  138,   35,  208,  208,  208,

-

-      208,  208,  208,  182,  183,  184,  208,  208,  208,  208,

-      208,  172,  208,  208,  208,  208,  208,  208,  208,  208,

-      132,  208,  208,  208,  208,  208,   64,  208,  208,   65,

-      208,    0,    0,    0,    0,    0,  208,   66,   29,  145,

-      186,  187,  188,  208,  208,  208,  208,  208,  208,  208,

-      208,  208,  208,  208,  208,  140,  208,  208,  208,  208,

-      208,  208,  208,  208,  208,  133,  190,  191,  192,  208,

-      208,  152,  208,  141,    0,    0,    6,    0,    0,    0,

-       12,    3,   22,  208,  208,  208,  208,  208,  208,  208,

-      208,  208,  185,  146,   67,  208,  208,  208,  208,  169,

-

-      208,  177,  174,  207,   71,   72,   73,  208,  208,  208,

-      208,  208,  208,  208,  208,  208,  208,    0,    0,    0,

-        0,    0,    0,    0,  208,  208,  208,  189,  208,  208,

-      208,  208,  208,   82,   83,   84,  208,  208,  208,  208,

-      208,  208,  208,  208,  208,  208,  208,  208,  208,  193,

-       88,   89,   90,  208,    4,    0,    5,    0,    0,    0,

-        0,    0,    0,  208,  208,  208,  208,  208,  208,  208,

-      204,  208,  208,  208,  208,  208,  208,  208,  208,  208,

-      208,  208,   74,  208,  208,  208,  208,  208,  208,    0,

-        0,    0,    0,  208,  208,  205,  194,  208,  195,  208,

-

-      208,  208,   85,  208,  208,  208,  208,  208,  208,  208,

-      208,  208,  208,  208,  206,  208,  208,   91,    0,    0,

-        0,  196,  197,  208,  200,  208,  201,  208,  208,   70,

-      208,  208,  208,  164,  208,  165,  180,  208,  198,  199,

-      208,  208,    0,    0,    0,  208,  208,  208,  208,   75,

-      208,   76,  208,  208,  208,  208,  208,    0,    0,    0,

-        0,  208,  208,   86,   87,  208,   77,  208,  208,   78,

-      208,   92,   93,    0,    0,    0,    0,  208,  208,  208,

-      208,  208,  208,    0,    0,    0,    0,  208,  208,  208,

-      208,  208,   79,    0,    0,    0,    7,    0,    0,  202,

-

-      203,  208,  208,  208,    0,    0,    8,    0,    0,  208,

-      208,  166,    0,    0,    0,   80,   81,    0,    0,    0,

-        9,    0,    0,   10,    0,    0,    0,    0,    0,    0,

-        0,    0,    0,   11,    0

-    } ;

-

-static yyconst flex_int32_t yy_ec[256] =

-    {   0,

-        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,

-        1,    1,    4,    1,    1,    1,    1,    1,    1,    1,

-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,

-        1,    2,    5,    1,    6,    1,    7,    8,    1,    9,

-       10,   11,   12,    1,   13,   14,   15,   16,   17,   18,

-       19,   20,   21,   21,   21,   22,   22,   23,    1,   24,

-       25,   26,    1,    1,   27,   28,   29,   30,   31,   32,

-       33,   34,   34,   34,   34,   35,   34,   34,   34,   34,

-       34,   36,   37,   38,   39,   34,   34,   40,   34,   34,

-        1,    1,    1,   41,   42,    1,   43,   44,   45,   46,

-

-       47,   48,   49,   50,   51,   52,   53,   54,   55,   56,

-       57,   58,   34,   59,   60,   61,   62,   63,   64,   65,

-       66,   67,    1,   68,    1,    1,    1,    1,    1,    1,

-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,

-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,

-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,

-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,

-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,

-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,

-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,

-

-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,

-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,

-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,

-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,

-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,

-        1,    1,    1,    1,    1

-    } ;

-

-static yyconst flex_int32_t yy_meta[69] =

-    {   0,

-        1,    1,    2,    1,    1,    1,    1,    1,    1,    1,

-        1,    1,    1,    1,    1,    3,    3,    3,    3,    3,

-        3,    3,    1,    1,    1,    1,    4,    4,    4,    4,

-        3,    3,    5,    5,    5,    5,    5,    5,    5,    5,

-        1,    5,    4,    4,    4,    4,    3,    3,    5,    5,

-        5,    5,    5,    5,    5,    5,    5,    5,    5,    5,

-        5,    5,    5,    5,    5,    5,    5,    1

-    } ;

-

-static yyconst flex_int16_t yy_base[845] =

-    {   0,

-        0,   67,   73,    0, 1210, 1209, 1211, 1214,   68, 1214,

-     1185, 1184,  134, 1183,  131,  132,  130, 1182,  146,  198,

-      129, 1181,  144,    0,  130,  113,  124,  141,  150,  126,

-      181, 1148,  159,  192,  118,  129,  146, 1142,  147,  174,

-      206,  192,  203,  222, 1153,  203,  221,  231, 1214,  260,

-     1214, 1187,  279, 1214,    0, 1214, 1214,  270, 1214, 1214,

-     1214, 1214, 1214, 1214, 1214, 1214, 1214,  244, 1214,  255,

-      139,  290,  307, 1214, 1214,    0,    0, 1214, 1176, 1214,

-     1214, 1214, 1175,    0, 1214, 1214, 1138, 1143, 1136, 1139,

-     1148, 1147, 1133, 1136, 1148,  144, 1142, 1129, 1126, 1140,

-

-     1126, 1123, 1123, 1129,  219,  193, 1123, 1134, 1119, 1125,

-     1129, 1130,    0, 1121, 1132,  278, 1131, 1126, 1106,  224,

-     1110, 1124, 1114,  232, 1107,  271, 1120, 1122, 1104, 1100,

-     1108, 1105, 1094, 1103,  234, 1101, 1107, 1102, 1105, 1093,

-     1096,  226,  145,  262, 1106, 1093, 1106,  263, 1099, 1214,

-     1214,  338,  331,  343, 1214, 1084, 1097, 1088, 1099,  345,

-        0,  334,    0,  345, 1214,  328,  391, 1214,  352,  398,

-      338, 1214, 1214, 1094,    0, 1085, 1089, 1099, 1096,  332,

-     1079, 1079, 1083,  320, 1094, 1091, 1091, 1089, 1086, 1077,

-     1084, 1070, 1068, 1081, 1066, 1083,    0, 1080, 1067, 1075,

-

-     1072, 1076, 1077, 1070, 1067, 1055, 1054, 1068, 1071, 1058,

-     1067, 1054, 1061, 1051,  364, 1057, 1060, 1050, 1058, 1046,

-     1050, 1041, 1056, 1046, 1037, 1056, 1039, 1037, 1048, 1037,

-     1032, 1030, 1044, 1029, 1031, 1028, 1040, 1039, 1042, 1023,

-      338, 1032, 1027, 1025, 1035, 1013,  403, 1032, 1034, 1022,

-     1014, 1018, 1030, 1013,    0,  415,  422,  439, 1214,  446,

-      455, 1214, 1214, 1008, 1019,    0, 1016,  406,    0,    0,

-     1009, 1007, 1009, 1004, 1013, 1001, 1019, 1007,  409,    0,

-        0, 1001, 1012, 1011, 1011,    0,  995,  429,    0,    0,

-      997,  460, 1005, 1006,  996,  990,  989,  990,  989,  989,

-

-      463,  984,    0,    0,  980,  979,  978,  980,  981,  986,

-      980,  976,  990,  985,  984,  983,  974,  977,  977,  969,

-      972,  967,  976,  981,  966,  979,  969,    0,    0,  976,

-      972,    0,  963,  963,  969,  959,  967,  466,  964,    0,

-        0,    0,    0,  953,  966,  965,  964,  961,  949,  472,

-      479,  961,  963,    0,    0,    0,    0,  949,    0,  949,

-        0,  948,  949,  943,  954,    0,    0,    0,  944,    0,

-      940,    0,    0,    0,    0,    0,    0,    0,    0,    0,

-      951,  487,  950,    0,    0,  948,  944,  940,    0,    0,

-        0,  932,  489,  494,  499,  937,  933,  939,  929,  927,

-

-      941,  925,  925,  939,  927,  939,  934,    0,  932,  929,

-      933,  916,  918,  925,  931,  926,  925,  912,    0,  914,

-      915,    0,    0,    0,    0,  912,  916,    0,  910,  963,

-      909,  912,    0,  900,  910,    0,  898,  898,  912,    0,

-      914,    0,  503,  926,  925,  924,  891,  890,    0,  908,

-      907,  902,    0,    0,    0,    0,    0,    0,    0,    0,

-        0,    0,  890,  904,  890,  887,    0,    0,  893,  892,

-        0,    0,  890,  882,    0,    0,    0,    0,    0,    0,

-      879,  891,  506,  883,  890,  889,  886,  880,  873,  524,

-      889,  874,  869,  883,  881,    0,    0,  873,  896,  895,

-

-      894,  861,  860,  361,  365,    0,  873,  876,  874,  862,

-      858,    0,  871,  868,  867,  856,  855,  854,  519,  863,

-        0,  879,  878,  877,  844,  843,    0,  858,  844,    0,

-      855,  850,  547,  553,  898,  843,  851,    0,    0,    0,

-      870,  869,    0,  847,  850,  834,  842,  832,  840,  841,

-      841,  840,  825,  559,  838,    0,  839,  827,  826,  822,

-      850,  849,  848,  815,  814,    0,  848,  847,    0,  825,

-      828,    0,  562,    0,  814,  580, 1214,  587,    0,  607,

-      584, 1214,    0,  811,  810,  820,  820,  807,  822,  805,

-      820,  815,    0,    0,    0,  831,  830,  829,  796,    0,

-

-      796,    0,    0,    0,  502,  524,  820,  807,  810,  794,

-      793,  803,  803,  819,  818,  817,  784,  789,  615,  640,

-      550,  806,  796,  784,  782,  781,  792,    0,  795,  791,

-      793,  789,  775,  806,  805,    0,  787,  779,  770,  778,

-      768,  779,  775,  777,  775,  775,  762,  761,  772,    0,

-      791,  790,    0,  772, 1214,  555, 1214,  647,    0,  667,

-      785,  770,  752,  769,  768,  751,  743,  751,  741,  749,

-        0,  746,  745,  756,  739,  742,  757,  740,  753,  754,

-      751,  748,  757,  750,  749,  732,  731,  730,  741,  582,

-      754,  724,  734,  718,  717,    0,  745,  717,  743,  715,

-

-      719,  718,    0,  729,  732,  728,  730,  711,  725,  709,

-      710,  718,  701,  700,    0,  706,  705,    0,  728,  713,

-      706,    0,    0,  710,    0,  709,    0,  715,  714,    0,

-      690,  698,  688,  716,  695,    0,    0,  708,    0,    0,

-      707,  706,  746,  611,  696,  703,  702,  678,  677,  705,

-      677,  703,  689,  674,  691,  670,  669,  190,  613,  557,

-      667,  687,  686,    0,    0,  681,    0,  680,  686,    0,

-      671,    0,    0,  671,  590,  343,  672,  645,  644,  654,

-      635,  631,  612,  612,  604,  443,  635,  576,  575,  549,

-       25,   87,    0,  183,  500,  552, 1214,  636,  591,    0,

-

-        0,  196,  258,  254,  272,  609, 1214,  614,  598,  279,

-      284,    0,  336,  348,  671,    0,    0,  362,  672,  688,

-     1214,  394,  689, 1214,  408,  670,  691,  649,  651,  474,

-      476,  693,  694, 1214, 1214,  704,  707,  710,  530,  591,

-      713,  717,  720,  722

-    } ;

-

-static yyconst flex_int16_t yy_def[845] =

-    {   0,

-      835,    1,  835,    3,  836,  836,  835,  835,  835,  835,

-      835,  835,  835,  835,  835,  835,  835,  835,  835,  835,

-      835,  835,  835,  837,  835,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  835,  835,  835,  835,  835,

-      835,  835,  835,  835,  838,  835,  835,  835,  835,  835,

-      835,  835,  835,  835,  835,  835,  835,  839,  835,  840,

-       19,  835,  835,  835,  835,  841,   20,  835,  835,  835,

-      835,  835,  835,  837,  835,  835,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  835,

-      835,  835,  835,  835,  835,  835,  835,  835,  835,  835,

-      842,  835,  838,  835,  835,  840,  835,  835,  835,  835,

-      841,  835,  835,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      835,  835,  835,  835,  842,  835,  835,  835,  835,  835,

-      835,  835,  835,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  835,  835,  835,  835,  835,

-      835,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  835,  835,

-      835,  835,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  835,  835,

-      835,  835,  837,  837,  837,  837,  837,  837,  837,  837,

-

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  835,  835,  835,  835,  835,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  835,  835,  835,  835,  843,  835,

-      835,  835,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  835,  835,  835,

-      843,  835,  835,  835,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  835,  835,  835,  835,  844,  835,

-      835,  835,  835,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  844,

-      835,  835,  835,  837,  837,  837,  837,  837,  837,  837,

-

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  835,  835,

-      835,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  835,  835,  835,  837,  837,  837,  837,  837,

-      837,  837,  837,  837,  837,  837,  837,  835,  835,  835,

-      835,  837,  837,  837,  837,  837,  837,  837,  837,  837,

-      837,  837,  837,  835,  835,  835,  835,  837,  837,  837,

-      837,  837,  837,  835,  835,  835,  835,  837,  837,  837,

-      837,  837,  837,  835,  835,  835,  835,  835,  835,  837,

-

-      837,  837,  837,  837,  835,  835,  835,  835,  835,  837,

-      837,  837,  835,  835,  835,  837,  837,  835,  835,  835,

-      835,  835,  835,  835,  835,  835,  835,  835,  835,  835,

-      835,  835,  835,  835,    0,  835,  835,  835,  835,  835,

-      835,  835,  835,  835

-    } ;

-

-static yyconst flex_int16_t yy_nxt[1283] =

-    {   0,

-        8,    9,   10,    9,   11,    8,   12,   13,    8,    8,

-       14,   15,   16,   17,   18,   19,   20,   20,   20,   20,

-       20,   20,    8,   21,   22,   23,   24,   24,   24,   24,

-       24,   24,   24,   24,   24,   24,   24,   24,   24,   24,

-       25,   24,   26,   27,   28,   29,   30,   31,   32,   33,

-       34,   24,   24,   35,   36,   37,   38,   39,   40,   41,

-       42,   43,   44,   45,   24,   24,   24,   46,   47,   58,

-      803,   58,   48,   49,   50,   51,   50,   49,   49,   49,

-       49,   49,   49,   49,   49,   49,   49,   52,   49,   53,

-       53,   53,   53,   53,   53,   54,   49,   49,   49,   55,

-

-       55,   55,   55,   55,   55,   55,   55,   55,   55,   55,

-       55,   55,   55,   49,   55,   55,   55,   55,   55,   55,

-       55,   55,   55,   55,   55,   55,   55,   55,   55,   55,

-       55,   55,   55,   55,   55,   55,   55,   55,   55,   55,

-       49,   61,   64,  804,   66,   68,   68,   68,   68,   68,

-       68,   68,   79,   80,   85,   65,   67,   87,   62,   70,

-      119,   71,   71,   71,   71,   71,   71,   72,   82,   83,

-       86,  121,   88,   89,  120,  122,   73,   74,  835,  101,

-       90,  102,   91,   93,   75,   76,   92,   94,  123,  126,

-      103,  758,   73,   74,   95,  241,   97,   96,  183,  184,

-

-       98,  110,  124,  835,  242,  127,   99,   75,  128,  111,

-       76,   70,  100,   77,   77,   77,   77,   77,   77,   77,

-      129,  112,  152,  104,   58,  805,  153,  150,   73,   74,

-      130,  105,  154,  155,  106,  195,   78,  107,  138,  113,

-      774,  139,  114,  108,   73,   74,  115,  116,  131,  196,

-      140,  117,  810,  142,  118,  132,  133,  141,  143,   78,

-      134,  160,  144,  160,  146,  145,  135,  136,  147,  137,

-      151,   58,  193,   58,  164,  165,  231,  156,  148,  213,

-      239,  240,  218,  194,  157,  167,  168,  214,  158,  219,

-      164,  165,  232,  159,  162,  162,  162,  162,  162,  162,

-

-      162,  167,  168,   70,  243,   72,   72,   72,   72,   72,

-       72,   72,  244,  248,  811,  221,  249,  812,  169,  169,

-       73,   74,  170,  170,  170,  170,  170,  170,  170,  222,

-      813,  205,  154,  155,  206,  207,   73,   74,  208,  152,

-      209,   58,  816,  153,  154,  155,  160,  817,  160,  162,

-      162,  162,  162,  162,  162,  162,  256,  256,  258,  259,

-      257,  257,  257,  257,  257,  257,  257,  170,  170,  170,

-      170,  170,  170,  170,  258,  259,  263,  156,  269,  274,

-      275,  305,  306,  307,  157,  333,  818,  546,  158,  156,

-      785,  548,  270,  159,  334,  819,  157,  547,  786,  263,

-

-      158,  549,  260,  260,  822,  159,  261,  261,  261,  261,

-      261,  261,  261,  170,  170,  170,  170,  170,  170,  170,

-      340,  341,  342,  355,  356,  357,  366,  367,  368,  262,

-      257,  257,  257,  257,  257,  257,  257,  257,  257,  257,

-      257,  257,  257,  257,  796,  262,  374,  375,  376,  825,

-      350,  350,  797,  165,  351,  351,  351,  351,  351,  351,

-      351,  261,  261,  261,  261,  261,  261,  261,  826,  165,

-      261,  261,  261,  261,  261,  261,  261,  378,  379,  380,

-      389,  390,  391,  423,  424,  425,  168,  351,  351,  351,

-      351,  351,  351,  351,  351,  351,  351,  351,  351,  351,

-

-      351,  806,  168,  444,  445,  446,  454,  455,  456,  807,

-      259,  457,  458,  459,  447,  448,  460,  461,  462,  499,

-      500,  501,  522,  523,  524,  490,  259,  831,  639,  832,

-      502,  503,   68,  525,  526,  561,  562,  563,  640,  533,

-      534,  534,  534,  534,  534,  534,  564,  565,  576,  577,

-      641,  576,  577,  796,  576,  577,  656,  657,  775,  642,

-      643,  797,  578,  578,  578,  578,  578,  578,  580,  580,

-      580,  580,  580,  580,  580,  596,  597,  598,  614,  615,

-      616,  576,  577,  656,  657,  581,  579,  599,  576,  577,

-      617,  775,  808,  166,  802,  619,  620,  620,  620,  620,

-

-      620,  620,  578,  578,  578,  578,  578,  578,  576,  577,

-      806,  579,  759,  776,  759,  808,  656,  657,  807,  760,

-      622,  760,  580,  580,  580,  580,  580,  580,  580,  623,

-      658,  658,  658,  658,  658,  658,  798,  798,  801,  800,

-      624,  656,  657,  799,  799,  814,  776,  809,  656,  657,

-      829,  795,  829,  815,  659,  660,  660,  660,  660,  660,

-      660,  660,  658,  658,  658,  658,  658,  658,  656,  657,

-      809,  827,  820,  823,  794,  793,  792,  791,  828,  659,

-      821,  824,  660,  660,  660,  660,  660,  660,  660,  820,

-      823,  830,  827,  830,  833,  833,  790,  821,  824,  828,

-

-      789,  788,  834,  834,   56,   56,   56,   56,   56,   84,

-       84,   84,  163,  163,  163,  171,  171,  255,  787,  255,

-      255,  255,  621,  621,  690,  690,  784,  783,  782,  781,

-      780,  779,  778,  777,  773,  772,  771,  770,  769,  768,

-      767,  766,  765,  764,  763,  762,  761,  758,  757,  756,

-      755,  754,  753,  752,  751,  750,  749,  748,  747,  746,

-      745,  744,  743,  742,  741,  740,  739,  738,  737,  736,

-      735,  734,  733,  732,  731,  730,  729,  728,  727,  726,

-      725,  724,  723,  722,  721,  720,  719,  718,  717,  716,

-      715,  714,  713,  712,  711,  710,  709,  708,  707,  706,

-

-      705,  704,  703,  702,  701,  700,  699,  698,  697,  696,

-      695,  694,  693,  692,  691,  689,  688,  687,  686,  685,

-      684,  683,  682,  681,  680,  679,  678,  677,  676,  675,

-      674,  673,  672,  671,  670,  669,  668,  667,  666,  665,

-      664,  663,  662,  661,  655,  654,  653,  652,  651,  650,

-      649,  648,  647,  646,  645,  644,  638,  637,  636,  635,

-      634,  633,  632,  631,  630,  629,  628,  627,  626,  625,

-      618,  613,  612,  611,  610,  609,  608,  607,  606,  605,

-      604,  603,  602,  601,  600,  595,  594,  593,  592,  591,

-      590,  589,  588,  587,  586,  585,  584,  583,  582,  581,

-

-      575,  574,  573,  572,  571,  570,  569,  568,  567,  566,

-      560,  559,  558,  557,  556,  555,  554,  553,  552,  551,

-      550,  545,  544,  543,  542,  541,  540,  539,  538,  537,

-      536,  535,  532,  531,  530,  529,  528,  527,  521,  520,

-      519,  518,  517,  516,  515,  514,  513,  512,  511,  510,

-      509,  508,  507,  506,  505,  504,  498,  497,  496,  495,

-      494,  493,  492,  491,  490,  489,  488,  487,  486,  485,

-      484,  483,  482,  481,  480,  479,  478,  477,  476,  475,

-      474,  473,  472,  471,  470,  469,  468,  467,  466,  465,

-      464,  463,  453,  452,  451,  450,  449,  443,  442,  441,

-

-      440,  439,  438,  437,  436,  435,  434,  433,  432,  431,

-      430,  429,  428,  427,  426,  422,  421,  420,  419,  418,

-      417,  416,  415,  414,  413,  412,  411,  410,  409,  408,

-      407,  406,  405,  404,  403,  402,  401,  400,  399,  398,

-      397,  396,  395,  394,  393,  392,  388,  387,  386,  385,

-      384,  383,  382,  381,  377,  373,  372,  371,  370,  369,

-      365,  364,  363,  362,  361,  360,  359,  358,  354,  353,

-      352,  349,  348,  347,  346,  345,  344,  343,  339,  338,

-      337,  336,  335,  332,  331,  330,  329,  328,  327,  326,

-      325,  324,  323,  322,  321,  320,  319,  318,  317,  316,

-

-      315,  314,  313,  312,  311,  310,  309,  308,  304,  303,

-      302,  301,  300,  299,  298,  297,  296,  295,  294,  293,

-      292,  291,  290,  289,  288,  287,  286,  285,  284,  283,

-      282,  281,  280,  279,  278,  277,  276,  273,  272,  271,

-      268,  267,  266,  265,  264,  254,  253,  252,  251,  250,

-      247,  246,  245,  238,  237,  236,  235,  234,  233,  230,

-      229,  228,  227,  226,  225,  224,  223,  220,  217,  216,

-      215,  212,  211,  210,  204,  203,  202,  201,  200,  199,

-      198,  197,  192,  191,  190,  189,  188,  187,  186,  185,

-      182,  181,  180,  179,  178,  177,  176,  175,  174,  173,

-

-      172,  161,  149,  125,  109,   81,   69,   63,   60,   59,

-      835,   57,   57,    7,  835,  835,  835,  835,  835,  835,

-      835,  835,  835,  835,  835,  835,  835,  835,  835,  835,

-      835,  835,  835,  835,  835,  835,  835,  835,  835,  835,

-      835,  835,  835,  835,  835,  835,  835,  835,  835,  835,

-      835,  835,  835,  835,  835,  835,  835,  835,  835,  835,

-      835,  835,  835,  835,  835,  835,  835,  835,  835,  835,

-      835,  835,  835,  835,  835,  835,  835,  835,  835,  835,

-      835,  835

-    } ;

-

-static yyconst flex_int16_t yy_chk[1283] =

-    {   0,

-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,

-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,

-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,

-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,

-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,

-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,

-        1,    1,    1,    1,    1,    1,    1,    1,    2,    9,

-      791,    9,    2,    3,    3,    3,    3,    3,    3,    3,

-        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,

-        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,

-

-        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,

-        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,

-        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,

-        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,

-        3,   13,   15,  792,   16,   17,   17,   17,   17,   17,

-       17,   17,   21,   21,   25,   15,   16,   26,   13,   19,

-       35,   19,   19,   19,   19,   19,   19,   19,   23,   23,

-       25,   36,   26,   26,   35,   36,   19,   19,   71,   30,

-       27,   30,   27,   28,   19,   19,   27,   28,   37,   39,

-       30,  758,   19,   19,   28,  143,   29,   28,   96,   96,

-

-       29,   33,   37,   71,  143,   39,   29,   19,   39,   33,

-       19,   20,   29,   20,   20,   20,   20,   20,   20,   20,

-       40,   33,   47,   31,   47,  794,   47,   46,   20,   20,

-       40,   31,   48,   48,   31,  106,   20,   31,   42,   34,

-      758,   42,   34,   31,   20,   20,   34,   34,   41,  106,

-       42,   34,  802,   43,   34,   41,   41,   42,   43,   20,

-       41,   50,   43,   50,   44,   43,   41,   41,   44,   41,

-       46,   58,  105,   58,   68,   68,  135,   48,   44,  120,

-      142,  142,  124,  105,   48,   70,   70,  120,   48,  124,

-       68,   68,  135,   48,   53,   53,   53,   53,   53,   53,

-

-       53,   70,   70,   72,  144,   72,   72,   72,   72,   72,

-       72,   72,  144,  148,  803,  126,  148,  804,   73,   73,

-       72,   72,   73,   73,   73,   73,   73,   73,   73,  126,

-      805,  116,  153,  153,  116,  116,   72,   72,  116,  152,

-      116,  152,  810,  152,  154,  154,  160,  811,  160,  162,

-      162,  162,  162,  162,  162,  162,  164,  164,  166,  166,

-      164,  164,  164,  164,  164,  164,  164,  169,  169,  169,

-      169,  169,  169,  169,  166,  166,  171,  153,  180,  184,

-      184,  215,  215,  215,  153,  241,  813,  504,  153,  154,

-      776,  505,  180,  153,  241,  814,  154,  504,  776,  171,

-

-      154,  505,  167,  167,  818,  154,  167,  167,  167,  167,

-      167,  167,  167,  170,  170,  170,  170,  170,  170,  170,

-      247,  247,  247,  268,  268,  268,  279,  279,  279,  170,

-      256,  256,  256,  256,  256,  256,  256,  257,  257,  257,

-      257,  257,  257,  257,  786,  170,  288,  288,  288,  822,

-      258,  258,  786,  257,  258,  258,  258,  258,  258,  258,

-      258,  260,  260,  260,  260,  260,  260,  260,  825,  257,

-      261,  261,  261,  261,  261,  261,  261,  292,  292,  292,

-      301,  301,  301,  338,  338,  338,  261,  350,  350,  350,

-      350,  350,  350,  350,  351,  351,  351,  351,  351,  351,

-

-      351,  795,  261,  382,  382,  382,  393,  393,  393,  795,

-      351,  394,  394,  394,  382,  382,  395,  395,  395,  443,

-      443,  443,  483,  483,  483,  490,  351,  830,  605,  831,

-      443,  443,  839,  483,  483,  519,  519,  519,  605,  490,

-      490,  490,  490,  490,  490,  490,  519,  519,  533,  533,

-      606,  621,  621,  796,  534,  534,  656,  656,  760,  606,

-      606,  796,  533,  533,  533,  533,  533,  533,  534,  534,

-      534,  534,  534,  534,  534,  554,  554,  554,  573,  573,

-      573,  576,  576,  690,  690,  581,  533,  554,  578,  578,

-      573,  775,  799,  840,  790,  576,  576,  576,  576,  576,

-

-      576,  576,  578,  578,  578,  578,  578,  578,  580,  580,

-      806,  533,  744,  760,  759,  808,  619,  619,  806,  744,

-      581,  759,  580,  580,  580,  580,  580,  580,  580,  581,

-      619,  619,  619,  619,  619,  619,  787,  798,  789,  788,

-      581,  620,  620,  787,  798,  809,  775,  799,  658,  658,

-      828,  785,  829,  809,  619,  620,  620,  620,  620,  620,

-      620,  620,  658,  658,  658,  658,  658,  658,  660,  660,

-      808,  826,  815,  819,  784,  783,  782,  781,  826,  619,

-      815,  819,  660,  660,  660,  660,  660,  660,  660,  820,

-      823,  828,  827,  829,  832,  833,  780,  820,  823,  827,

-

-      779,  778,  832,  833,  836,  836,  836,  836,  836,  837,

-      837,  837,  838,  838,  838,  841,  841,  842,  777,  842,

-      842,  842,  843,  843,  844,  844,  774,  771,  769,  768,

-      766,  763,  762,  761,  757,  756,  755,  754,  753,  752,

-      751,  750,  749,  748,  747,  746,  745,  743,  742,  741,

-      738,  735,  734,  733,  732,  731,  729,  728,  726,  724,

-      721,  720,  719,  717,  716,  714,  713,  712,  711,  710,

-      709,  708,  707,  706,  705,  704,  702,  701,  700,  699,

-      698,  697,  695,  694,  693,  692,  691,  689,  688,  687,

-      686,  685,  684,  683,  682,  681,  680,  679,  678,  677,

-

-      676,  675,  674,  673,  672,  670,  669,  668,  667,  666,

-      665,  664,  663,  662,  661,  654,  652,  651,  649,  648,

-      647,  646,  645,  644,  643,  642,  641,  640,  639,  638,

-      637,  635,  634,  633,  632,  631,  630,  629,  627,  626,

-      625,  624,  623,  622,  618,  617,  616,  615,  614,  613,

-      612,  611,  610,  609,  608,  607,  601,  599,  598,  597,

-      596,  592,  591,  590,  589,  588,  587,  586,  585,  584,

-      575,  571,  570,  568,  567,  565,  564,  563,  562,  561,

-      560,  559,  558,  557,  555,  553,  552,  551,  550,  549,

-      548,  547,  546,  545,  544,  542,  541,  537,  536,  535,

-

-      532,  531,  529,  528,  526,  525,  524,  523,  522,  520,

-      518,  517,  516,  515,  514,  513,  511,  510,  509,  508,

-      507,  503,  502,  501,  500,  499,  498,  495,  494,  493,

-      492,  491,  489,  488,  487,  486,  485,  484,  482,  481,

-      474,  473,  470,  469,  466,  465,  464,  463,  452,  451,

-      450,  448,  447,  446,  445,  444,  441,  439,  438,  437,

-      435,  434,  432,  431,  430,  429,  427,  426,  421,  420,

-      418,  417,  416,  415,  414,  413,  412,  411,  410,  409,

-      407,  406,  405,  404,  403,  402,  401,  400,  399,  398,

-      397,  396,  392,  388,  387,  386,  383,  381,  371,  369,

-

-      365,  364,  363,  362,  360,  358,  353,  352,  349,  348,

-      347,  346,  345,  344,  339,  337,  336,  335,  334,  333,

-      331,  330,  327,  326,  325,  324,  323,  322,  321,  320,

-      319,  318,  317,  316,  315,  314,  313,  312,  311,  310,

-      309,  308,  307,  306,  305,  302,  300,  299,  298,  297,

-      296,  295,  294,  293,  291,  287,  285,  284,  283,  282,

-      278,  277,  276,  275,  274,  273,  272,  271,  267,  265,

-      264,  254,  253,  252,  251,  250,  249,  248,  246,  245,

-      244,  243,  242,  240,  239,  238,  237,  236,  235,  234,

-      233,  232,  231,  230,  229,  228,  227,  226,  225,  224,

-

-      223,  222,  221,  220,  219,  218,  217,  216,  214,  213,

-      212,  211,  210,  209,  208,  207,  206,  205,  204,  203,

-      202,  201,  200,  199,  198,  196,  195,  194,  193,  192,

-      191,  190,  189,  188,  187,  186,  185,  183,  182,  181,

-      179,  178,  177,  176,  174,  159,  158,  157,  156,  149,

-      147,  146,  145,  141,  140,  139,  138,  137,  136,  134,

-      133,  132,  131,  130,  129,  128,  127,  125,  123,  122,

-      121,  119,  118,  117,  115,  114,  112,  111,  110,  109,

-      108,  107,  104,  103,  102,  101,  100,   99,   98,   97,

-       95,   94,   93,   92,   91,   90,   89,   88,   87,   83,

-

-       79,   52,   45,   38,   32,   22,   18,   14,   12,   11,

-        7,    6,    5,  835,  835,  835,  835,  835,  835,  835,

-      835,  835,  835,  835,  835,  835,  835,  835,  835,  835,

-      835,  835,  835,  835,  835,  835,  835,  835,  835,  835,

-      835,  835,  835,  835,  835,  835,  835,  835,  835,  835,

-      835,  835,  835,  835,  835,  835,  835,  835,  835,  835,

-      835,  835,  835,  835,  835,  835,  835,  835,  835,  835,

-      835,  835,  835,  835,  835,  835,  835,  835,  835,  835,

-      835,  835

-    } ;

-

-/* The intent behind this definition is that it'll catch

- * any uses of REJECT which flex missed.

- */

-#define REJECT reject_used_but_not_detected

-#define yymore() yymore_used_but_not_detected

-#define YY_MORE_ADJ 0

-#define YY_RESTORE_YY_MORE_OFFSET

-#line 1 "glsl_lexer.lpp"

-#line 2 "glsl_lexer.lpp"

-/*

- * Copyright © 2008, 2009 Intel Corporation

- *

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

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

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

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

- * Software.

- *

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

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

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

- * DEALINGS IN THE SOFTWARE.

- */

-#include <ctype.h>

-#include "strtod.h"

-#include "ast.h"

-#include "glsl_parser_extras.h"

-#include "glsl_parser.h"

-

-static int classify_identifier(struct _mesa_glsl_parse_state *, const char *);

-

-#define YY_USER_ACTION						\

-   do {								\

-      yylloc->source = 0;					\

-      yylloc->first_column = yycolumn + 1;			\

-      yylloc->first_line = yylineno + 1;			\

-      yycolumn += yyleng;					\

-   } while(0);

-

-#define YY_USER_INIT yylineno = 0; yycolumn = 0;

-

-#define IS_UINT (yytext[yyleng - 1] == 'u' || yytext[yyleng - 1] == 'U')

-

-/* A macro for handling reserved words and keywords across language versions.

- *

- * Certain words start out as identifiers, become reserved words in

- * later language revisions, and finally become language keywords.

- *

- * For example, consider the following lexer rule:

- * samplerBuffer       KEYWORD(130, 140, SAMPLERBUFFER)

- *

- * This means that "samplerBuffer" will be treated as:

- * - a keyword (SAMPLERBUFFER token)         ...in GLSL >= 1.40

- * - a reserved word - error                 ...in GLSL >= 1.30

- * - an identifier                           ...in GLSL <  1.30

- */

-#define KEYWORD(reserved_version, allowed_version, token)		\

-   do {									\

-      if (yyextra->language_version >= allowed_version) {		\

-	 return token;							\

-      } else if (yyextra->language_version >= reserved_version) {	\

-	 _mesa_glsl_error(yylloc, yyextra,				\

-			  "Illegal use of reserved word `%s'", yytext);	\

-	 return ERROR_TOK;						\

-      } else {								\

-	 yylval->identifier = strdup(yytext);				\

-	 return classify_identifier(yyextra, yytext);			\

-      }									\

-   } while (0)

-

-/* The ES macro can be used in KEYWORD checks:

- *

- *    word      KEYWORD(110 || ES, 400, TOKEN)

- * ...means the word is reserved in GLSL ES 1.00, while

- *

- *    word      KEYWORD(110, 130 || ES, TOKEN)

- * ...means the word is a legal keyword in GLSL ES 1.00.

- */

-#define ES yyextra->es_shader

-

-#line 1073 "glsl_lexer.cpp"

-

-#define INITIAL 0

-#define PP 1

-#define PRAGMA 2

-

-#define YY_EXTRA_TYPE struct _mesa_glsl_parse_state *

-

-/* Holds the entire state of the reentrant scanner. */

-struct yyguts_t

-    {

-

-    /* User-defined. Not touched by flex. */

-    YY_EXTRA_TYPE yyextra_r;

-

-    /* The rest are the same as the globals declared in the non-reentrant scanner. */

-    FILE *yyin_r, *yyout_r;

-    size_t yy_buffer_stack_top; /**< index of top of stack. */

-    size_t yy_buffer_stack_max; /**< capacity of stack. */

-    YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */

-    char yy_hold_char;

-    int yy_n_chars;

-    int yyleng_r;

-    char *yy_c_buf_p;

-    int yy_init;

-    int yy_start;

-    int yy_did_buffer_switch_on_eof;

-    int yy_start_stack_ptr;

-    int yy_start_stack_depth;

-    int *yy_start_stack;

-    yy_state_type yy_last_accepting_state;

-    char* yy_last_accepting_cpos;

-

-    int yylineno_r;

-    int yy_flex_debug_r;

-

-    char *yytext_r;

-    int yy_more_flag;

-    int yy_more_len;

-

-    YYSTYPE * yylval_r;

-

-    YYLTYPE * yylloc_r;

-

-    }; /* end struct yyguts_t */

-

-static int yy_init_globals (yyscan_t yyscanner );

-

-    /* This must go here because YYSTYPE and YYLTYPE are included

-     * from bison output in section 1.*/

-    #    define yylval yyg->yylval_r

-    

-    #    define yylloc yyg->yylloc_r

-    

-int _mesa_glsl_lex_init (yyscan_t* scanner);

-

-int _mesa_glsl_lex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner);

-

-/* Accessor methods to globals.

-   These are made visible to non-reentrant scanners for convenience. */

-

-int _mesa_glsl_lex_destroy (yyscan_t yyscanner );

-

-int _mesa_glsl_get_debug (yyscan_t yyscanner );

-

-void _mesa_glsl_set_debug (int debug_flag ,yyscan_t yyscanner );

-

-YY_EXTRA_TYPE _mesa_glsl_get_extra (yyscan_t yyscanner );

-

-void _mesa_glsl_set_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner );

-

-FILE *_mesa_glsl_get_in (yyscan_t yyscanner );

-

-void _mesa_glsl_set_in  (FILE * in_str ,yyscan_t yyscanner );

-

-FILE *_mesa_glsl_get_out (yyscan_t yyscanner );

-

-void _mesa_glsl_set_out  (FILE * out_str ,yyscan_t yyscanner );

-

-int _mesa_glsl_get_leng (yyscan_t yyscanner );

-

-char *_mesa_glsl_get_text (yyscan_t yyscanner );

-

-int _mesa_glsl_get_lineno (yyscan_t yyscanner );

-

-void _mesa_glsl_set_lineno (int line_number ,yyscan_t yyscanner );

-

-int _mesa_glsl_get_column  (yyscan_t yyscanner );

-

-void _mesa_glsl_set_column (int column_no ,yyscan_t yyscanner );

-

-YYSTYPE * _mesa_glsl_get_lval (yyscan_t yyscanner );

-

-void _mesa_glsl_set_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner );

-

-       YYLTYPE *_mesa_glsl_get_lloc (yyscan_t yyscanner );

-    

-        void _mesa_glsl_set_lloc (YYLTYPE * yylloc_param ,yyscan_t yyscanner );

-    

-/* Macros after this point can all be overridden by user definitions in

- * section 1.

- */

-

-#ifndef YY_SKIP_YYWRAP

-#ifdef __cplusplus

-extern "C" int _mesa_glsl_wrap (yyscan_t yyscanner );

-#else

-extern int _mesa_glsl_wrap (yyscan_t yyscanner );

-#endif

-#endif

-

-#ifndef yytext_ptr

-static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner);

-#endif

-

-#ifdef YY_NEED_STRLEN

-static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner);

-#endif

-

-#ifndef YY_NO_INPUT

-

-#ifdef __cplusplus

-static int yyinput (yyscan_t yyscanner );

-#else

-static int input (yyscan_t yyscanner );

-#endif

-

-#endif

-

-/* Amount of stuff to slurp up with each read. */

-#ifndef YY_READ_BUF_SIZE

-#define YY_READ_BUF_SIZE 8192

-#endif

-

-/* Copy whatever the last rule matched to the standard output. */

-#ifndef ECHO

-/* This used to be an fputs(), but since the string might contain NUL's,

- * we now use fwrite().

- */

-#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)

-#endif

-

-/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,

- * is returned in "result".

- */

-#ifndef YY_INPUT

-#define YY_INPUT(buf,result,max_size) \

-	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \

-		{ \

-		int c = '*'; \

-		unsigned n; \

-		for ( n = 0; n < max_size && \

-			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \

-			buf[n] = (char) c; \

-		if ( c == '\n' ) \

-			buf[n++] = (char) c; \

-		if ( c == EOF && ferror( yyin ) ) \

-			YY_FATAL_ERROR( "input in flex scanner failed" ); \

-		result = n; \

-		} \

-	else \

-		{ \

-		errno=0; \

-		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \

-			{ \

-			if( errno != EINTR) \

-				{ \

-				YY_FATAL_ERROR( "input in flex scanner failed" ); \

-				break; \

-				} \

-			errno=0; \

-			clearerr(yyin); \

-			} \

-		}\

-\

-

-#endif

-

-/* No semi-colon after return; correct usage is to write "yyterminate();" -

- * we don't want an extra ';' after the "return" because that will cause

- * some compilers to complain about unreachable statements.

- */

-#ifndef yyterminate

-#define yyterminate() return YY_NULL

-#endif

-

-/* Number of entries by which start-condition stack grows. */

-#ifndef YY_START_STACK_INCR

-#define YY_START_STACK_INCR 25

-#endif

-

-/* Report a fatal error. */

-#ifndef YY_FATAL_ERROR

-#define YY_FATAL_ERROR(msg) yy_fatal_error( msg , yyscanner)

-#endif

-

-/* end tables serialization structures and prototypes */

-

-/* Default declaration of generated scanner - a define so the user can

- * easily add parameters.

- */

-#ifndef YY_DECL

-#define YY_DECL_IS_OURS 1

-

-extern int _mesa_glsl_lex \

-               (YYSTYPE * yylval_param,YYLTYPE * yylloc_param ,yyscan_t yyscanner);

-

-#define YY_DECL int _mesa_glsl_lex \

-               (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner)

-#endif /* !YY_DECL */

-

-/* Code executed at the beginning of each rule, after yytext and yyleng

- * have been set up.

- */

-#ifndef YY_USER_ACTION

-#define YY_USER_ACTION

-#endif

-

-/* Code executed at the end of each rule. */

-#ifndef YY_BREAK

-#define YY_BREAK break;

-#endif

-

-#define YY_RULE_SETUP \

-	if ( yyleng > 0 ) \

-		YY_CURRENT_BUFFER_LVALUE->yy_at_bol = \

-				(yytext[yyleng - 1] == '\n'); \

-	YY_USER_ACTION

-

-/** The main scanner function which does all the work.

- */

-YY_DECL

-{

-	register yy_state_type yy_current_state;

-	register char *yy_cp, *yy_bp;

-	register int yy_act;

-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;

-

-#line 97 "glsl_lexer.lpp"

-

-

-#line 1314 "glsl_lexer.cpp"

-

-    yylval = yylval_param;

-

-    yylloc = yylloc_param;

-

-	if ( !yyg->yy_init )

-		{

-		yyg->yy_init = 1;

-

-#ifdef YY_USER_INIT

-		YY_USER_INIT;

-#endif

-

-		if ( ! yyg->yy_start )

-			yyg->yy_start = 1;	/* first start state */

-

-		if ( ! yyin )

-			yyin = stdin;

-

-		if ( ! yyout )

-			yyout = stdout;

-

-		if ( ! YY_CURRENT_BUFFER ) {

-			_mesa_glsl_ensure_buffer_stack (yyscanner);

-			YY_CURRENT_BUFFER_LVALUE =

-				_mesa_glsl__create_buffer(yyin,YY_BUF_SIZE ,yyscanner);

-		}

-

-		_mesa_glsl__load_buffer_state(yyscanner );

-		}

-

-	while ( 1 )		/* loops until end-of-file is reached */

-		{

-		yy_cp = yyg->yy_c_buf_p;

-

-		/* Support of yytext. */

-		*yy_cp = yyg->yy_hold_char;

-

-		/* yy_bp points to the position in yy_ch_buf of the start of

-		 * the current run.

-		 */

-		yy_bp = yy_cp;

-

-		yy_current_state = yyg->yy_start;

-		yy_current_state += YY_AT_BOL();

-yy_match:

-		do

-			{

-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];

-			if ( yy_accept[yy_current_state] )

-				{

-				yyg->yy_last_accepting_state = yy_current_state;

-				yyg->yy_last_accepting_cpos = yy_cp;

-				}

-			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )

-				{

-				yy_current_state = (int) yy_def[yy_current_state];

-				if ( yy_current_state >= 836 )

-					yy_c = yy_meta[(unsigned int) yy_c];

-				}

-			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];

-			++yy_cp;

-			}

-		while ( yy_current_state != 835 );

-		yy_cp = yyg->yy_last_accepting_cpos;

-		yy_current_state = yyg->yy_last_accepting_state;

-

-yy_find_action:

-		yy_act = yy_accept[yy_current_state];

-

-		YY_DO_BEFORE_ACTION;

-

-do_action:	/* This label is used only to access EOF actions. */

-

-		switch ( yy_act )

-	{ /* beginning of action switch */

-			case 0: /* must back up */

-			/* undo the effects of YY_DO_BEFORE_ACTION */

-			*yy_cp = yyg->yy_hold_char;

-			yy_cp = yyg->yy_last_accepting_cpos;

-			yy_current_state = yyg->yy_last_accepting_state;

-			goto yy_find_action;

-

-case 1:

-YY_RULE_SETUP

-#line 99 "glsl_lexer.lpp"

-;

-	YY_BREAK

-/* Preprocessor tokens. */ 

-case 2:

-*yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */

-yyg->yy_c_buf_p = yy_cp -= 1;

-YY_DO_BEFORE_ACTION; /* set up yytext again */

-YY_RULE_SETUP

-#line 102 "glsl_lexer.lpp"

-;

-	YY_BREAK

-case 3:

-YY_RULE_SETUP

-#line 103 "glsl_lexer.lpp"

-{ BEGIN PP; return VERSION; }

-	YY_BREAK

-case 4:

-YY_RULE_SETUP

-#line 104 "glsl_lexer.lpp"

-{ BEGIN PP; return EXTENSION; }

-	YY_BREAK

-case 5:

-*yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */

-yyg->yy_c_buf_p = yy_cp -= 1;

-YY_DO_BEFORE_ACTION; /* set up yytext again */

-YY_RULE_SETUP

-#line 105 "glsl_lexer.lpp"

-{

-				   /* Eat characters until the first digit is

-				    * encountered

-				    */

-				   char *ptr = yytext;

-				   while (!isdigit(*ptr))

-				      ptr++;

-

-				   /* Subtract one from the line number because

-				    * yylineno is zero-based instead of

-				    * one-based.

-				    */

-				   yylineno = strtol(ptr, &ptr, 0) - 1;

-				   yylloc->source = strtol(ptr, NULL, 0);

-				}

-	YY_BREAK

-case 6:

-*yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */

-yyg->yy_c_buf_p = yy_cp -= 1;

-YY_DO_BEFORE_ACTION; /* set up yytext again */

-YY_RULE_SETUP

-#line 120 "glsl_lexer.lpp"

-{

-				   /* Eat characters until the first digit is

-				    * encountered

-				    */

-				   char *ptr = yytext;

-				   while (!isdigit(*ptr))

-				      ptr++;

-

-				   /* Subtract one from the line number because

-				    * yylineno is zero-based instead of

-				    * one-based.

-				    */

-				   yylineno = strtol(ptr, &ptr, 0) - 1;

-				}

-	YY_BREAK

-case 7:

-YY_RULE_SETUP

-#line 134 "glsl_lexer.lpp"

-{

-				  BEGIN PP;

-				  return PRAGMA_DEBUG_ON;

-				}

-	YY_BREAK

-case 8:

-YY_RULE_SETUP

-#line 138 "glsl_lexer.lpp"

-{

-				  BEGIN PP;

-				  return PRAGMA_DEBUG_OFF;

-				}

-	YY_BREAK

-case 9:

-YY_RULE_SETUP

-#line 142 "glsl_lexer.lpp"

-{

-				  BEGIN PP;

-				  return PRAGMA_OPTIMIZE_ON;

-				}

-	YY_BREAK

-case 10:

-YY_RULE_SETUP

-#line 146 "glsl_lexer.lpp"

-{

-				  BEGIN PP;

-				  return PRAGMA_OPTIMIZE_OFF;

-				}

-	YY_BREAK

-case 11:

-YY_RULE_SETUP

-#line 150 "glsl_lexer.lpp"

-{

-				  BEGIN PP;

-				  return PRAGMA_INVARIANT_ALL;

-				}

-	YY_BREAK

-case 12:

-YY_RULE_SETUP

-#line 154 "glsl_lexer.lpp"

-{ BEGIN PRAGMA; }

-	YY_BREAK

-case 13:

-/* rule 13 can match eol */

-YY_RULE_SETUP

-#line 156 "glsl_lexer.lpp"

-{ BEGIN 0; yylineno++; yycolumn = 0; }

-	YY_BREAK

-case 14:

-YY_RULE_SETUP

-#line 157 "glsl_lexer.lpp"

-{ }

-	YY_BREAK

-case 15:

-YY_RULE_SETUP

-#line 159 "glsl_lexer.lpp"

-{ }

-	YY_BREAK

-case 16:

-YY_RULE_SETUP

-#line 160 "glsl_lexer.lpp"

-{ }

-	YY_BREAK

-case 17:

-YY_RULE_SETUP

-#line 161 "glsl_lexer.lpp"

-return COLON;

-	YY_BREAK

-case 18:

-YY_RULE_SETUP

-#line 162 "glsl_lexer.lpp"

-{

-				   yylval->identifier = strdup(yytext);

-				   return IDENTIFIER;

-				}

-	YY_BREAK

-case 19:

-YY_RULE_SETUP

-#line 166 "glsl_lexer.lpp"

-{

-				    yylval->n = strtol(yytext, NULL, 10);

-				    return INTCONSTANT;

-				}

-	YY_BREAK

-case 20:

-/* rule 20 can match eol */

-YY_RULE_SETUP

-#line 170 "glsl_lexer.lpp"

-{ BEGIN 0; yylineno++; yycolumn = 0; return EOL; }

-	YY_BREAK

-case 21:

-/* rule 21 can match eol */

-YY_RULE_SETUP

-#line 172 "glsl_lexer.lpp"

-{ yylineno++; yycolumn = 0; }

-	YY_BREAK

-case 22:

-YY_RULE_SETUP

-#line 174 "glsl_lexer.lpp"

-return ATTRIBUTE;

-	YY_BREAK

-case 23:

-YY_RULE_SETUP

-#line 175 "glsl_lexer.lpp"

-return CONST_TOK;

-	YY_BREAK

-case 24:

-YY_RULE_SETUP

-#line 176 "glsl_lexer.lpp"

-return BOOL_TOK;

-	YY_BREAK

-case 25:

-YY_RULE_SETUP

-#line 177 "glsl_lexer.lpp"

-return FLOAT_TOK;

-	YY_BREAK

-case 26:

-YY_RULE_SETUP

-#line 178 "glsl_lexer.lpp"

-return INT_TOK;

-	YY_BREAK

-case 27:

-YY_RULE_SETUP

-#line 179 "glsl_lexer.lpp"

-KEYWORD(130, 130, UINT_TOK);

-	YY_BREAK

-case 28:

-YY_RULE_SETUP

-#line 181 "glsl_lexer.lpp"

-return BREAK;

-	YY_BREAK

-case 29:

-YY_RULE_SETUP

-#line 182 "glsl_lexer.lpp"

-return CONTINUE;

-	YY_BREAK

-case 30:

-YY_RULE_SETUP

-#line 183 "glsl_lexer.lpp"

-return DO;

-	YY_BREAK

-case 31:

-YY_RULE_SETUP

-#line 184 "glsl_lexer.lpp"

-return WHILE;

-	YY_BREAK

-case 32:

-YY_RULE_SETUP

-#line 185 "glsl_lexer.lpp"

-return ELSE;

-	YY_BREAK

-case 33:

-YY_RULE_SETUP

-#line 186 "glsl_lexer.lpp"

-return FOR;

-	YY_BREAK

-case 34:

-YY_RULE_SETUP

-#line 187 "glsl_lexer.lpp"

-return IF;

-	YY_BREAK

-case 35:

-YY_RULE_SETUP

-#line 188 "glsl_lexer.lpp"

-return DISCARD;

-	YY_BREAK

-case 36:

-YY_RULE_SETUP

-#line 189 "glsl_lexer.lpp"

-return RETURN;

-	YY_BREAK

-case 37:

-YY_RULE_SETUP

-#line 191 "glsl_lexer.lpp"

-return BVEC2;

-	YY_BREAK

-case 38:

-YY_RULE_SETUP

-#line 192 "glsl_lexer.lpp"

-return BVEC3;

-	YY_BREAK

-case 39:

-YY_RULE_SETUP

-#line 193 "glsl_lexer.lpp"

-return BVEC4;

-	YY_BREAK

-case 40:

-YY_RULE_SETUP

-#line 194 "glsl_lexer.lpp"

-return IVEC2;

-	YY_BREAK

-case 41:

-YY_RULE_SETUP

-#line 195 "glsl_lexer.lpp"

-return IVEC3;

-	YY_BREAK

-case 42:

-YY_RULE_SETUP

-#line 196 "glsl_lexer.lpp"

-return IVEC4;

-	YY_BREAK

-case 43:

-YY_RULE_SETUP

-#line 197 "glsl_lexer.lpp"

-KEYWORD(130, 130, UVEC2);

-	YY_BREAK

-case 44:

-YY_RULE_SETUP

-#line 198 "glsl_lexer.lpp"

-KEYWORD(130, 130, UVEC3);

-	YY_BREAK

-case 45:

-YY_RULE_SETUP

-#line 199 "glsl_lexer.lpp"

-KEYWORD(130, 130, UVEC4);

-	YY_BREAK

-case 46:

-YY_RULE_SETUP

-#line 200 "glsl_lexer.lpp"

-return VEC2;

-	YY_BREAK

-case 47:

-YY_RULE_SETUP

-#line 201 "glsl_lexer.lpp"

-return VEC3;

-	YY_BREAK

-case 48:

-YY_RULE_SETUP

-#line 202 "glsl_lexer.lpp"

-return VEC4;

-	YY_BREAK

-case 49:

-YY_RULE_SETUP

-#line 203 "glsl_lexer.lpp"

-return MAT2X2;

-	YY_BREAK

-case 50:

-YY_RULE_SETUP

-#line 204 "glsl_lexer.lpp"

-return MAT3X3;

-	YY_BREAK

-case 51:

-YY_RULE_SETUP

-#line 205 "glsl_lexer.lpp"

-return MAT4X4;

-	YY_BREAK

-case 52:

-YY_RULE_SETUP

-#line 206 "glsl_lexer.lpp"

-KEYWORD(120, 120, MAT2X2);

-	YY_BREAK

-case 53:

-YY_RULE_SETUP

-#line 207 "glsl_lexer.lpp"

-KEYWORD(120, 120, MAT2X3);

-	YY_BREAK

-case 54:

-YY_RULE_SETUP

-#line 208 "glsl_lexer.lpp"

-KEYWORD(120, 120, MAT2X4);

-	YY_BREAK

-case 55:

-YY_RULE_SETUP

-#line 209 "glsl_lexer.lpp"

-KEYWORD(120, 120, MAT3X2);

-	YY_BREAK

-case 56:

-YY_RULE_SETUP

-#line 210 "glsl_lexer.lpp"

-KEYWORD(120, 120, MAT3X3);

-	YY_BREAK

-case 57:

-YY_RULE_SETUP

-#line 211 "glsl_lexer.lpp"

-KEYWORD(120, 120, MAT3X4);

-	YY_BREAK

-case 58:

-YY_RULE_SETUP

-#line 212 "glsl_lexer.lpp"

-KEYWORD(120, 120, MAT4X2);

-	YY_BREAK

-case 59:

-YY_RULE_SETUP

-#line 213 "glsl_lexer.lpp"

-KEYWORD(120, 120, MAT4X3);

-	YY_BREAK

-case 60:

-YY_RULE_SETUP

-#line 214 "glsl_lexer.lpp"

-KEYWORD(120, 120, MAT4X4);

-	YY_BREAK

-case 61:

-YY_RULE_SETUP

-#line 216 "glsl_lexer.lpp"

-return IN_TOK;

-	YY_BREAK

-case 62:

-YY_RULE_SETUP

-#line 217 "glsl_lexer.lpp"

-return OUT_TOK;

-	YY_BREAK

-case 63:

-YY_RULE_SETUP

-#line 218 "glsl_lexer.lpp"

-return INOUT_TOK;

-	YY_BREAK

-case 64:

-YY_RULE_SETUP

-#line 219 "glsl_lexer.lpp"

-return UNIFORM;

-	YY_BREAK

-case 65:

-YY_RULE_SETUP

-#line 220 "glsl_lexer.lpp"

-return VARYING;

-	YY_BREAK

-case 66:

-YY_RULE_SETUP

-#line 221 "glsl_lexer.lpp"

-KEYWORD(120, 120, CENTROID);

-	YY_BREAK

-case 67:

-YY_RULE_SETUP

-#line 222 "glsl_lexer.lpp"

-KEYWORD(120 || ES, 120 || ES, INVARIANT);

-	YY_BREAK

-case 68:

-YY_RULE_SETUP

-#line 223 "glsl_lexer.lpp"

-KEYWORD(130 || ES, 130, FLAT);

-	YY_BREAK

-case 69:

-YY_RULE_SETUP

-#line 224 "glsl_lexer.lpp"

-KEYWORD(130, 130, SMOOTH);

-	YY_BREAK

-case 70:

-YY_RULE_SETUP

-#line 225 "glsl_lexer.lpp"

-KEYWORD(130, 130, NOPERSPECTIVE);

-	YY_BREAK

-case 71:

-YY_RULE_SETUP

-#line 227 "glsl_lexer.lpp"

-return SAMPLER1D;

-	YY_BREAK

-case 72:

-YY_RULE_SETUP

-#line 228 "glsl_lexer.lpp"

-return SAMPLER2D;

-	YY_BREAK

-case 73:

-YY_RULE_SETUP

-#line 229 "glsl_lexer.lpp"

-return SAMPLER3D;

-	YY_BREAK

-case 74:

-YY_RULE_SETUP

-#line 230 "glsl_lexer.lpp"

-return SAMPLERCUBE;

-	YY_BREAK

-case 75:

-YY_RULE_SETUP

-#line 231 "glsl_lexer.lpp"

-KEYWORD(130, 130, SAMPLER1DARRAY);

-	YY_BREAK

-case 76:

-YY_RULE_SETUP

-#line 232 "glsl_lexer.lpp"

-KEYWORD(130, 130, SAMPLER2DARRAY);

-	YY_BREAK

-case 77:

-YY_RULE_SETUP

-#line 233 "glsl_lexer.lpp"

-return SAMPLER1DSHADOW;

-	YY_BREAK

-case 78:

-YY_RULE_SETUP

-#line 234 "glsl_lexer.lpp"

-return SAMPLER2DSHADOW;

-	YY_BREAK

-case 79:

-YY_RULE_SETUP

-#line 235 "glsl_lexer.lpp"

-KEYWORD(130, 130, SAMPLERCUBESHADOW);

-	YY_BREAK

-case 80:

-YY_RULE_SETUP

-#line 236 "glsl_lexer.lpp"

-KEYWORD(130, 130, SAMPLER1DARRAYSHADOW);

-	YY_BREAK

-case 81:

-YY_RULE_SETUP

-#line 237 "glsl_lexer.lpp"

-KEYWORD(130, 130, SAMPLER2DARRAYSHADOW);

-	YY_BREAK

-case 82:

-YY_RULE_SETUP

-#line 238 "glsl_lexer.lpp"

-KEYWORD(130, 130, ISAMPLER1D);

-	YY_BREAK

-case 83:

-YY_RULE_SETUP

-#line 239 "glsl_lexer.lpp"

-KEYWORD(130, 130, ISAMPLER2D);

-	YY_BREAK

-case 84:

-YY_RULE_SETUP

-#line 240 "glsl_lexer.lpp"

-KEYWORD(130, 130, ISAMPLER3D);

-	YY_BREAK

-case 85:

-YY_RULE_SETUP

-#line 241 "glsl_lexer.lpp"

-KEYWORD(130, 130, ISAMPLERCUBE);

-	YY_BREAK

-case 86:

-YY_RULE_SETUP

-#line 242 "glsl_lexer.lpp"

-KEYWORD(130, 130, ISAMPLER1DARRAY);

-	YY_BREAK

-case 87:

-YY_RULE_SETUP

-#line 243 "glsl_lexer.lpp"

-KEYWORD(130, 130, ISAMPLER2DARRAY);

-	YY_BREAK

-case 88:

-YY_RULE_SETUP

-#line 244 "glsl_lexer.lpp"

-KEYWORD(130, 130, USAMPLER1D);

-	YY_BREAK

-case 89:

-YY_RULE_SETUP

-#line 245 "glsl_lexer.lpp"

-KEYWORD(130, 130, USAMPLER2D);

-	YY_BREAK

-case 90:

-YY_RULE_SETUP

-#line 246 "glsl_lexer.lpp"

-KEYWORD(130, 130, USAMPLER3D);

-	YY_BREAK

-case 91:

-YY_RULE_SETUP

-#line 247 "glsl_lexer.lpp"

-KEYWORD(130, 130, USAMPLERCUBE);

-	YY_BREAK

-case 92:

-YY_RULE_SETUP

-#line 248 "glsl_lexer.lpp"

-KEYWORD(130, 130, USAMPLER1DARRAY);

-	YY_BREAK

-case 93:

-YY_RULE_SETUP

-#line 249 "glsl_lexer.lpp"

-KEYWORD(130, 130, USAMPLER2DARRAY);

-	YY_BREAK

-case 94:

-YY_RULE_SETUP

-#line 252 "glsl_lexer.lpp"

-return STRUCT;

-	YY_BREAK

-case 95:

-YY_RULE_SETUP

-#line 253 "glsl_lexer.lpp"

-return VOID_TOK;

-	YY_BREAK

-case 96:

-YY_RULE_SETUP

-#line 255 "glsl_lexer.lpp"

-{

-		  if ((yyextra->language_version >= 140)

-		      || yyextra->AMD_conservative_depth_enable

-		      || yyextra->ARB_explicit_attrib_location_enable

-		      || yyextra->ARB_fragment_coord_conventions_enable) {

-		      return LAYOUT_TOK;

-		   } else {

-		      yylval->identifier = strdup(yytext);

-		      return IDENTIFIER;

-		   }

-		}

-	YY_BREAK

-case 97:

-YY_RULE_SETUP

-#line 267 "glsl_lexer.lpp"

-return INC_OP;

-	YY_BREAK

-case 98:

-YY_RULE_SETUP

-#line 268 "glsl_lexer.lpp"

-return DEC_OP;

-	YY_BREAK

-case 99:

-YY_RULE_SETUP

-#line 269 "glsl_lexer.lpp"

-return LE_OP;

-	YY_BREAK

-case 100:

-YY_RULE_SETUP

-#line 270 "glsl_lexer.lpp"

-return GE_OP;

-	YY_BREAK

-case 101:

-YY_RULE_SETUP

-#line 271 "glsl_lexer.lpp"

-return EQ_OP;

-	YY_BREAK

-case 102:

-YY_RULE_SETUP

-#line 272 "glsl_lexer.lpp"

-return NE_OP;

-	YY_BREAK

-case 103:

-YY_RULE_SETUP

-#line 273 "glsl_lexer.lpp"

-return AND_OP;

-	YY_BREAK

-case 104:

-YY_RULE_SETUP

-#line 274 "glsl_lexer.lpp"

-return OR_OP;

-	YY_BREAK

-case 105:

-YY_RULE_SETUP

-#line 275 "glsl_lexer.lpp"

-return XOR_OP;

-	YY_BREAK

-case 106:

-YY_RULE_SETUP

-#line 276 "glsl_lexer.lpp"

-return LEFT_OP;

-	YY_BREAK

-case 107:

-YY_RULE_SETUP

-#line 277 "glsl_lexer.lpp"

-return RIGHT_OP;

-	YY_BREAK

-case 108:

-YY_RULE_SETUP

-#line 279 "glsl_lexer.lpp"

-return MUL_ASSIGN;

-	YY_BREAK

-case 109:

-YY_RULE_SETUP

-#line 280 "glsl_lexer.lpp"

-return DIV_ASSIGN;

-	YY_BREAK

-case 110:

-YY_RULE_SETUP

-#line 281 "glsl_lexer.lpp"

-return ADD_ASSIGN;

-	YY_BREAK

-case 111:

-YY_RULE_SETUP

-#line 282 "glsl_lexer.lpp"

-return MOD_ASSIGN;

-	YY_BREAK

-case 112:

-YY_RULE_SETUP

-#line 283 "glsl_lexer.lpp"

-return LEFT_ASSIGN;

-	YY_BREAK

-case 113:

-YY_RULE_SETUP

-#line 284 "glsl_lexer.lpp"

-return RIGHT_ASSIGN;

-	YY_BREAK

-case 114:

-YY_RULE_SETUP

-#line 285 "glsl_lexer.lpp"

-return AND_ASSIGN;

-	YY_BREAK

-case 115:

-YY_RULE_SETUP

-#line 286 "glsl_lexer.lpp"

-return XOR_ASSIGN;

-	YY_BREAK

-case 116:

-YY_RULE_SETUP

-#line 287 "glsl_lexer.lpp"

-return OR_ASSIGN;

-	YY_BREAK

-case 117:

-YY_RULE_SETUP

-#line 288 "glsl_lexer.lpp"

-return SUB_ASSIGN;

-	YY_BREAK

-case 118:

-YY_RULE_SETUP

-#line 290 "glsl_lexer.lpp"

-{

-			    yylval->n = strtol(yytext, NULL, 10);

-			    return IS_UINT ? UINTCONSTANT : INTCONSTANT;

-			}

-	YY_BREAK

-case 119:

-YY_RULE_SETUP

-#line 294 "glsl_lexer.lpp"

-{

-			    yylval->n = strtol(yytext + 2, NULL, 16);

-			    return IS_UINT ? UINTCONSTANT : INTCONSTANT;

-			}

-	YY_BREAK

-case 120:

-YY_RULE_SETUP

-#line 298 "glsl_lexer.lpp"

-{

-			    yylval->n = strtol(yytext, NULL, 8);

-			    return IS_UINT ? UINTCONSTANT : INTCONSTANT;

-			}

-	YY_BREAK

-case 121:

-YY_RULE_SETUP

-#line 303 "glsl_lexer.lpp"

-{

-			    yylval->real = glsl_strtod(yytext, NULL);

-			    return FLOATCONSTANT;

-			}

-	YY_BREAK

-case 122:

-YY_RULE_SETUP

-#line 307 "glsl_lexer.lpp"

-{

-			    yylval->real = glsl_strtod(yytext, NULL);

-			    return FLOATCONSTANT;

-			}

-	YY_BREAK

-case 123:

-YY_RULE_SETUP

-#line 311 "glsl_lexer.lpp"

-{

-			    yylval->real = glsl_strtod(yytext, NULL);

-			    return FLOATCONSTANT;

-			}

-	YY_BREAK

-case 124:

-YY_RULE_SETUP

-#line 315 "glsl_lexer.lpp"

-{

-			    yylval->real = glsl_strtod(yytext, NULL);

-			    return FLOATCONSTANT;

-			}

-	YY_BREAK

-case 125:

-YY_RULE_SETUP

-#line 319 "glsl_lexer.lpp"

-{

-			    yylval->real = glsl_strtod(yytext, NULL);

-			    return FLOATCONSTANT;

-			}

-	YY_BREAK

-case 126:

-YY_RULE_SETUP

-#line 324 "glsl_lexer.lpp"

-{

-			    yylval->n = 1;

-			    return BOOLCONSTANT;

-			}

-	YY_BREAK

-case 127:

-YY_RULE_SETUP

-#line 328 "glsl_lexer.lpp"

-{

-			    yylval->n = 0;

-			    return BOOLCONSTANT;

-			}

-	YY_BREAK

-/* Reserved words in GLSL 1.10. */

-case 128:

-YY_RULE_SETUP

-#line 335 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 999, ASM);

-	YY_BREAK

-case 129:

-YY_RULE_SETUP

-#line 336 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 999, CLASS);

-	YY_BREAK

-case 130:

-YY_RULE_SETUP

-#line 337 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 999, UNION);

-	YY_BREAK

-case 131:

-YY_RULE_SETUP

-#line 338 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 999, ENUM);

-	YY_BREAK

-case 132:

-YY_RULE_SETUP

-#line 339 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 999, TYPEDEF);

-	YY_BREAK

-case 133:

-YY_RULE_SETUP

-#line 340 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 999, TEMPLATE);

-	YY_BREAK

-case 134:

-YY_RULE_SETUP

-#line 341 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 999, THIS);

-	YY_BREAK

-case 135:

-YY_RULE_SETUP

-#line 342 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 999, PACKED_TOK);

-	YY_BREAK

-case 136:

-YY_RULE_SETUP

-#line 343 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 999, GOTO);

-	YY_BREAK

-case 137:

-YY_RULE_SETUP

-#line 344 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 130, SWITCH);

-	YY_BREAK

-case 138:

-YY_RULE_SETUP

-#line 345 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 130, DEFAULT);

-	YY_BREAK

-case 139:

-YY_RULE_SETUP

-#line 346 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 999, INLINE_TOK);

-	YY_BREAK

-case 140:

-YY_RULE_SETUP

-#line 347 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 999, NOINLINE);

-	YY_BREAK

-case 141:

-YY_RULE_SETUP

-#line 348 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 999, VOLATILE);

-	YY_BREAK

-case 142:

-YY_RULE_SETUP

-#line 349 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 999, PUBLIC_TOK);

-	YY_BREAK

-case 143:

-YY_RULE_SETUP

-#line 350 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 999, STATIC);

-	YY_BREAK

-case 144:

-YY_RULE_SETUP

-#line 351 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 999, EXTERN);

-	YY_BREAK

-case 145:

-YY_RULE_SETUP

-#line 352 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 999, EXTERNAL);

-	YY_BREAK

-case 146:

-YY_RULE_SETUP

-#line 353 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 999, INTERFACE);

-	YY_BREAK

-case 147:

-YY_RULE_SETUP

-#line 354 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 999, LONG_TOK);

-	YY_BREAK

-case 148:

-YY_RULE_SETUP

-#line 355 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 999, SHORT_TOK);

-	YY_BREAK

-case 149:

-YY_RULE_SETUP

-#line 356 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 400, DOUBLE_TOK);

-	YY_BREAK

-case 150:

-YY_RULE_SETUP

-#line 357 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 999, HALF);

-	YY_BREAK

-case 151:

-YY_RULE_SETUP

-#line 358 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 999, FIXED_TOK);

-	YY_BREAK

-case 152:

-YY_RULE_SETUP

-#line 359 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 999, UNSIGNED);

-	YY_BREAK

-case 153:

-YY_RULE_SETUP

-#line 360 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 999, INPUT_TOK);

-	YY_BREAK

-case 154:

-YY_RULE_SETUP

-#line 361 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 999, OUTPUT);

-	YY_BREAK

-case 155:

-YY_RULE_SETUP

-#line 362 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 999, HVEC2);

-	YY_BREAK

-case 156:

-YY_RULE_SETUP

-#line 363 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 999, HVEC3);

-	YY_BREAK

-case 157:

-YY_RULE_SETUP

-#line 364 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 999, HVEC4);

-	YY_BREAK

-case 158:

-YY_RULE_SETUP

-#line 365 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 400, DVEC2);

-	YY_BREAK

-case 159:

-YY_RULE_SETUP

-#line 366 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 400, DVEC3);

-	YY_BREAK

-case 160:

-YY_RULE_SETUP

-#line 367 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 400, DVEC4);

-	YY_BREAK

-case 161:

-YY_RULE_SETUP

-#line 368 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 999, FVEC2);

-	YY_BREAK

-case 162:

-YY_RULE_SETUP

-#line 369 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 999, FVEC3);

-	YY_BREAK

-case 163:

-YY_RULE_SETUP

-#line 370 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 999, FVEC4);

-	YY_BREAK

-case 164:

-YY_RULE_SETUP

-#line 371 "glsl_lexer.lpp"

-return SAMPLER2DRECT;

-	YY_BREAK

-case 165:

-YY_RULE_SETUP

-#line 372 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 999, SAMPLER3DRECT);

-	YY_BREAK

-case 166:

-YY_RULE_SETUP

-#line 373 "glsl_lexer.lpp"

-return SAMPLER2DRECTSHADOW;

-	YY_BREAK

-case 167:

-YY_RULE_SETUP

-#line 374 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 999, SIZEOF);

-	YY_BREAK

-case 168:

-YY_RULE_SETUP

-#line 375 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 999, CAST);

-	YY_BREAK

-case 169:

-YY_RULE_SETUP

-#line 376 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 999, NAMESPACE);

-	YY_BREAK

-case 170:

-YY_RULE_SETUP

-#line 377 "glsl_lexer.lpp"

-KEYWORD(110 || ES, 999, USING);

-	YY_BREAK

-/* Additional reserved words in GLSL 1.20. */

-case 171:

-YY_RULE_SETUP

-#line 380 "glsl_lexer.lpp"

-KEYWORD(120, 130 || ES, LOWP);

-	YY_BREAK

-case 172:

-YY_RULE_SETUP

-#line 381 "glsl_lexer.lpp"

-KEYWORD(120, 130 || ES, MEDIUMP);

-	YY_BREAK

-case 173:

-YY_RULE_SETUP

-#line 382 "glsl_lexer.lpp"

-KEYWORD(120, 130 || ES, HIGHP);

-	YY_BREAK

-case 174:

-YY_RULE_SETUP

-#line 383 "glsl_lexer.lpp"

-KEYWORD(120, 130 || ES, PRECISION);

-	YY_BREAK

-/* Additional reserved words in GLSL 1.30. */

-case 175:

-YY_RULE_SETUP

-#line 386 "glsl_lexer.lpp"

-KEYWORD(130, 130, CASE);

-	YY_BREAK

-case 176:

-YY_RULE_SETUP

-#line 387 "glsl_lexer.lpp"

-KEYWORD(130, 999, COMMON);

-	YY_BREAK

-case 177:

-YY_RULE_SETUP

-#line 388 "glsl_lexer.lpp"

-KEYWORD(130, 999, PARTITION);

-	YY_BREAK

-case 178:

-YY_RULE_SETUP

-#line 389 "glsl_lexer.lpp"

-KEYWORD(130, 999, ACTIVE);

-	YY_BREAK

-case 179:

-YY_RULE_SETUP

-#line 390 "glsl_lexer.lpp"

-KEYWORD(130 || ES, 999, SUPERP);

-	YY_BREAK

-case 180:

-YY_RULE_SETUP

-#line 391 "glsl_lexer.lpp"

-KEYWORD(130, 140, SAMPLERBUFFER);

-	YY_BREAK

-case 181:

-YY_RULE_SETUP

-#line 392 "glsl_lexer.lpp"

-KEYWORD(130, 999, FILTER);

-	YY_BREAK

-case 182:

-YY_RULE_SETUP

-#line 393 "glsl_lexer.lpp"

-KEYWORD(130, 999, IMAGE1D);

-	YY_BREAK

-case 183:

-YY_RULE_SETUP

-#line 394 "glsl_lexer.lpp"

-KEYWORD(130, 999, IMAGE2D);

-	YY_BREAK

-case 184:

-YY_RULE_SETUP

-#line 395 "glsl_lexer.lpp"

-KEYWORD(130, 999, IMAGE3D);

-	YY_BREAK

-case 185:

-YY_RULE_SETUP

-#line 396 "glsl_lexer.lpp"

-KEYWORD(130, 999, IMAGECUBE);

-	YY_BREAK

-case 186:

-YY_RULE_SETUP

-#line 397 "glsl_lexer.lpp"

-KEYWORD(130, 999, IIMAGE1D);

-	YY_BREAK

-case 187:

-YY_RULE_SETUP

-#line 398 "glsl_lexer.lpp"

-KEYWORD(130, 999, IIMAGE2D);

-	YY_BREAK

-case 188:

-YY_RULE_SETUP

-#line 399 "glsl_lexer.lpp"

-KEYWORD(130, 999, IIMAGE3D);

-	YY_BREAK

-case 189:

-YY_RULE_SETUP

-#line 400 "glsl_lexer.lpp"

-KEYWORD(130, 999, IIMAGECUBE);

-	YY_BREAK

-case 190:

-YY_RULE_SETUP

-#line 401 "glsl_lexer.lpp"

-KEYWORD(130, 999, UIMAGE1D);

-	YY_BREAK

-case 191:

-YY_RULE_SETUP

-#line 402 "glsl_lexer.lpp"

-KEYWORD(130, 999, UIMAGE2D);

-	YY_BREAK

-case 192:

-YY_RULE_SETUP

-#line 403 "glsl_lexer.lpp"

-KEYWORD(130, 999, UIMAGE3D);

-	YY_BREAK

-case 193:

-YY_RULE_SETUP

-#line 404 "glsl_lexer.lpp"

-KEYWORD(130, 999, UIMAGECUBE);

-	YY_BREAK

-case 194:

-YY_RULE_SETUP

-#line 405 "glsl_lexer.lpp"

-KEYWORD(130, 999, IMAGE1DARRAY);

-	YY_BREAK

-case 195:

-YY_RULE_SETUP

-#line 406 "glsl_lexer.lpp"

-KEYWORD(130, 999, IMAGE2DARRAY);

-	YY_BREAK

-case 196:

-YY_RULE_SETUP

-#line 407 "glsl_lexer.lpp"

-KEYWORD(130, 999, IIMAGE1DARRAY);

-	YY_BREAK

-case 197:

-YY_RULE_SETUP

-#line 408 "glsl_lexer.lpp"

-KEYWORD(130, 999, IIMAGE2DARRAY);

-	YY_BREAK

-case 198:

-YY_RULE_SETUP

-#line 409 "glsl_lexer.lpp"

-KEYWORD(130, 999, UIMAGE1DARRAY);

-	YY_BREAK

-case 199:

-YY_RULE_SETUP

-#line 410 "glsl_lexer.lpp"

-KEYWORD(130, 999, UIMAGE2DARRAY);

-	YY_BREAK

-case 200:

-YY_RULE_SETUP

-#line 411 "glsl_lexer.lpp"

-KEYWORD(130, 999, IMAGE1DSHADOW);

-	YY_BREAK

-case 201:

-YY_RULE_SETUP

-#line 412 "glsl_lexer.lpp"

-KEYWORD(130, 999, IMAGE2DSHADOW);

-	YY_BREAK

-case 202:

-YY_RULE_SETUP

-#line 413 "glsl_lexer.lpp"

-KEYWORD(130, 999, IMAGE1DARRAYSHADOW);

-	YY_BREAK

-case 203:

-YY_RULE_SETUP

-#line 414 "glsl_lexer.lpp"

-KEYWORD(130, 999, IMAGE2DARRAYSHADOW);

-	YY_BREAK

-case 204:

-YY_RULE_SETUP

-#line 415 "glsl_lexer.lpp"

-KEYWORD(130, 999, IMAGEBUFFER);

-	YY_BREAK

-case 205:

-YY_RULE_SETUP

-#line 416 "glsl_lexer.lpp"

-KEYWORD(130, 999, IIMAGEBUFFER);

-	YY_BREAK

-case 206:

-YY_RULE_SETUP

-#line 417 "glsl_lexer.lpp"

-KEYWORD(130, 999, UIMAGEBUFFER);

-	YY_BREAK

-case 207:

-YY_RULE_SETUP

-#line 418 "glsl_lexer.lpp"

-KEYWORD(130, 999, ROW_MAJOR);

-	YY_BREAK

-case 208:

-YY_RULE_SETUP

-#line 420 "glsl_lexer.lpp"

-{

-			    struct _mesa_glsl_parse_state *state = yyextra;

-			    void *ctx = state;	

-			    yylval->identifier = ralloc_strdup(ctx, yytext);

-			    return classify_identifier(state, yytext);

-			}

-	YY_BREAK

-case 209:

-YY_RULE_SETUP

-#line 427 "glsl_lexer.lpp"

-{ return yytext[0]; }

-	YY_BREAK

-case 210:

-YY_RULE_SETUP

-#line 429 "glsl_lexer.lpp"

-ECHO;

-	YY_BREAK

-#line 2557 "glsl_lexer.cpp"

-case YY_STATE_EOF(INITIAL):

-case YY_STATE_EOF(PP):

-case YY_STATE_EOF(PRAGMA):

-	yyterminate();

-

-	case YY_END_OF_BUFFER:

-		{

-		/* Amount of text matched not including the EOB char. */

-		int yy_amount_of_matched_text = (int) (yy_cp - yyg->yytext_ptr) - 1;

-

-		/* Undo the effects of YY_DO_BEFORE_ACTION. */

-		*yy_cp = yyg->yy_hold_char;

-		YY_RESTORE_YY_MORE_OFFSET

-

-		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )

-			{

-			/* We're scanning a new file or input source.  It's

-			 * possible that this happened because the user

-			 * just pointed yyin at a new source and called

-			 * _mesa_glsl_lex().  If so, then we have to assure

-			 * consistency between YY_CURRENT_BUFFER and our

-			 * globals.  Here is the right place to do so, because

-			 * this is the first action (other than possibly a

-			 * back-up) that will match for the new input source.

-			 */

-			yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;

-			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;

-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;

-			}

-

-		/* Note that here we test for yy_c_buf_p "<=" to the position

-		 * of the first EOB in the buffer, since yy_c_buf_p will

-		 * already have been incremented past the NUL character

-		 * (since all states make transitions on EOB to the

-		 * end-of-buffer state).  Contrast this with the test

-		 * in input().

-		 */

-		if ( yyg->yy_c_buf_p <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] )

-			{ /* This was really a NUL. */

-			yy_state_type yy_next_state;

-

-			yyg->yy_c_buf_p = yyg->yytext_ptr + yy_amount_of_matched_text;

-

-			yy_current_state = yy_get_previous_state( yyscanner );

-

-			/* Okay, we're now positioned to make the NUL

-			 * transition.  We couldn't have

-			 * yy_get_previous_state() go ahead and do it

-			 * for us because it doesn't know how to deal

-			 * with the possibility of jamming (and we don't

-			 * want to build jamming into it because then it

-			 * will run more slowly).

-			 */

-

-			yy_next_state = yy_try_NUL_trans( yy_current_state , yyscanner);

-

-			yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;

-

-			if ( yy_next_state )

-				{

-				/* Consume the NUL. */

-				yy_cp = ++yyg->yy_c_buf_p;

-				yy_current_state = yy_next_state;

-				goto yy_match;

-				}

-

-			else

-				{

-				yy_cp = yyg->yy_last_accepting_cpos;

-				yy_current_state = yyg->yy_last_accepting_state;

-				goto yy_find_action;

-				}

-			}

-

-		else switch ( yy_get_next_buffer( yyscanner ) )

-			{

-			case EOB_ACT_END_OF_FILE:

-				{

-				yyg->yy_did_buffer_switch_on_eof = 0;

-

-				if ( _mesa_glsl_wrap(yyscanner ) )

-					{

-					/* Note: because we've taken care in

-					 * yy_get_next_buffer() to have set up

-					 * yytext, we can now set up

-					 * yy_c_buf_p so that if some total

-					 * hoser (like flex itself) wants to

-					 * call the scanner after we return the

-					 * YY_NULL, it'll still work - another

-					 * YY_NULL will get returned.

-					 */

-					yyg->yy_c_buf_p = yyg->yytext_ptr + YY_MORE_ADJ;

-

-					yy_act = YY_STATE_EOF(YY_START);

-					goto do_action;

-					}

-

-				else

-					{

-					if ( ! yyg->yy_did_buffer_switch_on_eof )

-						YY_NEW_FILE;

-					}

-				break;

-				}

-

-			case EOB_ACT_CONTINUE_SCAN:

-				yyg->yy_c_buf_p =

-					yyg->yytext_ptr + yy_amount_of_matched_text;

-

-				yy_current_state = yy_get_previous_state( yyscanner );

-

-				yy_cp = yyg->yy_c_buf_p;

-				yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;

-				goto yy_match;

-

-			case EOB_ACT_LAST_MATCH:

-				yyg->yy_c_buf_p =

-				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars];

-

-				yy_current_state = yy_get_previous_state( yyscanner );

-

-				yy_cp = yyg->yy_c_buf_p;

-				yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;

-				goto yy_find_action;

-			}

-		break;

-		}

-

-	default:

-		YY_FATAL_ERROR(

-			"fatal flex scanner internal error--no action found" );

-	} /* end of action switch */

-		} /* end of scanning one token */

-} /* end of _mesa_glsl_lex */

-

-/* yy_get_next_buffer - try to read in a new buffer

- *

- * Returns a code representing an action:

- *	EOB_ACT_LAST_MATCH -

- *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position

- *	EOB_ACT_END_OF_FILE - end of file

- */

-static int yy_get_next_buffer (yyscan_t yyscanner)

-{

-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;

-	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;

-	register char *source = yyg->yytext_ptr;

-	register int number_to_move, i;

-	int ret_val;

-

-	if ( yyg->yy_c_buf_p > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] )

-		YY_FATAL_ERROR(

-		"fatal flex scanner internal error--end of buffer missed" );

-

-	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )

-		{ /* Don't try to fill the buffer, so this is an EOF. */

-		if ( yyg->yy_c_buf_p - yyg->yytext_ptr - YY_MORE_ADJ == 1 )

-			{

-			/* We matched a single character, the EOB, so

-			 * treat this as a final EOF.

-			 */

-			return EOB_ACT_END_OF_FILE;

-			}

-

-		else

-			{

-			/* We matched some text prior to the EOB, first

-			 * process it.

-			 */

-			return EOB_ACT_LAST_MATCH;

-			}

-		}

-

-	/* Try to read more data. */

-

-	/* First move last chars to start of buffer. */

-	number_to_move = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr) - 1;

-

-	for ( i = 0; i < number_to_move; ++i )

-		*(dest++) = *(source++);

-

-	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )

-		/* don't do the read, it's not guaranteed to return an EOF,

-		 * just force an EOF

-		 */

-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars = 0;

-

-	else

-		{

-			int num_to_read =

-			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;

-

-		while ( num_to_read <= 0 )

-			{ /* Not enough room in the buffer - grow it. */

-

-			/* just a shorter name for the current buffer */

-			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;

-

-			int yy_c_buf_p_offset =

-				(int) (yyg->yy_c_buf_p - b->yy_ch_buf);

-

-			if ( b->yy_is_our_buffer )

-				{

-				int new_size = b->yy_buf_size * 2;

-

-				if ( new_size <= 0 )

-					b->yy_buf_size += b->yy_buf_size / 8;

-				else

-					b->yy_buf_size *= 2;

-

-				b->yy_ch_buf = (char *)

-					/* Include room in for 2 EOB chars. */

-					_mesa_glsl_realloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ,yyscanner );

-				}

-			else

-				/* Can't grow it, we don't own it. */

-				b->yy_ch_buf = 0;

-

-			if ( ! b->yy_ch_buf )

-				YY_FATAL_ERROR(

-				"fatal error - scanner input buffer overflow" );

-

-			yyg->yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];

-

-			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -

-						number_to_move - 1;

-

-			}

-

-		if ( num_to_read > YY_READ_BUF_SIZE )

-			num_to_read = YY_READ_BUF_SIZE;

-

-		/* Read in more data. */

-		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),

-			yyg->yy_n_chars, (size_t) num_to_read );

-

-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;

-		}

-

-	if ( yyg->yy_n_chars == 0 )

-		{

-		if ( number_to_move == YY_MORE_ADJ )

-			{

-			ret_val = EOB_ACT_END_OF_FILE;

-			_mesa_glsl_restart(yyin  ,yyscanner);

-			}

-

-		else

-			{

-			ret_val = EOB_ACT_LAST_MATCH;

-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =

-				YY_BUFFER_EOF_PENDING;

-			}

-		}

-

-	else

-		ret_val = EOB_ACT_CONTINUE_SCAN;

-

-	if ((yy_size_t) (yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {

-		/* Extend the array by 50%, plus the number we really need. */

-		yy_size_t new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1);

-		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) _mesa_glsl_realloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ,yyscanner );

-		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )

-			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );

-	}

-

-	yyg->yy_n_chars += number_to_move;

-	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] = YY_END_OF_BUFFER_CHAR;

-	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;

-

-	yyg->yytext_ptr = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];

-

-	return ret_val;

-}

-

-/* yy_get_previous_state - get the state just before the EOB char was reached */

-

-    static yy_state_type yy_get_previous_state (yyscan_t yyscanner)

-{

-	register yy_state_type yy_current_state;

-	register char *yy_cp;

-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;

-

-	yy_current_state = yyg->yy_start;

-	yy_current_state += YY_AT_BOL();

-

-	for ( yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p; ++yy_cp )

-		{

-		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);

-		if ( yy_accept[yy_current_state] )

-			{

-			yyg->yy_last_accepting_state = yy_current_state;

-			yyg->yy_last_accepting_cpos = yy_cp;

-			}

-		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )

-			{

-			yy_current_state = (int) yy_def[yy_current_state];

-			if ( yy_current_state >= 836 )

-				yy_c = yy_meta[(unsigned int) yy_c];

-			}

-		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];

-		}

-

-	return yy_current_state;

-}

-

-/* yy_try_NUL_trans - try to make a transition on the NUL character

- *

- * synopsis

- *	next_state = yy_try_NUL_trans( current_state );

- */

-    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state , yyscan_t yyscanner)

-{

-	register int yy_is_jam;

-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* This var may be unused depending upon options. */

-	register char *yy_cp = yyg->yy_c_buf_p;

-

-	register YY_CHAR yy_c = 1;

-	if ( yy_accept[yy_current_state] )

-		{

-		yyg->yy_last_accepting_state = yy_current_state;

-		yyg->yy_last_accepting_cpos = yy_cp;

-		}

-	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )

-		{

-		yy_current_state = (int) yy_def[yy_current_state];

-		if ( yy_current_state >= 836 )

-			yy_c = yy_meta[(unsigned int) yy_c];

-		}

-	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];

-	yy_is_jam = (yy_current_state == 835);

-

-	return yy_is_jam ? 0 : yy_current_state;

-}

-

-#ifndef YY_NO_INPUT

-#ifdef __cplusplus

-    static int yyinput (yyscan_t yyscanner)

-#else

-    static int input  (yyscan_t yyscanner)

-#endif

-

-{

-	int c;

-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;

-

-	*yyg->yy_c_buf_p = yyg->yy_hold_char;

-

-	if ( *yyg->yy_c_buf_p == YY_END_OF_BUFFER_CHAR )

-		{

-		/* yy_c_buf_p now points to the character we want to return.

-		 * If this occurs *before* the EOB characters, then it's a

-		 * valid NUL; if not, then we've hit the end of the buffer.

-		 */

-		if ( yyg->yy_c_buf_p < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] )

-			/* This was really a NUL. */

-			*yyg->yy_c_buf_p = '\0';

-

-		else

-			{ /* need more input */

-			int offset = yyg->yy_c_buf_p - yyg->yytext_ptr;

-			++yyg->yy_c_buf_p;

-

-			switch ( yy_get_next_buffer( yyscanner ) )

-				{

-				case EOB_ACT_LAST_MATCH:

-					/* This happens because yy_g_n_b()

-					 * sees that we've accumulated a

-					 * token and flags that we need to

-					 * try matching the token before

-					 * proceeding.  But for input(),

-					 * there's no matching to consider.

-					 * So convert the EOB_ACT_LAST_MATCH

-					 * to EOB_ACT_END_OF_FILE.

-					 */

-

-					/* Reset buffer status. */

-					_mesa_glsl_restart(yyin ,yyscanner);

-

-					/*FALLTHROUGH*/

-

-				case EOB_ACT_END_OF_FILE:

-					{

-					if ( _mesa_glsl_wrap(yyscanner ) )

-						return EOF;

-

-					if ( ! yyg->yy_did_buffer_switch_on_eof )

-						YY_NEW_FILE;

-#ifdef __cplusplus

-					return yyinput(yyscanner);

-#else

-					return input(yyscanner);

-#endif

-					}

-

-				case EOB_ACT_CONTINUE_SCAN:

-					yyg->yy_c_buf_p = yyg->yytext_ptr + offset;

-					break;

-				}

-			}

-		}

-

-	c = *(unsigned char *) yyg->yy_c_buf_p;	/* cast for 8-bit char's */

-	*yyg->yy_c_buf_p = '\0';	/* preserve yytext */

-	yyg->yy_hold_char = *++yyg->yy_c_buf_p;

-

-	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = (c == '\n');

-

-	return c;

-}

-#endif	/* ifndef YY_NO_INPUT */

-

-/** Immediately switch to a different input stream.

- * @param input_file A readable stream.

- * @param yyscanner The scanner object.

- * @note This function does not reset the start condition to @c INITIAL .

- */

-    void _mesa_glsl_restart  (FILE * input_file , yyscan_t yyscanner)

-{

-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;

-

-	if ( ! YY_CURRENT_BUFFER ){

-        _mesa_glsl_ensure_buffer_stack (yyscanner);

-		YY_CURRENT_BUFFER_LVALUE =

-            _mesa_glsl__create_buffer(yyin,YY_BUF_SIZE ,yyscanner);

-	}

-

-	_mesa_glsl__init_buffer(YY_CURRENT_BUFFER,input_file ,yyscanner);

-	_mesa_glsl__load_buffer_state(yyscanner );

-}

-

-/** Switch to a different input buffer.

- * @param new_buffer The new input buffer.

- * @param yyscanner The scanner object.

- */

-    void _mesa_glsl__switch_to_buffer  (YY_BUFFER_STATE  new_buffer , yyscan_t yyscanner)

-{

-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;

-

-	/* TODO. We should be able to replace this entire function body

-	 * with

-	 *		_mesa_glsl_pop_buffer_state();

-	 *		_mesa_glsl_push_buffer_state(new_buffer);

-     */

-	_mesa_glsl_ensure_buffer_stack (yyscanner);

-	if ( YY_CURRENT_BUFFER == new_buffer )

-		return;

-

-	if ( YY_CURRENT_BUFFER )

-		{

-		/* Flush out information for old buffer. */

-		*yyg->yy_c_buf_p = yyg->yy_hold_char;

-		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p;

-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;

-		}

-

-	YY_CURRENT_BUFFER_LVALUE = new_buffer;

-	_mesa_glsl__load_buffer_state(yyscanner );

-

-	/* We don't actually know whether we did this switch during

-	 * EOF (_mesa_glsl_wrap()) processing, but the only time this flag

-	 * is looked at is after _mesa_glsl_wrap() is called, so it's safe

-	 * to go ahead and always set it.

-	 */

-	yyg->yy_did_buffer_switch_on_eof = 1;

-}

-

-static void _mesa_glsl__load_buffer_state  (yyscan_t yyscanner)

-{

-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;

-	yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;

-	yyg->yytext_ptr = yyg->yy_c_buf_p = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;

-	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;

-	yyg->yy_hold_char = *yyg->yy_c_buf_p;

-}

-

-/** Allocate and initialize an input buffer state.

- * @param file A readable stream.

- * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.

- * @param yyscanner The scanner object.

- * @return the allocated buffer state.

- */

-    YY_BUFFER_STATE _mesa_glsl__create_buffer  (FILE * file, int  size , yyscan_t yyscanner)

-{

-	YY_BUFFER_STATE b;

-    

-	b = (YY_BUFFER_STATE) _mesa_glsl_alloc(sizeof( struct yy_buffer_state ) ,yyscanner );

-	if ( ! b )

-		YY_FATAL_ERROR( "out of dynamic memory in _mesa_glsl__create_buffer()" );

-

-	b->yy_buf_size = size;

-

-	/* yy_ch_buf has to be 2 characters longer than the size given because

-	 * we need to put in 2 end-of-buffer characters.

-	 */

-	b->yy_ch_buf = (char *) _mesa_glsl_alloc(b->yy_buf_size + 2 ,yyscanner );

-	if ( ! b->yy_ch_buf )

-		YY_FATAL_ERROR( "out of dynamic memory in _mesa_glsl__create_buffer()" );

-

-	b->yy_is_our_buffer = 1;

-

-	_mesa_glsl__init_buffer(b,file ,yyscanner);

-

-	return b;

-}

-

-/** Destroy the buffer.

- * @param b a buffer created with _mesa_glsl__create_buffer()

- * @param yyscanner The scanner object.

- */

-    void _mesa_glsl__delete_buffer (YY_BUFFER_STATE  b , yyscan_t yyscanner)

-{

-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;

-

-	if ( ! b )

-		return;

-

-	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */

-		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;

-

-	if ( b->yy_is_our_buffer )

-		_mesa_glsl_free((void *) b->yy_ch_buf ,yyscanner );

-

-	_mesa_glsl_free((void *) b ,yyscanner );

-}

-

-/* Initializes or reinitializes a buffer.

- * This function is sometimes called more than once on the same buffer,

- * such as during a _mesa_glsl_restart() or at EOF.

- */

-    static void _mesa_glsl__init_buffer  (YY_BUFFER_STATE  b, FILE * file , yyscan_t yyscanner)

-

-{

-	int oerrno = errno;

-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;

-

-	_mesa_glsl__flush_buffer(b ,yyscanner);

-

-	b->yy_input_file = file;

-	b->yy_fill_buffer = 1;

-

-    /* If b is the current buffer, then _mesa_glsl__init_buffer was _probably_

-     * called from _mesa_glsl_restart() or through yy_get_next_buffer.

-     * In that case, we don't want to reset the lineno or column.

-     */

-    if (b != YY_CURRENT_BUFFER){

-        b->yy_bs_lineno = 1;

-        b->yy_bs_column = 0;

-    }

-

-        b->yy_is_interactive = 0;

-    

-	errno = oerrno;

-}

-

-/** Discard all buffered characters. On the next scan, YY_INPUT will be called.

- * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.

- * @param yyscanner The scanner object.

- */

-    void _mesa_glsl__flush_buffer (YY_BUFFER_STATE  b , yyscan_t yyscanner)

-{

-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;

-	if ( ! b )

-		return;

-

-	b->yy_n_chars = 0;

-

-	/* We always need two end-of-buffer characters.  The first causes

-	 * a transition to the end-of-buffer state.  The second causes

-	 * a jam in that state.

-	 */

-	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;

-	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;

-

-	b->yy_buf_pos = &b->yy_ch_buf[0];

-

-	b->yy_at_bol = 1;

-	b->yy_buffer_status = YY_BUFFER_NEW;

-

-	if ( b == YY_CURRENT_BUFFER )

-		_mesa_glsl__load_buffer_state(yyscanner );

-}

-

-/** Pushes the new state onto the stack. The new state becomes

- *  the current state. This function will allocate the stack

- *  if necessary.

- *  @param new_buffer The new state.

- *  @param yyscanner The scanner object.

- */

-void _mesa_glsl_push_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner)

-{

-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;

-	if (new_buffer == NULL)

-		return;

-

-	_mesa_glsl_ensure_buffer_stack(yyscanner);

-

-	/* This block is copied from _mesa_glsl__switch_to_buffer. */

-	if ( YY_CURRENT_BUFFER )

-		{

-		/* Flush out information for old buffer. */

-		*yyg->yy_c_buf_p = yyg->yy_hold_char;

-		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p;

-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;

-		}

-

-	/* Only push if top exists. Otherwise, replace top. */

-	if (YY_CURRENT_BUFFER)

-		yyg->yy_buffer_stack_top++;

-	YY_CURRENT_BUFFER_LVALUE = new_buffer;

-

-	/* copied from _mesa_glsl__switch_to_buffer. */

-	_mesa_glsl__load_buffer_state(yyscanner );

-	yyg->yy_did_buffer_switch_on_eof = 1;

-}

-

-/** Removes and deletes the top of the stack, if present.

- *  The next element becomes the new top.

- *  @param yyscanner The scanner object.

- */

-void _mesa_glsl_pop_buffer_state (yyscan_t yyscanner)

-{

-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;

-	if (!YY_CURRENT_BUFFER)

-		return;

-

-	_mesa_glsl__delete_buffer(YY_CURRENT_BUFFER ,yyscanner);

-	YY_CURRENT_BUFFER_LVALUE = NULL;

-	if (yyg->yy_buffer_stack_top > 0)

-		--yyg->yy_buffer_stack_top;

-

-	if (YY_CURRENT_BUFFER) {

-		_mesa_glsl__load_buffer_state(yyscanner );

-		yyg->yy_did_buffer_switch_on_eof = 1;

-	}

-}

-

-/* Allocates the stack if it does not exist.

- *  Guarantees space for at least one push.

- */

-static void _mesa_glsl_ensure_buffer_stack (yyscan_t yyscanner)

-{

-	int num_to_alloc;

-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;

-

-	if (!yyg->yy_buffer_stack) {

-

-		/* First allocation is just for 2 elements, since we don't know if this

-		 * scanner will even need a stack. We use 2 instead of 1 to avoid an

-		 * immediate realloc on the next call.

-         */

-		num_to_alloc = 1;

-		yyg->yy_buffer_stack = (struct yy_buffer_state**)_mesa_glsl_alloc

-								(num_to_alloc * sizeof(struct yy_buffer_state*)

-								, yyscanner);

-		if ( ! yyg->yy_buffer_stack )

-			YY_FATAL_ERROR( "out of dynamic memory in _mesa_glsl_ensure_buffer_stack()" );

-								  

-		memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*));

-				

-		yyg->yy_buffer_stack_max = num_to_alloc;

-		yyg->yy_buffer_stack_top = 0;

-		return;

-	}

-

-	if (yyg->yy_buffer_stack_top >= (yyg->yy_buffer_stack_max) - 1){

-

-		/* Increase the buffer to prepare for a possible push. */

-		int grow_size = 8 /* arbitrary grow size */;

-

-		num_to_alloc = yyg->yy_buffer_stack_max + grow_size;

-		yyg->yy_buffer_stack = (struct yy_buffer_state**)_mesa_glsl_realloc

-								(yyg->yy_buffer_stack,

-								num_to_alloc * sizeof(struct yy_buffer_state*)

-								, yyscanner);

-		if ( ! yyg->yy_buffer_stack )

-			YY_FATAL_ERROR( "out of dynamic memory in _mesa_glsl_ensure_buffer_stack()" );

-

-		/* zero only the new slots.*/

-		memset(yyg->yy_buffer_stack + yyg->yy_buffer_stack_max, 0, grow_size * sizeof(struct yy_buffer_state*));

-		yyg->yy_buffer_stack_max = num_to_alloc;

-	}

-}

-

-/** Setup the input buffer state to scan directly from a user-specified character buffer.

- * @param base the character buffer

- * @param size the size in bytes of the character buffer

- * @param yyscanner The scanner object.

- * @return the newly allocated buffer state object. 

- */

-YY_BUFFER_STATE _mesa_glsl__scan_buffer  (char * base, yy_size_t  size , yyscan_t yyscanner)

-{

-	YY_BUFFER_STATE b;

-    

-	if ( size < 2 ||

-	     base[size-2] != YY_END_OF_BUFFER_CHAR ||

-	     base[size-1] != YY_END_OF_BUFFER_CHAR )

-		/* They forgot to leave room for the EOB's. */

-		return 0;

-

-	b = (YY_BUFFER_STATE) _mesa_glsl_alloc(sizeof( struct yy_buffer_state ) ,yyscanner );

-	if ( ! b )

-		YY_FATAL_ERROR( "out of dynamic memory in _mesa_glsl__scan_buffer()" );

-

-	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */

-	b->yy_buf_pos = b->yy_ch_buf = base;

-	b->yy_is_our_buffer = 0;

-	b->yy_input_file = 0;

-	b->yy_n_chars = b->yy_buf_size;

-	b->yy_is_interactive = 0;

-	b->yy_at_bol = 1;

-	b->yy_fill_buffer = 0;

-	b->yy_buffer_status = YY_BUFFER_NEW;

-

-	_mesa_glsl__switch_to_buffer(b ,yyscanner );

-

-	return b;

-}

-

-/** Setup the input buffer state to scan a string. The next call to _mesa_glsl_lex() will

- * scan from a @e copy of @a str.

- * @param yystr a NUL-terminated string to scan

- * @param yyscanner The scanner object.

- * @return the newly allocated buffer state object.

- * @note If you want to scan bytes that may contain NUL values, then use

- *       _mesa_glsl__scan_bytes() instead.

- */

-YY_BUFFER_STATE _mesa_glsl__scan_string (yyconst char * yystr , yyscan_t yyscanner)

-{

-    

-	return _mesa_glsl__scan_bytes(yystr,strlen(yystr) ,yyscanner);

-}

-

-/** Setup the input buffer state to scan the given bytes. The next call to _mesa_glsl_lex() will

- * scan from a @e copy of @a bytes.

- * @param bytes the byte buffer to scan

- * @param len the number of bytes in the buffer pointed to by @a bytes.

- * @param yyscanner The scanner object.

- * @return the newly allocated buffer state object.

- */

-YY_BUFFER_STATE _mesa_glsl__scan_bytes  (yyconst char * yybytes, int  _yybytes_len , yyscan_t yyscanner)

-{

-	YY_BUFFER_STATE b;

-	char *buf;

-	yy_size_t n;

-	int i;

-    

-	/* Get memory for full buffer, including space for trailing EOB's. */

-	n = _yybytes_len + 2;

-	buf = (char *) _mesa_glsl_alloc(n ,yyscanner );

-	if ( ! buf )

-		YY_FATAL_ERROR( "out of dynamic memory in _mesa_glsl__scan_bytes()" );

-

-	for ( i = 0; i < _yybytes_len; ++i )

-		buf[i] = yybytes[i];

-

-	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;

-

-	b = _mesa_glsl__scan_buffer(buf,n ,yyscanner);

-	if ( ! b )

-		YY_FATAL_ERROR( "bad buffer in _mesa_glsl__scan_bytes()" );

-

-	/* It's okay to grow etc. this buffer, and we should throw it

-	 * away when we're done.

-	 */

-	b->yy_is_our_buffer = 1;

-

-	return b;

-}

-

-#ifndef YY_EXIT_FAILURE

-#define YY_EXIT_FAILURE 2

-#endif

-

-static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner)

-{

-    	(void) fprintf( stderr, "%s\n", msg );

-	exit( YY_EXIT_FAILURE );

-}

-

-/* Redefine yyless() so it works in section 3 code. */

-

-#undef yyless

-#define yyless(n) \

-	do \

-		{ \

-		/* Undo effects of setting up yytext. */ \

-        int yyless_macro_arg = (n); \

-        YY_LESS_LINENO(yyless_macro_arg);\

-		yytext[yyleng] = yyg->yy_hold_char; \

-		yyg->yy_c_buf_p = yytext + yyless_macro_arg; \

-		yyg->yy_hold_char = *yyg->yy_c_buf_p; \

-		*yyg->yy_c_buf_p = '\0'; \

-		yyleng = yyless_macro_arg; \

-		} \

-	while ( 0 )

-

-/* Accessor  methods (get/set functions) to struct members. */

-

-/** Get the user-defined data for this scanner.

- * @param yyscanner The scanner object.

- */

-YY_EXTRA_TYPE _mesa_glsl_get_extra  (yyscan_t yyscanner)

-{

-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;

-    return yyextra;

-}

-

-/** Get the current line number.

- * @param yyscanner The scanner object.

- */

-int _mesa_glsl_get_lineno  (yyscan_t yyscanner)

-{

-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;

-    

-        if (! YY_CURRENT_BUFFER)

-            return 0;

-    

-    return yylineno;

-}

-

-/** Get the current column number.

- * @param yyscanner The scanner object.

- */

-int _mesa_glsl_get_column  (yyscan_t yyscanner)

-{

-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;

-    

-        if (! YY_CURRENT_BUFFER)

-            return 0;

-    

-    return yycolumn;

-}

-

-/** Get the input stream.

- * @param yyscanner The scanner object.

- */

-FILE *_mesa_glsl_get_in  (yyscan_t yyscanner)

-{

-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;

-    return yyin;

-}

-

-/** Get the output stream.

- * @param yyscanner The scanner object.

- */

-FILE *_mesa_glsl_get_out  (yyscan_t yyscanner)

-{

-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;

-    return yyout;

-}

-

-/** Get the length of the current token.

- * @param yyscanner The scanner object.

- */

-int _mesa_glsl_get_leng  (yyscan_t yyscanner)

-{

-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;

-    return yyleng;

-}

-

-/** Get the current token.

- * @param yyscanner The scanner object.

- */

-

-char *_mesa_glsl_get_text  (yyscan_t yyscanner)

-{

-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;

-    return yytext;

-}

-

-/** Set the user-defined data. This data is never touched by the scanner.

- * @param user_defined The data to be associated with this scanner.

- * @param yyscanner The scanner object.

- */

-void _mesa_glsl_set_extra (YY_EXTRA_TYPE  user_defined , yyscan_t yyscanner)

-{

-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;

-    yyextra = user_defined ;

-}

-

-/** Set the current line number.

- * @param line_number

- * @param yyscanner The scanner object.

- */

-void _mesa_glsl_set_lineno (int  line_number , yyscan_t yyscanner)

-{

-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;

-

-        /* lineno is only valid if an input buffer exists. */

-        if (! YY_CURRENT_BUFFER )

-           yy_fatal_error( "_mesa_glsl_set_lineno called with no buffer" , yyscanner); 

-    

-    yylineno = line_number;

-}

-

-/** Set the current column.

- * @param line_number

- * @param yyscanner The scanner object.

- */

-void _mesa_glsl_set_column (int  column_no , yyscan_t yyscanner)

-{

-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;

-

-        /* column is only valid if an input buffer exists. */

-        if (! YY_CURRENT_BUFFER )

-           yy_fatal_error( "_mesa_glsl_set_column called with no buffer" , yyscanner); 

-    

-    yycolumn = column_no;

-}

-

-/** Set the input stream. This does not discard the current

- * input buffer.

- * @param in_str A readable stream.

- * @param yyscanner The scanner object.

- * @see _mesa_glsl__switch_to_buffer

- */

-void _mesa_glsl_set_in (FILE *  in_str , yyscan_t yyscanner)

-{

-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;

-    yyin = in_str ;

-}

-

-void _mesa_glsl_set_out (FILE *  out_str , yyscan_t yyscanner)

-{

-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;

-    yyout = out_str ;

-}

-

-int _mesa_glsl_get_debug  (yyscan_t yyscanner)

-{

-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;

-    return yy_flex_debug;

-}

-

-void _mesa_glsl_set_debug (int  bdebug , yyscan_t yyscanner)

-{

-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;

-    yy_flex_debug = bdebug ;

-}

-

-/* Accessor methods for yylval and yylloc */

-

-YYSTYPE * _mesa_glsl_get_lval  (yyscan_t yyscanner)

-{

-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;

-    return yylval;

-}

-

-void _mesa_glsl_set_lval (YYSTYPE *  yylval_param , yyscan_t yyscanner)

-{

-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;

-    yylval = yylval_param;

-}

-

-YYLTYPE *_mesa_glsl_get_lloc  (yyscan_t yyscanner)

-{

-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;

-    return yylloc;

-}

-    

-void _mesa_glsl_set_lloc (YYLTYPE *  yylloc_param , yyscan_t yyscanner)

-{

-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;

-    yylloc = yylloc_param;

-}

-    

-/* User-visible API */

-

-/* _mesa_glsl_lex_init is special because it creates the scanner itself, so it is

- * the ONLY reentrant function that doesn't take the scanner as the last argument.

- * That's why we explicitly handle the declaration, instead of using our macros.

- */

-

-int _mesa_glsl_lex_init(yyscan_t* ptr_yy_globals)

-

-{

-    if (ptr_yy_globals == NULL){

-        errno = EINVAL;

-        return 1;

-    }

-

-    *ptr_yy_globals = (yyscan_t) _mesa_glsl_alloc ( sizeof( struct yyguts_t ), NULL );

-

-    if (*ptr_yy_globals == NULL){

-        errno = ENOMEM;

-        return 1;

-    }

-

-    /* By setting to 0xAA, we expose bugs in yy_init_globals. Leave at 0x00 for releases. */

-    memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t));

-

-    return yy_init_globals ( *ptr_yy_globals );

-}

-

-/* _mesa_glsl_lex_init_extra has the same functionality as _mesa_glsl_lex_init, but follows the

- * convention of taking the scanner as the last argument. Note however, that

- * this is a *pointer* to a scanner, as it will be allocated by this call (and

- * is the reason, too, why this function also must handle its own declaration).

- * The user defined value in the first argument will be available to _mesa_glsl_alloc in

- * the yyextra field.

- */

-

-int _mesa_glsl_lex_init_extra(YY_EXTRA_TYPE yy_user_defined,yyscan_t* ptr_yy_globals )

-

-{

-    struct yyguts_t dummy_yyguts;

-

-    _mesa_glsl_set_extra (yy_user_defined, &dummy_yyguts);

-

-    if (ptr_yy_globals == NULL){

-        errno = EINVAL;

-        return 1;

-    }

-	

-    *ptr_yy_globals = (yyscan_t) _mesa_glsl_alloc ( sizeof( struct yyguts_t ), &dummy_yyguts );

-	

-    if (*ptr_yy_globals == NULL){

-        errno = ENOMEM;

-        return 1;

-    }

-    

-    /* By setting to 0xAA, we expose bugs in

-    yy_init_globals. Leave at 0x00 for releases. */

-    memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t));

-    

-    _mesa_glsl_set_extra (yy_user_defined, *ptr_yy_globals);

-    

-    return yy_init_globals ( *ptr_yy_globals );

-}

-

-static int yy_init_globals (yyscan_t yyscanner)

-{

-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;

-    /* Initialization is the same as for the non-reentrant scanner.

-     * This function is called from _mesa_glsl_lex_destroy(), so don't allocate here.

-     */

-

-    yyg->yy_buffer_stack = 0;

-    yyg->yy_buffer_stack_top = 0;

-    yyg->yy_buffer_stack_max = 0;

-    yyg->yy_c_buf_p = (char *) 0;

-    yyg->yy_init = 0;

-    yyg->yy_start = 0;

-

-    yyg->yy_start_stack_ptr = 0;

-    yyg->yy_start_stack_depth = 0;

-    yyg->yy_start_stack =  NULL;

-

-/* Defined in main.c */

-#ifdef YY_STDINIT

-    yyin = stdin;

-    yyout = stdout;

-#else

-    yyin = (FILE *) 0;

-    yyout = (FILE *) 0;

-#endif

-

-    /* For future reference: Set errno on error, since we are called by

-     * _mesa_glsl_lex_init()

-     */

-    return 0;

-}

-

-/* _mesa_glsl_lex_destroy is for both reentrant and non-reentrant scanners. */

-int _mesa_glsl_lex_destroy  (yyscan_t yyscanner)

-{

-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;

-

-    /* Pop the buffer stack, destroying each element. */

-	while(YY_CURRENT_BUFFER){

-		_mesa_glsl__delete_buffer(YY_CURRENT_BUFFER ,yyscanner );

-		YY_CURRENT_BUFFER_LVALUE = NULL;

-		_mesa_glsl_pop_buffer_state(yyscanner);

-	}

-

-	/* Destroy the stack itself. */

-	_mesa_glsl_free(yyg->yy_buffer_stack ,yyscanner);

-	yyg->yy_buffer_stack = NULL;

-

-    /* Destroy the start condition stack. */

-        _mesa_glsl_free(yyg->yy_start_stack ,yyscanner );

-        yyg->yy_start_stack = NULL;

-

-    /* Reset the globals. This is important in a non-reentrant scanner so the next time

-     * _mesa_glsl_lex() is called, initialization will occur. */

-    yy_init_globals( yyscanner);

-

-    /* Destroy the main struct (reentrant only). */

-    _mesa_glsl_free ( yyscanner , yyscanner );

-    yyscanner = NULL;

-    return 0;

-}

-

-/*

- * Internal utility routines.

- */

-

-#ifndef yytext_ptr

-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yyscanner)

-{

-	register int i;

-	for ( i = 0; i < n; ++i )

-		s1[i] = s2[i];

-}

-#endif

-

-#ifdef YY_NEED_STRLEN

-static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner)

-{

-	register int n;

-	for ( n = 0; s[n]; ++n )

-		;

-

-	return n;

-}

-#endif

-

-void *_mesa_glsl_alloc (yy_size_t  size , yyscan_t yyscanner)

-{

-	return (void *) malloc( size );

-}

-

-void *_mesa_glsl_realloc  (void * ptr, yy_size_t  size , yyscan_t yyscanner)

-{

-	/* The cast to (char *) in the following accommodates both

-	 * implementations that use char* generic pointers, and those

-	 * that use void* generic pointers.  It works with the latter

-	 * because both ANSI C and C++ allow castless assignment from

-	 * any pointer type to void*, and deal with argument conversions

-	 * as though doing an assignment.

-	 */

-	return (void *) realloc( (char *) ptr, size );

-}

-

-void _mesa_glsl_free (void * ptr , yyscan_t yyscanner)

-{

-	free( (char *) ptr );	/* see _mesa_glsl_realloc() for (char *) cast */

-}

-

-#define YYTABLES_NAME "yytables"

-

-#line 429 "glsl_lexer.lpp"

-

-

-

-int

-classify_identifier(struct _mesa_glsl_parse_state *state, const char *name)

-{

-   if (state->symbols->get_variable(name) || state->symbols->get_function(name))

-      return IDENTIFIER;

-   else if (state->symbols->get_type(name))

-      return TYPE_IDENTIFIER;

-   else

-      return NEW_IDENTIFIER;

-}

-

-void

-_mesa_glsl_lexer_ctor(struct _mesa_glsl_parse_state *state, const char *string)

-{

-   _mesa_glsl_lex_init_extra(state,& state->scanner);

-   _mesa_glsl__scan_string(string,state->scanner);

-}

-

-void

-_mesa_glsl_lexer_dtor(struct _mesa_glsl_parse_state *state)

-{

-   _mesa_glsl_lex_destroy(state->scanner);

-}

-

diff --git a/mesalib/src/glsl/glsl_lexer.lpp b/mesalib/src/glsl/glsl_lexer.ll
index e6f45f413..e6f45f413 100644
--- a/mesalib/src/glsl/glsl_lexer.lpp
+++ b/mesalib/src/glsl/glsl_lexer.ll
diff --git a/mesalib/src/glsl/glsl_parser.cpp b/mesalib/src/glsl/glsl_parser.cpp
deleted file mode 100644
index 1d445d400..000000000
--- a/mesalib/src/glsl/glsl_parser.cpp
+++ /dev/null
@@ -1,5456 +0,0 @@
-/* A Bison parser, made by GNU Bison 2.4.3.  */

-

-/* Skeleton implementation for Bison's Yacc-like parsers in C

-   

-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,

-   2009, 2010 Free Software Foundation, Inc.

-   

-   This program is free software: you can redistribute it and/or modify

-   it under the terms of the GNU General Public License as published by

-   the Free Software Foundation, either version 3 of the License, or

-   (at your option) any later version.

-   

-   This program is distributed in the hope that it will be useful,

-   but WITHOUT ANY WARRANTY; without even the implied warranty of

-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-   GNU General Public License for more details.

-   

-   You should have received a copy of the GNU General Public License

-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

-

-/* As a special exception, you may create a larger work that contains

-   part or all of the Bison parser skeleton and distribute that work

-   under terms of your choice, so long as that work isn't itself a

-   parser generator using the skeleton or a modified version thereof

-   as a parser skeleton.  Alternatively, if you modify or redistribute

-   the parser skeleton itself, you may (at your option) remove this

-   special exception, which will cause the skeleton and the resulting

-   Bison output files to be licensed under the GNU General Public

-   License without this special exception.

-   

-   This special exception was added by the Free Software Foundation in

-   version 2.2 of Bison.  */

-

-/* C LALR(1) parser skeleton written by Richard Stallman, by

-   simplifying the original so-called "semantic" parser.  */

-

-/* All symbols defined below should begin with yy or YY, to avoid

-   infringing on user name space.  This should be done even for local

-   variables, as they might otherwise be expanded by user macros.

-   There are some unavoidable exceptions within include files to

-   define necessary library symbols; they are noted "INFRINGES ON

-   USER NAME SPACE" below.  */

-

-/* Identify Bison output.  */

-#define YYBISON 1

-

-/* Bison version.  */

-#define YYBISON_VERSION "2.4.3"

-

-/* Skeleton name.  */

-#define YYSKELETON_NAME "yacc.c"

-

-/* Pure parsers.  */

-#define YYPURE 1

-

-/* Push parsers.  */

-#define YYPUSH 0

-

-/* Pull parsers.  */

-#define YYPULL 1

-

-/* Using locations.  */

-#define YYLSP_NEEDED 1

-

-/* Substitute the variable and function names.  */

-#define yyparse         _mesa_glsl_parse

-#define yylex           _mesa_glsl_lex

-#define yyerror         _mesa_glsl_error

-#define yylval          _mesa_glsl_lval

-#define yychar          _mesa_glsl_char

-#define yydebug         _mesa_glsl_debug

-#define yynerrs         _mesa_glsl_nerrs

-#define yylloc          _mesa_glsl_lloc

-

-/* Copy the first part of user declarations.  */

-

-/* Line 189 of yacc.c  */

-#line 1 "glsl_parser.ypp"

-

-/*

- * Copyright © 2008, 2009 Intel Corporation

- *

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

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

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

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

- * Software.

- *

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

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

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

- * DEALINGS IN THE SOFTWARE.

- */

-#include <stdio.h>

-#include <stdlib.h>

-#include <string.h>

-#include <assert.h>

-    

-#include "ast.h"

-#include "glsl_parser_extras.h"

-#include "glsl_types.h"

-

-#define YYLEX_PARAM state->scanner

-

-

-

-/* Line 189 of yacc.c  */

-#line 117 "glsl_parser.cpp"

-

-/* Enabling traces.  */

-#ifndef YYDEBUG

-# define YYDEBUG 0

-#endif

-

-/* Enabling verbose error messages.  */

-#ifdef YYERROR_VERBOSE

-# undef YYERROR_VERBOSE

-# define YYERROR_VERBOSE 1

-#else

-# define YYERROR_VERBOSE 1

-#endif

-

-/* Enabling the token table.  */

-#ifndef YYTOKEN_TABLE

-# define YYTOKEN_TABLE 0

-#endif

-

-

-/* Tokens.  */

-#ifndef YYTOKENTYPE

-# define YYTOKENTYPE

-   /* Put the tokens into the symbol table, so that GDB and other debuggers

-      know about them.  */

-   enum yytokentype {

-     ATTRIBUTE = 258,

-     CONST_TOK = 259,

-     BOOL_TOK = 260,

-     FLOAT_TOK = 261,

-     INT_TOK = 262,

-     UINT_TOK = 263,

-     BREAK = 264,

-     CONTINUE = 265,

-     DO = 266,

-     ELSE = 267,

-     FOR = 268,

-     IF = 269,

-     DISCARD = 270,

-     RETURN = 271,

-     SWITCH = 272,

-     CASE = 273,

-     DEFAULT = 274,

-     BVEC2 = 275,

-     BVEC3 = 276,

-     BVEC4 = 277,

-     IVEC2 = 278,

-     IVEC3 = 279,

-     IVEC4 = 280,

-     UVEC2 = 281,

-     UVEC3 = 282,

-     UVEC4 = 283,

-     VEC2 = 284,

-     VEC3 = 285,

-     VEC4 = 286,

-     CENTROID = 287,

-     IN_TOK = 288,

-     OUT_TOK = 289,

-     INOUT_TOK = 290,

-     UNIFORM = 291,

-     VARYING = 292,

-     NOPERSPECTIVE = 293,

-     FLAT = 294,

-     SMOOTH = 295,

-     MAT2X2 = 296,

-     MAT2X3 = 297,

-     MAT2X4 = 298,

-     MAT3X2 = 299,

-     MAT3X3 = 300,

-     MAT3X4 = 301,

-     MAT4X2 = 302,

-     MAT4X3 = 303,

-     MAT4X4 = 304,

-     SAMPLER1D = 305,

-     SAMPLER2D = 306,

-     SAMPLER3D = 307,

-     SAMPLERCUBE = 308,

-     SAMPLER1DSHADOW = 309,

-     SAMPLER2DSHADOW = 310,

-     SAMPLERCUBESHADOW = 311,

-     SAMPLER1DARRAY = 312,

-     SAMPLER2DARRAY = 313,

-     SAMPLER1DARRAYSHADOW = 314,

-     SAMPLER2DARRAYSHADOW = 315,

-     ISAMPLER1D = 316,

-     ISAMPLER2D = 317,

-     ISAMPLER3D = 318,

-     ISAMPLERCUBE = 319,

-     ISAMPLER1DARRAY = 320,

-     ISAMPLER2DARRAY = 321,

-     USAMPLER1D = 322,

-     USAMPLER2D = 323,

-     USAMPLER3D = 324,

-     USAMPLERCUBE = 325,

-     USAMPLER1DARRAY = 326,

-     USAMPLER2DARRAY = 327,

-     STRUCT = 328,

-     VOID_TOK = 329,

-     WHILE = 330,

-     IDENTIFIER = 331,

-     TYPE_IDENTIFIER = 332,

-     NEW_IDENTIFIER = 333,

-     FLOATCONSTANT = 334,

-     INTCONSTANT = 335,

-     UINTCONSTANT = 336,

-     BOOLCONSTANT = 337,

-     FIELD_SELECTION = 338,

-     LEFT_OP = 339,

-     RIGHT_OP = 340,

-     INC_OP = 341,

-     DEC_OP = 342,

-     LE_OP = 343,

-     GE_OP = 344,

-     EQ_OP = 345,

-     NE_OP = 346,

-     AND_OP = 347,

-     OR_OP = 348,

-     XOR_OP = 349,

-     MUL_ASSIGN = 350,

-     DIV_ASSIGN = 351,

-     ADD_ASSIGN = 352,

-     MOD_ASSIGN = 353,

-     LEFT_ASSIGN = 354,

-     RIGHT_ASSIGN = 355,

-     AND_ASSIGN = 356,

-     XOR_ASSIGN = 357,

-     OR_ASSIGN = 358,

-     SUB_ASSIGN = 359,

-     INVARIANT = 360,

-     LOWP = 361,

-     MEDIUMP = 362,

-     HIGHP = 363,

-     SUPERP = 364,

-     PRECISION = 365,

-     VERSION = 366,

-     EXTENSION = 367,

-     LINE = 368,

-     COLON = 369,

-     EOL = 370,

-     INTERFACE = 371,

-     OUTPUT = 372,

-     PRAGMA_DEBUG_ON = 373,

-     PRAGMA_DEBUG_OFF = 374,

-     PRAGMA_OPTIMIZE_ON = 375,

-     PRAGMA_OPTIMIZE_OFF = 376,

-     PRAGMA_INVARIANT_ALL = 377,

-     LAYOUT_TOK = 378,

-     ASM = 379,

-     CLASS = 380,

-     UNION = 381,

-     ENUM = 382,

-     TYPEDEF = 383,

-     TEMPLATE = 384,

-     THIS = 385,

-     PACKED_TOK = 386,

-     GOTO = 387,

-     INLINE_TOK = 388,

-     NOINLINE = 389,

-     VOLATILE = 390,

-     PUBLIC_TOK = 391,

-     STATIC = 392,

-     EXTERN = 393,

-     EXTERNAL = 394,

-     LONG_TOK = 395,

-     SHORT_TOK = 396,

-     DOUBLE_TOK = 397,

-     HALF = 398,

-     FIXED_TOK = 399,

-     UNSIGNED = 400,

-     INPUT_TOK = 401,

-     OUPTUT = 402,

-     HVEC2 = 403,

-     HVEC3 = 404,

-     HVEC4 = 405,

-     DVEC2 = 406,

-     DVEC3 = 407,

-     DVEC4 = 408,

-     FVEC2 = 409,

-     FVEC3 = 410,

-     FVEC4 = 411,

-     SAMPLER2DRECT = 412,

-     SAMPLER3DRECT = 413,

-     SAMPLER2DRECTSHADOW = 414,

-     SIZEOF = 415,

-     CAST = 416,

-     NAMESPACE = 417,

-     USING = 418,

-     ERROR_TOK = 419,

-     COMMON = 420,

-     PARTITION = 421,

-     ACTIVE = 422,

-     SAMPLERBUFFER = 423,

-     FILTER = 424,

-     IMAGE1D = 425,

-     IMAGE2D = 426,

-     IMAGE3D = 427,

-     IMAGECUBE = 428,

-     IMAGE1DARRAY = 429,

-     IMAGE2DARRAY = 430,

-     IIMAGE1D = 431,

-     IIMAGE2D = 432,

-     IIMAGE3D = 433,

-     IIMAGECUBE = 434,

-     IIMAGE1DARRAY = 435,

-     IIMAGE2DARRAY = 436,

-     UIMAGE1D = 437,

-     UIMAGE2D = 438,

-     UIMAGE3D = 439,

-     UIMAGECUBE = 440,

-     UIMAGE1DARRAY = 441,

-     UIMAGE2DARRAY = 442,

-     IMAGE1DSHADOW = 443,

-     IMAGE2DSHADOW = 444,

-     IMAGEBUFFER = 445,

-     IIMAGEBUFFER = 446,

-     UIMAGEBUFFER = 447,

-     IMAGE1DARRAYSHADOW = 448,

-     IMAGE2DARRAYSHADOW = 449,

-     ROW_MAJOR = 450

-   };

-#endif

-

-

-

-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED

-typedef union YYSTYPE

-{

-

-/* Line 214 of yacc.c  */

-#line 52 "glsl_parser.ypp"

-

-   int n;

-   float real;

-   char *identifier;

-

-   struct ast_type_qualifier type_qualifier;

-

-   ast_node *node;

-   ast_type_specifier *type_specifier;

-   ast_fully_specified_type *fully_specified_type;

-   ast_function *function;

-   ast_parameter_declarator *parameter_declarator;

-   ast_function_definition *function_definition;

-   ast_compound_statement *compound_statement;

-   ast_expression *expression;

-   ast_declarator_list *declarator_list;

-   ast_struct_specifier *struct_specifier;

-   ast_declaration *declaration;

-

-   struct {

-      ast_node *cond;

-      ast_expression *rest;

-   } for_rest_statement;

-

-   struct {

-      ast_node *then_statement;

-      ast_node *else_statement;

-   } selection_rest_statement;

-

-

-

-/* Line 214 of yacc.c  */

-#line 380 "glsl_parser.cpp"

-} YYSTYPE;

-# define YYSTYPE_IS_TRIVIAL 1

-# define yystype YYSTYPE /* obsolescent; will be withdrawn */

-# define YYSTYPE_IS_DECLARED 1

-#endif

-

-#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED

-typedef struct YYLTYPE

-{

-  int first_line;

-  int first_column;

-  int last_line;

-  int last_column;

-} YYLTYPE;

-# define yyltype YYLTYPE /* obsolescent; will be withdrawn */

-# define YYLTYPE_IS_DECLARED 1

-# define YYLTYPE_IS_TRIVIAL 1

-#endif

-

-

-/* Copy the second part of user declarations.  */

-

-

-/* Line 264 of yacc.c  */

-#line 405 "glsl_parser.cpp"

-

-#ifdef short

-# undef short

-#endif

-

-#ifdef YYTYPE_UINT8

-typedef YYTYPE_UINT8 yytype_uint8;

-#else

-typedef unsigned char yytype_uint8;

-#endif

-

-#ifdef YYTYPE_INT8

-typedef YYTYPE_INT8 yytype_int8;

-#elif (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-typedef signed char yytype_int8;

-#else

-typedef short int yytype_int8;

-#endif

-

-#ifdef YYTYPE_UINT16

-typedef YYTYPE_UINT16 yytype_uint16;

-#else

-typedef unsigned short int yytype_uint16;

-#endif

-

-#ifdef YYTYPE_INT16

-typedef YYTYPE_INT16 yytype_int16;

-#else

-typedef short int yytype_int16;

-#endif

-

-#ifndef YYSIZE_T

-# ifdef __SIZE_TYPE__

-#  define YYSIZE_T __SIZE_TYPE__

-# elif defined size_t

-#  define YYSIZE_T size_t

-# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */

-#  define YYSIZE_T size_t

-# else

-#  define YYSIZE_T unsigned int

-# endif

-#endif

-

-#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)

-

-#ifndef YY_

-# if defined YYENABLE_NLS && YYENABLE_NLS

-#  if ENABLE_NLS

-#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */

-#   define YY_(msgid) dgettext ("bison-runtime", msgid)

-#  endif

-# endif

-# ifndef YY_

-#  define YY_(msgid) msgid

-# endif

-#endif

-

-/* Suppress unused-variable warnings by "using" E.  */

-#if ! defined lint || defined __GNUC__

-# define YYUSE(e) ((void) (e))

-#else

-# define YYUSE(e) /* empty */

-#endif

-

-/* Identity function, used to suppress warnings about constant conditions.  */

-#ifndef lint

-# define YYID(n) (n)

-#else

-#if (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-static int

-YYID (int yyi)

-#else

-static int

-YYID (yyi)

-    int yyi;

-#endif

-{

-  return yyi;

-}

-#endif

-

-#if ! defined yyoverflow || YYERROR_VERBOSE

-

-/* The parser invokes alloca or malloc; define the necessary symbols.  */

-

-# ifdef YYSTACK_USE_ALLOCA

-#  if YYSTACK_USE_ALLOCA

-#   ifdef __GNUC__

-#    define YYSTACK_ALLOC __builtin_alloca

-#   elif defined __BUILTIN_VA_ARG_INCR

-#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */

-#   elif defined _AIX

-#    define YYSTACK_ALLOC __alloca

-#   elif defined _MSC_VER

-#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */

-#    define alloca _alloca

-#   else

-#    define YYSTACK_ALLOC alloca

-#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */

-#     ifndef _STDLIB_H

-#      define _STDLIB_H 1

-#     endif

-#    endif

-#   endif

-#  endif

-# endif

-

-# ifdef YYSTACK_ALLOC

-   /* Pacify GCC's `empty if-body' warning.  */

-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))

-#  ifndef YYSTACK_ALLOC_MAXIMUM

-    /* The OS might guarantee only one guard page at the bottom of the stack,

-       and a page size can be as small as 4096 bytes.  So we cannot safely

-       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number

-       to allow for a few compiler-allocated temporary stack slots.  */

-#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */

-#  endif

-# else

-#  define YYSTACK_ALLOC YYMALLOC

-#  define YYSTACK_FREE YYFREE

-#  ifndef YYSTACK_ALLOC_MAXIMUM

-#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM

-#  endif

-#  if (defined __cplusplus && ! defined _STDLIB_H \

-       && ! ((defined YYMALLOC || defined malloc) \

-	     && (defined YYFREE || defined free)))

-#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */

-#   ifndef _STDLIB_H

-#    define _STDLIB_H 1

-#   endif

-#  endif

-#  ifndef YYMALLOC

-#   define YYMALLOC malloc

-#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */

-#   endif

-#  endif

-#  ifndef YYFREE

-#   define YYFREE free

-#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-void free (void *); /* INFRINGES ON USER NAME SPACE */

-#   endif

-#  endif

-# endif

-#endif /* ! defined yyoverflow || YYERROR_VERBOSE */

-

-

-#if (! defined yyoverflow \

-     && (! defined __cplusplus \

-	 || (defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \

-	     && defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))

-

-/* A type that is properly aligned for any stack member.  */

-union yyalloc

-{

-  yytype_int16 yyss_alloc;

-  YYSTYPE yyvs_alloc;

-  YYLTYPE yyls_alloc;

-};

-

-/* The size of the maximum gap between one aligned stack and the next.  */

-# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)

-

-/* The size of an array large to enough to hold all stacks, each with

-   N elements.  */

-# define YYSTACK_BYTES(N) \

-     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \

-      + 2 * YYSTACK_GAP_MAXIMUM)

-

-/* Copy COUNT objects from FROM to TO.  The source and destination do

-   not overlap.  */

-# ifndef YYCOPY

-#  if defined __GNUC__ && 1 < __GNUC__

-#   define YYCOPY(To, From, Count) \

-      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))

-#  else

-#   define YYCOPY(To, From, Count)		\

-      do					\

-	{					\

-	  YYSIZE_T yyi;				\

-	  for (yyi = 0; yyi < (Count); yyi++)	\

-	    (To)[yyi] = (From)[yyi];		\

-	}					\

-      while (YYID (0))

-#  endif

-# endif

-

-/* Relocate STACK from its old location to the new one.  The

-   local variables YYSIZE and YYSTACKSIZE give the old and new number of

-   elements in the stack, and YYPTR gives the new location of the

-   stack.  Advance YYPTR to a properly aligned location for the next

-   stack.  */

-# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\

-    do									\

-      {									\

-	YYSIZE_T yynewbytes;						\

-	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\

-	Stack = &yyptr->Stack_alloc;					\

-	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \

-	yyptr += yynewbytes / sizeof (*yyptr);				\

-      }									\

-    while (YYID (0))

-

-#endif

-

-/* YYFINAL -- State number of the termination state.  */

-#define YYFINAL  5

-/* YYLAST -- Last index in YYTABLE.  */

-#define YYLAST   3692

-

-/* YYNTOKENS -- Number of terminals.  */

-#define YYNTOKENS  220

-/* YYNNTS -- Number of nonterminals.  */

-#define YYNNTS  93

-/* YYNRULES -- Number of rules.  */

-#define YYNRULES  291

-/* YYNRULES -- Number of states.  */

-#define YYNSTATES  434

-

-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */

-#define YYUNDEFTOK  2

-#define YYMAXUTOK   450

-

-#define YYTRANSLATE(YYX)						\

-  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)

-

-/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */

-static const yytype_uint8 yytranslate[] =

-{

-       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,   204,     2,     2,     2,   208,   211,     2,

-     196,   197,   206,   202,   201,   203,   200,   207,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,   215,   217,

-     209,   216,   210,   214,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,   198,     2,   199,   212,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,   218,   213,   219,   205,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,

-       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,

-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,

-      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,

-      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,

-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,

-      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,

-      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,

-      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,

-      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,

-      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,

-     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,

-     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,

-     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,

-     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,

-     145,   146,   147,   148,   149,   150,   151,   152,   153,   154,

-     155,   156,   157,   158,   159,   160,   161,   162,   163,   164,

-     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,

-     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,

-     185,   186,   187,   188,   189,   190,   191,   192,   193,   194,

-     195

-};

-

-#if YYDEBUG

-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in

-   YYRHS.  */

-static const yytype_uint16 yyprhs[] =

-{

-       0,     0,     3,     4,     9,    10,    14,    17,    20,    23,

-      26,    29,    30,    33,    35,    37,    39,    45,    47,    50,

-      52,    54,    56,    58,    60,    62,    64,    68,    70,    75,

-      77,    81,    84,    87,    89,    91,    93,    97,   100,   103,

-     106,   108,   111,   115,   118,   120,   122,   124,   127,   130,

-     133,   135,   138,   142,   145,   147,   150,   153,   156,   158,

-     160,   162,   164,   166,   170,   174,   178,   180,   184,   188,

-     190,   194,   198,   200,   204,   208,   212,   216,   218,   222,

-     226,   228,   232,   234,   238,   240,   244,   246,   250,   252,

-     256,   258,   262,   264,   270,   272,   276,   278,   280,   282,

-     284,   286,   288,   290,   292,   294,   296,   298,   300,   304,

-     306,   309,   312,   317,   320,   322,   324,   327,   331,   335,

-     338,   344,   348,   351,   355,   358,   359,   361,   363,   365,

-     367,   369,   373,   379,   386,   394,   403,   409,   411,   414,

-     419,   425,   432,   440,   445,   448,   450,   453,   458,   460,

-     464,   466,   470,   472,   474,   476,   478,   480,   482,   485,

-     487,   490,   493,   497,   499,   501,   503,   505,   508,   510,

-     512,   515,   518,   520,   522,   525,   527,   531,   536,   538,

-     540,   542,   544,   546,   548,   550,   552,   554,   556,   558,

-     560,   562,   564,   566,   568,   570,   572,   574,   576,   578,

-     580,   582,   584,   586,   588,   590,   592,   594,   596,   598,

-     600,   602,   604,   606,   608,   610,   612,   614,   616,   618,

-     620,   622,   624,   626,   628,   630,   632,   634,   636,   638,

-     640,   642,   644,   646,   648,   650,   656,   661,   663,   666,

-     670,   672,   676,   678,   683,   685,   687,   689,   691,   693,

-     695,   697,   699,   701,   703,   705,   708,   709,   714,   716,

-     718,   721,   725,   727,   730,   732,   735,   741,   745,   747,

-     749,   754,   760,   764,   767,   773,   781,   788,   790,   792,

-     794,   795,   798,   802,   805,   808,   811,   815,   818,   820,

-     822,   824

-};

-

-/* YYRHS -- A `-1'-separated list of the rules' RHS.  */

-static const yytype_int16 yyrhs[] =

-{

-     221,     0,    -1,    -1,   223,   225,   222,   228,    -1,    -1,

-     111,    80,   115,    -1,   118,   115,    -1,   119,   115,    -1,

-     120,   115,    -1,   121,   115,    -1,   122,   115,    -1,    -1,

-     225,   227,    -1,    76,    -1,    77,    -1,    78,    -1,   112,

-     226,   114,   226,   115,    -1,   311,    -1,   228,   311,    -1,

-      76,    -1,    78,    -1,   229,    -1,    80,    -1,    81,    -1,

-      79,    -1,    82,    -1,   196,   260,   197,    -1,   230,    -1,

-     231,   198,   232,   199,    -1,   233,    -1,   231,   200,   226,

-      -1,   231,    86,    -1,   231,    87,    -1,   260,    -1,   234,

-      -1,   235,    -1,   231,   200,   240,    -1,   237,   197,    -1,

-     236,   197,    -1,   238,    74,    -1,   238,    -1,   238,   258,

-      -1,   237,   201,   258,    -1,   239,   196,    -1,   281,    -1,

-     229,    -1,    83,    -1,   242,   197,    -1,   241,   197,    -1,

-     243,    74,    -1,   243,    -1,   243,   258,    -1,   242,   201,

-     258,    -1,   229,   196,    -1,   231,    -1,    86,   244,    -1,

-      87,   244,    -1,   245,   244,    -1,   202,    -1,   203,    -1,

-     204,    -1,   205,    -1,   244,    -1,   246,   206,   244,    -1,

-     246,   207,   244,    -1,   246,   208,   244,    -1,   246,    -1,

-     247,   202,   246,    -1,   247,   203,   246,    -1,   247,    -1,

-     248,    84,   247,    -1,   248,    85,   247,    -1,   248,    -1,

-     249,   209,   248,    -1,   249,   210,   248,    -1,   249,    88,

-     248,    -1,   249,    89,   248,    -1,   249,    -1,   250,    90,

-     249,    -1,   250,    91,   249,    -1,   250,    -1,   251,   211,

-     250,    -1,   251,    -1,   252,   212,   251,    -1,   252,    -1,

-     253,   213,   252,    -1,   253,    -1,   254,    92,   253,    -1,

-     254,    -1,   255,    94,   254,    -1,   255,    -1,   256,    93,

-     255,    -1,   256,    -1,   256,   214,   260,   215,   258,    -1,

-     257,    -1,   244,   259,   258,    -1,   216,    -1,    95,    -1,

-      96,    -1,    98,    -1,    97,    -1,   104,    -1,    99,    -1,

-     100,    -1,   101,    -1,   102,    -1,   103,    -1,   258,    -1,

-     260,   201,   258,    -1,   257,    -1,   263,   217,    -1,   271,

-     217,    -1,   110,   285,   282,   217,    -1,   264,   197,    -1,

-     266,    -1,   265,    -1,   266,   268,    -1,   265,   201,   268,

-      -1,   273,   229,   196,    -1,   281,   226,    -1,   281,   226,

-     198,   261,   199,    -1,   278,   269,   267,    -1,   269,   267,

-      -1,   278,   269,   270,    -1,   269,   270,    -1,    -1,    33,

-      -1,    34,    -1,    35,    -1,   281,    -1,   272,    -1,   271,

-     201,   226,    -1,   271,   201,   226,   198,   199,    -1,   271,

-     201,   226,   198,   261,   199,    -1,   271,   201,   226,   198,

-     199,   216,   291,    -1,   271,   201,   226,   198,   261,   199,

-     216,   291,    -1,   271,   201,   226,   216,   291,    -1,   273,

-      -1,   273,   226,    -1,   273,   226,   198,   199,    -1,   273,

-     226,   198,   261,   199,    -1,   273,   226,   198,   199,   216,

-     291,    -1,   273,   226,   198,   261,   199,   216,   291,    -1,

-     273,   226,   216,   291,    -1,   105,   229,    -1,   281,    -1,

-     279,   281,    -1,   123,   196,   275,   197,    -1,   276,    -1,

-     275,   201,   276,    -1,   226,    -1,   226,   216,    80,    -1,

-      40,    -1,    39,    -1,    38,    -1,     4,    -1,   280,    -1,

-     274,    -1,   274,   280,    -1,   277,    -1,   277,   280,    -1,

-     105,   280,    -1,   105,   277,   280,    -1,   105,    -1,     4,

-      -1,     3,    -1,    37,    -1,    32,    37,    -1,    33,    -1,

-      34,    -1,    32,    33,    -1,    32,    34,    -1,    36,    -1,

-     282,    -1,   285,   282,    -1,   283,    -1,   283,   198,   199,

-      -1,   283,   198,   261,   199,    -1,   284,    -1,   286,    -1,

-      77,    -1,    74,    -1,     6,    -1,     7,    -1,     8,    -1,

-       5,    -1,    29,    -1,    30,    -1,    31,    -1,    20,    -1,

-      21,    -1,    22,    -1,    23,    -1,    24,    -1,    25,    -1,

-      26,    -1,    27,    -1,    28,    -1,    41,    -1,    42,    -1,

-      43,    -1,    44,    -1,    45,    -1,    46,    -1,    47,    -1,

-      48,    -1,    49,    -1,    50,    -1,    51,    -1,   157,    -1,

-      52,    -1,    53,    -1,    54,    -1,    55,    -1,   159,    -1,

-      56,    -1,    57,    -1,    58,    -1,    59,    -1,    60,    -1,

-      61,    -1,    62,    -1,    63,    -1,    64,    -1,    65,    -1,

-      66,    -1,    67,    -1,    68,    -1,    69,    -1,    70,    -1,

-      71,    -1,    72,    -1,   108,    -1,   107,    -1,   106,    -1,

-      73,   226,   218,   287,   219,    -1,    73,   218,   287,   219,

-      -1,   288,    -1,   287,   288,    -1,   281,   289,   217,    -1,

-     290,    -1,   289,   201,   290,    -1,   226,    -1,   226,   198,

-     261,   199,    -1,   258,    -1,   262,    -1,   295,    -1,   294,

-      -1,   292,    -1,   300,    -1,   301,    -1,   304,    -1,   305,

-      -1,   306,    -1,   310,    -1,   218,   219,    -1,    -1,   218,

-     296,   299,   219,    -1,   298,    -1,   294,    -1,   218,   219,

-      -1,   218,   299,   219,    -1,   293,    -1,   299,   293,    -1,

-     217,    -1,   260,   217,    -1,    14,   196,   260,   197,   302,

-      -1,   293,    12,   293,    -1,   293,    -1,   260,    -1,   273,

-     226,   216,   291,    -1,    17,   196,   260,   197,   295,    -1,

-      18,   260,   215,    -1,    19,   215,    -1,    75,   196,   303,

-     197,   297,    -1,    11,   293,    75,   196,   260,   197,   217,

-      -1,    13,   196,   307,   309,   197,   297,    -1,   300,    -1,

-     292,    -1,   303,    -1,    -1,   308,   217,    -1,   308,   217,

-     260,    -1,    10,   217,    -1,     9,   217,    -1,    16,   217,

-      -1,    16,   260,   217,    -1,    15,   217,    -1,   312,    -1,

-     262,    -1,   224,    -1,   263,   298,    -1

-};

-

-/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */

-static const yytype_uint16 yyrline[] =

-{

-       0,   218,   218,   217,   229,   231,   271,   272,   273,   274,

-     275,   287,   289,   293,   294,   295,   299,   308,   316,   327,

-     328,   332,   339,   346,   353,   360,   367,   374,   375,   381,

-     385,   392,   398,   407,   411,   415,   416,   425,   426,   430,

-     431,   435,   441,   453,   457,   463,   470,   480,   481,   485,

-     486,   490,   496,   508,   519,   520,   526,   532,   542,   543,

-     544,   545,   549,   550,   556,   562,   571,   572,   578,   587,

-     588,   594,   603,   604,   610,   616,   622,   631,   632,   638,

-     647,   648,   657,   658,   667,   668,   677,   678,   687,   688,

-     697,   698,   707,   708,   717,   718,   727,   728,   729,   730,

-     731,   732,   733,   734,   735,   736,   737,   741,   745,   761,

-     765,   770,   774,   783,   787,   788,   792,   797,   805,   819,

-     829,   844,   851,   856,   867,   880,   883,   888,   893,   902,

-     906,   907,   917,   927,   937,   947,   957,   971,   982,   991,

-    1000,  1009,  1018,  1027,  1036,  1050,  1057,  1068,  1075,  1076,

-    1095,  1147,  1188,  1193,  1198,  1206,  1214,  1215,  1216,  1221,

-    1222,  1227,  1232,  1238,  1246,  1251,  1256,  1261,  1267,  1272,

-    1277,  1282,  1287,  1295,  1299,  1307,  1308,  1314,  1323,  1329,

-    1335,  1344,  1345,  1346,  1347,  1348,  1349,  1350,  1351,  1352,

-    1353,  1354,  1355,  1356,  1357,  1358,  1359,  1360,  1361,  1362,

-    1363,  1364,  1365,  1366,  1367,  1368,  1369,  1370,  1371,  1372,

-    1373,  1374,  1375,  1376,  1377,  1378,  1379,  1380,  1381,  1382,

-    1383,  1384,  1385,  1386,  1387,  1388,  1389,  1390,  1391,  1392,

-    1393,  1394,  1398,  1408,  1418,  1431,  1438,  1447,  1452,  1460,

-    1475,  1480,  1488,  1495,  1504,  1508,  1514,  1515,  1519,  1520,

-    1521,  1522,  1523,  1524,  1525,  1529,  1536,  1535,  1549,  1550,

-    1554,  1560,  1569,  1579,  1591,  1597,  1606,  1615,  1620,  1628,

-    1632,  1646,  1650,  1651,  1655,  1662,  1669,  1679,  1680,  1684,

-    1686,  1692,  1697,  1706,  1712,  1718,  1724,  1730,  1739,  1740,

-    1741,  1745

-};

-#endif

-

-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE

-/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.

-   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */

-static const char *const yytname[] =

-{

-  "$end", "error", "$undefined", "ATTRIBUTE", "CONST_TOK", "BOOL_TOK",

-  "FLOAT_TOK", "INT_TOK", "UINT_TOK", "BREAK", "CONTINUE", "DO", "ELSE",

-  "FOR", "IF", "DISCARD", "RETURN", "SWITCH", "CASE", "DEFAULT", "BVEC2",

-  "BVEC3", "BVEC4", "IVEC2", "IVEC3", "IVEC4", "UVEC2", "UVEC3", "UVEC4",

-  "VEC2", "VEC3", "VEC4", "CENTROID", "IN_TOK", "OUT_TOK", "INOUT_TOK",

-  "UNIFORM", "VARYING", "NOPERSPECTIVE", "FLAT", "SMOOTH", "MAT2X2",

-  "MAT2X3", "MAT2X4", "MAT3X2", "MAT3X3", "MAT3X4", "MAT4X2", "MAT4X3",

-  "MAT4X4", "SAMPLER1D", "SAMPLER2D", "SAMPLER3D", "SAMPLERCUBE",

-  "SAMPLER1DSHADOW", "SAMPLER2DSHADOW", "SAMPLERCUBESHADOW",

-  "SAMPLER1DARRAY", "SAMPLER2DARRAY", "SAMPLER1DARRAYSHADOW",

-  "SAMPLER2DARRAYSHADOW", "ISAMPLER1D", "ISAMPLER2D", "ISAMPLER3D",

-  "ISAMPLERCUBE", "ISAMPLER1DARRAY", "ISAMPLER2DARRAY", "USAMPLER1D",

-  "USAMPLER2D", "USAMPLER3D", "USAMPLERCUBE", "USAMPLER1DARRAY",

-  "USAMPLER2DARRAY", "STRUCT", "VOID_TOK", "WHILE", "IDENTIFIER",

-  "TYPE_IDENTIFIER", "NEW_IDENTIFIER", "FLOATCONSTANT", "INTCONSTANT",

-  "UINTCONSTANT", "BOOLCONSTANT", "FIELD_SELECTION", "LEFT_OP", "RIGHT_OP",

-  "INC_OP", "DEC_OP", "LE_OP", "GE_OP", "EQ_OP", "NE_OP", "AND_OP",

-  "OR_OP", "XOR_OP", "MUL_ASSIGN", "DIV_ASSIGN", "ADD_ASSIGN",

-  "MOD_ASSIGN", "LEFT_ASSIGN", "RIGHT_ASSIGN", "AND_ASSIGN", "XOR_ASSIGN",

-  "OR_ASSIGN", "SUB_ASSIGN", "INVARIANT", "LOWP", "MEDIUMP", "HIGHP",

-  "SUPERP", "PRECISION", "VERSION", "EXTENSION", "LINE", "COLON", "EOL",

-  "INTERFACE", "OUTPUT", "PRAGMA_DEBUG_ON", "PRAGMA_DEBUG_OFF",

-  "PRAGMA_OPTIMIZE_ON", "PRAGMA_OPTIMIZE_OFF", "PRAGMA_INVARIANT_ALL",

-  "LAYOUT_TOK", "ASM", "CLASS", "UNION", "ENUM", "TYPEDEF", "TEMPLATE",

-  "THIS", "PACKED_TOK", "GOTO", "INLINE_TOK", "NOINLINE", "VOLATILE",

-  "PUBLIC_TOK", "STATIC", "EXTERN", "EXTERNAL", "LONG_TOK", "SHORT_TOK",

-  "DOUBLE_TOK", "HALF", "FIXED_TOK", "UNSIGNED", "INPUT_TOK", "OUPTUT",

-  "HVEC2", "HVEC3", "HVEC4", "DVEC2", "DVEC3", "DVEC4", "FVEC2", "FVEC3",

-  "FVEC4", "SAMPLER2DRECT", "SAMPLER3DRECT", "SAMPLER2DRECTSHADOW",

-  "SIZEOF", "CAST", "NAMESPACE", "USING", "ERROR_TOK", "COMMON",

-  "PARTITION", "ACTIVE", "SAMPLERBUFFER", "FILTER", "IMAGE1D", "IMAGE2D",

-  "IMAGE3D", "IMAGECUBE", "IMAGE1DARRAY", "IMAGE2DARRAY", "IIMAGE1D",

-  "IIMAGE2D", "IIMAGE3D", "IIMAGECUBE", "IIMAGE1DARRAY", "IIMAGE2DARRAY",

-  "UIMAGE1D", "UIMAGE2D", "UIMAGE3D", "UIMAGECUBE", "UIMAGE1DARRAY",

-  "UIMAGE2DARRAY", "IMAGE1DSHADOW", "IMAGE2DSHADOW", "IMAGEBUFFER",

-  "IIMAGEBUFFER", "UIMAGEBUFFER", "IMAGE1DARRAYSHADOW",

-  "IMAGE2DARRAYSHADOW", "ROW_MAJOR", "'('", "')'", "'['", "']'", "'.'",

-  "','", "'+'", "'-'", "'!'", "'~'", "'*'", "'/'", "'%'", "'<'", "'>'",

-  "'&'", "'^'", "'|'", "'?'", "':'", "'='", "';'", "'{'", "'}'", "$accept",

-  "translation_unit", "$@1", "version_statement", "pragma_statement",

-  "extension_statement_list", "any_identifier", "extension_statement",

-  "external_declaration_list", "variable_identifier", "primary_expression",

-  "postfix_expression", "integer_expression", "function_call",

-  "function_call_or_method", "function_call_generic",

-  "function_call_header_no_parameters",

-  "function_call_header_with_parameters", "function_call_header",

-  "function_identifier", "method_call_generic",

-  "method_call_header_no_parameters", "method_call_header_with_parameters",

-  "method_call_header", "unary_expression", "unary_operator",

-  "multiplicative_expression", "additive_expression", "shift_expression",

-  "relational_expression", "equality_expression", "and_expression",

-  "exclusive_or_expression", "inclusive_or_expression",

-  "logical_and_expression", "logical_xor_expression",

-  "logical_or_expression", "conditional_expression",

-  "assignment_expression", "assignment_operator", "expression",

-  "constant_expression", "declaration", "function_prototype",

-  "function_declarator", "function_header_with_parameters",

-  "function_header", "parameter_declarator", "parameter_declaration",

-  "parameter_qualifier", "parameter_type_specifier",

-  "init_declarator_list", "single_declaration", "fully_specified_type",

-  "layout_qualifier", "layout_qualifier_id_list", "layout_qualifier_id",

-  "interpolation_qualifier", "parameter_type_qualifier", "type_qualifier",

-  "storage_qualifier", "type_specifier", "type_specifier_no_prec",

-  "type_specifier_nonarray", "basic_type_specifier_nonarray",

-  "precision_qualifier", "struct_specifier", "struct_declaration_list",

-  "struct_declaration", "struct_declarator_list", "struct_declarator",

-  "initializer", "declaration_statement", "statement", "simple_statement",

-  "compound_statement", "$@2", "statement_no_new_scope",

-  "compound_statement_no_new_scope", "statement_list",

-  "expression_statement", "selection_statement",

-  "selection_rest_statement", "condition", "switch_statement",

-  "case_label", "iteration_statement", "for_init_statement",

-  "conditionopt", "for_rest_statement", "jump_statement",

-  "external_declaration", "function_definition", 0

-};

-#endif

-

-# ifdef YYPRINT

-/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to

-   token YYLEX-NUM.  */

-static const yytype_uint16 yytoknum[] =

-{

-       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,

-     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,

-     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,

-     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,

-     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,

-     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,

-     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,

-     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,

-     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,

-     345,   346,   347,   348,   349,   350,   351,   352,   353,   354,

-     355,   356,   357,   358,   359,   360,   361,   362,   363,   364,

-     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,

-     375,   376,   377,   378,   379,   380,   381,   382,   383,   384,

-     385,   386,   387,   388,   389,   390,   391,   392,   393,   394,

-     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,

-     405,   406,   407,   408,   409,   410,   411,   412,   413,   414,

-     415,   416,   417,   418,   419,   420,   421,   422,   423,   424,

-     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,

-     435,   436,   437,   438,   439,   440,   441,   442,   443,   444,

-     445,   446,   447,   448,   449,   450,    40,    41,    91,    93,

-      46,    44,    43,    45,    33,   126,    42,    47,    37,    60,

-      62,    38,    94,   124,    63,    58,    61,    59,   123,   125

-};

-# endif

-

-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */

-static const yytype_uint16 yyr1[] =

-{

-       0,   220,   222,   221,   223,   223,   224,   224,   224,   224,

-     224,   225,   225,   226,   226,   226,   227,   228,   228,   229,

-     229,   230,   230,   230,   230,   230,   230,   231,   231,   231,

-     231,   231,   231,   232,   233,   234,   234,   235,   235,   236,

-     236,   237,   237,   238,   239,   239,   239,   240,   240,   241,

-     241,   242,   242,   243,   244,   244,   244,   244,   245,   245,

-     245,   245,   246,   246,   246,   246,   247,   247,   247,   248,

-     248,   248,   249,   249,   249,   249,   249,   250,   250,   250,

-     251,   251,   252,   252,   253,   253,   254,   254,   255,   255,

-     256,   256,   257,   257,   258,   258,   259,   259,   259,   259,

-     259,   259,   259,   259,   259,   259,   259,   260,   260,   261,

-     262,   262,   262,   263,   264,   264,   265,   265,   266,   267,

-     267,   268,   268,   268,   268,   269,   269,   269,   269,   270,

-     271,   271,   271,   271,   271,   271,   271,   272,   272,   272,

-     272,   272,   272,   272,   272,   273,   273,   274,   275,   275,

-     276,   276,   277,   277,   277,   278,   279,   279,   279,   279,

-     279,   279,   279,   279,   280,   280,   280,   280,   280,   280,

-     280,   280,   280,   281,   281,   282,   282,   282,   283,   283,

-     283,   284,   284,   284,   284,   284,   284,   284,   284,   284,

-     284,   284,   284,   284,   284,   284,   284,   284,   284,   284,

-     284,   284,   284,   284,   284,   284,   284,   284,   284,   284,

-     284,   284,   284,   284,   284,   284,   284,   284,   284,   284,

-     284,   284,   284,   284,   284,   284,   284,   284,   284,   284,

-     284,   284,   285,   285,   285,   286,   286,   287,   287,   288,

-     289,   289,   290,   290,   291,   292,   293,   293,   294,   294,

-     294,   294,   294,   294,   294,   295,   296,   295,   297,   297,

-     298,   298,   299,   299,   300,   300,   301,   302,   302,   303,

-     303,   304,   305,   305,   306,   306,   306,   307,   307,   308,

-     308,   309,   309,   310,   310,   310,   310,   310,   311,   311,

-     311,   312

-};

-

-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */

-static const yytype_uint8 yyr2[] =

-{

-       0,     2,     0,     4,     0,     3,     2,     2,     2,     2,

-       2,     0,     2,     1,     1,     1,     5,     1,     2,     1,

-       1,     1,     1,     1,     1,     1,     3,     1,     4,     1,

-       3,     2,     2,     1,     1,     1,     3,     2,     2,     2,

-       1,     2,     3,     2,     1,     1,     1,     2,     2,     2,

-       1,     2,     3,     2,     1,     2,     2,     2,     1,     1,

-       1,     1,     1,     3,     3,     3,     1,     3,     3,     1,

-       3,     3,     1,     3,     3,     3,     3,     1,     3,     3,

-       1,     3,     1,     3,     1,     3,     1,     3,     1,     3,

-       1,     3,     1,     5,     1,     3,     1,     1,     1,     1,

-       1,     1,     1,     1,     1,     1,     1,     1,     3,     1,

-       2,     2,     4,     2,     1,     1,     2,     3,     3,     2,

-       5,     3,     2,     3,     2,     0,     1,     1,     1,     1,

-       1,     3,     5,     6,     7,     8,     5,     1,     2,     4,

-       5,     6,     7,     4,     2,     1,     2,     4,     1,     3,

-       1,     3,     1,     1,     1,     1,     1,     1,     2,     1,

-       2,     2,     3,     1,     1,     1,     1,     2,     1,     1,

-       2,     2,     1,     1,     2,     1,     3,     4,     1,     1,

-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,

-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,

-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,

-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,

-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,

-       1,     1,     1,     1,     1,     5,     4,     1,     2,     3,

-       1,     3,     1,     4,     1,     1,     1,     1,     1,     1,

-       1,     1,     1,     1,     1,     2,     0,     4,     1,     1,

-       2,     3,     1,     2,     1,     2,     5,     3,     1,     1,

-       4,     5,     3,     2,     5,     7,     6,     1,     1,     1,

-       0,     2,     3,     2,     2,     2,     3,     2,     1,     1,

-       1,     2

-};

-

-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state

-   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero

-   means the default is an error.  */

-static const yytype_uint16 yydefact[] =

-{

-       4,     0,     0,    11,     0,     1,     2,     5,     0,     0,

-      12,    13,    14,    15,     0,   165,   164,   185,   182,   183,

-     184,   189,   190,   191,   192,   193,   194,   195,   196,   197,

-     186,   187,   188,     0,   168,   169,   172,   166,   154,   153,

-     152,   198,   199,   200,   201,   202,   203,   204,   205,   206,

-     207,   208,   210,   211,   212,   213,   215,   216,   217,   218,

-     219,   220,   221,   222,   223,   224,   225,   226,   227,   228,

-     229,   230,   231,     0,   181,   180,   163,   234,   233,   232,

-       0,     0,     0,     0,     0,     0,     0,   209,   214,   290,

-       3,   289,     0,     0,   115,   125,     0,   130,   137,   157,

-     159,     0,   156,   145,   173,   175,   178,     0,   179,    17,

-     288,     0,   170,   171,   167,     0,     0,    19,    20,   144,

-       0,   161,     0,     6,     7,     8,     9,    10,     0,    18,

-     110,     0,   291,   113,   125,   155,   126,   127,   128,   116,

-       0,   125,     0,   111,    13,    15,   138,     0,   158,   160,

-     146,     0,   174,     0,     0,     0,   237,     0,   162,     0,

-     150,     0,   148,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,    24,    22,    23,    25,    46,     0,

-       0,     0,    58,    59,    60,    61,   264,   256,   260,    21,

-      27,    54,    29,    34,    35,     0,     0,    40,     0,    62,

-       0,    66,    69,    72,    77,    80,    82,    84,    86,    88,

-      90,    92,    94,   107,     0,   245,     0,   145,   248,   262,

-     247,   246,     0,   249,   250,   251,   252,   253,   254,   117,

-     122,   124,   129,     0,   131,     0,     0,   118,   176,    62,

-     109,     0,    44,    16,   242,     0,   240,   236,   238,     0,

-     112,     0,   147,     0,   284,   283,     0,     0,     0,   287,

-     285,     0,     0,     0,   273,     0,    55,    56,     0,   255,

-       0,    31,    32,     0,     0,    38,    37,     0,   181,    41,

-      43,    97,    98,   100,    99,   102,   103,   104,   105,   106,

-     101,    96,     0,    57,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,   265,   261,   263,   119,   121,

-     123,     0,     0,   139,     0,   244,   143,   177,     0,     0,

-     239,   235,   151,   149,     0,   278,   277,   280,     0,   286,

-       0,   272,   163,   269,     0,     0,    26,     0,     0,    33,

-      30,     0,    36,     0,     0,    50,    42,    95,    63,    64,

-      65,    67,    68,    70,    71,    75,    76,    73,    74,    78,

-      79,    81,    83,    85,    87,    89,    91,     0,   108,     0,

-     132,     0,   136,     0,   140,     0,   241,     0,   279,     0,

-       0,     0,     0,     0,     0,   257,    28,    53,    48,    47,

-       0,   181,    51,     0,     0,     0,   133,   141,     0,   243,

-       0,   281,     0,   268,   266,   271,     0,   259,   274,   258,

-      52,    93,   120,   134,     0,   142,     0,   282,   276,     0,

-     270,   135,   275,   267

-};

-

-/* YYDEFGOTO[NTERM-NUM].  */

-static const yytype_int16 yydefgoto[] =

-{

-      -1,     2,     9,     3,    89,     6,   160,    10,    90,   189,

-     190,   191,   348,   192,   193,   194,   195,   196,   197,   198,

-     352,   353,   354,   355,   199,   200,   201,   202,   203,   204,

-     205,   206,   207,   208,   209,   210,   211,   212,   213,   292,

-     214,   241,   215,   216,    93,    94,    95,   230,   139,   140,

-     231,    96,    97,    98,    99,   161,   162,   100,   141,   101,

-     102,   242,   104,   105,   106,   107,   108,   155,   156,   245,

-     246,   326,   218,   219,   220,   221,   270,   418,   419,   222,

-     223,   224,   414,   345,   225,   226,   227,   337,   389,   390,

-     228,   109,   110

-};

-

-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing

-   STATE-NUM.  */

-#define YYPACT_NINF -366

-static const yytype_int16 yypact[] =

-{

-     -57,   -43,    62,  -366,   -50,  -366,   -30,  -366,    67,  3341,

-    -366,  -366,  -366,  -366,    -6,  -366,  -366,  -366,  -366,  -366,

-    -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,

-    -366,  -366,  -366,     8,  -366,  -366,  -366,  -366,  -366,  -366,

-    -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,

-    -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,

-    -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,

-    -366,  -366,  -366,   -65,  -366,  -366,   226,  -366,  -366,  -366,

-      51,   -31,   -28,     6,    13,    15,   -44,  -366,  -366,  -366,

-    3341,  -366,  -183,   -47,   -29,    18,  -169,  -366,   140,    24,

-      24,  3460,  -366,  -366,  -366,   -24,  -366,  3533,  -366,  -366,

-    -366,    67,  -366,  -366,  -366,  3460,   -48,  -366,  -366,  -366,

-      24,  -366,  3533,  -366,  -366,  -366,  -366,  -366,    67,  -366,

-    -366,   408,  -366,  -366,    55,  -366,  -366,  -366,  -366,  -366,

-    3460,   200,    67,  -366,   -20,   -18,  -178,    23,  -366,  -366,

-    -366,  2225,  -366,    72,    67,  1598,  -366,  3460,  -366,     4,

-      10,   -84,  -366,    11,    14,  1059,    40,    42,    29,  1836,

-      43,  2783,    34,    54,  -366,  -366,  -366,  -366,  -366,  2783,

-    2783,  2783,  -366,  -366,  -366,  -366,  -366,    32,  -366,    56,

-    -366,   -71,  -366,  -366,  -366,    57,   -81,  2969,    61,   -27,

-    2783,    35,   -88,   -41,   -70,    33,    60,    41,    59,   181,

-     180,   -89,  -366,  -366,  -168,  -366,    58,    80,  -366,  -366,

-    -366,  -366,   625,  -366,  -366,  -366,  -366,  -366,  -366,  -366,

-    -366,  -366,    67,  3460,  -177,  2411,  2783,  -366,  -366,  -366,

-    -366,    78,  -366,  -366,    81,  -137,  -366,  -366,  -366,  1717,

-    -366,   201,  -366,    67,  -366,  -366,   205,  1478,  2783,  -366,

-    -366,  -134,  2783,  -115,  -366,  2039,  -366,  -366,   -60,  -366,

-    1059,  -366,  -366,  2783,   140,  -366,  -366,  2783,    85,  -366,

-    -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,

-    -366,  -366,  2783,  -366,  2783,  2783,  2783,  2783,  2783,  2783,

-    2783,  2783,  2783,  2783,  2783,  2783,  2783,  2783,  2783,  2783,

-    2783,  2783,  2783,  2783,  2783,  -366,  -366,  -366,    86,  -366,

-    -366,  2597,  2783,    69,    87,  -366,  -366,  -366,  2783,    67,

-    -366,  -366,  -366,  -366,    91,  -366,  -366,  2039,   -59,  -366,

-     -46,  -366,   129,    88,    67,    93,  -366,   842,    89,    88,

-    -366,    95,  -366,    96,   -37,  3155,  -366,  -366,  -366,  -366,

-    -366,    35,    35,   -88,   -88,   -41,   -41,   -41,   -41,   -70,

-     -70,    33,    60,    41,    59,   181,   180,   -96,  -366,  2783,

-      76,    97,  -366,  2783,    79,    98,  -366,  2783,  -366,    77,

-     101,  1059,    83,    90,  1275,  -366,  -366,  -366,  -366,  -366,

-    2783,   102,  -366,  2783,   108,  2783,    94,  -366,  2783,  -366,

-     -26,  2783,  1275,   297,  -366,  -366,  2783,  -366,  -366,  -366,

-    -366,  -366,  -366,  -366,  2783,  -366,   100,    88,  -366,  1059,

-    -366,  -366,  -366,  -366

-};

-

-/* YYPGOTO[NTERM-NUM].  */

-static const yytype_int16 yypgoto[] =

-{

-    -366,  -366,  -366,  -366,  -366,  -366,    -7,  -366,  -366,   -62,

-    -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,

-    -366,  -366,  -366,  -366,  -101,  -366,  -113,  -109,  -121,   -61,

-       5,     3,     9,    16,     2,     7,  -366,  -142,  -100,  -366,

-    -164,  -225,    21,    22,  -366,  -366,  -366,    82,   186,   173,

-      92,  -366,  -366,  -242,  -366,  -366,    68,   -73,  -366,  -366,

-     -74,    -9,   -67,  -366,  -366,   243,  -366,   170,  -147,  -366,

-       0,  -298,    73,  -159,  -365,   -58,  -366,   -80,   239,    63,

-      84,  -366,  -366,    -2,  -366,  -366,  -366,  -366,  -366,  -366,

-    -366,   246,  -366

-};

-

-/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If

-   positive, shift that token.  If negative, reduce the rule which

-   number is the opposite.  If zero, do what YYDEFACT says.

-   If YYTABLE_NINF, syntax error.  */

-#define YYTABLE_NINF -115

-static const yytype_int16 yytable[] =

-{

-     103,    14,   121,   120,   312,   261,   256,   263,   248,   240,

-     324,    11,    12,    13,   119,   271,   272,   268,   301,   302,

-     235,   321,   135,   344,   382,   148,   149,    15,    16,   417,

-      91,    92,   142,   314,   130,   131,   147,     4,   236,   322,

-     152,   112,   113,   299,   300,   114,   158,   417,   143,   315,

-     239,   136,   137,   138,     1,   159,    33,    34,    35,   135,

-      36,    37,     5,   317,   329,     7,   116,   314,   281,   282,

-     283,   284,   285,   286,   287,   288,   289,   290,   266,   267,

-     330,   103,     8,   339,   123,   407,   314,   124,   136,   137,

-     138,   146,   150,   240,   338,   344,   381,   279,   340,   293,

-     341,   343,   248,   385,   153,   314,   154,   423,   111,   349,

-     425,    91,    92,   252,   297,   298,   276,   253,   430,   403,

-     277,   125,   217,   305,   306,   313,   431,   273,   126,   274,

-     127,   232,    15,    16,   239,   234,   325,   346,   391,   303,

-     304,   314,   314,    11,    12,    13,   154,   244,   154,   377,

-     133,   392,   128,   115,   404,   314,   217,    77,    78,    79,

-     399,    33,    34,    35,   400,    36,    37,    38,    39,    40,

-     157,   426,   134,   343,   151,   314,   -19,   356,   -20,   240,

-     365,   366,   367,   368,   361,   362,   240,   243,   317,   291,

-     363,   364,   357,   358,   359,   360,   239,   239,   239,   239,

-     239,   239,   239,   239,   239,   239,   239,   239,   239,   239,

-     239,   239,   351,   217,   378,  -114,   144,    12,   145,   237,

-     239,   250,   325,   410,   232,   318,   251,   239,   254,    15,

-      16,   255,   413,   136,   137,   138,   257,   240,   258,   262,

-     154,   294,   295,   296,   369,   370,   259,   427,   217,   264,

-     265,   269,   -45,   308,   275,   402,   217,   280,    33,    34,

-      35,   217,    36,    37,    38,    39,    40,   350,   121,   120,

-     433,   307,   309,   310,   311,   130,   -44,   327,   239,   328,

-     334,   332,   -39,   325,   379,   383,   384,   387,   396,   314,

-     394,   397,   405,   398,   411,   408,   406,   409,   412,   -49,

-     420,   187,   117,   421,   118,   325,   416,   422,   325,   429,

-     424,   372,   371,   375,   233,   319,   325,   432,   373,   376,

-     229,   333,   244,   122,   325,   320,   374,   249,   217,   386,

-     335,   132,   428,   347,   415,   388,   129,   393,   217,     0,

-       0,   336,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,   217,     0,     0,   217,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,   217,     0,     0,     0,     0,     0,     0,

-       0,    15,    16,    17,    18,    19,    20,   163,   164,   165,

-     217,   166,   167,   168,   169,   170,   171,   172,    21,    22,

-      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,

-      33,    34,    35,     0,    36,    37,    38,    39,    40,    41,

-      42,    43,    44,    45,    46,    47,    48,    49,    50,    51,

-      52,    53,    54,    55,    56,    57,    58,    59,    60,    61,

-      62,    63,    64,    65,    66,    67,    68,    69,    70,    71,

-      72,    73,    74,   173,   117,    75,   118,   174,   175,   176,

-     177,   178,     0,     0,   179,   180,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,    76,    77,    78,    79,     0,    80,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,    86,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,    87,     0,    88,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,   181,     0,     0,     0,     0,     0,

-     182,   183,   184,   185,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,   186,   187,   188,    15,    16,

-      17,    18,    19,    20,   163,   164,   165,     0,   166,   167,

-     168,   169,   170,   171,   172,    21,    22,    23,    24,    25,

-      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,

-       0,    36,    37,    38,    39,    40,    41,    42,    43,    44,

-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,

-      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,

-      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,

-     173,   117,    75,   118,   174,   175,   176,   177,   178,     0,

-       0,   179,   180,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-      76,    77,    78,    79,     0,    80,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,    86,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,    87,     0,    88,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,   181,     0,     0,     0,     0,     0,   182,   183,   184,

-     185,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,   186,   187,   316,    15,    16,    17,    18,    19,

-      20,   163,   164,   165,     0,   166,   167,   168,   169,   170,

-     171,   172,    21,    22,    23,    24,    25,    26,    27,    28,

-      29,    30,    31,    32,    33,    34,    35,     0,    36,    37,

-      38,    39,    40,    41,    42,    43,    44,    45,    46,    47,

-      48,    49,    50,    51,    52,    53,    54,    55,    56,    57,

-      58,    59,    60,    61,    62,    63,    64,    65,    66,    67,

-      68,    69,    70,    71,    72,    73,    74,   173,   117,    75,

-     118,   174,   175,   176,   177,   178,     0,     0,   179,   180,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,    76,    77,    78,

-      79,     0,    80,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,    86,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,    87,

-       0,    88,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,   181,     0,

-       0,     0,     0,     0,   182,   183,   184,   185,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,   186,

-     187,   395,    15,    16,    17,    18,    19,    20,   163,   164,

-     165,     0,   166,   167,   168,   169,   170,   171,   172,    21,

-      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,

-      32,    33,    34,    35,     0,    36,    37,    38,    39,    40,

-      41,    42,    43,    44,    45,    46,    47,    48,    49,    50,

-      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,

-      61,    62,    63,    64,    65,    66,    67,    68,    69,    70,

-      71,    72,    73,    74,   173,   117,    75,   118,   174,   175,

-     176,   177,   178,     0,     0,   179,   180,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,    76,    77,    78,    79,     0,    80,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,    86,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,    87,     0,    88,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,   181,     0,     0,     0,     0,

-       0,   182,   183,   184,   185,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,   186,   187,    15,    16,

-      17,    18,    19,    20,   163,   164,   165,     0,   166,   167,

-     168,   169,   170,   171,   172,    21,    22,    23,    24,    25,

-      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,

-       0,    36,    37,    38,    39,    40,    41,    42,    43,    44,

-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,

-      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,

-      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,

-     173,   117,    75,   118,   174,   175,   176,   177,   178,     0,

-       0,   179,   180,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-      76,    77,    78,    79,     0,    80,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,    86,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,    87,     0,    88,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,   181,     0,     0,     0,     0,     0,   182,   183,   184,

-     185,    15,    16,    17,    18,    19,    20,     0,     0,     0,

-       0,     0,   186,   131,     0,     0,     0,     0,    21,    22,

-      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,

-      33,    34,    35,     0,    36,    37,    38,    39,    40,    41,

-      42,    43,    44,    45,    46,    47,    48,    49,    50,    51,

-      52,    53,    54,    55,    56,    57,    58,    59,    60,    61,

-      62,    63,    64,    65,    66,    67,    68,    69,    70,    71,

-      72,    73,    74,     0,   117,    75,   118,   174,   175,   176,

-     177,   178,     0,     0,   179,   180,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,    76,    77,    78,    79,     0,    80,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,    86,     0,    17,    18,    19,    20,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,    21,    22,

-      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,

-       0,     0,     0,     0,     0,    87,     0,    88,     0,    41,

-      42,    43,    44,    45,    46,    47,    48,    49,    50,    51,

-      52,    53,    54,    55,    56,    57,    58,    59,    60,    61,

-      62,    63,    64,    65,    66,    67,    68,    69,    70,    71,

-      72,    73,    74,     0,   181,    75,     0,     0,     0,     0,

-     182,   183,   184,   185,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,   186,     0,     0,     0,     0,

-       0,     0,     0,     0,    77,    78,    79,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,    17,    18,    19,    20,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,    21,    22,    23,

-      24,    25,    26,    27,    28,    29,    30,    31,    32,     0,

-       0,     0,     0,     0,     0,    87,     0,    88,    41,    42,

-      43,    44,    45,    46,    47,    48,    49,    50,    51,    52,

-      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,

-      63,    64,    65,    66,    67,    68,    69,    70,    71,    72,

-      73,    74,     0,     0,    75,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,   247,     0,     0,

-       0,     0,     0,    77,    78,    79,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,    17,    18,    19,    20,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,    21,    22,    23,    24,

-      25,    26,    27,    28,    29,    30,    31,    32,     0,     0,

-       0,     0,     0,     0,    87,     0,    88,    41,    42,    43,

-      44,    45,    46,    47,    48,    49,    50,    51,    52,    53,

-      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,

-      64,    65,    66,    67,    68,    69,    70,    71,    72,    73,

-      74,     0,   117,    75,   118,   174,   175,   176,   177,   178,

-       0,     0,   179,   180,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,   331,     0,     0,     0,

-       0,     0,    77,    78,    79,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,    87,     0,    88,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,   181,     0,     0,     0,     0,     0,   182,   183,

-     184,   185,    15,    16,    17,    18,    19,    20,     0,     0,

-       0,     0,     0,   260,     0,     0,     0,     0,     0,    21,

-      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,

-      32,    33,    34,    35,     0,    36,    37,    38,    39,    40,

-      41,    42,    43,    44,    45,    46,    47,    48,    49,    50,

-      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,

-      61,    62,    63,    64,    65,    66,    67,    68,    69,    70,

-      71,    72,    73,    74,     0,   117,    75,   118,   174,   175,

-     176,   177,   178,     0,     0,   179,   180,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,   342,    77,    78,    79,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,    86,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,    87,     0,    88,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-      17,    18,    19,    20,     0,   181,     0,     0,     0,     0,

-       0,   182,   183,   184,   185,    21,    22,    23,    24,    25,

-      26,    27,    28,    29,    30,    31,    32,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,    41,    42,    43,    44,

-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,

-      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,

-      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,

-       0,   117,    75,   118,   174,   175,   176,   177,   178,     0,

-       0,   179,   180,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,    77,    78,    79,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,    87,     0,    88,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,    17,    18,    19,    20,

-       0,   181,     0,     0,   238,     0,     0,   182,   183,   184,

-     185,    21,    22,    23,    24,    25,    26,    27,    28,    29,

-      30,    31,    32,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,    41,    42,    43,    44,    45,    46,    47,    48,

-      49,    50,    51,    52,    53,    54,    55,    56,    57,    58,

-      59,    60,    61,    62,    63,    64,    65,    66,    67,    68,

-      69,    70,    71,    72,    73,    74,     0,   117,    75,   118,

-     174,   175,   176,   177,   178,     0,     0,   179,   180,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,    77,    78,    79,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,    87,     0,

-      88,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,    17,    18,    19,    20,     0,   181,     0,     0,

-     323,     0,     0,   182,   183,   184,   185,    21,    22,    23,

-      24,    25,    26,    27,    28,    29,    30,    31,    32,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,    41,    42,

-      43,    44,    45,    46,    47,    48,    49,    50,    51,    52,

-      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,

-      63,    64,    65,    66,    67,    68,    69,    70,    71,    72,

-      73,    74,     0,   117,    75,   118,   174,   175,   176,   177,

-     178,     0,     0,   179,   180,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,    77,    78,    79,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,    87,     0,    88,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,    17,    18,

-      19,    20,     0,   181,     0,     0,   380,     0,     0,   182,

-     183,   184,   185,    21,    22,    23,    24,    25,    26,    27,

-      28,    29,    30,    31,    32,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,    41,    42,    43,    44,    45,    46,

-      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,

-      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,

-      67,    68,    69,    70,    71,    72,    73,    74,     0,   117,

-      75,   118,   174,   175,   176,   177,   178,     0,     0,   179,

-     180,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,    77,

-      78,    79,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-      87,     0,    88,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,    17,    18,    19,    20,     0,   181,

-       0,     0,     0,     0,     0,   182,   183,   184,   185,    21,

-      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,

-      32,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-      41,    42,    43,    44,    45,    46,    47,    48,    49,    50,

-      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,

-      61,    62,    63,    64,    65,    66,    67,    68,    69,    70,

-      71,    72,    73,   278,     0,   117,    75,   118,   174,   175,

-     176,   177,   178,     0,     0,   179,   180,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,    77,    78,    79,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,    87,     0,    88,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-      17,    18,    19,    20,     0,   181,     0,     0,     0,     0,

-       0,   182,   183,   184,   185,    21,    22,    23,    24,    25,

-      26,    27,    28,    29,    30,    31,    32,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,    41,    42,    43,    44,

-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,

-      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,

-      65,    66,    67,    68,    69,    70,    71,    72,    73,   401,

-       0,   117,    75,   118,   174,   175,   176,   177,   178,     0,

-       0,   179,   180,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,    77,    78,    79,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,    87,     0,    88,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,    15,    16,    17,    18,    19,    20,

-       0,   181,     0,     0,     0,     0,     0,   182,   183,   184,

-     185,    21,    22,    23,    24,    25,    26,    27,    28,    29,

-      30,    31,    32,    33,    34,    35,     0,    36,    37,    38,

-      39,    40,    41,    42,    43,    44,    45,    46,    47,    48,

-      49,    50,    51,    52,    53,    54,    55,    56,    57,    58,

-      59,    60,    61,    62,    63,    64,    65,    66,    67,    68,

-      69,    70,    71,    72,    73,    74,     0,     0,    75,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,    76,    77,    78,    79,

-       0,    80,     0,     0,     0,     0,     0,     0,     0,    81,

-      82,    83,    84,    85,    86,    17,    18,    19,    20,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,

-      31,    32,     0,     0,     0,     0,     0,     0,    87,     0,

-      88,    41,    42,    43,    44,    45,    46,    47,    48,    49,

-      50,    51,    52,    53,    54,    55,    56,    57,    58,    59,

-      60,    61,    62,    63,    64,    65,    66,    67,    68,    69,

-      70,    71,    72,    73,    74,     0,     0,    75,    17,    18,

-      19,    20,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,    21,    22,    23,    24,    25,    26,    27,

-      28,    29,    30,    31,    32,     0,    77,    78,    79,     0,

-       0,     0,     0,     0,    41,    42,    43,    44,    45,    46,

-      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,

-      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,

-      67,    68,    69,    70,    71,    72,    73,    74,     0,     0,

-      75,     0,     0,     0,     0,     0,     0,    87,     0,    88,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-      87,     0,    88

-};

-

-static const yytype_int16 yycheck[] =

-{

-       9,     8,    76,    76,    93,   169,   165,   171,   155,   151,

-     235,    76,    77,    78,    76,    86,    87,   181,    88,    89,

-     198,   198,     4,   265,   322,    99,   100,     3,     4,   394,

-       9,     9,   201,   201,   217,   218,    98,    80,   216,   216,

-     107,    33,    34,    84,    85,    37,   120,   412,   217,   217,

-     151,    33,    34,    35,   111,   122,    32,    33,    34,     4,

-      36,    37,     0,   222,   201,   115,    73,   201,    95,    96,

-      97,    98,    99,   100,   101,   102,   103,   104,   179,   180,

-     217,    90,   112,   217,   115,   383,   201,   115,    33,    34,

-      35,    98,   101,   235,   258,   337,   321,   197,   262,   200,

-     215,   265,   249,   328,   111,   201,   115,   405,   114,   273,

-     408,    90,    90,   197,   202,   203,   197,   201,   416,   215,

-     201,   115,   131,    90,    91,   214,   424,   198,   115,   200,

-     115,   140,     3,     4,   235,   142,   236,   197,   197,   209,

-     210,   201,   201,    76,    77,    78,   155,   154,   157,   313,

-     197,   197,   196,   218,   379,   201,   165,   106,   107,   108,

-     197,    32,    33,    34,   201,    36,    37,    38,    39,    40,

-     218,   197,   201,   337,   198,   201,   196,   277,   196,   321,

-     301,   302,   303,   304,   297,   298,   328,   115,   347,   216,

-     299,   300,   292,   294,   295,   296,   297,   298,   299,   300,

-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,

-     311,   312,   274,   222,   314,   197,    76,    77,    78,   196,

-     321,   217,   322,   387,   233,   232,   216,   328,   217,     3,

-       4,   217,   391,    33,    34,    35,   196,   379,   196,   196,

-     249,   206,   207,   208,   305,   306,   217,   411,   257,   215,

-     196,   219,   196,   212,   197,   355,   265,   196,    32,    33,

-      34,   270,    36,    37,    38,    39,    40,   274,   342,   342,

-     429,   211,   213,    92,    94,   217,   196,   199,   379,   198,

-      75,    80,   197,   383,   198,   216,   199,   196,   199,   201,

-     197,   196,   216,   197,   217,   216,   199,   199,   197,   197,

-     400,   218,    76,   403,    78,   405,   216,   199,   408,    12,

-     216,   308,   307,   311,   141,   233,   416,   217,   309,   312,

-     134,   253,   329,    80,   424,   233,   310,   157,   337,   329,

-     257,    92,   412,   270,   392,   337,    90,   344,   347,    -1,

-      -1,   257,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,   391,    -1,    -1,   394,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,   412,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,     3,     4,     5,     6,     7,     8,     9,    10,    11,

-     429,    13,    14,    15,    16,    17,    18,    19,    20,    21,

-      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,

-      32,    33,    34,    -1,    36,    37,    38,    39,    40,    41,

-      42,    43,    44,    45,    46,    47,    48,    49,    50,    51,

-      52,    53,    54,    55,    56,    57,    58,    59,    60,    61,

-      62,    63,    64,    65,    66,    67,    68,    69,    70,    71,

-      72,    73,    74,    75,    76,    77,    78,    79,    80,    81,

-      82,    83,    -1,    -1,    86,    87,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,   105,   106,   107,   108,    -1,   110,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,   123,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,   157,    -1,   159,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,   196,    -1,    -1,    -1,    -1,    -1,

-     202,   203,   204,   205,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,   217,   218,   219,     3,     4,

-       5,     6,     7,     8,     9,    10,    11,    -1,    13,    14,

-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,

-      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,

-      -1,    36,    37,    38,    39,    40,    41,    42,    43,    44,

-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,

-      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,

-      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,

-      75,    76,    77,    78,    79,    80,    81,    82,    83,    -1,

-      -1,    86,    87,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-     105,   106,   107,   108,    -1,   110,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   123,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,   157,    -1,   159,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,   196,    -1,    -1,    -1,    -1,    -1,   202,   203,   204,

-     205,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,   217,   218,   219,     3,     4,     5,     6,     7,

-       8,     9,    10,    11,    -1,    13,    14,    15,    16,    17,

-      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,

-      28,    29,    30,    31,    32,    33,    34,    -1,    36,    37,

-      38,    39,    40,    41,    42,    43,    44,    45,    46,    47,

-      48,    49,    50,    51,    52,    53,    54,    55,    56,    57,

-      58,    59,    60,    61,    62,    63,    64,    65,    66,    67,

-      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,

-      78,    79,    80,    81,    82,    83,    -1,    -1,    86,    87,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   105,   106,   107,

-     108,    -1,   110,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,   123,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   157,

-      -1,   159,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   196,    -1,

-      -1,    -1,    -1,    -1,   202,   203,   204,   205,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   217,

-     218,   219,     3,     4,     5,     6,     7,     8,     9,    10,

-      11,    -1,    13,    14,    15,    16,    17,    18,    19,    20,

-      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,

-      31,    32,    33,    34,    -1,    36,    37,    38,    39,    40,

-      41,    42,    43,    44,    45,    46,    47,    48,    49,    50,

-      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,

-      61,    62,    63,    64,    65,    66,    67,    68,    69,    70,

-      71,    72,    73,    74,    75,    76,    77,    78,    79,    80,

-      81,    82,    83,    -1,    -1,    86,    87,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,   105,   106,   107,   108,    -1,   110,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,   123,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,   157,    -1,   159,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,   196,    -1,    -1,    -1,    -1,

-      -1,   202,   203,   204,   205,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,   217,   218,     3,     4,

-       5,     6,     7,     8,     9,    10,    11,    -1,    13,    14,

-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,

-      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,

-      -1,    36,    37,    38,    39,    40,    41,    42,    43,    44,

-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,

-      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,

-      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,

-      75,    76,    77,    78,    79,    80,    81,    82,    83,    -1,

-      -1,    86,    87,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-     105,   106,   107,   108,    -1,   110,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   123,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,   157,    -1,   159,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,   196,    -1,    -1,    -1,    -1,    -1,   202,   203,   204,

-     205,     3,     4,     5,     6,     7,     8,    -1,    -1,    -1,

-      -1,    -1,   217,   218,    -1,    -1,    -1,    -1,    20,    21,

-      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,

-      32,    33,    34,    -1,    36,    37,    38,    39,    40,    41,

-      42,    43,    44,    45,    46,    47,    48,    49,    50,    51,

-      52,    53,    54,    55,    56,    57,    58,    59,    60,    61,

-      62,    63,    64,    65,    66,    67,    68,    69,    70,    71,

-      72,    73,    74,    -1,    76,    77,    78,    79,    80,    81,

-      82,    83,    -1,    -1,    86,    87,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,   105,   106,   107,   108,    -1,   110,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,   123,    -1,     5,     6,     7,     8,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    20,    21,

-      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,

-      -1,    -1,    -1,    -1,    -1,   157,    -1,   159,    -1,    41,

-      42,    43,    44,    45,    46,    47,    48,    49,    50,    51,

-      52,    53,    54,    55,    56,    57,    58,    59,    60,    61,

-      62,    63,    64,    65,    66,    67,    68,    69,    70,    71,

-      72,    73,    74,    -1,   196,    77,    -1,    -1,    -1,    -1,

-     202,   203,   204,   205,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,   217,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,   106,   107,   108,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,     5,     6,     7,     8,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    20,    21,    22,

-      23,    24,    25,    26,    27,    28,    29,    30,    31,    -1,

-      -1,    -1,    -1,    -1,    -1,   157,    -1,   159,    41,    42,

-      43,    44,    45,    46,    47,    48,    49,    50,    51,    52,

-      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,

-      63,    64,    65,    66,    67,    68,    69,    70,    71,    72,

-      73,    74,    -1,    -1,    77,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   219,    -1,    -1,

-      -1,    -1,    -1,   106,   107,   108,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,     5,     6,     7,     8,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    20,    21,    22,    23,

-      24,    25,    26,    27,    28,    29,    30,    31,    -1,    -1,

-      -1,    -1,    -1,    -1,   157,    -1,   159,    41,    42,    43,

-      44,    45,    46,    47,    48,    49,    50,    51,    52,    53,

-      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,

-      64,    65,    66,    67,    68,    69,    70,    71,    72,    73,

-      74,    -1,    76,    77,    78,    79,    80,    81,    82,    83,

-      -1,    -1,    86,    87,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,   219,    -1,    -1,    -1,

-      -1,    -1,   106,   107,   108,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,   157,    -1,   159,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,   196,    -1,    -1,    -1,    -1,    -1,   202,   203,

-     204,   205,     3,     4,     5,     6,     7,     8,    -1,    -1,

-      -1,    -1,    -1,   217,    -1,    -1,    -1,    -1,    -1,    20,

-      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,

-      31,    32,    33,    34,    -1,    36,    37,    38,    39,    40,

-      41,    42,    43,    44,    45,    46,    47,    48,    49,    50,

-      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,

-      61,    62,    63,    64,    65,    66,    67,    68,    69,    70,

-      71,    72,    73,    74,    -1,    76,    77,    78,    79,    80,

-      81,    82,    83,    -1,    -1,    86,    87,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,   105,   106,   107,   108,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,   123,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,   157,    -1,   159,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-       5,     6,     7,     8,    -1,   196,    -1,    -1,    -1,    -1,

-      -1,   202,   203,   204,   205,    20,    21,    22,    23,    24,

-      25,    26,    27,    28,    29,    30,    31,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    41,    42,    43,    44,

-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,

-      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,

-      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,

-      -1,    76,    77,    78,    79,    80,    81,    82,    83,    -1,

-      -1,    86,    87,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,   106,   107,   108,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,   157,    -1,   159,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,     5,     6,     7,     8,

-      -1,   196,    -1,    -1,   199,    -1,    -1,   202,   203,   204,

-     205,    20,    21,    22,    23,    24,    25,    26,    27,    28,

-      29,    30,    31,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    41,    42,    43,    44,    45,    46,    47,    48,

-      49,    50,    51,    52,    53,    54,    55,    56,    57,    58,

-      59,    60,    61,    62,    63,    64,    65,    66,    67,    68,

-      69,    70,    71,    72,    73,    74,    -1,    76,    77,    78,

-      79,    80,    81,    82,    83,    -1,    -1,    86,    87,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   106,   107,   108,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   157,    -1,

-     159,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,     5,     6,     7,     8,    -1,   196,    -1,    -1,

-     199,    -1,    -1,   202,   203,   204,   205,    20,    21,    22,

-      23,    24,    25,    26,    27,    28,    29,    30,    31,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    41,    42,

-      43,    44,    45,    46,    47,    48,    49,    50,    51,    52,

-      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,

-      63,    64,    65,    66,    67,    68,    69,    70,    71,    72,

-      73,    74,    -1,    76,    77,    78,    79,    80,    81,    82,

-      83,    -1,    -1,    86,    87,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,   106,   107,   108,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,   157,    -1,   159,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     5,     6,

-       7,     8,    -1,   196,    -1,    -1,   199,    -1,    -1,   202,

-     203,   204,   205,    20,    21,    22,    23,    24,    25,    26,

-      27,    28,    29,    30,    31,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    41,    42,    43,    44,    45,    46,

-      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,

-      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,

-      67,    68,    69,    70,    71,    72,    73,    74,    -1,    76,

-      77,    78,    79,    80,    81,    82,    83,    -1,    -1,    86,

-      87,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   106,

-     107,   108,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-     157,    -1,   159,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,     5,     6,     7,     8,    -1,   196,

-      -1,    -1,    -1,    -1,    -1,   202,   203,   204,   205,    20,

-      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,

-      31,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      41,    42,    43,    44,    45,    46,    47,    48,    49,    50,

-      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,

-      61,    62,    63,    64,    65,    66,    67,    68,    69,    70,

-      71,    72,    73,    74,    -1,    76,    77,    78,    79,    80,

-      81,    82,    83,    -1,    -1,    86,    87,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,   106,   107,   108,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,   157,    -1,   159,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-       5,     6,     7,     8,    -1,   196,    -1,    -1,    -1,    -1,

-      -1,   202,   203,   204,   205,    20,    21,    22,    23,    24,

-      25,    26,    27,    28,    29,    30,    31,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    41,    42,    43,    44,

-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,

-      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,

-      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,

-      -1,    76,    77,    78,    79,    80,    81,    82,    83,    -1,

-      -1,    86,    87,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,   106,   107,   108,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,   157,    -1,   159,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,     3,     4,     5,     6,     7,     8,

-      -1,   196,    -1,    -1,    -1,    -1,    -1,   202,   203,   204,

-     205,    20,    21,    22,    23,    24,    25,    26,    27,    28,

-      29,    30,    31,    32,    33,    34,    -1,    36,    37,    38,

-      39,    40,    41,    42,    43,    44,    45,    46,    47,    48,

-      49,    50,    51,    52,    53,    54,    55,    56,    57,    58,

-      59,    60,    61,    62,    63,    64,    65,    66,    67,    68,

-      69,    70,    71,    72,    73,    74,    -1,    -1,    77,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,   105,   106,   107,   108,

-      -1,   110,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   118,

-     119,   120,   121,   122,   123,     5,     6,     7,     8,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,

-      30,    31,    -1,    -1,    -1,    -1,    -1,    -1,   157,    -1,

-     159,    41,    42,    43,    44,    45,    46,    47,    48,    49,

-      50,    51,    52,    53,    54,    55,    56,    57,    58,    59,

-      60,    61,    62,    63,    64,    65,    66,    67,    68,    69,

-      70,    71,    72,    73,    74,    -1,    -1,    77,     5,     6,

-       7,     8,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    20,    21,    22,    23,    24,    25,    26,

-      27,    28,    29,    30,    31,    -1,   106,   107,   108,    -1,

-      -1,    -1,    -1,    -1,    41,    42,    43,    44,    45,    46,

-      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,

-      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,

-      67,    68,    69,    70,    71,    72,    73,    74,    -1,    -1,

-      77,    -1,    -1,    -1,    -1,    -1,    -1,   157,    -1,   159,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-     157,    -1,   159

-};

-

-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing

-   symbol of state STATE-NUM.  */

-static const yytype_uint16 yystos[] =

-{

-       0,   111,   221,   223,    80,     0,   225,   115,   112,   222,

-     227,    76,    77,    78,   226,     3,     4,     5,     6,     7,

-       8,    20,    21,    22,    23,    24,    25,    26,    27,    28,

-      29,    30,    31,    32,    33,    34,    36,    37,    38,    39,

-      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,

-      50,    51,    52,    53,    54,    55,    56,    57,    58,    59,

-      60,    61,    62,    63,    64,    65,    66,    67,    68,    69,

-      70,    71,    72,    73,    74,    77,   105,   106,   107,   108,

-     110,   118,   119,   120,   121,   122,   123,   157,   159,   224,

-     228,   262,   263,   264,   265,   266,   271,   272,   273,   274,

-     277,   279,   280,   281,   282,   283,   284,   285,   286,   311,

-     312,   114,    33,    34,    37,   218,   226,    76,    78,   229,

-     277,   280,   285,   115,   115,   115,   115,   115,   196,   311,

-     217,   218,   298,   197,   201,     4,    33,    34,    35,   268,

-     269,   278,   201,   217,    76,    78,   226,   229,   280,   280,

-     281,   198,   282,   226,   281,   287,   288,   218,   280,   282,

-     226,   275,   276,     9,    10,    11,    13,    14,    15,    16,

-      17,    18,    19,    75,    79,    80,    81,    82,    83,    86,

-      87,   196,   202,   203,   204,   205,   217,   218,   219,   229,

-     230,   231,   233,   234,   235,   236,   237,   238,   239,   244,

-     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,

-     255,   256,   257,   258,   260,   262,   263,   281,   292,   293,

-     294,   295,   299,   300,   301,   304,   305,   306,   310,   268,

-     267,   270,   281,   269,   226,   198,   216,   196,   199,   244,

-     257,   261,   281,   115,   226,   289,   290,   219,   288,   287,

-     217,   216,   197,   201,   217,   217,   293,   196,   196,   217,

-     217,   260,   196,   260,   215,   196,   244,   244,   260,   219,

-     296,    86,    87,   198,   200,   197,   197,   201,    74,   258,

-     196,    95,    96,    97,    98,    99,   100,   101,   102,   103,

-     104,   216,   259,   244,   206,   207,   208,   202,   203,    84,

-      85,    88,    89,   209,   210,    90,    91,   211,   212,   213,

-      92,    94,    93,   214,   201,   217,   219,   293,   226,   267,

-     270,   198,   216,   199,   261,   258,   291,   199,   198,   201,

-     217,   219,    80,   276,    75,   292,   300,   307,   260,   217,

-     260,   215,   105,   260,   273,   303,   197,   299,   232,   260,

-     226,   229,   240,   241,   242,   243,   258,   258,   244,   244,

-     244,   246,   246,   247,   247,   248,   248,   248,   248,   249,

-     249,   250,   251,   252,   253,   254,   255,   260,   258,   198,

-     199,   261,   291,   216,   199,   261,   290,   196,   303,   308,

-     309,   197,   197,   226,   197,   219,   199,   196,   197,   197,

-     201,    74,   258,   215,   261,   216,   199,   291,   216,   199,

-     260,   217,   197,   293,   302,   295,   216,   294,   297,   298,

-     258,   258,   199,   291,   216,   291,   197,   260,   297,    12,

-     291,   291,   217,   293

-};

-

-#define yyerrok		(yyerrstatus = 0)

-#define yyclearin	(yychar = YYEMPTY)

-#define YYEMPTY		(-2)

-#define YYEOF		0

-

-#define YYACCEPT	goto yyacceptlab

-#define YYABORT		goto yyabortlab

-#define YYERROR		goto yyerrorlab

-

-

-/* Like YYERROR except do call yyerror.  This remains here temporarily

-   to ease the transition to the new meaning of YYERROR, for GCC.

-   Once GCC version 2 has supplanted version 1, this can go.  However,

-   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated

-   in Bison 2.4.2's NEWS entry, where a plan to phase it out is

-   discussed.  */

-

-#define YYFAIL		goto yyerrlab

-#if defined YYFAIL

-  /* This is here to suppress warnings from the GCC cpp's

-     -Wunused-macros.  Normally we don't worry about that warning, but

-     some users do, and we want to make it easy for users to remove

-     YYFAIL uses, which will produce warnings from Bison 2.5.  */

-#endif

-

-#define YYRECOVERING()  (!!yyerrstatus)

-

-#define YYBACKUP(Token, Value)					\

-do								\

-  if (yychar == YYEMPTY && yylen == 1)				\

-    {								\

-      yychar = (Token);						\

-      yylval = (Value);						\

-      yytoken = YYTRANSLATE (yychar);				\

-      YYPOPSTACK (1);						\

-      goto yybackup;						\

-    }								\

-  else								\

-    {								\

-      yyerror (&yylloc, state, YY_("syntax error: cannot back up")); \

-      YYERROR;							\

-    }								\

-while (YYID (0))

-

-

-#define YYTERROR	1

-#define YYERRCODE	256

-

-

-/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].

-   If N is 0, then set CURRENT to the empty location which ends

-   the previous symbol: RHS[0] (always defined).  */

-

-#define YYRHSLOC(Rhs, K) ((Rhs)[K])

-#ifndef YYLLOC_DEFAULT

-# define YYLLOC_DEFAULT(Current, Rhs, N)				\

-    do									\

-      if (YYID (N))                                                    \

-	{								\

-	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\

-	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\

-	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\

-	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\

-	}								\

-      else								\

-	{								\

-	  (Current).first_line   = (Current).last_line   =		\

-	    YYRHSLOC (Rhs, 0).last_line;				\

-	  (Current).first_column = (Current).last_column =		\

-	    YYRHSLOC (Rhs, 0).last_column;				\

-	}								\

-    while (YYID (0))

-#endif

-

-

-/* YY_LOCATION_PRINT -- Print the location on the stream.

-   This macro was not mandated originally: define only if we know

-   we won't break user code: when these are the locations we know.  */

-

-#ifndef YY_LOCATION_PRINT

-# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL

-#  define YY_LOCATION_PRINT(File, Loc)			\

-     fprintf (File, "%d.%d-%d.%d",			\

-	      (Loc).first_line, (Loc).first_column,	\

-	      (Loc).last_line,  (Loc).last_column)

-# else

-#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)

-# endif

-#endif

-

-

-/* YYLEX -- calling `yylex' with the right arguments.  */

-

-#ifdef YYLEX_PARAM

-# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM)

-#else

-# define YYLEX yylex (&yylval, &yylloc, scanner)

-#endif

-

-/* Enable debugging if requested.  */

-#if YYDEBUG

-

-# ifndef YYFPRINTF

-#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */

-#  define YYFPRINTF fprintf

-# endif

-

-# define YYDPRINTF(Args)			\

-do {						\

-  if (yydebug)					\

-    YYFPRINTF Args;				\

-} while (YYID (0))

-

-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \

-do {									  \

-  if (yydebug)								  \

-    {									  \

-      YYFPRINTF (stderr, "%s ", Title);					  \

-      yy_symbol_print (stderr,						  \

-		  Type, Value, Location, state); \

-      YYFPRINTF (stderr, "\n");						  \

-    }									  \

-} while (YYID (0))

-

-

-/*--------------------------------.

-| Print this symbol on YYOUTPUT.  |

-`--------------------------------*/

-

-/*ARGSUSED*/

-#if (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-static void

-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, struct _mesa_glsl_parse_state *state)

-#else

-static void

-yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp, state)

-    FILE *yyoutput;

-    int yytype;

-    YYSTYPE const * const yyvaluep;

-    YYLTYPE const * const yylocationp;

-    struct _mesa_glsl_parse_state *state;

-#endif

-{

-  if (!yyvaluep)

-    return;

-  YYUSE (yylocationp);

-  YYUSE (state);

-# ifdef YYPRINT

-  if (yytype < YYNTOKENS)

-    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);

-# else

-  YYUSE (yyoutput);

-# endif

-  switch (yytype)

-    {

-      default:

-	break;

-    }

-}

-

-

-/*--------------------------------.

-| Print this symbol on YYOUTPUT.  |

-`--------------------------------*/

-

-#if (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-static void

-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, struct _mesa_glsl_parse_state *state)

-#else

-static void

-yy_symbol_print (yyoutput, yytype, yyvaluep, yylocationp, state)

-    FILE *yyoutput;

-    int yytype;

-    YYSTYPE const * const yyvaluep;

-    YYLTYPE const * const yylocationp;

-    struct _mesa_glsl_parse_state *state;

-#endif

-{

-  if (yytype < YYNTOKENS)

-    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);

-  else

-    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);

-

-  YY_LOCATION_PRINT (yyoutput, *yylocationp);

-  YYFPRINTF (yyoutput, ": ");

-  yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp, state);

-  YYFPRINTF (yyoutput, ")");

-}

-

-/*------------------------------------------------------------------.

-| yy_stack_print -- Print the state stack from its BOTTOM up to its |

-| TOP (included).                                                   |

-`------------------------------------------------------------------*/

-

-#if (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-static void

-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)

-#else

-static void

-yy_stack_print (yybottom, yytop)

-    yytype_int16 *yybottom;

-    yytype_int16 *yytop;

-#endif

-{

-  YYFPRINTF (stderr, "Stack now");

-  for (; yybottom <= yytop; yybottom++)

-    {

-      int yybot = *yybottom;

-      YYFPRINTF (stderr, " %d", yybot);

-    }

-  YYFPRINTF (stderr, "\n");

-}

-

-# define YY_STACK_PRINT(Bottom, Top)				\

-do {								\

-  if (yydebug)							\

-    yy_stack_print ((Bottom), (Top));				\

-} while (YYID (0))

-

-

-/*------------------------------------------------.

-| Report that the YYRULE is going to be reduced.  |

-`------------------------------------------------*/

-

-#if (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-static void

-yy_reduce_print (YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule, struct _mesa_glsl_parse_state *state)

-#else

-static void

-yy_reduce_print (yyvsp, yylsp, yyrule, state)

-    YYSTYPE *yyvsp;

-    YYLTYPE *yylsp;

-    int yyrule;

-    struct _mesa_glsl_parse_state *state;

-#endif

-{

-  int yynrhs = yyr2[yyrule];

-  int yyi;

-  unsigned long int yylno = yyrline[yyrule];

-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",

-	     yyrule - 1, yylno);

-  /* The symbols being reduced.  */

-  for (yyi = 0; yyi < yynrhs; yyi++)

-    {

-      YYFPRINTF (stderr, "   $%d = ", yyi + 1);

-      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],

-		       &(yyvsp[(yyi + 1) - (yynrhs)])

-		       , &(yylsp[(yyi + 1) - (yynrhs)])		       , state);

-      YYFPRINTF (stderr, "\n");

-    }

-}

-

-# define YY_REDUCE_PRINT(Rule)		\

-do {					\

-  if (yydebug)				\

-    yy_reduce_print (yyvsp, yylsp, Rule, state); \

-} while (YYID (0))

-

-/* Nonzero means print parse trace.  It is left uninitialized so that

-   multiple parsers can coexist.  */

-int yydebug;

-#else /* !YYDEBUG */

-# define YYDPRINTF(Args)

-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)

-# define YY_STACK_PRINT(Bottom, Top)

-# define YY_REDUCE_PRINT(Rule)

-#endif /* !YYDEBUG */

-

-

-/* YYINITDEPTH -- initial size of the parser's stacks.  */

-#ifndef	YYINITDEPTH

-# define YYINITDEPTH 200

-#endif

-

-/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only

-   if the built-in stack extension method is used).

-

-   Do not make this value too large; the results are undefined if

-   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)

-   evaluated with infinite-precision integer arithmetic.  */

-

-#ifndef YYMAXDEPTH

-# define YYMAXDEPTH 10000

-#endif

-

-

-

-#if YYERROR_VERBOSE

-

-# ifndef yystrlen

-#  if defined __GLIBC__ && defined _STRING_H

-#   define yystrlen strlen

-#  else

-/* Return the length of YYSTR.  */

-#if (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-static YYSIZE_T

-yystrlen (const char *yystr)

-#else

-static YYSIZE_T

-yystrlen (yystr)

-    const char *yystr;

-#endif

-{

-  YYSIZE_T yylen;

-  for (yylen = 0; yystr[yylen]; yylen++)

-    continue;

-  return yylen;

-}

-#  endif

-# endif

-

-# ifndef yystpcpy

-#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE

-#   define yystpcpy stpcpy

-#  else

-/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in

-   YYDEST.  */

-#if (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-static char *

-yystpcpy (char *yydest, const char *yysrc)

-#else

-static char *

-yystpcpy (yydest, yysrc)

-    char *yydest;

-    const char *yysrc;

-#endif

-{

-  char *yyd = yydest;

-  const char *yys = yysrc;

-

-  while ((*yyd++ = *yys++) != '\0')

-    continue;

-

-  return yyd - 1;

-}

-#  endif

-# endif

-

-# ifndef yytnamerr

-/* Copy to YYRES the contents of YYSTR after stripping away unnecessary

-   quotes and backslashes, so that it's suitable for yyerror.  The

-   heuristic is that double-quoting is unnecessary unless the string

-   contains an apostrophe, a comma, or backslash (other than

-   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is

-   null, do not copy; instead, return the length of what the result

-   would have been.  */

-static YYSIZE_T

-yytnamerr (char *yyres, const char *yystr)

-{

-  if (*yystr == '"')

-    {

-      YYSIZE_T yyn = 0;

-      char const *yyp = yystr;

-

-      for (;;)

-	switch (*++yyp)

-	  {

-	  case '\'':

-	  case ',':

-	    goto do_not_strip_quotes;

-

-	  case '\\':

-	    if (*++yyp != '\\')

-	      goto do_not_strip_quotes;

-	    /* Fall through.  */

-	  default:

-	    if (yyres)

-	      yyres[yyn] = *yyp;

-	    yyn++;

-	    break;

-

-	  case '"':

-	    if (yyres)

-	      yyres[yyn] = '\0';

-	    return yyn;

-	  }

-    do_not_strip_quotes: ;

-    }

-

-  if (! yyres)

-    return yystrlen (yystr);

-

-  return yystpcpy (yyres, yystr) - yyres;

-}

-# endif

-

-/* Copy into YYRESULT an error message about the unexpected token

-   YYCHAR while in state YYSTATE.  Return the number of bytes copied,

-   including the terminating null byte.  If YYRESULT is null, do not

-   copy anything; just return the number of bytes that would be

-   copied.  As a special case, return 0 if an ordinary "syntax error"

-   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during

-   size calculation.  */

-static YYSIZE_T

-yysyntax_error (char *yyresult, int yystate, int yychar)

-{

-  int yyn = yypact[yystate];

-

-  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))

-    return 0;

-  else

-    {

-      int yytype = YYTRANSLATE (yychar);

-      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);

-      YYSIZE_T yysize = yysize0;

-      YYSIZE_T yysize1;

-      int yysize_overflow = 0;

-      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };

-      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];

-      int yyx;

-

-# if 0

-      /* This is so xgettext sees the translatable formats that are

-	 constructed on the fly.  */

-      YY_("syntax error, unexpected %s");

-      YY_("syntax error, unexpected %s, expecting %s");

-      YY_("syntax error, unexpected %s, expecting %s or %s");

-      YY_("syntax error, unexpected %s, expecting %s or %s or %s");

-      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");

-# endif

-      char *yyfmt;

-      char const *yyf;

-      static char const yyunexpected[] = "syntax error, unexpected %s";

-      static char const yyexpecting[] = ", expecting %s";

-      static char const yyor[] = " or %s";

-      char yyformat[sizeof yyunexpected

-		    + sizeof yyexpecting - 1

-		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)

-		       * (sizeof yyor - 1))];

-      char const *yyprefix = yyexpecting;

-

-      /* Start YYX at -YYN if negative to avoid negative indexes in

-	 YYCHECK.  */

-      int yyxbegin = yyn < 0 ? -yyn : 0;

-

-      /* Stay within bounds of both yycheck and yytname.  */

-      int yychecklim = YYLAST - yyn + 1;

-      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;

-      int yycount = 1;

-

-      yyarg[0] = yytname[yytype];

-      yyfmt = yystpcpy (yyformat, yyunexpected);

-

-      for (yyx = yyxbegin; yyx < yyxend; ++yyx)

-	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)

-	  {

-	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)

-	      {

-		yycount = 1;

-		yysize = yysize0;

-		yyformat[sizeof yyunexpected - 1] = '\0';

-		break;

-	      }

-	    yyarg[yycount++] = yytname[yyx];

-	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);

-	    yysize_overflow |= (yysize1 < yysize);

-	    yysize = yysize1;

-	    yyfmt = yystpcpy (yyfmt, yyprefix);

-	    yyprefix = yyor;

-	  }

-

-      yyf = YY_(yyformat);

-      yysize1 = yysize + yystrlen (yyf);

-      yysize_overflow |= (yysize1 < yysize);

-      yysize = yysize1;

-

-      if (yysize_overflow)

-	return YYSIZE_MAXIMUM;

-

-      if (yyresult)

-	{

-	  /* Avoid sprintf, as that infringes on the user's name space.

-	     Don't have undefined behavior even if the translation

-	     produced a string with the wrong number of "%s"s.  */

-	  char *yyp = yyresult;

-	  int yyi = 0;

-	  while ((*yyp = *yyf) != '\0')

-	    {

-	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)

-		{

-		  yyp += yytnamerr (yyp, yyarg[yyi++]);

-		  yyf += 2;

-		}

-	      else

-		{

-		  yyp++;

-		  yyf++;

-		}

-	    }

-	}

-      return yysize;

-    }

-}

-#endif /* YYERROR_VERBOSE */

-

-

-/*-----------------------------------------------.

-| Release the memory associated to this symbol.  |

-`-----------------------------------------------*/

-

-/*ARGSUSED*/

-#if (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-static void

-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp, struct _mesa_glsl_parse_state *state)

-#else

-static void

-yydestruct (yymsg, yytype, yyvaluep, yylocationp, state)

-    const char *yymsg;

-    int yytype;

-    YYSTYPE *yyvaluep;

-    YYLTYPE *yylocationp;

-    struct _mesa_glsl_parse_state *state;

-#endif

-{

-  YYUSE (yyvaluep);

-  YYUSE (yylocationp);

-  YYUSE (state);

-

-  if (!yymsg)

-    yymsg = "Deleting";

-  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);

-

-  switch (yytype)

-    {

-

-      default:

-	break;

-    }

-}

-

-/* Prevent warnings from -Wmissing-prototypes.  */

-#ifdef YYPARSE_PARAM

-#if defined __STDC__ || defined __cplusplus

-int yyparse (void *YYPARSE_PARAM);

-#else

-int yyparse ();

-#endif

-#else /* ! YYPARSE_PARAM */

-#if defined __STDC__ || defined __cplusplus

-int yyparse (struct _mesa_glsl_parse_state *state);

-#else

-int yyparse ();

-#endif

-#endif /* ! YYPARSE_PARAM */

-

-

-

-

-

-/*-------------------------.

-| yyparse or yypush_parse.  |

-`-------------------------*/

-

-#ifdef YYPARSE_PARAM

-#if (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-int

-yyparse (void *YYPARSE_PARAM)

-#else

-int

-yyparse (YYPARSE_PARAM)

-    void *YYPARSE_PARAM;

-#endif

-#else /* ! YYPARSE_PARAM */

-#if (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-int

-yyparse (struct _mesa_glsl_parse_state *state)

-#else

-int

-yyparse (state)

-    struct _mesa_glsl_parse_state *state;

-#endif

-#endif

-{

-/* The lookahead symbol.  */

-int yychar;

-

-/* The semantic value of the lookahead symbol.  */

-YYSTYPE yylval;

-

-/* Location data for the lookahead symbol.  */

-YYLTYPE yylloc;

-

-    /* Number of syntax errors so far.  */

-    int yynerrs;

-

-    int yystate;

-    /* Number of tokens to shift before error messages enabled.  */

-    int yyerrstatus;

-

-    /* The stacks and their tools:

-       `yyss': related to states.

-       `yyvs': related to semantic values.

-       `yyls': related to locations.

-

-       Refer to the stacks thru separate pointers, to allow yyoverflow

-       to reallocate them elsewhere.  */

-

-    /* The state stack.  */

-    yytype_int16 yyssa[YYINITDEPTH];

-    yytype_int16 *yyss;

-    yytype_int16 *yyssp;

-

-    /* The semantic value stack.  */

-    YYSTYPE yyvsa[YYINITDEPTH];

-    YYSTYPE *yyvs;

-    YYSTYPE *yyvsp;

-

-    /* The location stack.  */

-    YYLTYPE yylsa[YYINITDEPTH];

-    YYLTYPE *yyls;

-    YYLTYPE *yylsp;

-

-    /* The locations where the error started and ended.  */

-    YYLTYPE yyerror_range[3];

-

-    YYSIZE_T yystacksize;

-

-  int yyn;

-  int yyresult;

-  /* Lookahead token as an internal (translated) token number.  */

-  int yytoken;

-  /* The variables used to return semantic value and location from the

-     action routines.  */

-  YYSTYPE yyval;

-  YYLTYPE yyloc;

-

-#if YYERROR_VERBOSE

-  /* Buffer for error messages, and its allocated size.  */

-  char yymsgbuf[128];

-  char *yymsg = yymsgbuf;

-  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;

-#endif

-

-#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N), yylsp -= (N))

-

-  /* The number of symbols on the RHS of the reduced rule.

-     Keep to zero when no symbol should be popped.  */

-  int yylen = 0;

-

-  yytoken = 0;

-  yyss = yyssa;

-  yyvs = yyvsa;

-  yyls = yylsa;

-  yystacksize = YYINITDEPTH;

-

-  YYDPRINTF ((stderr, "Starting parse\n"));

-

-  yystate = 0;

-  yyerrstatus = 0;

-  yynerrs = 0;

-  yychar = YYEMPTY; /* Cause a token to be read.  */

-

-  /* Initialize stack pointers.

-     Waste one element of value and location stack

-     so that they stay on the same level as the state stack.

-     The wasted elements are never initialized.  */

-  yyssp = yyss;

-  yyvsp = yyvs;

-  yylsp = yyls;

-

-#if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL

-  /* Initialize the default location before parsing starts.  */

-  yylloc.first_line   = yylloc.last_line   = 1;

-  yylloc.first_column = yylloc.last_column = 1;

-#endif

-

-/* User initialization code.  */

-

-/* Line 1251 of yacc.c  */

-#line 41 "glsl_parser.ypp"

-{

-   yylloc.first_line = 1;

-   yylloc.first_column = 1;

-   yylloc.last_line = 1;

-   yylloc.last_column = 1;

-   yylloc.source = 0;

-}

-

-/* Line 1251 of yacc.c  */

-#line 2657 "glsl_parser.cpp"

-  yylsp[0] = yylloc;

-

-  goto yysetstate;

-

-/*------------------------------------------------------------.

-| yynewstate -- Push a new state, which is found in yystate.  |

-`------------------------------------------------------------*/

- yynewstate:

-  /* In all cases, when you get here, the value and location stacks

-     have just been pushed.  So pushing a state here evens the stacks.  */

-  yyssp++;

-

- yysetstate:

-  *yyssp = yystate;

-

-  if (yyss + yystacksize - 1 <= yyssp)

-    {

-      /* Get the current used size of the three stacks, in elements.  */

-      YYSIZE_T yysize = yyssp - yyss + 1;

-

-#ifdef yyoverflow

-      {

-	/* Give user a chance to reallocate the stack.  Use copies of

-	   these so that the &'s don't force the real ones into

-	   memory.  */

-	YYSTYPE *yyvs1 = yyvs;

-	yytype_int16 *yyss1 = yyss;

-	YYLTYPE *yyls1 = yyls;

-

-	/* Each stack pointer address is followed by the size of the

-	   data in use in that stack, in bytes.  This used to be a

-	   conditional around just the two extra args, but that might

-	   be undefined if yyoverflow is a macro.  */

-	yyoverflow (YY_("memory exhausted"),

-		    &yyss1, yysize * sizeof (*yyssp),

-		    &yyvs1, yysize * sizeof (*yyvsp),

-		    &yyls1, yysize * sizeof (*yylsp),

-		    &yystacksize);

-

-	yyls = yyls1;

-	yyss = yyss1;

-	yyvs = yyvs1;

-      }

-#else /* no yyoverflow */

-# ifndef YYSTACK_RELOCATE

-      goto yyexhaustedlab;

-# else

-      /* Extend the stack our own way.  */

-      if (YYMAXDEPTH <= yystacksize)

-	goto yyexhaustedlab;

-      yystacksize *= 2;

-      if (YYMAXDEPTH < yystacksize)

-	yystacksize = YYMAXDEPTH;

-

-      {

-	yytype_int16 *yyss1 = yyss;

-	union yyalloc *yyptr =

-	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));

-	if (! yyptr)

-	  goto yyexhaustedlab;

-	YYSTACK_RELOCATE (yyss_alloc, yyss);

-	YYSTACK_RELOCATE (yyvs_alloc, yyvs);

-	YYSTACK_RELOCATE (yyls_alloc, yyls);

-#  undef YYSTACK_RELOCATE

-	if (yyss1 != yyssa)

-	  YYSTACK_FREE (yyss1);

-      }

-# endif

-#endif /* no yyoverflow */

-

-      yyssp = yyss + yysize - 1;

-      yyvsp = yyvs + yysize - 1;

-      yylsp = yyls + yysize - 1;

-

-      YYDPRINTF ((stderr, "Stack size increased to %lu\n",

-		  (unsigned long int) yystacksize));

-

-      if (yyss + yystacksize - 1 <= yyssp)

-	YYABORT;

-    }

-

-  YYDPRINTF ((stderr, "Entering state %d\n", yystate));

-

-  if (yystate == YYFINAL)

-    YYACCEPT;

-

-  goto yybackup;

-

-/*-----------.

-| yybackup.  |

-`-----------*/

-yybackup:

-

-  /* Do appropriate processing given the current state.  Read a

-     lookahead token if we need one and don't already have one.  */

-

-  /* First try to decide what to do without reference to lookahead token.  */

-  yyn = yypact[yystate];

-  if (yyn == YYPACT_NINF)

-    goto yydefault;

-

-  /* Not known => get a lookahead token if don't already have one.  */

-

-  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */

-  if (yychar == YYEMPTY)

-    {

-      YYDPRINTF ((stderr, "Reading a token: "));

-      yychar = YYLEX;

-    }

-

-  if (yychar <= YYEOF)

-    {

-      yychar = yytoken = YYEOF;

-      YYDPRINTF ((stderr, "Now at end of input.\n"));

-    }

-  else

-    {

-      yytoken = YYTRANSLATE (yychar);

-      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);

-    }

-

-  /* If the proper action on seeing token YYTOKEN is to reduce or to

-     detect an error, take that action.  */

-  yyn += yytoken;

-  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)

-    goto yydefault;

-  yyn = yytable[yyn];

-  if (yyn <= 0)

-    {

-      if (yyn == 0 || yyn == YYTABLE_NINF)

-	goto yyerrlab;

-      yyn = -yyn;

-      goto yyreduce;

-    }

-

-  /* Count tokens shifted since error; after three, turn off error

-     status.  */

-  if (yyerrstatus)

-    yyerrstatus--;

-

-  /* Shift the lookahead token.  */

-  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);

-

-  /* Discard the shifted token.  */

-  yychar = YYEMPTY;

-

-  yystate = yyn;

-  *++yyvsp = yylval;

-  *++yylsp = yylloc;

-  goto yynewstate;

-

-

-/*-----------------------------------------------------------.

-| yydefault -- do the default action for the current state.  |

-`-----------------------------------------------------------*/

-yydefault:

-  yyn = yydefact[yystate];

-  if (yyn == 0)

-    goto yyerrlab;

-  goto yyreduce;

-

-

-/*-----------------------------.

-| yyreduce -- Do a reduction.  |

-`-----------------------------*/

-yyreduce:

-  /* yyn is the number of a rule to reduce with.  */

-  yylen = yyr2[yyn];

-

-  /* If YYLEN is nonzero, implement the default value of the action:

-     `$$ = $1'.

-

-     Otherwise, the following line sets YYVAL to garbage.

-     This behavior is undocumented and Bison

-     users should not rely upon it.  Assigning to YYVAL

-     unconditionally makes the parser a bit smaller, and it avoids a

-     GCC warning that YYVAL may be used uninitialized.  */

-  yyval = yyvsp[1-yylen];

-

-  /* Default location.  */

-  YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);

-  YY_REDUCE_PRINT (yyn);

-  switch (yyn)

-    {

-        case 2:

-

-/* Line 1464 of yacc.c  */

-#line 218 "glsl_parser.ypp"

-    {

-	   _mesa_glsl_initialize_types(state);

-	;}

-    break;

-

-  case 3:

-

-/* Line 1464 of yacc.c  */

-#line 222 "glsl_parser.ypp"

-    {

-	   delete state->symbols;

-	   state->symbols = new(ralloc_parent(state)) glsl_symbol_table;

-	   _mesa_glsl_initialize_types(state);

-	;}

-    break;

-

-  case 5:

-

-/* Line 1464 of yacc.c  */

-#line 232 "glsl_parser.ypp"

-    {

-	   bool supported = false;

-

-	   switch ((yyvsp[(2) - (3)].n)) {

-	   case 100:

-	      state->es_shader = true;

-	      supported = state->Const.GLSL_100ES;

-	      break;

-	   case 110:

-	      supported = state->Const.GLSL_110;

-	      break;

-	   case 120:

-	      supported = state->Const.GLSL_120;

-	      break;

-	   case 130:

-	      supported = state->Const.GLSL_130;

-	      break;

-	   default:

-	      supported = false;

-	      break;

-	   }

-

-	   state->language_version = (yyvsp[(2) - (3)].n);

-	   state->version_string =

-	      ralloc_asprintf(state, "GLSL%s %d.%02d",

-			      state->es_shader ? " ES" : "",

-			      state->language_version / 100,

-			      state->language_version % 100);

-

-	   if (!supported) {

-	      _mesa_glsl_error(& (yylsp[(2) - (3)]), state, "%s is not supported. "

-			       "Supported versions are: %s\n",

-			       state->version_string,

-			       state->supported_version_string);

-	   }

-	;}

-    break;

-

-  case 10:

-

-/* Line 1464 of yacc.c  */

-#line 276 "glsl_parser.ypp"

-    {

-	   if (state->language_version < 120) {

-	      _mesa_glsl_warning(& (yylsp[(1) - (2)]), state,

-				 "pragma `invariant(all)' not supported in %s",

-				 state->version_string);

-	   } else {

-	      state->all_invariant = true;

-	   }

-	;}

-    break;

-

-  case 16:

-

-/* Line 1464 of yacc.c  */

-#line 300 "glsl_parser.ypp"

-    {

-	   if (!_mesa_glsl_process_extension((yyvsp[(2) - (5)].identifier), & (yylsp[(2) - (5)]), (yyvsp[(4) - (5)].identifier), & (yylsp[(4) - (5)]), state)) {

-	      YYERROR;

-	   }

-	;}

-    break;

-

-  case 17:

-

-/* Line 1464 of yacc.c  */

-#line 309 "glsl_parser.ypp"

-    {

-	   /* FINISHME: The NULL test is required because pragmas are set to

-	    * FINISHME: NULL. (See production rule for external_declaration.)

-	    */

-	   if ((yyvsp[(1) - (1)].node) != NULL)

-	      state->translation_unit.push_tail(& (yyvsp[(1) - (1)].node)->link);

-	;}

-    break;

-

-  case 18:

-

-/* Line 1464 of yacc.c  */

-#line 317 "glsl_parser.ypp"

-    {

-	   /* FINISHME: The NULL test is required because pragmas are set to

-	    * FINISHME: NULL. (See production rule for external_declaration.)

-	    */

-	   if ((yyvsp[(2) - (2)].node) != NULL)

-	      state->translation_unit.push_tail(& (yyvsp[(2) - (2)].node)->link);

-	;}

-    break;

-

-  case 21:

-

-/* Line 1464 of yacc.c  */

-#line 333 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.expression) = new(ctx) ast_expression(ast_identifier, NULL, NULL, NULL);

-	   (yyval.expression)->set_location(yylloc);

-	   (yyval.expression)->primary_expression.identifier = (yyvsp[(1) - (1)].identifier);

-	;}

-    break;

-

-  case 22:

-

-/* Line 1464 of yacc.c  */

-#line 340 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.expression) = new(ctx) ast_expression(ast_int_constant, NULL, NULL, NULL);

-	   (yyval.expression)->set_location(yylloc);

-	   (yyval.expression)->primary_expression.int_constant = (yyvsp[(1) - (1)].n);

-	;}

-    break;

-

-  case 23:

-

-/* Line 1464 of yacc.c  */

-#line 347 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.expression) = new(ctx) ast_expression(ast_uint_constant, NULL, NULL, NULL);

-	   (yyval.expression)->set_location(yylloc);

-	   (yyval.expression)->primary_expression.uint_constant = (yyvsp[(1) - (1)].n);

-	;}

-    break;

-

-  case 24:

-

-/* Line 1464 of yacc.c  */

-#line 354 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.expression) = new(ctx) ast_expression(ast_float_constant, NULL, NULL, NULL);

-	   (yyval.expression)->set_location(yylloc);

-	   (yyval.expression)->primary_expression.float_constant = (yyvsp[(1) - (1)].real);

-	;}

-    break;

-

-  case 25:

-

-/* Line 1464 of yacc.c  */

-#line 361 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.expression) = new(ctx) ast_expression(ast_bool_constant, NULL, NULL, NULL);

-	   (yyval.expression)->set_location(yylloc);

-	   (yyval.expression)->primary_expression.bool_constant = (yyvsp[(1) - (1)].n);

-	;}

-    break;

-

-  case 26:

-

-/* Line 1464 of yacc.c  */

-#line 368 "glsl_parser.ypp"

-    {

-	   (yyval.expression) = (yyvsp[(2) - (3)].expression);

-	;}

-    break;

-

-  case 28:

-

-/* Line 1464 of yacc.c  */

-#line 376 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.expression) = new(ctx) ast_expression(ast_array_index, (yyvsp[(1) - (4)].expression), (yyvsp[(3) - (4)].expression), NULL);

-	   (yyval.expression)->set_location(yylloc);

-	;}

-    break;

-

-  case 29:

-

-/* Line 1464 of yacc.c  */

-#line 382 "glsl_parser.ypp"

-    {

-	   (yyval.expression) = (yyvsp[(1) - (1)].expression);

-	;}

-    break;

-

-  case 30:

-

-/* Line 1464 of yacc.c  */

-#line 386 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.expression) = new(ctx) ast_expression(ast_field_selection, (yyvsp[(1) - (3)].expression), NULL, NULL);

-	   (yyval.expression)->set_location(yylloc);

-	   (yyval.expression)->primary_expression.identifier = (yyvsp[(3) - (3)].identifier);

-	;}

-    break;

-

-  case 31:

-

-/* Line 1464 of yacc.c  */

-#line 393 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.expression) = new(ctx) ast_expression(ast_post_inc, (yyvsp[(1) - (2)].expression), NULL, NULL);

-	   (yyval.expression)->set_location(yylloc);

-	;}

-    break;

-

-  case 32:

-

-/* Line 1464 of yacc.c  */

-#line 399 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.expression) = new(ctx) ast_expression(ast_post_dec, (yyvsp[(1) - (2)].expression), NULL, NULL);

-	   (yyval.expression)->set_location(yylloc);

-	;}

-    break;

-

-  case 36:

-

-/* Line 1464 of yacc.c  */

-#line 417 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.expression) = new(ctx) ast_expression(ast_field_selection, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression), NULL);

-	   (yyval.expression)->set_location(yylloc);

-	;}

-    break;

-

-  case 41:

-

-/* Line 1464 of yacc.c  */

-#line 436 "glsl_parser.ypp"

-    {

-	   (yyval.expression) = (yyvsp[(1) - (2)].expression);

-	   (yyval.expression)->set_location(yylloc);

-	   (yyval.expression)->expressions.push_tail(& (yyvsp[(2) - (2)].expression)->link);

-	;}

-    break;

-

-  case 42:

-

-/* Line 1464 of yacc.c  */

-#line 442 "glsl_parser.ypp"

-    {

-	   (yyval.expression) = (yyvsp[(1) - (3)].expression);

-	   (yyval.expression)->set_location(yylloc);

-	   (yyval.expression)->expressions.push_tail(& (yyvsp[(3) - (3)].expression)->link);

-	;}

-    break;

-

-  case 44:

-

-/* Line 1464 of yacc.c  */

-#line 458 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.expression) = new(ctx) ast_function_expression((yyvsp[(1) - (1)].type_specifier));

-	   (yyval.expression)->set_location(yylloc);

-   	;}

-    break;

-

-  case 45:

-

-/* Line 1464 of yacc.c  */

-#line 464 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   ast_expression *callee = new(ctx) ast_expression((yyvsp[(1) - (1)].identifier));

-	   (yyval.expression) = new(ctx) ast_function_expression(callee);

-	   (yyval.expression)->set_location(yylloc);

-   	;}

-    break;

-

-  case 46:

-

-/* Line 1464 of yacc.c  */

-#line 471 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   ast_expression *callee = new(ctx) ast_expression((yyvsp[(1) - (1)].identifier));

-	   (yyval.expression) = new(ctx) ast_function_expression(callee);

-	   (yyval.expression)->set_location(yylloc);

-   	;}

-    break;

-

-  case 51:

-

-/* Line 1464 of yacc.c  */

-#line 491 "glsl_parser.ypp"

-    {

-	   (yyval.expression) = (yyvsp[(1) - (2)].expression);

-	   (yyval.expression)->set_location(yylloc);

-	   (yyval.expression)->expressions.push_tail(& (yyvsp[(2) - (2)].expression)->link);

-	;}

-    break;

-

-  case 52:

-

-/* Line 1464 of yacc.c  */

-#line 497 "glsl_parser.ypp"

-    {

-	   (yyval.expression) = (yyvsp[(1) - (3)].expression);

-	   (yyval.expression)->set_location(yylloc);

-	   (yyval.expression)->expressions.push_tail(& (yyvsp[(3) - (3)].expression)->link);

-	;}

-    break;

-

-  case 53:

-

-/* Line 1464 of yacc.c  */

-#line 509 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   ast_expression *callee = new(ctx) ast_expression((yyvsp[(1) - (2)].identifier));

-	   (yyval.expression) = new(ctx) ast_function_expression(callee);

-	   (yyval.expression)->set_location(yylloc);

-   	;}

-    break;

-

-  case 55:

-

-/* Line 1464 of yacc.c  */

-#line 521 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.expression) = new(ctx) ast_expression(ast_pre_inc, (yyvsp[(2) - (2)].expression), NULL, NULL);

-	   (yyval.expression)->set_location(yylloc);

-	;}

-    break;

-

-  case 56:

-

-/* Line 1464 of yacc.c  */

-#line 527 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.expression) = new(ctx) ast_expression(ast_pre_dec, (yyvsp[(2) - (2)].expression), NULL, NULL);

-	   (yyval.expression)->set_location(yylloc);

-	;}

-    break;

-

-  case 57:

-

-/* Line 1464 of yacc.c  */

-#line 533 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.expression) = new(ctx) ast_expression((yyvsp[(1) - (2)].n), (yyvsp[(2) - (2)].expression), NULL, NULL);

-	   (yyval.expression)->set_location(yylloc);

-	;}

-    break;

-

-  case 58:

-

-/* Line 1464 of yacc.c  */

-#line 542 "glsl_parser.ypp"

-    { (yyval.n) = ast_plus; ;}

-    break;

-

-  case 59:

-

-/* Line 1464 of yacc.c  */

-#line 543 "glsl_parser.ypp"

-    { (yyval.n) = ast_neg; ;}

-    break;

-

-  case 60:

-

-/* Line 1464 of yacc.c  */

-#line 544 "glsl_parser.ypp"

-    { (yyval.n) = ast_logic_not; ;}

-    break;

-

-  case 61:

-

-/* Line 1464 of yacc.c  */

-#line 545 "glsl_parser.ypp"

-    { (yyval.n) = ast_bit_not; ;}

-    break;

-

-  case 63:

-

-/* Line 1464 of yacc.c  */

-#line 551 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.expression) = new(ctx) ast_expression_bin(ast_mul, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));

-	   (yyval.expression)->set_location(yylloc);

-	;}

-    break;

-

-  case 64:

-

-/* Line 1464 of yacc.c  */

-#line 557 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.expression) = new(ctx) ast_expression_bin(ast_div, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));

-	   (yyval.expression)->set_location(yylloc);

-	;}

-    break;

-

-  case 65:

-

-/* Line 1464 of yacc.c  */

-#line 563 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.expression) = new(ctx) ast_expression_bin(ast_mod, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));

-	   (yyval.expression)->set_location(yylloc);

-	;}

-    break;

-

-  case 67:

-

-/* Line 1464 of yacc.c  */

-#line 573 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.expression) = new(ctx) ast_expression_bin(ast_add, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));

-	   (yyval.expression)->set_location(yylloc);

-	;}

-    break;

-

-  case 68:

-

-/* Line 1464 of yacc.c  */

-#line 579 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.expression) = new(ctx) ast_expression_bin(ast_sub, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));

-	   (yyval.expression)->set_location(yylloc);

-	;}

-    break;

-

-  case 70:

-

-/* Line 1464 of yacc.c  */

-#line 589 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.expression) = new(ctx) ast_expression_bin(ast_lshift, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));

-	   (yyval.expression)->set_location(yylloc);

-	;}

-    break;

-

-  case 71:

-

-/* Line 1464 of yacc.c  */

-#line 595 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.expression) = new(ctx) ast_expression_bin(ast_rshift, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));

-	   (yyval.expression)->set_location(yylloc);

-	;}

-    break;

-

-  case 73:

-

-/* Line 1464 of yacc.c  */

-#line 605 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.expression) = new(ctx) ast_expression_bin(ast_less, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));

-	   (yyval.expression)->set_location(yylloc);

-	;}

-    break;

-

-  case 74:

-

-/* Line 1464 of yacc.c  */

-#line 611 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.expression) = new(ctx) ast_expression_bin(ast_greater, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));

-	   (yyval.expression)->set_location(yylloc);

-	;}

-    break;

-

-  case 75:

-

-/* Line 1464 of yacc.c  */

-#line 617 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.expression) = new(ctx) ast_expression_bin(ast_lequal, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));

-	   (yyval.expression)->set_location(yylloc);

-	;}

-    break;

-

-  case 76:

-

-/* Line 1464 of yacc.c  */

-#line 623 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.expression) = new(ctx) ast_expression_bin(ast_gequal, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));

-	   (yyval.expression)->set_location(yylloc);

-	;}

-    break;

-

-  case 78:

-

-/* Line 1464 of yacc.c  */

-#line 633 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.expression) = new(ctx) ast_expression_bin(ast_equal, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));

-	   (yyval.expression)->set_location(yylloc);

-	;}

-    break;

-

-  case 79:

-

-/* Line 1464 of yacc.c  */

-#line 639 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.expression) = new(ctx) ast_expression_bin(ast_nequal, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));

-	   (yyval.expression)->set_location(yylloc);

-	;}

-    break;

-

-  case 81:

-

-/* Line 1464 of yacc.c  */

-#line 649 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.expression) = new(ctx) ast_expression_bin(ast_bit_and, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));

-	   (yyval.expression)->set_location(yylloc);

-	;}

-    break;

-

-  case 83:

-

-/* Line 1464 of yacc.c  */

-#line 659 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.expression) = new(ctx) ast_expression_bin(ast_bit_xor, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));

-	   (yyval.expression)->set_location(yylloc);

-	;}

-    break;

-

-  case 85:

-

-/* Line 1464 of yacc.c  */

-#line 669 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.expression) = new(ctx) ast_expression_bin(ast_bit_or, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));

-	   (yyval.expression)->set_location(yylloc);

-	;}

-    break;

-

-  case 87:

-

-/* Line 1464 of yacc.c  */

-#line 679 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.expression) = new(ctx) ast_expression_bin(ast_logic_and, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));

-	   (yyval.expression)->set_location(yylloc);

-	;}

-    break;

-

-  case 89:

-

-/* Line 1464 of yacc.c  */

-#line 689 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.expression) = new(ctx) ast_expression_bin(ast_logic_xor, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));

-	   (yyval.expression)->set_location(yylloc);

-	;}

-    break;

-

-  case 91:

-

-/* Line 1464 of yacc.c  */

-#line 699 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.expression) = new(ctx) ast_expression_bin(ast_logic_or, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));

-	   (yyval.expression)->set_location(yylloc);

-	;}

-    break;

-

-  case 93:

-

-/* Line 1464 of yacc.c  */

-#line 709 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.expression) = new(ctx) ast_expression(ast_conditional, (yyvsp[(1) - (5)].expression), (yyvsp[(3) - (5)].expression), (yyvsp[(5) - (5)].expression));

-	   (yyval.expression)->set_location(yylloc);

-	;}

-    break;

-

-  case 95:

-

-/* Line 1464 of yacc.c  */

-#line 719 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.expression) = new(ctx) ast_expression((yyvsp[(2) - (3)].n), (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression), NULL);

-	   (yyval.expression)->set_location(yylloc);

-	;}

-    break;

-

-  case 96:

-

-/* Line 1464 of yacc.c  */

-#line 727 "glsl_parser.ypp"

-    { (yyval.n) = ast_assign; ;}

-    break;

-

-  case 97:

-

-/* Line 1464 of yacc.c  */

-#line 728 "glsl_parser.ypp"

-    { (yyval.n) = ast_mul_assign; ;}

-    break;

-

-  case 98:

-

-/* Line 1464 of yacc.c  */

-#line 729 "glsl_parser.ypp"

-    { (yyval.n) = ast_div_assign; ;}

-    break;

-

-  case 99:

-

-/* Line 1464 of yacc.c  */

-#line 730 "glsl_parser.ypp"

-    { (yyval.n) = ast_mod_assign; ;}

-    break;

-

-  case 100:

-

-/* Line 1464 of yacc.c  */

-#line 731 "glsl_parser.ypp"

-    { (yyval.n) = ast_add_assign; ;}

-    break;

-

-  case 101:

-

-/* Line 1464 of yacc.c  */

-#line 732 "glsl_parser.ypp"

-    { (yyval.n) = ast_sub_assign; ;}

-    break;

-

-  case 102:

-

-/* Line 1464 of yacc.c  */

-#line 733 "glsl_parser.ypp"

-    { (yyval.n) = ast_ls_assign; ;}

-    break;

-

-  case 103:

-

-/* Line 1464 of yacc.c  */

-#line 734 "glsl_parser.ypp"

-    { (yyval.n) = ast_rs_assign; ;}

-    break;

-

-  case 104:

-

-/* Line 1464 of yacc.c  */

-#line 735 "glsl_parser.ypp"

-    { (yyval.n) = ast_and_assign; ;}

-    break;

-

-  case 105:

-

-/* Line 1464 of yacc.c  */

-#line 736 "glsl_parser.ypp"

-    { (yyval.n) = ast_xor_assign; ;}

-    break;

-

-  case 106:

-

-/* Line 1464 of yacc.c  */

-#line 737 "glsl_parser.ypp"

-    { (yyval.n) = ast_or_assign; ;}

-    break;

-

-  case 107:

-

-/* Line 1464 of yacc.c  */

-#line 742 "glsl_parser.ypp"

-    {

-	   (yyval.expression) = (yyvsp[(1) - (1)].expression);

-	;}

-    break;

-

-  case 108:

-

-/* Line 1464 of yacc.c  */

-#line 746 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   if ((yyvsp[(1) - (3)].expression)->oper != ast_sequence) {

-	      (yyval.expression) = new(ctx) ast_expression(ast_sequence, NULL, NULL, NULL);

-	      (yyval.expression)->set_location(yylloc);

-	      (yyval.expression)->expressions.push_tail(& (yyvsp[(1) - (3)].expression)->link);

-	   } else {

-	      (yyval.expression) = (yyvsp[(1) - (3)].expression);

-	   }

-

-	   (yyval.expression)->expressions.push_tail(& (yyvsp[(3) - (3)].expression)->link);

-	;}

-    break;

-

-  case 110:

-

-/* Line 1464 of yacc.c  */

-#line 766 "glsl_parser.ypp"

-    {

-	   state->symbols->pop_scope();

-	   (yyval.node) = (yyvsp[(1) - (2)].function);

-	;}

-    break;

-

-  case 111:

-

-/* Line 1464 of yacc.c  */

-#line 771 "glsl_parser.ypp"

-    {

-	   (yyval.node) = (yyvsp[(1) - (2)].declarator_list);

-	;}

-    break;

-

-  case 112:

-

-/* Line 1464 of yacc.c  */

-#line 775 "glsl_parser.ypp"

-    {

-	   (yyvsp[(3) - (4)].type_specifier)->precision = (yyvsp[(2) - (4)].n);

-	   (yyvsp[(3) - (4)].type_specifier)->is_precision_statement = true;

-	   (yyval.node) = (yyvsp[(3) - (4)].type_specifier);

-	;}

-    break;

-

-  case 116:

-

-/* Line 1464 of yacc.c  */

-#line 793 "glsl_parser.ypp"

-    {

-	   (yyval.function) = (yyvsp[(1) - (2)].function);

-	   (yyval.function)->parameters.push_tail(& (yyvsp[(2) - (2)].parameter_declarator)->link);

-	;}

-    break;

-

-  case 117:

-

-/* Line 1464 of yacc.c  */

-#line 798 "glsl_parser.ypp"

-    {

-	   (yyval.function) = (yyvsp[(1) - (3)].function);

-	   (yyval.function)->parameters.push_tail(& (yyvsp[(3) - (3)].parameter_declarator)->link);

-	;}

-    break;

-

-  case 118:

-

-/* Line 1464 of yacc.c  */

-#line 806 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.function) = new(ctx) ast_function();

-	   (yyval.function)->set_location(yylloc);

-	   (yyval.function)->return_type = (yyvsp[(1) - (3)].fully_specified_type);

-	   (yyval.function)->identifier = (yyvsp[(2) - (3)].identifier);

-

-	   state->symbols->add_function(new(state) ir_function((yyvsp[(2) - (3)].identifier)));

-	   state->symbols->push_scope();

-	;}

-    break;

-

-  case 119:

-

-/* Line 1464 of yacc.c  */

-#line 820 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.parameter_declarator) = new(ctx) ast_parameter_declarator();

-	   (yyval.parameter_declarator)->set_location(yylloc);

-	   (yyval.parameter_declarator)->type = new(ctx) ast_fully_specified_type();

-	   (yyval.parameter_declarator)->type->set_location(yylloc);

-	   (yyval.parameter_declarator)->type->specifier = (yyvsp[(1) - (2)].type_specifier);

-	   (yyval.parameter_declarator)->identifier = (yyvsp[(2) - (2)].identifier);

-	;}

-    break;

-

-  case 120:

-

-/* Line 1464 of yacc.c  */

-#line 830 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.parameter_declarator) = new(ctx) ast_parameter_declarator();

-	   (yyval.parameter_declarator)->set_location(yylloc);

-	   (yyval.parameter_declarator)->type = new(ctx) ast_fully_specified_type();

-	   (yyval.parameter_declarator)->type->set_location(yylloc);

-	   (yyval.parameter_declarator)->type->specifier = (yyvsp[(1) - (5)].type_specifier);

-	   (yyval.parameter_declarator)->identifier = (yyvsp[(2) - (5)].identifier);

-	   (yyval.parameter_declarator)->is_array = true;

-	   (yyval.parameter_declarator)->array_size = (yyvsp[(4) - (5)].expression);

-	;}

-    break;

-

-  case 121:

-

-/* Line 1464 of yacc.c  */

-#line 845 "glsl_parser.ypp"

-    {

-	   (yyvsp[(1) - (3)].type_qualifier).flags.i |= (yyvsp[(2) - (3)].type_qualifier).flags.i;

-

-	   (yyval.parameter_declarator) = (yyvsp[(3) - (3)].parameter_declarator);

-	   (yyval.parameter_declarator)->type->qualifier = (yyvsp[(1) - (3)].type_qualifier);

-	;}

-    break;

-

-  case 122:

-

-/* Line 1464 of yacc.c  */

-#line 852 "glsl_parser.ypp"

-    {

-	   (yyval.parameter_declarator) = (yyvsp[(2) - (2)].parameter_declarator);

-	   (yyval.parameter_declarator)->type->qualifier = (yyvsp[(1) - (2)].type_qualifier);

-	;}

-    break;

-

-  case 123:

-

-/* Line 1464 of yacc.c  */

-#line 857 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyvsp[(1) - (3)].type_qualifier).flags.i |= (yyvsp[(2) - (3)].type_qualifier).flags.i;

-

-	   (yyval.parameter_declarator) = new(ctx) ast_parameter_declarator();

-	   (yyval.parameter_declarator)->set_location(yylloc);

-	   (yyval.parameter_declarator)->type = new(ctx) ast_fully_specified_type();

-	   (yyval.parameter_declarator)->type->qualifier = (yyvsp[(1) - (3)].type_qualifier);

-	   (yyval.parameter_declarator)->type->specifier = (yyvsp[(3) - (3)].type_specifier);

-	;}

-    break;

-

-  case 124:

-

-/* Line 1464 of yacc.c  */

-#line 868 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.parameter_declarator) = new(ctx) ast_parameter_declarator();

-	   (yyval.parameter_declarator)->set_location(yylloc);

-	   (yyval.parameter_declarator)->type = new(ctx) ast_fully_specified_type();

-	   (yyval.parameter_declarator)->type->qualifier = (yyvsp[(1) - (2)].type_qualifier);

-	   (yyval.parameter_declarator)->type->specifier = (yyvsp[(2) - (2)].type_specifier);

-	;}

-    break;

-

-  case 125:

-

-/* Line 1464 of yacc.c  */

-#line 880 "glsl_parser.ypp"

-    {

-	   memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));

-	;}

-    break;

-

-  case 126:

-

-/* Line 1464 of yacc.c  */

-#line 884 "glsl_parser.ypp"

-    {

-	   memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));

-	   (yyval.type_qualifier).flags.q.in = 1;

-	;}

-    break;

-

-  case 127:

-

-/* Line 1464 of yacc.c  */

-#line 889 "glsl_parser.ypp"

-    {

-	   memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));

-	   (yyval.type_qualifier).flags.q.out = 1;

-	;}

-    break;

-

-  case 128:

-

-/* Line 1464 of yacc.c  */

-#line 894 "glsl_parser.ypp"

-    {

-	   memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));

-	   (yyval.type_qualifier).flags.q.in = 1;

-	   (yyval.type_qualifier).flags.q.out = 1;

-	;}

-    break;

-

-  case 131:

-

-/* Line 1464 of yacc.c  */

-#line 908 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(3) - (3)].identifier), false, NULL, NULL);

-	   decl->set_location(yylloc);

-

-	   (yyval.declarator_list) = (yyvsp[(1) - (3)].declarator_list);

-	   (yyval.declarator_list)->declarations.push_tail(&decl->link);

-	   state->symbols->add_variable(new(state) ir_variable(NULL, (yyvsp[(3) - (3)].identifier), ir_var_auto));

-	;}

-    break;

-

-  case 132:

-

-/* Line 1464 of yacc.c  */

-#line 918 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(3) - (5)].identifier), true, NULL, NULL);

-	   decl->set_location(yylloc);

-

-	   (yyval.declarator_list) = (yyvsp[(1) - (5)].declarator_list);

-	   (yyval.declarator_list)->declarations.push_tail(&decl->link);

-	   state->symbols->add_variable(new(state) ir_variable(NULL, (yyvsp[(3) - (5)].identifier), ir_var_auto));

-	;}

-    break;

-

-  case 133:

-

-/* Line 1464 of yacc.c  */

-#line 928 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(3) - (6)].identifier), true, (yyvsp[(5) - (6)].expression), NULL);

-	   decl->set_location(yylloc);

-

-	   (yyval.declarator_list) = (yyvsp[(1) - (6)].declarator_list);

-	   (yyval.declarator_list)->declarations.push_tail(&decl->link);

-	   state->symbols->add_variable(new(state) ir_variable(NULL, (yyvsp[(3) - (6)].identifier), ir_var_auto));

-	;}

-    break;

-

-  case 134:

-

-/* Line 1464 of yacc.c  */

-#line 938 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(3) - (7)].identifier), true, NULL, (yyvsp[(7) - (7)].expression));

-	   decl->set_location(yylloc);

-

-	   (yyval.declarator_list) = (yyvsp[(1) - (7)].declarator_list);

-	   (yyval.declarator_list)->declarations.push_tail(&decl->link);

-	   state->symbols->add_variable(new(state) ir_variable(NULL, (yyvsp[(3) - (7)].identifier), ir_var_auto));

-	;}

-    break;

-

-  case 135:

-

-/* Line 1464 of yacc.c  */

-#line 948 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(3) - (8)].identifier), true, (yyvsp[(5) - (8)].expression), (yyvsp[(8) - (8)].expression));

-	   decl->set_location(yylloc);

-

-	   (yyval.declarator_list) = (yyvsp[(1) - (8)].declarator_list);

-	   (yyval.declarator_list)->declarations.push_tail(&decl->link);

-	   state->symbols->add_variable(new(state) ir_variable(NULL, (yyvsp[(3) - (8)].identifier), ir_var_auto));

-	;}

-    break;

-

-  case 136:

-

-/* Line 1464 of yacc.c  */

-#line 958 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(3) - (5)].identifier), false, NULL, (yyvsp[(5) - (5)].expression));

-	   decl->set_location(yylloc);

-

-	   (yyval.declarator_list) = (yyvsp[(1) - (5)].declarator_list);

-	   (yyval.declarator_list)->declarations.push_tail(&decl->link);

-	   state->symbols->add_variable(new(state) ir_variable(NULL, (yyvsp[(3) - (5)].identifier), ir_var_auto));

-	;}

-    break;

-

-  case 137:

-

-/* Line 1464 of yacc.c  */

-#line 972 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   if ((yyvsp[(1) - (1)].fully_specified_type)->specifier->type_specifier != ast_struct) {

-	      _mesa_glsl_error(& (yylsp[(1) - (1)]), state, "empty declaration list\n");

-	      YYERROR;

-	   } else {

-	      (yyval.declarator_list) = new(ctx) ast_declarator_list((yyvsp[(1) - (1)].fully_specified_type));

-	      (yyval.declarator_list)->set_location(yylloc);

-	   }

-	;}

-    break;

-

-  case 138:

-

-/* Line 1464 of yacc.c  */

-#line 983 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(2) - (2)].identifier), false, NULL, NULL);

-

-	   (yyval.declarator_list) = new(ctx) ast_declarator_list((yyvsp[(1) - (2)].fully_specified_type));

-	   (yyval.declarator_list)->set_location(yylloc);

-	   (yyval.declarator_list)->declarations.push_tail(&decl->link);

-	;}

-    break;

-

-  case 139:

-

-/* Line 1464 of yacc.c  */

-#line 992 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(2) - (4)].identifier), true, NULL, NULL);

-

-	   (yyval.declarator_list) = new(ctx) ast_declarator_list((yyvsp[(1) - (4)].fully_specified_type));

-	   (yyval.declarator_list)->set_location(yylloc);

-	   (yyval.declarator_list)->declarations.push_tail(&decl->link);

-	;}

-    break;

-

-  case 140:

-

-/* Line 1464 of yacc.c  */

-#line 1001 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(2) - (5)].identifier), true, (yyvsp[(4) - (5)].expression), NULL);

-

-	   (yyval.declarator_list) = new(ctx) ast_declarator_list((yyvsp[(1) - (5)].fully_specified_type));

-	   (yyval.declarator_list)->set_location(yylloc);

-	   (yyval.declarator_list)->declarations.push_tail(&decl->link);

-	;}

-    break;

-

-  case 141:

-

-/* Line 1464 of yacc.c  */

-#line 1010 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(2) - (6)].identifier), true, NULL, (yyvsp[(6) - (6)].expression));

-

-	   (yyval.declarator_list) = new(ctx) ast_declarator_list((yyvsp[(1) - (6)].fully_specified_type));

-	   (yyval.declarator_list)->set_location(yylloc);

-	   (yyval.declarator_list)->declarations.push_tail(&decl->link);

-	;}

-    break;

-

-  case 142:

-

-/* Line 1464 of yacc.c  */

-#line 1019 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(2) - (7)].identifier), true, (yyvsp[(4) - (7)].expression), (yyvsp[(7) - (7)].expression));

-

-	   (yyval.declarator_list) = new(ctx) ast_declarator_list((yyvsp[(1) - (7)].fully_specified_type));

-	   (yyval.declarator_list)->set_location(yylloc);

-	   (yyval.declarator_list)->declarations.push_tail(&decl->link);

-	;}

-    break;

-

-  case 143:

-

-/* Line 1464 of yacc.c  */

-#line 1028 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(2) - (4)].identifier), false, NULL, (yyvsp[(4) - (4)].expression));

-

-	   (yyval.declarator_list) = new(ctx) ast_declarator_list((yyvsp[(1) - (4)].fully_specified_type));

-	   (yyval.declarator_list)->set_location(yylloc);

-	   (yyval.declarator_list)->declarations.push_tail(&decl->link);

-	;}

-    break;

-

-  case 144:

-

-/* Line 1464 of yacc.c  */

-#line 1037 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(2) - (2)].identifier), false, NULL, NULL);

-

-	   (yyval.declarator_list) = new(ctx) ast_declarator_list(NULL);

-	   (yyval.declarator_list)->set_location(yylloc);

-	   (yyval.declarator_list)->invariant = true;

-

-	   (yyval.declarator_list)->declarations.push_tail(&decl->link);

-	;}

-    break;

-

-  case 145:

-

-/* Line 1464 of yacc.c  */

-#line 1051 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.fully_specified_type) = new(ctx) ast_fully_specified_type();

-	   (yyval.fully_specified_type)->set_location(yylloc);

-	   (yyval.fully_specified_type)->specifier = (yyvsp[(1) - (1)].type_specifier);

-	;}

-    break;

-

-  case 146:

-

-/* Line 1464 of yacc.c  */

-#line 1058 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.fully_specified_type) = new(ctx) ast_fully_specified_type();

-	   (yyval.fully_specified_type)->set_location(yylloc);

-	   (yyval.fully_specified_type)->qualifier = (yyvsp[(1) - (2)].type_qualifier);

-	   (yyval.fully_specified_type)->specifier = (yyvsp[(2) - (2)].type_specifier);

-	;}

-    break;

-

-  case 147:

-

-/* Line 1464 of yacc.c  */

-#line 1069 "glsl_parser.ypp"

-    {

-	  (yyval.type_qualifier) = (yyvsp[(3) - (4)].type_qualifier);

-	;}

-    break;

-

-  case 149:

-

-/* Line 1464 of yacc.c  */

-#line 1077 "glsl_parser.ypp"

-    {

-	   if (((yyvsp[(1) - (3)].type_qualifier).flags.i & (yyvsp[(3) - (3)].type_qualifier).flags.i) != 0) {

-	      _mesa_glsl_error(& (yylsp[(3) - (3)]), state,

-			       "duplicate layout qualifiers used\n");

-	      YYERROR;

-	   }

-

-	   (yyval.type_qualifier).flags.i = (yyvsp[(1) - (3)].type_qualifier).flags.i | (yyvsp[(3) - (3)].type_qualifier).flags.i;

-

-	   if ((yyvsp[(1) - (3)].type_qualifier).flags.q.explicit_location)

-	      (yyval.type_qualifier).location = (yyvsp[(1) - (3)].type_qualifier).location;

-

-	   if ((yyvsp[(3) - (3)].type_qualifier).flags.q.explicit_location)

-	      (yyval.type_qualifier).location = (yyvsp[(3) - (3)].type_qualifier).location;

-	;}

-    break;

-

-  case 150:

-

-/* Line 1464 of yacc.c  */

-#line 1096 "glsl_parser.ypp"

-    {

-	   bool got_one = false;

-

-	   memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));

-

-	   /* Layout qualifiers for ARB_fragment_coord_conventions. */

-	   if (!got_one && state->ARB_fragment_coord_conventions_enable) {

-	      if (strcmp((yyvsp[(1) - (1)].identifier), "origin_upper_left") == 0) {

-		 got_one = true;

-		 (yyval.type_qualifier).flags.q.origin_upper_left = 1;

-	      } else if (strcmp((yyvsp[(1) - (1)].identifier), "pixel_center_integer") == 0) {

-		 got_one = true;

-		 (yyval.type_qualifier).flags.q.pixel_center_integer = 1;

-	      }

-

-	      if (got_one && state->ARB_fragment_coord_conventions_warn) {

-		 _mesa_glsl_warning(& (yylsp[(1) - (1)]), state,

-				    "GL_ARB_fragment_coord_conventions layout "

-				    "identifier `%s' used\n", (yyvsp[(1) - (1)].identifier));

-	      }

-	   }

-

-	   /* Layout qualifiers for AMD_conservative_depth. */

-	   if (!got_one && state->AMD_conservative_depth_enable) {

-	      if (strcmp((yyvsp[(1) - (1)].identifier), "depth_any") == 0) {

-	         got_one = true;

-	         (yyval.type_qualifier).flags.q.depth_any = 1;

-	      } else if (strcmp((yyvsp[(1) - (1)].identifier), "depth_greater") == 0) {

-	         got_one = true;

-	         (yyval.type_qualifier).flags.q.depth_greater = 1;

-	      } else if (strcmp((yyvsp[(1) - (1)].identifier), "depth_less") == 0) {

-	         got_one = true;

-	         (yyval.type_qualifier).flags.q.depth_less = 1;

-	      } else if (strcmp((yyvsp[(1) - (1)].identifier), "depth_unchanged") == 0) {

-	         got_one = true;

-	         (yyval.type_qualifier).flags.q.depth_unchanged = 1;

-	      }

-	

-	      if (got_one && state->AMD_conservative_depth_warn) {

-	         _mesa_glsl_warning(& (yylsp[(1) - (1)]), state,

-	                            "GL_AMD_conservative_depth "

-	                            "layout qualifier `%s' is used\n", (yyvsp[(1) - (1)].identifier));

-	      }

-	   }

-

-	   if (!got_one) {

-	      _mesa_glsl_error(& (yylsp[(1) - (1)]), state, "unrecognized layout identifier "

-			       "`%s'\n", (yyvsp[(1) - (1)].identifier));

-	      YYERROR;

-	   }

-	;}

-    break;

-

-  case 151:

-

-/* Line 1464 of yacc.c  */

-#line 1148 "glsl_parser.ypp"

-    {

-	   bool got_one = false;

-

-	   memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));

-

-	   if (state->ARB_explicit_attrib_location_enable) {

-	      /* FINISHME: Handle 'index' once GL_ARB_blend_func_exteneded and

-	       * FINISHME: GLSL 1.30 (or later) are supported.

-	       */

-	      if (strcmp("location", (yyvsp[(1) - (3)].identifier)) == 0) {

-		 got_one = true;

-

-		 (yyval.type_qualifier).flags.q.explicit_location = 1;

-

-		 if ((yyvsp[(3) - (3)].n) >= 0) {

-		    (yyval.type_qualifier).location = (yyvsp[(3) - (3)].n);

-		 } else {

-		    _mesa_glsl_error(& (yylsp[(3) - (3)]), state,

-				     "invalid location %d specified\n", (yyvsp[(3) - (3)].n));

-		    YYERROR;

-		 }

-	      }

-	   }

-

-	   /* If the identifier didn't match any known layout identifiers,

-	    * emit an error.

-	    */

-	   if (!got_one) {

-	      _mesa_glsl_error(& (yylsp[(1) - (3)]), state, "unrecognized layout identifier "

-			       "`%s'\n", (yyvsp[(1) - (3)].identifier));

-	      YYERROR;

-	   } else if (state->ARB_explicit_attrib_location_warn) {

-	      _mesa_glsl_warning(& (yylsp[(1) - (3)]), state,

-				 "GL_ARB_explicit_attrib_location layout "

-				 "identifier `%s' used\n", (yyvsp[(1) - (3)].identifier));

-	   }

-	;}

-    break;

-

-  case 152:

-

-/* Line 1464 of yacc.c  */

-#line 1189 "glsl_parser.ypp"

-    {

-	   memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));

-	   (yyval.type_qualifier).flags.q.smooth = 1;

-	;}

-    break;

-

-  case 153:

-

-/* Line 1464 of yacc.c  */

-#line 1194 "glsl_parser.ypp"

-    {

-	   memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));

-	   (yyval.type_qualifier).flags.q.flat = 1;

-	;}

-    break;

-

-  case 154:

-

-/* Line 1464 of yacc.c  */

-#line 1199 "glsl_parser.ypp"

-    {

-	   memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));

-	   (yyval.type_qualifier).flags.q.noperspective = 1;

-	;}

-    break;

-

-  case 155:

-

-/* Line 1464 of yacc.c  */

-#line 1207 "glsl_parser.ypp"

-    {

-	   memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));

-	   (yyval.type_qualifier).flags.q.constant = 1;

-	;}

-    break;

-

-  case 158:

-

-/* Line 1464 of yacc.c  */

-#line 1217 "glsl_parser.ypp"

-    {

-	   (yyval.type_qualifier) = (yyvsp[(1) - (2)].type_qualifier);

-	   (yyval.type_qualifier).flags.i |= (yyvsp[(2) - (2)].type_qualifier).flags.i;

-	;}

-    break;

-

-  case 160:

-

-/* Line 1464 of yacc.c  */

-#line 1223 "glsl_parser.ypp"

-    {

-	   (yyval.type_qualifier) = (yyvsp[(1) - (2)].type_qualifier);

-	   (yyval.type_qualifier).flags.i |= (yyvsp[(2) - (2)].type_qualifier).flags.i;

-	;}

-    break;

-

-  case 161:

-

-/* Line 1464 of yacc.c  */

-#line 1228 "glsl_parser.ypp"

-    {

-	   (yyval.type_qualifier) = (yyvsp[(2) - (2)].type_qualifier);

-	   (yyval.type_qualifier).flags.q.invariant = 1;

-	;}

-    break;

-

-  case 162:

-

-/* Line 1464 of yacc.c  */

-#line 1233 "glsl_parser.ypp"

-    {

-	   (yyval.type_qualifier) = (yyvsp[(2) - (3)].type_qualifier);

-	   (yyval.type_qualifier).flags.i |= (yyvsp[(3) - (3)].type_qualifier).flags.i;

-	   (yyval.type_qualifier).flags.q.invariant = 1;

-	;}

-    break;

-

-  case 163:

-

-/* Line 1464 of yacc.c  */

-#line 1239 "glsl_parser.ypp"

-    {

-	   memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));

-	   (yyval.type_qualifier).flags.q.invariant = 1;

-	;}

-    break;

-

-  case 164:

-

-/* Line 1464 of yacc.c  */

-#line 1247 "glsl_parser.ypp"

-    {

-	   memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));

-	   (yyval.type_qualifier).flags.q.constant = 1;

-	;}

-    break;

-

-  case 165:

-

-/* Line 1464 of yacc.c  */

-#line 1252 "glsl_parser.ypp"

-    {

-	   memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));

-	   (yyval.type_qualifier).flags.q.attribute = 1;

-	;}

-    break;

-

-  case 166:

-

-/* Line 1464 of yacc.c  */

-#line 1257 "glsl_parser.ypp"

-    {

-	   memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));

-	   (yyval.type_qualifier).flags.q.varying = 1;

-	;}

-    break;

-

-  case 167:

-

-/* Line 1464 of yacc.c  */

-#line 1262 "glsl_parser.ypp"

-    {

-	   memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));

-	   (yyval.type_qualifier).flags.q.centroid = 1;

-	   (yyval.type_qualifier).flags.q.varying = 1;

-	;}

-    break;

-

-  case 168:

-

-/* Line 1464 of yacc.c  */

-#line 1268 "glsl_parser.ypp"

-    {

-	   memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));

-	   (yyval.type_qualifier).flags.q.in = 1;

-	;}

-    break;

-

-  case 169:

-

-/* Line 1464 of yacc.c  */

-#line 1273 "glsl_parser.ypp"

-    {

-	   memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));

-	   (yyval.type_qualifier).flags.q.out = 1;

-	;}

-    break;

-

-  case 170:

-

-/* Line 1464 of yacc.c  */

-#line 1278 "glsl_parser.ypp"

-    {

-	   memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));

-	   (yyval.type_qualifier).flags.q.centroid = 1; (yyval.type_qualifier).flags.q.in = 1;

-	;}

-    break;

-

-  case 171:

-

-/* Line 1464 of yacc.c  */

-#line 1283 "glsl_parser.ypp"

-    {

-	   memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));

-	   (yyval.type_qualifier).flags.q.centroid = 1; (yyval.type_qualifier).flags.q.out = 1;

-	;}

-    break;

-

-  case 172:

-

-/* Line 1464 of yacc.c  */

-#line 1288 "glsl_parser.ypp"

-    {

-	   memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));

-	   (yyval.type_qualifier).flags.q.uniform = 1;

-	;}

-    break;

-

-  case 173:

-

-/* Line 1464 of yacc.c  */

-#line 1296 "glsl_parser.ypp"

-    {

-	   (yyval.type_specifier) = (yyvsp[(1) - (1)].type_specifier);

-	;}

-    break;

-

-  case 174:

-

-/* Line 1464 of yacc.c  */

-#line 1300 "glsl_parser.ypp"

-    {

-	   (yyval.type_specifier) = (yyvsp[(2) - (2)].type_specifier);

-	   (yyval.type_specifier)->precision = (yyvsp[(1) - (2)].n);

-	;}

-    break;

-

-  case 176:

-

-/* Line 1464 of yacc.c  */

-#line 1309 "glsl_parser.ypp"

-    {

-	   (yyval.type_specifier) = (yyvsp[(1) - (3)].type_specifier);

-	   (yyval.type_specifier)->is_array = true;

-	   (yyval.type_specifier)->array_size = NULL;

-	;}

-    break;

-

-  case 177:

-

-/* Line 1464 of yacc.c  */

-#line 1315 "glsl_parser.ypp"

-    {

-	   (yyval.type_specifier) = (yyvsp[(1) - (4)].type_specifier);

-	   (yyval.type_specifier)->is_array = true;

-	   (yyval.type_specifier)->array_size = (yyvsp[(3) - (4)].expression);

-	;}

-    break;

-

-  case 178:

-

-/* Line 1464 of yacc.c  */

-#line 1324 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.type_specifier) = new(ctx) ast_type_specifier((yyvsp[(1) - (1)].n));

-	   (yyval.type_specifier)->set_location(yylloc);

-	;}

-    break;

-

-  case 179:

-

-/* Line 1464 of yacc.c  */

-#line 1330 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.type_specifier) = new(ctx) ast_type_specifier((yyvsp[(1) - (1)].struct_specifier));

-	   (yyval.type_specifier)->set_location(yylloc);

-	;}

-    break;

-

-  case 180:

-

-/* Line 1464 of yacc.c  */

-#line 1336 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.type_specifier) = new(ctx) ast_type_specifier((yyvsp[(1) - (1)].identifier));

-	   (yyval.type_specifier)->set_location(yylloc);

-	;}

-    break;

-

-  case 181:

-

-/* Line 1464 of yacc.c  */

-#line 1344 "glsl_parser.ypp"

-    { (yyval.n) = ast_void; ;}

-    break;

-

-  case 182:

-

-/* Line 1464 of yacc.c  */

-#line 1345 "glsl_parser.ypp"

-    { (yyval.n) = ast_float; ;}

-    break;

-

-  case 183:

-

-/* Line 1464 of yacc.c  */

-#line 1346 "glsl_parser.ypp"

-    { (yyval.n) = ast_int; ;}

-    break;

-

-  case 184:

-

-/* Line 1464 of yacc.c  */

-#line 1347 "glsl_parser.ypp"

-    { (yyval.n) = ast_uint; ;}

-    break;

-

-  case 185:

-

-/* Line 1464 of yacc.c  */

-#line 1348 "glsl_parser.ypp"

-    { (yyval.n) = ast_bool; ;}

-    break;

-

-  case 186:

-

-/* Line 1464 of yacc.c  */

-#line 1349 "glsl_parser.ypp"

-    { (yyval.n) = ast_vec2; ;}

-    break;

-

-  case 187:

-

-/* Line 1464 of yacc.c  */

-#line 1350 "glsl_parser.ypp"

-    { (yyval.n) = ast_vec3; ;}

-    break;

-

-  case 188:

-

-/* Line 1464 of yacc.c  */

-#line 1351 "glsl_parser.ypp"

-    { (yyval.n) = ast_vec4; ;}

-    break;

-

-  case 189:

-

-/* Line 1464 of yacc.c  */

-#line 1352 "glsl_parser.ypp"

-    { (yyval.n) = ast_bvec2; ;}

-    break;

-

-  case 190:

-

-/* Line 1464 of yacc.c  */

-#line 1353 "glsl_parser.ypp"

-    { (yyval.n) = ast_bvec3; ;}

-    break;

-

-  case 191:

-

-/* Line 1464 of yacc.c  */

-#line 1354 "glsl_parser.ypp"

-    { (yyval.n) = ast_bvec4; ;}

-    break;

-

-  case 192:

-

-/* Line 1464 of yacc.c  */

-#line 1355 "glsl_parser.ypp"

-    { (yyval.n) = ast_ivec2; ;}

-    break;

-

-  case 193:

-

-/* Line 1464 of yacc.c  */

-#line 1356 "glsl_parser.ypp"

-    { (yyval.n) = ast_ivec3; ;}

-    break;

-

-  case 194:

-

-/* Line 1464 of yacc.c  */

-#line 1357 "glsl_parser.ypp"

-    { (yyval.n) = ast_ivec4; ;}

-    break;

-

-  case 195:

-

-/* Line 1464 of yacc.c  */

-#line 1358 "glsl_parser.ypp"

-    { (yyval.n) = ast_uvec2; ;}

-    break;

-

-  case 196:

-

-/* Line 1464 of yacc.c  */

-#line 1359 "glsl_parser.ypp"

-    { (yyval.n) = ast_uvec3; ;}

-    break;

-

-  case 197:

-

-/* Line 1464 of yacc.c  */

-#line 1360 "glsl_parser.ypp"

-    { (yyval.n) = ast_uvec4; ;}

-    break;

-

-  case 198:

-

-/* Line 1464 of yacc.c  */

-#line 1361 "glsl_parser.ypp"

-    { (yyval.n) = ast_mat2; ;}

-    break;

-

-  case 199:

-

-/* Line 1464 of yacc.c  */

-#line 1362 "glsl_parser.ypp"

-    { (yyval.n) = ast_mat2x3; ;}

-    break;

-

-  case 200:

-

-/* Line 1464 of yacc.c  */

-#line 1363 "glsl_parser.ypp"

-    { (yyval.n) = ast_mat2x4; ;}

-    break;

-

-  case 201:

-

-/* Line 1464 of yacc.c  */

-#line 1364 "glsl_parser.ypp"

-    { (yyval.n) = ast_mat3x2; ;}

-    break;

-

-  case 202:

-

-/* Line 1464 of yacc.c  */

-#line 1365 "glsl_parser.ypp"

-    { (yyval.n) = ast_mat3; ;}

-    break;

-

-  case 203:

-

-/* Line 1464 of yacc.c  */

-#line 1366 "glsl_parser.ypp"

-    { (yyval.n) = ast_mat3x4; ;}

-    break;

-

-  case 204:

-

-/* Line 1464 of yacc.c  */

-#line 1367 "glsl_parser.ypp"

-    { (yyval.n) = ast_mat4x2; ;}

-    break;

-

-  case 205:

-

-/* Line 1464 of yacc.c  */

-#line 1368 "glsl_parser.ypp"

-    { (yyval.n) = ast_mat4x3; ;}

-    break;

-

-  case 206:

-

-/* Line 1464 of yacc.c  */

-#line 1369 "glsl_parser.ypp"

-    { (yyval.n) = ast_mat4; ;}

-    break;

-

-  case 207:

-

-/* Line 1464 of yacc.c  */

-#line 1370 "glsl_parser.ypp"

-    { (yyval.n) = ast_sampler1d; ;}

-    break;

-

-  case 208:

-

-/* Line 1464 of yacc.c  */

-#line 1371 "glsl_parser.ypp"

-    { (yyval.n) = ast_sampler2d; ;}

-    break;

-

-  case 209:

-

-/* Line 1464 of yacc.c  */

-#line 1372 "glsl_parser.ypp"

-    { (yyval.n) = ast_sampler2drect; ;}

-    break;

-

-  case 210:

-

-/* Line 1464 of yacc.c  */

-#line 1373 "glsl_parser.ypp"

-    { (yyval.n) = ast_sampler3d; ;}

-    break;

-

-  case 211:

-

-/* Line 1464 of yacc.c  */

-#line 1374 "glsl_parser.ypp"

-    { (yyval.n) = ast_samplercube; ;}

-    break;

-

-  case 212:

-

-/* Line 1464 of yacc.c  */

-#line 1375 "glsl_parser.ypp"

-    { (yyval.n) = ast_sampler1dshadow; ;}

-    break;

-

-  case 213:

-

-/* Line 1464 of yacc.c  */

-#line 1376 "glsl_parser.ypp"

-    { (yyval.n) = ast_sampler2dshadow; ;}

-    break;

-

-  case 214:

-

-/* Line 1464 of yacc.c  */

-#line 1377 "glsl_parser.ypp"

-    { (yyval.n) = ast_sampler2drectshadow; ;}

-    break;

-

-  case 215:

-

-/* Line 1464 of yacc.c  */

-#line 1378 "glsl_parser.ypp"

-    { (yyval.n) = ast_samplercubeshadow; ;}

-    break;

-

-  case 216:

-

-/* Line 1464 of yacc.c  */

-#line 1379 "glsl_parser.ypp"

-    { (yyval.n) = ast_sampler1darray; ;}

-    break;

-

-  case 217:

-

-/* Line 1464 of yacc.c  */

-#line 1380 "glsl_parser.ypp"

-    { (yyval.n) = ast_sampler2darray; ;}

-    break;

-

-  case 218:

-

-/* Line 1464 of yacc.c  */

-#line 1381 "glsl_parser.ypp"

-    { (yyval.n) = ast_sampler1darrayshadow; ;}

-    break;

-

-  case 219:

-

-/* Line 1464 of yacc.c  */

-#line 1382 "glsl_parser.ypp"

-    { (yyval.n) = ast_sampler2darrayshadow; ;}

-    break;

-

-  case 220:

-

-/* Line 1464 of yacc.c  */

-#line 1383 "glsl_parser.ypp"

-    { (yyval.n) = ast_isampler1d; ;}

-    break;

-

-  case 221:

-

-/* Line 1464 of yacc.c  */

-#line 1384 "glsl_parser.ypp"

-    { (yyval.n) = ast_isampler2d; ;}

-    break;

-

-  case 222:

-

-/* Line 1464 of yacc.c  */

-#line 1385 "glsl_parser.ypp"

-    { (yyval.n) = ast_isampler3d; ;}

-    break;

-

-  case 223:

-

-/* Line 1464 of yacc.c  */

-#line 1386 "glsl_parser.ypp"

-    { (yyval.n) = ast_isamplercube; ;}

-    break;

-

-  case 224:

-

-/* Line 1464 of yacc.c  */

-#line 1387 "glsl_parser.ypp"

-    { (yyval.n) = ast_isampler1darray; ;}

-    break;

-

-  case 225:

-

-/* Line 1464 of yacc.c  */

-#line 1388 "glsl_parser.ypp"

-    { (yyval.n) = ast_isampler2darray; ;}

-    break;

-

-  case 226:

-

-/* Line 1464 of yacc.c  */

-#line 1389 "glsl_parser.ypp"

-    { (yyval.n) = ast_usampler1d; ;}

-    break;

-

-  case 227:

-

-/* Line 1464 of yacc.c  */

-#line 1390 "glsl_parser.ypp"

-    { (yyval.n) = ast_usampler2d; ;}

-    break;

-

-  case 228:

-

-/* Line 1464 of yacc.c  */

-#line 1391 "glsl_parser.ypp"

-    { (yyval.n) = ast_usampler3d; ;}

-    break;

-

-  case 229:

-

-/* Line 1464 of yacc.c  */

-#line 1392 "glsl_parser.ypp"

-    { (yyval.n) = ast_usamplercube; ;}

-    break;

-

-  case 230:

-

-/* Line 1464 of yacc.c  */

-#line 1393 "glsl_parser.ypp"

-    { (yyval.n) = ast_usampler1darray; ;}

-    break;

-

-  case 231:

-

-/* Line 1464 of yacc.c  */

-#line 1394 "glsl_parser.ypp"

-    { (yyval.n) = ast_usampler2darray; ;}

-    break;

-

-  case 232:

-

-/* Line 1464 of yacc.c  */

-#line 1398 "glsl_parser.ypp"

-    {

-		     if (!state->es_shader && state->language_version < 130)

-			_mesa_glsl_error(& (yylsp[(1) - (1)]), state,

-				         "precision qualifier forbidden "

-					 "in %s (1.30 or later "

-					 "required)\n",

-					 state->version_string);

-

-		     (yyval.n) = ast_precision_high;

-		  ;}

-    break;

-

-  case 233:

-

-/* Line 1464 of yacc.c  */

-#line 1408 "glsl_parser.ypp"

-    {

-		     if (!state->es_shader && state->language_version < 130)

-			_mesa_glsl_error(& (yylsp[(1) - (1)]), state,

-					 "precision qualifier forbidden "

-					 "in %s (1.30 or later "

-					 "required)\n",

-					 state->version_string);

-

-		     (yyval.n) = ast_precision_medium;

-		  ;}

-    break;

-

-  case 234:

-

-/* Line 1464 of yacc.c  */

-#line 1418 "glsl_parser.ypp"

-    {

-		     if (!state->es_shader && state->language_version < 130)

-			_mesa_glsl_error(& (yylsp[(1) - (1)]), state,

-					 "precision qualifier forbidden "

-					 "in %s (1.30 or later "

-					 "required)\n",

-					 state->version_string);

-

-		     (yyval.n) = ast_precision_low;

-		  ;}

-    break;

-

-  case 235:

-

-/* Line 1464 of yacc.c  */

-#line 1432 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.struct_specifier) = new(ctx) ast_struct_specifier((yyvsp[(2) - (5)].identifier), (yyvsp[(4) - (5)].node));

-	   (yyval.struct_specifier)->set_location(yylloc);

-	   state->symbols->add_type((yyvsp[(2) - (5)].identifier), glsl_type::void_type);

-	;}

-    break;

-

-  case 236:

-

-/* Line 1464 of yacc.c  */

-#line 1439 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.struct_specifier) = new(ctx) ast_struct_specifier(NULL, (yyvsp[(3) - (4)].node));

-	   (yyval.struct_specifier)->set_location(yylloc);

-	;}

-    break;

-

-  case 237:

-

-/* Line 1464 of yacc.c  */

-#line 1448 "glsl_parser.ypp"

-    {

-	   (yyval.node) = (ast_node *) (yyvsp[(1) - (1)].declarator_list);

-	   (yyvsp[(1) - (1)].declarator_list)->link.self_link();

-	;}

-    break;

-

-  case 238:

-

-/* Line 1464 of yacc.c  */

-#line 1453 "glsl_parser.ypp"

-    {

-	   (yyval.node) = (ast_node *) (yyvsp[(1) - (2)].node);

-	   (yyval.node)->link.insert_before(& (yyvsp[(2) - (2)].declarator_list)->link);

-	;}

-    break;

-

-  case 239:

-

-/* Line 1464 of yacc.c  */

-#line 1461 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   ast_fully_specified_type *type = new(ctx) ast_fully_specified_type();

-	   type->set_location(yylloc);

-

-	   type->specifier = (yyvsp[(1) - (3)].type_specifier);

-	   (yyval.declarator_list) = new(ctx) ast_declarator_list(type);

-	   (yyval.declarator_list)->set_location(yylloc);

-

-	   (yyval.declarator_list)->declarations.push_degenerate_list_at_head(& (yyvsp[(2) - (3)].declaration)->link);

-	;}

-    break;

-

-  case 240:

-

-/* Line 1464 of yacc.c  */

-#line 1476 "glsl_parser.ypp"

-    {

-	   (yyval.declaration) = (yyvsp[(1) - (1)].declaration);

-	   (yyvsp[(1) - (1)].declaration)->link.self_link();

-	;}

-    break;

-

-  case 241:

-

-/* Line 1464 of yacc.c  */

-#line 1481 "glsl_parser.ypp"

-    {

-	   (yyval.declaration) = (yyvsp[(1) - (3)].declaration);

-	   (yyval.declaration)->link.insert_before(& (yyvsp[(3) - (3)].declaration)->link);

-	;}

-    break;

-

-  case 242:

-

-/* Line 1464 of yacc.c  */

-#line 1489 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.declaration) = new(ctx) ast_declaration((yyvsp[(1) - (1)].identifier), false, NULL, NULL);

-	   (yyval.declaration)->set_location(yylloc);

-	   state->symbols->add_variable(new(state) ir_variable(NULL, (yyvsp[(1) - (1)].identifier), ir_var_auto));

-	;}

-    break;

-

-  case 243:

-

-/* Line 1464 of yacc.c  */

-#line 1496 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.declaration) = new(ctx) ast_declaration((yyvsp[(1) - (4)].identifier), true, (yyvsp[(3) - (4)].expression), NULL);

-	   (yyval.declaration)->set_location(yylloc);

-	;}

-    break;

-

-  case 246:

-

-/* Line 1464 of yacc.c  */

-#line 1514 "glsl_parser.ypp"

-    { (yyval.node) = (ast_node *) (yyvsp[(1) - (1)].compound_statement); ;}

-    break;

-

-  case 251:

-

-/* Line 1464 of yacc.c  */

-#line 1522 "glsl_parser.ypp"

-    { (yyval.node) = NULL; ;}

-    break;

-

-  case 252:

-

-/* Line 1464 of yacc.c  */

-#line 1523 "glsl_parser.ypp"

-    { (yyval.node) = NULL; ;}

-    break;

-

-  case 255:

-

-/* Line 1464 of yacc.c  */

-#line 1530 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.compound_statement) = new(ctx) ast_compound_statement(true, NULL);

-	   (yyval.compound_statement)->set_location(yylloc);

-	;}

-    break;

-

-  case 256:

-

-/* Line 1464 of yacc.c  */

-#line 1536 "glsl_parser.ypp"

-    {

-	   state->symbols->push_scope();

-	;}

-    break;

-

-  case 257:

-

-/* Line 1464 of yacc.c  */

-#line 1540 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.compound_statement) = new(ctx) ast_compound_statement(true, (yyvsp[(3) - (4)].node));

-	   (yyval.compound_statement)->set_location(yylloc);

-	   state->symbols->pop_scope();

-	;}

-    break;

-

-  case 258:

-

-/* Line 1464 of yacc.c  */

-#line 1549 "glsl_parser.ypp"

-    { (yyval.node) = (ast_node *) (yyvsp[(1) - (1)].compound_statement); ;}

-    break;

-

-  case 260:

-

-/* Line 1464 of yacc.c  */

-#line 1555 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.compound_statement) = new(ctx) ast_compound_statement(false, NULL);

-	   (yyval.compound_statement)->set_location(yylloc);

-	;}

-    break;

-

-  case 261:

-

-/* Line 1464 of yacc.c  */

-#line 1561 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.compound_statement) = new(ctx) ast_compound_statement(false, (yyvsp[(2) - (3)].node));

-	   (yyval.compound_statement)->set_location(yylloc);

-	;}

-    break;

-

-  case 262:

-

-/* Line 1464 of yacc.c  */

-#line 1570 "glsl_parser.ypp"

-    {

-	   if ((yyvsp[(1) - (1)].node) == NULL) {

-	      _mesa_glsl_error(& (yylsp[(1) - (1)]), state, "<nil> statement\n");

-	      assert((yyvsp[(1) - (1)].node) != NULL);

-	   }

-

-	   (yyval.node) = (yyvsp[(1) - (1)].node);

-	   (yyval.node)->link.self_link();

-	;}

-    break;

-

-  case 263:

-

-/* Line 1464 of yacc.c  */

-#line 1580 "glsl_parser.ypp"

-    {

-	   if ((yyvsp[(2) - (2)].node) == NULL) {

-	      _mesa_glsl_error(& (yylsp[(2) - (2)]), state, "<nil> statement\n");

-	      assert((yyvsp[(2) - (2)].node) != NULL);

-	   }

-	   (yyval.node) = (yyvsp[(1) - (2)].node);

-	   (yyval.node)->link.insert_before(& (yyvsp[(2) - (2)].node)->link);

-	;}

-    break;

-

-  case 264:

-

-/* Line 1464 of yacc.c  */

-#line 1592 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.node) = new(ctx) ast_expression_statement(NULL);

-	   (yyval.node)->set_location(yylloc);

-	;}

-    break;

-

-  case 265:

-

-/* Line 1464 of yacc.c  */

-#line 1598 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.node) = new(ctx) ast_expression_statement((yyvsp[(1) - (2)].expression));

-	   (yyval.node)->set_location(yylloc);

-	;}

-    break;

-

-  case 266:

-

-/* Line 1464 of yacc.c  */

-#line 1607 "glsl_parser.ypp"

-    {

-	   (yyval.node) = new(state) ast_selection_statement((yyvsp[(3) - (5)].expression), (yyvsp[(5) - (5)].selection_rest_statement).then_statement,

-						   (yyvsp[(5) - (5)].selection_rest_statement).else_statement);

-	   (yyval.node)->set_location(yylloc);

-	;}

-    break;

-

-  case 267:

-

-/* Line 1464 of yacc.c  */

-#line 1616 "glsl_parser.ypp"

-    {

-	   (yyval.selection_rest_statement).then_statement = (yyvsp[(1) - (3)].node);

-	   (yyval.selection_rest_statement).else_statement = (yyvsp[(3) - (3)].node);

-	;}

-    break;

-

-  case 268:

-

-/* Line 1464 of yacc.c  */

-#line 1621 "glsl_parser.ypp"

-    {

-	   (yyval.selection_rest_statement).then_statement = (yyvsp[(1) - (1)].node);

-	   (yyval.selection_rest_statement).else_statement = NULL;

-	;}

-    break;

-

-  case 269:

-

-/* Line 1464 of yacc.c  */

-#line 1629 "glsl_parser.ypp"

-    {

-	   (yyval.node) = (ast_node *) (yyvsp[(1) - (1)].expression);

-	;}

-    break;

-

-  case 270:

-

-/* Line 1464 of yacc.c  */

-#line 1633 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(2) - (4)].identifier), false, NULL, (yyvsp[(4) - (4)].expression));

-	   ast_declarator_list *declarator = new(ctx) ast_declarator_list((yyvsp[(1) - (4)].fully_specified_type));

-	   decl->set_location(yylloc);

-	   declarator->set_location(yylloc);

-

-	   declarator->declarations.push_tail(&decl->link);

-	   (yyval.node) = declarator;

-	;}

-    break;

-

-  case 274:

-

-/* Line 1464 of yacc.c  */

-#line 1656 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.node) = new(ctx) ast_iteration_statement(ast_iteration_statement::ast_while,

-	   					    NULL, (yyvsp[(3) - (5)].node), NULL, (yyvsp[(5) - (5)].node));

-	   (yyval.node)->set_location(yylloc);

-	;}

-    break;

-

-  case 275:

-

-/* Line 1464 of yacc.c  */

-#line 1663 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.node) = new(ctx) ast_iteration_statement(ast_iteration_statement::ast_do_while,

-						    NULL, (yyvsp[(5) - (7)].expression), NULL, (yyvsp[(2) - (7)].node));

-	   (yyval.node)->set_location(yylloc);

-	;}

-    break;

-

-  case 276:

-

-/* Line 1464 of yacc.c  */

-#line 1670 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.node) = new(ctx) ast_iteration_statement(ast_iteration_statement::ast_for,

-						    (yyvsp[(3) - (6)].node), (yyvsp[(4) - (6)].for_rest_statement).cond, (yyvsp[(4) - (6)].for_rest_statement).rest, (yyvsp[(6) - (6)].node));

-	   (yyval.node)->set_location(yylloc);

-	;}

-    break;

-

-  case 280:

-

-/* Line 1464 of yacc.c  */

-#line 1686 "glsl_parser.ypp"

-    {

-	   (yyval.node) = NULL;

-	;}

-    break;

-

-  case 281:

-

-/* Line 1464 of yacc.c  */

-#line 1693 "glsl_parser.ypp"

-    {

-	   (yyval.for_rest_statement).cond = (yyvsp[(1) - (2)].node);

-	   (yyval.for_rest_statement).rest = NULL;

-	;}

-    break;

-

-  case 282:

-

-/* Line 1464 of yacc.c  */

-#line 1698 "glsl_parser.ypp"

-    {

-	   (yyval.for_rest_statement).cond = (yyvsp[(1) - (3)].node);

-	   (yyval.for_rest_statement).rest = (yyvsp[(3) - (3)].expression);

-	;}

-    break;

-

-  case 283:

-

-/* Line 1464 of yacc.c  */

-#line 1707 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.node) = new(ctx) ast_jump_statement(ast_jump_statement::ast_continue, NULL);

-	   (yyval.node)->set_location(yylloc);

-	;}

-    break;

-

-  case 284:

-

-/* Line 1464 of yacc.c  */

-#line 1713 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.node) = new(ctx) ast_jump_statement(ast_jump_statement::ast_break, NULL);

-	   (yyval.node)->set_location(yylloc);

-	;}

-    break;

-

-  case 285:

-

-/* Line 1464 of yacc.c  */

-#line 1719 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.node) = new(ctx) ast_jump_statement(ast_jump_statement::ast_return, NULL);

-	   (yyval.node)->set_location(yylloc);

-	;}

-    break;

-

-  case 286:

-

-/* Line 1464 of yacc.c  */

-#line 1725 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.node) = new(ctx) ast_jump_statement(ast_jump_statement::ast_return, (yyvsp[(2) - (3)].expression));

-	   (yyval.node)->set_location(yylloc);

-	;}

-    break;

-

-  case 287:

-

-/* Line 1464 of yacc.c  */

-#line 1731 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.node) = new(ctx) ast_jump_statement(ast_jump_statement::ast_discard, NULL);

-	   (yyval.node)->set_location(yylloc);

-	;}

-    break;

-

-  case 288:

-

-/* Line 1464 of yacc.c  */

-#line 1739 "glsl_parser.ypp"

-    { (yyval.node) = (yyvsp[(1) - (1)].function_definition); ;}

-    break;

-

-  case 289:

-

-/* Line 1464 of yacc.c  */

-#line 1740 "glsl_parser.ypp"

-    { (yyval.node) = (yyvsp[(1) - (1)].node); ;}

-    break;

-

-  case 290:

-

-/* Line 1464 of yacc.c  */

-#line 1741 "glsl_parser.ypp"

-    { (yyval.node) = NULL; ;}

-    break;

-

-  case 291:

-

-/* Line 1464 of yacc.c  */

-#line 1746 "glsl_parser.ypp"

-    {

-	   void *ctx = state;

-	   (yyval.function_definition) = new(ctx) ast_function_definition();

-	   (yyval.function_definition)->set_location(yylloc);

-	   (yyval.function_definition)->prototype = (yyvsp[(1) - (2)].function);

-	   (yyval.function_definition)->body = (yyvsp[(2) - (2)].compound_statement);

-

-	   state->symbols->pop_scope();

-	;}

-    break;

-

-

-

-/* Line 1464 of yacc.c  */

-#line 5240 "glsl_parser.cpp"

-      default: break;

-    }

-  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);

-

-  YYPOPSTACK (yylen);

-  yylen = 0;

-  YY_STACK_PRINT (yyss, yyssp);

-

-  *++yyvsp = yyval;

-  *++yylsp = yyloc;

-

-  /* Now `shift' the result of the reduction.  Determine what state

-     that goes to, based on the state we popped back to and the rule

-     number reduced by.  */

-

-  yyn = yyr1[yyn];

-

-  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;

-  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)

-    yystate = yytable[yystate];

-  else

-    yystate = yydefgoto[yyn - YYNTOKENS];

-

-  goto yynewstate;

-

-

-/*------------------------------------.

-| yyerrlab -- here on detecting error |

-`------------------------------------*/

-yyerrlab:

-  /* If not already recovering from an error, report this error.  */

-  if (!yyerrstatus)

-    {

-      ++yynerrs;

-#if ! YYERROR_VERBOSE

-      yyerror (&yylloc, state, YY_("syntax error"));

-#else

-      {

-	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);

-	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)

-	  {

-	    YYSIZE_T yyalloc = 2 * yysize;

-	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))

-	      yyalloc = YYSTACK_ALLOC_MAXIMUM;

-	    if (yymsg != yymsgbuf)

-	      YYSTACK_FREE (yymsg);

-	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);

-	    if (yymsg)

-	      yymsg_alloc = yyalloc;

-	    else

-	      {

-		yymsg = yymsgbuf;

-		yymsg_alloc = sizeof yymsgbuf;

-	      }

-	  }

-

-	if (0 < yysize && yysize <= yymsg_alloc)

-	  {

-	    (void) yysyntax_error (yymsg, yystate, yychar);

-	    yyerror (&yylloc, state, yymsg);

-	  }

-	else

-	  {

-	    yyerror (&yylloc, state, YY_("syntax error"));

-	    if (yysize != 0)

-	      goto yyexhaustedlab;

-	  }

-      }

-#endif

-    }

-

-  yyerror_range[1] = yylloc;

-

-  if (yyerrstatus == 3)

-    {

-      /* If just tried and failed to reuse lookahead token after an

-	 error, discard it.  */

-

-      if (yychar <= YYEOF)

-	{

-	  /* Return failure if at end of input.  */

-	  if (yychar == YYEOF)

-	    YYABORT;

-	}

-      else

-	{

-	  yydestruct ("Error: discarding",

-		      yytoken, &yylval, &yylloc, state);

-	  yychar = YYEMPTY;

-	}

-    }

-

-  /* Else will try to reuse lookahead token after shifting the error

-     token.  */

-  goto yyerrlab1;

-

-

-/*---------------------------------------------------.

-| yyerrorlab -- error raised explicitly by YYERROR.  |

-`---------------------------------------------------*/

-yyerrorlab:

-

-  /* Pacify compilers like GCC when the user code never invokes

-     YYERROR and the label yyerrorlab therefore never appears in user

-     code.  */

-  if (/*CONSTCOND*/ 0)

-     goto yyerrorlab;

-

-  yyerror_range[1] = yylsp[1-yylen];

-  /* Do not reclaim the symbols of the rule which action triggered

-     this YYERROR.  */

-  YYPOPSTACK (yylen);

-  yylen = 0;

-  YY_STACK_PRINT (yyss, yyssp);

-  yystate = *yyssp;

-  goto yyerrlab1;

-

-

-/*-------------------------------------------------------------.

-| yyerrlab1 -- common code for both syntax error and YYERROR.  |

-`-------------------------------------------------------------*/

-yyerrlab1:

-  yyerrstatus = 3;	/* Each real token shifted decrements this.  */

-

-  for (;;)

-    {

-      yyn = yypact[yystate];

-      if (yyn != YYPACT_NINF)

-	{

-	  yyn += YYTERROR;

-	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)

-	    {

-	      yyn = yytable[yyn];

-	      if (0 < yyn)

-		break;

-	    }

-	}

-

-      /* Pop the current state because it cannot handle the error token.  */

-      if (yyssp == yyss)

-	YYABORT;

-

-      yyerror_range[1] = *yylsp;

-      yydestruct ("Error: popping",

-		  yystos[yystate], yyvsp, yylsp, state);

-      YYPOPSTACK (1);

-      yystate = *yyssp;

-      YY_STACK_PRINT (yyss, yyssp);

-    }

-

-  *++yyvsp = yylval;

-

-  yyerror_range[2] = yylloc;

-  /* Using YYLLOC is tempting, but would change the location of

-     the lookahead.  YYLOC is available though.  */

-  YYLLOC_DEFAULT (yyloc, yyerror_range, 2);

-  *++yylsp = yyloc;

-

-  /* Shift the error token.  */

-  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);

-

-  yystate = yyn;

-  goto yynewstate;

-

-

-/*-------------------------------------.

-| yyacceptlab -- YYACCEPT comes here.  |

-`-------------------------------------*/

-yyacceptlab:

-  yyresult = 0;

-  goto yyreturn;

-

-/*-----------------------------------.

-| yyabortlab -- YYABORT comes here.  |

-`-----------------------------------*/

-yyabortlab:

-  yyresult = 1;

-  goto yyreturn;

-

-#if !defined(yyoverflow) || YYERROR_VERBOSE

-/*-------------------------------------------------.

-| yyexhaustedlab -- memory exhaustion comes here.  |

-`-------------------------------------------------*/

-yyexhaustedlab:

-  yyerror (&yylloc, state, YY_("memory exhausted"));

-  yyresult = 2;

-  /* Fall through.  */

-#endif

-

-yyreturn:

-  if (yychar != YYEMPTY)

-     yydestruct ("Cleanup: discarding lookahead",

-		 yytoken, &yylval, &yylloc, state);

-  /* Do not reclaim the symbols of the rule which action triggered

-     this YYABORT or YYACCEPT.  */

-  YYPOPSTACK (yylen);

-  YY_STACK_PRINT (yyss, yyssp);

-  while (yyssp != yyss)

-    {

-      yydestruct ("Cleanup: popping",

-		  yystos[*yyssp], yyvsp, yylsp, state);

-      YYPOPSTACK (1);

-    }

-#ifndef yyoverflow

-  if (yyss != yyssa)

-    YYSTACK_FREE (yyss);

-#endif

-#if YYERROR_VERBOSE

-  if (yymsg != yymsgbuf)

-    YYSTACK_FREE (yymsg);

-#endif

-  /* Make sure YYID is used.  */

-  return YYID (yyresult);

-}

-

-

-

diff --git a/mesalib/src/glsl/glsl_parser.h b/mesalib/src/glsl/glsl_parser.h
deleted file mode 100644
index da50fdac0..000000000
--- a/mesalib/src/glsl/glsl_parser.h
+++ /dev/null
@@ -1,300 +0,0 @@
-/* A Bison parser, made by GNU Bison 2.4.3.  */

-

-/* Skeleton interface for Bison's Yacc-like parsers in C

-   

-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,

-   2009, 2010 Free Software Foundation, Inc.

-   

-   This program is free software: you can redistribute it and/or modify

-   it under the terms of the GNU General Public License as published by

-   the Free Software Foundation, either version 3 of the License, or

-   (at your option) any later version.

-   

-   This program is distributed in the hope that it will be useful,

-   but WITHOUT ANY WARRANTY; without even the implied warranty of

-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-   GNU General Public License for more details.

-   

-   You should have received a copy of the GNU General Public License

-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

-

-/* As a special exception, you may create a larger work that contains

-   part or all of the Bison parser skeleton and distribute that work

-   under terms of your choice, so long as that work isn't itself a

-   parser generator using the skeleton or a modified version thereof

-   as a parser skeleton.  Alternatively, if you modify or redistribute

-   the parser skeleton itself, you may (at your option) remove this

-   special exception, which will cause the skeleton and the resulting

-   Bison output files to be licensed under the GNU General Public

-   License without this special exception.

-   

-   This special exception was added by the Free Software Foundation in

-   version 2.2 of Bison.  */

-

-

-/* Tokens.  */

-#ifndef YYTOKENTYPE

-# define YYTOKENTYPE

-   /* Put the tokens into the symbol table, so that GDB and other debuggers

-      know about them.  */

-   enum yytokentype {

-     ATTRIBUTE = 258,

-     CONST_TOK = 259,

-     BOOL_TOK = 260,

-     FLOAT_TOK = 261,

-     INT_TOK = 262,

-     UINT_TOK = 263,

-     BREAK = 264,

-     CONTINUE = 265,

-     DO = 266,

-     ELSE = 267,

-     FOR = 268,

-     IF = 269,

-     DISCARD = 270,

-     RETURN = 271,

-     SWITCH = 272,

-     CASE = 273,

-     DEFAULT = 274,

-     BVEC2 = 275,

-     BVEC3 = 276,

-     BVEC4 = 277,

-     IVEC2 = 278,

-     IVEC3 = 279,

-     IVEC4 = 280,

-     UVEC2 = 281,

-     UVEC3 = 282,

-     UVEC4 = 283,

-     VEC2 = 284,

-     VEC3 = 285,

-     VEC4 = 286,

-     CENTROID = 287,

-     IN_TOK = 288,

-     OUT_TOK = 289,

-     INOUT_TOK = 290,

-     UNIFORM = 291,

-     VARYING = 292,

-     NOPERSPECTIVE = 293,

-     FLAT = 294,

-     SMOOTH = 295,

-     MAT2X2 = 296,

-     MAT2X3 = 297,

-     MAT2X4 = 298,

-     MAT3X2 = 299,

-     MAT3X3 = 300,

-     MAT3X4 = 301,

-     MAT4X2 = 302,

-     MAT4X3 = 303,

-     MAT4X4 = 304,

-     SAMPLER1D = 305,

-     SAMPLER2D = 306,

-     SAMPLER3D = 307,

-     SAMPLERCUBE = 308,

-     SAMPLER1DSHADOW = 309,

-     SAMPLER2DSHADOW = 310,

-     SAMPLERCUBESHADOW = 311,

-     SAMPLER1DARRAY = 312,

-     SAMPLER2DARRAY = 313,

-     SAMPLER1DARRAYSHADOW = 314,

-     SAMPLER2DARRAYSHADOW = 315,

-     ISAMPLER1D = 316,

-     ISAMPLER2D = 317,

-     ISAMPLER3D = 318,

-     ISAMPLERCUBE = 319,

-     ISAMPLER1DARRAY = 320,

-     ISAMPLER2DARRAY = 321,

-     USAMPLER1D = 322,

-     USAMPLER2D = 323,

-     USAMPLER3D = 324,

-     USAMPLERCUBE = 325,

-     USAMPLER1DARRAY = 326,

-     USAMPLER2DARRAY = 327,

-     STRUCT = 328,

-     VOID_TOK = 329,

-     WHILE = 330,

-     IDENTIFIER = 331,

-     TYPE_IDENTIFIER = 332,

-     NEW_IDENTIFIER = 333,

-     FLOATCONSTANT = 334,

-     INTCONSTANT = 335,

-     UINTCONSTANT = 336,

-     BOOLCONSTANT = 337,

-     FIELD_SELECTION = 338,

-     LEFT_OP = 339,

-     RIGHT_OP = 340,

-     INC_OP = 341,

-     DEC_OP = 342,

-     LE_OP = 343,

-     GE_OP = 344,

-     EQ_OP = 345,

-     NE_OP = 346,

-     AND_OP = 347,

-     OR_OP = 348,

-     XOR_OP = 349,

-     MUL_ASSIGN = 350,

-     DIV_ASSIGN = 351,

-     ADD_ASSIGN = 352,

-     MOD_ASSIGN = 353,

-     LEFT_ASSIGN = 354,

-     RIGHT_ASSIGN = 355,

-     AND_ASSIGN = 356,

-     XOR_ASSIGN = 357,

-     OR_ASSIGN = 358,

-     SUB_ASSIGN = 359,

-     INVARIANT = 360,

-     LOWP = 361,

-     MEDIUMP = 362,

-     HIGHP = 363,

-     SUPERP = 364,

-     PRECISION = 365,

-     VERSION = 366,

-     EXTENSION = 367,

-     LINE = 368,

-     COLON = 369,

-     EOL = 370,

-     INTERFACE = 371,

-     OUTPUT = 372,

-     PRAGMA_DEBUG_ON = 373,

-     PRAGMA_DEBUG_OFF = 374,

-     PRAGMA_OPTIMIZE_ON = 375,

-     PRAGMA_OPTIMIZE_OFF = 376,

-     PRAGMA_INVARIANT_ALL = 377,

-     LAYOUT_TOK = 378,

-     ASM = 379,

-     CLASS = 380,

-     UNION = 381,

-     ENUM = 382,

-     TYPEDEF = 383,

-     TEMPLATE = 384,

-     THIS = 385,

-     PACKED_TOK = 386,

-     GOTO = 387,

-     INLINE_TOK = 388,

-     NOINLINE = 389,

-     VOLATILE = 390,

-     PUBLIC_TOK = 391,

-     STATIC = 392,

-     EXTERN = 393,

-     EXTERNAL = 394,

-     LONG_TOK = 395,

-     SHORT_TOK = 396,

-     DOUBLE_TOK = 397,

-     HALF = 398,

-     FIXED_TOK = 399,

-     UNSIGNED = 400,

-     INPUT_TOK = 401,

-     OUPTUT = 402,

-     HVEC2 = 403,

-     HVEC3 = 404,

-     HVEC4 = 405,

-     DVEC2 = 406,

-     DVEC3 = 407,

-     DVEC4 = 408,

-     FVEC2 = 409,

-     FVEC3 = 410,

-     FVEC4 = 411,

-     SAMPLER2DRECT = 412,

-     SAMPLER3DRECT = 413,

-     SAMPLER2DRECTSHADOW = 414,

-     SIZEOF = 415,

-     CAST = 416,

-     NAMESPACE = 417,

-     USING = 418,

-     ERROR_TOK = 419,

-     COMMON = 420,

-     PARTITION = 421,

-     ACTIVE = 422,

-     SAMPLERBUFFER = 423,

-     FILTER = 424,

-     IMAGE1D = 425,

-     IMAGE2D = 426,

-     IMAGE3D = 427,

-     IMAGECUBE = 428,

-     IMAGE1DARRAY = 429,

-     IMAGE2DARRAY = 430,

-     IIMAGE1D = 431,

-     IIMAGE2D = 432,

-     IIMAGE3D = 433,

-     IIMAGECUBE = 434,

-     IIMAGE1DARRAY = 435,

-     IIMAGE2DARRAY = 436,

-     UIMAGE1D = 437,

-     UIMAGE2D = 438,

-     UIMAGE3D = 439,

-     UIMAGECUBE = 440,

-     UIMAGE1DARRAY = 441,

-     UIMAGE2DARRAY = 442,

-     IMAGE1DSHADOW = 443,

-     IMAGE2DSHADOW = 444,

-     IMAGEBUFFER = 445,

-     IIMAGEBUFFER = 446,

-     UIMAGEBUFFER = 447,

-     IMAGE1DARRAYSHADOW = 448,

-     IMAGE2DARRAYSHADOW = 449,

-     ROW_MAJOR = 450

-   };

-#endif

-

-

-

-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED

-typedef union YYSTYPE

-{

-

-/* Line 1685 of yacc.c  */

-#line 52 "glsl_parser.ypp"

-

-   int n;

-   float real;

-   char *identifier;

-

-   struct ast_type_qualifier type_qualifier;

-

-   ast_node *node;

-   ast_type_specifier *type_specifier;

-   ast_fully_specified_type *fully_specified_type;

-   ast_function *function;

-   ast_parameter_declarator *parameter_declarator;

-   ast_function_definition *function_definition;

-   ast_compound_statement *compound_statement;

-   ast_expression *expression;

-   ast_declarator_list *declarator_list;

-   ast_struct_specifier *struct_specifier;

-   ast_declaration *declaration;

-

-   struct {

-      ast_node *cond;

-      ast_expression *rest;

-   } for_rest_statement;

-

-   struct {

-      ast_node *then_statement;

-      ast_node *else_statement;

-   } selection_rest_statement;

-

-

-

-/* Line 1685 of yacc.c  */

-#line 278 "glsl_parser.h"

-} YYSTYPE;

-# define YYSTYPE_IS_TRIVIAL 1

-# define yystype YYSTYPE /* obsolescent; will be withdrawn */

-# define YYSTYPE_IS_DECLARED 1

-#endif

-

-

-

-#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED

-typedef struct YYLTYPE

-{

-  int first_line;

-  int first_column;

-  int last_line;

-  int last_column;

-} YYLTYPE;

-# define yyltype YYLTYPE /* obsolescent; will be withdrawn */

-# define YYLTYPE_IS_DECLARED 1

-# define YYLTYPE_IS_TRIVIAL 1

-#endif

-

-

-

diff --git a/mesalib/src/glsl/glsl_parser.ypp b/mesalib/src/glsl/glsl_parser.yy
index 29849c1e9..29849c1e9 100644
--- a/mesalib/src/glsl/glsl_parser.ypp
+++ b/mesalib/src/glsl/glsl_parser.yy
diff --git a/mesalib/src/mesa/Makefile b/mesalib/src/mesa/Makefile
index 36cbdd994..10d73f000 100644
--- a/mesalib/src/mesa/Makefile
+++ b/mesalib/src/mesa/Makefile
@@ -1,224 +1,230 @@
-# src/mesa/Makefile

-

-TOP = ../..

-include $(TOP)/configs/current

-

-MESA_LIBS := libmesa.a libmesagallium.a

-DEPENDS := depend

-

-MESA_OBJ_DIR := .

-DRICORE_OBJ_DIR := objs-dricore

-

-include sources.mak

-

-# adjust object dirs

-MESA_OBJECTS := $(addprefix $(MESA_OBJ_DIR)/, $(MESA_OBJECTS))

-MESA_GALLIUM_OBJECTS := $(addprefix $(MESA_OBJ_DIR)/, $(MESA_GALLIUM_OBJECTS))

-

-DRICORE_OBJECTS := $(addprefix $(DRICORE_OBJ_DIR)/, $(MESA_OBJECTS))

-

-# define preprocessor flags

-MESA_CPPFLAGS := $(API_DEFINES) $(DEFINES)

-

-# append include dirs

-MESA_CPPFLAGS += $(INCLUDE_DIRS)

-

-DRICORE_CPPFLAGS = $(MESA_CPPFLAGS)

-

-# tidy compiler flags

-CFLAGS := $(filter-out $(DEFINES), $(CFLAGS))

-CXXFLAGS := $(filter-out $(DEFINES), $(CXXFLAGS))

-

-# LLVM is needed for the state tracker

-MESA_CFLAGS := $(LLVM_CFLAGS) $(CFLAGS)

-DRICORE_CFLAGS := $(LLVM_CFLAGS) $(DRI_CFLAGS)

-

-MESA_CXXFLAGS := $(LLVM_CFLAGS) $(CXXFLAGS)

-DRICORE_CXXFLAGS := $(LLVM_CFLAGS) $(DRI_CXXFLAGS)

-

-define mesa-cc-c

-	@mkdir -p $(dir $@)

-	$(CC) -c -o $@ $< $($(1)_CPPFLAGS) $($(1)_CFLAGS)

-endef

-

-define mesa-cxx-c

-	@mkdir -p $(dir $@)

-	$(CXX) -c -o $@ $< $($(1)_CPPFLAGS) $($(1)_CFLAGS) $($(1)_CXXFLAGS)

-endef

-

-$(MESA_OBJ_DIR)/%.o: %.c

-	$(call mesa-cc-c,MESA)

-

-$(MESA_OBJ_DIR)/%.o: %.cpp

-	$(call mesa-cxx-c,MESA)

-

-$(MESA_OBJ_DIR)/%.o: %.S

-	$(call mesa-cc-c,MESA)

-

-$(DRICORE_OBJ_DIR)/%.o: %.c

-	$(call mesa-cc-c,DRICORE)

-

-$(DRICORE_OBJ_DIR)/%.o: %.cpp

-	$(call mesa-cxx-c,DRICORE)

-

-$(DRICORE_OBJ_DIR)/%.o: %.S

-	$(call mesa-cc-c,DRICORE)

-

-# Default: build dependencies, then asm_subdirs, GLSL built-in lib,

-# then convenience libs (.a) and finally the device drivers:

-default: $(DEPENDS) asm_subdirs $(MESA_LIBS) $(DRICORE_LIBS) driver_subdirs

-

-main/api_exec_es1.c: main/APIspec.xml main/es_generator.py main/APIspecutil.py main/APIspec.py

-	$(PYTHON2) $(PYTHON_FLAGS) main/es_generator.py -S main/APIspec.xml -V GLES1.1 > $@

-

-main/api_exec_es2.c: main/APIspec.xml main/es_generator.py main/APIspecutil.py main/APIspec.py

-	$(PYTHON2) $(PYTHON_FLAGS) main/es_generator.py -S main/APIspec.xml -V GLES2.0 > $@

-

-######################################################################

-# Helper libraries used by many drivers:

-

-# Make archive of core mesa object files

-libmesa.a: $(MESA_OBJECTS) $(GLSL_LIBS)

-	@ $(MKLIB) -o mesa -static $(MESA_OBJECTS) $(GLSL_LIBS)

-

-# Shared dricore library for classic DRI drivers

-$(TOP)/$(LIB_DIR)/libdricore.so: $(DRICORE_OBJECTS) $(DRICORE_GLSL_LIBS)

-	@$(MKLIB) -o $@ -linker '$(CXX)' -ldflags '$(LDFLAGS)' \

-		-cplusplus -noprefix \

-		-install $(TOP)/$(LIB_DIR) -id $(DRI_DRIVER_INSTALL_DIR)/$@.dylib \

-		$(DRICORE_LIB_DEPS) $(DRICORE_OBJECTS)

-

-# Make archive of subset of core mesa object files for gallium

-libmesagallium.a: $(MESA_GALLIUM_OBJECTS) $(GLSL_LIBS)

-	@ $(MKLIB) -o mesagallium -static $(MESA_GALLIUM_OBJECTS) $(GLSL_LIBS)

-

-######################################################################

-# Device drivers

-driver_subdirs: $(MESA_LIBS) $(DRICORE_LIBS)

-	@ (cd drivers && $(MAKE))

-

-

-######################################################################

-# Assembly subdirs

-asm_subdirs:

-	@ if echo "$(ASM_FLAGS)" | grep -q USE_X86_ASM ; then \

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

-	fi

-	@ if echo "$(ASM_FLAGS)" | grep -q USE_X86_64_ASM ; then \

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

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

-	fi

-

-

-######################################################################

-# Dependency generation

-

-depend: $(ALL_SOURCES)

-	@ echo "running $(MKDEP)"

-	@ touch depend

-	@$(MKDEP) $(MKDEP_OPTIONS) -p$(MESA_OBJ_DIR)/ $(MESA_CPPFLAGS) \

-		$(ALL_SOURCES) > /dev/null 2>/dev/null

-

-######################################################################

-# Installation rules

-

-# this isn't fleshed out yet but is probably the way to go in the future

-new_install:

-	(cd drivers && $(MAKE) install)

-

-ifneq (,$(DRICORE_LIBS))

-DRICORE_INSTALL_TARGET = install-dricore

-endif

-

-# XXX replace this with new_install above someday

-install: default $(DRICORE_INSTALL_TARGET)

-	@for driver in $(DRIVER_DIRS) ; do \

-	  case "$$driver" in \

-	    osmesa) if [ "$(DRIVER_DIRS)" = osmesa ]; then \

-	              $(MAKE) install-headers install-osmesa || exit 1 ; \

-	            else \

-	              $(MAKE) install-osmesa || exit 1 ; \

-	            fi ;; \

-	    dri)    $(MAKE) install-libgl install-dri || exit 1 ;; \

-	    *)      $(MAKE) install-libgl || exit 1 ;; \

-	  esac ; \

-	done

-

-pcedit = \

-	-e 's,@INSTALL_DIR@,$(INSTALL_DIR),' \

-	-e 's,@INSTALL_LIB_DIR@,$(INSTALL_LIB_DIR),' \

-	-e 's,@INSTALL_INC_DIR@,$(INSTALL_INC_DIR),' \

-	-e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),' \

-

-

-gl_pcedit = sed \

-	$(pcedit) \

-	-e 's,@GL_PC_REQ_PRIV@,$(GL_PC_REQ_PRIV),' \

-	-e 's,@GL_PC_LIB_PRIV@,$(GL_PC_LIB_PRIV),' \

-	-e 's,@GL_PC_CFLAGS@,$(GL_PC_CFLAGS),' \

-	-e 's,@GLX_TLS@,$(GLX_TLS),' \

-	-e 's,@GL_LIB@,$(GL_LIB),'

-

-gl.pc: gl.pc.in

-	$(gl_pcedit) $< > $@

-

-osmesa_pcedit = sed \

-	$(pcedit) \

-	-e 's,@OSMESA_LIB@,$(OSMESA_LIB),' \

-	-e 's,@OSMESA_PC_REQ@,$(OSMESA_PC_REQ),' \

-	-e 's,@OSMESA_PC_LIB_PRIV@,$(OSMESA_PC_LIB_PRIV),'

-

-osmesa.pc: osmesa.pc.in

-	$(osmesa_pcedit) $< > $@

-

-install-headers:

-	$(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL

-	$(INSTALL) -m 644 $(TOP)/include/GL/*.h \

-		$(DESTDIR)$(INSTALL_INC_DIR)/GL

-

-install-libgl: default gl.pc install-headers

-	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)

-	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig

-	$(MINSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB) \

-		$(DESTDIR)$(INSTALL_LIB_DIR)

-	$(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig

-

-install-osmesa: default osmesa.pc

-	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)

-	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig

-	$(MINSTALL) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_GLOB) \

-		$(DESTDIR)$(INSTALL_LIB_DIR)

-	$(INSTALL) -m 644 osmesa.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig

-

-install-dri: default

-	cd drivers/dri && $(MAKE) install

-

-# We don't need MINSTALL here because we're not installing symbolic links

-install-dricore: default

-	$(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)

-	$(INSTALL) -m 755 $(DRICORE_LIBS) $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)

-

-

-# Emacs tags

-tags:

-	etags `find . -name \*.[ch]` $(TOP)/include/GL/*.h

-

-clean-dricore:

-	-rm -f libdricore.so

-	-rm -f $(DRICORE_LIBS)

-	-rm -rf $(DRICORE_OBJ_DIR)

-

-clean: clean-dricore

-	-rm -f */*.o

-	-rm -f */*/*.o

-	-rm -f depend depend.bak libmesa.a libmesagallium.a

-	-rm -f drivers/*/*.o

-	-rm -f *.pc

-	-@cd drivers/dri && $(MAKE) clean

-	-@cd drivers/x11 && $(MAKE) clean

-	-@cd drivers/osmesa && $(MAKE) clean

-	-@cd x86 && $(MAKE) clean

-	-@cd x86-64 && $(MAKE) clean

-

-

--include $(DEPENDS)

+# src/mesa/Makefile
+
+TOP = ../..
+include $(TOP)/configs/current
+
+MESA_LIBS := libmesa.a libmesagallium.a
+DEPENDS := depend
+
+MESA_OBJ_DIR := .
+DRICORE_OBJ_DIR := objs-dricore
+
+include sources.mak
+
+# adjust object dirs
+MESA_OBJECTS := $(addprefix $(MESA_OBJ_DIR)/, $(MESA_OBJECTS))
+MESA_GALLIUM_OBJECTS := $(addprefix $(MESA_OBJ_DIR)/, $(MESA_GALLIUM_OBJECTS))
+
+DRICORE_OBJECTS := $(addprefix $(DRICORE_OBJ_DIR)/, $(MESA_OBJECTS))
+
+# define preprocessor flags
+MESA_CPPFLAGS := $(API_DEFINES) $(DEFINES)
+
+# append include dirs
+MESA_CPPFLAGS += $(INCLUDE_DIRS)
+
+DRICORE_CPPFLAGS = $(MESA_CPPFLAGS)
+
+# tidy compiler flags
+CFLAGS := $(filter-out $(DEFINES), $(CFLAGS))
+CXXFLAGS := $(filter-out $(DEFINES), $(CXXFLAGS))
+
+# LLVM is needed for the state tracker
+MESA_CFLAGS := $(LLVM_CFLAGS) $(CFLAGS)
+DRICORE_CFLAGS := $(LLVM_CFLAGS) $(DRI_CFLAGS)
+
+MESA_CXXFLAGS := $(LLVM_CFLAGS) $(CXXFLAGS)
+DRICORE_CXXFLAGS := $(LLVM_CFLAGS) $(DRI_CXXFLAGS)
+
+define mesa-cc-c
+	@mkdir -p $(dir $@)
+	$(CC) -c -o $@ $< $($(1)_CPPFLAGS) $($(1)_CFLAGS)
+endef
+
+define mesa-cxx-c
+	@mkdir -p $(dir $@)
+	$(CXX) -c -o $@ $< $($(1)_CPPFLAGS) $($(1)_CFLAGS) $($(1)_CXXFLAGS)
+endef
+
+$(MESA_OBJ_DIR)/%.o: %.c
+	$(call mesa-cc-c,MESA)
+
+$(MESA_OBJ_DIR)/%.o: %.cpp
+	$(call mesa-cxx-c,MESA)
+
+$(MESA_OBJ_DIR)/%.o: %.S
+	$(call mesa-cc-c,MESA)
+
+$(DRICORE_OBJ_DIR)/%.o: %.c
+	$(call mesa-cc-c,DRICORE)
+
+$(DRICORE_OBJ_DIR)/%.o: %.cpp
+	$(call mesa-cxx-c,DRICORE)
+
+$(DRICORE_OBJ_DIR)/%.o: %.S
+	$(call mesa-cc-c,DRICORE)
+
+# Default: build dependencies, then asm_subdirs, GLSL built-in lib,
+# then convenience libs (.a) and finally the device drivers:
+default: $(DEPENDS) asm_subdirs $(MESA_LIBS) $(DRICORE_LIBS) driver_subdirs
+
+main/api_exec_es1.c: main/APIspec.xml main/es_generator.py main/APIspecutil.py main/APIspec.py
+	$(PYTHON2) $(PYTHON_FLAGS) main/es_generator.py -S main/APIspec.xml -V GLES1.1 > $@
+
+main/api_exec_es2.c: main/APIspec.xml main/es_generator.py main/APIspecutil.py main/APIspec.py
+	$(PYTHON2) $(PYTHON_FLAGS) main/es_generator.py -S main/APIspec.xml -V GLES2.0 > $@
+
+program/program_parse.tab.c program/program_parse.tab.h: program/program_parse.y
+	bison -v -d --output=program/program_parse.tab.c $<
+
+program/lex.yy.c: program/program_lexer.l
+	flex --never-interactive --outfile=$@ $<
+
+######################################################################
+# Helper libraries used by many drivers:
+
+# Make archive of core mesa object files
+libmesa.a: $(MESA_OBJECTS) $(GLSL_LIBS)
+	@ $(MKLIB) -o mesa -static $(MESA_OBJECTS) $(GLSL_LIBS)
+
+# Shared dricore library for classic DRI drivers
+$(TOP)/$(LIB_DIR)/libdricore.so: $(DRICORE_OBJECTS) $(DRICORE_GLSL_LIBS)
+	@$(MKLIB) -o $@ -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
+		-cplusplus -noprefix \
+		-install $(TOP)/$(LIB_DIR) -id $(DRI_DRIVER_INSTALL_DIR)/$@.dylib \
+		$(DRICORE_LIB_DEPS) $(DRICORE_OBJECTS)
+
+# Make archive of subset of core mesa object files for gallium
+libmesagallium.a: $(MESA_GALLIUM_OBJECTS) $(GLSL_LIBS)
+	@ $(MKLIB) -o mesagallium -static $(MESA_GALLIUM_OBJECTS) $(GLSL_LIBS)
+
+######################################################################
+# Device drivers
+driver_subdirs: $(MESA_LIBS) $(DRICORE_LIBS)
+	@ (cd drivers && $(MAKE))
+
+
+######################################################################
+# Assembly subdirs
+asm_subdirs:
+	@ if echo "$(ASM_FLAGS)" | grep -q USE_X86_ASM ; then \
+		(cd x86 && $(MAKE)) || exit 1 ; \
+	fi
+	@ if echo "$(ASM_FLAGS)" | grep -q USE_X86_64_ASM ; then \
+		(cd x86 && $(MAKE)) || exit 1 ; \
+		(cd x86-64 && $(MAKE)) || exit 1 ; \
+	fi
+
+
+######################################################################
+# Dependency generation
+
+depend: $(ALL_SOURCES)
+	@ echo "running $(MKDEP)"
+	@ touch depend
+	@$(MKDEP) $(MKDEP_OPTIONS) -p$(MESA_OBJ_DIR)/ $(MESA_CPPFLAGS) \
+		$(ALL_SOURCES) > /dev/null 2>/dev/null
+
+######################################################################
+# Installation rules
+
+# this isn't fleshed out yet but is probably the way to go in the future
+new_install:
+	(cd drivers && $(MAKE) install)
+
+ifneq (,$(DRICORE_LIBS))
+DRICORE_INSTALL_TARGET = install-dricore
+endif
+
+# XXX replace this with new_install above someday
+install: default $(DRICORE_INSTALL_TARGET)
+	@for driver in $(DRIVER_DIRS) ; do \
+	  case "$$driver" in \
+	    osmesa) if [ "$(DRIVER_DIRS)" = osmesa ]; then \
+	              $(MAKE) install-headers install-osmesa || exit 1 ; \
+	            else \
+	              $(MAKE) install-osmesa || exit 1 ; \
+	            fi ;; \
+	    dri)    $(MAKE) install-libgl install-dri || exit 1 ;; \
+	    *)      $(MAKE) install-libgl || exit 1 ;; \
+	  esac ; \
+	done
+
+pcedit = \
+	-e 's,@INSTALL_DIR@,$(INSTALL_DIR),' \
+	-e 's,@INSTALL_LIB_DIR@,$(INSTALL_LIB_DIR),' \
+	-e 's,@INSTALL_INC_DIR@,$(INSTALL_INC_DIR),' \
+	-e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),' \
+
+
+gl_pcedit = sed \
+	$(pcedit) \
+	-e 's,@GL_PC_REQ_PRIV@,$(GL_PC_REQ_PRIV),' \
+	-e 's,@GL_PC_LIB_PRIV@,$(GL_PC_LIB_PRIV),' \
+	-e 's,@GL_PC_CFLAGS@,$(GL_PC_CFLAGS),' \
+	-e 's,@GLX_TLS@,$(GLX_TLS),' \
+	-e 's,@GL_LIB@,$(GL_LIB),'
+
+gl.pc: gl.pc.in
+	$(gl_pcedit) $< > $@
+
+osmesa_pcedit = sed \
+	$(pcedit) \
+	-e 's,@OSMESA_LIB@,$(OSMESA_LIB),' \
+	-e 's,@OSMESA_PC_REQ@,$(OSMESA_PC_REQ),' \
+	-e 's,@OSMESA_PC_LIB_PRIV@,$(OSMESA_PC_LIB_PRIV),'
+
+osmesa.pc: osmesa.pc.in
+	$(osmesa_pcedit) $< > $@
+
+install-headers:
+	$(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL
+	$(INSTALL) -m 644 $(TOP)/include/GL/*.h \
+		$(DESTDIR)$(INSTALL_INC_DIR)/GL
+
+install-libgl: default gl.pc install-headers
+	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
+	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
+	$(MINSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB) \
+		$(DESTDIR)$(INSTALL_LIB_DIR)
+	$(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
+
+install-osmesa: default osmesa.pc
+	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
+	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
+	$(MINSTALL) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_GLOB) \
+		$(DESTDIR)$(INSTALL_LIB_DIR)
+	$(INSTALL) -m 644 osmesa.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
+
+install-dri: default
+	cd drivers/dri && $(MAKE) install
+
+# We don't need MINSTALL here because we're not installing symbolic links
+install-dricore: default
+	$(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
+	$(INSTALL) -m 755 $(DRICORE_LIBS) $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
+
+
+# Emacs tags
+tags:
+	etags `find . -name \*.[ch]` $(TOP)/include/GL/*.h
+
+clean-dricore:
+	-rm -f libdricore.so
+	-rm -f $(DRICORE_LIBS)
+	-rm -rf $(DRICORE_OBJ_DIR)
+
+clean: clean-dricore
+	-rm -f */*.o
+	-rm -f */*/*.o
+	-rm -f depend depend.bak libmesa.a libmesagallium.a
+	-rm -f drivers/*/*.o
+	-rm -f *.pc
+	-@cd drivers/dri && $(MAKE) clean
+	-@cd drivers/x11 && $(MAKE) clean
+	-@cd drivers/osmesa && $(MAKE) clean
+	-@cd x86 && $(MAKE) clean
+	-@cd x86-64 && $(MAKE) clean
+
+
+-include $(DEPENDS)
diff --git a/mesalib/src/mesa/SConscript b/mesalib/src/mesa/SConscript
index d65750b93..acbf86ebd 100644
--- a/mesalib/src/mesa/SConscript
+++ b/mesalib/src/mesa/SConscript
@@ -214,15 +214,17 @@ statetracker_sources = [
     'state_tracker/st_texture.c',
 ]
 
+env.Append(YACCFLAGS = '-d')
+program_lex = env.CFile('program/lex.yy.c', 'program/program_lexer.l')
+program_parse = env.CFile('program/program_parse.tab.c',
+                          'program/program_parse.y')
 program_sources = [
     'program/arbprogparse.c',
     'program/hash_table.c',
     'program/ir_to_mesa.cpp',
-    'program/lex.yy.c',
     'program/nvfragparse.c',
     'program/nvvertparse.c',
     'program/program.c',
-    'program/program_parse.tab.c',
     'program/program_parse_extra.c',
     'program/prog_cache.c',
     'program/prog_execute.c',
@@ -237,6 +239,8 @@ program_sources = [
     'program/programopt.c',
     'program/sampler.cpp',
     'program/symbol_table.c',
+    program_lex,
+    program_parse[0],
 ]
 
 mesa_sources = (
diff --git a/mesalib/src/mesa/main/mipmap.c b/mesalib/src/mesa/main/mipmap.c
index 3d7ab6b35..0727e1818 100644
--- a/mesalib/src/mesa/main/mipmap.c
+++ b/mesalib/src/mesa/main/mipmap.c
@@ -1,2017 +1,2022 @@
-/*

- * Mesa 3-D graphics library

- * Version:  7.1

- *

- * Copyright (C) 1999-2007  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.

- */

-

-

-/**

- * \file mipmap.c  mipmap generation and teximage resizing functions.

- */

-

-#include "imports.h"

-#include "formats.h"

-#include "mipmap.h"

-#include "mtypes.h"

-#include "teximage.h"

-#include "texstore.h"

-#include "image.h"

-

-

-

-static GLint

-bytes_per_pixel(GLenum datatype, GLuint comps)

-{

-   GLint b = _mesa_sizeof_packed_type(datatype);

-   assert(b >= 0);

-

-   if (_mesa_type_is_packed(datatype))

-       return b;

-   else

-       return b * comps;

-}

-

-

-/**

- * \name Support macros for do_row and do_row_3d

- *

- * The macro madness is here for two reasons.  First, it compacts the code

- * slightly.  Second, it makes it much easier to adjust the specifics of the

- * filter to tune the rounding characteristics.

- */

-/*@{*/

-#define DECLARE_ROW_POINTERS(t, e) \

-      const t(*rowA)[e] = (const t(*)[e]) srcRowA; \

-      const t(*rowB)[e] = (const t(*)[e]) srcRowB; \

-      const t(*rowC)[e] = (const t(*)[e]) srcRowC; \

-      const t(*rowD)[e] = (const t(*)[e]) srcRowD; \

-      t(*dst)[e] = (t(*)[e]) dstRow

-

-#define DECLARE_ROW_POINTERS0(t) \

-      const t *rowA = (const t *) srcRowA; \

-      const t *rowB = (const t *) srcRowB; \

-      const t *rowC = (const t *) srcRowC; \

-      const t *rowD = (const t *) srcRowD; \

-      t *dst = (t *) dstRow

-

-#define FILTER_SUM_3D(Aj, Ak, Bj, Bk, Cj, Ck, Dj, Dk) \

-   ((unsigned) Aj + (unsigned) Ak \

-    + (unsigned) Bj + (unsigned) Bk \

-    + (unsigned) Cj + (unsigned) Ck \

-    + (unsigned) Dj + (unsigned) Dk \

-    + 4) >> 3

-

-#define FILTER_3D(e) \

-   do { \

-      dst[i][e] = FILTER_SUM_3D(rowA[j][e], rowA[k][e], \

-                                rowB[j][e], rowB[k][e], \

-                                rowC[j][e], rowC[k][e], \

-                                rowD[j][e], rowD[k][e]); \

-   } while(0)

-

-#define FILTER_SUM_3D_SIGNED(Aj, Ak, Bj, Bk, Cj, Ck, Dj, Dk) \

-   (Aj + Ak \

-    + Bj + Bk \

-    + Cj + Ck \

-    + Dj + Dk \

-    + 4) / 8

-

-#define FILTER_3D_SIGNED(e) \

-   do { \

-      dst[i][e] = FILTER_SUM_3D_SIGNED(rowA[j][e], rowA[k][e], \

-                                       rowB[j][e], rowB[k][e], \

-                                       rowC[j][e], rowC[k][e], \

-                                       rowD[j][e], rowD[k][e]); \

-   } while(0)

-

-#define FILTER_F_3D(e) \

-   do { \

-      dst[i][e] = (rowA[j][e] + rowA[k][e] \

-                   + rowB[j][e] + rowB[k][e] \

-                   + rowC[j][e] + rowC[k][e] \

-                   + rowD[j][e] + rowD[k][e]) * 0.125F; \

-   } while(0)

-

-#define FILTER_HF_3D(e) \

-   do { \

-      const GLfloat aj = _mesa_half_to_float(rowA[j][e]); \

-      const GLfloat ak = _mesa_half_to_float(rowA[k][e]); \

-      const GLfloat bj = _mesa_half_to_float(rowB[j][e]); \

-      const GLfloat bk = _mesa_half_to_float(rowB[k][e]); \

-      const GLfloat cj = _mesa_half_to_float(rowC[j][e]); \

-      const GLfloat ck = _mesa_half_to_float(rowC[k][e]); \

-      const GLfloat dj = _mesa_half_to_float(rowD[j][e]); \

-      const GLfloat dk = _mesa_half_to_float(rowD[k][e]); \

-      dst[i][e] = _mesa_float_to_half((aj + ak + bj + bk + cj + ck + dj + dk) \

-                                      * 0.125F); \

-   } while(0)

-/*@}*/

-

-

-/**

- * Average together two rows of a source image to produce a single new

- * row in the dest image.  It's legal for the two source rows to point

- * to the same data.  The source width must be equal to either the

- * dest width or two times the dest width.

- * \param datatype  GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, GL_FLOAT, etc.

- * \param comps  number of components per pixel (1..4)

- */

-static void

-do_row(GLenum datatype, GLuint comps, GLint srcWidth,

-       const GLvoid *srcRowA, const GLvoid *srcRowB,

-       GLint dstWidth, GLvoid *dstRow)

-{

-   const GLuint k0 = (srcWidth == dstWidth) ? 0 : 1;

-   const GLuint colStride = (srcWidth == dstWidth) ? 1 : 2;

-

-   ASSERT(comps >= 1);

-   ASSERT(comps <= 4);

-

-   /* This assertion is no longer valid with non-power-of-2 textures

-   assert(srcWidth == dstWidth || srcWidth == 2 * dstWidth);

-   */

-

-   if (datatype == GL_UNSIGNED_BYTE && comps == 4) {

-      GLuint i, j, k;

-      const GLubyte(*rowA)[4] = (const GLubyte(*)[4]) srcRowA;

-      const GLubyte(*rowB)[4] = (const GLubyte(*)[4]) srcRowB;

-      GLubyte(*dst)[4] = (GLubyte(*)[4]) dstRow;

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;

-         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;

-         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;

-         dst[i][3] = (rowA[j][3] + rowA[k][3] + rowB[j][3] + rowB[k][3]) / 4;

-      }

-   }

-   else if (datatype == GL_UNSIGNED_BYTE && comps == 3) {

-      GLuint i, j, k;

-      const GLubyte(*rowA)[3] = (const GLubyte(*)[3]) srcRowA;

-      const GLubyte(*rowB)[3] = (const GLubyte(*)[3]) srcRowB;

-      GLubyte(*dst)[3] = (GLubyte(*)[3]) dstRow;

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;

-         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;

-         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;

-      }

-   }

-   else if (datatype == GL_UNSIGNED_BYTE && comps == 2) {

-      GLuint i, j, k;

-      const GLubyte(*rowA)[2] = (const GLubyte(*)[2]) srcRowA;

-      const GLubyte(*rowB)[2] = (const GLubyte(*)[2]) srcRowB;

-      GLubyte(*dst)[2] = (GLubyte(*)[2]) dstRow;

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) >> 2;

-         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) >> 2;

-      }

-   }

-   else if (datatype == GL_UNSIGNED_BYTE && comps == 1) {

-      GLuint i, j, k;

-      const GLubyte *rowA = (const GLubyte *) srcRowA;

-      const GLubyte *rowB = (const GLubyte *) srcRowB;

-      GLubyte *dst = (GLubyte *) dstRow;

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) >> 2;

-      }

-   }

-

-   else if (datatype == GL_BYTE && comps == 4) {

-      GLuint i, j, k;

-      const GLbyte(*rowA)[4] = (const GLbyte(*)[4]) srcRowA;

-      const GLbyte(*rowB)[4] = (const GLbyte(*)[4]) srcRowB;

-      GLbyte(*dst)[4] = (GLbyte(*)[4]) dstRow;

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;

-         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;

-         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;

-         dst[i][3] = (rowA[j][3] + rowA[k][3] + rowB[j][3] + rowB[k][3]) / 4;

-      }

-   }

-   else if (datatype == GL_BYTE && comps == 3) {

-      GLuint i, j, k;

-      const GLbyte(*rowA)[3] = (const GLbyte(*)[3]) srcRowA;

-      const GLbyte(*rowB)[3] = (const GLbyte(*)[3]) srcRowB;

-      GLbyte(*dst)[3] = (GLbyte(*)[3]) dstRow;

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;

-         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;

-         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;

-      }

-   }

-   else if (datatype == GL_BYTE && comps == 2) {

-      GLuint i, j, k;

-      const GLbyte(*rowA)[2] = (const GLbyte(*)[2]) srcRowA;

-      const GLbyte(*rowB)[2] = (const GLbyte(*)[2]) srcRowB;

-      GLbyte(*dst)[2] = (GLbyte(*)[2]) dstRow;

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;

-         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;

-      }

-   }

-   else if (datatype == GL_BYTE && comps == 1) {

-      GLuint i, j, k;

-      const GLbyte *rowA = (const GLbyte *) srcRowA;

-      const GLbyte *rowB = (const GLbyte *) srcRowB;

-      GLbyte *dst = (GLbyte *) dstRow;

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) / 4;

-      }

-   }

-

-   else if (datatype == GL_UNSIGNED_SHORT && comps == 4) {

-      GLuint i, j, k;

-      const GLushort(*rowA)[4] = (const GLushort(*)[4]) srcRowA;

-      const GLushort(*rowB)[4] = (const GLushort(*)[4]) srcRowB;

-      GLushort(*dst)[4] = (GLushort(*)[4]) dstRow;

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;

-         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;

-         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;

-         dst[i][3] = (rowA[j][3] + rowA[k][3] + rowB[j][3] + rowB[k][3]) / 4;

-      }

-   }

-   else if (datatype == GL_UNSIGNED_SHORT && comps == 3) {

-      GLuint i, j, k;

-      const GLushort(*rowA)[3] = (const GLushort(*)[3]) srcRowA;

-      const GLushort(*rowB)[3] = (const GLushort(*)[3]) srcRowB;

-      GLushort(*dst)[3] = (GLushort(*)[3]) dstRow;

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;

-         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;

-         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;

-      }

-   }

-   else if (datatype == GL_UNSIGNED_SHORT && comps == 2) {

-      GLuint i, j, k;

-      const GLushort(*rowA)[2] = (const GLushort(*)[2]) srcRowA;

-      const GLushort(*rowB)[2] = (const GLushort(*)[2]) srcRowB;

-      GLushort(*dst)[2] = (GLushort(*)[2]) dstRow;

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;

-         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;

-      }

-   }

-   else if (datatype == GL_UNSIGNED_SHORT && comps == 1) {

-      GLuint i, j, k;

-      const GLushort *rowA = (const GLushort *) srcRowA;

-      const GLushort *rowB = (const GLushort *) srcRowB;

-      GLushort *dst = (GLushort *) dstRow;

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) / 4;

-      }

-   }

-

-   else if (datatype == GL_SHORT && comps == 4) {

-      GLuint i, j, k;

-      const GLshort(*rowA)[4] = (const GLshort(*)[4]) srcRowA;

-      const GLshort(*rowB)[4] = (const GLshort(*)[4]) srcRowB;

-      GLshort(*dst)[4] = (GLshort(*)[4]) dstRow;

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;

-         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;

-         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;

-         dst[i][3] = (rowA[j][3] + rowA[k][3] + rowB[j][3] + rowB[k][3]) / 4;

-      }

-   }

-   else if (datatype == GL_SHORT && comps == 3) {

-      GLuint i, j, k;

-      const GLshort(*rowA)[3] = (const GLshort(*)[3]) srcRowA;

-      const GLshort(*rowB)[3] = (const GLshort(*)[3]) srcRowB;

-      GLshort(*dst)[3] = (GLshort(*)[3]) dstRow;

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;

-         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;

-         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;

-      }

-   }

-   else if (datatype == GL_SHORT && comps == 2) {

-      GLuint i, j, k;

-      const GLshort(*rowA)[2] = (const GLshort(*)[2]) srcRowA;

-      const GLshort(*rowB)[2] = (const GLshort(*)[2]) srcRowB;

-      GLshort(*dst)[2] = (GLshort(*)[2]) dstRow;

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;

-         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;

-      }

-   }

-   else if (datatype == GL_SHORT && comps == 1) {

-      GLuint i, j, k;

-      const GLshort *rowA = (const GLshort *) srcRowA;

-      const GLshort *rowB = (const GLshort *) srcRowB;

-      GLshort *dst = (GLshort *) dstRow;

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) / 4;

-      }

-   }

-

-   else if (datatype == GL_FLOAT && comps == 4) {

-      GLuint i, j, k;

-      const GLfloat(*rowA)[4] = (const GLfloat(*)[4]) srcRowA;

-      const GLfloat(*rowB)[4] = (const GLfloat(*)[4]) srcRowB;

-      GLfloat(*dst)[4] = (GLfloat(*)[4]) dstRow;

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         dst[i][0] = (rowA[j][0] + rowA[k][0] +

-                      rowB[j][0] + rowB[k][0]) * 0.25F;

-         dst[i][1] = (rowA[j][1] + rowA[k][1] +

-                      rowB[j][1] + rowB[k][1]) * 0.25F;

-         dst[i][2] = (rowA[j][2] + rowA[k][2] +

-                      rowB[j][2] + rowB[k][2]) * 0.25F;

-         dst[i][3] = (rowA[j][3] + rowA[k][3] +

-                      rowB[j][3] + rowB[k][3]) * 0.25F;

-      }

-   }

-   else if (datatype == GL_FLOAT && comps == 3) {

-      GLuint i, j, k;

-      const GLfloat(*rowA)[3] = (const GLfloat(*)[3]) srcRowA;

-      const GLfloat(*rowB)[3] = (const GLfloat(*)[3]) srcRowB;

-      GLfloat(*dst)[3] = (GLfloat(*)[3]) dstRow;

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         dst[i][0] = (rowA[j][0] + rowA[k][0] +

-                      rowB[j][0] + rowB[k][0]) * 0.25F;

-         dst[i][1] = (rowA[j][1] + rowA[k][1] +

-                      rowB[j][1] + rowB[k][1]) * 0.25F;

-         dst[i][2] = (rowA[j][2] + rowA[k][2] +

-                      rowB[j][2] + rowB[k][2]) * 0.25F;

-      }

-   }

-   else if (datatype == GL_FLOAT && comps == 2) {

-      GLuint i, j, k;

-      const GLfloat(*rowA)[2] = (const GLfloat(*)[2]) srcRowA;

-      const GLfloat(*rowB)[2] = (const GLfloat(*)[2]) srcRowB;

-      GLfloat(*dst)[2] = (GLfloat(*)[2]) dstRow;

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         dst[i][0] = (rowA[j][0] + rowA[k][0] +

-                      rowB[j][0] + rowB[k][0]) * 0.25F;

-         dst[i][1] = (rowA[j][1] + rowA[k][1] +

-                      rowB[j][1] + rowB[k][1]) * 0.25F;

-      }

-   }

-   else if (datatype == GL_FLOAT && comps == 1) {

-      GLuint i, j, k;

-      const GLfloat *rowA = (const GLfloat *) srcRowA;

-      const GLfloat *rowB = (const GLfloat *) srcRowB;

-      GLfloat *dst = (GLfloat *) dstRow;

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) * 0.25F;

-      }

-   }

-

-   else if (datatype == GL_HALF_FLOAT_ARB && comps == 4) {

-      GLuint i, j, k, comp;

-      const GLhalfARB(*rowA)[4] = (const GLhalfARB(*)[4]) srcRowA;

-      const GLhalfARB(*rowB)[4] = (const GLhalfARB(*)[4]) srcRowB;

-      GLhalfARB(*dst)[4] = (GLhalfARB(*)[4]) dstRow;

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         for (comp = 0; comp < 4; comp++) {

-            GLfloat aj, ak, bj, bk;

-            aj = _mesa_half_to_float(rowA[j][comp]);

-            ak = _mesa_half_to_float(rowA[k][comp]);

-            bj = _mesa_half_to_float(rowB[j][comp]);

-            bk = _mesa_half_to_float(rowB[k][comp]);

-            dst[i][comp] = _mesa_float_to_half((aj + ak + bj + bk) * 0.25F);

-         }

-      }

-   }

-   else if (datatype == GL_HALF_FLOAT_ARB && comps == 3) {

-      GLuint i, j, k, comp;

-      const GLhalfARB(*rowA)[3] = (const GLhalfARB(*)[3]) srcRowA;

-      const GLhalfARB(*rowB)[3] = (const GLhalfARB(*)[3]) srcRowB;

-      GLhalfARB(*dst)[3] = (GLhalfARB(*)[3]) dstRow;

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         for (comp = 0; comp < 3; comp++) {

-            GLfloat aj, ak, bj, bk;

-            aj = _mesa_half_to_float(rowA[j][comp]);

-            ak = _mesa_half_to_float(rowA[k][comp]);

-            bj = _mesa_half_to_float(rowB[j][comp]);

-            bk = _mesa_half_to_float(rowB[k][comp]);

-            dst[i][comp] = _mesa_float_to_half((aj + ak + bj + bk) * 0.25F);

-         }

-      }

-   }

-   else if (datatype == GL_HALF_FLOAT_ARB && comps == 2) {

-      GLuint i, j, k, comp;

-      const GLhalfARB(*rowA)[2] = (const GLhalfARB(*)[2]) srcRowA;

-      const GLhalfARB(*rowB)[2] = (const GLhalfARB(*)[2]) srcRowB;

-      GLhalfARB(*dst)[2] = (GLhalfARB(*)[2]) dstRow;

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         for (comp = 0; comp < 2; comp++) {

-            GLfloat aj, ak, bj, bk;

-            aj = _mesa_half_to_float(rowA[j][comp]);

-            ak = _mesa_half_to_float(rowA[k][comp]);

-            bj = _mesa_half_to_float(rowB[j][comp]);

-            bk = _mesa_half_to_float(rowB[k][comp]);

-            dst[i][comp] = _mesa_float_to_half((aj + ak + bj + bk) * 0.25F);

-         }

-      }

-   }

-   else if (datatype == GL_HALF_FLOAT_ARB && comps == 1) {

-      GLuint i, j, k;

-      const GLhalfARB *rowA = (const GLhalfARB *) srcRowA;

-      const GLhalfARB *rowB = (const GLhalfARB *) srcRowB;

-      GLhalfARB *dst = (GLhalfARB *) dstRow;

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         GLfloat aj, ak, bj, bk;

-         aj = _mesa_half_to_float(rowA[j]);

-         ak = _mesa_half_to_float(rowA[k]);

-         bj = _mesa_half_to_float(rowB[j]);

-         bk = _mesa_half_to_float(rowB[k]);

-         dst[i] = _mesa_float_to_half((aj + ak + bj + bk) * 0.25F);

-      }

-   }

-

-   else if (datatype == GL_UNSIGNED_INT && comps == 1) {

-      GLuint i, j, k;

-      const GLuint *rowA = (const GLuint *) srcRowA;

-      const GLuint *rowB = (const GLuint *) srcRowB;

-      GLuint *dst = (GLuint *) dstRow;

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         dst[i] = (GLfloat)(rowA[j] / 4 + rowA[k] / 4 + rowB[j] / 4 + rowB[k] / 4);

-      }

-   }

-

-   else if (datatype == GL_UNSIGNED_SHORT_5_6_5 && comps == 3) {

-      GLuint i, j, k;

-      const GLushort *rowA = (const GLushort *) srcRowA;

-      const GLushort *rowB = (const GLushort *) srcRowB;

-      GLushort *dst = (GLushort *) dstRow;

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         const GLint rowAr0 = rowA[j] & 0x1f;

-         const GLint rowAr1 = rowA[k] & 0x1f;

-         const GLint rowBr0 = rowB[j] & 0x1f;

-         const GLint rowBr1 = rowB[k] & 0x1f;

-         const GLint rowAg0 = (rowA[j] >> 5) & 0x3f;

-         const GLint rowAg1 = (rowA[k] >> 5) & 0x3f;

-         const GLint rowBg0 = (rowB[j] >> 5) & 0x3f;

-         const GLint rowBg1 = (rowB[k] >> 5) & 0x3f;

-         const GLint rowAb0 = (rowA[j] >> 11) & 0x1f;

-         const GLint rowAb1 = (rowA[k] >> 11) & 0x1f;

-         const GLint rowBb0 = (rowB[j] >> 11) & 0x1f;

-         const GLint rowBb1 = (rowB[k] >> 11) & 0x1f;

-         const GLint red = (rowAr0 + rowAr1 + rowBr0 + rowBr1) >> 2;

-         const GLint green = (rowAg0 + rowAg1 + rowBg0 + rowBg1) >> 2;

-         const GLint blue = (rowAb0 + rowAb1 + rowBb0 + rowBb1) >> 2;

-         dst[i] = (blue << 11) | (green << 5) | red;

-      }

-   }

-   else if (datatype == GL_UNSIGNED_SHORT_4_4_4_4 && comps == 4) {

-      GLuint i, j, k;

-      const GLushort *rowA = (const GLushort *) srcRowA;

-      const GLushort *rowB = (const GLushort *) srcRowB;

-      GLushort *dst = (GLushort *) dstRow;

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         const GLint rowAr0 = rowA[j] & 0xf;

-         const GLint rowAr1 = rowA[k] & 0xf;

-         const GLint rowBr0 = rowB[j] & 0xf;

-         const GLint rowBr1 = rowB[k] & 0xf;

-         const GLint rowAg0 = (rowA[j] >> 4) & 0xf;

-         const GLint rowAg1 = (rowA[k] >> 4) & 0xf;

-         const GLint rowBg0 = (rowB[j] >> 4) & 0xf;

-         const GLint rowBg1 = (rowB[k] >> 4) & 0xf;

-         const GLint rowAb0 = (rowA[j] >> 8) & 0xf;

-         const GLint rowAb1 = (rowA[k] >> 8) & 0xf;

-         const GLint rowBb0 = (rowB[j] >> 8) & 0xf;

-         const GLint rowBb1 = (rowB[k] >> 8) & 0xf;

-         const GLint rowAa0 = (rowA[j] >> 12) & 0xf;

-         const GLint rowAa1 = (rowA[k] >> 12) & 0xf;

-         const GLint rowBa0 = (rowB[j] >> 12) & 0xf;

-         const GLint rowBa1 = (rowB[k] >> 12) & 0xf;

-         const GLint red = (rowAr0 + rowAr1 + rowBr0 + rowBr1) >> 2;

-         const GLint green = (rowAg0 + rowAg1 + rowBg0 + rowBg1) >> 2;

-         const GLint blue = (rowAb0 + rowAb1 + rowBb0 + rowBb1) >> 2;

-         const GLint alpha = (rowAa0 + rowAa1 + rowBa0 + rowBa1) >> 2;

-         dst[i] = (alpha << 12) | (blue << 8) | (green << 4) | red;

-      }

-   }

-   else if (datatype == GL_UNSIGNED_SHORT_1_5_5_5_REV && comps == 4) {

-      GLuint i, j, k;

-      const GLushort *rowA = (const GLushort *) srcRowA;

-      const GLushort *rowB = (const GLushort *) srcRowB;

-      GLushort *dst = (GLushort *) dstRow;

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         const GLint rowAr0 = rowA[j] & 0x1f;

-         const GLint rowAr1 = rowA[k] & 0x1f;

-         const GLint rowBr0 = rowB[j] & 0x1f;

-         const GLint rowBr1 = rowB[k] & 0x1f;

-         const GLint rowAg0 = (rowA[j] >> 5) & 0x1f;

-         const GLint rowAg1 = (rowA[k] >> 5) & 0x1f;

-         const GLint rowBg0 = (rowB[j] >> 5) & 0x1f;

-         const GLint rowBg1 = (rowB[k] >> 5) & 0x1f;

-         const GLint rowAb0 = (rowA[j] >> 10) & 0x1f;

-         const GLint rowAb1 = (rowA[k] >> 10) & 0x1f;

-         const GLint rowBb0 = (rowB[j] >> 10) & 0x1f;

-         const GLint rowBb1 = (rowB[k] >> 10) & 0x1f;

-         const GLint rowAa0 = (rowA[j] >> 15) & 0x1;

-         const GLint rowAa1 = (rowA[k] >> 15) & 0x1;

-         const GLint rowBa0 = (rowB[j] >> 15) & 0x1;

-         const GLint rowBa1 = (rowB[k] >> 15) & 0x1;

-         const GLint red = (rowAr0 + rowAr1 + rowBr0 + rowBr1) >> 2;

-         const GLint green = (rowAg0 + rowAg1 + rowBg0 + rowBg1) >> 2;

-         const GLint blue = (rowAb0 + rowAb1 + rowBb0 + rowBb1) >> 2;

-         const GLint alpha = (rowAa0 + rowAa1 + rowBa0 + rowBa1) >> 2;

-         dst[i] = (alpha << 15) | (blue << 10) | (green << 5) | red;

-      }

-   }

-   else if (datatype == GL_UNSIGNED_SHORT_5_5_5_1 && comps == 4) {

-      GLuint i, j, k;

-      const GLushort *rowA = (const GLushort *) srcRowA;

-      const GLushort *rowB = (const GLushort *) srcRowB;

-      GLushort *dst = (GLushort *) dstRow;

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         const GLint rowAr0 = (rowA[j] >> 11) & 0x1f;

-         const GLint rowAr1 = (rowA[k] >> 11) & 0x1f;

-         const GLint rowBr0 = (rowB[j] >> 11) & 0x1f;

-         const GLint rowBr1 = (rowB[k] >> 11) & 0x1f;

-         const GLint rowAg0 = (rowA[j] >> 6) & 0x1f;

-         const GLint rowAg1 = (rowA[k] >> 6) & 0x1f;

-         const GLint rowBg0 = (rowB[j] >> 6) & 0x1f;

-         const GLint rowBg1 = (rowB[k] >> 6) & 0x1f;

-         const GLint rowAb0 = (rowA[j] >> 1) & 0x1f;

-         const GLint rowAb1 = (rowA[k] >> 1) & 0x1f;

-         const GLint rowBb0 = (rowB[j] >> 1) & 0x1f;

-         const GLint rowBb1 = (rowB[k] >> 1) & 0x1f;

-         const GLint rowAa0 = (rowA[j] & 0x1);

-         const GLint rowAa1 = (rowA[k] & 0x1);

-         const GLint rowBa0 = (rowB[j] & 0x1);

-         const GLint rowBa1 = (rowB[k] & 0x1);

-         const GLint red = (rowAr0 + rowAr1 + rowBr0 + rowBr1) >> 2;

-         const GLint green = (rowAg0 + rowAg1 + rowBg0 + rowBg1) >> 2;

-         const GLint blue = (rowAb0 + rowAb1 + rowBb0 + rowBb1) >> 2;

-         const GLint alpha = (rowAa0 + rowAa1 + rowBa0 + rowBa1) >> 2;

-         dst[i] = (red << 11) | (green << 6) | (blue << 1) | alpha;

-      }

-   }

-

-   else if (datatype == GL_UNSIGNED_BYTE_3_3_2 && comps == 3) {

-      GLuint i, j, k;

-      const GLubyte *rowA = (const GLubyte *) srcRowA;

-      const GLubyte *rowB = (const GLubyte *) srcRowB;

-      GLubyte *dst = (GLubyte *) dstRow;

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         const GLint rowAr0 = rowA[j] & 0x3;

-         const GLint rowAr1 = rowA[k] & 0x3;

-         const GLint rowBr0 = rowB[j] & 0x3;

-         const GLint rowBr1 = rowB[k] & 0x3;

-         const GLint rowAg0 = (rowA[j] >> 2) & 0x7;

-         const GLint rowAg1 = (rowA[k] >> 2) & 0x7;

-         const GLint rowBg0 = (rowB[j] >> 2) & 0x7;

-         const GLint rowBg1 = (rowB[k] >> 2) & 0x7;

-         const GLint rowAb0 = (rowA[j] >> 5) & 0x7;

-         const GLint rowAb1 = (rowA[k] >> 5) & 0x7;

-         const GLint rowBb0 = (rowB[j] >> 5) & 0x7;

-         const GLint rowBb1 = (rowB[k] >> 5) & 0x7;

-         const GLint red = (rowAr0 + rowAr1 + rowBr0 + rowBr1) >> 2;

-         const GLint green = (rowAg0 + rowAg1 + rowBg0 + rowBg1) >> 2;

-         const GLint blue = (rowAb0 + rowAb1 + rowBb0 + rowBb1) >> 2;

-         dst[i] = (blue << 5) | (green << 2) | red;

-      }

-   }

-

-   else if (datatype == MESA_UNSIGNED_BYTE_4_4 && comps == 2) {

-      GLuint i, j, k;

-      const GLubyte *rowA = (const GLubyte *) srcRowA;

-      const GLubyte *rowB = (const GLubyte *) srcRowB;

-      GLubyte *dst = (GLubyte *) dstRow;

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         const GLint rowAr0 = rowA[j] & 0xf;

-         const GLint rowAr1 = rowA[k] & 0xf;

-         const GLint rowBr0 = rowB[j] & 0xf;

-         const GLint rowBr1 = rowB[k] & 0xf;

-         const GLint rowAg0 = (rowA[j] >> 4) & 0xf;

-         const GLint rowAg1 = (rowA[k] >> 4) & 0xf;

-         const GLint rowBg0 = (rowB[j] >> 4) & 0xf;

-         const GLint rowBg1 = (rowB[k] >> 4) & 0xf;

-         const GLint r = (rowAr0 + rowAr1 + rowBr0 + rowBr1) >> 2;

-         const GLint g = (rowAg0 + rowAg1 + rowBg0 + rowBg1) >> 2;

-         dst[i] = (g << 4) | r;

-      }

-   }

-

-   else {

-      _mesa_problem(NULL, "bad format in do_row()");

-   }

-}

-

-

-/**

- * Average together four rows of a source image to produce a single new

- * row in the dest image.  It's legal for the two source rows to point

- * to the same data.  The source width must be equal to either the

- * dest width or two times the dest width.

- *

- * \param datatype  GL pixel type \c GL_UNSIGNED_BYTE, \c GL_UNSIGNED_SHORT,

- *                  \c GL_FLOAT, etc.

- * \param comps     number of components per pixel (1..4)

- * \param srcWidth  Width of a row in the source data

- * \param srcRowA   Pointer to one of the rows of source data

- * \param srcRowB   Pointer to one of the rows of source data

- * \param srcRowC   Pointer to one of the rows of source data

- * \param srcRowD   Pointer to one of the rows of source data

- * \param dstWidth  Width of a row in the destination data

- * \param srcRowA   Pointer to the row of destination data

- */

-static void

-do_row_3D(GLenum datatype, GLuint comps, GLint srcWidth,

-          const GLvoid *srcRowA, const GLvoid *srcRowB,

-          const GLvoid *srcRowC, const GLvoid *srcRowD,

-          GLint dstWidth, GLvoid *dstRow)

-{

-   const GLuint k0 = (srcWidth == dstWidth) ? 0 : 1;

-   const GLuint colStride = (srcWidth == dstWidth) ? 1 : 2;

-   GLuint i, j, k;

-

-   ASSERT(comps >= 1);

-   ASSERT(comps <= 4);

-

-   if ((datatype == GL_UNSIGNED_BYTE) && (comps == 4)) {

-      DECLARE_ROW_POINTERS(GLubyte, 4);

-

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         FILTER_3D(0);

-         FILTER_3D(1);

-         FILTER_3D(2);

-         FILTER_3D(3);

-      }

-   }

-   else if ((datatype == GL_UNSIGNED_BYTE) && (comps == 3)) {

-      DECLARE_ROW_POINTERS(GLubyte, 3);

-

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         FILTER_3D(0);

-         FILTER_3D(1);

-         FILTER_3D(2);

-      }

-   }

-   else if ((datatype == GL_UNSIGNED_BYTE) && (comps == 2)) {

-      DECLARE_ROW_POINTERS(GLubyte, 2);

-

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         FILTER_3D(0);

-         FILTER_3D(1);

-      }

-   }

-   else if ((datatype == GL_UNSIGNED_BYTE) && (comps == 1)) {

-      DECLARE_ROW_POINTERS(GLubyte, 1);

-

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         FILTER_3D(0);

-      }

-   }

-   else if ((datatype == GL_BYTE) && (comps == 4)) {

-      DECLARE_ROW_POINTERS(GLbyte, 4);

-

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         FILTER_3D_SIGNED(0);

-         FILTER_3D_SIGNED(1);

-         FILTER_3D_SIGNED(2);

-         FILTER_3D_SIGNED(3);

-      }

-   }

-   else if ((datatype == GL_BYTE) && (comps == 3)) {

-      DECLARE_ROW_POINTERS(GLbyte, 3);

-

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         FILTER_3D_SIGNED(0);

-         FILTER_3D_SIGNED(1);

-         FILTER_3D_SIGNED(2);

-      }

-   }

-   else if ((datatype == GL_BYTE) && (comps == 2)) {

-      DECLARE_ROW_POINTERS(GLbyte, 2);

-

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         FILTER_3D_SIGNED(0);

-         FILTER_3D_SIGNED(1);

-       }

-   }

-   else if ((datatype == GL_BYTE) && (comps == 1)) {

-      DECLARE_ROW_POINTERS(GLbyte, 1);

-

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         FILTER_3D_SIGNED(0);

-      }

-   }

-   else if ((datatype == GL_UNSIGNED_SHORT) && (comps == 4)) {

-      DECLARE_ROW_POINTERS(GLushort, 4);

-

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         FILTER_3D(0);

-         FILTER_3D(1);

-         FILTER_3D(2);

-         FILTER_3D(3);

-      }

-   }

-   else if ((datatype == GL_UNSIGNED_SHORT) && (comps == 3)) {

-      DECLARE_ROW_POINTERS(GLushort, 3);

-

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         FILTER_3D(0);

-         FILTER_3D(1);

-         FILTER_3D(2);

-      }

-   }

-   else if ((datatype == GL_UNSIGNED_SHORT) && (comps == 2)) {

-      DECLARE_ROW_POINTERS(GLushort, 2);

-

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         FILTER_3D(0);

-         FILTER_3D(1);

-      }

-   }

-   else if ((datatype == GL_UNSIGNED_SHORT) && (comps == 1)) {

-      DECLARE_ROW_POINTERS(GLushort, 1);

-

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         FILTER_3D(0);

-      }

-   }

-   else if ((datatype == GL_SHORT) && (comps == 4)) {

-      DECLARE_ROW_POINTERS(GLshort, 4);

-

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         FILTER_3D(0);

-         FILTER_3D(1);

-         FILTER_3D(2);

-         FILTER_3D(3);

-      }

-   }

-   else if ((datatype == GL_SHORT) && (comps == 3)) {

-      DECLARE_ROW_POINTERS(GLshort, 3);

-

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         FILTER_3D(0);

-         FILTER_3D(1);

-         FILTER_3D(2);

-      }

-   }

-   else if ((datatype == GL_SHORT) && (comps == 2)) {

-      DECLARE_ROW_POINTERS(GLshort, 2);

-

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         FILTER_3D(0);

-         FILTER_3D(1);

-      }

-   }

-   else if ((datatype == GL_SHORT) && (comps == 1)) {

-      DECLARE_ROW_POINTERS(GLshort, 1);

-

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         FILTER_3D(0);

-      }

-   }

-   else if ((datatype == GL_FLOAT) && (comps == 4)) {

-      DECLARE_ROW_POINTERS(GLfloat, 4);

-

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         FILTER_F_3D(0);

-         FILTER_F_3D(1);

-         FILTER_F_3D(2);

-         FILTER_F_3D(3);

-      }

-   }

-   else if ((datatype == GL_FLOAT) && (comps == 3)) {

-      DECLARE_ROW_POINTERS(GLfloat, 3);

-

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         FILTER_F_3D(0);

-         FILTER_F_3D(1);

-         FILTER_F_3D(2);

-      }

-   }

-   else if ((datatype == GL_FLOAT) && (comps == 2)) {

-      DECLARE_ROW_POINTERS(GLfloat, 2);

-

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         FILTER_F_3D(0);

-         FILTER_F_3D(1);

-      }

-   }

-   else if ((datatype == GL_FLOAT) && (comps == 1)) {

-      DECLARE_ROW_POINTERS(GLfloat, 1);

-

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         FILTER_F_3D(0);

-      }

-   }

-   else if ((datatype == GL_HALF_FLOAT_ARB) && (comps == 4)) {

-      DECLARE_ROW_POINTERS(GLhalfARB, 4);

-

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         FILTER_HF_3D(0);

-         FILTER_HF_3D(1);

-         FILTER_HF_3D(2);

-         FILTER_HF_3D(3);

-      }

-   }

-   else if ((datatype == GL_HALF_FLOAT_ARB) && (comps == 3)) {

-      DECLARE_ROW_POINTERS(GLhalfARB, 4);

-

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         FILTER_HF_3D(0);

-         FILTER_HF_3D(1);

-         FILTER_HF_3D(2);

-      }

-   }

-   else if ((datatype == GL_HALF_FLOAT_ARB) && (comps == 2)) {

-      DECLARE_ROW_POINTERS(GLhalfARB, 4);

-

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         FILTER_HF_3D(0);

-         FILTER_HF_3D(1);

-      }

-   }

-   else if ((datatype == GL_HALF_FLOAT_ARB) && (comps == 1)) {

-      DECLARE_ROW_POINTERS(GLhalfARB, 4);

-

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         FILTER_HF_3D(0);

-      }

-   }

-   else if ((datatype == GL_UNSIGNED_INT) && (comps == 1)) {

-      const GLuint *rowA = (const GLuint *) srcRowA;

-      const GLuint *rowB = (const GLuint *) srcRowB;

-      const GLuint *rowC = (const GLuint *) srcRowC;

-      const GLuint *rowD = (const GLuint *) srcRowD;

-      GLfloat *dst = (GLfloat *) dstRow;

-

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         const uint64_t tmp = (((uint64_t) rowA[j] + (uint64_t) rowA[k])

-                               + ((uint64_t) rowB[j] + (uint64_t) rowB[k])

-                               + ((uint64_t) rowC[j] + (uint64_t) rowC[k])

-                               + ((uint64_t) rowD[j] + (uint64_t) rowD[k]));

-         dst[i] = (GLfloat)((double) tmp * 0.125);

-      }

-   }

-   else if ((datatype == GL_UNSIGNED_SHORT_5_6_5) && (comps == 3)) {

-      DECLARE_ROW_POINTERS0(GLushort);

-

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         const GLint rowAr0 = rowA[j] & 0x1f;

-         const GLint rowAr1 = rowA[k] & 0x1f;

-         const GLint rowBr0 = rowB[j] & 0x1f;

-         const GLint rowBr1 = rowB[k] & 0x1f;

-         const GLint rowCr0 = rowC[j] & 0x1f;

-         const GLint rowCr1 = rowC[k] & 0x1f;

-         const GLint rowDr0 = rowD[j] & 0x1f;

-         const GLint rowDr1 = rowD[k] & 0x1f;

-         const GLint rowAg0 = (rowA[j] >> 5) & 0x3f;

-         const GLint rowAg1 = (rowA[k] >> 5) & 0x3f;

-         const GLint rowBg0 = (rowB[j] >> 5) & 0x3f;

-         const GLint rowBg1 = (rowB[k] >> 5) & 0x3f;

-         const GLint rowCg0 = (rowC[j] >> 5) & 0x3f;

-         const GLint rowCg1 = (rowC[k] >> 5) & 0x3f;

-         const GLint rowDg0 = (rowD[j] >> 5) & 0x3f;

-         const GLint rowDg1 = (rowD[k] >> 5) & 0x3f;

-         const GLint rowAb0 = (rowA[j] >> 11) & 0x1f;

-         const GLint rowAb1 = (rowA[k] >> 11) & 0x1f;

-         const GLint rowBb0 = (rowB[j] >> 11) & 0x1f;

-         const GLint rowBb1 = (rowB[k] >> 11) & 0x1f;

-         const GLint rowCb0 = (rowC[j] >> 11) & 0x1f;

-         const GLint rowCb1 = (rowC[k] >> 11) & 0x1f;

-         const GLint rowDb0 = (rowD[j] >> 11) & 0x1f;

-         const GLint rowDb1 = (rowD[k] >> 11) & 0x1f;

-         const GLint r = FILTER_SUM_3D(rowAr0, rowAr1, rowBr0, rowBr1,

-                                       rowCr0, rowCr1, rowDr0, rowDr1);

-         const GLint g = FILTER_SUM_3D(rowAg0, rowAg1, rowBg0, rowBg1,

-                                       rowCg0, rowCg1, rowDg0, rowDg1);

-         const GLint b = FILTER_SUM_3D(rowAb0, rowAb1, rowBb0, rowBb1,

-                                       rowCb0, rowCb1, rowDb0, rowDb1);

-         dst[i] = (b << 11) | (g << 5) | r;

-      }

-   }

-   else if ((datatype == GL_UNSIGNED_SHORT_4_4_4_4) && (comps == 4)) {

-      DECLARE_ROW_POINTERS0(GLushort);

-

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         const GLint rowAr0 = rowA[j] & 0xf;

-         const GLint rowAr1 = rowA[k] & 0xf;

-         const GLint rowBr0 = rowB[j] & 0xf;

-         const GLint rowBr1 = rowB[k] & 0xf;

-         const GLint rowCr0 = rowC[j] & 0xf;

-         const GLint rowCr1 = rowC[k] & 0xf;

-         const GLint rowDr0 = rowD[j] & 0xf;

-         const GLint rowDr1 = rowD[k] & 0xf;

-         const GLint rowAg0 = (rowA[j] >> 4) & 0xf;

-         const GLint rowAg1 = (rowA[k] >> 4) & 0xf;

-         const GLint rowBg0 = (rowB[j] >> 4) & 0xf;

-         const GLint rowBg1 = (rowB[k] >> 4) & 0xf;

-         const GLint rowCg0 = (rowC[j] >> 4) & 0xf;

-         const GLint rowCg1 = (rowC[k] >> 4) & 0xf;

-         const GLint rowDg0 = (rowD[j] >> 4) & 0xf;

-         const GLint rowDg1 = (rowD[k] >> 4) & 0xf;

-         const GLint rowAb0 = (rowA[j] >> 8) & 0xf;

-         const GLint rowAb1 = (rowA[k] >> 8) & 0xf;

-         const GLint rowBb0 = (rowB[j] >> 8) & 0xf;

-         const GLint rowBb1 = (rowB[k] >> 8) & 0xf;

-         const GLint rowCb0 = (rowC[j] >> 8) & 0xf;

-         const GLint rowCb1 = (rowC[k] >> 8) & 0xf;

-         const GLint rowDb0 = (rowD[j] >> 8) & 0xf;

-         const GLint rowDb1 = (rowD[k] >> 8) & 0xf;

-         const GLint rowAa0 = (rowA[j] >> 12) & 0xf;

-         const GLint rowAa1 = (rowA[k] >> 12) & 0xf;

-         const GLint rowBa0 = (rowB[j] >> 12) & 0xf;

-         const GLint rowBa1 = (rowB[k] >> 12) & 0xf;

-         const GLint rowCa0 = (rowC[j] >> 12) & 0xf;

-         const GLint rowCa1 = (rowC[k] >> 12) & 0xf;

-         const GLint rowDa0 = (rowD[j] >> 12) & 0xf;

-         const GLint rowDa1 = (rowD[k] >> 12) & 0xf;

-         const GLint r = FILTER_SUM_3D(rowAr0, rowAr1, rowBr0, rowBr1,

-                                       rowCr0, rowCr1, rowDr0, rowDr1);

-         const GLint g = FILTER_SUM_3D(rowAg0, rowAg1, rowBg0, rowBg1,

-                                       rowCg0, rowCg1, rowDg0, rowDg1);

-         const GLint b = FILTER_SUM_3D(rowAb0, rowAb1, rowBb0, rowBb1,

-                                       rowCb0, rowCb1, rowDb0, rowDb1);

-         const GLint a = FILTER_SUM_3D(rowAa0, rowAa1, rowBa0, rowBa1,

-                                       rowCa0, rowCa1, rowDa0, rowDa1);

-

-         dst[i] = (a << 12) | (b << 8) | (g << 4) | r;

-      }

-   }

-   else if ((datatype == GL_UNSIGNED_SHORT_1_5_5_5_REV) && (comps == 4)) {

-      DECLARE_ROW_POINTERS0(GLushort);

-

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         const GLint rowAr0 = rowA[j] & 0x1f;

-         const GLint rowAr1 = rowA[k] & 0x1f;

-         const GLint rowBr0 = rowB[j] & 0x1f;

-         const GLint rowBr1 = rowB[k] & 0x1f;

-         const GLint rowCr0 = rowC[j] & 0x1f;

-         const GLint rowCr1 = rowC[k] & 0x1f;

-         const GLint rowDr0 = rowD[j] & 0x1f;

-         const GLint rowDr1 = rowD[k] & 0x1f;

-         const GLint rowAg0 = (rowA[j] >> 5) & 0x1f;

-         const GLint rowAg1 = (rowA[k] >> 5) & 0x1f;

-         const GLint rowBg0 = (rowB[j] >> 5) & 0x1f;

-         const GLint rowBg1 = (rowB[k] >> 5) & 0x1f;

-         const GLint rowCg0 = (rowC[j] >> 5) & 0x1f;

-         const GLint rowCg1 = (rowC[k] >> 5) & 0x1f;

-         const GLint rowDg0 = (rowD[j] >> 5) & 0x1f;

-         const GLint rowDg1 = (rowD[k] >> 5) & 0x1f;

-         const GLint rowAb0 = (rowA[j] >> 10) & 0x1f;

-         const GLint rowAb1 = (rowA[k] >> 10) & 0x1f;

-         const GLint rowBb0 = (rowB[j] >> 10) & 0x1f;

-         const GLint rowBb1 = (rowB[k] >> 10) & 0x1f;

-         const GLint rowCb0 = (rowC[j] >> 10) & 0x1f;

-         const GLint rowCb1 = (rowC[k] >> 10) & 0x1f;

-         const GLint rowDb0 = (rowD[j] >> 10) & 0x1f;

-         const GLint rowDb1 = (rowD[k] >> 10) & 0x1f;

-         const GLint rowAa0 = (rowA[j] >> 15) & 0x1;

-         const GLint rowAa1 = (rowA[k] >> 15) & 0x1;

-         const GLint rowBa0 = (rowB[j] >> 15) & 0x1;

-         const GLint rowBa1 = (rowB[k] >> 15) & 0x1;

-         const GLint rowCa0 = (rowC[j] >> 15) & 0x1;

-         const GLint rowCa1 = (rowC[k] >> 15) & 0x1;

-         const GLint rowDa0 = (rowD[j] >> 15) & 0x1;

-         const GLint rowDa1 = (rowD[k] >> 15) & 0x1;

-         const GLint r = FILTER_SUM_3D(rowAr0, rowAr1, rowBr0, rowBr1,

-                                       rowCr0, rowCr1, rowDr0, rowDr1);

-         const GLint g = FILTER_SUM_3D(rowAg0, rowAg1, rowBg0, rowBg1,

-                                       rowCg0, rowCg1, rowDg0, rowDg1);

-         const GLint b = FILTER_SUM_3D(rowAb0, rowAb1, rowBb0, rowBb1,

-                                       rowCb0, rowCb1, rowDb0, rowDb1);

-         const GLint a = FILTER_SUM_3D(rowAa0, rowAa1, rowBa0, rowBa1,

-                                       rowCa0, rowCa1, rowDa0, rowDa1);

-

-         dst[i] = (a << 15) | (b << 10) | (g << 5) | r;

-      }

-   }

-   else if ((datatype == GL_UNSIGNED_SHORT_5_5_5_1) && (comps == 4)) {

-      DECLARE_ROW_POINTERS0(GLushort);

-

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         const GLint rowAr0 = (rowA[j] >> 11) & 0x1f;

-         const GLint rowAr1 = (rowA[k] >> 11) & 0x1f;

-         const GLint rowBr0 = (rowB[j] >> 11) & 0x1f;

-         const GLint rowBr1 = (rowB[k] >> 11) & 0x1f;

-         const GLint rowCr0 = (rowC[j] >> 11) & 0x1f;

-         const GLint rowCr1 = (rowC[k] >> 11) & 0x1f;

-         const GLint rowDr0 = (rowD[j] >> 11) & 0x1f;

-         const GLint rowDr1 = (rowD[k] >> 11) & 0x1f;

-         const GLint rowAg0 = (rowA[j] >> 6) & 0x1f;

-         const GLint rowAg1 = (rowA[k] >> 6) & 0x1f;

-         const GLint rowBg0 = (rowB[j] >> 6) & 0x1f;

-         const GLint rowBg1 = (rowB[k] >> 6) & 0x1f;

-         const GLint rowCg0 = (rowC[j] >> 6) & 0x1f;

-         const GLint rowCg1 = (rowC[k] >> 6) & 0x1f;

-         const GLint rowDg0 = (rowD[j] >> 6) & 0x1f;

-         const GLint rowDg1 = (rowD[k] >> 6) & 0x1f;

-         const GLint rowAb0 = (rowA[j] >> 1) & 0x1f;

-         const GLint rowAb1 = (rowA[k] >> 1) & 0x1f;

-         const GLint rowBb0 = (rowB[j] >> 1) & 0x1f;

-         const GLint rowBb1 = (rowB[k] >> 1) & 0x1f;

-         const GLint rowCb0 = (rowC[j] >> 1) & 0x1f;

-         const GLint rowCb1 = (rowC[k] >> 1) & 0x1f;

-         const GLint rowDb0 = (rowD[j] >> 1) & 0x1f;

-         const GLint rowDb1 = (rowD[k] >> 1) & 0x1f;

-         const GLint rowAa0 = (rowA[j] & 0x1);

-         const GLint rowAa1 = (rowA[k] & 0x1);

-         const GLint rowBa0 = (rowB[j] & 0x1);

-         const GLint rowBa1 = (rowB[k] & 0x1);

-         const GLint rowCa0 = (rowC[j] & 0x1);

-         const GLint rowCa1 = (rowC[k] & 0x1);

-         const GLint rowDa0 = (rowD[j] & 0x1);

-         const GLint rowDa1 = (rowD[k] & 0x1);

-         const GLint r = FILTER_SUM_3D(rowAr0, rowAr1, rowBr0, rowBr1,

-                                       rowCr0, rowCr1, rowDr0, rowDr1);

-         const GLint g = FILTER_SUM_3D(rowAg0, rowAg1, rowBg0, rowBg1,

-                                       rowCg0, rowCg1, rowDg0, rowDg1);

-         const GLint b = FILTER_SUM_3D(rowAb0, rowAb1, rowBb0, rowBb1,

-                                       rowCb0, rowCb1, rowDb0, rowDb1);

-         const GLint a = FILTER_SUM_3D(rowAa0, rowAa1, rowBa0, rowBa1,

-                                       rowCa0, rowCa1, rowDa0, rowDa1);

-

-         dst[i] = (r << 11) | (g << 6) | (b << 1) | a;

-      }

-   }

-   else if ((datatype == GL_UNSIGNED_BYTE_3_3_2) && (comps == 3)) {

-      DECLARE_ROW_POINTERS0(GLubyte);

-

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         const GLint rowAr0 = rowA[j] & 0x3;

-         const GLint rowAr1 = rowA[k] & 0x3;

-         const GLint rowBr0 = rowB[j] & 0x3;

-         const GLint rowBr1 = rowB[k] & 0x3;

-         const GLint rowCr0 = rowC[j] & 0x3;

-         const GLint rowCr1 = rowC[k] & 0x3;

-         const GLint rowDr0 = rowD[j] & 0x3;

-         const GLint rowDr1 = rowD[k] & 0x3;

-         const GLint rowAg0 = (rowA[j] >> 2) & 0x7;

-         const GLint rowAg1 = (rowA[k] >> 2) & 0x7;

-         const GLint rowBg0 = (rowB[j] >> 2) & 0x7;

-         const GLint rowBg1 = (rowB[k] >> 2) & 0x7;

-         const GLint rowCg0 = (rowC[j] >> 2) & 0x7;

-         const GLint rowCg1 = (rowC[k] >> 2) & 0x7;

-         const GLint rowDg0 = (rowD[j] >> 2) & 0x7;

-         const GLint rowDg1 = (rowD[k] >> 2) & 0x7;

-         const GLint rowAb0 = (rowA[j] >> 5) & 0x7;

-         const GLint rowAb1 = (rowA[k] >> 5) & 0x7;

-         const GLint rowBb0 = (rowB[j] >> 5) & 0x7;

-         const GLint rowBb1 = (rowB[k] >> 5) & 0x7;

-         const GLint rowCb0 = (rowC[j] >> 5) & 0x7;

-         const GLint rowCb1 = (rowC[k] >> 5) & 0x7;

-         const GLint rowDb0 = (rowD[j] >> 5) & 0x7;

-         const GLint rowDb1 = (rowD[k] >> 5) & 0x7;

-         const GLint r = FILTER_SUM_3D(rowAr0, rowAr1, rowBr0, rowBr1,

-                                       rowCr0, rowCr1, rowDr0, rowDr1);

-         const GLint g = FILTER_SUM_3D(rowAg0, rowAg1, rowBg0, rowBg1,

-                                       rowCg0, rowCg1, rowDg0, rowDg1);

-         const GLint b = FILTER_SUM_3D(rowAb0, rowAb1, rowBb0, rowBb1,

-                                       rowCb0, rowCb1, rowDb0, rowDb1);

-         dst[i] = (b << 5) | (g << 2) | r;

-      }

-   }

-   else if (datatype == MESA_UNSIGNED_BYTE_4_4 && comps == 2) {

-      DECLARE_ROW_POINTERS0(GLubyte);

-

-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

-           i++, j += colStride, k += colStride) {

-         const GLint rowAr0 = rowA[j] & 0xf;

-         const GLint rowAr1 = rowA[k] & 0xf;

-         const GLint rowBr0 = rowB[j] & 0xf;

-         const GLint rowBr1 = rowB[k] & 0xf;

-         const GLint rowCr0 = rowC[j] & 0xf;

-         const GLint rowCr1 = rowC[k] & 0xf;

-         const GLint rowDr0 = rowD[j] & 0xf;

-         const GLint rowDr1 = rowD[k] & 0xf;

-         const GLint rowAg0 = (rowA[j] >> 4) & 0xf;

-         const GLint rowAg1 = (rowA[k] >> 4) & 0xf;

-         const GLint rowBg0 = (rowB[j] >> 4) & 0xf;

-         const GLint rowBg1 = (rowB[k] >> 4) & 0xf;

-         const GLint rowCg0 = (rowC[j] >> 4) & 0xf;

-         const GLint rowCg1 = (rowC[k] >> 4) & 0xf;

-         const GLint rowDg0 = (rowD[j] >> 4) & 0xf;

-         const GLint rowDg1 = (rowD[k] >> 4) & 0xf;

-         const GLint r = FILTER_SUM_3D(rowAr0, rowAr1, rowBr0, rowBr1,

-                                       rowCr0, rowCr1, rowDr0, rowDr1);

-         const GLint g = FILTER_SUM_3D(rowAg0, rowAg1, rowBg0, rowBg1,

-                                       rowCg0, rowCg1, rowDg0, rowDg1);

-         dst[i] = (g << 4) | r;

-      }

-   }

-   else {

-      _mesa_problem(NULL, "bad format in do_row()");

-   }

-}

-

-

-/*

- * These functions generate a 1/2-size mipmap image from a source image.

- * Texture borders are handled by copying or averaging the source image's

- * border texels, depending on the scale-down factor.

- */

-

-static void

-make_1d_mipmap(GLenum datatype, GLuint comps, GLint border,

-               GLint srcWidth, const GLubyte *srcPtr,

-               GLint dstWidth, GLubyte *dstPtr)

-{

-   const GLint bpt = bytes_per_pixel(datatype, comps);

-   const GLubyte *src;

-   GLubyte *dst;

-

-   /* skip the border pixel, if any */

-   src = srcPtr + border * bpt;

-   dst = dstPtr + border * bpt;

-

-   /* we just duplicate the input row, kind of hack, saves code */

-   do_row(datatype, comps, srcWidth - 2 * border, src, src,

-          dstWidth - 2 * border, dst);

-

-   if (border) {

-      /* copy left-most pixel from source */

-      assert(dstPtr);

-      assert(srcPtr);

-      memcpy(dstPtr, srcPtr, bpt);

-      /* copy right-most pixel from source */

-      memcpy(dstPtr + (dstWidth - 1) * bpt,

-             srcPtr + (srcWidth - 1) * bpt,

-             bpt);

-   }

-}

-

-

-static void

-make_2d_mipmap(GLenum datatype, GLuint comps, GLint border,

-               GLint srcWidth, GLint srcHeight,

-	       const GLubyte *srcPtr, GLint srcRowStride,

-               GLint dstWidth, GLint dstHeight,

-	       GLubyte *dstPtr, GLint dstRowStride)

-{

-   const GLint bpt = bytes_per_pixel(datatype, comps);

-   const GLint srcWidthNB = srcWidth - 2 * border;  /* sizes w/out border */

-   const GLint dstWidthNB = dstWidth - 2 * border;

-   const GLint dstHeightNB = dstHeight - 2 * border;

-   const GLint srcRowBytes = bpt * srcRowStride;

-   const GLint dstRowBytes = bpt * dstRowStride;

-   const GLubyte *srcA, *srcB;

-   GLubyte *dst;

-   GLint row, srcRowStep;

-

-   /* Compute src and dst pointers, skipping any border */

-   srcA = srcPtr + border * ((srcWidth + 1) * bpt);

-   if (srcHeight > 1 && srcHeight > dstHeight) {

-      /* sample from two source rows */

-      srcB = srcA + srcRowBytes;

-      srcRowStep = 2;

-   }

-   else {

-      /* sample from one source row */

-      srcB = srcA;

-      srcRowStep = 1;

-   }

-

-   dst = dstPtr + border * ((dstWidth + 1) * bpt);

-

-   for (row = 0; row < dstHeightNB; row++) {

-      do_row(datatype, comps, srcWidthNB, srcA, srcB,

-             dstWidthNB, dst);

-      srcA += srcRowStep * srcRowBytes;

-      srcB += srcRowStep * srcRowBytes;

-      dst += dstRowBytes;

-   }

-

-   /* This is ugly but probably won't be used much */

-   if (border > 0) {

-      /* fill in dest border */

-      /* lower-left border pixel */

-      assert(dstPtr);

-      assert(srcPtr);

-      memcpy(dstPtr, srcPtr, bpt);

-      /* lower-right border pixel */

-      memcpy(dstPtr + (dstWidth - 1) * bpt,

-             srcPtr + (srcWidth - 1) * bpt, bpt);

-      /* upper-left border pixel */

-      memcpy(dstPtr + dstWidth * (dstHeight - 1) * bpt,

-             srcPtr + srcWidth * (srcHeight - 1) * bpt, bpt);

-      /* upper-right border pixel */

-      memcpy(dstPtr + (dstWidth * dstHeight - 1) * bpt,

-             srcPtr + (srcWidth * srcHeight - 1) * bpt, bpt);

-      /* lower border */

-      do_row(datatype, comps, srcWidthNB,

-             srcPtr + bpt,

-             srcPtr + bpt,

-             dstWidthNB, dstPtr + bpt);

-      /* upper border */

-      do_row(datatype, comps, srcWidthNB,

-             srcPtr + (srcWidth * (srcHeight - 1) + 1) * bpt,

-             srcPtr + (srcWidth * (srcHeight - 1) + 1) * bpt,

-             dstWidthNB,

-             dstPtr + (dstWidth * (dstHeight - 1) + 1) * bpt);

-      /* left and right borders */

-      if (srcHeight == dstHeight) {

-         /* copy border pixel from src to dst */

-         for (row = 1; row < srcHeight; row++) {

-            memcpy(dstPtr + dstWidth * row * bpt,

-                   srcPtr + srcWidth * row * bpt, bpt);

-            memcpy(dstPtr + (dstWidth * row + dstWidth - 1) * bpt,

-                   srcPtr + (srcWidth * row + srcWidth - 1) * bpt, bpt);

-         }

-      }

-      else {

-         /* average two src pixels each dest pixel */

-         for (row = 0; row < dstHeightNB; row += 2) {

-            do_row(datatype, comps, 1,

-                   srcPtr + (srcWidth * (row * 2 + 1)) * bpt,

-                   srcPtr + (srcWidth * (row * 2 + 2)) * bpt,

-                   1, dstPtr + (dstWidth * row + 1) * bpt);

-            do_row(datatype, comps, 1,

-                   srcPtr + (srcWidth * (row * 2 + 1) + srcWidth - 1) * bpt,

-                   srcPtr + (srcWidth * (row * 2 + 2) + srcWidth - 1) * bpt,

-                   1, dstPtr + (dstWidth * row + 1 + dstWidth - 1) * bpt);

-         }

-      }

-   }

-}

-

-

-static void

-make_3d_mipmap(GLenum datatype, GLuint comps, GLint border,

-               GLint srcWidth, GLint srcHeight, GLint srcDepth,

-               const GLubyte *srcPtr, GLint srcRowStride,

-               GLint dstWidth, GLint dstHeight, GLint dstDepth,

-               GLubyte *dstPtr, GLint dstRowStride)

-{

-   const GLint bpt = bytes_per_pixel(datatype, comps);

-   const GLint srcWidthNB = srcWidth - 2 * border;  /* sizes w/out border */

-   const GLint srcDepthNB = srcDepth - 2 * border;

-   const GLint dstWidthNB = dstWidth - 2 * border;

-   const GLint dstHeightNB = dstHeight - 2 * border;

-   const GLint dstDepthNB = dstDepth - 2 * border;

-   GLint img, row;

-   GLint bytesPerSrcImage, bytesPerDstImage;

-   GLint bytesPerSrcRow, bytesPerDstRow;

-   GLint srcImageOffset, srcRowOffset;

-

-   (void) srcDepthNB; /* silence warnings */

-

-

-   bytesPerSrcImage = srcWidth * srcHeight * bpt;

-   bytesPerDstImage = dstWidth * dstHeight * bpt;

-

-   bytesPerSrcRow = srcWidth * bpt;

-   bytesPerDstRow = dstWidth * bpt;

-

-   /* Offset between adjacent src images to be averaged together */

-   srcImageOffset = (srcDepth == dstDepth) ? 0 : bytesPerSrcImage;

-

-   /* Offset between adjacent src rows to be averaged together */

-   srcRowOffset = (srcHeight == dstHeight) ? 0 : srcWidth * bpt;

-

-   /*

-    * Need to average together up to 8 src pixels for each dest pixel.

-    * Break that down into 3 operations:

-    *   1. take two rows from source image and average them together.

-    *   2. take two rows from next source image and average them together.

-    *   3. take the two averaged rows and average them for the final dst row.

-    */

-

-   /*

-   printf("mip3d %d x %d x %d  ->  %d x %d x %d\n",

-          srcWidth, srcHeight, srcDepth, dstWidth, dstHeight, dstDepth);

-   */

-

-   for (img = 0; img < dstDepthNB; img++) {

-      /* first source image pointer, skipping border */

-      const GLubyte *imgSrcA = srcPtr

-         + (bytesPerSrcImage + bytesPerSrcRow + border) * bpt * border

-         + img * (bytesPerSrcImage + srcImageOffset);

-      /* second source image pointer, skipping border */

-      const GLubyte *imgSrcB = imgSrcA + srcImageOffset;

-      /* address of the dest image, skipping border */

-      GLubyte *imgDst = dstPtr

-         + (bytesPerDstImage + bytesPerDstRow + border) * bpt * border

-         + img * bytesPerDstImage;

-

-      /* setup the four source row pointers and the dest row pointer */

-      const GLubyte *srcImgARowA = imgSrcA;

-      const GLubyte *srcImgARowB = imgSrcA + srcRowOffset;

-      const GLubyte *srcImgBRowA = imgSrcB;

-      const GLubyte *srcImgBRowB = imgSrcB + srcRowOffset;

-      GLubyte *dstImgRow = imgDst;

-

-      for (row = 0; row < dstHeightNB; row++) {

-         do_row_3D(datatype, comps, srcWidthNB, 

-                   srcImgARowA, srcImgARowB,

-                   srcImgBRowA, srcImgBRowB,

-                   dstWidthNB, dstImgRow);

-

-         /* advance to next rows */

-         srcImgARowA += bytesPerSrcRow + srcRowOffset;

-         srcImgARowB += bytesPerSrcRow + srcRowOffset;

-         srcImgBRowA += bytesPerSrcRow + srcRowOffset;

-         srcImgBRowB += bytesPerSrcRow + srcRowOffset;

-         dstImgRow += bytesPerDstRow;

-      }

-   }

-

-

-   /* Luckily we can leverage the make_2d_mipmap() function here! */

-   if (border > 0) {

-      /* do front border image */

-      make_2d_mipmap(datatype, comps, 1, srcWidth, srcHeight, srcPtr, srcRowStride,

-                     dstWidth, dstHeight, dstPtr, dstRowStride);

-      /* do back border image */

-      make_2d_mipmap(datatype, comps, 1, srcWidth, srcHeight,

-                     srcPtr + bytesPerSrcImage * (srcDepth - 1), srcRowStride,

-                     dstWidth, dstHeight,

-                     dstPtr + bytesPerDstImage * (dstDepth - 1), dstRowStride);

-      /* do four remaining border edges that span the image slices */

-      if (srcDepth == dstDepth) {

-         /* just copy border pixels from src to dst */

-         for (img = 0; img < dstDepthNB; img++) {

-            const GLubyte *src;

-            GLubyte *dst;

-

-            /* do border along [img][row=0][col=0] */

-            src = srcPtr + (img + 1) * bytesPerSrcImage;

-            dst = dstPtr + (img + 1) * bytesPerDstImage;

-            memcpy(dst, src, bpt);

-

-            /* do border along [img][row=dstHeight-1][col=0] */

-            src = srcPtr + (img * 2 + 1) * bytesPerSrcImage

-                         + (srcHeight - 1) * bytesPerSrcRow;

-            dst = dstPtr + (img + 1) * bytesPerDstImage

-                         + (dstHeight - 1) * bytesPerDstRow;

-            memcpy(dst, src, bpt);

-

-            /* do border along [img][row=0][col=dstWidth-1] */

-            src = srcPtr + (img * 2 + 1) * bytesPerSrcImage

-                         + (srcWidth - 1) * bpt;

-            dst = dstPtr + (img + 1) * bytesPerDstImage

-                         + (dstWidth - 1) * bpt;

-            memcpy(dst, src, bpt);

-

-            /* do border along [img][row=dstHeight-1][col=dstWidth-1] */

-            src = srcPtr + (img * 2 + 1) * bytesPerSrcImage

-                         + (bytesPerSrcImage - bpt);

-            dst = dstPtr + (img + 1) * bytesPerDstImage

-                         + (bytesPerDstImage - bpt);

-            memcpy(dst, src, bpt);

-         }

-      }

-      else {

-         /* average border pixels from adjacent src image pairs */

-         ASSERT(srcDepthNB == 2 * dstDepthNB);

-         for (img = 0; img < dstDepthNB; img++) {

-            const GLubyte *src;

-            GLubyte *dst;

-

-            /* do border along [img][row=0][col=0] */

-            src = srcPtr + (img * 2 + 1) * bytesPerSrcImage;

-            dst = dstPtr + (img + 1) * bytesPerDstImage;

-            do_row(datatype, comps, 1, src, src + srcImageOffset, 1, dst);

-

-            /* do border along [img][row=dstHeight-1][col=0] */

-            src = srcPtr + (img * 2 + 1) * bytesPerSrcImage

-                         + (srcHeight - 1) * bytesPerSrcRow;

-            dst = dstPtr + (img + 1) * bytesPerDstImage

-                         + (dstHeight - 1) * bytesPerDstRow;

-            do_row(datatype, comps, 1, src, src + srcImageOffset, 1, dst);

-

-            /* do border along [img][row=0][col=dstWidth-1] */

-            src = srcPtr + (img * 2 + 1) * bytesPerSrcImage

-                         + (srcWidth - 1) * bpt;

-            dst = dstPtr + (img + 1) * bytesPerDstImage

-                         + (dstWidth - 1) * bpt;

-            do_row(datatype, comps, 1, src, src + srcImageOffset, 1, dst);

-

-            /* do border along [img][row=dstHeight-1][col=dstWidth-1] */

-            src = srcPtr + (img * 2 + 1) * bytesPerSrcImage

-                         + (bytesPerSrcImage - bpt);

-            dst = dstPtr + (img + 1) * bytesPerDstImage

-                         + (bytesPerDstImage - bpt);

-            do_row(datatype, comps, 1, src, src + srcImageOffset, 1, dst);

-         }

-      }

-   }

-}

-

-

-static void

-make_1d_stack_mipmap(GLenum datatype, GLuint comps, GLint border,

-                     GLint srcWidth, const GLubyte *srcPtr, GLuint srcRowStride,

-                     GLint dstWidth, GLint dstHeight,

-		     GLubyte *dstPtr, GLuint dstRowStride )

-{

-   const GLint bpt = bytes_per_pixel(datatype, comps);

-   const GLint srcWidthNB = srcWidth - 2 * border;  /* sizes w/out border */

-   const GLint dstWidthNB = dstWidth - 2 * border;

-   const GLint dstHeightNB = dstHeight - 2 * border;

-   const GLint srcRowBytes = bpt * srcRowStride;

-   const GLint dstRowBytes = bpt * dstRowStride;

-   const GLubyte *src;

-   GLubyte *dst;

-   GLint row;

-

-   /* Compute src and dst pointers, skipping any border */

-   src = srcPtr + border * ((srcWidth + 1) * bpt);

-   dst = dstPtr + border * ((dstWidth + 1) * bpt);

-

-   for (row = 0; row < dstHeightNB; row++) {

-      do_row(datatype, comps, srcWidthNB, src, src,

-             dstWidthNB, dst);

-      src += srcRowBytes;

-      dst += dstRowBytes;

-   }

-

-   if (border) {

-      /* copy left-most pixel from source */

-      assert(dstPtr);

-      assert(srcPtr);

-      memcpy(dstPtr, srcPtr, bpt);

-      /* copy right-most pixel from source */

-      memcpy(dstPtr + (dstWidth - 1) * bpt,

-             srcPtr + (srcWidth - 1) * bpt,

-             bpt);

-   }

-}

-

-

-/**

- * \bug

- * There is quite a bit of refactoring that could be done with this function

- * and \c make_2d_mipmap.

- */

-static void

-make_2d_stack_mipmap(GLenum datatype, GLuint comps, GLint border,

-                     GLint srcWidth, GLint srcHeight,

-		     const GLubyte *srcPtr, GLint srcRowStride,

-                     GLint dstWidth, GLint dstHeight, GLint dstDepth,

-                     GLubyte *dstPtr, GLint dstRowStride)

-{

-   const GLint bpt = bytes_per_pixel(datatype, comps);

-   const GLint srcWidthNB = srcWidth - 2 * border;  /* sizes w/out border */

-   const GLint dstWidthNB = dstWidth - 2 * border;

-   const GLint dstHeightNB = dstHeight - 2 * border;

-   const GLint dstDepthNB = dstDepth - 2 * border;

-   const GLint srcRowBytes = bpt * srcRowStride;

-   const GLint dstRowBytes = bpt * dstRowStride;

-   const GLubyte *srcA, *srcB;

-   GLubyte *dst;

-   GLint layer;

-   GLint row;

-

-   /* Compute src and dst pointers, skipping any border */

-   srcA = srcPtr + border * ((srcWidth + 1) * bpt);

-   if (srcHeight > 1) 

-      srcB = srcA + srcRowBytes;

-   else

-      srcB = srcA;

-   dst = dstPtr + border * ((dstWidth + 1) * bpt);

-

-   for (layer = 0; layer < dstDepthNB; layer++) {

-      for (row = 0; row < dstHeightNB; row++) {

-         do_row(datatype, comps, srcWidthNB, srcA, srcB,

-                dstWidthNB, dst);

-         srcA += 2 * srcRowBytes;

-         srcB += 2 * srcRowBytes;

-         dst += dstRowBytes;

-      }

-

-      /* This is ugly but probably won't be used much */

-      if (border > 0) {

-         /* fill in dest border */

-         /* lower-left border pixel */

-         assert(dstPtr);

-         assert(srcPtr);

-         memcpy(dstPtr, srcPtr, bpt);

-         /* lower-right border pixel */

-         memcpy(dstPtr + (dstWidth - 1) * bpt,

-                srcPtr + (srcWidth - 1) * bpt, bpt);

-         /* upper-left border pixel */

-         memcpy(dstPtr + dstWidth * (dstHeight - 1) * bpt,

-                srcPtr + srcWidth * (srcHeight - 1) * bpt, bpt);

-         /* upper-right border pixel */

-         memcpy(dstPtr + (dstWidth * dstHeight - 1) * bpt,

-                srcPtr + (srcWidth * srcHeight - 1) * bpt, bpt);

-         /* lower border */

-         do_row(datatype, comps, srcWidthNB,

-                srcPtr + bpt,

-                srcPtr + bpt,

-                dstWidthNB, dstPtr + bpt);

-         /* upper border */

-         do_row(datatype, comps, srcWidthNB,

-                srcPtr + (srcWidth * (srcHeight - 1) + 1) * bpt,

-                srcPtr + (srcWidth * (srcHeight - 1) + 1) * bpt,

-                dstWidthNB,

-                dstPtr + (dstWidth * (dstHeight - 1) + 1) * bpt);

-         /* left and right borders */

-         if (srcHeight == dstHeight) {

-            /* copy border pixel from src to dst */

-            for (row = 1; row < srcHeight; row++) {

-               memcpy(dstPtr + dstWidth * row * bpt,

-                      srcPtr + srcWidth * row * bpt, bpt);

-               memcpy(dstPtr + (dstWidth * row + dstWidth - 1) * bpt,

-                      srcPtr + (srcWidth * row + srcWidth - 1) * bpt, bpt);

-            }

-         }

-         else {

-            /* average two src pixels each dest pixel */

-            for (row = 0; row < dstHeightNB; row += 2) {

-               do_row(datatype, comps, 1,

-                      srcPtr + (srcWidth * (row * 2 + 1)) * bpt,

-                      srcPtr + (srcWidth * (row * 2 + 2)) * bpt,

-                      1, dstPtr + (dstWidth * row + 1) * bpt);

-               do_row(datatype, comps, 1,

-                      srcPtr + (srcWidth * (row * 2 + 1) + srcWidth - 1) * bpt,

-                      srcPtr + (srcWidth * (row * 2 + 2) + srcWidth - 1) * bpt,

-                      1, dstPtr + (dstWidth * row + 1 + dstWidth - 1) * bpt);

-            }

-         }

-      }

-   }

-}

-

-

-/**

- * Down-sample a texture image to produce the next lower mipmap level.

- * \param comps  components per texel (1, 2, 3 or 4)

- * \param srcRowStride  stride between source rows, in texels

- * \param dstRowStride  stride between destination rows, in texels

- */

-void

-_mesa_generate_mipmap_level(GLenum target,

-                            GLenum datatype, GLuint comps,

-                            GLint border,

-                            GLint srcWidth, GLint srcHeight, GLint srcDepth,

-                            const GLubyte *srcData,

-                            GLint srcRowStride,

-                            GLint dstWidth, GLint dstHeight, GLint dstDepth,

-                            GLubyte *dstData,

-                            GLint dstRowStride)

-{

-   /*

-    * We use simple 2x2 averaging to compute the next mipmap level.

-    */

-   switch (target) {

-   case GL_TEXTURE_1D:

-      make_1d_mipmap(datatype, comps, border,

-                     srcWidth, srcData,

-                     dstWidth, dstData);

-      break;

-   case GL_TEXTURE_2D:

-   case GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB:

-   case GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB:

-   case GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB:

-   case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB:

-   case GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB:

-   case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB:

-      make_2d_mipmap(datatype, comps, border,

-                     srcWidth, srcHeight, srcData, srcRowStride,

-                     dstWidth, dstHeight, dstData, dstRowStride);

-      break;

-   case GL_TEXTURE_3D:

-      make_3d_mipmap(datatype, comps, border,

-                     srcWidth, srcHeight, srcDepth,

-                     srcData, srcRowStride,

-                     dstWidth, dstHeight, dstDepth,

-                     dstData, dstRowStride);

-      break;

-   case GL_TEXTURE_1D_ARRAY_EXT:

-      make_1d_stack_mipmap(datatype, comps, border,

-                           srcWidth, srcData, srcRowStride,

-                           dstWidth, dstHeight,

-                           dstData, dstRowStride);

-      break;

-   case GL_TEXTURE_2D_ARRAY_EXT:

-      make_2d_stack_mipmap(datatype, comps, border,

-                           srcWidth, srcHeight,

-                           srcData, srcRowStride,

-                           dstWidth, dstHeight,

-                           dstDepth, dstData, dstRowStride);

-      break;

-   case GL_TEXTURE_RECTANGLE_NV:

-      /* no mipmaps, do nothing */

-      break;

-   default:

-      _mesa_problem(NULL, "bad dimensions in _mesa_generate_mipmaps");

-      return;

-   }

-}

-

-

-/**

- * compute next (level+1) image size

- * \return GL_FALSE if no smaller size can be generated (eg. src is 1x1x1 size)

- */

-static GLboolean

-next_mipmap_level_size(GLenum target, GLint border,

-                       GLint srcWidth, GLint srcHeight, GLint srcDepth,

-                       GLint *dstWidth, GLint *dstHeight, GLint *dstDepth)

-{

-   if (srcWidth - 2 * border > 1) {

-      *dstWidth = (srcWidth - 2 * border) / 2 + 2 * border;

-   }

-   else {

-      *dstWidth = srcWidth; /* can't go smaller */

-   }

-

-   if ((srcHeight - 2 * border > 1) && 

-       (target != GL_TEXTURE_1D_ARRAY_EXT)) {

-      *dstHeight = (srcHeight - 2 * border) / 2 + 2 * border;

-   }

-   else {

-      *dstHeight = srcHeight; /* can't go smaller */

-   }

-

-   if ((srcDepth - 2 * border > 1) &&

-       (target != GL_TEXTURE_2D_ARRAY_EXT)) {

-      *dstDepth = (srcDepth - 2 * border) / 2 + 2 * border;

-   }

-   else {

-      *dstDepth = srcDepth; /* can't go smaller */

-   }

-

-   if (*dstWidth == srcWidth &&

-       *dstHeight == srcHeight &&

-       *dstDepth == srcDepth) {

-      return GL_FALSE;

-   }

-   else {

-      return GL_TRUE;

-   }

-}

-

-

-

-

-/**

- * Automatic mipmap generation.

- * This is the fallback/default function for ctx->Driver.GenerateMipmap().

- * Generate a complete set of mipmaps from texObj's BaseLevel image.

- * Stop at texObj's MaxLevel or when we get to the 1x1 texture.

- * For cube maps, target will be one of

- * GL_TEXTURE_CUBE_MAP_POSITIVE/NEGATIVE_X/Y/Z; never GL_TEXTURE_CUBE_MAP.

- */

-void

-_mesa_generate_mipmap(struct gl_context *ctx, GLenum target,

-                      struct gl_texture_object *texObj)

-{

-   const struct gl_texture_image *srcImage;

-   gl_format convertFormat;

-   const GLubyte *srcData = NULL;

-   GLubyte *dstData = NULL;

-   GLint level, maxLevels;

-   GLenum datatype;

-   GLuint comps;

-

-   ASSERT(texObj);

-   srcImage = _mesa_select_tex_image(ctx, texObj, target, texObj->BaseLevel);

-   ASSERT(srcImage);

-

-   maxLevels = _mesa_max_texture_levels(ctx, texObj->Target);

-   ASSERT(maxLevels > 0);  /* bad target */

-

-   /* Find convertFormat - the format that do_row() will process */

-

-   if (_mesa_is_format_compressed(srcImage->TexFormat)) {

-      /* setup for compressed textures - need to allocate temporary

-       * image buffers to hold uncompressed images.

-       */

-      GLuint row;

-      GLint  components, size;

-      GLchan *dst;

-

-      assert(texObj->Target == GL_TEXTURE_2D ||

-             texObj->Target == GL_TEXTURE_CUBE_MAP_ARB);

-

-      if (srcImage->_BaseFormat == GL_RGB) {

-         convertFormat = MESA_FORMAT_RGB888;

-         components = 3;

-      }

-      else if (srcImage->_BaseFormat == GL_RGBA) {

-         convertFormat = MESA_FORMAT_RGBA8888;

-         components = 4;

-      }

-      else {

-         _mesa_problem(ctx, "bad srcImage->_BaseFormat in _mesa_generate_mipmaps");

-         return;

-      }

-

-      /* allocate storage for uncompressed GL_RGB or GL_RGBA images */

-      size = _mesa_bytes_per_pixel(srcImage->_BaseFormat, CHAN_TYPE)

-         * srcImage->Width * srcImage->Height * srcImage->Depth + 20;

-      /* 20 extra bytes, just be safe when calling last FetchTexel */

-      srcData = (GLubyte *) malloc(size);

-      if (!srcData) {

-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "generate mipmaps");

-         return;

-      }

-      dstData = (GLubyte *) malloc(size / 2);  /* 1/4 would probably be OK */

-      if (!dstData) {

-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "generate mipmaps");

-         free((void *) srcData);

-         return;

-      }

-

-      /* decompress base image here */

-      dst = (GLchan *) srcData;

-      for (row = 0; row < srcImage->Height; row++) {

-         GLuint col;

-         for (col = 0; col < srcImage->Width; col++) {

-            srcImage->FetchTexelc(srcImage, col, row, 0, dst);

-            dst += components;

-         }

-      }

-   }

-   else {

-      /* uncompressed */

-      convertFormat = srcImage->TexFormat;

-   }

-

-   _mesa_format_to_type_and_comps(convertFormat, &datatype, &comps);

-

-   for (level = texObj->BaseLevel; level < texObj->MaxLevel

-           && level < maxLevels - 1; level++) {

-      /* generate image[level+1] from image[level] */

-      const struct gl_texture_image *srcImage;

-      struct gl_texture_image *dstImage;

-      GLint srcWidth, srcHeight, srcDepth;

-      GLint dstWidth, dstHeight, dstDepth;

-      GLint border;

-      GLboolean nextLevel;

-

-      /* get src image parameters */

-      srcImage = _mesa_select_tex_image(ctx, texObj, target, level);

-      ASSERT(srcImage);

-      srcWidth = srcImage->Width;

-      srcHeight = srcImage->Height;

-      srcDepth = srcImage->Depth;

-      border = srcImage->Border;

-

-      nextLevel = next_mipmap_level_size(target, border,

-                                         srcWidth, srcHeight, srcDepth,

-                                         &dstWidth, &dstHeight, &dstDepth);

-      if (!nextLevel) {

-         /* all done */

-         if (_mesa_is_format_compressed(srcImage->TexFormat)) {

-            free((void *) srcData);

-            free(dstData);

-         }

-         return;

-      }

-

-      /* get dest gl_texture_image */

-      dstImage = _mesa_get_tex_image(ctx, texObj, target, level + 1);

-      if (!dstImage) {

-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "generating mipmaps");

-         return;

-      }

-

-      /* Free old image data */

-      if (dstImage->Data)

-         ctx->Driver.FreeTexImageData(ctx, dstImage);

-

-      /* initialize new image */

-      _mesa_init_teximage_fields(ctx, target, dstImage, dstWidth, dstHeight,

-                                 dstDepth, border, srcImage->InternalFormat,

-                                 srcImage->TexFormat);

-      dstImage->DriverData = NULL;

-      dstImage->FetchTexelc = srcImage->FetchTexelc;

-      dstImage->FetchTexelf = srcImage->FetchTexelf;

-

-      /* Alloc new teximage data buffer */

-      {

-         GLuint size = _mesa_format_image_size(dstImage->TexFormat,

-                                               dstWidth, dstHeight, dstDepth);

-         dstImage->Data = _mesa_alloc_texmemory(size);

-         if (!dstImage->Data) {

-            _mesa_error(ctx, GL_OUT_OF_MEMORY, "generating mipmaps");

-            return;

-         }

-      }

-

-      /* Setup src and dest data pointers */

-      if (_mesa_is_format_compressed(dstImage->TexFormat)) {

-         /* srcData and dstData are already set */

-         ASSERT(srcData);

-         ASSERT(dstData);

-      }

-      else {

-         srcData = (const GLubyte *) srcImage->Data;

-         dstData = (GLubyte *) dstImage->Data;

-      }

-

-      ASSERT(dstImage->TexFormat);

-      ASSERT(dstImage->FetchTexelc);

-      ASSERT(dstImage->FetchTexelf);

-

-      _mesa_generate_mipmap_level(target, datatype, comps, border,

-                                  srcWidth, srcHeight, srcDepth, 

-                                  srcData, srcImage->RowStride,

-                                  dstWidth, dstHeight, dstDepth, 

-                                  dstData, dstImage->RowStride);

-

-

-      if (_mesa_is_format_compressed(dstImage->TexFormat)) {

-         GLubyte *temp;

-         /* compress image from dstData into dstImage->Data */

-         const GLenum srcFormat = _mesa_get_format_base_format(convertFormat);

-         GLint dstRowStride

-            = _mesa_format_row_stride(dstImage->TexFormat, dstWidth);

-         ASSERT(srcFormat == GL_RGB || srcFormat == GL_RGBA);

-

-         _mesa_texstore(ctx, 2, dstImage->_BaseFormat,

-                        dstImage->TexFormat,

-                        dstImage->Data,

-                        0, 0, 0, /* dstX/Y/Zoffset */

-                        dstRowStride, 0, /* strides */

-                        dstWidth, dstHeight, 1, /* size */

-                        srcFormat, CHAN_TYPE,

-                        dstData, /* src data, actually */

-                        &ctx->DefaultPacking);

-

-         /* swap src and dest pointers */

-         temp = (GLubyte *) srcData;

-         srcData = dstData;

-         dstData = temp;

-      }

-

-   } /* loop over mipmap levels */

-}

-

-

-/**

- * Helper function for drivers which need to rescale texture images to

- * certain aspect ratios.

- * Nearest filtering only (for broken hardware that can't support

- * all aspect ratios).  This can be made a lot faster, but I don't

- * really care enough...

- */

-void

-_mesa_rescale_teximage2d(GLuint bytesPerPixel,

-			 GLuint srcStrideInPixels,

-			 GLuint dstRowStride,

-			 GLint srcWidth, GLint srcHeight,

-			 GLint dstWidth, GLint dstHeight,

-			 const GLvoid *srcImage, GLvoid *dstImage)

-{

-   GLint row, col;

-

-#define INNER_LOOP( TYPE, HOP, WOP )					\

-   for ( row = 0 ; row < dstHeight ; row++ ) {				\

-      GLint srcRow = row HOP hScale;					\

-      for ( col = 0 ; col < dstWidth ; col++ ) {			\

-	 GLint srcCol = col WOP wScale;					\

-	 dst[col] = src[srcRow * srcStrideInPixels + srcCol];		\

-      }									\

-      dst = (TYPE *) ((GLubyte *) dst + dstRowStride);			\

-   }									\

-

-#define RESCALE_IMAGE( TYPE )						\

-do {									\

-   const TYPE *src = (const TYPE *)srcImage;				\

-   TYPE *dst = (TYPE *)dstImage;					\

-									\

-   if ( srcHeight < dstHeight ) {					\

-      const GLint hScale = dstHeight / srcHeight;			\

-      if ( srcWidth < dstWidth ) {					\

-	 const GLint wScale = dstWidth / srcWidth;			\

-	 INNER_LOOP( TYPE, /, / );					\

-      }									\

-      else {								\

-	 const GLint wScale = srcWidth / dstWidth;			\

-	 INNER_LOOP( TYPE, /, * );					\

-      }									\

-   }									\

-   else {								\

-      const GLint hScale = srcHeight / dstHeight;			\

-      if ( srcWidth < dstWidth ) {					\

-	 const GLint wScale = dstWidth / srcWidth;			\

-	 INNER_LOOP( TYPE, *, / );					\

-      }									\

-      else {								\

-	 const GLint wScale = srcWidth / dstWidth;			\

-	 INNER_LOOP( TYPE, *, * );					\

-      }									\

-   }									\

-} while (0)

-

-   switch ( bytesPerPixel ) {

-   case 4:

-      RESCALE_IMAGE( GLuint );

-      break;

-

-   case 2:

-      RESCALE_IMAGE( GLushort );

-      break;

-

-   case 1:

-      RESCALE_IMAGE( GLubyte );

-      break;

-   default:

-      _mesa_problem(NULL,"unexpected bytes/pixel in _mesa_rescale_teximage2d");

-   }

-}

-

-

-/**

- * Upscale an image by replication, not (typical) stretching.

- * We use this when the image width or height is less than a

- * certain size (4, 8) and we need to upscale an image.

- */

-void

-_mesa_upscale_teximage2d(GLsizei inWidth, GLsizei inHeight,

-                         GLsizei outWidth, GLsizei outHeight,

-                         GLint comps, const GLchan *src, GLint srcRowStride,

-                         GLchan *dest )

-{

-   GLint i, j, k;

-

-   ASSERT(outWidth >= inWidth);

-   ASSERT(outHeight >= inHeight);

-#if 0

-   ASSERT(inWidth == 1 || inWidth == 2 || inHeight == 1 || inHeight == 2);

-   ASSERT((outWidth & 3) == 0);

-   ASSERT((outHeight & 3) == 0);

-#endif

-

-   for (i = 0; i < outHeight; i++) {

-      const GLint ii = i % inHeight;

-      for (j = 0; j < outWidth; j++) {

-         const GLint jj = j % inWidth;

-         for (k = 0; k < comps; k++) {

-            dest[(i * outWidth + j) * comps + k]

-               = src[ii * srcRowStride + jj * comps + k];

-         }

-      }

-   }

-}

-

+/*
+ * Mesa 3-D graphics library
+ * Version:  7.1
+ *
+ * Copyright (C) 1999-2007  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.
+ */
+
+
+/**
+ * \file mipmap.c  mipmap generation and teximage resizing functions.
+ */
+
+#include "imports.h"
+#include "formats.h"
+#include "mipmap.h"
+#include "mtypes.h"
+#include "teximage.h"
+#include "texstore.h"
+#include "image.h"
+
+
+
+static GLint
+bytes_per_pixel(GLenum datatype, GLuint comps)
+{
+   GLint b = _mesa_sizeof_packed_type(datatype);
+   assert(b >= 0);
+
+   if (_mesa_type_is_packed(datatype))
+       return b;
+   else
+       return b * comps;
+}
+
+
+/**
+ * \name Support macros for do_row and do_row_3d
+ *
+ * The macro madness is here for two reasons.  First, it compacts the code
+ * slightly.  Second, it makes it much easier to adjust the specifics of the
+ * filter to tune the rounding characteristics.
+ */
+/*@{*/
+#define DECLARE_ROW_POINTERS(t, e) \
+      const t(*rowA)[e] = (const t(*)[e]) srcRowA; \
+      const t(*rowB)[e] = (const t(*)[e]) srcRowB; \
+      const t(*rowC)[e] = (const t(*)[e]) srcRowC; \
+      const t(*rowD)[e] = (const t(*)[e]) srcRowD; \
+      t(*dst)[e] = (t(*)[e]) dstRow
+
+#define DECLARE_ROW_POINTERS0(t) \
+      const t *rowA = (const t *) srcRowA; \
+      const t *rowB = (const t *) srcRowB; \
+      const t *rowC = (const t *) srcRowC; \
+      const t *rowD = (const t *) srcRowD; \
+      t *dst = (t *) dstRow
+
+#define FILTER_SUM_3D(Aj, Ak, Bj, Bk, Cj, Ck, Dj, Dk) \
+   ((unsigned) Aj + (unsigned) Ak \
+    + (unsigned) Bj + (unsigned) Bk \
+    + (unsigned) Cj + (unsigned) Ck \
+    + (unsigned) Dj + (unsigned) Dk \
+    + 4) >> 3
+
+#define FILTER_3D(e) \
+   do { \
+      dst[i][e] = FILTER_SUM_3D(rowA[j][e], rowA[k][e], \
+                                rowB[j][e], rowB[k][e], \
+                                rowC[j][e], rowC[k][e], \
+                                rowD[j][e], rowD[k][e]); \
+   } while(0)
+
+#define FILTER_SUM_3D_SIGNED(Aj, Ak, Bj, Bk, Cj, Ck, Dj, Dk) \
+   (Aj + Ak \
+    + Bj + Bk \
+    + Cj + Ck \
+    + Dj + Dk \
+    + 4) / 8
+
+#define FILTER_3D_SIGNED(e) \
+   do { \
+      dst[i][e] = FILTER_SUM_3D_SIGNED(rowA[j][e], rowA[k][e], \
+                                       rowB[j][e], rowB[k][e], \
+                                       rowC[j][e], rowC[k][e], \
+                                       rowD[j][e], rowD[k][e]); \
+   } while(0)
+
+#define FILTER_F_3D(e) \
+   do { \
+      dst[i][e] = (rowA[j][e] + rowA[k][e] \
+                   + rowB[j][e] + rowB[k][e] \
+                   + rowC[j][e] + rowC[k][e] \
+                   + rowD[j][e] + rowD[k][e]) * 0.125F; \
+   } while(0)
+
+#define FILTER_HF_3D(e) \
+   do { \
+      const GLfloat aj = _mesa_half_to_float(rowA[j][e]); \
+      const GLfloat ak = _mesa_half_to_float(rowA[k][e]); \
+      const GLfloat bj = _mesa_half_to_float(rowB[j][e]); \
+      const GLfloat bk = _mesa_half_to_float(rowB[k][e]); \
+      const GLfloat cj = _mesa_half_to_float(rowC[j][e]); \
+      const GLfloat ck = _mesa_half_to_float(rowC[k][e]); \
+      const GLfloat dj = _mesa_half_to_float(rowD[j][e]); \
+      const GLfloat dk = _mesa_half_to_float(rowD[k][e]); \
+      dst[i][e] = _mesa_float_to_half((aj + ak + bj + bk + cj + ck + dj + dk) \
+                                      * 0.125F); \
+   } while(0)
+/*@}*/
+
+
+/**
+ * Average together two rows of a source image to produce a single new
+ * row in the dest image.  It's legal for the two source rows to point
+ * to the same data.  The source width must be equal to either the
+ * dest width or two times the dest width.
+ * \param datatype  GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, GL_FLOAT, etc.
+ * \param comps  number of components per pixel (1..4)
+ */
+static void
+do_row(GLenum datatype, GLuint comps, GLint srcWidth,
+       const GLvoid *srcRowA, const GLvoid *srcRowB,
+       GLint dstWidth, GLvoid *dstRow)
+{
+   const GLuint k0 = (srcWidth == dstWidth) ? 0 : 1;
+   const GLuint colStride = (srcWidth == dstWidth) ? 1 : 2;
+
+   ASSERT(comps >= 1);
+   ASSERT(comps <= 4);
+
+   /* This assertion is no longer valid with non-power-of-2 textures
+   assert(srcWidth == dstWidth || srcWidth == 2 * dstWidth);
+   */
+
+   if (datatype == GL_UNSIGNED_BYTE && comps == 4) {
+      GLuint i, j, k;
+      const GLubyte(*rowA)[4] = (const GLubyte(*)[4]) srcRowA;
+      const GLubyte(*rowB)[4] = (const GLubyte(*)[4]) srcRowB;
+      GLubyte(*dst)[4] = (GLubyte(*)[4]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;
+         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;
+         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;
+         dst[i][3] = (rowA[j][3] + rowA[k][3] + rowB[j][3] + rowB[k][3]) / 4;
+      }
+   }
+   else if (datatype == GL_UNSIGNED_BYTE && comps == 3) {
+      GLuint i, j, k;
+      const GLubyte(*rowA)[3] = (const GLubyte(*)[3]) srcRowA;
+      const GLubyte(*rowB)[3] = (const GLubyte(*)[3]) srcRowB;
+      GLubyte(*dst)[3] = (GLubyte(*)[3]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;
+         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;
+         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;
+      }
+   }
+   else if (datatype == GL_UNSIGNED_BYTE && comps == 2) {
+      GLuint i, j, k;
+      const GLubyte(*rowA)[2] = (const GLubyte(*)[2]) srcRowA;
+      const GLubyte(*rowB)[2] = (const GLubyte(*)[2]) srcRowB;
+      GLubyte(*dst)[2] = (GLubyte(*)[2]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) >> 2;
+         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) >> 2;
+      }
+   }
+   else if (datatype == GL_UNSIGNED_BYTE && comps == 1) {
+      GLuint i, j, k;
+      const GLubyte *rowA = (const GLubyte *) srcRowA;
+      const GLubyte *rowB = (const GLubyte *) srcRowB;
+      GLubyte *dst = (GLubyte *) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) >> 2;
+      }
+   }
+
+   else if (datatype == GL_BYTE && comps == 4) {
+      GLuint i, j, k;
+      const GLbyte(*rowA)[4] = (const GLbyte(*)[4]) srcRowA;
+      const GLbyte(*rowB)[4] = (const GLbyte(*)[4]) srcRowB;
+      GLbyte(*dst)[4] = (GLbyte(*)[4]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;
+         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;
+         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;
+         dst[i][3] = (rowA[j][3] + rowA[k][3] + rowB[j][3] + rowB[k][3]) / 4;
+      }
+   }
+   else if (datatype == GL_BYTE && comps == 3) {
+      GLuint i, j, k;
+      const GLbyte(*rowA)[3] = (const GLbyte(*)[3]) srcRowA;
+      const GLbyte(*rowB)[3] = (const GLbyte(*)[3]) srcRowB;
+      GLbyte(*dst)[3] = (GLbyte(*)[3]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;
+         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;
+         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;
+      }
+   }
+   else if (datatype == GL_BYTE && comps == 2) {
+      GLuint i, j, k;
+      const GLbyte(*rowA)[2] = (const GLbyte(*)[2]) srcRowA;
+      const GLbyte(*rowB)[2] = (const GLbyte(*)[2]) srcRowB;
+      GLbyte(*dst)[2] = (GLbyte(*)[2]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;
+         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;
+      }
+   }
+   else if (datatype == GL_BYTE && comps == 1) {
+      GLuint i, j, k;
+      const GLbyte *rowA = (const GLbyte *) srcRowA;
+      const GLbyte *rowB = (const GLbyte *) srcRowB;
+      GLbyte *dst = (GLbyte *) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) / 4;
+      }
+   }
+
+   else if (datatype == GL_UNSIGNED_SHORT && comps == 4) {
+      GLuint i, j, k;
+      const GLushort(*rowA)[4] = (const GLushort(*)[4]) srcRowA;
+      const GLushort(*rowB)[4] = (const GLushort(*)[4]) srcRowB;
+      GLushort(*dst)[4] = (GLushort(*)[4]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;
+         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;
+         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;
+         dst[i][3] = (rowA[j][3] + rowA[k][3] + rowB[j][3] + rowB[k][3]) / 4;
+      }
+   }
+   else if (datatype == GL_UNSIGNED_SHORT && comps == 3) {
+      GLuint i, j, k;
+      const GLushort(*rowA)[3] = (const GLushort(*)[3]) srcRowA;
+      const GLushort(*rowB)[3] = (const GLushort(*)[3]) srcRowB;
+      GLushort(*dst)[3] = (GLushort(*)[3]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;
+         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;
+         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;
+      }
+   }
+   else if (datatype == GL_UNSIGNED_SHORT && comps == 2) {
+      GLuint i, j, k;
+      const GLushort(*rowA)[2] = (const GLushort(*)[2]) srcRowA;
+      const GLushort(*rowB)[2] = (const GLushort(*)[2]) srcRowB;
+      GLushort(*dst)[2] = (GLushort(*)[2]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;
+         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;
+      }
+   }
+   else if (datatype == GL_UNSIGNED_SHORT && comps == 1) {
+      GLuint i, j, k;
+      const GLushort *rowA = (const GLushort *) srcRowA;
+      const GLushort *rowB = (const GLushort *) srcRowB;
+      GLushort *dst = (GLushort *) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) / 4;
+      }
+   }
+
+   else if (datatype == GL_SHORT && comps == 4) {
+      GLuint i, j, k;
+      const GLshort(*rowA)[4] = (const GLshort(*)[4]) srcRowA;
+      const GLshort(*rowB)[4] = (const GLshort(*)[4]) srcRowB;
+      GLshort(*dst)[4] = (GLshort(*)[4]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;
+         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;
+         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;
+         dst[i][3] = (rowA[j][3] + rowA[k][3] + rowB[j][3] + rowB[k][3]) / 4;
+      }
+   }
+   else if (datatype == GL_SHORT && comps == 3) {
+      GLuint i, j, k;
+      const GLshort(*rowA)[3] = (const GLshort(*)[3]) srcRowA;
+      const GLshort(*rowB)[3] = (const GLshort(*)[3]) srcRowB;
+      GLshort(*dst)[3] = (GLshort(*)[3]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;
+         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;
+         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;
+      }
+   }
+   else if (datatype == GL_SHORT && comps == 2) {
+      GLuint i, j, k;
+      const GLshort(*rowA)[2] = (const GLshort(*)[2]) srcRowA;
+      const GLshort(*rowB)[2] = (const GLshort(*)[2]) srcRowB;
+      GLshort(*dst)[2] = (GLshort(*)[2]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;
+         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;
+      }
+   }
+   else if (datatype == GL_SHORT && comps == 1) {
+      GLuint i, j, k;
+      const GLshort *rowA = (const GLshort *) srcRowA;
+      const GLshort *rowB = (const GLshort *) srcRowB;
+      GLshort *dst = (GLshort *) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) / 4;
+      }
+   }
+
+   else if (datatype == GL_FLOAT && comps == 4) {
+      GLuint i, j, k;
+      const GLfloat(*rowA)[4] = (const GLfloat(*)[4]) srcRowA;
+      const GLfloat(*rowB)[4] = (const GLfloat(*)[4]) srcRowB;
+      GLfloat(*dst)[4] = (GLfloat(*)[4]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i][0] = (rowA[j][0] + rowA[k][0] +
+                      rowB[j][0] + rowB[k][0]) * 0.25F;
+         dst[i][1] = (rowA[j][1] + rowA[k][1] +
+                      rowB[j][1] + rowB[k][1]) * 0.25F;
+         dst[i][2] = (rowA[j][2] + rowA[k][2] +
+                      rowB[j][2] + rowB[k][2]) * 0.25F;
+         dst[i][3] = (rowA[j][3] + rowA[k][3] +
+                      rowB[j][3] + rowB[k][3]) * 0.25F;
+      }
+   }
+   else if (datatype == GL_FLOAT && comps == 3) {
+      GLuint i, j, k;
+      const GLfloat(*rowA)[3] = (const GLfloat(*)[3]) srcRowA;
+      const GLfloat(*rowB)[3] = (const GLfloat(*)[3]) srcRowB;
+      GLfloat(*dst)[3] = (GLfloat(*)[3]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i][0] = (rowA[j][0] + rowA[k][0] +
+                      rowB[j][0] + rowB[k][0]) * 0.25F;
+         dst[i][1] = (rowA[j][1] + rowA[k][1] +
+                      rowB[j][1] + rowB[k][1]) * 0.25F;
+         dst[i][2] = (rowA[j][2] + rowA[k][2] +
+                      rowB[j][2] + rowB[k][2]) * 0.25F;
+      }
+   }
+   else if (datatype == GL_FLOAT && comps == 2) {
+      GLuint i, j, k;
+      const GLfloat(*rowA)[2] = (const GLfloat(*)[2]) srcRowA;
+      const GLfloat(*rowB)[2] = (const GLfloat(*)[2]) srcRowB;
+      GLfloat(*dst)[2] = (GLfloat(*)[2]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i][0] = (rowA[j][0] + rowA[k][0] +
+                      rowB[j][0] + rowB[k][0]) * 0.25F;
+         dst[i][1] = (rowA[j][1] + rowA[k][1] +
+                      rowB[j][1] + rowB[k][1]) * 0.25F;
+      }
+   }
+   else if (datatype == GL_FLOAT && comps == 1) {
+      GLuint i, j, k;
+      const GLfloat *rowA = (const GLfloat *) srcRowA;
+      const GLfloat *rowB = (const GLfloat *) srcRowB;
+      GLfloat *dst = (GLfloat *) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) * 0.25F;
+      }
+   }
+
+   else if (datatype == GL_HALF_FLOAT_ARB && comps == 4) {
+      GLuint i, j, k, comp;
+      const GLhalfARB(*rowA)[4] = (const GLhalfARB(*)[4]) srcRowA;
+      const GLhalfARB(*rowB)[4] = (const GLhalfARB(*)[4]) srcRowB;
+      GLhalfARB(*dst)[4] = (GLhalfARB(*)[4]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         for (comp = 0; comp < 4; comp++) {
+            GLfloat aj, ak, bj, bk;
+            aj = _mesa_half_to_float(rowA[j][comp]);
+            ak = _mesa_half_to_float(rowA[k][comp]);
+            bj = _mesa_half_to_float(rowB[j][comp]);
+            bk = _mesa_half_to_float(rowB[k][comp]);
+            dst[i][comp] = _mesa_float_to_half((aj + ak + bj + bk) * 0.25F);
+         }
+      }
+   }
+   else if (datatype == GL_HALF_FLOAT_ARB && comps == 3) {
+      GLuint i, j, k, comp;
+      const GLhalfARB(*rowA)[3] = (const GLhalfARB(*)[3]) srcRowA;
+      const GLhalfARB(*rowB)[3] = (const GLhalfARB(*)[3]) srcRowB;
+      GLhalfARB(*dst)[3] = (GLhalfARB(*)[3]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         for (comp = 0; comp < 3; comp++) {
+            GLfloat aj, ak, bj, bk;
+            aj = _mesa_half_to_float(rowA[j][comp]);
+            ak = _mesa_half_to_float(rowA[k][comp]);
+            bj = _mesa_half_to_float(rowB[j][comp]);
+            bk = _mesa_half_to_float(rowB[k][comp]);
+            dst[i][comp] = _mesa_float_to_half((aj + ak + bj + bk) * 0.25F);
+         }
+      }
+   }
+   else if (datatype == GL_HALF_FLOAT_ARB && comps == 2) {
+      GLuint i, j, k, comp;
+      const GLhalfARB(*rowA)[2] = (const GLhalfARB(*)[2]) srcRowA;
+      const GLhalfARB(*rowB)[2] = (const GLhalfARB(*)[2]) srcRowB;
+      GLhalfARB(*dst)[2] = (GLhalfARB(*)[2]) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         for (comp = 0; comp < 2; comp++) {
+            GLfloat aj, ak, bj, bk;
+            aj = _mesa_half_to_float(rowA[j][comp]);
+            ak = _mesa_half_to_float(rowA[k][comp]);
+            bj = _mesa_half_to_float(rowB[j][comp]);
+            bk = _mesa_half_to_float(rowB[k][comp]);
+            dst[i][comp] = _mesa_float_to_half((aj + ak + bj + bk) * 0.25F);
+         }
+      }
+   }
+   else if (datatype == GL_HALF_FLOAT_ARB && comps == 1) {
+      GLuint i, j, k;
+      const GLhalfARB *rowA = (const GLhalfARB *) srcRowA;
+      const GLhalfARB *rowB = (const GLhalfARB *) srcRowB;
+      GLhalfARB *dst = (GLhalfARB *) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         GLfloat aj, ak, bj, bk;
+         aj = _mesa_half_to_float(rowA[j]);
+         ak = _mesa_half_to_float(rowA[k]);
+         bj = _mesa_half_to_float(rowB[j]);
+         bk = _mesa_half_to_float(rowB[k]);
+         dst[i] = _mesa_float_to_half((aj + ak + bj + bk) * 0.25F);
+      }
+   }
+
+   else if (datatype == GL_UNSIGNED_INT && comps == 1) {
+      GLuint i, j, k;
+      const GLuint *rowA = (const GLuint *) srcRowA;
+      const GLuint *rowB = (const GLuint *) srcRowB;
+      GLuint *dst = (GLuint *) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         dst[i] = (GLfloat)(rowA[j] / 4 + rowA[k] / 4 + rowB[j] / 4 + rowB[k] / 4);
+      }
+   }
+
+   else if (datatype == GL_UNSIGNED_SHORT_5_6_5 && comps == 3) {
+      GLuint i, j, k;
+      const GLushort *rowA = (const GLushort *) srcRowA;
+      const GLushort *rowB = (const GLushort *) srcRowB;
+      GLushort *dst = (GLushort *) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         const GLint rowAr0 = rowA[j] & 0x1f;
+         const GLint rowAr1 = rowA[k] & 0x1f;
+         const GLint rowBr0 = rowB[j] & 0x1f;
+         const GLint rowBr1 = rowB[k] & 0x1f;
+         const GLint rowAg0 = (rowA[j] >> 5) & 0x3f;
+         const GLint rowAg1 = (rowA[k] >> 5) & 0x3f;
+         const GLint rowBg0 = (rowB[j] >> 5) & 0x3f;
+         const GLint rowBg1 = (rowB[k] >> 5) & 0x3f;
+         const GLint rowAb0 = (rowA[j] >> 11) & 0x1f;
+         const GLint rowAb1 = (rowA[k] >> 11) & 0x1f;
+         const GLint rowBb0 = (rowB[j] >> 11) & 0x1f;
+         const GLint rowBb1 = (rowB[k] >> 11) & 0x1f;
+         const GLint red = (rowAr0 + rowAr1 + rowBr0 + rowBr1) >> 2;
+         const GLint green = (rowAg0 + rowAg1 + rowBg0 + rowBg1) >> 2;
+         const GLint blue = (rowAb0 + rowAb1 + rowBb0 + rowBb1) >> 2;
+         dst[i] = (blue << 11) | (green << 5) | red;
+      }
+   }
+   else if (datatype == GL_UNSIGNED_SHORT_4_4_4_4 && comps == 4) {
+      GLuint i, j, k;
+      const GLushort *rowA = (const GLushort *) srcRowA;
+      const GLushort *rowB = (const GLushort *) srcRowB;
+      GLushort *dst = (GLushort *) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         const GLint rowAr0 = rowA[j] & 0xf;
+         const GLint rowAr1 = rowA[k] & 0xf;
+         const GLint rowBr0 = rowB[j] & 0xf;
+         const GLint rowBr1 = rowB[k] & 0xf;
+         const GLint rowAg0 = (rowA[j] >> 4) & 0xf;
+         const GLint rowAg1 = (rowA[k] >> 4) & 0xf;
+         const GLint rowBg0 = (rowB[j] >> 4) & 0xf;
+         const GLint rowBg1 = (rowB[k] >> 4) & 0xf;
+         const GLint rowAb0 = (rowA[j] >> 8) & 0xf;
+         const GLint rowAb1 = (rowA[k] >> 8) & 0xf;
+         const GLint rowBb0 = (rowB[j] >> 8) & 0xf;
+         const GLint rowBb1 = (rowB[k] >> 8) & 0xf;
+         const GLint rowAa0 = (rowA[j] >> 12) & 0xf;
+         const GLint rowAa1 = (rowA[k] >> 12) & 0xf;
+         const GLint rowBa0 = (rowB[j] >> 12) & 0xf;
+         const GLint rowBa1 = (rowB[k] >> 12) & 0xf;
+         const GLint red = (rowAr0 + rowAr1 + rowBr0 + rowBr1) >> 2;
+         const GLint green = (rowAg0 + rowAg1 + rowBg0 + rowBg1) >> 2;
+         const GLint blue = (rowAb0 + rowAb1 + rowBb0 + rowBb1) >> 2;
+         const GLint alpha = (rowAa0 + rowAa1 + rowBa0 + rowBa1) >> 2;
+         dst[i] = (alpha << 12) | (blue << 8) | (green << 4) | red;
+      }
+   }
+   else if (datatype == GL_UNSIGNED_SHORT_1_5_5_5_REV && comps == 4) {
+      GLuint i, j, k;
+      const GLushort *rowA = (const GLushort *) srcRowA;
+      const GLushort *rowB = (const GLushort *) srcRowB;
+      GLushort *dst = (GLushort *) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         const GLint rowAr0 = rowA[j] & 0x1f;
+         const GLint rowAr1 = rowA[k] & 0x1f;
+         const GLint rowBr0 = rowB[j] & 0x1f;
+         const GLint rowBr1 = rowB[k] & 0x1f;
+         const GLint rowAg0 = (rowA[j] >> 5) & 0x1f;
+         const GLint rowAg1 = (rowA[k] >> 5) & 0x1f;
+         const GLint rowBg0 = (rowB[j] >> 5) & 0x1f;
+         const GLint rowBg1 = (rowB[k] >> 5) & 0x1f;
+         const GLint rowAb0 = (rowA[j] >> 10) & 0x1f;
+         const GLint rowAb1 = (rowA[k] >> 10) & 0x1f;
+         const GLint rowBb0 = (rowB[j] >> 10) & 0x1f;
+         const GLint rowBb1 = (rowB[k] >> 10) & 0x1f;
+         const GLint rowAa0 = (rowA[j] >> 15) & 0x1;
+         const GLint rowAa1 = (rowA[k] >> 15) & 0x1;
+         const GLint rowBa0 = (rowB[j] >> 15) & 0x1;
+         const GLint rowBa1 = (rowB[k] >> 15) & 0x1;
+         const GLint red = (rowAr0 + rowAr1 + rowBr0 + rowBr1) >> 2;
+         const GLint green = (rowAg0 + rowAg1 + rowBg0 + rowBg1) >> 2;
+         const GLint blue = (rowAb0 + rowAb1 + rowBb0 + rowBb1) >> 2;
+         const GLint alpha = (rowAa0 + rowAa1 + rowBa0 + rowBa1) >> 2;
+         dst[i] = (alpha << 15) | (blue << 10) | (green << 5) | red;
+      }
+   }
+   else if (datatype == GL_UNSIGNED_SHORT_5_5_5_1 && comps == 4) {
+      GLuint i, j, k;
+      const GLushort *rowA = (const GLushort *) srcRowA;
+      const GLushort *rowB = (const GLushort *) srcRowB;
+      GLushort *dst = (GLushort *) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         const GLint rowAr0 = (rowA[j] >> 11) & 0x1f;
+         const GLint rowAr1 = (rowA[k] >> 11) & 0x1f;
+         const GLint rowBr0 = (rowB[j] >> 11) & 0x1f;
+         const GLint rowBr1 = (rowB[k] >> 11) & 0x1f;
+         const GLint rowAg0 = (rowA[j] >> 6) & 0x1f;
+         const GLint rowAg1 = (rowA[k] >> 6) & 0x1f;
+         const GLint rowBg0 = (rowB[j] >> 6) & 0x1f;
+         const GLint rowBg1 = (rowB[k] >> 6) & 0x1f;
+         const GLint rowAb0 = (rowA[j] >> 1) & 0x1f;
+         const GLint rowAb1 = (rowA[k] >> 1) & 0x1f;
+         const GLint rowBb0 = (rowB[j] >> 1) & 0x1f;
+         const GLint rowBb1 = (rowB[k] >> 1) & 0x1f;
+         const GLint rowAa0 = (rowA[j] & 0x1);
+         const GLint rowAa1 = (rowA[k] & 0x1);
+         const GLint rowBa0 = (rowB[j] & 0x1);
+         const GLint rowBa1 = (rowB[k] & 0x1);
+         const GLint red = (rowAr0 + rowAr1 + rowBr0 + rowBr1) >> 2;
+         const GLint green = (rowAg0 + rowAg1 + rowBg0 + rowBg1) >> 2;
+         const GLint blue = (rowAb0 + rowAb1 + rowBb0 + rowBb1) >> 2;
+         const GLint alpha = (rowAa0 + rowAa1 + rowBa0 + rowBa1) >> 2;
+         dst[i] = (red << 11) | (green << 6) | (blue << 1) | alpha;
+      }
+   }
+
+   else if (datatype == GL_UNSIGNED_BYTE_3_3_2 && comps == 3) {
+      GLuint i, j, k;
+      const GLubyte *rowA = (const GLubyte *) srcRowA;
+      const GLubyte *rowB = (const GLubyte *) srcRowB;
+      GLubyte *dst = (GLubyte *) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         const GLint rowAr0 = rowA[j] & 0x3;
+         const GLint rowAr1 = rowA[k] & 0x3;
+         const GLint rowBr0 = rowB[j] & 0x3;
+         const GLint rowBr1 = rowB[k] & 0x3;
+         const GLint rowAg0 = (rowA[j] >> 2) & 0x7;
+         const GLint rowAg1 = (rowA[k] >> 2) & 0x7;
+         const GLint rowBg0 = (rowB[j] >> 2) & 0x7;
+         const GLint rowBg1 = (rowB[k] >> 2) & 0x7;
+         const GLint rowAb0 = (rowA[j] >> 5) & 0x7;
+         const GLint rowAb1 = (rowA[k] >> 5) & 0x7;
+         const GLint rowBb0 = (rowB[j] >> 5) & 0x7;
+         const GLint rowBb1 = (rowB[k] >> 5) & 0x7;
+         const GLint red = (rowAr0 + rowAr1 + rowBr0 + rowBr1) >> 2;
+         const GLint green = (rowAg0 + rowAg1 + rowBg0 + rowBg1) >> 2;
+         const GLint blue = (rowAb0 + rowAb1 + rowBb0 + rowBb1) >> 2;
+         dst[i] = (blue << 5) | (green << 2) | red;
+      }
+   }
+
+   else if (datatype == MESA_UNSIGNED_BYTE_4_4 && comps == 2) {
+      GLuint i, j, k;
+      const GLubyte *rowA = (const GLubyte *) srcRowA;
+      const GLubyte *rowB = (const GLubyte *) srcRowB;
+      GLubyte *dst = (GLubyte *) dstRow;
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         const GLint rowAr0 = rowA[j] & 0xf;
+         const GLint rowAr1 = rowA[k] & 0xf;
+         const GLint rowBr0 = rowB[j] & 0xf;
+         const GLint rowBr1 = rowB[k] & 0xf;
+         const GLint rowAg0 = (rowA[j] >> 4) & 0xf;
+         const GLint rowAg1 = (rowA[k] >> 4) & 0xf;
+         const GLint rowBg0 = (rowB[j] >> 4) & 0xf;
+         const GLint rowBg1 = (rowB[k] >> 4) & 0xf;
+         const GLint r = (rowAr0 + rowAr1 + rowBr0 + rowBr1) >> 2;
+         const GLint g = (rowAg0 + rowAg1 + rowBg0 + rowBg1) >> 2;
+         dst[i] = (g << 4) | r;
+      }
+   }
+
+   else {
+      _mesa_problem(NULL, "bad format in do_row()");
+   }
+}
+
+
+/**
+ * Average together four rows of a source image to produce a single new
+ * row in the dest image.  It's legal for the two source rows to point
+ * to the same data.  The source width must be equal to either the
+ * dest width or two times the dest width.
+ *
+ * \param datatype  GL pixel type \c GL_UNSIGNED_BYTE, \c GL_UNSIGNED_SHORT,
+ *                  \c GL_FLOAT, etc.
+ * \param comps     number of components per pixel (1..4)
+ * \param srcWidth  Width of a row in the source data
+ * \param srcRowA   Pointer to one of the rows of source data
+ * \param srcRowB   Pointer to one of the rows of source data
+ * \param srcRowC   Pointer to one of the rows of source data
+ * \param srcRowD   Pointer to one of the rows of source data
+ * \param dstWidth  Width of a row in the destination data
+ * \param srcRowA   Pointer to the row of destination data
+ */
+static void
+do_row_3D(GLenum datatype, GLuint comps, GLint srcWidth,
+          const GLvoid *srcRowA, const GLvoid *srcRowB,
+          const GLvoid *srcRowC, const GLvoid *srcRowD,
+          GLint dstWidth, GLvoid *dstRow)
+{
+   const GLuint k0 = (srcWidth == dstWidth) ? 0 : 1;
+   const GLuint colStride = (srcWidth == dstWidth) ? 1 : 2;
+   GLuint i, j, k;
+
+   ASSERT(comps >= 1);
+   ASSERT(comps <= 4);
+
+   if ((datatype == GL_UNSIGNED_BYTE) && (comps == 4)) {
+      DECLARE_ROW_POINTERS(GLubyte, 4);
+
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         FILTER_3D(0);
+         FILTER_3D(1);
+         FILTER_3D(2);
+         FILTER_3D(3);
+      }
+   }
+   else if ((datatype == GL_UNSIGNED_BYTE) && (comps == 3)) {
+      DECLARE_ROW_POINTERS(GLubyte, 3);
+
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         FILTER_3D(0);
+         FILTER_3D(1);
+         FILTER_3D(2);
+      }
+   }
+   else if ((datatype == GL_UNSIGNED_BYTE) && (comps == 2)) {
+      DECLARE_ROW_POINTERS(GLubyte, 2);
+
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         FILTER_3D(0);
+         FILTER_3D(1);
+      }
+   }
+   else if ((datatype == GL_UNSIGNED_BYTE) && (comps == 1)) {
+      DECLARE_ROW_POINTERS(GLubyte, 1);
+
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         FILTER_3D(0);
+      }
+   }
+   else if ((datatype == GL_BYTE) && (comps == 4)) {
+      DECLARE_ROW_POINTERS(GLbyte, 4);
+
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         FILTER_3D_SIGNED(0);
+         FILTER_3D_SIGNED(1);
+         FILTER_3D_SIGNED(2);
+         FILTER_3D_SIGNED(3);
+      }
+   }
+   else if ((datatype == GL_BYTE) && (comps == 3)) {
+      DECLARE_ROW_POINTERS(GLbyte, 3);
+
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         FILTER_3D_SIGNED(0);
+         FILTER_3D_SIGNED(1);
+         FILTER_3D_SIGNED(2);
+      }
+   }
+   else if ((datatype == GL_BYTE) && (comps == 2)) {
+      DECLARE_ROW_POINTERS(GLbyte, 2);
+
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         FILTER_3D_SIGNED(0);
+         FILTER_3D_SIGNED(1);
+       }
+   }
+   else if ((datatype == GL_BYTE) && (comps == 1)) {
+      DECLARE_ROW_POINTERS(GLbyte, 1);
+
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         FILTER_3D_SIGNED(0);
+      }
+   }
+   else if ((datatype == GL_UNSIGNED_SHORT) && (comps == 4)) {
+      DECLARE_ROW_POINTERS(GLushort, 4);
+
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         FILTER_3D(0);
+         FILTER_3D(1);
+         FILTER_3D(2);
+         FILTER_3D(3);
+      }
+   }
+   else if ((datatype == GL_UNSIGNED_SHORT) && (comps == 3)) {
+      DECLARE_ROW_POINTERS(GLushort, 3);
+
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         FILTER_3D(0);
+         FILTER_3D(1);
+         FILTER_3D(2);
+      }
+   }
+   else if ((datatype == GL_UNSIGNED_SHORT) && (comps == 2)) {
+      DECLARE_ROW_POINTERS(GLushort, 2);
+
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         FILTER_3D(0);
+         FILTER_3D(1);
+      }
+   }
+   else if ((datatype == GL_UNSIGNED_SHORT) && (comps == 1)) {
+      DECLARE_ROW_POINTERS(GLushort, 1);
+
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         FILTER_3D(0);
+      }
+   }
+   else if ((datatype == GL_SHORT) && (comps == 4)) {
+      DECLARE_ROW_POINTERS(GLshort, 4);
+
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         FILTER_3D(0);
+         FILTER_3D(1);
+         FILTER_3D(2);
+         FILTER_3D(3);
+      }
+   }
+   else if ((datatype == GL_SHORT) && (comps == 3)) {
+      DECLARE_ROW_POINTERS(GLshort, 3);
+
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         FILTER_3D(0);
+         FILTER_3D(1);
+         FILTER_3D(2);
+      }
+   }
+   else if ((datatype == GL_SHORT) && (comps == 2)) {
+      DECLARE_ROW_POINTERS(GLshort, 2);
+
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         FILTER_3D(0);
+         FILTER_3D(1);
+      }
+   }
+   else if ((datatype == GL_SHORT) && (comps == 1)) {
+      DECLARE_ROW_POINTERS(GLshort, 1);
+
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         FILTER_3D(0);
+      }
+   }
+   else if ((datatype == GL_FLOAT) && (comps == 4)) {
+      DECLARE_ROW_POINTERS(GLfloat, 4);
+
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         FILTER_F_3D(0);
+         FILTER_F_3D(1);
+         FILTER_F_3D(2);
+         FILTER_F_3D(3);
+      }
+   }
+   else if ((datatype == GL_FLOAT) && (comps == 3)) {
+      DECLARE_ROW_POINTERS(GLfloat, 3);
+
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         FILTER_F_3D(0);
+         FILTER_F_3D(1);
+         FILTER_F_3D(2);
+      }
+   }
+   else if ((datatype == GL_FLOAT) && (comps == 2)) {
+      DECLARE_ROW_POINTERS(GLfloat, 2);
+
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         FILTER_F_3D(0);
+         FILTER_F_3D(1);
+      }
+   }
+   else if ((datatype == GL_FLOAT) && (comps == 1)) {
+      DECLARE_ROW_POINTERS(GLfloat, 1);
+
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         FILTER_F_3D(0);
+      }
+   }
+   else if ((datatype == GL_HALF_FLOAT_ARB) && (comps == 4)) {
+      DECLARE_ROW_POINTERS(GLhalfARB, 4);
+
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         FILTER_HF_3D(0);
+         FILTER_HF_3D(1);
+         FILTER_HF_3D(2);
+         FILTER_HF_3D(3);
+      }
+   }
+   else if ((datatype == GL_HALF_FLOAT_ARB) && (comps == 3)) {
+      DECLARE_ROW_POINTERS(GLhalfARB, 4);
+
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         FILTER_HF_3D(0);
+         FILTER_HF_3D(1);
+         FILTER_HF_3D(2);
+      }
+   }
+   else if ((datatype == GL_HALF_FLOAT_ARB) && (comps == 2)) {
+      DECLARE_ROW_POINTERS(GLhalfARB, 4);
+
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         FILTER_HF_3D(0);
+         FILTER_HF_3D(1);
+      }
+   }
+   else if ((datatype == GL_HALF_FLOAT_ARB) && (comps == 1)) {
+      DECLARE_ROW_POINTERS(GLhalfARB, 4);
+
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         FILTER_HF_3D(0);
+      }
+   }
+   else if ((datatype == GL_UNSIGNED_INT) && (comps == 1)) {
+      const GLuint *rowA = (const GLuint *) srcRowA;
+      const GLuint *rowB = (const GLuint *) srcRowB;
+      const GLuint *rowC = (const GLuint *) srcRowC;
+      const GLuint *rowD = (const GLuint *) srcRowD;
+      GLfloat *dst = (GLfloat *) dstRow;
+
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         const uint64_t tmp = (((uint64_t) rowA[j] + (uint64_t) rowA[k])
+                               + ((uint64_t) rowB[j] + (uint64_t) rowB[k])
+                               + ((uint64_t) rowC[j] + (uint64_t) rowC[k])
+                               + ((uint64_t) rowD[j] + (uint64_t) rowD[k]));
+         dst[i] = (GLfloat)((double) tmp * 0.125);
+      }
+   }
+   else if ((datatype == GL_UNSIGNED_SHORT_5_6_5) && (comps == 3)) {
+      DECLARE_ROW_POINTERS0(GLushort);
+
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         const GLint rowAr0 = rowA[j] & 0x1f;
+         const GLint rowAr1 = rowA[k] & 0x1f;
+         const GLint rowBr0 = rowB[j] & 0x1f;
+         const GLint rowBr1 = rowB[k] & 0x1f;
+         const GLint rowCr0 = rowC[j] & 0x1f;
+         const GLint rowCr1 = rowC[k] & 0x1f;
+         const GLint rowDr0 = rowD[j] & 0x1f;
+         const GLint rowDr1 = rowD[k] & 0x1f;
+         const GLint rowAg0 = (rowA[j] >> 5) & 0x3f;
+         const GLint rowAg1 = (rowA[k] >> 5) & 0x3f;
+         const GLint rowBg0 = (rowB[j] >> 5) & 0x3f;
+         const GLint rowBg1 = (rowB[k] >> 5) & 0x3f;
+         const GLint rowCg0 = (rowC[j] >> 5) & 0x3f;
+         const GLint rowCg1 = (rowC[k] >> 5) & 0x3f;
+         const GLint rowDg0 = (rowD[j] >> 5) & 0x3f;
+         const GLint rowDg1 = (rowD[k] >> 5) & 0x3f;
+         const GLint rowAb0 = (rowA[j] >> 11) & 0x1f;
+         const GLint rowAb1 = (rowA[k] >> 11) & 0x1f;
+         const GLint rowBb0 = (rowB[j] >> 11) & 0x1f;
+         const GLint rowBb1 = (rowB[k] >> 11) & 0x1f;
+         const GLint rowCb0 = (rowC[j] >> 11) & 0x1f;
+         const GLint rowCb1 = (rowC[k] >> 11) & 0x1f;
+         const GLint rowDb0 = (rowD[j] >> 11) & 0x1f;
+         const GLint rowDb1 = (rowD[k] >> 11) & 0x1f;
+         const GLint r = FILTER_SUM_3D(rowAr0, rowAr1, rowBr0, rowBr1,
+                                       rowCr0, rowCr1, rowDr0, rowDr1);
+         const GLint g = FILTER_SUM_3D(rowAg0, rowAg1, rowBg0, rowBg1,
+                                       rowCg0, rowCg1, rowDg0, rowDg1);
+         const GLint b = FILTER_SUM_3D(rowAb0, rowAb1, rowBb0, rowBb1,
+                                       rowCb0, rowCb1, rowDb0, rowDb1);
+         dst[i] = (b << 11) | (g << 5) | r;
+      }
+   }
+   else if ((datatype == GL_UNSIGNED_SHORT_4_4_4_4) && (comps == 4)) {
+      DECLARE_ROW_POINTERS0(GLushort);
+
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         const GLint rowAr0 = rowA[j] & 0xf;
+         const GLint rowAr1 = rowA[k] & 0xf;
+         const GLint rowBr0 = rowB[j] & 0xf;
+         const GLint rowBr1 = rowB[k] & 0xf;
+         const GLint rowCr0 = rowC[j] & 0xf;
+         const GLint rowCr1 = rowC[k] & 0xf;
+         const GLint rowDr0 = rowD[j] & 0xf;
+         const GLint rowDr1 = rowD[k] & 0xf;
+         const GLint rowAg0 = (rowA[j] >> 4) & 0xf;
+         const GLint rowAg1 = (rowA[k] >> 4) & 0xf;
+         const GLint rowBg0 = (rowB[j] >> 4) & 0xf;
+         const GLint rowBg1 = (rowB[k] >> 4) & 0xf;
+         const GLint rowCg0 = (rowC[j] >> 4) & 0xf;
+         const GLint rowCg1 = (rowC[k] >> 4) & 0xf;
+         const GLint rowDg0 = (rowD[j] >> 4) & 0xf;
+         const GLint rowDg1 = (rowD[k] >> 4) & 0xf;
+         const GLint rowAb0 = (rowA[j] >> 8) & 0xf;
+         const GLint rowAb1 = (rowA[k] >> 8) & 0xf;
+         const GLint rowBb0 = (rowB[j] >> 8) & 0xf;
+         const GLint rowBb1 = (rowB[k] >> 8) & 0xf;
+         const GLint rowCb0 = (rowC[j] >> 8) & 0xf;
+         const GLint rowCb1 = (rowC[k] >> 8) & 0xf;
+         const GLint rowDb0 = (rowD[j] >> 8) & 0xf;
+         const GLint rowDb1 = (rowD[k] >> 8) & 0xf;
+         const GLint rowAa0 = (rowA[j] >> 12) & 0xf;
+         const GLint rowAa1 = (rowA[k] >> 12) & 0xf;
+         const GLint rowBa0 = (rowB[j] >> 12) & 0xf;
+         const GLint rowBa1 = (rowB[k] >> 12) & 0xf;
+         const GLint rowCa0 = (rowC[j] >> 12) & 0xf;
+         const GLint rowCa1 = (rowC[k] >> 12) & 0xf;
+         const GLint rowDa0 = (rowD[j] >> 12) & 0xf;
+         const GLint rowDa1 = (rowD[k] >> 12) & 0xf;
+         const GLint r = FILTER_SUM_3D(rowAr0, rowAr1, rowBr0, rowBr1,
+                                       rowCr0, rowCr1, rowDr0, rowDr1);
+         const GLint g = FILTER_SUM_3D(rowAg0, rowAg1, rowBg0, rowBg1,
+                                       rowCg0, rowCg1, rowDg0, rowDg1);
+         const GLint b = FILTER_SUM_3D(rowAb0, rowAb1, rowBb0, rowBb1,
+                                       rowCb0, rowCb1, rowDb0, rowDb1);
+         const GLint a = FILTER_SUM_3D(rowAa0, rowAa1, rowBa0, rowBa1,
+                                       rowCa0, rowCa1, rowDa0, rowDa1);
+
+         dst[i] = (a << 12) | (b << 8) | (g << 4) | r;
+      }
+   }
+   else if ((datatype == GL_UNSIGNED_SHORT_1_5_5_5_REV) && (comps == 4)) {
+      DECLARE_ROW_POINTERS0(GLushort);
+
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         const GLint rowAr0 = rowA[j] & 0x1f;
+         const GLint rowAr1 = rowA[k] & 0x1f;
+         const GLint rowBr0 = rowB[j] & 0x1f;
+         const GLint rowBr1 = rowB[k] & 0x1f;
+         const GLint rowCr0 = rowC[j] & 0x1f;
+         const GLint rowCr1 = rowC[k] & 0x1f;
+         const GLint rowDr0 = rowD[j] & 0x1f;
+         const GLint rowDr1 = rowD[k] & 0x1f;
+         const GLint rowAg0 = (rowA[j] >> 5) & 0x1f;
+         const GLint rowAg1 = (rowA[k] >> 5) & 0x1f;
+         const GLint rowBg0 = (rowB[j] >> 5) & 0x1f;
+         const GLint rowBg1 = (rowB[k] >> 5) & 0x1f;
+         const GLint rowCg0 = (rowC[j] >> 5) & 0x1f;
+         const GLint rowCg1 = (rowC[k] >> 5) & 0x1f;
+         const GLint rowDg0 = (rowD[j] >> 5) & 0x1f;
+         const GLint rowDg1 = (rowD[k] >> 5) & 0x1f;
+         const GLint rowAb0 = (rowA[j] >> 10) & 0x1f;
+         const GLint rowAb1 = (rowA[k] >> 10) & 0x1f;
+         const GLint rowBb0 = (rowB[j] >> 10) & 0x1f;
+         const GLint rowBb1 = (rowB[k] >> 10) & 0x1f;
+         const GLint rowCb0 = (rowC[j] >> 10) & 0x1f;
+         const GLint rowCb1 = (rowC[k] >> 10) & 0x1f;
+         const GLint rowDb0 = (rowD[j] >> 10) & 0x1f;
+         const GLint rowDb1 = (rowD[k] >> 10) & 0x1f;
+         const GLint rowAa0 = (rowA[j] >> 15) & 0x1;
+         const GLint rowAa1 = (rowA[k] >> 15) & 0x1;
+         const GLint rowBa0 = (rowB[j] >> 15) & 0x1;
+         const GLint rowBa1 = (rowB[k] >> 15) & 0x1;
+         const GLint rowCa0 = (rowC[j] >> 15) & 0x1;
+         const GLint rowCa1 = (rowC[k] >> 15) & 0x1;
+         const GLint rowDa0 = (rowD[j] >> 15) & 0x1;
+         const GLint rowDa1 = (rowD[k] >> 15) & 0x1;
+         const GLint r = FILTER_SUM_3D(rowAr0, rowAr1, rowBr0, rowBr1,
+                                       rowCr0, rowCr1, rowDr0, rowDr1);
+         const GLint g = FILTER_SUM_3D(rowAg0, rowAg1, rowBg0, rowBg1,
+                                       rowCg0, rowCg1, rowDg0, rowDg1);
+         const GLint b = FILTER_SUM_3D(rowAb0, rowAb1, rowBb0, rowBb1,
+                                       rowCb0, rowCb1, rowDb0, rowDb1);
+         const GLint a = FILTER_SUM_3D(rowAa0, rowAa1, rowBa0, rowBa1,
+                                       rowCa0, rowCa1, rowDa0, rowDa1);
+
+         dst[i] = (a << 15) | (b << 10) | (g << 5) | r;
+      }
+   }
+   else if ((datatype == GL_UNSIGNED_SHORT_5_5_5_1) && (comps == 4)) {
+      DECLARE_ROW_POINTERS0(GLushort);
+
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         const GLint rowAr0 = (rowA[j] >> 11) & 0x1f;
+         const GLint rowAr1 = (rowA[k] >> 11) & 0x1f;
+         const GLint rowBr0 = (rowB[j] >> 11) & 0x1f;
+         const GLint rowBr1 = (rowB[k] >> 11) & 0x1f;
+         const GLint rowCr0 = (rowC[j] >> 11) & 0x1f;
+         const GLint rowCr1 = (rowC[k] >> 11) & 0x1f;
+         const GLint rowDr0 = (rowD[j] >> 11) & 0x1f;
+         const GLint rowDr1 = (rowD[k] >> 11) & 0x1f;
+         const GLint rowAg0 = (rowA[j] >> 6) & 0x1f;
+         const GLint rowAg1 = (rowA[k] >> 6) & 0x1f;
+         const GLint rowBg0 = (rowB[j] >> 6) & 0x1f;
+         const GLint rowBg1 = (rowB[k] >> 6) & 0x1f;
+         const GLint rowCg0 = (rowC[j] >> 6) & 0x1f;
+         const GLint rowCg1 = (rowC[k] >> 6) & 0x1f;
+         const GLint rowDg0 = (rowD[j] >> 6) & 0x1f;
+         const GLint rowDg1 = (rowD[k] >> 6) & 0x1f;
+         const GLint rowAb0 = (rowA[j] >> 1) & 0x1f;
+         const GLint rowAb1 = (rowA[k] >> 1) & 0x1f;
+         const GLint rowBb0 = (rowB[j] >> 1) & 0x1f;
+         const GLint rowBb1 = (rowB[k] >> 1) & 0x1f;
+         const GLint rowCb0 = (rowC[j] >> 1) & 0x1f;
+         const GLint rowCb1 = (rowC[k] >> 1) & 0x1f;
+         const GLint rowDb0 = (rowD[j] >> 1) & 0x1f;
+         const GLint rowDb1 = (rowD[k] >> 1) & 0x1f;
+         const GLint rowAa0 = (rowA[j] & 0x1);
+         const GLint rowAa1 = (rowA[k] & 0x1);
+         const GLint rowBa0 = (rowB[j] & 0x1);
+         const GLint rowBa1 = (rowB[k] & 0x1);
+         const GLint rowCa0 = (rowC[j] & 0x1);
+         const GLint rowCa1 = (rowC[k] & 0x1);
+         const GLint rowDa0 = (rowD[j] & 0x1);
+         const GLint rowDa1 = (rowD[k] & 0x1);
+         const GLint r = FILTER_SUM_3D(rowAr0, rowAr1, rowBr0, rowBr1,
+                                       rowCr0, rowCr1, rowDr0, rowDr1);
+         const GLint g = FILTER_SUM_3D(rowAg0, rowAg1, rowBg0, rowBg1,
+                                       rowCg0, rowCg1, rowDg0, rowDg1);
+         const GLint b = FILTER_SUM_3D(rowAb0, rowAb1, rowBb0, rowBb1,
+                                       rowCb0, rowCb1, rowDb0, rowDb1);
+         const GLint a = FILTER_SUM_3D(rowAa0, rowAa1, rowBa0, rowBa1,
+                                       rowCa0, rowCa1, rowDa0, rowDa1);
+
+         dst[i] = (r << 11) | (g << 6) | (b << 1) | a;
+      }
+   }
+   else if ((datatype == GL_UNSIGNED_BYTE_3_3_2) && (comps == 3)) {
+      DECLARE_ROW_POINTERS0(GLubyte);
+
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         const GLint rowAr0 = rowA[j] & 0x3;
+         const GLint rowAr1 = rowA[k] & 0x3;
+         const GLint rowBr0 = rowB[j] & 0x3;
+         const GLint rowBr1 = rowB[k] & 0x3;
+         const GLint rowCr0 = rowC[j] & 0x3;
+         const GLint rowCr1 = rowC[k] & 0x3;
+         const GLint rowDr0 = rowD[j] & 0x3;
+         const GLint rowDr1 = rowD[k] & 0x3;
+         const GLint rowAg0 = (rowA[j] >> 2) & 0x7;
+         const GLint rowAg1 = (rowA[k] >> 2) & 0x7;
+         const GLint rowBg0 = (rowB[j] >> 2) & 0x7;
+         const GLint rowBg1 = (rowB[k] >> 2) & 0x7;
+         const GLint rowCg0 = (rowC[j] >> 2) & 0x7;
+         const GLint rowCg1 = (rowC[k] >> 2) & 0x7;
+         const GLint rowDg0 = (rowD[j] >> 2) & 0x7;
+         const GLint rowDg1 = (rowD[k] >> 2) & 0x7;
+         const GLint rowAb0 = (rowA[j] >> 5) & 0x7;
+         const GLint rowAb1 = (rowA[k] >> 5) & 0x7;
+         const GLint rowBb0 = (rowB[j] >> 5) & 0x7;
+         const GLint rowBb1 = (rowB[k] >> 5) & 0x7;
+         const GLint rowCb0 = (rowC[j] >> 5) & 0x7;
+         const GLint rowCb1 = (rowC[k] >> 5) & 0x7;
+         const GLint rowDb0 = (rowD[j] >> 5) & 0x7;
+         const GLint rowDb1 = (rowD[k] >> 5) & 0x7;
+         const GLint r = FILTER_SUM_3D(rowAr0, rowAr1, rowBr0, rowBr1,
+                                       rowCr0, rowCr1, rowDr0, rowDr1);
+         const GLint g = FILTER_SUM_3D(rowAg0, rowAg1, rowBg0, rowBg1,
+                                       rowCg0, rowCg1, rowDg0, rowDg1);
+         const GLint b = FILTER_SUM_3D(rowAb0, rowAb1, rowBb0, rowBb1,
+                                       rowCb0, rowCb1, rowDb0, rowDb1);
+         dst[i] = (b << 5) | (g << 2) | r;
+      }
+   }
+   else if (datatype == MESA_UNSIGNED_BYTE_4_4 && comps == 2) {
+      DECLARE_ROW_POINTERS0(GLubyte);
+
+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+           i++, j += colStride, k += colStride) {
+         const GLint rowAr0 = rowA[j] & 0xf;
+         const GLint rowAr1 = rowA[k] & 0xf;
+         const GLint rowBr0 = rowB[j] & 0xf;
+         const GLint rowBr1 = rowB[k] & 0xf;
+         const GLint rowCr0 = rowC[j] & 0xf;
+         const GLint rowCr1 = rowC[k] & 0xf;
+         const GLint rowDr0 = rowD[j] & 0xf;
+         const GLint rowDr1 = rowD[k] & 0xf;
+         const GLint rowAg0 = (rowA[j] >> 4) & 0xf;
+         const GLint rowAg1 = (rowA[k] >> 4) & 0xf;
+         const GLint rowBg0 = (rowB[j] >> 4) & 0xf;
+         const GLint rowBg1 = (rowB[k] >> 4) & 0xf;
+         const GLint rowCg0 = (rowC[j] >> 4) & 0xf;
+         const GLint rowCg1 = (rowC[k] >> 4) & 0xf;
+         const GLint rowDg0 = (rowD[j] >> 4) & 0xf;
+         const GLint rowDg1 = (rowD[k] >> 4) & 0xf;
+         const GLint r = FILTER_SUM_3D(rowAr0, rowAr1, rowBr0, rowBr1,
+                                       rowCr0, rowCr1, rowDr0, rowDr1);
+         const GLint g = FILTER_SUM_3D(rowAg0, rowAg1, rowBg0, rowBg1,
+                                       rowCg0, rowCg1, rowDg0, rowDg1);
+         dst[i] = (g << 4) | r;
+      }
+   }
+   else {
+      _mesa_problem(NULL, "bad format in do_row()");
+   }
+}
+
+
+/*
+ * These functions generate a 1/2-size mipmap image from a source image.
+ * Texture borders are handled by copying or averaging the source image's
+ * border texels, depending on the scale-down factor.
+ */
+
+static void
+make_1d_mipmap(GLenum datatype, GLuint comps, GLint border,
+               GLint srcWidth, const GLubyte *srcPtr,
+               GLint dstWidth, GLubyte *dstPtr)
+{
+   const GLint bpt = bytes_per_pixel(datatype, comps);
+   const GLubyte *src;
+   GLubyte *dst;
+
+   /* skip the border pixel, if any */
+   src = srcPtr + border * bpt;
+   dst = dstPtr + border * bpt;
+
+   /* we just duplicate the input row, kind of hack, saves code */
+   do_row(datatype, comps, srcWidth - 2 * border, src, src,
+          dstWidth - 2 * border, dst);
+
+   if (border) {
+      /* copy left-most pixel from source */
+      assert(dstPtr);
+      assert(srcPtr);
+      memcpy(dstPtr, srcPtr, bpt);
+      /* copy right-most pixel from source */
+      memcpy(dstPtr + (dstWidth - 1) * bpt,
+             srcPtr + (srcWidth - 1) * bpt,
+             bpt);
+   }
+}
+
+
+static void
+make_2d_mipmap(GLenum datatype, GLuint comps, GLint border,
+               GLint srcWidth, GLint srcHeight,
+	       const GLubyte *srcPtr, GLint srcRowStride,
+               GLint dstWidth, GLint dstHeight,
+	       GLubyte *dstPtr, GLint dstRowStride)
+{
+   const GLint bpt = bytes_per_pixel(datatype, comps);
+   const GLint srcWidthNB = srcWidth - 2 * border;  /* sizes w/out border */
+   const GLint dstWidthNB = dstWidth - 2 * border;
+   const GLint dstHeightNB = dstHeight - 2 * border;
+   const GLint srcRowBytes = bpt * srcRowStride;
+   const GLint dstRowBytes = bpt * dstRowStride;
+   const GLubyte *srcA, *srcB;
+   GLubyte *dst;
+   GLint row, srcRowStep;
+
+   /* Compute src and dst pointers, skipping any border */
+   srcA = srcPtr + border * ((srcWidth + 1) * bpt);
+   if (srcHeight > 1 && srcHeight > dstHeight) {
+      /* sample from two source rows */
+      srcB = srcA + srcRowBytes;
+      srcRowStep = 2;
+   }
+   else {
+      /* sample from one source row */
+      srcB = srcA;
+      srcRowStep = 1;
+   }
+
+   dst = dstPtr + border * ((dstWidth + 1) * bpt);
+
+   for (row = 0; row < dstHeightNB; row++) {
+      do_row(datatype, comps, srcWidthNB, srcA, srcB,
+             dstWidthNB, dst);
+      srcA += srcRowStep * srcRowBytes;
+      srcB += srcRowStep * srcRowBytes;
+      dst += dstRowBytes;
+   }
+
+   /* This is ugly but probably won't be used much */
+   if (border > 0) {
+      /* fill in dest border */
+      /* lower-left border pixel */
+      assert(dstPtr);
+      assert(srcPtr);
+      memcpy(dstPtr, srcPtr, bpt);
+      /* lower-right border pixel */
+      memcpy(dstPtr + (dstWidth - 1) * bpt,
+             srcPtr + (srcWidth - 1) * bpt, bpt);
+      /* upper-left border pixel */
+      memcpy(dstPtr + dstWidth * (dstHeight - 1) * bpt,
+             srcPtr + srcWidth * (srcHeight - 1) * bpt, bpt);
+      /* upper-right border pixel */
+      memcpy(dstPtr + (dstWidth * dstHeight - 1) * bpt,
+             srcPtr + (srcWidth * srcHeight - 1) * bpt, bpt);
+      /* lower border */
+      do_row(datatype, comps, srcWidthNB,
+             srcPtr + bpt,
+             srcPtr + bpt,
+             dstWidthNB, dstPtr + bpt);
+      /* upper border */
+      do_row(datatype, comps, srcWidthNB,
+             srcPtr + (srcWidth * (srcHeight - 1) + 1) * bpt,
+             srcPtr + (srcWidth * (srcHeight - 1) + 1) * bpt,
+             dstWidthNB,
+             dstPtr + (dstWidth * (dstHeight - 1) + 1) * bpt);
+      /* left and right borders */
+      if (srcHeight == dstHeight) {
+         /* copy border pixel from src to dst */
+         for (row = 1; row < srcHeight; row++) {
+            memcpy(dstPtr + dstWidth * row * bpt,
+                   srcPtr + srcWidth * row * bpt, bpt);
+            memcpy(dstPtr + (dstWidth * row + dstWidth - 1) * bpt,
+                   srcPtr + (srcWidth * row + srcWidth - 1) * bpt, bpt);
+         }
+      }
+      else {
+         /* average two src pixels each dest pixel */
+         for (row = 0; row < dstHeightNB; row += 2) {
+            do_row(datatype, comps, 1,
+                   srcPtr + (srcWidth * (row * 2 + 1)) * bpt,
+                   srcPtr + (srcWidth * (row * 2 + 2)) * bpt,
+                   1, dstPtr + (dstWidth * row + 1) * bpt);
+            do_row(datatype, comps, 1,
+                   srcPtr + (srcWidth * (row * 2 + 1) + srcWidth - 1) * bpt,
+                   srcPtr + (srcWidth * (row * 2 + 2) + srcWidth - 1) * bpt,
+                   1, dstPtr + (dstWidth * row + 1 + dstWidth - 1) * bpt);
+         }
+      }
+   }
+}
+
+
+static void
+make_3d_mipmap(GLenum datatype, GLuint comps, GLint border,
+               GLint srcWidth, GLint srcHeight, GLint srcDepth,
+               const GLubyte *srcPtr, GLint srcRowStride,
+               GLint dstWidth, GLint dstHeight, GLint dstDepth,
+               GLubyte *dstPtr, GLint dstRowStride)
+{
+   const GLint bpt = bytes_per_pixel(datatype, comps);
+   const GLint srcWidthNB = srcWidth - 2 * border;  /* sizes w/out border */
+   const GLint srcDepthNB = srcDepth - 2 * border;
+   const GLint dstWidthNB = dstWidth - 2 * border;
+   const GLint dstHeightNB = dstHeight - 2 * border;
+   const GLint dstDepthNB = dstDepth - 2 * border;
+   GLint img, row;
+   GLint bytesPerSrcImage, bytesPerDstImage;
+   GLint bytesPerSrcRow, bytesPerDstRow;
+   GLint srcImageOffset, srcRowOffset;
+
+   (void) srcDepthNB; /* silence warnings */
+
+
+   bytesPerSrcImage = srcWidth * srcHeight * bpt;
+   bytesPerDstImage = dstWidth * dstHeight * bpt;
+
+   bytesPerSrcRow = srcWidth * bpt;
+   bytesPerDstRow = dstWidth * bpt;
+
+   /* Offset between adjacent src images to be averaged together */
+   srcImageOffset = (srcDepth == dstDepth) ? 0 : bytesPerSrcImage;
+
+   /* Offset between adjacent src rows to be averaged together */
+   srcRowOffset = (srcHeight == dstHeight) ? 0 : srcWidth * bpt;
+
+   /*
+    * Need to average together up to 8 src pixels for each dest pixel.
+    * Break that down into 3 operations:
+    *   1. take two rows from source image and average them together.
+    *   2. take two rows from next source image and average them together.
+    *   3. take the two averaged rows and average them for the final dst row.
+    */
+
+   /*
+   printf("mip3d %d x %d x %d  ->  %d x %d x %d\n",
+          srcWidth, srcHeight, srcDepth, dstWidth, dstHeight, dstDepth);
+   */
+
+   for (img = 0; img < dstDepthNB; img++) {
+      /* first source image pointer, skipping border */
+      const GLubyte *imgSrcA = srcPtr
+         + (bytesPerSrcImage + bytesPerSrcRow + border) * bpt * border
+         + img * (bytesPerSrcImage + srcImageOffset);
+      /* second source image pointer, skipping border */
+      const GLubyte *imgSrcB = imgSrcA + srcImageOffset;
+      /* address of the dest image, skipping border */
+      GLubyte *imgDst = dstPtr
+         + (bytesPerDstImage + bytesPerDstRow + border) * bpt * border
+         + img * bytesPerDstImage;
+
+      /* setup the four source row pointers and the dest row pointer */
+      const GLubyte *srcImgARowA = imgSrcA;
+      const GLubyte *srcImgARowB = imgSrcA + srcRowOffset;
+      const GLubyte *srcImgBRowA = imgSrcB;
+      const GLubyte *srcImgBRowB = imgSrcB + srcRowOffset;
+      GLubyte *dstImgRow = imgDst;
+
+      for (row = 0; row < dstHeightNB; row++) {
+         do_row_3D(datatype, comps, srcWidthNB, 
+                   srcImgARowA, srcImgARowB,
+                   srcImgBRowA, srcImgBRowB,
+                   dstWidthNB, dstImgRow);
+
+         /* advance to next rows */
+         srcImgARowA += bytesPerSrcRow + srcRowOffset;
+         srcImgARowB += bytesPerSrcRow + srcRowOffset;
+         srcImgBRowA += bytesPerSrcRow + srcRowOffset;
+         srcImgBRowB += bytesPerSrcRow + srcRowOffset;
+         dstImgRow += bytesPerDstRow;
+      }
+   }
+
+
+   /* Luckily we can leverage the make_2d_mipmap() function here! */
+   if (border > 0) {
+      /* do front border image */
+      make_2d_mipmap(datatype, comps, 1, srcWidth, srcHeight, srcPtr, srcRowStride,
+                     dstWidth, dstHeight, dstPtr, dstRowStride);
+      /* do back border image */
+      make_2d_mipmap(datatype, comps, 1, srcWidth, srcHeight,
+                     srcPtr + bytesPerSrcImage * (srcDepth - 1), srcRowStride,
+                     dstWidth, dstHeight,
+                     dstPtr + bytesPerDstImage * (dstDepth - 1), dstRowStride);
+      /* do four remaining border edges that span the image slices */
+      if (srcDepth == dstDepth) {
+         /* just copy border pixels from src to dst */
+         for (img = 0; img < dstDepthNB; img++) {
+            const GLubyte *src;
+            GLubyte *dst;
+
+            /* do border along [img][row=0][col=0] */
+            src = srcPtr + (img + 1) * bytesPerSrcImage;
+            dst = dstPtr + (img + 1) * bytesPerDstImage;
+            memcpy(dst, src, bpt);
+
+            /* do border along [img][row=dstHeight-1][col=0] */
+            src = srcPtr + (img * 2 + 1) * bytesPerSrcImage
+                         + (srcHeight - 1) * bytesPerSrcRow;
+            dst = dstPtr + (img + 1) * bytesPerDstImage
+                         + (dstHeight - 1) * bytesPerDstRow;
+            memcpy(dst, src, bpt);
+
+            /* do border along [img][row=0][col=dstWidth-1] */
+            src = srcPtr + (img * 2 + 1) * bytesPerSrcImage
+                         + (srcWidth - 1) * bpt;
+            dst = dstPtr + (img + 1) * bytesPerDstImage
+                         + (dstWidth - 1) * bpt;
+            memcpy(dst, src, bpt);
+
+            /* do border along [img][row=dstHeight-1][col=dstWidth-1] */
+            src = srcPtr + (img * 2 + 1) * bytesPerSrcImage
+                         + (bytesPerSrcImage - bpt);
+            dst = dstPtr + (img + 1) * bytesPerDstImage
+                         + (bytesPerDstImage - bpt);
+            memcpy(dst, src, bpt);
+         }
+      }
+      else {
+         /* average border pixels from adjacent src image pairs */
+         ASSERT(srcDepthNB == 2 * dstDepthNB);
+         for (img = 0; img < dstDepthNB; img++) {
+            const GLubyte *src;
+            GLubyte *dst;
+
+            /* do border along [img][row=0][col=0] */
+            src = srcPtr + (img * 2 + 1) * bytesPerSrcImage;
+            dst = dstPtr + (img + 1) * bytesPerDstImage;
+            do_row(datatype, comps, 1, src, src + srcImageOffset, 1, dst);
+
+            /* do border along [img][row=dstHeight-1][col=0] */
+            src = srcPtr + (img * 2 + 1) * bytesPerSrcImage
+                         + (srcHeight - 1) * bytesPerSrcRow;
+            dst = dstPtr + (img + 1) * bytesPerDstImage
+                         + (dstHeight - 1) * bytesPerDstRow;
+            do_row(datatype, comps, 1, src, src + srcImageOffset, 1, dst);
+
+            /* do border along [img][row=0][col=dstWidth-1] */
+            src = srcPtr + (img * 2 + 1) * bytesPerSrcImage
+                         + (srcWidth - 1) * bpt;
+            dst = dstPtr + (img + 1) * bytesPerDstImage
+                         + (dstWidth - 1) * bpt;
+            do_row(datatype, comps, 1, src, src + srcImageOffset, 1, dst);
+
+            /* do border along [img][row=dstHeight-1][col=dstWidth-1] */
+            src = srcPtr + (img * 2 + 1) * bytesPerSrcImage
+                         + (bytesPerSrcImage - bpt);
+            dst = dstPtr + (img + 1) * bytesPerDstImage
+                         + (bytesPerDstImage - bpt);
+            do_row(datatype, comps, 1, src, src + srcImageOffset, 1, dst);
+         }
+      }
+   }
+}
+
+
+static void
+make_1d_stack_mipmap(GLenum datatype, GLuint comps, GLint border,
+                     GLint srcWidth, const GLubyte *srcPtr, GLuint srcRowStride,
+                     GLint dstWidth, GLint dstHeight,
+		     GLubyte *dstPtr, GLuint dstRowStride )
+{
+   const GLint bpt = bytes_per_pixel(datatype, comps);
+   const GLint srcWidthNB = srcWidth - 2 * border;  /* sizes w/out border */
+   const GLint dstWidthNB = dstWidth - 2 * border;
+   const GLint dstHeightNB = dstHeight - 2 * border;
+   const GLint srcRowBytes = bpt * srcRowStride;
+   const GLint dstRowBytes = bpt * dstRowStride;
+   const GLubyte *src;
+   GLubyte *dst;
+   GLint row;
+
+   /* Compute src and dst pointers, skipping any border */
+   src = srcPtr + border * ((srcWidth + 1) * bpt);
+   dst = dstPtr + border * ((dstWidth + 1) * bpt);
+
+   for (row = 0; row < dstHeightNB; row++) {
+      do_row(datatype, comps, srcWidthNB, src, src,
+             dstWidthNB, dst);
+      src += srcRowBytes;
+      dst += dstRowBytes;
+   }
+
+   if (border) {
+      /* copy left-most pixel from source */
+      assert(dstPtr);
+      assert(srcPtr);
+      memcpy(dstPtr, srcPtr, bpt);
+      /* copy right-most pixel from source */
+      memcpy(dstPtr + (dstWidth - 1) * bpt,
+             srcPtr + (srcWidth - 1) * bpt,
+             bpt);
+   }
+}
+
+
+/**
+ * \bug
+ * There is quite a bit of refactoring that could be done with this function
+ * and \c make_2d_mipmap.
+ */
+static void
+make_2d_stack_mipmap(GLenum datatype, GLuint comps, GLint border,
+                     GLint srcWidth, GLint srcHeight,
+		     const GLubyte *srcPtr, GLint srcRowStride,
+                     GLint dstWidth, GLint dstHeight, GLint dstDepth,
+                     GLubyte *dstPtr, GLint dstRowStride)
+{
+   const GLint bpt = bytes_per_pixel(datatype, comps);
+   const GLint srcWidthNB = srcWidth - 2 * border;  /* sizes w/out border */
+   const GLint dstWidthNB = dstWidth - 2 * border;
+   const GLint dstHeightNB = dstHeight - 2 * border;
+   const GLint dstDepthNB = dstDepth - 2 * border;
+   const GLint srcRowBytes = bpt * srcRowStride;
+   const GLint dstRowBytes = bpt * dstRowStride;
+   const GLubyte *srcA, *srcB;
+   GLubyte *dst;
+   GLint layer;
+   GLint row;
+
+   /* Compute src and dst pointers, skipping any border */
+   srcA = srcPtr + border * ((srcWidth + 1) * bpt);
+   if (srcHeight > 1) 
+      srcB = srcA + srcRowBytes;
+   else
+      srcB = srcA;
+   dst = dstPtr + border * ((dstWidth + 1) * bpt);
+
+   for (layer = 0; layer < dstDepthNB; layer++) {
+      for (row = 0; row < dstHeightNB; row++) {
+         do_row(datatype, comps, srcWidthNB, srcA, srcB,
+                dstWidthNB, dst);
+         srcA += 2 * srcRowBytes;
+         srcB += 2 * srcRowBytes;
+         dst += dstRowBytes;
+      }
+
+      /* This is ugly but probably won't be used much */
+      if (border > 0) {
+         /* fill in dest border */
+         /* lower-left border pixel */
+         assert(dstPtr);
+         assert(srcPtr);
+         memcpy(dstPtr, srcPtr, bpt);
+         /* lower-right border pixel */
+         memcpy(dstPtr + (dstWidth - 1) * bpt,
+                srcPtr + (srcWidth - 1) * bpt, bpt);
+         /* upper-left border pixel */
+         memcpy(dstPtr + dstWidth * (dstHeight - 1) * bpt,
+                srcPtr + srcWidth * (srcHeight - 1) * bpt, bpt);
+         /* upper-right border pixel */
+         memcpy(dstPtr + (dstWidth * dstHeight - 1) * bpt,
+                srcPtr + (srcWidth * srcHeight - 1) * bpt, bpt);
+         /* lower border */
+         do_row(datatype, comps, srcWidthNB,
+                srcPtr + bpt,
+                srcPtr + bpt,
+                dstWidthNB, dstPtr + bpt);
+         /* upper border */
+         do_row(datatype, comps, srcWidthNB,
+                srcPtr + (srcWidth * (srcHeight - 1) + 1) * bpt,
+                srcPtr + (srcWidth * (srcHeight - 1) + 1) * bpt,
+                dstWidthNB,
+                dstPtr + (dstWidth * (dstHeight - 1) + 1) * bpt);
+         /* left and right borders */
+         if (srcHeight == dstHeight) {
+            /* copy border pixel from src to dst */
+            for (row = 1; row < srcHeight; row++) {
+               memcpy(dstPtr + dstWidth * row * bpt,
+                      srcPtr + srcWidth * row * bpt, bpt);
+               memcpy(dstPtr + (dstWidth * row + dstWidth - 1) * bpt,
+                      srcPtr + (srcWidth * row + srcWidth - 1) * bpt, bpt);
+            }
+         }
+         else {
+            /* average two src pixels each dest pixel */
+            for (row = 0; row < dstHeightNB; row += 2) {
+               do_row(datatype, comps, 1,
+                      srcPtr + (srcWidth * (row * 2 + 1)) * bpt,
+                      srcPtr + (srcWidth * (row * 2 + 2)) * bpt,
+                      1, dstPtr + (dstWidth * row + 1) * bpt);
+               do_row(datatype, comps, 1,
+                      srcPtr + (srcWidth * (row * 2 + 1) + srcWidth - 1) * bpt,
+                      srcPtr + (srcWidth * (row * 2 + 2) + srcWidth - 1) * bpt,
+                      1, dstPtr + (dstWidth * row + 1 + dstWidth - 1) * bpt);
+            }
+         }
+      }
+   }
+}
+
+
+/**
+ * Down-sample a texture image to produce the next lower mipmap level.
+ * \param comps  components per texel (1, 2, 3 or 4)
+ * \param srcRowStride  stride between source rows, in texels
+ * \param dstRowStride  stride between destination rows, in texels
+ */
+void
+_mesa_generate_mipmap_level(GLenum target,
+                            GLenum datatype, GLuint comps,
+                            GLint border,
+                            GLint srcWidth, GLint srcHeight, GLint srcDepth,
+                            const GLubyte *srcData,
+                            GLint srcRowStride,
+                            GLint dstWidth, GLint dstHeight, GLint dstDepth,
+                            GLubyte *dstData,
+                            GLint dstRowStride)
+{
+   /*
+    * We use simple 2x2 averaging to compute the next mipmap level.
+    */
+   switch (target) {
+   case GL_TEXTURE_1D:
+      make_1d_mipmap(datatype, comps, border,
+                     srcWidth, srcData,
+                     dstWidth, dstData);
+      break;
+   case GL_TEXTURE_2D:
+   case GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB:
+   case GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB:
+   case GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB:
+   case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB:
+   case GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB:
+   case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB:
+      make_2d_mipmap(datatype, comps, border,
+                     srcWidth, srcHeight, srcData, srcRowStride,
+                     dstWidth, dstHeight, dstData, dstRowStride);
+      break;
+   case GL_TEXTURE_3D:
+      make_3d_mipmap(datatype, comps, border,
+                     srcWidth, srcHeight, srcDepth,
+                     srcData, srcRowStride,
+                     dstWidth, dstHeight, dstDepth,
+                     dstData, dstRowStride);
+      break;
+   case GL_TEXTURE_1D_ARRAY_EXT:
+      make_1d_stack_mipmap(datatype, comps, border,
+                           srcWidth, srcData, srcRowStride,
+                           dstWidth, dstHeight,
+                           dstData, dstRowStride);
+      break;
+   case GL_TEXTURE_2D_ARRAY_EXT:
+      make_2d_stack_mipmap(datatype, comps, border,
+                           srcWidth, srcHeight,
+                           srcData, srcRowStride,
+                           dstWidth, dstHeight,
+                           dstDepth, dstData, dstRowStride);
+      break;
+   case GL_TEXTURE_RECTANGLE_NV:
+      /* no mipmaps, do nothing */
+      break;
+   default:
+      _mesa_problem(NULL, "bad dimensions in _mesa_generate_mipmaps");
+      return;
+   }
+}
+
+
+/**
+ * compute next (level+1) image size
+ * \return GL_FALSE if no smaller size can be generated (eg. src is 1x1x1 size)
+ */
+static GLboolean
+next_mipmap_level_size(GLenum target, GLint border,
+                       GLint srcWidth, GLint srcHeight, GLint srcDepth,
+                       GLint *dstWidth, GLint *dstHeight, GLint *dstDepth)
+{
+   if (srcWidth - 2 * border > 1) {
+      *dstWidth = (srcWidth - 2 * border) / 2 + 2 * border;
+   }
+   else {
+      *dstWidth = srcWidth; /* can't go smaller */
+   }
+
+   if ((srcHeight - 2 * border > 1) && 
+       (target != GL_TEXTURE_1D_ARRAY_EXT)) {
+      *dstHeight = (srcHeight - 2 * border) / 2 + 2 * border;
+   }
+   else {
+      *dstHeight = srcHeight; /* can't go smaller */
+   }
+
+   if ((srcDepth - 2 * border > 1) &&
+       (target != GL_TEXTURE_2D_ARRAY_EXT)) {
+      *dstDepth = (srcDepth - 2 * border) / 2 + 2 * border;
+   }
+   else {
+      *dstDepth = srcDepth; /* can't go smaller */
+   }
+
+   if (*dstWidth == srcWidth &&
+       *dstHeight == srcHeight &&
+       *dstDepth == srcDepth) {
+      return GL_FALSE;
+   }
+   else {
+      return GL_TRUE;
+   }
+}
+
+
+
+
+/**
+ * Automatic mipmap generation.
+ * This is the fallback/default function for ctx->Driver.GenerateMipmap().
+ * Generate a complete set of mipmaps from texObj's BaseLevel image.
+ * Stop at texObj's MaxLevel or when we get to the 1x1 texture.
+ * For cube maps, target will be one of
+ * GL_TEXTURE_CUBE_MAP_POSITIVE/NEGATIVE_X/Y/Z; never GL_TEXTURE_CUBE_MAP.
+ */
+void
+_mesa_generate_mipmap(struct gl_context *ctx, GLenum target,
+                      struct gl_texture_object *texObj)
+{
+   const struct gl_texture_image *srcImage;
+   gl_format convertFormat;
+   const GLubyte *srcData = NULL;
+   GLubyte *dstData = NULL;
+   GLint level, maxLevels;
+   GLenum datatype;
+   GLuint comps;
+
+   ASSERT(texObj);
+   srcImage = _mesa_select_tex_image(ctx, texObj, target, texObj->BaseLevel);
+   ASSERT(srcImage);
+
+   maxLevels = _mesa_max_texture_levels(ctx, texObj->Target);
+   ASSERT(maxLevels > 0);  /* bad target */
+
+   /* Find convertFormat - the format that do_row() will process */
+
+   if (_mesa_is_format_compressed(srcImage->TexFormat)) {
+      /* setup for compressed textures - need to allocate temporary
+       * image buffers to hold uncompressed images.
+       */
+      GLuint row;
+      GLint  components, size;
+      GLchan *dst;
+
+      assert(texObj->Target == GL_TEXTURE_2D ||
+             texObj->Target == GL_TEXTURE_CUBE_MAP_ARB);
+
+      if (srcImage->_BaseFormat == GL_RGB) {
+         convertFormat = MESA_FORMAT_RGB888;
+         components = 3;
+      } else if (srcImage->_BaseFormat == GL_RED) {
+         convertFormat = MESA_FORMAT_R8;
+         components = 1;
+      } else if (srcImage->_BaseFormat == GL_RG) {
+         convertFormat = MESA_FORMAT_RG88;
+         components = 2;
+      } else if (srcImage->_BaseFormat == GL_RGBA) {
+         convertFormat = MESA_FORMAT_RGBA8888;
+         components = 4;
+      }
+      else {
+         _mesa_problem(ctx, "bad srcImage->_BaseFormat in _mesa_generate_mipmaps");
+         return;
+      }
+
+      /* allocate storage for uncompressed GL_RGB or GL_RGBA images */
+      size = _mesa_bytes_per_pixel(srcImage->_BaseFormat, CHAN_TYPE)
+         * srcImage->Width * srcImage->Height * srcImage->Depth + 20;
+      /* 20 extra bytes, just be safe when calling last FetchTexel */
+      srcData = (GLubyte *) malloc(size);
+      if (!srcData) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "generate mipmaps");
+         return;
+      }
+      dstData = (GLubyte *) malloc(size / 2);  /* 1/4 would probably be OK */
+      if (!dstData) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "generate mipmaps");
+         free((void *) srcData);
+         return;
+      }
+
+      /* decompress base image here */
+      dst = (GLchan *) srcData;
+      for (row = 0; row < srcImage->Height; row++) {
+         GLuint col;
+         for (col = 0; col < srcImage->Width; col++) {
+            srcImage->FetchTexelc(srcImage, col, row, 0, dst);
+            dst += components;
+         }
+      }
+   }
+   else {
+      /* uncompressed */
+      convertFormat = srcImage->TexFormat;
+   }
+
+   _mesa_format_to_type_and_comps(convertFormat, &datatype, &comps);
+
+   for (level = texObj->BaseLevel; level < texObj->MaxLevel
+           && level < maxLevels - 1; level++) {
+      /* generate image[level+1] from image[level] */
+      const struct gl_texture_image *srcImage;
+      struct gl_texture_image *dstImage;
+      GLint srcWidth, srcHeight, srcDepth;
+      GLint dstWidth, dstHeight, dstDepth;
+      GLint border;
+      GLboolean nextLevel;
+
+      /* get src image parameters */
+      srcImage = _mesa_select_tex_image(ctx, texObj, target, level);
+      ASSERT(srcImage);
+      srcWidth = srcImage->Width;
+      srcHeight = srcImage->Height;
+      srcDepth = srcImage->Depth;
+      border = srcImage->Border;
+
+      nextLevel = next_mipmap_level_size(target, border,
+                                         srcWidth, srcHeight, srcDepth,
+                                         &dstWidth, &dstHeight, &dstDepth);
+      if (!nextLevel) {
+         /* all done */
+         if (_mesa_is_format_compressed(srcImage->TexFormat)) {
+            free((void *) srcData);
+            free(dstData);
+         }
+         return;
+      }
+
+      /* get dest gl_texture_image */
+      dstImage = _mesa_get_tex_image(ctx, texObj, target, level + 1);
+      if (!dstImage) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "generating mipmaps");
+         return;
+      }
+
+      /* Free old image data */
+      if (dstImage->Data)
+         ctx->Driver.FreeTexImageData(ctx, dstImage);
+
+      /* initialize new image */
+      _mesa_init_teximage_fields(ctx, target, dstImage, dstWidth, dstHeight,
+                                 dstDepth, border, srcImage->InternalFormat,
+                                 srcImage->TexFormat);
+      dstImage->DriverData = NULL;
+      dstImage->FetchTexelc = srcImage->FetchTexelc;
+      dstImage->FetchTexelf = srcImage->FetchTexelf;
+
+      /* Alloc new teximage data buffer */
+      {
+         GLuint size = _mesa_format_image_size(dstImage->TexFormat,
+                                               dstWidth, dstHeight, dstDepth);
+         dstImage->Data = _mesa_alloc_texmemory(size);
+         if (!dstImage->Data) {
+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "generating mipmaps");
+            return;
+         }
+      }
+
+      /* Setup src and dest data pointers */
+      if (_mesa_is_format_compressed(dstImage->TexFormat)) {
+         /* srcData and dstData are already set */
+         ASSERT(srcData);
+         ASSERT(dstData);
+      }
+      else {
+         srcData = (const GLubyte *) srcImage->Data;
+         dstData = (GLubyte *) dstImage->Data;
+      }
+
+      ASSERT(dstImage->TexFormat);
+      ASSERT(dstImage->FetchTexelc);
+      ASSERT(dstImage->FetchTexelf);
+
+      _mesa_generate_mipmap_level(target, datatype, comps, border,
+                                  srcWidth, srcHeight, srcDepth, 
+                                  srcData, srcImage->RowStride,
+                                  dstWidth, dstHeight, dstDepth, 
+                                  dstData, dstImage->RowStride);
+
+
+      if (_mesa_is_format_compressed(dstImage->TexFormat)) {
+         GLubyte *temp;
+         /* compress image from dstData into dstImage->Data */
+         const GLenum srcFormat = _mesa_get_format_base_format(convertFormat);
+         GLint dstRowStride
+            = _mesa_format_row_stride(dstImage->TexFormat, dstWidth);
+         ASSERT(srcFormat == GL_RGB || srcFormat == GL_RGBA);
+
+         _mesa_texstore(ctx, 2, dstImage->_BaseFormat,
+                        dstImage->TexFormat,
+                        dstImage->Data,
+                        0, 0, 0, /* dstX/Y/Zoffset */
+                        dstRowStride, 0, /* strides */
+                        dstWidth, dstHeight, 1, /* size */
+                        srcFormat, CHAN_TYPE,
+                        dstData, /* src data, actually */
+                        &ctx->DefaultPacking);
+
+         /* swap src and dest pointers */
+         temp = (GLubyte *) srcData;
+         srcData = dstData;
+         dstData = temp;
+      }
+
+   } /* loop over mipmap levels */
+}
+
+
+/**
+ * Helper function for drivers which need to rescale texture images to
+ * certain aspect ratios.
+ * Nearest filtering only (for broken hardware that can't support
+ * all aspect ratios).  This can be made a lot faster, but I don't
+ * really care enough...
+ */
+void
+_mesa_rescale_teximage2d(GLuint bytesPerPixel,
+			 GLuint srcStrideInPixels,
+			 GLuint dstRowStride,
+			 GLint srcWidth, GLint srcHeight,
+			 GLint dstWidth, GLint dstHeight,
+			 const GLvoid *srcImage, GLvoid *dstImage)
+{
+   GLint row, col;
+
+#define INNER_LOOP( TYPE, HOP, WOP )					\
+   for ( row = 0 ; row < dstHeight ; row++ ) {				\
+      GLint srcRow = row HOP hScale;					\
+      for ( col = 0 ; col < dstWidth ; col++ ) {			\
+	 GLint srcCol = col WOP wScale;					\
+	 dst[col] = src[srcRow * srcStrideInPixels + srcCol];		\
+      }									\
+      dst = (TYPE *) ((GLubyte *) dst + dstRowStride);			\
+   }									\
+
+#define RESCALE_IMAGE( TYPE )						\
+do {									\
+   const TYPE *src = (const TYPE *)srcImage;				\
+   TYPE *dst = (TYPE *)dstImage;					\
+									\
+   if ( srcHeight < dstHeight ) {					\
+      const GLint hScale = dstHeight / srcHeight;			\
+      if ( srcWidth < dstWidth ) {					\
+	 const GLint wScale = dstWidth / srcWidth;			\
+	 INNER_LOOP( TYPE, /, / );					\
+      }									\
+      else {								\
+	 const GLint wScale = srcWidth / dstWidth;			\
+	 INNER_LOOP( TYPE, /, * );					\
+      }									\
+   }									\
+   else {								\
+      const GLint hScale = srcHeight / dstHeight;			\
+      if ( srcWidth < dstWidth ) {					\
+	 const GLint wScale = dstWidth / srcWidth;			\
+	 INNER_LOOP( TYPE, *, / );					\
+      }									\
+      else {								\
+	 const GLint wScale = srcWidth / dstWidth;			\
+	 INNER_LOOP( TYPE, *, * );					\
+      }									\
+   }									\
+} while (0)
+
+   switch ( bytesPerPixel ) {
+   case 4:
+      RESCALE_IMAGE( GLuint );
+      break;
+
+   case 2:
+      RESCALE_IMAGE( GLushort );
+      break;
+
+   case 1:
+      RESCALE_IMAGE( GLubyte );
+      break;
+   default:
+      _mesa_problem(NULL,"unexpected bytes/pixel in _mesa_rescale_teximage2d");
+   }
+}
+
+
+/**
+ * Upscale an image by replication, not (typical) stretching.
+ * We use this when the image width or height is less than a
+ * certain size (4, 8) and we need to upscale an image.
+ */
+void
+_mesa_upscale_teximage2d(GLsizei inWidth, GLsizei inHeight,
+                         GLsizei outWidth, GLsizei outHeight,
+                         GLint comps, const GLchan *src, GLint srcRowStride,
+                         GLchan *dest )
+{
+   GLint i, j, k;
+
+   ASSERT(outWidth >= inWidth);
+   ASSERT(outHeight >= inHeight);
+#if 0
+   ASSERT(inWidth == 1 || inWidth == 2 || inHeight == 1 || inHeight == 2);
+   ASSERT((outWidth & 3) == 0);
+   ASSERT((outHeight & 3) == 0);
+#endif
+
+   for (i = 0; i < outHeight; i++) {
+      const GLint ii = i % inHeight;
+      for (j = 0; j < outWidth; j++) {
+         const GLint jj = j % inWidth;
+         for (k = 0; k < comps; k++) {
+            dest[(i * outWidth + j) * comps + k]
+               = src[ii * srcRowStride + jj * comps + k];
+         }
+      }
+   }
+}
+
diff --git a/mesalib/src/mesa/main/texcompress_rgtc.c b/mesalib/src/mesa/main/texcompress_rgtc.c
index 2f3a0f214..26dca2d76 100644
--- a/mesalib/src/mesa/main/texcompress_rgtc.c
+++ b/mesalib/src/mesa/main/texcompress_rgtc.c
@@ -51,6 +51,12 @@ static void unsigned_encode_rgtc_chan(GLubyte *blkaddr, GLubyte srccolors[4][4],
 static void signed_encode_rgtc_chan(GLbyte *blkaddr, GLbyte srccolors[4][4],
 			     GLint numxpixels, GLint numypixels);
 
+static void unsigned_fetch_texel_rgtc(unsigned srcRowStride, const GLubyte *pixdata,
+				      unsigned i, unsigned j, GLubyte *value, unsigned comps);
+
+static void signed_fetch_texel_rgtc(unsigned srcRowStride, const GLbyte *pixdata,
+				      unsigned i, unsigned j, GLbyte *value, unsigned comps);
+
 static void extractsrc_u( GLubyte srcpixels[4][4], const GLchan *srcaddr,
 			  GLint srcRowStride, GLint numxpixels, GLint numypixels, GLint comps)
 {
@@ -312,73 +318,14 @@ _mesa_texstore_signed_rg_rgtc2(TEXSTORE_PARAMS)
    return GL_TRUE;
 }
 
-static void _fetch_texel_rgtc_u(GLint srcRowStride, const GLubyte *pixdata,
-				GLint i, GLint j, GLchan *value, int comps)
-{
-   GLchan decode;
-   const GLubyte *blksrc = (pixdata + ((srcRowStride + 3) / 4 * (j / 4) + (i / 4)) * 8 * comps);
-   const GLubyte alpha0 = blksrc[0];
-   const GLubyte alpha1 = blksrc[1];
-   const GLubyte bit_pos = ((j&3) * 4 + (i&3)) * 3;
-   const GLubyte acodelow = blksrc[2 + bit_pos / 8];
-   const GLubyte acodehigh = blksrc[3 + bit_pos / 8];
-   const GLubyte code = (acodelow >> (bit_pos & 0x7) |
-      (acodehigh  << (8 - (bit_pos & 0x7)))) & 0x7;
-
-   if (code == 0)
-      decode = UBYTE_TO_CHAN( alpha0 );
-   else if (code == 1)
-      decode = UBYTE_TO_CHAN( alpha1 );
-   else if (alpha0 > alpha1)
-      decode = UBYTE_TO_CHAN( ((alpha0 * (8 - code) + (alpha1 * (code - 1))) / 7) );
-   else if (code < 6)
-      decode = UBYTE_TO_CHAN( ((alpha0 * (6 - code) + (alpha1 * (code - 1))) / 5) );
-   else if (code == 6)
-      decode = 0;
-   else
-      decode = CHAN_MAX;
-
-   *value = decode;
-}
-
-
-static void _fetch_texel_rgtc_s(GLint srcRowStride, const GLbyte *pixdata,
-				GLint i, GLint j, GLbyte *value, int comps)
-{
-   GLbyte decode;
-   const GLbyte *blksrc = (pixdata + ((srcRowStride + 3) / 4 * (j / 4) + (i / 4)) * 8 * comps);
-   const GLbyte alpha0 = blksrc[0];
-   const GLbyte alpha1 = blksrc[1];
-   const GLbyte bit_pos = ((j&3) * 4 + (i&3)) * 3;
-   const GLbyte acodelow = blksrc[2 + bit_pos / 8];
-   const GLbyte acodehigh = blksrc[3 + bit_pos / 8];
-   const GLbyte code = (acodelow >> (bit_pos & 0x7) |
-      (acodehigh  << (8 - (bit_pos & 0x7)))) & 0x7;
-
-   if (code == 0)
-      decode = alpha0;
-   else if (code == 1)
-      decode = alpha1;
-   else if (alpha0 > alpha1)
-      decode = ((alpha0 * (8 - code) + (alpha1 * (code - 1))) / 7);
-   else if (code < 6)
-      decode = ((alpha0 * (6 - code) + (alpha1 * (code - 1))) / 5);
-   else if (code == 6)
-      decode = -128;
-   else
-      decode = 127;
-
-   *value = decode;
-}
-
 void
 _mesa_fetch_texel_2d_f_red_rgtc1(const struct gl_texture_image *texImage,
 				 GLint i, GLint j, GLint k, GLfloat *texel)
 {
-   GLchan red;
-   _fetch_texel_rgtc_u(texImage->RowStride, (GLubyte *)(texImage->Data),
+   GLubyte red;
+   unsigned_fetch_texel_rgtc(texImage->RowStride, (GLubyte *)(texImage->Data),
 		       i, j, &red, 1);
-   texel[RCOMP] = CHAN_TO_FLOAT(red);
+   texel[RCOMP] = UBYTE_TO_FLOAT(red);
    texel[GCOMP] = 0.0;
    texel[BCOMP] = 0.0;
    texel[ACOMP] = 1.0;
@@ -389,7 +336,7 @@ _mesa_fetch_texel_2d_f_signed_red_rgtc1(const struct gl_texture_image *texImage,
 					GLint i, GLint j, GLint k, GLfloat *texel)
 {
    GLbyte red;
-   _fetch_texel_rgtc_s(texImage->RowStride, (GLbyte *)(texImage->Data),
+   signed_fetch_texel_rgtc(texImage->RowStride, (GLbyte *)(texImage->Data),
 		       i, j, &red, 1);
    texel[RCOMP] = BYTE_TO_FLOAT_TEX(red);
    texel[GCOMP] = 0.0;
@@ -401,13 +348,13 @@ void
 _mesa_fetch_texel_2d_f_rg_rgtc2(const struct gl_texture_image *texImage,
 				 GLint i, GLint j, GLint k, GLfloat *texel)
 {
-   GLchan red, green;
-   _fetch_texel_rgtc_u(texImage->RowStride, (GLubyte *)(texImage->Data),
+   GLubyte red, green;
+   unsigned_fetch_texel_rgtc(texImage->RowStride, (GLubyte *)(texImage->Data),
 		     i, j, &red, 2);
-   _fetch_texel_rgtc_u(texImage->RowStride, (GLubyte *)(texImage->Data) + 8,
+   unsigned_fetch_texel_rgtc(texImage->RowStride, (GLubyte *)(texImage->Data) + 8,
 		     i, j, &green, 2);
-   texel[RCOMP] = CHAN_TO_FLOAT(red);
-   texel[GCOMP] = CHAN_TO_FLOAT(green);
+   texel[RCOMP] = UBYTE_TO_FLOAT(red);
+   texel[GCOMP] = UBYTE_TO_FLOAT(green);
    texel[BCOMP] = 0.0;
    texel[ACOMP] = 1.0;
 }
@@ -417,9 +364,9 @@ _mesa_fetch_texel_2d_f_signed_rg_rgtc2(const struct gl_texture_image *texImage,
 				       GLint i, GLint j, GLint k, GLfloat *texel)
 {
    GLbyte red, green;
-   _fetch_texel_rgtc_s(texImage->RowStride, (GLbyte *)(texImage->Data),
+   signed_fetch_texel_rgtc(texImage->RowStride, (GLbyte *)(texImage->Data),
 		     i, j, &red, 2);
-   _fetch_texel_rgtc_s(texImage->RowStride, (GLbyte *)(texImage->Data) + 8,
+   signed_fetch_texel_rgtc(texImage->RowStride, (GLbyte *)(texImage->Data) + 8,
 		     i, j, &green, 2);
    texel[RCOMP] = BYTE_TO_FLOAT_TEX(red);
    texel[GCOMP] = BYTE_TO_FLOAT_TEX(green);
@@ -442,7 +389,7 @@ _mesa_fetch_texel_2d_f_signed_rg_rgtc2(const struct gl_texture_image *texImage,
 
 #define TAG(x) signed_##x
 #define TYPE GLbyte
-#define T_MIN (GLbyte)-127
+#define T_MIN (GLbyte)-128
 #define T_MAX (GLbyte)127
 
 #include "texcompress_rgtc_tmp.h"
diff --git a/mesalib/src/mesa/main/texcompress_rgtc_tmp.h b/mesalib/src/mesa/main/texcompress_rgtc_tmp.h
index 0f830a5d9..c8bf082a1 100644
--- a/mesalib/src/mesa/main/texcompress_rgtc_tmp.h
+++ b/mesalib/src/mesa/main/texcompress_rgtc_tmp.h
@@ -29,6 +29,35 @@
 
 /* included by texcompress_rgtc to define byte/ubyte compressors */
 
+static void TAG(fetch_texel_rgtc)(unsigned srcRowStride, const TYPE *pixdata,
+				  unsigned i, unsigned j, TYPE *value, unsigned comps)
+{
+   TYPE decode;
+   const TYPE *blksrc = (pixdata + ((srcRowStride + 3) / 4 * (j / 4) + (i / 4)) * 8 * comps);
+   const TYPE alpha0 = blksrc[0];
+   const TYPE alpha1 = blksrc[1];
+   const char bit_pos = ((j&3) * 4 + (i&3)) * 3;
+   const TYPE acodelow = blksrc[2 + bit_pos / 8];
+   const TYPE acodehigh = (3 + bit_pos / 8) < 8 ? blksrc[3 + bit_pos / 8] : 0;
+   const TYPE code = (acodelow >> (bit_pos & 0x7) |
+      (acodehigh  << (8 - (bit_pos & 0x7)))) & 0x7;
+
+   if (code == 0)
+      decode = alpha0;
+   else if (code == 1)
+      decode = alpha1;
+   else if (alpha0 > alpha1)
+      decode = ((alpha0 * (8 - code) + (alpha1 * (code - 1))) / 7);
+   else if (code < 6)
+      decode = ((alpha0 * (6 - code) + (alpha1 * (code - 1))) / 5);
+   else if (code == 6)
+      decode = T_MIN;
+   else
+      decode = T_MAX;
+
+   *value = decode;
+}
+
 static void TAG(write_rgtc_encoded_channel)(TYPE *blkaddr,
 					    TYPE alphabase1,
 					    TYPE alphabase2,
@@ -43,26 +72,26 @@ static void TAG(write_rgtc_encoded_channel)(TYPE *blkaddr,
    *blkaddr++ = (alphaenc[10] >> 2) | (alphaenc[11] << 1) | (alphaenc[12] << 4) | ((alphaenc[13] & 1) << 7);
    *blkaddr++ = (alphaenc[13] >> 1) | (alphaenc[14] << 2) | (alphaenc[15] << 5);
 }
+
 static void TAG(encode_rgtc_chan)(TYPE *blkaddr, TYPE srccolors[4][4],
-			     GLint numxpixels, GLint numypixels)
+			     int numxpixels, int numypixels)
 {
    TYPE alphabase[2], alphause[2];
-   GLshort alphatest[2] = { 0 };
-   GLuint alphablockerror1, alphablockerror2, alphablockerror3;
+   short alphatest[2] = { 0 };
+   unsigned int alphablockerror1, alphablockerror2, alphablockerror3;
    TYPE i, j, aindex, acutValues[7];
    TYPE alphaenc1[16], alphaenc2[16], alphaenc3[16];
-   GLboolean alphaabsmin = GL_FALSE;
-   GLboolean alphaabsmax = GL_FALSE;
-   GLshort alphadist;
+   int alphaabsmin = 0, alphaabsmax = 0;
+   short alphadist;
 
    /* find lowest and highest alpha value in block, alphabase[0] lowest, alphabase[1] highest */
    alphabase[0] = T_MAX; alphabase[1] = T_MIN;
    for (j = 0; j < numypixels; j++) {
       for (i = 0; i < numxpixels; i++) {
 	 if (srccolors[j][i] == T_MIN)
-            alphaabsmin = GL_TRUE;
+            alphaabsmin = 1;
          else if (srccolors[j][i] == T_MAX)
-            alphaabsmax = GL_TRUE;
+            alphaabsmax = 1;
          else {
             if (srccolors[j][i] > alphabase[1])
                alphabase[1] = srccolors[j][i];
@@ -73,9 +102,9 @@ static void TAG(encode_rgtc_chan)(TYPE *blkaddr, TYPE srccolors[4][4],
    }
 
 
-   if ((alphabase[0] > alphabase[1]) && !(alphaabsmin && alphaabsmax)) { /* one color, either max or min */
+   if (((alphabase[0] > alphabase[1]) && !(alphaabsmin && alphaabsmax))
+       || (alphabase[0] == alphabase[1] && !alphaabsmin && !alphaabsmax)) { /* one color, either max or min */
       /* shortcut here since it is a very common case (and also avoids later problems) */
-      /* || (alphabase[0] == alphabase[1] && !alphaabsmin && !alphaabsmax) */
       /* could also thest for alpha0 == alpha1 (and not min/max), but probably not common, so don't bother */
 
       *blkaddr++ = srccolors[0][0];
@@ -219,12 +248,12 @@ static void TAG(encode_rgtc_chan)(TYPE *blkaddr, TYPE srccolors[4][4],
       /* skip this if the error is already very small
          this encoding is MUCH better on average than #2 though, but expensive! */
       if ((alphablockerror2 > 96) && (alphablockerror1 > 96)) {
-         GLshort blockerrlin1 = 0;
-         GLshort blockerrlin2 = 0;
+         short blockerrlin1 = 0;
+         short blockerrlin2 = 0;
          TYPE nralphainrangelow = 0;
          TYPE nralphainrangehigh = 0;
-         alphatest[0] = 0xff;
-         alphatest[1] = 0x0;
+         alphatest[0] = T_MAX;
+         alphatest[1] = T_MIN;
          /* if we have large range it's likely there are values close to 0/255, try to map them to 0/255 */
          for (j = 0; j < numypixels; j++) {
             for (i = 0; i < numxpixels; i++) {
@@ -236,8 +265,8 @@ static void TAG(encode_rgtc_chan)(TYPE *blkaddr, TYPE srccolors[4][4],
          }
           /* shouldn't happen too often, don't really care about those degenerated cases */
           if (alphatest[1] <= alphatest[0]) {
-             alphatest[0] = 1;
-             alphatest[1] = 254;
+             alphatest[0] = T_MIN+1;
+             alphatest[1] = T_MAX-1;
          }
          for (aindex = 0; aindex < 5; aindex++) {
          /* don't forget here is always rounded down */
@@ -305,7 +334,7 @@ static void TAG(encode_rgtc_chan)(TYPE *blkaddr, TYPE srccolors[4][4],
          }
          alphatest[1] = alphatest[1] + (blockerrlin2 / nralphainrangehigh);
          if (alphatest[1] > T_MAX) {
-            alphatest[1] = T_MIN;
+            alphatest[1] = T_MAX;
          }
 
          alphablockerror3 = 0;
@@ -354,23 +383,36 @@ static void TAG(encode_rgtc_chan)(TYPE *blkaddr, TYPE srccolors[4][4],
          }
       }
    }
+
   /* write the alpha values and encoding back. */
    if ((alphablockerror1 <= alphablockerror2) && (alphablockerror1 <= alphablockerror3)) {
 #if RGTC_DEBUG
       if (alphablockerror1 > 96) fprintf(stderr, "enc1 used, error %d\n", alphablockerror1);
+      fprintf(stderr,"w1: min %d max %d au0 %d au1 %d\n",
+	      T_MIN, T_MAX,
+	      alphause[1], alphause[0]);
 #endif
+
       TAG(write_rgtc_encoded_channel)( blkaddr, alphause[1], alphause[0], alphaenc1 );
    }
    else if (alphablockerror2 <= alphablockerror3) {
 #if RGTC_DEBUG
       if (alphablockerror2 > 96) fprintf(stderr, "enc2 used, error %d\n", alphablockerror2);
+      fprintf(stderr,"w2: min %d max %d au0 %d au1 %d\n",
+	      T_MIN, T_MAX,
+	      alphabase[0], alphabase[1]);
 #endif
+
       TAG(write_rgtc_encoded_channel)( blkaddr, alphabase[0], alphabase[1], alphaenc2 );
    }
    else {
 #if RGTC_DEBUG
       fprintf(stderr, "enc3 used, error %d\n", alphablockerror3);
+      fprintf(stderr,"w3: min %d max %d au0 %d au1 %d\n",
+	      T_MIN, T_MAX,
+	      alphatest[0], alphatest[1]);
 #endif
+
       TAG(write_rgtc_encoded_channel)( blkaddr, (TYPE)alphatest[0], (TYPE)alphatest[1], alphaenc3 );
    }
 }
diff --git a/mesalib/src/mesa/program/Makefile b/mesalib/src/mesa/program/Makefile
deleted file mode 100644
index 400a543bd..000000000
--- a/mesalib/src/mesa/program/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-all: program_parse.tab.c lex.yy.c
-
-program_parse.tab.c program_parse.tab.h: program_parse.y
-	bison -v -d $<
-
-lex.yy.c: program_lexer.l
-	flex --never-interactive $<
diff --git a/mesalib/src/mesa/program/lex.yy.c b/mesalib/src/mesa/program/lex.yy.c
deleted file mode 100644
index 135eca6fd..000000000
--- a/mesalib/src/mesa/program/lex.yy.c
+++ /dev/null
@@ -1,3681 +0,0 @@
-
-#line 3 "lex.yy.c"
-
-#define  YY_INT_ALIGNED short int
-
-/* A lexical scanner generated by flex */
-
-#define FLEX_SCANNER
-#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 35
-#if YY_FLEX_SUBMINOR_VERSION > 0
-#define FLEX_BETA
-#endif
-
-/* First, we deal with  platform-specific or compiler-specific issues. */
-
-/* begin standard C headers. */
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-
-/* end standard C headers. */
-
-/* flex integer type definitions */
-
-#ifndef FLEXINT_H
-#define FLEXINT_H
-
-/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
-
-#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-
-/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
- * if you want the limit (max/min) macros for int types. 
- */
-#ifndef __STDC_LIMIT_MACROS
-#define __STDC_LIMIT_MACROS 1
-#endif
-
-#include <inttypes.h>
-typedef int8_t flex_int8_t;
-typedef uint8_t flex_uint8_t;
-typedef int16_t flex_int16_t;
-typedef uint16_t flex_uint16_t;
-typedef int32_t flex_int32_t;
-typedef uint32_t flex_uint32_t;
-#else
-typedef signed char flex_int8_t;
-typedef short int flex_int16_t;
-typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t; 
-typedef unsigned short int flex_uint16_t;
-typedef unsigned int flex_uint32_t;
-
-/* Limits of integral types. */
-#ifndef INT8_MIN
-#define INT8_MIN               (-128)
-#endif
-#ifndef INT16_MIN
-#define INT16_MIN              (-32767-1)
-#endif
-#ifndef INT32_MIN
-#define INT32_MIN              (-2147483647-1)
-#endif
-#ifndef INT8_MAX
-#define INT8_MAX               (127)
-#endif
-#ifndef INT16_MAX
-#define INT16_MAX              (32767)
-#endif
-#ifndef INT32_MAX
-#define INT32_MAX              (2147483647)
-#endif
-#ifndef UINT8_MAX
-#define UINT8_MAX              (255U)
-#endif
-#ifndef UINT16_MAX
-#define UINT16_MAX             (65535U)
-#endif
-#ifndef UINT32_MAX
-#define UINT32_MAX             (4294967295U)
-#endif
-
-#endif /* ! C99 */
-
-#endif /* ! FLEXINT_H */
-
-#ifdef __cplusplus
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else	/* ! __cplusplus */
-
-/* C99 requires __STDC__ to be defined as 1. */
-#if defined (__STDC__)
-
-#define YY_USE_CONST
-
-#endif	/* defined (__STDC__) */
-#endif	/* ! __cplusplus */
-
-#ifdef YY_USE_CONST
-#define yyconst const
-#else
-#define yyconst
-#endif
-
-/* Returned upon end-of-file. */
-#define YY_NULL 0
-
-/* Promotes a possibly negative, possibly signed char to an unsigned
- * integer for use as an array index.  If the signed char is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
- */
-#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
-
-/* An opaque pointer. */
-#ifndef YY_TYPEDEF_YY_SCANNER_T
-#define YY_TYPEDEF_YY_SCANNER_T
-typedef void* yyscan_t;
-#endif
-
-/* For convenience, these vars (plus the bison vars far below)
-   are macros in the reentrant scanner. */
-#define yyin yyg->yyin_r
-#define yyout yyg->yyout_r
-#define yyextra yyg->yyextra_r
-#define yyleng yyg->yyleng_r
-#define yytext yyg->yytext_r
-#define yylineno (YY_CURRENT_BUFFER_LVALUE->yy_bs_lineno)
-#define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column)
-#define yy_flex_debug yyg->yy_flex_debug_r
-
-/* Enter a start condition.  This macro really ought to take a parameter,
- * but we do it the disgusting crufty way forced on us by the ()-less
- * definition of BEGIN.
- */
-#define BEGIN yyg->yy_start = 1 + 2 *
-
-/* Translate the current start state into a value that can be later handed
- * to BEGIN to return to the state.  The YYSTATE alias is for lex
- * compatibility.
- */
-#define YY_START ((yyg->yy_start - 1) / 2)
-#define YYSTATE YY_START
-
-/* Action number for EOF rule of a given start state. */
-#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
-/* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart(yyin ,yyscanner )
-
-#define YY_END_OF_BUFFER_CHAR 0
-
-/* Size of default input buffer. */
-#ifndef YY_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k.
- * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
- * Ditto for the __ia64__ case accordingly.
- */
-#define YY_BUF_SIZE 32768
-#else
-#define YY_BUF_SIZE 16384
-#endif /* __ia64__ */
-#endif
-
-/* The state buf must be large enough to hold one state per character in the main buffer.
- */
-#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
-
-#ifndef YY_TYPEDEF_YY_BUFFER_STATE
-#define YY_TYPEDEF_YY_BUFFER_STATE
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-#endif
-
-#define EOB_ACT_CONTINUE_SCAN 0
-#define EOB_ACT_END_OF_FILE 1
-#define EOB_ACT_LAST_MATCH 2
-
-    #define YY_LESS_LINENO(n)
-    
-/* Return all but the first "n" matched characters back to the input stream. */
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-        int yyless_macro_arg = (n); \
-        YY_LESS_LINENO(yyless_macro_arg);\
-		*yy_cp = yyg->yy_hold_char; \
-		YY_RESTORE_YY_MORE_OFFSET \
-		yyg->yy_c_buf_p = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
-		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
-		} \
-	while ( 0 )
-
-#define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner )
-
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
-#endif
-
-#ifndef YY_STRUCT_YY_BUFFER_STATE
-#define YY_STRUCT_YY_BUFFER_STATE
-struct yy_buffer_state
-	{
-	FILE *yy_input_file;
-
-	char *yy_ch_buf;		/* input buffer */
-	char *yy_buf_pos;		/* current position in input buffer */
-
-	/* Size of input buffer in bytes, not including room for EOB
-	 * characters.
-	 */
-	yy_size_t yy_buf_size;
-
-	/* Number of characters read into yy_ch_buf, not including EOB
-	 * characters.
-	 */
-	int yy_n_chars;
-
-	/* Whether we "own" the buffer - i.e., we know we created it,
-	 * and can realloc() it to grow it, and should free() it to
-	 * delete it.
-	 */
-	int yy_is_our_buffer;
-
-	/* Whether this is an "interactive" input source; if so, and
-	 * if we're using stdio for input, then we want to use getc()
-	 * instead of fread(), to make sure we stop fetching input after
-	 * each newline.
-	 */
-	int yy_is_interactive;
-
-	/* Whether we're considered to be at the beginning of a line.
-	 * If so, '^' rules will be active on the next match, otherwise
-	 * not.
-	 */
-	int yy_at_bol;
-
-    int yy_bs_lineno; /**< The line count. */
-    int yy_bs_column; /**< The column count. */
-    
-	/* Whether to try to fill the input buffer when we reach the
-	 * end of it.
-	 */
-	int yy_fill_buffer;
-
-	int yy_buffer_status;
-
-#define YY_BUFFER_NEW 0
-#define YY_BUFFER_NORMAL 1
-	/* When an EOF's been seen but there's still some text to process
-	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
-	 * shouldn't try reading from the input source any more.  We might
-	 * still have a bunch of tokens to match, though, because of
-	 * possible backing-up.
-	 *
-	 * When we actually see the EOF, we change the status to "new"
-	 * (via yyrestart()), so that the user can continue scanning by
-	 * just pointing yyin at a new input file.
-	 */
-#define YY_BUFFER_EOF_PENDING 2
-
-	};
-#endif /* !YY_STRUCT_YY_BUFFER_STATE */
-
-/* We provide macros for accessing buffer states in case in the
- * future we want to put the buffer states in a more general
- * "scanner state".
- *
- * Returns the top of the stack, or NULL.
- */
-#define YY_CURRENT_BUFFER ( yyg->yy_buffer_stack \
-                          ? yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] \
-                          : NULL)
-
-/* Same as previous macro, but useful when we know that the buffer stack is not
- * NULL or when we need an lvalue. For internal use only.
- */
-#define YY_CURRENT_BUFFER_LVALUE yyg->yy_buffer_stack[yyg->yy_buffer_stack_top]
-
-void yyrestart (FILE *input_file ,yyscan_t yyscanner );
-void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
-YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ,yyscan_t yyscanner );
-void yy_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
-void yy_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
-void yypush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
-void yypop_buffer_state (yyscan_t yyscanner );
-
-static void yyensure_buffer_stack (yyscan_t yyscanner );
-static void yy_load_buffer_state (yyscan_t yyscanner );
-static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ,yyscan_t yyscanner );
-
-#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER ,yyscanner)
-
-YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner );
-YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner );
-YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner );
-
-void *yyalloc (yy_size_t ,yyscan_t yyscanner );
-void *yyrealloc (void *,yy_size_t ,yyscan_t yyscanner );
-void yyfree (void * ,yyscan_t yyscanner );
-
-#define yy_new_buffer yy_create_buffer
-
-#define yy_set_interactive(is_interactive) \
-	{ \
-	if ( ! YY_CURRENT_BUFFER ){ \
-        yyensure_buffer_stack (yyscanner); \
-		YY_CURRENT_BUFFER_LVALUE =    \
-            yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \
-	} \
-	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
-	}
-
-#define yy_set_bol(at_bol) \
-	{ \
-	if ( ! YY_CURRENT_BUFFER ){\
-        yyensure_buffer_stack (yyscanner); \
-		YY_CURRENT_BUFFER_LVALUE =    \
-            yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \
-	} \
-	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
-	}
-
-#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
-
-/* Begin user sect3 */
-
-#define yywrap(n) 1
-#define YY_SKIP_YYWRAP
-
-typedef unsigned char YY_CHAR;
-
-typedef int yy_state_type;
-
-#define yytext_ptr yytext_r
-
-static yy_state_type yy_get_previous_state (yyscan_t yyscanner );
-static yy_state_type yy_try_NUL_trans (yy_state_type current_state  ,yyscan_t yyscanner);
-static int yy_get_next_buffer (yyscan_t yyscanner );
-static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner );
-
-/* Done after the current pattern has been matched and before the
- * corresponding action - sets up yytext.
- */
-#define YY_DO_BEFORE_ACTION \
-	yyg->yytext_ptr = yy_bp; \
-	yyleng = (size_t) (yy_cp - yy_bp); \
-	yyg->yy_hold_char = *yy_cp; \
-	*yy_cp = '\0'; \
-	yyg->yy_c_buf_p = yy_cp;
-
-#define YY_NUM_RULES 170
-#define YY_END_OF_BUFFER 171
-/* This struct is not used in this scanner,
-   but its presence is necessary. */
-struct yy_trans_info
-	{
-	flex_int32_t yy_verify;
-	flex_int32_t yy_nxt;
-	};
-static yyconst flex_int16_t yy_accept[850] =
-    {   0,
-        0,    0,  171,  169,  167,  166,  169,  169,  139,  165,
-      141,  141,  141,  141,  139,  139,  139,  139,  139,  139,
-      139,  139,  139,  139,  139,  139,  139,  139,  139,  139,
-      139,  139,  139,  139,  139,  167,    0,    0,  168,  139,
-        0,  140,  142,  162,  162,    0,    0,    0,    0,  162,
-        0,    0,    0,    0,    0,    0,    0,  119,  163,  120,
-      121,  153,  153,  153,  153,    0,  141,    0,  127,  128,
-      129,  139,  139,  139,  139,  139,  139,  139,  139,  139,
-      139,  139,  139,  139,  139,  139,  139,  139,  139,  139,
-      139,  139,  139,  139,  139,  139,  139,  139,  139,  139,
-
-      139,  139,  139,  139,  139,  139,  139,  139,  139,  139,
-      139,  139,  139,  139,  139,  139,  139,  139,  139,  139,
-      139,  139,  139,  139,  139,  139,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,  161,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,  160,  160,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      159,  159,  159,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,  150,  150,  150,  151,  151,  152,  143,
-      142,  143,    0,  144,   11,   12,  139,   13,  139,  139,
-       14,   15,  139,   16,   17,   18,   19,   20,   21,    6,
-
-       22,   23,   24,   25,   26,   28,   27,   29,   30,   31,
-       32,   33,   34,   35,  139,  139,  139,  139,  139,   40,
-       41,  139,   42,   43,   44,   45,   46,   47,   48,  139,
-       49,   50,   51,   52,   53,   54,   55,  139,   56,   57,
-       58,   59,  139,  139,   64,   65,  139,  139,  139,  139,
-      139,  139,    0,    0,    0,    0,  142,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,   80,   81,   83,
-        0,  158,    0,    0,    0,    0,    0,    0,   97,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,  157,
-      156,  156,  109,    0,    0,    0,    0,    0,    0,    0,
-
-        0,    0,    0,  147,  147,  148,  149,    0,  145,   11,
-       11,  139,   12,   12,   12,  139,  139,  139,  139,  139,
-       15,   15,  139,  130,   16,   16,  139,   17,   17,  139,
-       18,   18,  139,   19,   19,  139,   20,   20,  139,   21,
-       21,  139,   22,   22,  139,   24,   24,  139,   25,   25,
-      139,   28,   28,  139,   27,   27,  139,   30,   30,  139,
-       31,   31,  139,   32,   32,  139,   33,   33,  139,   34,
-       34,  139,   35,   35,  139,  139,  139,  139,   36,  139,
-       38,  139,   40,   40,  139,   41,   41,  139,  131,   42,
-       42,  139,   43,   43,  139,  139,   45,   45,  139,   46,
-
-       46,  139,   47,   47,  139,   48,   48,  139,  139,   49,
-       49,  139,   50,   50,  139,   51,   51,  139,   52,   52,
-      139,   53,   53,  139,   54,   54,  139,  139,   10,   56,
-      139,   57,  139,   58,  139,   59,  139,   60,  139,   62,
-      139,   64,   64,  139,  139,  139,  139,  139,  139,  139,
-      139,    0,  164,    0,    0,    0,   73,   74,    0,    0,
-        0,    0,    0,    0,    0,   85,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,  155,    0,    0,    0,  113,    0,
-      115,    0,    0,    0,    0,    0,    0,  154,  146,  139,
-
-      139,  139,    4,  139,  139,  139,  139,  139,  139,  139,
-      139,  139,  139,  139,  139,  139,  139,  139,  139,  139,
-      139,  139,  139,  139,  139,  139,    9,   37,   39,  139,
-      139,  139,  139,  139,  139,  139,  139,  139,  139,  139,
-      139,  139,  139,  139,  139,  139,  139,  139,  139,  139,
-       60,  139,   61,   62,  139,   63,  139,  139,  139,  139,
-      139,   69,  139,  139,    0,    0,    0,    0,    0,   75,
-       76,    0,    0,    0,    0,   84,    0,    0,   88,   91,
-        0,    0,    0,    0,    0,    0,    0,  102,  103,    0,
-        0,    0,    0,  108,    0,    0,    0,    0,    0,    0,
-
-        0,    0,    0,    0,  139,  139,  139,  139,  139,  139,
-        5,  139,  139,  139,  139,  139,  139,  139,  139,  139,
-      139,  139,  139,  139,  139,  139,  139,  139,  139,  139,
-        7,    8,  139,  139,  139,  139,  139,  139,  139,  139,
-      139,  139,  139,  139,  139,  139,  139,  139,  139,  139,
-      139,  139,  139,  139,   61,  139,  139,   63,  139,  139,
-      139,  139,  139,   70,  139,   66,    0,    0,    0,    0,
-      124,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-       94,    0,   98,   99,    0,  101,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,  117,  118,    0,    0,
-
-      125,   11,    3,   12,  135,  136,  139,   14,   15,   16,
-       17,   18,   19,   20,   21,   22,   24,   25,   28,   27,
-       30,   31,   32,   33,   34,   35,   40,   41,   42,   43,
-       44,   45,   46,   47,   48,  139,  139,  139,   49,   50,
-       51,   52,   53,   54,   55,   56,   57,   58,   59,  139,
-      139,  139,  139,   64,   65,  139,   68,  126,    0,    0,
-       71,    0,   77,    0,    0,    0,   86,    0,    0,    0,
-        0,    0,    0,  100,    0,    0,  106,   93,    0,    0,
-        0,    0,    0,    0,  122,    0,  139,  132,  133,  139,
-       60,  139,   62,  139,   67,    0,    0,    0,    0,   79,
-
-       82,   87,    0,    0,   92,    0,    0,    0,  105,    0,
-        0,    0,    0,  114,  116,    0,  139,  139,   61,   63,
-        2,    1,    0,   78,    0,   90,    0,   96,  104,    0,
-        0,  111,  112,  123,  139,  134,    0,   89,    0,  107,
-      110,  139,   72,   95,  139,  139,  137,  138,    0
-    } ;
-
-static yyconst flex_int32_t yy_ec[256] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
-        1,    1,    4,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    2,    5,    1,    6,    7,    1,    1,    1,    1,
-        1,    1,    8,    1,    8,    9,    1,   10,   11,   12,
-       13,   14,   15,   15,   15,   15,   15,    1,    1,    1,
-        1,    1,    1,    1,   16,   17,   18,   19,   20,   21,
-       22,   23,   24,    7,   25,   26,   27,   28,   29,   30,
-       31,   32,   33,   34,   35,   36,   37,   38,   39,   40,
-        1,    1,    1,    1,   41,    1,   42,   43,   44,   45,
-
-       46,   47,   48,   49,   50,   51,   52,   53,   54,   55,
-       56,   57,   58,   59,   60,   61,   62,   63,   64,   65,
-       66,   67,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1
-    } ;
-
-static yyconst flex_int32_t yy_meta[68] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    2,    1,    3,    2,
-        2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-        2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-        2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-        2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-        2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-        2,    2,    2,    2,    2,    2,    2
-    } ;
-
-static yyconst flex_int16_t yy_base[853] =
-    {   0,
-        0,    0, 1299, 1300,   66, 1300, 1293, 1294,    0,   69,
-       85,  128,  140,  152,  151,   58,   56,   63,   76, 1272,
-      158,  160,   39,  163,  173,  189,   52, 1265,   76, 1235,
-     1234, 1246, 1230, 1244, 1243,  105, 1272, 1284, 1300,    0,
-      225, 1300,  218,  160,  157,   20,  123,   66,  119,  192,
-     1244, 1230,   54,  162, 1228, 1240,  194, 1300,  200,  195,
-       98,  227,  196,  231,  235,  293,  305,  316, 1300, 1300,
-     1300, 1249, 1262, 1256,  223, 1245, 1248, 1244, 1259,  107,
-      298, 1241, 1255,  246, 1241, 1254, 1245, 1258, 1235, 1246,
-     1237,  182, 1238, 1229, 1238, 1229, 1228, 1229,  144, 1223,
-
-     1229, 1240, 1231, 1225, 1222, 1223, 1227,  289, 1236, 1223,
-      302, 1230, 1217, 1231, 1207,   65,  315,  276, 1227, 1226,
-     1202, 1187, 1182, 1199, 1175, 1180, 1206,  279, 1195,  293,
-     1190,  342,  299, 1192, 1173,  317, 1183, 1179, 1174,  207,
-     1180, 1166, 1182, 1179, 1170,  320,  324, 1172, 1161, 1175,
-     1178, 1160, 1175, 1162, 1159, 1166,  284, 1174,  227,  288,
-      327,  342,  345, 1151, 1168, 1169, 1162, 1144,  318, 1145,
-     1167, 1158,  330,  341,  345,  349,  353,  357,  361, 1300,
-      419,  430,  436,  442,  440,  441, 1191,    0, 1190, 1173,
-     1163,  443, 1183,  444,  451,  468,  470,  472,  471,    0,
-
-      496,    0,  497,  498,    0,  499,  500,    0,  524,  525,
-      526,  536,  537,  553, 1178, 1171, 1184,  354,  356,  561,
-      563, 1165,  564,  565, 1157,  580,  590,  591,  592, 1178,
-      593,  617,  618,  619,  629,  630, 1155, 1165,  330,  362,
-      419,  483,  445,  364,  646, 1153, 1145, 1144, 1129, 1129,
-     1128, 1127, 1170, 1142, 1130,  662,  669,  643, 1134,  487,
-     1131, 1125, 1125, 1119, 1132, 1132, 1117, 1300, 1300, 1132,
-     1120,  646, 1127,  135, 1124, 1130,  561, 1125, 1300, 1116,
-     1123, 1122, 1125, 1111, 1110, 1114, 1109,  448, 1114,  650,
-      653,  665, 1300, 1106, 1104, 1104, 1112, 1113, 1095,  670,
-
-     1100, 1106,  486,  579,  655,  661,  668,  726,  732, 1112,
-      682, 1119, 1110,  688,  730, 1117, 1116, 1109, 1123, 1113,
-     1104,  712, 1111,    0, 1102,  731, 1109, 1100,  733, 1107,
-     1098,  734, 1105, 1096,  736, 1103, 1094,  737, 1101, 1092,
-      738, 1099, 1090,  739, 1097, 1088,  740, 1095, 1086,  741,
-     1093, 1084,  742, 1091, 1082,  743, 1089, 1080,  744, 1087,
-     1078,  745, 1085, 1076,  746, 1083, 1074,  747, 1081, 1072,
-      748, 1079, 1070,  749, 1077, 1080, 1073, 1080,    0, 1073,
-        0, 1088, 1063,  750, 1070, 1061,  751, 1068,    0, 1059,
-      752, 1066, 1057,  755, 1064, 1063, 1054,  758, 1061, 1052,
-
-      776, 1059, 1050,  777, 1057, 1048,  779, 1055, 1058, 1045,
-      780, 1052, 1043,  782, 1050, 1041,  783, 1048, 1039,  784,
-     1046, 1037,  785, 1044, 1035,  786, 1042, 1041,    0, 1032,
-     1039, 1030, 1037, 1028, 1035, 1026, 1033,  787, 1032,  788,
-     1047, 1022,  789, 1029, 1028, 1006, 1000, 1005, 1011,  994,
-     1009,  424, 1300, 1008,  998, 1002, 1300, 1300,  992, 1001,
-      987, 1004,  987,  990,  984, 1300,  985,  984,  981,  988,
-      981,  989,  985,  995,  992,  974,  980,  987,  971,  970,
-      988,  970,  982,  981, 1300,  980,  970,  974, 1300,  961,
-     1300,  966,  966,  974,  957,  958,  968, 1300, 1300, 1000,
-
-      982,  998,    0,  798,  996,  996,  995,  994,  993,  992,
-      991,  990,  989,  988,  987,  986,  985,  984,  983,  982,
-      981,  980,  979,  978,  965,  958,    0,    0,    0,  975,
-      974,  973,  972,  971,  970,  969,  968,  967,  945,  965,
-      964,  963,  962,  961,  960,  959,  958,  957,  956,  955,
-      929,  936,  793,  927,  934,  794,  950,  949,  918,  921,
-      901,    0,  902,  895,  902,  901,  902,  894,  912, 1300,
-     1300,  894,  892,  902,  895, 1300,  890,  907,  516, 1300,
-      898,  882,  883,  892,  883,  882,  882, 1300,  881,  890,
-      880,  896,  893, 1300,  892,  890,  879,  880,  876,  868,
-
-      875,  870,  871,  866,  892,  892,  890,  904,  903,  898,
-        0,  886,  885,  884,  883,  882,  881,  880,  879,  878,
-      877,  876,  875,  874,  873,  872,  871,  870,  869,  868,
-        0,    0,  867,  866,  865,  864,  863,  862,  861,  860,
-      859,  804,  858,  857,  856,  855,  854,  853,  852,  851,
-      850,  849,  848,  865,  839,  846,  862,  836,  843,  841,
-      840,  818,  818,    0,  825,    0,  859,  858,  807,  825,
-     1300,  820,  815,  808,  804,  816,  806,  804,  800,  816,
-      807,  806, 1300, 1300,  809, 1300,  804,  797,  786,  797,
-      789,  793,  806,  801,  804,  786, 1300, 1300,  798,  787,
-
-     1300,    0,    0,    0,    0,    0,  826,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,  814,  813,  802,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,  785,
-      798,  779,  792,    0,    0,  656,    0,    0,  706,  702,
-     1300,  649, 1300,  648,  648,  654, 1300,  637,  645,  610,
-      612,  608,  608, 1300,  572,  583, 1300, 1300,  577,  573,
-      560,  557,  542,  555, 1300,  539,  573,    0,    0,  572,
-        0,  555,    0,  546,    0,  562,  551,  495,  479, 1300,
-
-     1300, 1300,  481,  481, 1300,  480,  443,   31, 1300,  141,
-      166,  171,  186, 1300, 1300,  211,  236,  276,    0,    0,
-     1300, 1300,  290, 1300,  325, 1300,  346, 1300, 1300,  343,
-      341, 1300, 1300, 1300,  365,    0,  380, 1300,  371, 1300,
-     1300,  486, 1300, 1300,  451,  458,    0,    0, 1300,  836,
-      503,  839
-    } ;
-
-static yyconst flex_int16_t yy_def[853] =
-    {   0,
-      849,    1,  849,  849,  849,  849,  849,  850,  851,  849,
-      849,  849,  849,  849,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  849,  849,  850,  849,  851,
-      849,  849,  849,  849,  849,  849,  849,  849,  849,  849,
-      849,  849,  849,  849,  849,  849,  849,  849,  849,  849,
-      849,  849,  849,  849,  849,  852,  849,  849,  849,  849,
-      849,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  849,  849,  849,  849,
-      849,  849,  849,  849,  849,  849,  849,  849,  849,  849,
-      849,  849,  849,  849,  849,  849,  849,  849,  849,  849,
-      849,  849,  849,  849,  849,  849,  849,  849,  849,  849,
-      849,  849,  849,  849,  849,  849,  849,  849,  849,  849,
-      849,  849,  849,  849,  849,  849,  849,  849,  849,  849,
-      849,  849,  849,  849,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  851,  849,  849,  849,  849,  849,  849,  849,  849,
-      849,  849,  849,  849,  849,  849,  849,  849,  849,  849,
-      849,  849,  849,  849,  849,  849,  849,  849,  849,  849,
-      849,  849,  849,  849,  849,  849,  849,  849,  849,  849,
-      849,  849,  849,  849,  849,  849,  849,  849,  849,  849,
-
-      849,  849,  849,  849,  849,  849,  849,  849,  849,  851,
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  849,  849,  849,  849,  849,  849,  849,  849,  849,
-      849,  849,  849,  849,  849,  849,  849,  849,  849,  849,
-      849,  849,  849,  849,  849,  849,  849,  849,  849,  849,
-      849,  849,  849,  849,  849,  849,  849,  849,  849,  849,
-      849,  849,  849,  849,  849,  849,  849,  849,  849,  851,
-
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  849,  849,  849,  849,  849,  849,
-      849,  849,  849,  849,  849,  849,  849,  849,  849,  849,
-      849,  849,  849,  849,  849,  849,  849,  849,  849,  849,
-      849,  849,  849,  849,  849,  849,  849,  849,  849,  849,
-
-      849,  849,  849,  849,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  849,  849,  849,  849,
-      849,  849,  849,  849,  849,  849,  849,  849,  849,  849,
-      849,  849,  849,  849,  849,  849,  849,  849,  849,  849,
-      849,  849,  849,  849,  849,  849,  849,  849,  849,  849,
-
-      849,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  851,  851,  851,  849,  849,
-      849,  849,  849,  849,  849,  849,  849,  849,  849,  849,
-      849,  849,  849,  849,  849,  849,  849,  849,  849,  849,
-      849,  849,  849,  849,  849,  849,  851,  851,  851,  851,
-      851,  851,  851,  851,  851,  849,  849,  849,  849,  849,
-
-      849,  849,  849,  849,  849,  849,  849,  849,  849,  849,
-      849,  849,  849,  849,  849,  849,  851,  851,  851,  851,
-      849,  849,  849,  849,  849,  849,  849,  849,  849,  849,
-      849,  849,  849,  849,  851,  851,  849,  849,  849,  849,
-      849,  851,  849,  849,  851,  851,  851,  851,    0,  849,
-      849,  849
-    } ;
-
-static yyconst flex_int16_t yy_nxt[1368] =
-    {   0,
-        4,    5,    6,    5,    7,    8,    9,    4,   10,   11,
-       12,   13,   14,   11,   11,   15,    9,   16,   17,   18,
-       19,    9,    9,    9,   20,   21,   22,    9,   23,   24,
-        9,   25,   26,   27,   28,    9,    9,   29,    9,    9,
-        9,    9,    9,    9,    9,    9,   30,    9,    9,    9,
-        9,    9,    9,    9,    9,    9,   31,    9,   32,   33,
-       34,    9,   35,    9,    9,    9,    9,   36,   96,   36,
-       41,  116,  137,   97,   80,  138,  829,   42,   43,   43,
-       43,   43,   43,   43,   77,   81,   78,  119,   82,  117,
-       83,  238,   79,   66,   67,   67,   67,   67,   67,   67,
-
-       84,   85,  239,  150,   68,  120,   36,   86,   36,  151,
-       44,   45,   46,   47,   48,   49,   50,   51,   52,  141,
-      142,   53,   54,   55,   56,   57,   58,   59,   60,   61,
-       68,  143,   62,   63,   64,   65,   66,   67,   67,   67,
-       67,   67,   67,  170,  194,  195,   69,   68,   66,   67,
-       67,   67,   67,   67,   67,  218,  171,  219,   70,   68,
-       66,   67,   67,   67,   67,   67,   67,   72,  139,   73,
-       71,   68,  140,   68,  144,   92,   74,  145,   98,   88,
-      467,   89,   75,   93,   76,   68,   90,   99,   94,   91,
-      101,  100,  102,  103,   95,  468,  830,   68,  136,  133,
-
-      210,  133,  133,  152,  133,  104,  105,  133,  106,  107,
-      108,  109,  110,  134,  111,  133,  112,  153,  133,  211,
-      135,  831,  113,  114,  154,  115,   41,   43,   43,   43,
-       43,   43,   43,  146,  147,  157,  832,  132,  165,  133,
-      166,  161,  162,  167,  168,  833,  158,  163,  188,  159,
-      133,  169,  160,  265,  189,  164,  834,  201,  133,  174,
-      173,  175,  176,  132,  835,  266,  128,  129,   46,   47,
-       48,   49,  172,   51,   52,  202,  285,   53,   54,   55,
-       56,   57,   58,  130,   60,   61,  286,  243,  131,  244,
-      173,  173,  173,  173,  177,  173,  173,  178,  179,  173,
-
-      173,  173,  181,  181,  181,  181,  181,  181,  228,  836,
-      196,  197,  182,   66,   67,   67,   67,   67,   67,   67,
-      198,  232,  229,  183,   68,  184,  184,  184,  184,  184,
-      184,  240,  134,  241,  255,  233,  282,  287,  182,  135,
-      258,  258,  283,  288,  242,  837,  258,  430,  164,  256,
-       68,  257,  257,  257,  257,  257,  257,  258,  258,  258,
-      261,  258,  258,  298,  258,  272,  258,  258,  258,  258,
-      431,  258,  381,  299,  258,  258,  379,  838,  258,  432,
-      440,  289,  258,  290,  258,  258,  291,  292,  380,  258,
-      382,  839,  258,  303,  303,  303,  303,  840,  441,  841,
-
-      258,  842,  433,  258,  303,  303,  303,  303,  304,  303,
-      303,  305,  306,  303,  303,  303,  303,  303,  303,  303,
-      307,  303,  303,  303,  303,  303,  303,  303,   43,   43,
-       43,   43,   43,   43,  843,  844,  434,  308,  132,  309,
-      309,  309,  309,  309,  309,  184,  184,  184,  184,  184,
-      184,  184,  184,  184,  184,  184,  184,  310,  313,  435,
-      321,  325,  311,  314,  132,  322,  326,  438,  328,  847,
-      565,  311,  315,  329,  322,  326,  848,  311,  314,  439,
-      312,  316,  329,  323,  327,  331,  566,  334,  340,  337,
-      332,  330,  335,  341,  338,  482,  845,  846,  483,  332,
-
-      436,  335,  341,  338,   40,  332,  828,  335,  333,  338,
-      336,  342,  339,  343,  346,  349,  352,  355,  344,  347,
-      350,  353,  356,  437,  827,  826,  825,  344,  347,  350,
-      353,  356,  455,  824,  347,  350,  345,  348,  351,  354,
-      357,  358,  361,  364,  823,  456,  359,  362,  365,  498,
-      498,  498,  498,  367,  370,  359,  362,  365,  368,  371,
-      822,  359,  362,  365,  360,  363,  366,  368,  371,  678,
-      373,  821,  679,  368,  371,  374,  369,  372,  383,  820,
-      386,  390,  393,  384,  374,  387,  391,  394,  819,  818,
-      374,  817,  384,  375,  387,  391,  394,  397,  816,  815,
-
-      814,  385,  398,  388,  392,  395,  471,  400,  403,  406,
-      410,  398,  401,  404,  407,  411,  813,  398,  812,  472,
-      399,  401,  404,  407,  411,  811,  810,  401,  404,  407,
-      402,  405,  408,  412,  413,  416,  419,  809,  808,  414,
-      417,  420,  498,  498,  498,  498,  422,  425,  414,  417,
-      420,  423,  426,  807,  414,  417,  420,  415,  418,  421,
-      423,  426,  806,  442,  805,  804,  423,  426,  443,  424,
-      427,  257,  257,  257,  257,  257,  257,  443,  257,  257,
-      257,  257,  257,  257,  453,  453,  444,  453,  453,  803,
-      453,  453,  453,  453,  453,  453,  802,  453,  801,  310,
-
-      453,  453,  800,  799,  453,  313,  485,  453,  453,  798,
-      797,  453,  453,  492,  796,  493,  795,  494,  499,  498,
-      498,  498,  312,  453,  498,  498,  498,  498,  316,  321,
-      495,  498,  498,  498,  498,  309,  309,  309,  309,  309,
-      309,  309,  309,  309,  309,  309,  309,  313,  325,  501,
-      328,  331,  323,  334,  337,  340,  343,  346,  349,  352,
-      355,  358,  361,  364,  367,  370,  373,  383,  386,  390,
-      316,  327,  393,  330,  333,  397,  336,  339,  342,  345,
-      348,  351,  354,  357,  360,  363,  366,  369,  372,  375,
-      385,  388,  392,  400,  403,  395,  406,  410,  399,  413,
-
-      416,  419,  422,  425,  551,  554,  442,  794,  608,  609,
-      655,  658,  793,  792,  736,  737,  402,  405,  791,  408,
-      412,  790,  415,  418,  421,  424,  427,  552,  555,  444,
-      610,  789,  788,  656,  659,  738,   38,   38,   38,  180,
-      180,  787,  786,  785,  784,  783,  782,  781,  780,  779,
-      778,  777,  776,  775,  774,  773,  772,  771,  770,  769,
-      768,  767,  766,  765,  764,  763,  762,  761,  760,  759,
-      758,  757,  756,  755,  754,  753,  659,  752,  751,  656,
-      750,  749,  748,  747,  746,  745,  744,  743,  742,  741,
-      740,  739,  735,  734,  733,  732,  731,  730,  729,  728,
-
-      727,  726,  725,  724,  723,  722,  721,  720,  719,  718,
-      717,  716,  715,  714,  713,  712,  711,  710,  709,  708,
-      707,  706,  705,  704,  703,  702,  701,  700,  699,  698,
-      697,  696,  695,  694,  693,  692,  691,  690,  689,  688,
-      687,  686,  685,  684,  683,  682,  681,  680,  677,  676,
-      675,  674,  673,  672,  671,  670,  669,  668,  667,  666,
-      665,  664,  663,  662,  661,  660,  657,  555,  654,  552,
-      653,  652,  651,  650,  649,  648,  647,  646,  645,  644,
-      643,  642,  641,  640,  639,  638,  637,  636,  635,  634,
-      633,  632,  631,  630,  629,  628,  627,  626,  625,  624,
-
-      623,  622,  621,  620,  619,  618,  617,  616,  615,  614,
-      613,  612,  611,  607,  606,  605,  604,  603,  602,  601,
-      600,  599,  598,  597,  596,  595,  594,  593,  592,  591,
-      590,  589,  588,  587,  586,  585,  584,  583,  582,  581,
-      580,  579,  578,  577,  576,  575,  574,  573,  572,  571,
-      570,  569,  568,  567,  564,  563,  562,  561,  560,  559,
-      558,  557,  444,  556,  553,  550,  437,  549,  435,  548,
-      433,  547,  431,  546,  545,  427,  544,  424,  543,  421,
-      542,  418,  541,  415,  540,  412,  539,  538,  408,  537,
-      405,  536,  402,  535,  399,  534,  533,  395,  532,  392,
-
-      531,  388,  530,  385,  529,  528,  527,  526,  525,  524,
-      375,  523,  372,  522,  369,  521,  366,  520,  363,  519,
-      360,  518,  357,  517,  354,  516,  351,  515,  348,  514,
-      345,  513,  342,  512,  339,  511,  336,  510,  333,  509,
-      330,  508,  327,  507,  323,  506,  505,  504,  503,  502,
-      316,  500,  312,  497,  496,  491,  490,  489,  488,  487,
-      486,  484,  481,  480,  479,  478,  477,  476,  475,  474,
-      473,  470,  469,  466,  465,  464,  463,  462,  461,  460,
-      459,  458,  457,  454,  289,  261,  452,  451,  450,  449,
-      448,  447,  446,  445,  429,  428,  409,  396,  389,  378,
-
-      377,  376,  324,  320,  319,  318,  317,  302,  301,  300,
-      297,  296,  295,  294,  293,  284,  281,  280,  279,  278,
-      277,  276,  275,  274,  273,  271,  270,  269,  268,  267,
-      264,  263,  262,  260,  259,  172,  254,  253,  252,  251,
-      250,  249,  248,  247,  246,  245,  237,  236,  235,  234,
-      231,  230,  227,  226,  225,  224,  223,  222,  221,  220,
-      217,  216,  215,  214,  213,  212,  209,  208,  207,  206,
-      205,  204,  203,  200,  199,  193,  192,  191,  190,  187,
-      186,  185,  156,  155,  149,  148,   39,  127,  126,  125,
-      124,  123,  122,  121,  118,   87,   39,   37,  849,    3,
-
-      849,  849,  849,  849,  849,  849,  849,  849,  849,  849,
-      849,  849,  849,  849,  849,  849,  849,  849,  849,  849,
-      849,  849,  849,  849,  849,  849,  849,  849,  849,  849,
-      849,  849,  849,  849,  849,  849,  849,  849,  849,  849,
-      849,  849,  849,  849,  849,  849,  849,  849,  849,  849,
-      849,  849,  849,  849,  849,  849,  849,  849,  849,  849,
-      849,  849,  849,  849,  849,  849,  849
-    } ;
-
-static yyconst flex_int16_t yy_chk[1368] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    5,   23,    5,
-       10,   27,   46,   23,   17,   46,  808,   10,   10,   10,
-       10,   10,   10,   10,   16,   17,   16,   29,   17,   27,
-       18,  116,   16,   11,   11,   11,   11,   11,   11,   11,
-
-       18,   19,  116,   53,   11,   29,   36,   19,   36,   53,
-       10,   10,   10,   10,   10,   10,   10,   10,   10,   48,
-       48,   10,   10,   10,   10,   10,   10,   10,   10,   10,
-       11,   48,   10,   10,   10,   10,   12,   12,   12,   12,
-       12,   12,   12,   61,   80,   80,   12,   12,   13,   13,
-       13,   13,   13,   13,   13,   99,   61,   99,   13,   13,
-       14,   14,   14,   14,   14,   14,   14,   15,   47,   15,
-       14,   14,   47,   12,   49,   22,   15,   49,   24,   21,
-      274,   21,   15,   22,   15,   13,   21,   24,   22,   21,
-       25,   24,   25,   25,   22,  274,  810,   14,   45,   45,
-
-       92,   44,   44,   54,   45,   25,   26,   44,   26,   26,
-       26,   26,   26,   44,   26,   45,   26,   54,   44,   92,
-       44,  811,   26,   26,   54,   26,   41,   43,   43,   43,
-       43,   43,   43,   50,   50,   57,  812,   43,   60,   50,
-       60,   59,   59,   60,   60,  813,   57,   59,   75,   57,
-       50,   60,   57,  140,   75,   59,  816,   84,   59,   63,
-       63,   63,   63,   43,  817,  140,   41,   41,   41,   41,
-       41,   41,   62,   41,   41,   84,  159,   41,   41,   41,
-       41,   41,   41,   41,   41,   41,  159,  118,   41,  118,
-       62,   62,   62,   62,   64,   64,   64,   64,   65,   65,
-
-       65,   65,   66,   66,   66,   66,   66,   66,  108,  818,
-       81,   81,   66,   67,   67,   67,   67,   67,   67,   67,
-       81,  111,  108,   68,   67,   68,   68,   68,   68,   68,
-       68,  117,  128,  117,  130,  111,  157,  160,   66,  128,
-      133,  133,  157,  160,  117,  823,  133,  239,  130,  132,
-       67,  132,  132,  132,  132,  132,  132,  133,  136,  136,
-      136,  146,  146,  169,  136,  147,  147,  146,  161,  161,
-      239,  147,  219,  169,  161,  136,  218,  825,  146,  240,
-      244,  161,  147,  162,  162,  161,  163,  163,  218,  162,
-      219,  827,  163,  173,  173,  173,  173,  830,  244,  831,
-
-      162,  835,  240,  163,  174,  174,  174,  174,  175,  175,
-      175,  175,  176,  176,  176,  176,  177,  177,  177,  177,
-      178,  178,  178,  178,  179,  179,  179,  179,  181,  181,
-      181,  181,  181,  181,  837,  839,  241,  182,  181,  182,
-      182,  182,  182,  182,  182,  183,  183,  183,  183,  183,
-      183,  184,  184,  184,  184,  184,  184,  185,  186,  241,
-      192,  194,  185,  186,  181,  192,  194,  243,  195,  845,
-      452,  185,  186,  195,  192,  194,  846,  185,  186,  243,
-      185,  186,  195,  192,  194,  196,  452,  197,  199,  198,
-      196,  195,  197,  199,  198,  288,  842,  842,  288,  196,
-
-      242,  197,  199,  198,  851,  196,  807,  197,  196,  198,
-      197,  199,  198,  201,  203,  204,  206,  207,  201,  203,
-      204,  206,  207,  242,  806,  804,  803,  201,  203,  204,
-      206,  207,  260,  799,  203,  204,  201,  203,  204,  206,
-      207,  209,  210,  211,  798,  260,  209,  210,  211,  303,
-      303,  303,  303,  212,  213,  209,  210,  211,  212,  213,
-      797,  209,  210,  211,  209,  210,  211,  212,  213,  579,
-      214,  796,  579,  212,  213,  214,  212,  213,  220,  794,
-      221,  223,  224,  220,  214,  221,  223,  224,  792,  790,
-      214,  787,  220,  214,  221,  223,  224,  226,  786,  784,
-
-      783,  220,  226,  221,  223,  224,  277,  227,  228,  229,
-      231,  226,  227,  228,  229,  231,  782,  226,  781,  277,
-      226,  227,  228,  229,  231,  780,  779,  227,  228,  229,
-      227,  228,  229,  231,  232,  233,  234,  776,  775,  232,
-      233,  234,  304,  304,  304,  304,  235,  236,  232,  233,
-      234,  235,  236,  773,  232,  233,  234,  232,  233,  234,
-      235,  236,  772,  245,  771,  770,  235,  236,  245,  235,
-      236,  256,  256,  256,  256,  256,  256,  245,  257,  257,
-      257,  257,  257,  257,  258,  258,  245,  272,  272,  769,
-      258,  290,  290,  272,  291,  291,  768,  290,  766,  311,
-
-      291,  258,  765,  764,  272,  314,  292,  292,  290,  762,
-      760,  291,  292,  300,  759,  300,  756,  300,  305,  305,
-      305,  305,  311,  292,  306,  306,  306,  306,  314,  322,
-      300,  307,  307,  307,  307,  308,  308,  308,  308,  308,
-      308,  309,  309,  309,  309,  309,  309,  315,  326,  315,
-      329,  332,  322,  335,  338,  341,  344,  347,  350,  353,
-      356,  359,  362,  365,  368,  371,  374,  384,  387,  391,
-      315,  326,  394,  329,  332,  398,  335,  338,  341,  344,
-      347,  350,  353,  356,  359,  362,  365,  368,  371,  374,
-      384,  387,  391,  401,  404,  394,  407,  411,  398,  414,
-
-      417,  420,  423,  426,  438,  440,  443,  753,  504,  504,
-      553,  556,  752,  751,  642,  642,  401,  404,  750,  407,
-      411,  738,  414,  417,  420,  423,  426,  438,  440,  443,
-      504,  737,  736,  553,  556,  642,  850,  850,  850,  852,
-      852,  707,  700,  699,  696,  695,  694,  693,  692,  691,
-      690,  689,  688,  687,  685,  682,  681,  680,  679,  678,
-      677,  676,  675,  674,  673,  672,  670,  669,  668,  667,
-      665,  663,  662,  661,  660,  659,  658,  657,  656,  655,
-      654,  653,  652,  651,  650,  649,  648,  647,  646,  645,
-      644,  643,  641,  640,  639,  638,  637,  636,  635,  634,
-
-      633,  630,  629,  628,  627,  626,  625,  624,  623,  622,
-      621,  620,  619,  618,  617,  616,  615,  614,  613,  612,
-      610,  609,  608,  607,  606,  605,  604,  603,  602,  601,
-      600,  599,  598,  597,  596,  595,  593,  592,  591,  590,
-      589,  587,  586,  585,  584,  583,  582,  581,  578,  577,
-      575,  574,  573,  572,  569,  568,  567,  566,  565,  564,
-      563,  561,  560,  559,  558,  557,  555,  554,  552,  551,
-      550,  549,  548,  547,  546,  545,  544,  543,  542,  541,
-      540,  539,  538,  537,  536,  535,  534,  533,  532,  531,
-      530,  526,  525,  524,  523,  522,  521,  520,  519,  518,
-
-      517,  516,  515,  514,  513,  512,  511,  510,  509,  508,
-      507,  506,  505,  502,  501,  500,  497,  496,  495,  494,
-      493,  492,  490,  488,  487,  486,  484,  483,  482,  481,
-      480,  479,  478,  477,  476,  475,  474,  473,  472,  471,
-      470,  469,  468,  467,  465,  464,  463,  462,  461,  460,
-      459,  456,  455,  454,  451,  450,  449,  448,  447,  446,
-      445,  444,  442,  441,  439,  437,  436,  435,  434,  433,
-      432,  431,  430,  428,  427,  425,  424,  422,  421,  419,
-      418,  416,  415,  413,  412,  410,  409,  408,  406,  405,
-      403,  402,  400,  399,  397,  396,  395,  393,  392,  390,
-
-      388,  386,  385,  383,  382,  380,  378,  377,  376,  375,
-      373,  372,  370,  369,  367,  366,  364,  363,  361,  360,
-      358,  357,  355,  354,  352,  351,  349,  348,  346,  345,
-      343,  342,  340,  339,  337,  336,  334,  333,  331,  330,
-      328,  327,  325,  323,  321,  320,  319,  318,  317,  316,
-      313,  312,  310,  302,  301,  299,  298,  297,  296,  295,
-      294,  289,  287,  286,  285,  284,  283,  282,  281,  280,
-      278,  276,  275,  273,  271,  270,  267,  266,  265,  264,
-      263,  262,  261,  259,  255,  254,  253,  252,  251,  250,
-      249,  248,  247,  246,  238,  237,  230,  225,  222,  217,
-
-      216,  215,  193,  191,  190,  189,  187,  172,  171,  170,
-      168,  167,  166,  165,  164,  158,  156,  155,  154,  153,
-      152,  151,  150,  149,  148,  145,  144,  143,  142,  141,
-      139,  138,  137,  135,  134,  131,  129,  127,  126,  125,
-      124,  123,  122,  121,  120,  119,  115,  114,  113,  112,
-      110,  109,  107,  106,  105,  104,  103,  102,  101,  100,
-       98,   97,   96,   95,   94,   93,   91,   90,   89,   88,
-       87,   86,   85,   83,   82,   79,   78,   77,   76,   74,
-       73,   72,   56,   55,   52,   51,   38,   37,   35,   34,
-       33,   32,   31,   30,   28,   20,    8,    7,    3,  849,
-
-      849,  849,  849,  849,  849,  849,  849,  849,  849,  849,
-      849,  849,  849,  849,  849,  849,  849,  849,  849,  849,
-      849,  849,  849,  849,  849,  849,  849,  849,  849,  849,
-      849,  849,  849,  849,  849,  849,  849,  849,  849,  849,
-      849,  849,  849,  849,  849,  849,  849,  849,  849,  849,
-      849,  849,  849,  849,  849,  849,  849,  849,  849,  849,
-      849,  849,  849,  849,  849,  849,  849
-    } ;
-
-/* The intent behind this definition is that it'll catch
- * any uses of REJECT which flex missed.
- */
-#define REJECT reject_used_but_not_detected
-#define yymore() yymore_used_but_not_detected
-#define YY_MORE_ADJ 0
-#define YY_RESTORE_YY_MORE_OFFSET
-#line 1 "program_lexer.l"
-#line 2 "program_lexer.l"
-/*
- * Copyright © 2009 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-#include "main/glheader.h"
-#include "main/imports.h"
-#include "program/prog_instruction.h"
-#include "program/prog_statevars.h"
-#include "program/symbol_table.h"
-#include "program/program_parser.h"
-#include "program/program_parse.tab.h"
-
-#define require_ARB_vp (yyextra->mode == ARB_vertex)
-#define require_ARB_fp (yyextra->mode == ARB_fragment)
-#define require_NV_fp  (yyextra->option.NV_fragment)
-#define require_shadow (yyextra->option.Shadow)
-#define require_rect   (yyextra->option.TexRect)
-#define require_texarray        (yyextra->option.TexArray)
-
-#ifndef HAVE_UNISTD_H
-#define YY_NO_UNISTD_H
-#endif
-
-#define return_token_or_IDENTIFIER(condition, token)	\
-   do {							\
-      if (condition) {					\
-	 return token;					\
-      } else {						\
-	 return handle_ident(yyextra, yytext, yylval);	\
-      }							\
-   } while (0)
-
-#define return_token_or_DOT(condition, token)		\
-   do {							\
-      if (condition) {					\
-	 return token;					\
-      } else {						\
-	 yyless(1);					\
-	 return DOT;					\
-      }							\
-   } while (0)
-
-
-#define return_opcode(condition, token, opcode, len)	\
-   do {							\
-      if (condition &&					\
-	  _mesa_parse_instruction_suffix(yyextra,	\
-					 yytext + len,	\
-					 & yylval->temp_inst)) {	\
-	 yylval->temp_inst.Opcode = OPCODE_ ## opcode;	\
-	 return token;					\
-      } else {						\
-	 return handle_ident(yyextra, yytext, yylval);	\
-      }							\
-   } while (0)
-
-#define SWIZZLE_INVAL  MAKE_SWIZZLE4(SWIZZLE_NIL, SWIZZLE_NIL, \
-				     SWIZZLE_NIL, SWIZZLE_NIL)
-
-static unsigned
-mask_from_char(char c)
-{
-   switch (c) {
-   case 'x':
-   case 'r':
-      return WRITEMASK_X;
-   case 'y':
-   case 'g':
-      return WRITEMASK_Y;
-   case 'z':
-   case 'b':
-      return WRITEMASK_Z;
-   case 'w':
-   case 'a':
-      return WRITEMASK_W;
-   }
-
-   return 0;
-}
-
-static unsigned
-swiz_from_char(char c)
-{
-   switch (c) {
-   case 'x':
-   case 'r':
-      return SWIZZLE_X;
-   case 'y':
-   case 'g':
-      return SWIZZLE_Y;
-   case 'z':
-   case 'b':
-      return SWIZZLE_Z;
-   case 'w':
-   case 'a':
-      return SWIZZLE_W;
-   }
-
-   return 0;
-}
-
-static int
-handle_ident(struct asm_parser_state *state, const char *text, YYSTYPE *lval)
-{
-   lval->string = strdup(text);
-
-   return (_mesa_symbol_table_find_symbol(state->st, 0, text) == NULL)
-      ? IDENTIFIER : USED_IDENTIFIER;
-}
-
-#define YY_USER_ACTION							\
-   do {									\
-      yylloc->first_column = yylloc->last_column;			\
-      yylloc->last_column += yyleng;					\
-      if ((yylloc->first_line == 1)					\
-	  && (yylloc->first_column == 1)) {				\
-	 yylloc->position = 1;						\
-      } else {								\
-	 yylloc->position += yylloc->last_column - yylloc->first_column; \
-      }									\
-   } while(0);
-
-#define YY_NO_INPUT
-
-/* Yes, this is intentionally doing nothing. We have this line of code
-here only to avoid the compiler complaining about an unput function
-that is defined, but never called. */
-#define YY_USER_INIT while (0) { unput(0); }
-
-#define YY_EXTRA_TYPE struct asm_parser_state *
-
-/* Flex defines a couple of functions with no declarations nor the
-static keyword. Declare them here to avoid a compiler warning. */
-int yyget_column  (yyscan_t yyscanner);
-void yyset_column (int  column_no , yyscan_t yyscanner);
-
-#line 1177 "lex.yy.c"
-
-#define INITIAL 0
-
-#ifndef YY_NO_UNISTD_H
-/* Special case for "unistd.h", since it is non-ANSI. We include it way
- * down here because we want the user's section 1 to have been scanned first.
- * The user has a chance to override it with an option.
- */
-#include <unistd.h>
-#endif
-
-#ifndef YY_EXTRA_TYPE
-#define YY_EXTRA_TYPE void *
-#endif
-
-/* Holds the entire state of the reentrant scanner. */
-struct yyguts_t
-    {
-
-    /* User-defined. Not touched by flex. */
-    YY_EXTRA_TYPE yyextra_r;
-
-    /* The rest are the same as the globals declared in the non-reentrant scanner. */
-    FILE *yyin_r, *yyout_r;
-    size_t yy_buffer_stack_top; /**< index of top of stack. */
-    size_t yy_buffer_stack_max; /**< capacity of stack. */
-    YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */
-    char yy_hold_char;
-    int yy_n_chars;
-    int yyleng_r;
-    char *yy_c_buf_p;
-    int yy_init;
-    int yy_start;
-    int yy_did_buffer_switch_on_eof;
-    int yy_start_stack_ptr;
-    int yy_start_stack_depth;
-    int *yy_start_stack;
-    yy_state_type yy_last_accepting_state;
-    char* yy_last_accepting_cpos;
-
-    int yylineno_r;
-    int yy_flex_debug_r;
-
-    char *yytext_r;
-    int yy_more_flag;
-    int yy_more_len;
-
-    YYSTYPE * yylval_r;
-
-    YYLTYPE * yylloc_r;
-
-    }; /* end struct yyguts_t */
-
-static int yy_init_globals (yyscan_t yyscanner );
-
-    /* This must go here because YYSTYPE and YYLTYPE are included
-     * from bison output in section 1.*/
-    #    define yylval yyg->yylval_r
-    
-    #    define yylloc yyg->yylloc_r
-    
-int yylex_init (yyscan_t* scanner);
-
-int yylex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner);
-
-/* Accessor methods to globals.
-   These are made visible to non-reentrant scanners for convenience. */
-
-int yylex_destroy (yyscan_t yyscanner );
-
-int yyget_debug (yyscan_t yyscanner );
-
-void yyset_debug (int debug_flag ,yyscan_t yyscanner );
-
-YY_EXTRA_TYPE yyget_extra (yyscan_t yyscanner );
-
-void yyset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner );
-
-FILE *yyget_in (yyscan_t yyscanner );
-
-void yyset_in  (FILE * in_str ,yyscan_t yyscanner );
-
-FILE *yyget_out (yyscan_t yyscanner );
-
-void yyset_out  (FILE * out_str ,yyscan_t yyscanner );
-
-int yyget_leng (yyscan_t yyscanner );
-
-char *yyget_text (yyscan_t yyscanner );
-
-int yyget_lineno (yyscan_t yyscanner );
-
-void yyset_lineno (int line_number ,yyscan_t yyscanner );
-
-YYSTYPE * yyget_lval (yyscan_t yyscanner );
-
-void yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner );
-
-       YYLTYPE *yyget_lloc (yyscan_t yyscanner );
-    
-        void yyset_lloc (YYLTYPE * yylloc_param ,yyscan_t yyscanner );
-    
-/* Macros after this point can all be overridden by user definitions in
- * section 1.
- */
-
-#ifndef YY_SKIP_YYWRAP
-#ifdef __cplusplus
-extern "C" int yywrap (yyscan_t yyscanner );
-#else
-extern int yywrap (yyscan_t yyscanner );
-#endif
-#endif
-
-    static void yyunput (int c,char *buf_ptr  ,yyscan_t yyscanner);
-    
-#ifndef yytext_ptr
-static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner);
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner);
-#endif
-
-#ifndef YY_NO_INPUT
-
-#ifdef __cplusplus
-static int yyinput (yyscan_t yyscanner );
-#else
-static int input (yyscan_t yyscanner );
-#endif
-
-#endif
-
-/* Amount of stuff to slurp up with each read. */
-#ifndef YY_READ_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k */
-#define YY_READ_BUF_SIZE 16384
-#else
-#define YY_READ_BUF_SIZE 8192
-#endif /* __ia64__ */
-#endif
-
-/* Copy whatever the last rule matched to the standard output. */
-#ifndef ECHO
-/* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
-#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
-#endif
-
-/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
- * is returned in "result".
- */
-#ifndef YY_INPUT
-#define YY_INPUT(buf,result,max_size) \
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
-		{ \
-		int c = '*'; \
-		size_t n; \
-		for ( n = 0; n < max_size && \
-			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
-			buf[n] = (char) c; \
-		if ( c == '\n' ) \
-			buf[n++] = (char) c; \
-		if ( c == EOF && ferror( yyin ) ) \
-			YY_FATAL_ERROR( "input in flex scanner failed" ); \
-		result = n; \
-		} \
-	else \
-		{ \
-		errno=0; \
-		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
-			{ \
-			if( errno != EINTR) \
-				{ \
-				YY_FATAL_ERROR( "input in flex scanner failed" ); \
-				break; \
-				} \
-			errno=0; \
-			clearerr(yyin); \
-			} \
-		}\
-\
-
-#endif
-
-/* No semi-colon after return; correct usage is to write "yyterminate();" -
- * we don't want an extra ';' after the "return" because that will cause
- * some compilers to complain about unreachable statements.
- */
-#ifndef yyterminate
-#define yyterminate() return YY_NULL
-#endif
-
-/* Number of entries by which start-condition stack grows. */
-#ifndef YY_START_STACK_INCR
-#define YY_START_STACK_INCR 25
-#endif
-
-/* Report a fatal error. */
-#ifndef YY_FATAL_ERROR
-#define YY_FATAL_ERROR(msg) yy_fatal_error( msg , yyscanner)
-#endif
-
-/* end tables serialization structures and prototypes */
-
-/* Default declaration of generated scanner - a define so the user can
- * easily add parameters.
- */
-#ifndef YY_DECL
-#define YY_DECL_IS_OURS 1
-
-extern int yylex \
-               (YYSTYPE * yylval_param,YYLTYPE * yylloc_param ,yyscan_t yyscanner);
-
-#define YY_DECL int yylex \
-               (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner)
-#endif /* !YY_DECL */
-
-/* Code executed at the beginning of each rule, after yytext and yyleng
- * have been set up.
- */
-#ifndef YY_USER_ACTION
-#define YY_USER_ACTION
-#endif
-
-/* Code executed at the end of each rule. */
-#ifndef YY_BREAK
-#define YY_BREAK break;
-#endif
-
-#define YY_RULE_SETUP \
-	YY_USER_ACTION
-
-/** The main scanner function which does all the work.
- */
-YY_DECL
-{
-	register yy_state_type yy_current_state;
-	register char *yy_cp, *yy_bp;
-	register int yy_act;
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-#line 169 "program_lexer.l"
-
-
-#line 1426 "lex.yy.c"
-
-    yylval = yylval_param;
-
-    yylloc = yylloc_param;
-
-	if ( !yyg->yy_init )
-		{
-		yyg->yy_init = 1;
-
-#ifdef YY_USER_INIT
-		YY_USER_INIT;
-#endif
-
-		if ( ! yyg->yy_start )
-			yyg->yy_start = 1;	/* first start state */
-
-		if ( ! yyin )
-			yyin = stdin;
-
-		if ( ! yyout )
-			yyout = stdout;
-
-		if ( ! YY_CURRENT_BUFFER ) {
-			yyensure_buffer_stack (yyscanner);
-			YY_CURRENT_BUFFER_LVALUE =
-				yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner);
-		}
-
-		yy_load_buffer_state(yyscanner );
-		}
-
-	while ( 1 )		/* loops until end-of-file is reached */
-		{
-		yy_cp = yyg->yy_c_buf_p;
-
-		/* Support of yytext. */
-		*yy_cp = yyg->yy_hold_char;
-
-		/* yy_bp points to the position in yy_ch_buf of the start of
-		 * the current run.
-		 */
-		yy_bp = yy_cp;
-
-		yy_current_state = yyg->yy_start;
-yy_match:
-		do
-			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
-			if ( yy_accept[yy_current_state] )
-				{
-				yyg->yy_last_accepting_state = yy_current_state;
-				yyg->yy_last_accepting_cpos = yy_cp;
-				}
-			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-				{
-				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 850 )
-					yy_c = yy_meta[(unsigned int) yy_c];
-				}
-			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-			++yy_cp;
-			}
-		while ( yy_base[yy_current_state] != 1300 );
-
-yy_find_action:
-		yy_act = yy_accept[yy_current_state];
-		if ( yy_act == 0 )
-			{ /* have to back up */
-			yy_cp = yyg->yy_last_accepting_cpos;
-			yy_current_state = yyg->yy_last_accepting_state;
-			yy_act = yy_accept[yy_current_state];
-			}
-
-		YY_DO_BEFORE_ACTION;
-
-do_action:	/* This label is used only to access EOF actions. */
-
-		switch ( yy_act )
-	{ /* beginning of action switch */
-			case 0: /* must back up */
-			/* undo the effects of YY_DO_BEFORE_ACTION */
-			*yy_cp = yyg->yy_hold_char;
-			yy_cp = yyg->yy_last_accepting_cpos;
-			yy_current_state = yyg->yy_last_accepting_state;
-			goto yy_find_action;
-
-case 1:
-YY_RULE_SETUP
-#line 171 "program_lexer.l"
-{ return ARBvp_10; }
-	YY_BREAK
-case 2:
-YY_RULE_SETUP
-#line 172 "program_lexer.l"
-{ return ARBfp_10; }
-	YY_BREAK
-case 3:
-YY_RULE_SETUP
-#line 173 "program_lexer.l"
-{
-   yylval->integer = at_address;
-   return_token_or_IDENTIFIER(require_ARB_vp, ADDRESS);
-}
-	YY_BREAK
-case 4:
-YY_RULE_SETUP
-#line 177 "program_lexer.l"
-{ return ALIAS; }
-	YY_BREAK
-case 5:
-YY_RULE_SETUP
-#line 178 "program_lexer.l"
-{ return ATTRIB; }
-	YY_BREAK
-case 6:
-YY_RULE_SETUP
-#line 179 "program_lexer.l"
-{ return END; }
-	YY_BREAK
-case 7:
-YY_RULE_SETUP
-#line 180 "program_lexer.l"
-{ return OPTION; }
-	YY_BREAK
-case 8:
-YY_RULE_SETUP
-#line 181 "program_lexer.l"
-{ return OUTPUT; }
-	YY_BREAK
-case 9:
-YY_RULE_SETUP
-#line 182 "program_lexer.l"
-{ return PARAM; }
-	YY_BREAK
-case 10:
-YY_RULE_SETUP
-#line 183 "program_lexer.l"
-{ yylval->integer = at_temp; return TEMP; }
-	YY_BREAK
-case 11:
-YY_RULE_SETUP
-#line 185 "program_lexer.l"
-{ return_opcode(             1, VECTOR_OP, ABS, 3); }
-	YY_BREAK
-case 12:
-YY_RULE_SETUP
-#line 186 "program_lexer.l"
-{ return_opcode(             1, BIN_OP, ADD, 3); }
-	YY_BREAK
-case 13:
-YY_RULE_SETUP
-#line 187 "program_lexer.l"
-{ return_opcode(require_ARB_vp, ARL, ARL, 3); }
-	YY_BREAK
-case 14:
-YY_RULE_SETUP
-#line 189 "program_lexer.l"
-{ return_opcode(require_ARB_fp, TRI_OP, CMP, 3); }
-	YY_BREAK
-case 15:
-YY_RULE_SETUP
-#line 190 "program_lexer.l"
-{ return_opcode(require_ARB_fp, SCALAR_OP, COS, 3); }
-	YY_BREAK
-case 16:
-YY_RULE_SETUP
-#line 192 "program_lexer.l"
-{ return_opcode(require_NV_fp,  VECTOR_OP, DDX, 3); }
-	YY_BREAK
-case 17:
-YY_RULE_SETUP
-#line 193 "program_lexer.l"
-{ return_opcode(require_NV_fp,  VECTOR_OP, DDY, 3); }
-	YY_BREAK
-case 18:
-YY_RULE_SETUP
-#line 194 "program_lexer.l"
-{ return_opcode(             1, BIN_OP, DP3, 3); }
-	YY_BREAK
-case 19:
-YY_RULE_SETUP
-#line 195 "program_lexer.l"
-{ return_opcode(             1, BIN_OP, DP4, 3); }
-	YY_BREAK
-case 20:
-YY_RULE_SETUP
-#line 196 "program_lexer.l"
-{ return_opcode(             1, BIN_OP, DPH, 3); }
-	YY_BREAK
-case 21:
-YY_RULE_SETUP
-#line 197 "program_lexer.l"
-{ return_opcode(             1, BIN_OP, DST, 3); }
-	YY_BREAK
-case 22:
-YY_RULE_SETUP
-#line 199 "program_lexer.l"
-{ return_opcode(             1, SCALAR_OP, EX2, 3); }
-	YY_BREAK
-case 23:
-YY_RULE_SETUP
-#line 200 "program_lexer.l"
-{ return_opcode(require_ARB_vp, SCALAR_OP, EXP, 3); }
-	YY_BREAK
-case 24:
-YY_RULE_SETUP
-#line 202 "program_lexer.l"
-{ return_opcode(             1, VECTOR_OP, FLR, 3); }
-	YY_BREAK
-case 25:
-YY_RULE_SETUP
-#line 203 "program_lexer.l"
-{ return_opcode(             1, VECTOR_OP, FRC, 3); }
-	YY_BREAK
-case 26:
-YY_RULE_SETUP
-#line 205 "program_lexer.l"
-{ return_opcode(require_ARB_fp, KIL, KIL, 3); }
-	YY_BREAK
-case 27:
-YY_RULE_SETUP
-#line 207 "program_lexer.l"
-{ return_opcode(             1, VECTOR_OP, LIT, 3); }
-	YY_BREAK
-case 28:
-YY_RULE_SETUP
-#line 208 "program_lexer.l"
-{ return_opcode(             1, SCALAR_OP, LG2, 3); }
-	YY_BREAK
-case 29:
-YY_RULE_SETUP
-#line 209 "program_lexer.l"
-{ return_opcode(require_ARB_vp, SCALAR_OP, LOG, 3); }
-	YY_BREAK
-case 30:
-YY_RULE_SETUP
-#line 210 "program_lexer.l"
-{ return_opcode(require_ARB_fp, TRI_OP, LRP, 3); }
-	YY_BREAK
-case 31:
-YY_RULE_SETUP
-#line 212 "program_lexer.l"
-{ return_opcode(             1, TRI_OP, MAD, 3); }
-	YY_BREAK
-case 32:
-YY_RULE_SETUP
-#line 213 "program_lexer.l"
-{ return_opcode(             1, BIN_OP, MAX, 3); }
-	YY_BREAK
-case 33:
-YY_RULE_SETUP
-#line 214 "program_lexer.l"
-{ return_opcode(             1, BIN_OP, MIN, 3); }
-	YY_BREAK
-case 34:
-YY_RULE_SETUP
-#line 215 "program_lexer.l"
-{ return_opcode(             1, VECTOR_OP, MOV, 3); }
-	YY_BREAK
-case 35:
-YY_RULE_SETUP
-#line 216 "program_lexer.l"
-{ return_opcode(             1, BIN_OP, MUL, 3); }
-	YY_BREAK
-case 36:
-YY_RULE_SETUP
-#line 218 "program_lexer.l"
-{ return_opcode(require_NV_fp,  VECTOR_OP, PK2H, 4); }
-	YY_BREAK
-case 37:
-YY_RULE_SETUP
-#line 219 "program_lexer.l"
-{ return_opcode(require_NV_fp,  VECTOR_OP, PK2US, 5); }
-	YY_BREAK
-case 38:
-YY_RULE_SETUP
-#line 220 "program_lexer.l"
-{ return_opcode(require_NV_fp,  VECTOR_OP, PK4B, 4); }
-	YY_BREAK
-case 39:
-YY_RULE_SETUP
-#line 221 "program_lexer.l"
-{ return_opcode(require_NV_fp,  VECTOR_OP, PK4UB, 5); }
-	YY_BREAK
-case 40:
-YY_RULE_SETUP
-#line 222 "program_lexer.l"
-{ return_opcode(             1, BINSC_OP, POW, 3); }
-	YY_BREAK
-case 41:
-YY_RULE_SETUP
-#line 224 "program_lexer.l"
-{ return_opcode(             1, SCALAR_OP, RCP, 3); }
-	YY_BREAK
-case 42:
-YY_RULE_SETUP
-#line 225 "program_lexer.l"
-{ return_opcode(require_NV_fp,  BIN_OP,    RFL, 3); }
-	YY_BREAK
-case 43:
-YY_RULE_SETUP
-#line 226 "program_lexer.l"
-{ return_opcode(             1, SCALAR_OP, RSQ, 3); }
-	YY_BREAK
-case 44:
-YY_RULE_SETUP
-#line 228 "program_lexer.l"
-{ return_opcode(require_ARB_fp, SCALAR_OP, SCS, 3); }
-	YY_BREAK
-case 45:
-YY_RULE_SETUP
-#line 229 "program_lexer.l"
-{ return_opcode(require_NV_fp,  BIN_OP, SEQ, 3); }
-	YY_BREAK
-case 46:
-YY_RULE_SETUP
-#line 230 "program_lexer.l"
-{ return_opcode(require_NV_fp,  BIN_OP, SFL, 3); }
-	YY_BREAK
-case 47:
-YY_RULE_SETUP
-#line 231 "program_lexer.l"
-{ return_opcode(             1, BIN_OP, SGE, 3); }
-	YY_BREAK
-case 48:
-YY_RULE_SETUP
-#line 232 "program_lexer.l"
-{ return_opcode(require_NV_fp,  BIN_OP, SGT, 3); }
-	YY_BREAK
-case 49:
-YY_RULE_SETUP
-#line 233 "program_lexer.l"
-{ return_opcode(require_ARB_fp, SCALAR_OP, SIN, 3); }
-	YY_BREAK
-case 50:
-YY_RULE_SETUP
-#line 234 "program_lexer.l"
-{ return_opcode(require_NV_fp,  BIN_OP, SLE, 3); }
-	YY_BREAK
-case 51:
-YY_RULE_SETUP
-#line 235 "program_lexer.l"
-{ return_opcode(             1, BIN_OP, SLT, 3); }
-	YY_BREAK
-case 52:
-YY_RULE_SETUP
-#line 236 "program_lexer.l"
-{ return_opcode(require_NV_fp,  BIN_OP, SNE, 3); }
-	YY_BREAK
-case 53:
-YY_RULE_SETUP
-#line 237 "program_lexer.l"
-{ return_opcode(require_NV_fp,  BIN_OP, STR, 3); }
-	YY_BREAK
-case 54:
-YY_RULE_SETUP
-#line 238 "program_lexer.l"
-{ return_opcode(             1, BIN_OP, SUB, 3); }
-	YY_BREAK
-case 55:
-YY_RULE_SETUP
-#line 239 "program_lexer.l"
-{ return_opcode(             1, SWZ, SWZ, 3); }
-	YY_BREAK
-case 56:
-YY_RULE_SETUP
-#line 241 "program_lexer.l"
-{ return_opcode(require_ARB_fp, SAMPLE_OP, TEX, 3); }
-	YY_BREAK
-case 57:
-YY_RULE_SETUP
-#line 242 "program_lexer.l"
-{ return_opcode(require_ARB_fp, SAMPLE_OP, TXB, 3); }
-	YY_BREAK
-case 58:
-YY_RULE_SETUP
-#line 243 "program_lexer.l"
-{ return_opcode(require_NV_fp,  TXD_OP, TXD, 3); }
-	YY_BREAK
-case 59:
-YY_RULE_SETUP
-#line 244 "program_lexer.l"
-{ return_opcode(require_ARB_fp, SAMPLE_OP, TXP, 3); }
-	YY_BREAK
-case 60:
-YY_RULE_SETUP
-#line 246 "program_lexer.l"
-{ return_opcode(require_NV_fp,  SCALAR_OP, UP2H, 4); }
-	YY_BREAK
-case 61:
-YY_RULE_SETUP
-#line 247 "program_lexer.l"
-{ return_opcode(require_NV_fp,  SCALAR_OP, UP2US, 5); }
-	YY_BREAK
-case 62:
-YY_RULE_SETUP
-#line 248 "program_lexer.l"
-{ return_opcode(require_NV_fp,  SCALAR_OP, UP4B, 4); }
-	YY_BREAK
-case 63:
-YY_RULE_SETUP
-#line 249 "program_lexer.l"
-{ return_opcode(require_NV_fp,  SCALAR_OP, UP4UB, 5); }
-	YY_BREAK
-case 64:
-YY_RULE_SETUP
-#line 251 "program_lexer.l"
-{ return_opcode(require_NV_fp,  TRI_OP, X2D, 3); }
-	YY_BREAK
-case 65:
-YY_RULE_SETUP
-#line 252 "program_lexer.l"
-{ return_opcode(             1, BIN_OP, XPD, 3); }
-	YY_BREAK
-case 66:
-YY_RULE_SETUP
-#line 254 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_vp, VERTEX); }
-	YY_BREAK
-case 67:
-YY_RULE_SETUP
-#line 255 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp, FRAGMENT); }
-	YY_BREAK
-case 68:
-YY_RULE_SETUP
-#line 256 "program_lexer.l"
-{ return PROGRAM; }
-	YY_BREAK
-case 69:
-YY_RULE_SETUP
-#line 257 "program_lexer.l"
-{ return STATE; }
-	YY_BREAK
-case 70:
-YY_RULE_SETUP
-#line 258 "program_lexer.l"
-{ return RESULT; }
-	YY_BREAK
-case 71:
-YY_RULE_SETUP
-#line 260 "program_lexer.l"
-{ return AMBIENT; }
-	YY_BREAK
-case 72:
-YY_RULE_SETUP
-#line 261 "program_lexer.l"
-{ return ATTENUATION; }
-	YY_BREAK
-case 73:
-YY_RULE_SETUP
-#line 262 "program_lexer.l"
-{ return BACK; }
-	YY_BREAK
-case 74:
-YY_RULE_SETUP
-#line 263 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, CLIP); }
-	YY_BREAK
-case 75:
-YY_RULE_SETUP
-#line 264 "program_lexer.l"
-{ return COLOR; }
-	YY_BREAK
-case 76:
-YY_RULE_SETUP
-#line 265 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_fp, DEPTH); }
-	YY_BREAK
-case 77:
-YY_RULE_SETUP
-#line 266 "program_lexer.l"
-{ return DIFFUSE; }
-	YY_BREAK
-case 78:
-YY_RULE_SETUP
-#line 267 "program_lexer.l"
-{ return DIRECTION; }
-	YY_BREAK
-case 79:
-YY_RULE_SETUP
-#line 268 "program_lexer.l"
-{ return EMISSION; }
-	YY_BREAK
-case 80:
-YY_RULE_SETUP
-#line 269 "program_lexer.l"
-{ return ENV; }
-	YY_BREAK
-case 81:
-YY_RULE_SETUP
-#line 270 "program_lexer.l"
-{ return EYE; }
-	YY_BREAK
-case 82:
-YY_RULE_SETUP
-#line 271 "program_lexer.l"
-{ return FOGCOORD; }
-	YY_BREAK
-case 83:
-YY_RULE_SETUP
-#line 272 "program_lexer.l"
-{ return FOG; }
-	YY_BREAK
-case 84:
-YY_RULE_SETUP
-#line 273 "program_lexer.l"
-{ return FRONT; }
-	YY_BREAK
-case 85:
-YY_RULE_SETUP
-#line 274 "program_lexer.l"
-{ return HALF; }
-	YY_BREAK
-case 86:
-YY_RULE_SETUP
-#line 275 "program_lexer.l"
-{ return INVERSE; }
-	YY_BREAK
-case 87:
-YY_RULE_SETUP
-#line 276 "program_lexer.l"
-{ return INVTRANS; }
-	YY_BREAK
-case 88:
-YY_RULE_SETUP
-#line 277 "program_lexer.l"
-{ return LIGHT; }
-	YY_BREAK
-case 89:
-YY_RULE_SETUP
-#line 278 "program_lexer.l"
-{ return LIGHTMODEL; }
-	YY_BREAK
-case 90:
-YY_RULE_SETUP
-#line 279 "program_lexer.l"
-{ return LIGHTPROD; }
-	YY_BREAK
-case 91:
-YY_RULE_SETUP
-#line 280 "program_lexer.l"
-{ return LOCAL; }
-	YY_BREAK
-case 92:
-YY_RULE_SETUP
-#line 281 "program_lexer.l"
-{ return MATERIAL; }
-	YY_BREAK
-case 93:
-YY_RULE_SETUP
-#line 282 "program_lexer.l"
-{ return MAT_PROGRAM; }
-	YY_BREAK
-case 94:
-YY_RULE_SETUP
-#line 283 "program_lexer.l"
-{ return MATRIX; }
-	YY_BREAK
-case 95:
-YY_RULE_SETUP
-#line 284 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, MATRIXINDEX); }
-	YY_BREAK
-case 96:
-YY_RULE_SETUP
-#line 285 "program_lexer.l"
-{ return MODELVIEW; }
-	YY_BREAK
-case 97:
-YY_RULE_SETUP
-#line 286 "program_lexer.l"
-{ return MVP; }
-	YY_BREAK
-case 98:
-YY_RULE_SETUP
-#line 287 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, NORMAL); }
-	YY_BREAK
-case 99:
-YY_RULE_SETUP
-#line 288 "program_lexer.l"
-{ return OBJECT; }
-	YY_BREAK
-case 100:
-YY_RULE_SETUP
-#line 289 "program_lexer.l"
-{ return PALETTE; }
-	YY_BREAK
-case 101:
-YY_RULE_SETUP
-#line 290 "program_lexer.l"
-{ return PARAMS; }
-	YY_BREAK
-case 102:
-YY_RULE_SETUP
-#line 291 "program_lexer.l"
-{ return PLANE; }
-	YY_BREAK
-case 103:
-YY_RULE_SETUP
-#line 292 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, POINT_TOK); }
-	YY_BREAK
-case 104:
-YY_RULE_SETUP
-#line 293 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, POINTSIZE); }
-	YY_BREAK
-case 105:
-YY_RULE_SETUP
-#line 294 "program_lexer.l"
-{ return POSITION; }
-	YY_BREAK
-case 106:
-YY_RULE_SETUP
-#line 295 "program_lexer.l"
-{ return PRIMARY; }
-	YY_BREAK
-case 107:
-YY_RULE_SETUP
-#line 296 "program_lexer.l"
-{ return PROJECTION; }
-	YY_BREAK
-case 108:
-YY_RULE_SETUP
-#line 297 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_fp, RANGE); }
-	YY_BREAK
-case 109:
-YY_RULE_SETUP
-#line 298 "program_lexer.l"
-{ return ROW; }
-	YY_BREAK
-case 110:
-YY_RULE_SETUP
-#line 299 "program_lexer.l"
-{ return SCENECOLOR; }
-	YY_BREAK
-case 111:
-YY_RULE_SETUP
-#line 300 "program_lexer.l"
-{ return SECONDARY; }
-	YY_BREAK
-case 112:
-YY_RULE_SETUP
-#line 301 "program_lexer.l"
-{ return SHININESS; }
-	YY_BREAK
-case 113:
-YY_RULE_SETUP
-#line 302 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, SIZE_TOK); }
-	YY_BREAK
-case 114:
-YY_RULE_SETUP
-#line 303 "program_lexer.l"
-{ return SPECULAR; }
-	YY_BREAK
-case 115:
-YY_RULE_SETUP
-#line 304 "program_lexer.l"
-{ return SPOT; }
-	YY_BREAK
-case 116:
-YY_RULE_SETUP
-#line 305 "program_lexer.l"
-{ return TEXCOORD; }
-	YY_BREAK
-case 117:
-YY_RULE_SETUP
-#line 306 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_fp, TEXENV); }
-	YY_BREAK
-case 118:
-YY_RULE_SETUP
-#line 307 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, TEXGEN); }
-	YY_BREAK
-case 119:
-YY_RULE_SETUP
-#line 308 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, TEXGEN_Q); }
-	YY_BREAK
-case 120:
-YY_RULE_SETUP
-#line 309 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, TEXGEN_S); }
-	YY_BREAK
-case 121:
-YY_RULE_SETUP
-#line 310 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, TEXGEN_T); }
-	YY_BREAK
-case 122:
-YY_RULE_SETUP
-#line 311 "program_lexer.l"
-{ return TEXTURE; }
-	YY_BREAK
-case 123:
-YY_RULE_SETUP
-#line 312 "program_lexer.l"
-{ return TRANSPOSE; }
-	YY_BREAK
-case 124:
-YY_RULE_SETUP
-#line 313 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, VTXATTRIB); }
-	YY_BREAK
-case 125:
-YY_RULE_SETUP
-#line 314 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, WEIGHT); }
-	YY_BREAK
-case 126:
-YY_RULE_SETUP
-#line 316 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp, TEXTURE_UNIT); }
-	YY_BREAK
-case 127:
-YY_RULE_SETUP
-#line 317 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp, TEX_1D); }
-	YY_BREAK
-case 128:
-YY_RULE_SETUP
-#line 318 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp, TEX_2D); }
-	YY_BREAK
-case 129:
-YY_RULE_SETUP
-#line 319 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp, TEX_3D); }
-	YY_BREAK
-case 130:
-YY_RULE_SETUP
-#line 320 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp, TEX_CUBE); }
-	YY_BREAK
-case 131:
-YY_RULE_SETUP
-#line 321 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp && require_rect, TEX_RECT); }
-	YY_BREAK
-case 132:
-YY_RULE_SETUP
-#line 322 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow, TEX_SHADOW1D); }
-	YY_BREAK
-case 133:
-YY_RULE_SETUP
-#line 323 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow, TEX_SHADOW2D); }
-	YY_BREAK
-case 134:
-YY_RULE_SETUP
-#line 324 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow && require_rect, TEX_SHADOWRECT); }
-	YY_BREAK
-case 135:
-YY_RULE_SETUP
-#line 325 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp && require_texarray, TEX_ARRAY1D); }
-	YY_BREAK
-case 136:
-YY_RULE_SETUP
-#line 326 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp && require_texarray, TEX_ARRAY2D); }
-	YY_BREAK
-case 137:
-YY_RULE_SETUP
-#line 327 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow && require_texarray, TEX_ARRAYSHADOW1D); }
-	YY_BREAK
-case 138:
-YY_RULE_SETUP
-#line 328 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow && require_texarray, TEX_ARRAYSHADOW2D); }
-	YY_BREAK
-case 139:
-YY_RULE_SETUP
-#line 330 "program_lexer.l"
-{ return handle_ident(yyextra, yytext, yylval); }
-	YY_BREAK
-case 140:
-YY_RULE_SETUP
-#line 332 "program_lexer.l"
-{ return DOT_DOT; }
-	YY_BREAK
-case 141:
-YY_RULE_SETUP
-#line 334 "program_lexer.l"
-{
-   yylval->integer = strtol(yytext, NULL, 10);
-   return INTEGER;
-}
-	YY_BREAK
-case 142:
-YY_RULE_SETUP
-#line 338 "program_lexer.l"
-{
-   yylval->real = _mesa_strtof(yytext, NULL);
-   return REAL;
-}
-	YY_BREAK
-case 143:
-/* rule 143 can match eol */
-*yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */
-yyg->yy_c_buf_p = yy_cp -= 1;
-YY_DO_BEFORE_ACTION; /* set up yytext again */
-YY_RULE_SETUP
-#line 342 "program_lexer.l"
-{
-   yylval->real = _mesa_strtof(yytext, NULL);
-   return REAL;
-}
-	YY_BREAK
-case 144:
-YY_RULE_SETUP
-#line 346 "program_lexer.l"
-{
-   yylval->real = _mesa_strtof(yytext, NULL);
-   return REAL;
-}
-	YY_BREAK
-case 145:
-YY_RULE_SETUP
-#line 350 "program_lexer.l"
-{
-   yylval->real = _mesa_strtof(yytext, NULL);
-   return REAL;
-}
-	YY_BREAK
-case 146:
-YY_RULE_SETUP
-#line 355 "program_lexer.l"
-{
-   yylval->swiz_mask.swizzle = SWIZZLE_NOOP;
-   yylval->swiz_mask.mask = WRITEMASK_XYZW;
-   return MASK4;
-}
-	YY_BREAK
-case 147:
-YY_RULE_SETUP
-#line 361 "program_lexer.l"
-{
-   yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
-   yylval->swiz_mask.mask = WRITEMASK_XY
-      | mask_from_char(yytext[3]);
-   return MASK3;
-}
-	YY_BREAK
-case 148:
-YY_RULE_SETUP
-#line 367 "program_lexer.l"
-{
-   yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
-   yylval->swiz_mask.mask = WRITEMASK_XZW;
-   return MASK3;
-}
-	YY_BREAK
-case 149:
-YY_RULE_SETUP
-#line 372 "program_lexer.l"
-{
-   yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
-   yylval->swiz_mask.mask = WRITEMASK_YZW;
-   return MASK3;
-}
-	YY_BREAK
-case 150:
-YY_RULE_SETUP
-#line 378 "program_lexer.l"
-{
-   yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
-   yylval->swiz_mask.mask = WRITEMASK_X
-      | mask_from_char(yytext[2]);
-   return MASK2;
-}
-	YY_BREAK
-case 151:
-YY_RULE_SETUP
-#line 384 "program_lexer.l"
-{
-   yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
-   yylval->swiz_mask.mask = WRITEMASK_Y
-      | mask_from_char(yytext[2]);
-   return MASK2;
-}
-	YY_BREAK
-case 152:
-YY_RULE_SETUP
-#line 390 "program_lexer.l"
-{
-   yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
-   yylval->swiz_mask.mask = WRITEMASK_ZW;
-   return MASK2;
-}
-	YY_BREAK
-case 153:
-YY_RULE_SETUP
-#line 396 "program_lexer.l"
-{
-   const unsigned s = swiz_from_char(yytext[1]);
-   yylval->swiz_mask.swizzle = MAKE_SWIZZLE4(s, s, s, s);
-   yylval->swiz_mask.mask = mask_from_char(yytext[1]);
-   return MASK1; 
-}
-	YY_BREAK
-case 154:
-YY_RULE_SETUP
-#line 403 "program_lexer.l"
-{
-   yylval->swiz_mask.swizzle = MAKE_SWIZZLE4(swiz_from_char(yytext[1]),
-					    swiz_from_char(yytext[2]),
-					    swiz_from_char(yytext[3]),
-					    swiz_from_char(yytext[4]));
-   yylval->swiz_mask.mask = 0;
-   return SWIZZLE;
-}
-	YY_BREAK
-case 155:
-YY_RULE_SETUP
-#line 412 "program_lexer.l"
-{
-   yylval->swiz_mask.swizzle = SWIZZLE_NOOP;
-   yylval->swiz_mask.mask = WRITEMASK_XYZW;
-   return_token_or_DOT(require_ARB_fp, MASK4);
-}
-	YY_BREAK
-case 156:
-YY_RULE_SETUP
-#line 418 "program_lexer.l"
-{
-   yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
-   yylval->swiz_mask.mask = WRITEMASK_XY
-      | mask_from_char(yytext[3]);
-   return_token_or_DOT(require_ARB_fp, MASK3);
-}
-	YY_BREAK
-case 157:
-YY_RULE_SETUP
-#line 424 "program_lexer.l"
-{
-   yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
-   yylval->swiz_mask.mask = WRITEMASK_XZW;
-   return_token_or_DOT(require_ARB_fp, MASK3);
-}
-	YY_BREAK
-case 158:
-YY_RULE_SETUP
-#line 429 "program_lexer.l"
-{
-   yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
-   yylval->swiz_mask.mask = WRITEMASK_YZW;
-   return_token_or_DOT(require_ARB_fp, MASK3);
-}
-	YY_BREAK
-case 159:
-YY_RULE_SETUP
-#line 435 "program_lexer.l"
-{
-   yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
-   yylval->swiz_mask.mask = WRITEMASK_X
-      | mask_from_char(yytext[2]);
-   return_token_or_DOT(require_ARB_fp, MASK2);
-}
-	YY_BREAK
-case 160:
-YY_RULE_SETUP
-#line 441 "program_lexer.l"
-{
-   yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
-   yylval->swiz_mask.mask = WRITEMASK_Y
-      | mask_from_char(yytext[2]);
-   return_token_or_DOT(require_ARB_fp, MASK2);
-}
-	YY_BREAK
-case 161:
-YY_RULE_SETUP
-#line 447 "program_lexer.l"
-{
-   yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
-   yylval->swiz_mask.mask = WRITEMASK_ZW;
-   return_token_or_DOT(require_ARB_fp, MASK2);
-}
-	YY_BREAK
-case 162:
-YY_RULE_SETUP
-#line 453 "program_lexer.l"
-{
-   const unsigned s = swiz_from_char(yytext[1]);
-   yylval->swiz_mask.swizzle = MAKE_SWIZZLE4(s, s, s, s);
-   yylval->swiz_mask.mask = mask_from_char(yytext[1]);
-   return_token_or_DOT(require_ARB_fp, MASK1);
-}
-	YY_BREAK
-case 163:
-YY_RULE_SETUP
-#line 461 "program_lexer.l"
-{
-   if (require_ARB_vp) {
-      return TEXGEN_R;
-   } else {
-      yylval->swiz_mask.swizzle = MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_X,
-						SWIZZLE_X, SWIZZLE_X);
-      yylval->swiz_mask.mask = WRITEMASK_X;
-      return MASK1;
-   }
-}
-	YY_BREAK
-case 164:
-YY_RULE_SETUP
-#line 472 "program_lexer.l"
-{
-   yylval->swiz_mask.swizzle = MAKE_SWIZZLE4(swiz_from_char(yytext[1]),
-					    swiz_from_char(yytext[2]),
-					    swiz_from_char(yytext[3]),
-					    swiz_from_char(yytext[4]));
-   yylval->swiz_mask.mask = 0;
-   return_token_or_DOT(require_ARB_fp, SWIZZLE);
-}
-	YY_BREAK
-case 165:
-YY_RULE_SETUP
-#line 481 "program_lexer.l"
-{ return DOT; }
-	YY_BREAK
-case 166:
-/* rule 166 can match eol */
-YY_RULE_SETUP
-#line 483 "program_lexer.l"
-{
-   yylloc->first_line++;
-   yylloc->first_column = 1;
-   yylloc->last_line++;
-   yylloc->last_column = 1;
-   yylloc->position++;
-}
-	YY_BREAK
-case 167:
-YY_RULE_SETUP
-#line 490 "program_lexer.l"
-/* eat whitespace */ ;
-	YY_BREAK
-case 168:
-*yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */
-yyg->yy_c_buf_p = yy_cp -= 1;
-YY_DO_BEFORE_ACTION; /* set up yytext again */
-YY_RULE_SETUP
-#line 491 "program_lexer.l"
-/* eat comments */ ;
-	YY_BREAK
-case 169:
-YY_RULE_SETUP
-#line 492 "program_lexer.l"
-{ return yytext[0]; }
-	YY_BREAK
-case 170:
-YY_RULE_SETUP
-#line 493 "program_lexer.l"
-ECHO;
-	YY_BREAK
-#line 2490 "lex.yy.c"
-case YY_STATE_EOF(INITIAL):
-	yyterminate();
-
-	case YY_END_OF_BUFFER:
-		{
-		/* Amount of text matched not including the EOB char. */
-		int yy_amount_of_matched_text = (int) (yy_cp - yyg->yytext_ptr) - 1;
-
-		/* Undo the effects of YY_DO_BEFORE_ACTION. */
-		*yy_cp = yyg->yy_hold_char;
-		YY_RESTORE_YY_MORE_OFFSET
-
-		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
-			{
-			/* We're scanning a new file or input source.  It's
-			 * possible that this happened because the user
-			 * just pointed yyin at a new source and called
-			 * yylex().  If so, then we have to assure
-			 * consistency between YY_CURRENT_BUFFER and our
-			 * globals.  Here is the right place to do so, because
-			 * this is the first action (other than possibly a
-			 * back-up) that will match for the new input source.
-			 */
-			yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
-			}
-
-		/* Note that here we test for yy_c_buf_p "<=" to the position
-		 * of the first EOB in the buffer, since yy_c_buf_p will
-		 * already have been incremented past the NUL character
-		 * (since all states make transitions on EOB to the
-		 * end-of-buffer state).  Contrast this with the test
-		 * in input().
-		 */
-		if ( yyg->yy_c_buf_p <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] )
-			{ /* This was really a NUL. */
-			yy_state_type yy_next_state;
-
-			yyg->yy_c_buf_p = yyg->yytext_ptr + yy_amount_of_matched_text;
-
-			yy_current_state = yy_get_previous_state( yyscanner );
-
-			/* Okay, we're now positioned to make the NUL
-			 * transition.  We couldn't have
-			 * yy_get_previous_state() go ahead and do it
-			 * for us because it doesn't know how to deal
-			 * with the possibility of jamming (and we don't
-			 * want to build jamming into it because then it
-			 * will run more slowly).
-			 */
-
-			yy_next_state = yy_try_NUL_trans( yy_current_state , yyscanner);
-
-			yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
-
-			if ( yy_next_state )
-				{
-				/* Consume the NUL. */
-				yy_cp = ++yyg->yy_c_buf_p;
-				yy_current_state = yy_next_state;
-				goto yy_match;
-				}
-
-			else
-				{
-				yy_cp = yyg->yy_c_buf_p;
-				goto yy_find_action;
-				}
-			}
-
-		else switch ( yy_get_next_buffer( yyscanner ) )
-			{
-			case EOB_ACT_END_OF_FILE:
-				{
-				yyg->yy_did_buffer_switch_on_eof = 0;
-
-				if ( yywrap(yyscanner ) )
-					{
-					/* Note: because we've taken care in
-					 * yy_get_next_buffer() to have set up
-					 * yytext, we can now set up
-					 * yy_c_buf_p so that if some total
-					 * hoser (like flex itself) wants to
-					 * call the scanner after we return the
-					 * YY_NULL, it'll still work - another
-					 * YY_NULL will get returned.
-					 */
-					yyg->yy_c_buf_p = yyg->yytext_ptr + YY_MORE_ADJ;
-
-					yy_act = YY_STATE_EOF(YY_START);
-					goto do_action;
-					}
-
-				else
-					{
-					if ( ! yyg->yy_did_buffer_switch_on_eof )
-						YY_NEW_FILE;
-					}
-				break;
-				}
-
-			case EOB_ACT_CONTINUE_SCAN:
-				yyg->yy_c_buf_p =
-					yyg->yytext_ptr + yy_amount_of_matched_text;
-
-				yy_current_state = yy_get_previous_state( yyscanner );
-
-				yy_cp = yyg->yy_c_buf_p;
-				yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
-				goto yy_match;
-
-			case EOB_ACT_LAST_MATCH:
-				yyg->yy_c_buf_p =
-				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars];
-
-				yy_current_state = yy_get_previous_state( yyscanner );
-
-				yy_cp = yyg->yy_c_buf_p;
-				yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
-				goto yy_find_action;
-			}
-		break;
-		}
-
-	default:
-		YY_FATAL_ERROR(
-			"fatal flex scanner internal error--no action found" );
-	} /* end of action switch */
-		} /* end of scanning one token */
-} /* end of yylex */
-
-/* yy_get_next_buffer - try to read in a new buffer
- *
- * Returns a code representing an action:
- *	EOB_ACT_LAST_MATCH -
- *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- *	EOB_ACT_END_OF_FILE - end of file
- */
-static int yy_get_next_buffer (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-	register char *source = yyg->yytext_ptr;
-	register int number_to_move, i;
-	int ret_val;
-
-	if ( yyg->yy_c_buf_p > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] )
-		YY_FATAL_ERROR(
-		"fatal flex scanner internal error--end of buffer missed" );
-
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
-		{ /* Don't try to fill the buffer, so this is an EOF. */
-		if ( yyg->yy_c_buf_p - yyg->yytext_ptr - YY_MORE_ADJ == 1 )
-			{
-			/* We matched a single character, the EOB, so
-			 * treat this as a final EOF.
-			 */
-			return EOB_ACT_END_OF_FILE;
-			}
-
-		else
-			{
-			/* We matched some text prior to the EOB, first
-			 * process it.
-			 */
-			return EOB_ACT_LAST_MATCH;
-			}
-		}
-
-	/* Try to read more data. */
-
-	/* First move last chars to start of buffer. */
-	number_to_move = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr) - 1;
-
-	for ( i = 0; i < number_to_move; ++i )
-		*(dest++) = *(source++);
-
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
-		/* don't do the read, it's not guaranteed to return an EOF,
-		 * just force an EOF
-		 */
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars = 0;
-
-	else
-		{
-			int num_to_read =
-			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
-
-		while ( num_to_read <= 0 )
-			{ /* Not enough room in the buffer - grow it. */
-
-			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
-
-			int yy_c_buf_p_offset =
-				(int) (yyg->yy_c_buf_p - b->yy_ch_buf);
-
-			if ( b->yy_is_our_buffer )
-				{
-				int new_size = b->yy_buf_size * 2;
-
-				if ( new_size <= 0 )
-					b->yy_buf_size += b->yy_buf_size / 8;
-				else
-					b->yy_buf_size *= 2;
-
-				b->yy_ch_buf = (char *)
-					/* Include room in for 2 EOB chars. */
-					yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ,yyscanner );
-				}
-			else
-				/* Can't grow it, we don't own it. */
-				b->yy_ch_buf = 0;
-
-			if ( ! b->yy_ch_buf )
-				YY_FATAL_ERROR(
-				"fatal error - scanner input buffer overflow" );
-
-			yyg->yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
-
-			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
-						number_to_move - 1;
-
-			}
-
-		if ( num_to_read > YY_READ_BUF_SIZE )
-			num_to_read = YY_READ_BUF_SIZE;
-
-		/* Read in more data. */
-		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-			yyg->yy_n_chars, (size_t) num_to_read );
-
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
-		}
-
-	if ( yyg->yy_n_chars == 0 )
-		{
-		if ( number_to_move == YY_MORE_ADJ )
-			{
-			ret_val = EOB_ACT_END_OF_FILE;
-			yyrestart(yyin  ,yyscanner);
-			}
-
-		else
-			{
-			ret_val = EOB_ACT_LAST_MATCH;
-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
-				YY_BUFFER_EOF_PENDING;
-			}
-		}
-
-	else
-		ret_val = EOB_ACT_CONTINUE_SCAN;
-
-	if ((yy_size_t) (yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
-		/* Extend the array by 50%, plus the number we really need. */
-		yy_size_t new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1);
-		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ,yyscanner );
-		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
-			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
-	}
-
-	yyg->yy_n_chars += number_to_move;
-	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] = YY_END_OF_BUFFER_CHAR;
-	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
-
-	yyg->yytext_ptr = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
-
-	return ret_val;
-}
-
-/* yy_get_previous_state - get the state just before the EOB char was reached */
-
-    static yy_state_type yy_get_previous_state (yyscan_t yyscanner)
-{
-	register yy_state_type yy_current_state;
-	register char *yy_cp;
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-	yy_current_state = yyg->yy_start;
-
-	for ( yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p; ++yy_cp )
-		{
-		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
-		if ( yy_accept[yy_current_state] )
-			{
-			yyg->yy_last_accepting_state = yy_current_state;
-			yyg->yy_last_accepting_cpos = yy_cp;
-			}
-		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-			{
-			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 850 )
-				yy_c = yy_meta[(unsigned int) yy_c];
-			}
-		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-		}
-
-	return yy_current_state;
-}
-
-/* yy_try_NUL_trans - try to make a transition on the NUL character
- *
- * synopsis
- *	next_state = yy_try_NUL_trans( current_state );
- */
-    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state , yyscan_t yyscanner)
-{
-	register int yy_is_jam;
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* This var may be unused depending upon options. */
-	register char *yy_cp = yyg->yy_c_buf_p;
-
-	register YY_CHAR yy_c = 1;
-	if ( yy_accept[yy_current_state] )
-		{
-		yyg->yy_last_accepting_state = yy_current_state;
-		yyg->yy_last_accepting_cpos = yy_cp;
-		}
-	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-		{
-		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 850 )
-			yy_c = yy_meta[(unsigned int) yy_c];
-		}
-	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 849);
-
-	return yy_is_jam ? 0 : yy_current_state;
-}
-
-    static void yyunput (int c, register char * yy_bp , yyscan_t yyscanner)
-{
-	register char *yy_cp;
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-    yy_cp = yyg->yy_c_buf_p;
-
-	/* undo effects of setting up yytext */
-	*yy_cp = yyg->yy_hold_char;
-
-	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
-		{ /* need to shift things up to make room */
-		/* +2 for EOB chars. */
-		register int number_to_move = yyg->yy_n_chars + 2;
-		register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
-					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
-		register char *source =
-				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
-
-		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
-			*--dest = *--source;
-
-		yy_cp += (int) (dest - source);
-		yy_bp += (int) (dest - source);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
-			yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
-
-		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
-			YY_FATAL_ERROR( "flex scanner push-back overflow" );
-		}
-
-	*--yy_cp = (char) c;
-
-	yyg->yytext_ptr = yy_bp;
-	yyg->yy_hold_char = *yy_cp;
-	yyg->yy_c_buf_p = yy_cp;
-}
-
-#ifndef YY_NO_INPUT
-#ifdef __cplusplus
-    static int yyinput (yyscan_t yyscanner)
-#else
-    static int input  (yyscan_t yyscanner)
-#endif
-
-{
-	int c;
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-	*yyg->yy_c_buf_p = yyg->yy_hold_char;
-
-	if ( *yyg->yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
-		{
-		/* yy_c_buf_p now points to the character we want to return.
-		 * If this occurs *before* the EOB characters, then it's a
-		 * valid NUL; if not, then we've hit the end of the buffer.
-		 */
-		if ( yyg->yy_c_buf_p < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] )
-			/* This was really a NUL. */
-			*yyg->yy_c_buf_p = '\0';
-
-		else
-			{ /* need more input */
-			int offset = yyg->yy_c_buf_p - yyg->yytext_ptr;
-			++yyg->yy_c_buf_p;
-
-			switch ( yy_get_next_buffer( yyscanner ) )
-				{
-				case EOB_ACT_LAST_MATCH:
-					/* This happens because yy_g_n_b()
-					 * sees that we've accumulated a
-					 * token and flags that we need to
-					 * try matching the token before
-					 * proceeding.  But for input(),
-					 * there's no matching to consider.
-					 * So convert the EOB_ACT_LAST_MATCH
-					 * to EOB_ACT_END_OF_FILE.
-					 */
-
-					/* Reset buffer status. */
-					yyrestart(yyin ,yyscanner);
-
-					/*FALLTHROUGH*/
-
-				case EOB_ACT_END_OF_FILE:
-					{
-					if ( yywrap(yyscanner ) )
-						return EOF;
-
-					if ( ! yyg->yy_did_buffer_switch_on_eof )
-						YY_NEW_FILE;
-#ifdef __cplusplus
-					return yyinput(yyscanner);
-#else
-					return input(yyscanner);
-#endif
-					}
-
-				case EOB_ACT_CONTINUE_SCAN:
-					yyg->yy_c_buf_p = yyg->yytext_ptr + offset;
-					break;
-				}
-			}
-		}
-
-	c = *(unsigned char *) yyg->yy_c_buf_p;	/* cast for 8-bit char's */
-	*yyg->yy_c_buf_p = '\0';	/* preserve yytext */
-	yyg->yy_hold_char = *++yyg->yy_c_buf_p;
-
-	return c;
-}
-#endif	/* ifndef YY_NO_INPUT */
-
-/** Immediately switch to a different input stream.
- * @param input_file A readable stream.
- * @param yyscanner The scanner object.
- * @note This function does not reset the start condition to @c INITIAL .
- */
-    void yyrestart  (FILE * input_file , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-	if ( ! YY_CURRENT_BUFFER ){
-        yyensure_buffer_stack (yyscanner);
-		YY_CURRENT_BUFFER_LVALUE =
-            yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner);
-	}
-
-	yy_init_buffer(YY_CURRENT_BUFFER,input_file ,yyscanner);
-	yy_load_buffer_state(yyscanner );
-}
-
-/** Switch to a different input buffer.
- * @param new_buffer The new input buffer.
- * @param yyscanner The scanner object.
- */
-    void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-	/* TODO. We should be able to replace this entire function body
-	 * with
-	 *		yypop_buffer_state();
-	 *		yypush_buffer_state(new_buffer);
-     */
-	yyensure_buffer_stack (yyscanner);
-	if ( YY_CURRENT_BUFFER == new_buffer )
-		return;
-
-	if ( YY_CURRENT_BUFFER )
-		{
-		/* Flush out information for old buffer. */
-		*yyg->yy_c_buf_p = yyg->yy_hold_char;
-		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p;
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
-		}
-
-	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-	yy_load_buffer_state(yyscanner );
-
-	/* We don't actually know whether we did this switch during
-	 * EOF (yywrap()) processing, but the only time this flag
-	 * is looked at is after yywrap() is called, so it's safe
-	 * to go ahead and always set it.
-	 */
-	yyg->yy_did_buffer_switch_on_eof = 1;
-}
-
-static void yy_load_buffer_state  (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-	yyg->yytext_ptr = yyg->yy_c_buf_p = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
-	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
-	yyg->yy_hold_char = *yyg->yy_c_buf_p;
-}
-
-/** Allocate and initialize an input buffer state.
- * @param file A readable stream.
- * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
- * @param yyscanner The scanner object.
- * @return the allocated buffer state.
- */
-    YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size , yyscan_t yyscanner)
-{
-	YY_BUFFER_STATE b;
-    
-	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ,yyscanner );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-	b->yy_buf_size = size;
-
-	/* yy_ch_buf has to be 2 characters longer than the size given because
-	 * we need to put in 2 end-of-buffer characters.
-	 */
-	b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 ,yyscanner );
-	if ( ! b->yy_ch_buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-	b->yy_is_our_buffer = 1;
-
-	yy_init_buffer(b,file ,yyscanner);
-
-	return b;
-}
-
-/** Destroy the buffer.
- * @param b a buffer created with yy_create_buffer()
- * @param yyscanner The scanner object.
- */
-    void yy_delete_buffer (YY_BUFFER_STATE  b , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-	if ( ! b )
-		return;
-
-	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
-		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
-
-	if ( b->yy_is_our_buffer )
-		yyfree((void *) b->yy_ch_buf ,yyscanner );
-
-	yyfree((void *) b ,yyscanner );
-}
-
-/* Initializes or reinitializes a buffer.
- * This function is sometimes called more than once on the same buffer,
- * such as during a yyrestart() or at EOF.
- */
-    static void yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file , yyscan_t yyscanner)
-
-{
-	int oerrno = errno;
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-	yy_flush_buffer(b ,yyscanner);
-
-	b->yy_input_file = file;
-	b->yy_fill_buffer = 1;
-
-    /* If b is the current buffer, then yy_init_buffer was _probably_
-     * called from yyrestart() or through yy_get_next_buffer.
-     * In that case, we don't want to reset the lineno or column.
-     */
-    if (b != YY_CURRENT_BUFFER){
-        b->yy_bs_lineno = 1;
-        b->yy_bs_column = 0;
-    }
-
-        b->yy_is_interactive = 0;
-    
-	errno = oerrno;
-}
-
-/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
- * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
- * @param yyscanner The scanner object.
- */
-    void yy_flush_buffer (YY_BUFFER_STATE  b , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	if ( ! b )
-		return;
-
-	b->yy_n_chars = 0;
-
-	/* We always need two end-of-buffer characters.  The first causes
-	 * a transition to the end-of-buffer state.  The second causes
-	 * a jam in that state.
-	 */
-	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
-	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
-
-	b->yy_buf_pos = &b->yy_ch_buf[0];
-
-	b->yy_at_bol = 1;
-	b->yy_buffer_status = YY_BUFFER_NEW;
-
-	if ( b == YY_CURRENT_BUFFER )
-		yy_load_buffer_state(yyscanner );
-}
-
-/** Pushes the new state onto the stack. The new state becomes
- *  the current state. This function will allocate the stack
- *  if necessary.
- *  @param new_buffer The new state.
- *  @param yyscanner The scanner object.
- */
-void yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	if (new_buffer == NULL)
-		return;
-
-	yyensure_buffer_stack(yyscanner);
-
-	/* This block is copied from yy_switch_to_buffer. */
-	if ( YY_CURRENT_BUFFER )
-		{
-		/* Flush out information for old buffer. */
-		*yyg->yy_c_buf_p = yyg->yy_hold_char;
-		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p;
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
-		}
-
-	/* Only push if top exists. Otherwise, replace top. */
-	if (YY_CURRENT_BUFFER)
-		yyg->yy_buffer_stack_top++;
-	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-
-	/* copied from yy_switch_to_buffer. */
-	yy_load_buffer_state(yyscanner );
-	yyg->yy_did_buffer_switch_on_eof = 1;
-}
-
-/** Removes and deletes the top of the stack, if present.
- *  The next element becomes the new top.
- *  @param yyscanner The scanner object.
- */
-void yypop_buffer_state (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	if (!YY_CURRENT_BUFFER)
-		return;
-
-	yy_delete_buffer(YY_CURRENT_BUFFER ,yyscanner);
-	YY_CURRENT_BUFFER_LVALUE = NULL;
-	if (yyg->yy_buffer_stack_top > 0)
-		--yyg->yy_buffer_stack_top;
-
-	if (YY_CURRENT_BUFFER) {
-		yy_load_buffer_state(yyscanner );
-		yyg->yy_did_buffer_switch_on_eof = 1;
-	}
-}
-
-/* Allocates the stack if it does not exist.
- *  Guarantees space for at least one push.
- */
-static void yyensure_buffer_stack (yyscan_t yyscanner)
-{
-	int num_to_alloc;
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-	if (!yyg->yy_buffer_stack) {
-
-		/* First allocation is just for 2 elements, since we don't know if this
-		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
-		 * immediate realloc on the next call.
-         */
-		num_to_alloc = 1;
-		yyg->yy_buffer_stack = (struct yy_buffer_state**)yyalloc
-								(num_to_alloc * sizeof(struct yy_buffer_state*)
-								, yyscanner);
-		if ( ! yyg->yy_buffer_stack )
-			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
-								  
-		memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-				
-		yyg->yy_buffer_stack_max = num_to_alloc;
-		yyg->yy_buffer_stack_top = 0;
-		return;
-	}
-
-	if (yyg->yy_buffer_stack_top >= (yyg->yy_buffer_stack_max) - 1){
-
-		/* Increase the buffer to prepare for a possible push. */
-		int grow_size = 8 /* arbitrary grow size */;
-
-		num_to_alloc = yyg->yy_buffer_stack_max + grow_size;
-		yyg->yy_buffer_stack = (struct yy_buffer_state**)yyrealloc
-								(yyg->yy_buffer_stack,
-								num_to_alloc * sizeof(struct yy_buffer_state*)
-								, yyscanner);
-		if ( ! yyg->yy_buffer_stack )
-			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
-
-		/* zero only the new slots.*/
-		memset(yyg->yy_buffer_stack + yyg->yy_buffer_stack_max, 0, grow_size * sizeof(struct yy_buffer_state*));
-		yyg->yy_buffer_stack_max = num_to_alloc;
-	}
-}
-
-/** Setup the input buffer state to scan directly from a user-specified character buffer.
- * @param base the character buffer
- * @param size the size in bytes of the character buffer
- * @param yyscanner The scanner object.
- * @return the newly allocated buffer state object. 
- */
-YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size , yyscan_t yyscanner)
-{
-	YY_BUFFER_STATE b;
-    
-	if ( size < 2 ||
-	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
-	     base[size-1] != YY_END_OF_BUFFER_CHAR )
-		/* They forgot to leave room for the EOB's. */
-		return 0;
-
-	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ,yyscanner );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
-
-	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
-	b->yy_buf_pos = b->yy_ch_buf = base;
-	b->yy_is_our_buffer = 0;
-	b->yy_input_file = 0;
-	b->yy_n_chars = b->yy_buf_size;
-	b->yy_is_interactive = 0;
-	b->yy_at_bol = 1;
-	b->yy_fill_buffer = 0;
-	b->yy_buffer_status = YY_BUFFER_NEW;
-
-	yy_switch_to_buffer(b ,yyscanner );
-
-	return b;
-}
-
-/** Setup the input buffer state to scan a string. The next call to yylex() will
- * scan from a @e copy of @a str.
- * @param yystr a NUL-terminated string to scan
- * @param yyscanner The scanner object.
- * @return the newly allocated buffer state object.
- * @note If you want to scan bytes that may contain NUL values, then use
- *       yy_scan_bytes() instead.
- */
-YY_BUFFER_STATE yy_scan_string (yyconst char * yystr , yyscan_t yyscanner)
-{
-    
-	return yy_scan_bytes(yystr,strlen(yystr) ,yyscanner);
-}
-
-/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
- * scan from a @e copy of @a bytes.
- * @param yybytes the byte buffer to scan
- * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
- * @param yyscanner The scanner object.
- * @return the newly allocated buffer state object.
- */
-YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, int  _yybytes_len , yyscan_t yyscanner)
-{
-	YY_BUFFER_STATE b;
-	char *buf;
-	yy_size_t n;
-	int i;
-    
-	/* Get memory for full buffer, including space for trailing EOB's. */
-	n = _yybytes_len + 2;
-	buf = (char *) yyalloc(n ,yyscanner );
-	if ( ! buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
-
-	for ( i = 0; i < _yybytes_len; ++i )
-		buf[i] = yybytes[i];
-
-	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
-
-	b = yy_scan_buffer(buf,n ,yyscanner);
-	if ( ! b )
-		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
-
-	/* It's okay to grow etc. this buffer, and we should throw it
-	 * away when we're done.
-	 */
-	b->yy_is_our_buffer = 1;
-
-	return b;
-}
-
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
-#endif
-
-static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner)
-{
-    	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
-}
-
-/* Redefine yyless() so it works in section 3 code. */
-
-#undef yyless
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-        int yyless_macro_arg = (n); \
-        YY_LESS_LINENO(yyless_macro_arg);\
-		yytext[yyleng] = yyg->yy_hold_char; \
-		yyg->yy_c_buf_p = yytext + yyless_macro_arg; \
-		yyg->yy_hold_char = *yyg->yy_c_buf_p; \
-		*yyg->yy_c_buf_p = '\0'; \
-		yyleng = yyless_macro_arg; \
-		} \
-	while ( 0 )
-
-/* Accessor  methods (get/set functions) to struct members. */
-
-/** Get the user-defined data for this scanner.
- * @param yyscanner The scanner object.
- */
-YY_EXTRA_TYPE yyget_extra  (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    return yyextra;
-}
-
-/** Get the current line number.
- * @param yyscanner The scanner object.
- */
-int yyget_lineno  (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    
-        if (! YY_CURRENT_BUFFER)
-            return 0;
-    
-    return yylineno;
-}
-
-/** Get the current column number.
- * @param yyscanner The scanner object.
- */
-int yyget_column  (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    
-        if (! YY_CURRENT_BUFFER)
-            return 0;
-    
-    return yycolumn;
-}
-
-/** Get the input stream.
- * @param yyscanner The scanner object.
- */
-FILE *yyget_in  (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    return yyin;
-}
-
-/** Get the output stream.
- * @param yyscanner The scanner object.
- */
-FILE *yyget_out  (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    return yyout;
-}
-
-/** Get the length of the current token.
- * @param yyscanner The scanner object.
- */
-int yyget_leng  (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    return yyleng;
-}
-
-/** Get the current token.
- * @param yyscanner The scanner object.
- */
-
-char *yyget_text  (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    return yytext;
-}
-
-/** Set the user-defined data. This data is never touched by the scanner.
- * @param user_defined The data to be associated with this scanner.
- * @param yyscanner The scanner object.
- */
-void yyset_extra (YY_EXTRA_TYPE  user_defined , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    yyextra = user_defined ;
-}
-
-/** Set the current line number.
- * @param line_number
- * @param yyscanner The scanner object.
- */
-void yyset_lineno (int  line_number , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-        /* lineno is only valid if an input buffer exists. */
-        if (! YY_CURRENT_BUFFER )
-           yy_fatal_error( "yyset_lineno called with no buffer" , yyscanner); 
-    
-    yylineno = line_number;
-}
-
-/** Set the current column.
- * @param line_number
- * @param yyscanner The scanner object.
- */
-void yyset_column (int  column_no , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-        /* column is only valid if an input buffer exists. */
-        if (! YY_CURRENT_BUFFER )
-           yy_fatal_error( "yyset_column called with no buffer" , yyscanner); 
-    
-    yycolumn = column_no;
-}
-
-/** Set the input stream. This does not discard the current
- * input buffer.
- * @param in_str A readable stream.
- * @param yyscanner The scanner object.
- * @see yy_switch_to_buffer
- */
-void yyset_in (FILE *  in_str , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    yyin = in_str ;
-}
-
-void yyset_out (FILE *  out_str , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    yyout = out_str ;
-}
-
-int yyget_debug  (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    return yy_flex_debug;
-}
-
-void yyset_debug (int  bdebug , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    yy_flex_debug = bdebug ;
-}
-
-/* Accessor methods for yylval and yylloc */
-
-YYSTYPE * yyget_lval  (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    return yylval;
-}
-
-void yyset_lval (YYSTYPE *  yylval_param , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    yylval = yylval_param;
-}
-
-YYLTYPE *yyget_lloc  (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    return yylloc;
-}
-    
-void yyset_lloc (YYLTYPE *  yylloc_param , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    yylloc = yylloc_param;
-}
-    
-/* User-visible API */
-
-/* yylex_init is special because it creates the scanner itself, so it is
- * the ONLY reentrant function that doesn't take the scanner as the last argument.
- * That's why we explicitly handle the declaration, instead of using our macros.
- */
-
-int yylex_init(yyscan_t* ptr_yy_globals)
-
-{
-    if (ptr_yy_globals == NULL){
-        errno = EINVAL;
-        return 1;
-    }
-
-    *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), NULL );
-
-    if (*ptr_yy_globals == NULL){
-        errno = ENOMEM;
-        return 1;
-    }
-
-    /* By setting to 0xAA, we expose bugs in yy_init_globals. Leave at 0x00 for releases. */
-    memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t));
-
-    return yy_init_globals ( *ptr_yy_globals );
-}
-
-/* yylex_init_extra has the same functionality as yylex_init, but follows the
- * convention of taking the scanner as the last argument. Note however, that
- * this is a *pointer* to a scanner, as it will be allocated by this call (and
- * is the reason, too, why this function also must handle its own declaration).
- * The user defined value in the first argument will be available to yyalloc in
- * the yyextra field.
- */
-
-int yylex_init_extra(YY_EXTRA_TYPE yy_user_defined,yyscan_t* ptr_yy_globals )
-
-{
-    struct yyguts_t dummy_yyguts;
-
-    yyset_extra (yy_user_defined, &dummy_yyguts);
-
-    if (ptr_yy_globals == NULL){
-        errno = EINVAL;
-        return 1;
-    }
-	
-    *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), &dummy_yyguts );
-	
-    if (*ptr_yy_globals == NULL){
-        errno = ENOMEM;
-        return 1;
-    }
-    
-    /* By setting to 0xAA, we expose bugs in
-    yy_init_globals. Leave at 0x00 for releases. */
-    memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t));
-    
-    yyset_extra (yy_user_defined, *ptr_yy_globals);
-    
-    return yy_init_globals ( *ptr_yy_globals );
-}
-
-static int yy_init_globals (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    /* Initialization is the same as for the non-reentrant scanner.
-     * This function is called from yylex_destroy(), so don't allocate here.
-     */
-
-    yyg->yy_buffer_stack = 0;
-    yyg->yy_buffer_stack_top = 0;
-    yyg->yy_buffer_stack_max = 0;
-    yyg->yy_c_buf_p = (char *) 0;
-    yyg->yy_init = 0;
-    yyg->yy_start = 0;
-
-    yyg->yy_start_stack_ptr = 0;
-    yyg->yy_start_stack_depth = 0;
-    yyg->yy_start_stack =  NULL;
-
-/* Defined in main.c */
-#ifdef YY_STDINIT
-    yyin = stdin;
-    yyout = stdout;
-#else
-    yyin = (FILE *) 0;
-    yyout = (FILE *) 0;
-#endif
-
-    /* For future reference: Set errno on error, since we are called by
-     * yylex_init()
-     */
-    return 0;
-}
-
-/* yylex_destroy is for both reentrant and non-reentrant scanners. */
-int yylex_destroy  (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-    /* Pop the buffer stack, destroying each element. */
-	while(YY_CURRENT_BUFFER){
-		yy_delete_buffer(YY_CURRENT_BUFFER ,yyscanner );
-		YY_CURRENT_BUFFER_LVALUE = NULL;
-		yypop_buffer_state(yyscanner);
-	}
-
-	/* Destroy the stack itself. */
-	yyfree(yyg->yy_buffer_stack ,yyscanner);
-	yyg->yy_buffer_stack = NULL;
-
-    /* Destroy the start condition stack. */
-        yyfree(yyg->yy_start_stack ,yyscanner );
-        yyg->yy_start_stack = NULL;
-
-    /* Reset the globals. This is important in a non-reentrant scanner so the next time
-     * yylex() is called, initialization will occur. */
-    yy_init_globals( yyscanner);
-
-    /* Destroy the main struct (reentrant only). */
-    yyfree ( yyscanner , yyscanner );
-    yyscanner = NULL;
-    return 0;
-}
-
-/*
- * Internal utility routines.
- */
-
-#ifndef yytext_ptr
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yyscanner)
-{
-	register int i;
-	for ( i = 0; i < n; ++i )
-		s1[i] = s2[i];
-}
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner)
-{
-	register int n;
-	for ( n = 0; s[n]; ++n )
-		;
-
-	return n;
-}
-#endif
-
-void *yyalloc (yy_size_t  size , yyscan_t yyscanner)
-{
-	return (void *) malloc( size );
-}
-
-void *yyrealloc  (void * ptr, yy_size_t  size , yyscan_t yyscanner)
-{
-	/* The cast to (char *) in the following accommodates both
-	 * implementations that use char* generic pointers, and those
-	 * that use void* generic pointers.  It works with the latter
-	 * because both ANSI C and C++ allow castless assignment from
-	 * any pointer type to void*, and deal with argument conversions
-	 * as though doing an assignment.
-	 */
-	return (void *) realloc( (char *) ptr, size );
-}
-
-void yyfree (void * ptr , yyscan_t yyscanner)
-{
-	free( (char *) ptr );	/* see yyrealloc() for (char *) cast */
-}
-
-#define YYTABLES_NAME "yytables"
-
-#line 493 "program_lexer.l"
-
-
-
-void
-_mesa_program_lexer_ctor(void **scanner, struct asm_parser_state *state,
-			 const char *string, size_t len)
-{
-   yylex_init_extra(state,scanner);
-   yy_scan_bytes(string,len,*scanner);
-}
-
-void
-_mesa_program_lexer_dtor(void *scanner)
-{
-   yylex_destroy(scanner);
-}
-
diff --git a/mesalib/src/mesa/program/program_parse.tab.c b/mesalib/src/mesa/program/program_parse.tab.c
deleted file mode 100644
index 80735af85..000000000
--- a/mesalib/src/mesa/program/program_parse.tab.c
+++ /dev/null
@@ -1,5730 +0,0 @@
-

-/* A Bison parser, made by GNU Bison 2.4.1.  */

-

-/* Skeleton implementation for Bison's Yacc-like parsers in C

-   

-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006

-   Free Software Foundation, Inc.

-   

-   This program is free software: you can redistribute it and/or modify

-   it under the terms of the GNU General Public License as published by

-   the Free Software Foundation, either version 3 of the License, or

-   (at your option) any later version.

-   

-   This program is distributed in the hope that it will be useful,

-   but WITHOUT ANY WARRANTY; without even the implied warranty of

-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-   GNU General Public License for more details.

-   

-   You should have received a copy of the GNU General Public License

-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

-

-/* As a special exception, you may create a larger work that contains

-   part or all of the Bison parser skeleton and distribute that work

-   under terms of your choice, so long as that work isn't itself a

-   parser generator using the skeleton or a modified version thereof

-   as a parser skeleton.  Alternatively, if you modify or redistribute

-   the parser skeleton itself, you may (at your option) remove this

-   special exception, which will cause the skeleton and the resulting

-   Bison output files to be licensed under the GNU General Public

-   License without this special exception.

-   

-   This special exception was added by the Free Software Foundation in

-   version 2.2 of Bison.  */

-

-/* C LALR(1) parser skeleton written by Richard Stallman, by

-   simplifying the original so-called "semantic" parser.  */

-

-/* All symbols defined below should begin with yy or YY, to avoid

-   infringing on user name space.  This should be done even for local

-   variables, as they might otherwise be expanded by user macros.

-   There are some unavoidable exceptions within include files to

-   define necessary library symbols; they are noted "INFRINGES ON

-   USER NAME SPACE" below.  */

-

-/* Identify Bison output.  */

-#define YYBISON 1

-

-/* Bison version.  */

-#define YYBISON_VERSION "2.4.1"

-

-/* Skeleton name.  */

-#define YYSKELETON_NAME "yacc.c"

-

-/* Pure parsers.  */

-#define YYPURE 1

-

-/* Push parsers.  */

-#define YYPUSH 0

-

-/* Pull parsers.  */

-#define YYPULL 1

-

-/* Using locations.  */

-#define YYLSP_NEEDED 1

-

-

-

-/* Copy the first part of user declarations.  */

-

-/* Line 189 of yacc.c  */

-#line 1 "program_parse.y"

-

-/*

- * Copyright © 2009 Intel Corporation

- *

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

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

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

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

- * Software.

- *

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

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

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

- * DEALINGS IN THE SOFTWARE.

- */

-#include <stdio.h>

-#include <stdlib.h>

-#include <string.h>

-

-#include "main/mtypes.h"

-#include "main/imports.h"

-#include "program/program.h"

-#include "program/prog_parameter.h"

-#include "program/prog_parameter_layout.h"

-#include "program/prog_statevars.h"

-#include "program/prog_instruction.h"

-

-#include "program/symbol_table.h"

-#include "program/program_parser.h"

-

-extern void *yy_scan_string(char *);

-extern void yy_delete_buffer(void *);

-

-static struct asm_symbol *declare_variable(struct asm_parser_state *state,

-    char *name, enum asm_type t, struct YYLTYPE *locp);

-

-static int add_state_reference(struct gl_program_parameter_list *param_list,

-    const gl_state_index tokens[STATE_LENGTH]);

-

-static int initialize_symbol_from_state(struct gl_program *prog,

-    struct asm_symbol *param_var, const gl_state_index tokens[STATE_LENGTH]);

-

-static int initialize_symbol_from_param(struct gl_program *prog,

-    struct asm_symbol *param_var, const gl_state_index tokens[STATE_LENGTH]);

-

-static int initialize_symbol_from_const(struct gl_program *prog,

-    struct asm_symbol *param_var, const struct asm_vector *vec,

-    GLboolean allowSwizzle);

-

-static int yyparse(struct asm_parser_state *state);

-

-static char *make_error_string(const char *fmt, ...);

-

-static void yyerror(struct YYLTYPE *locp, struct asm_parser_state *state,

-    const char *s);

-

-static int validate_inputs(struct YYLTYPE *locp,

-    struct asm_parser_state *state);

-

-static void init_dst_reg(struct prog_dst_register *r);

-

-static void set_dst_reg(struct prog_dst_register *r,

-                        gl_register_file file, GLint index);

-

-static void init_src_reg(struct asm_src_register *r);

-

-static void set_src_reg(struct asm_src_register *r,

-                        gl_register_file file, GLint index);

-

-static void set_src_reg_swz(struct asm_src_register *r,

-                            gl_register_file file, GLint index, GLuint swizzle);

-

-static void asm_instruction_set_operands(struct asm_instruction *inst,

-    const struct prog_dst_register *dst, const struct asm_src_register *src0,

-    const struct asm_src_register *src1, const struct asm_src_register *src2);

-

-static struct asm_instruction *asm_instruction_ctor(gl_inst_opcode op,

-    const struct prog_dst_register *dst, const struct asm_src_register *src0,

-    const struct asm_src_register *src1, const struct asm_src_register *src2);

-

-static struct asm_instruction *asm_instruction_copy_ctor(

-    const struct prog_instruction *base, const struct prog_dst_register *dst,

-    const struct asm_src_register *src0, const struct asm_src_register *src1,

-    const struct asm_src_register *src2);

-

-#ifndef FALSE

-#define FALSE 0

-#define TRUE (!FALSE)

-#endif

-

-#define YYLLOC_DEFAULT(Current, Rhs, N)					\

-   do {									\

-      if (YYID(N)) {							\

-	 (Current).first_line = YYRHSLOC(Rhs, 1).first_line;		\

-	 (Current).first_column = YYRHSLOC(Rhs, 1).first_column;	\

-	 (Current).position = YYRHSLOC(Rhs, 1).position;		\

-	 (Current).last_line = YYRHSLOC(Rhs, N).last_line;		\

-	 (Current).last_column = YYRHSLOC(Rhs, N).last_column;		\

-      } else {								\

-	 (Current).first_line = YYRHSLOC(Rhs, 0).last_line;		\

-	 (Current).last_line = (Current).first_line;			\

-	 (Current).first_column = YYRHSLOC(Rhs, 0).last_column;		\

-	 (Current).last_column = (Current).first_column;		\

-	 (Current).position = YYRHSLOC(Rhs, 0).position			\

-	    + (Current).first_column;					\

-      }									\

-   } while(YYID(0))

-

-#define YYLEX_PARAM state->scanner

-

-

-/* Line 189 of yacc.c  */

-#line 193 "program_parse.tab.c"

-

-/* Enabling traces.  */

-#ifndef YYDEBUG

-# define YYDEBUG 0

-#endif

-

-/* Enabling verbose error messages.  */

-#ifdef YYERROR_VERBOSE

-# undef YYERROR_VERBOSE

-# define YYERROR_VERBOSE 1

-#else

-# define YYERROR_VERBOSE 1

-#endif

-

-/* Enabling the token table.  */

-#ifndef YYTOKEN_TABLE

-# define YYTOKEN_TABLE 0

-#endif

-

-

-/* Tokens.  */

-#ifndef YYTOKENTYPE

-# define YYTOKENTYPE

-   /* Put the tokens into the symbol table, so that GDB and other debuggers

-      know about them.  */

-   enum yytokentype {

-     ARBvp_10 = 258,

-     ARBfp_10 = 259,

-     ADDRESS = 260,

-     ALIAS = 261,

-     ATTRIB = 262,

-     OPTION = 263,

-     OUTPUT = 264,

-     PARAM = 265,

-     TEMP = 266,

-     END = 267,

-     BIN_OP = 268,

-     BINSC_OP = 269,

-     SAMPLE_OP = 270,

-     SCALAR_OP = 271,

-     TRI_OP = 272,

-     VECTOR_OP = 273,

-     ARL = 274,

-     KIL = 275,

-     SWZ = 276,

-     TXD_OP = 277,

-     INTEGER = 278,

-     REAL = 279,

-     AMBIENT = 280,

-     ATTENUATION = 281,

-     BACK = 282,

-     CLIP = 283,

-     COLOR = 284,

-     DEPTH = 285,

-     DIFFUSE = 286,

-     DIRECTION = 287,

-     EMISSION = 288,

-     ENV = 289,

-     EYE = 290,

-     FOG = 291,

-     FOGCOORD = 292,

-     FRAGMENT = 293,

-     FRONT = 294,

-     HALF = 295,

-     INVERSE = 296,

-     INVTRANS = 297,

-     LIGHT = 298,

-     LIGHTMODEL = 299,

-     LIGHTPROD = 300,

-     LOCAL = 301,

-     MATERIAL = 302,

-     MAT_PROGRAM = 303,

-     MATRIX = 304,

-     MATRIXINDEX = 305,

-     MODELVIEW = 306,

-     MVP = 307,

-     NORMAL = 308,

-     OBJECT = 309,

-     PALETTE = 310,

-     PARAMS = 311,

-     PLANE = 312,

-     POINT_TOK = 313,

-     POINTSIZE = 314,

-     POSITION = 315,

-     PRIMARY = 316,

-     PROGRAM = 317,

-     PROJECTION = 318,

-     RANGE = 319,

-     RESULT = 320,

-     ROW = 321,

-     SCENECOLOR = 322,

-     SECONDARY = 323,

-     SHININESS = 324,

-     SIZE_TOK = 325,

-     SPECULAR = 326,

-     SPOT = 327,

-     STATE = 328,

-     TEXCOORD = 329,

-     TEXENV = 330,

-     TEXGEN = 331,

-     TEXGEN_Q = 332,

-     TEXGEN_R = 333,

-     TEXGEN_S = 334,

-     TEXGEN_T = 335,

-     TEXTURE = 336,

-     TRANSPOSE = 337,

-     TEXTURE_UNIT = 338,

-     TEX_1D = 339,

-     TEX_2D = 340,

-     TEX_3D = 341,

-     TEX_CUBE = 342,

-     TEX_RECT = 343,

-     TEX_SHADOW1D = 344,

-     TEX_SHADOW2D = 345,

-     TEX_SHADOWRECT = 346,

-     TEX_ARRAY1D = 347,

-     TEX_ARRAY2D = 348,

-     TEX_ARRAYSHADOW1D = 349,

-     TEX_ARRAYSHADOW2D = 350,

-     VERTEX = 351,

-     VTXATTRIB = 352,

-     WEIGHT = 353,

-     IDENTIFIER = 354,

-     USED_IDENTIFIER = 355,

-     MASK4 = 356,

-     MASK3 = 357,

-     MASK2 = 358,

-     MASK1 = 359,

-     SWIZZLE = 360,

-     DOT_DOT = 361,

-     DOT = 362

-   };

-#endif

-

-

-

-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED

-typedef union YYSTYPE

-{

-

-/* Line 214 of yacc.c  */

-#line 126 "program_parse.y"

-

-   struct asm_instruction *inst;

-   struct asm_symbol *sym;

-   struct asm_symbol temp_sym;

-   struct asm_swizzle_mask swiz_mask;

-   struct asm_src_register src_reg;

-   struct prog_dst_register dst_reg;

-   struct prog_instruction temp_inst;

-   char *string;

-   unsigned result;

-   unsigned attrib;

-   int integer;

-   float real;

-   gl_state_index state[STATE_LENGTH];

-   int negate;

-   struct asm_vector vector;

-   gl_inst_opcode opcode;

-

-   struct {

-      unsigned swz;

-      unsigned rgba_valid:1;

-      unsigned xyzw_valid:1;

-      unsigned negate:1;

-   } ext_swizzle;

-

-

-

-/* Line 214 of yacc.c  */

-#line 364 "program_parse.tab.c"

-} YYSTYPE;

-# define YYSTYPE_IS_TRIVIAL 1

-# define yystype YYSTYPE /* obsolescent; will be withdrawn */

-# define YYSTYPE_IS_DECLARED 1

-#endif

-

-#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED

-typedef struct YYLTYPE

-{

-  int first_line;

-  int first_column;

-  int last_line;

-  int last_column;

-} YYLTYPE;

-# define yyltype YYLTYPE /* obsolescent; will be withdrawn */

-# define YYLTYPE_IS_DECLARED 1

-# define YYLTYPE_IS_TRIVIAL 1

-#endif

-

-

-/* Copy the second part of user declarations.  */

-

-/* Line 264 of yacc.c  */

-#line 271 "program_parse.y"

-

-extern int yylex(YYSTYPE *yylval_param, YYLTYPE *yylloc_param,

-    void *yyscanner);

-

-

-/* Line 264 of yacc.c  */

-#line 395 "program_parse.tab.c"

-

-#ifdef short

-# undef short

-#endif

-

-#ifdef YYTYPE_UINT8

-typedef YYTYPE_UINT8 yytype_uint8;

-#else

-typedef unsigned char yytype_uint8;

-#endif

-

-#ifdef YYTYPE_INT8

-typedef YYTYPE_INT8 yytype_int8;

-#elif (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-typedef signed char yytype_int8;

-#else

-typedef short int yytype_int8;

-#endif

-

-#ifdef YYTYPE_UINT16

-typedef YYTYPE_UINT16 yytype_uint16;

-#else

-typedef unsigned short int yytype_uint16;

-#endif

-

-#ifdef YYTYPE_INT16

-typedef YYTYPE_INT16 yytype_int16;

-#else

-typedef short int yytype_int16;

-#endif

-

-#ifndef YYSIZE_T

-# ifdef __SIZE_TYPE__

-#  define YYSIZE_T __SIZE_TYPE__

-# elif defined size_t

-#  define YYSIZE_T size_t

-# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */

-#  define YYSIZE_T size_t

-# else

-#  define YYSIZE_T unsigned int

-# endif

-#endif

-

-#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)

-

-#ifndef YY_

-# if YYENABLE_NLS

-#  if ENABLE_NLS

-#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */

-#   define YY_(msgid) dgettext ("bison-runtime", msgid)

-#  endif

-# endif

-# ifndef YY_

-#  define YY_(msgid) msgid

-# endif

-#endif

-

-/* Suppress unused-variable warnings by "using" E.  */

-#if ! defined lint || defined __GNUC__

-# define YYUSE(e) ((void) (e))

-#else

-# define YYUSE(e) /* empty */

-#endif

-

-/* Identity function, used to suppress warnings about constant conditions.  */

-#ifndef lint

-# define YYID(n) (n)

-#else

-#if (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-static int

-YYID (int yyi)

-#else

-static int

-YYID (yyi)

-    int yyi;

-#endif

-{

-  return yyi;

-}

-#endif

-

-#if ! defined yyoverflow || YYERROR_VERBOSE

-

-/* The parser invokes alloca or malloc; define the necessary symbols.  */

-

-# ifdef YYSTACK_USE_ALLOCA

-#  if YYSTACK_USE_ALLOCA

-#   ifdef __GNUC__

-#    define YYSTACK_ALLOC __builtin_alloca

-#   elif defined __BUILTIN_VA_ARG_INCR

-#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */

-#   elif defined _AIX

-#    define YYSTACK_ALLOC __alloca

-#   elif defined _MSC_VER

-#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */

-#    define alloca _alloca

-#   else

-#    define YYSTACK_ALLOC alloca

-#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */

-#     ifndef _STDLIB_H

-#      define _STDLIB_H 1

-#     endif

-#    endif

-#   endif

-#  endif

-# endif

-

-# ifdef YYSTACK_ALLOC

-   /* Pacify GCC's `empty if-body' warning.  */

-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))

-#  ifndef YYSTACK_ALLOC_MAXIMUM

-    /* The OS might guarantee only one guard page at the bottom of the stack,

-       and a page size can be as small as 4096 bytes.  So we cannot safely

-       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number

-       to allow for a few compiler-allocated temporary stack slots.  */

-#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */

-#  endif

-# else

-#  define YYSTACK_ALLOC YYMALLOC

-#  define YYSTACK_FREE YYFREE

-#  ifndef YYSTACK_ALLOC_MAXIMUM

-#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM

-#  endif

-#  if (defined __cplusplus && ! defined _STDLIB_H \

-       && ! ((defined YYMALLOC || defined malloc) \

-	     && (defined YYFREE || defined free)))

-#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */

-#   ifndef _STDLIB_H

-#    define _STDLIB_H 1

-#   endif

-#  endif

-#  ifndef YYMALLOC

-#   define YYMALLOC malloc

-#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */

-#   endif

-#  endif

-#  ifndef YYFREE

-#   define YYFREE free

-#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-void free (void *); /* INFRINGES ON USER NAME SPACE */

-#   endif

-#  endif

-# endif

-#endif /* ! defined yyoverflow || YYERROR_VERBOSE */

-

-

-#if (! defined yyoverflow \

-     && (! defined __cplusplus \

-	 || (defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \

-	     && defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))

-

-/* A type that is properly aligned for any stack member.  */

-union yyalloc

-{

-  yytype_int16 yyss_alloc;

-  YYSTYPE yyvs_alloc;

-  YYLTYPE yyls_alloc;

-};

-

-/* The size of the maximum gap between one aligned stack and the next.  */

-# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)

-

-/* The size of an array large to enough to hold all stacks, each with

-   N elements.  */

-# define YYSTACK_BYTES(N) \

-     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \

-      + 2 * YYSTACK_GAP_MAXIMUM)

-

-/* Copy COUNT objects from FROM to TO.  The source and destination do

-   not overlap.  */

-# ifndef YYCOPY

-#  if defined __GNUC__ && 1 < __GNUC__

-#   define YYCOPY(To, From, Count) \

-      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))

-#  else

-#   define YYCOPY(To, From, Count)		\

-      do					\

-	{					\

-	  YYSIZE_T yyi;				\

-	  for (yyi = 0; yyi < (Count); yyi++)	\

-	    (To)[yyi] = (From)[yyi];		\

-	}					\

-      while (YYID (0))

-#  endif

-# endif

-

-/* Relocate STACK from its old location to the new one.  The

-   local variables YYSIZE and YYSTACKSIZE give the old and new number of

-   elements in the stack, and YYPTR gives the new location of the

-   stack.  Advance YYPTR to a properly aligned location for the next

-   stack.  */

-# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\

-    do									\

-      {									\

-	YYSIZE_T yynewbytes;						\

-	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\

-	Stack = &yyptr->Stack_alloc;					\

-	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \

-	yyptr += yynewbytes / sizeof (*yyptr);				\

-      }									\

-    while (YYID (0))

-

-#endif

-

-/* YYFINAL -- State number of the termination state.  */

-#define YYFINAL  5

-/* YYLAST -- Last index in YYTABLE.  */

-#define YYLAST   396

-

-/* YYNTOKENS -- Number of terminals.  */

-#define YYNTOKENS  120

-/* YYNNTS -- Number of nonterminals.  */

-#define YYNNTS  143

-/* YYNRULES -- Number of rules.  */

-#define YYNRULES  282

-/* YYNRULES -- Number of states.  */

-#define YYNSTATES  475

-

-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */

-#define YYUNDEFTOK  2

-#define YYMAXUTOK   362

-

-#define YYTRANSLATE(YYX)						\

-  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)

-

-/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */

-static const yytype_uint8 yytranslate[] =

-{

-       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-     115,   116,     2,   113,   109,   114,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,   108,

-       2,   117,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,   111,     2,   112,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,   118,   110,   119,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,

-       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,

-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,

-      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,

-      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,

-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,

-      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,

-      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,

-      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,

-      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,

-      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,

-     105,   106,   107

-};

-

-#if YYDEBUG

-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in

-   YYRHS.  */

-static const yytype_uint16 yyprhs[] =

-{

-       0,     0,     3,     8,    10,    12,    15,    16,    20,    23,

-      24,    27,    30,    32,    34,    36,    38,    40,    42,    44,

-      46,    48,    50,    52,    54,    59,    64,    69,    76,    83,

-      92,   101,   104,   107,   120,   123,   125,   127,   129,   131,

-     133,   135,   137,   139,   141,   143,   145,   147,   154,   157,

-     162,   165,   167,   171,   177,   181,   184,   192,   195,   197,

-     199,   201,   203,   208,   210,   212,   214,   216,   218,   220,

-     222,   226,   227,   230,   233,   235,   237,   239,   241,   243,

-     245,   247,   249,   251,   252,   254,   256,   258,   260,   261,

-     265,   269,   270,   273,   276,   278,   280,   282,   284,   286,

-     288,   290,   292,   297,   300,   303,   305,   308,   310,   313,

-     315,   318,   323,   328,   330,   331,   335,   337,   339,   342,

-     344,   347,   349,   351,   355,   362,   363,   365,   368,   373,

-     375,   379,   381,   383,   385,   387,   389,   391,   393,   395,

-     397,   399,   402,   405,   408,   411,   414,   417,   420,   423,

-     426,   429,   432,   435,   439,   441,   443,   445,   451,   453,

-     455,   457,   460,   462,   464,   467,   469,   472,   479,   481,

-     485,   487,   489,   491,   493,   495,   500,   502,   504,   506,

-     508,   510,   512,   515,   517,   519,   525,   527,   530,   532,

-     534,   540,   543,   544,   551,   555,   556,   558,   560,   562,

-     564,   566,   569,   571,   573,   576,   581,   586,   587,   591,

-     593,   595,   597,   600,   602,   604,   606,   608,   614,   616,

-     620,   626,   632,   634,   638,   644,   646,   648,   650,   652,

-     654,   656,   658,   660,   662,   666,   672,   680,   690,   693,

-     696,   698,   700,   701,   702,   707,   709,   710,   711,   715,

-     719,   721,   727,   730,   733,   736,   739,   743,   746,   750,

-     751,   753,   755,   756,   758,   760,   761,   763,   765,   766,

-     768,   770,   771,   775,   776,   780,   781,   785,   787,   789,

-     791,   796,   798

-};

-

-/* YYRHS -- A `-1'-separated list of the rules' RHS.  */

-static const yytype_int16 yyrhs[] =

-{

-     121,     0,    -1,   122,   123,   125,    12,    -1,     3,    -1,

-       4,    -1,   123,   124,    -1,    -1,     8,   262,   108,    -1,

-     125,   126,    -1,    -1,   127,   108,    -1,   170,   108,    -1,

-     128,    -1,   129,    -1,   130,    -1,   131,    -1,   132,    -1,

-     133,    -1,   134,    -1,   135,    -1,   141,    -1,   136,    -1,

-     137,    -1,   138,    -1,    19,   146,   109,   142,    -1,    18,

-     145,   109,   144,    -1,    16,   145,   109,   142,    -1,    14,

-     145,   109,   142,   109,   142,    -1,    13,   145,   109,   144,

-     109,   144,    -1,    17,   145,   109,   144,   109,   144,   109,

-     144,    -1,    15,   145,   109,   144,   109,   139,   109,   140,

-      -1,    20,   144,    -1,    20,   166,    -1,    22,   145,   109,

-     144,   109,   144,   109,   144,   109,   139,   109,   140,    -1,

-      83,   256,    -1,    84,    -1,    85,    -1,    86,    -1,    87,

-      -1,    88,    -1,    89,    -1,    90,    -1,    91,    -1,    92,

-      -1,    93,    -1,    94,    -1,    95,    -1,    21,   145,   109,

-     150,   109,   147,    -1,   241,   143,    -1,   241,   110,   143,

-     110,    -1,   150,   162,    -1,   238,    -1,   241,   150,   163,

-      -1,   241,   110,   150,   163,   110,    -1,   151,   164,   165,

-      -1,   159,   161,    -1,   148,   109,   148,   109,   148,   109,

-     148,    -1,   241,   149,    -1,    23,    -1,   262,    -1,   100,

-      -1,   172,    -1,   152,   111,   153,   112,    -1,   186,    -1,

-     249,    -1,   100,    -1,   100,    -1,   154,    -1,   155,    -1,

-      23,    -1,   159,   160,   156,    -1,    -1,   113,   157,    -1,

-     114,   158,    -1,    23,    -1,    23,    -1,   100,    -1,   104,

-      -1,   104,    -1,   104,    -1,   104,    -1,   101,    -1,   105,

-      -1,    -1,   101,    -1,   102,    -1,   103,    -1,   104,    -1,

-      -1,   115,   166,   116,    -1,   115,   167,   116,    -1,    -1,

-     168,   163,    -1,   169,   163,    -1,    99,    -1,   100,    -1,

-     171,    -1,   178,    -1,   242,    -1,   245,    -1,   248,    -1,

-     261,    -1,     7,    99,   117,   172,    -1,    96,   173,    -1,

-      38,   177,    -1,    60,    -1,    98,   175,    -1,    53,    -1,

-      29,   254,    -1,    37,    -1,    74,   255,    -1,    50,   111,

-     176,   112,    -1,    97,   111,   174,   112,    -1,    23,    -1,

-      -1,   111,   176,   112,    -1,    23,    -1,    60,    -1,    29,

-     254,    -1,    37,    -1,    74,   255,    -1,   179,    -1,   180,

-      -1,    10,    99,   182,    -1,    10,    99,   111,   181,   112,

-     183,    -1,    -1,    23,    -1,   117,   185,    -1,   117,   118,

-     184,   119,    -1,   187,    -1,   184,   109,   187,    -1,   189,

-      -1,   225,    -1,   235,    -1,   189,    -1,   225,    -1,   236,

-      -1,   188,    -1,   226,    -1,   235,    -1,   189,    -1,    73,

-     213,    -1,    73,   190,    -1,    73,   192,    -1,    73,   195,

-      -1,    73,   197,    -1,    73,   203,    -1,    73,   199,    -1,

-      73,   206,    -1,    73,   208,    -1,    73,   210,    -1,    73,

-     212,    -1,    73,   224,    -1,    47,   253,   191,    -1,   201,

-      -1,    33,    -1,    69,    -1,    43,   111,   202,   112,   193,

-      -1,   201,    -1,    60,    -1,    26,    -1,    72,   194,    -1,

-      40,    -1,    32,    -1,    44,   196,    -1,    25,    -1,   253,

-      67,    -1,    45,   111,   202,   112,   253,   198,    -1,   201,

-      -1,    75,   257,   200,    -1,    29,    -1,    25,    -1,    31,

-      -1,    71,    -1,    23,    -1,    76,   255,   204,   205,    -1,

-      35,    -1,    54,    -1,    79,    -1,    80,    -1,    78,    -1,

-      77,    -1,    36,   207,    -1,    29,    -1,    56,    -1,    28,

-     111,   209,   112,    57,    -1,    23,    -1,    58,   211,    -1,

-      70,    -1,    26,    -1,   215,    66,   111,   218,   112,    -1,

-     215,   214,    -1,    -1,    66,   111,   218,   106,   218,   112,

-      -1,    49,   219,   216,    -1,    -1,   217,    -1,    41,    -1,

-      82,    -1,    42,    -1,    23,    -1,    51,   220,    -1,    63,

-      -1,    52,    -1,    81,   255,    -1,    55,   111,   222,   112,

-      -1,    48,   111,   223,   112,    -1,    -1,   111,   221,   112,

-      -1,    23,    -1,    23,    -1,    23,    -1,    30,    64,    -1,

-     229,    -1,   232,    -1,   227,    -1,   230,    -1,    62,    34,

-     111,   228,   112,    -1,   233,    -1,   233,   106,   233,    -1,

-      62,    34,   111,   233,   112,    -1,    62,    46,   111,   231,

-     112,    -1,   234,    -1,   234,   106,   234,    -1,    62,    46,

-     111,   234,   112,    -1,    23,    -1,    23,    -1,   237,    -1,

-     239,    -1,   238,    -1,   239,    -1,   240,    -1,    24,    -1,

-      23,    -1,   118,   240,   119,    -1,   118,   240,   109,   240,

-     119,    -1,   118,   240,   109,   240,   109,   240,   119,    -1,

-     118,   240,   109,   240,   109,   240,   109,   240,   119,    -1,

-     241,    24,    -1,   241,    23,    -1,   113,    -1,   114,    -1,

-      -1,    -1,   244,    11,   243,   247,    -1,   262,    -1,    -1,

-      -1,     5,   246,   247,    -1,   247,   109,    99,    -1,    99,

-      -1,   244,     9,    99,   117,   249,    -1,    65,    60,    -1,

-      65,    37,    -1,    65,   250,    -1,    65,    59,    -1,    65,

-      74,   255,    -1,    65,    30,    -1,    29,   251,   252,    -1,

-      -1,    39,    -1,    27,    -1,    -1,    61,    -1,    68,    -1,

-      -1,    39,    -1,    27,    -1,    -1,    61,    -1,    68,    -1,

-      -1,   111,   258,   112,    -1,    -1,   111,   259,   112,    -1,

-      -1,   111,   260,   112,    -1,    23,    -1,    23,    -1,    23,

-      -1,     6,    99,   117,   100,    -1,    99,    -1,   100,    -1

-};

-

-/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */

-static const yytype_uint16 yyrline[] =

-{

-       0,   278,   278,   281,   289,   301,   302,   305,   329,   330,

-     333,   348,   351,   356,   363,   364,   365,   366,   367,   368,

-     369,   372,   373,   374,   377,   383,   389,   395,   402,   408,

-     415,   459,   464,   474,   518,   524,   525,   526,   527,   528,

-     529,   530,   531,   532,   533,   534,   535,   538,   550,   558,

-     575,   582,   601,   612,   632,   657,   664,   697,   704,   719,

-     774,   817,   826,   848,   858,   862,   891,   910,   910,   912,

-     919,   931,   932,   933,   936,   950,   964,   984,   995,  1007,

-    1009,  1010,  1011,  1012,  1015,  1015,  1015,  1015,  1016,  1019,

-    1023,  1028,  1035,  1042,  1049,  1072,  1095,  1096,  1097,  1098,

-    1099,  1100,  1103,  1122,  1126,  1132,  1136,  1140,  1144,  1153,

-    1162,  1166,  1171,  1177,  1188,  1188,  1189,  1191,  1195,  1199,

-    1203,  1209,  1209,  1211,  1229,  1255,  1258,  1269,  1275,  1281,

-    1282,  1289,  1295,  1301,  1309,  1315,  1321,  1329,  1335,  1341,

-    1349,  1350,  1353,  1354,  1355,  1356,  1357,  1358,  1359,  1360,

-    1361,  1362,  1363,  1366,  1375,  1379,  1383,  1389,  1398,  1402,

-    1406,  1415,  1419,  1425,  1431,  1438,  1443,  1451,  1461,  1463,

-    1471,  1477,  1481,  1485,  1491,  1502,  1511,  1515,  1520,  1524,

-    1528,  1532,  1538,  1545,  1549,  1555,  1563,  1574,  1581,  1585,

-    1591,  1601,  1612,  1616,  1634,  1643,  1646,  1652,  1656,  1660,

-    1666,  1677,  1682,  1687,  1692,  1697,  1702,  1710,  1713,  1718,

-    1731,  1739,  1750,  1758,  1758,  1760,  1760,  1762,  1772,  1777,

-    1784,  1794,  1803,  1808,  1815,  1825,  1835,  1847,  1847,  1848,

-    1848,  1850,  1860,  1868,  1878,  1886,  1894,  1903,  1914,  1918,

-    1924,  1925,  1926,  1929,  1929,  1932,  1967,  1971,  1971,  1974,

-    1981,  1990,  2004,  2013,  2022,  2026,  2035,  2044,  2055,  2062,

-    2067,  2076,  2088,  2091,  2100,  2111,  2112,  2113,  2116,  2117,

-    2118,  2121,  2122,  2125,  2126,  2129,  2130,  2133,  2144,  2155,

-    2166,  2192,  2193

-};

-#endif

-

-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE

-/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.

-   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */

-static const char *const yytname[] =

-{

-  "$end", "error", "$undefined", "ARBvp_10", "ARBfp_10", "ADDRESS",

-  "ALIAS", "ATTRIB", "OPTION", "OUTPUT", "PARAM", "TEMP", "END", "BIN_OP",

-  "BINSC_OP", "SAMPLE_OP", "SCALAR_OP", "TRI_OP", "VECTOR_OP", "ARL",

-  "KIL", "SWZ", "TXD_OP", "INTEGER", "REAL", "AMBIENT", "ATTENUATION",

-  "BACK", "CLIP", "COLOR", "DEPTH", "DIFFUSE", "DIRECTION", "EMISSION",

-  "ENV", "EYE", "FOG", "FOGCOORD", "FRAGMENT", "FRONT", "HALF", "INVERSE",

-  "INVTRANS", "LIGHT", "LIGHTMODEL", "LIGHTPROD", "LOCAL", "MATERIAL",

-  "MAT_PROGRAM", "MATRIX", "MATRIXINDEX", "MODELVIEW", "MVP", "NORMAL",

-  "OBJECT", "PALETTE", "PARAMS", "PLANE", "POINT_TOK", "POINTSIZE",

-  "POSITION", "PRIMARY", "PROGRAM", "PROJECTION", "RANGE", "RESULT", "ROW",

-  "SCENECOLOR", "SECONDARY", "SHININESS", "SIZE_TOK", "SPECULAR", "SPOT",

-  "STATE", "TEXCOORD", "TEXENV", "TEXGEN", "TEXGEN_Q", "TEXGEN_R",

-  "TEXGEN_S", "TEXGEN_T", "TEXTURE", "TRANSPOSE", "TEXTURE_UNIT", "TEX_1D",

-  "TEX_2D", "TEX_3D", "TEX_CUBE", "TEX_RECT", "TEX_SHADOW1D",

-  "TEX_SHADOW2D", "TEX_SHADOWRECT", "TEX_ARRAY1D", "TEX_ARRAY2D",

-  "TEX_ARRAYSHADOW1D", "TEX_ARRAYSHADOW2D", "VERTEX", "VTXATTRIB",

-  "WEIGHT", "IDENTIFIER", "USED_IDENTIFIER", "MASK4", "MASK3", "MASK2",

-  "MASK1", "SWIZZLE", "DOT_DOT", "DOT", "';'", "','", "'|'", "'['", "']'",

-  "'+'", "'-'", "'('", "')'", "'='", "'{'", "'}'", "$accept", "program",

-  "language", "optionSequence", "option", "statementSequence", "statement",

-  "instruction", "ALU_instruction", "TexInstruction", "ARL_instruction",

-  "VECTORop_instruction", "SCALARop_instruction", "BINSCop_instruction",

-  "BINop_instruction", "TRIop_instruction", "SAMPLE_instruction",

-  "KIL_instruction", "TXD_instruction", "texImageUnit", "texTarget",

-  "SWZ_instruction", "scalarSrcReg", "scalarUse", "swizzleSrcReg",

-  "maskedDstReg", "maskedAddrReg", "extendedSwizzle", "extSwizComp",

-  "extSwizSel", "srcReg", "dstReg", "progParamArray", "progParamArrayMem",

-  "progParamArrayAbs", "progParamArrayRel", "addrRegRelOffset",

-  "addrRegPosOffset", "addrRegNegOffset", "addrReg", "addrComponent",

-  "addrWriteMask", "scalarSuffix", "swizzleSuffix", "optionalMask",

-  "optionalCcMask", "ccTest", "ccTest2", "ccMaskRule", "ccMaskRule2",

-  "namingStatement", "ATTRIB_statement", "attribBinding", "vtxAttribItem",

-  "vtxAttribNum", "vtxOptWeightNum", "vtxWeightNum", "fragAttribItem",

-  "PARAM_statement", "PARAM_singleStmt", "PARAM_multipleStmt",

-  "optArraySize", "paramSingleInit", "paramMultipleInit",

-  "paramMultInitList", "paramSingleItemDecl", "paramSingleItemUse",

-  "paramMultipleItem", "stateMultipleItem", "stateSingleItem",

-  "stateMaterialItem", "stateMatProperty", "stateLightItem",

-  "stateLightProperty", "stateSpotProperty", "stateLightModelItem",

-  "stateLModProperty", "stateLightProdItem", "stateLProdProperty",

-  "stateTexEnvItem", "stateTexEnvProperty", "ambDiffSpecProperty",

-  "stateLightNumber", "stateTexGenItem", "stateTexGenType",

-  "stateTexGenCoord", "stateFogItem", "stateFogProperty",

-  "stateClipPlaneItem", "stateClipPlaneNum", "statePointItem",

-  "statePointProperty", "stateMatrixRow", "stateMatrixRows",

-  "optMatrixRows", "stateMatrixItem", "stateOptMatModifier",

-  "stateMatModifier", "stateMatrixRowNum", "stateMatrixName",

-  "stateOptModMatNum", "stateModMatNum", "statePaletteMatNum",

-  "stateProgramMatNum", "stateDepthItem", "programSingleItem",

-  "programMultipleItem", "progEnvParams", "progEnvParamNums",

-  "progEnvParam", "progLocalParams", "progLocalParamNums",

-  "progLocalParam", "progEnvParamNum", "progLocalParamNum",

-  "paramConstDecl", "paramConstUse", "paramConstScalarDecl",

-  "paramConstScalarUse", "paramConstVector", "signedFloatConstant",

-  "optionalSign", "TEMP_statement", "@1", "optVarSize",

-  "ADDRESS_statement", "@2", "varNameList", "OUTPUT_statement",

-  "resultBinding", "resultColBinding", "optResultFaceType",

-  "optResultColorType", "optFaceType", "optColorType",

-  "optTexCoordUnitNum", "optTexImageUnitNum", "optLegacyTexUnitNum",

-  "texCoordUnitNum", "texImageUnitNum", "legacyTexUnitNum",

-  "ALIAS_statement", "string", 0

-};

-#endif

-

-# ifdef YYPRINT

-/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to

-   token YYLEX-NUM.  */

-static const yytype_uint16 yytoknum[] =

-{

-       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,

-     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,

-     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,

-     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,

-     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,

-     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,

-     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,

-     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,

-     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,

-     345,   346,   347,   348,   349,   350,   351,   352,   353,   354,

-     355,   356,   357,   358,   359,   360,   361,   362,    59,    44,

-     124,    91,    93,    43,    45,    40,    41,    61,   123,   125

-};

-# endif

-

-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */

-static const yytype_uint16 yyr1[] =

-{

-       0,   120,   121,   122,   122,   123,   123,   124,   125,   125,

-     126,   126,   127,   127,   128,   128,   128,   128,   128,   128,

-     128,   129,   129,   129,   130,   131,   132,   133,   134,   135,

-     136,   137,   137,   138,   139,   140,   140,   140,   140,   140,

-     140,   140,   140,   140,   140,   140,   140,   141,   142,   142,

-     143,   143,   144,   144,   145,   146,   147,   148,   149,   149,

-     150,   150,   150,   150,   151,   151,   152,   153,   153,   154,

-     155,   156,   156,   156,   157,   158,   159,   160,   161,   162,

-     163,   163,   163,   163,   164,   164,   164,   164,   164,   165,

-     165,   165,   166,   167,   168,   169,   170,   170,   170,   170,

-     170,   170,   171,   172,   172,   173,   173,   173,   173,   173,

-     173,   173,   173,   174,   175,   175,   176,   177,   177,   177,

-     177,   178,   178,   179,   180,   181,   181,   182,   183,   184,

-     184,   185,   185,   185,   186,   186,   186,   187,   187,   187,

-     188,   188,   189,   189,   189,   189,   189,   189,   189,   189,

-     189,   189,   189,   190,   191,   191,   191,   192,   193,   193,

-     193,   193,   193,   194,   195,   196,   196,   197,   198,   199,

-     200,   201,   201,   201,   202,   203,   204,   204,   205,   205,

-     205,   205,   206,   207,   207,   208,   209,   210,   211,   211,

-     212,   213,   214,   214,   215,   216,   216,   217,   217,   217,

-     218,   219,   219,   219,   219,   219,   219,   220,   220,   221,

-     222,   223,   224,   225,   225,   226,   226,   227,   228,   228,

-     229,   230,   231,   231,   232,   233,   234,   235,   235,   236,

-     236,   237,   238,   238,   239,   239,   239,   239,   240,   240,

-     241,   241,   241,   243,   242,   244,   244,   246,   245,   247,

-     247,   248,   249,   249,   249,   249,   249,   249,   250,   251,

-     251,   251,   252,   252,   252,   253,   253,   253,   254,   254,

-     254,   255,   255,   256,   256,   257,   257,   258,   259,   260,

-     261,   262,   262

-};

-

-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */

-static const yytype_uint8 yyr2[] =

-{

-       0,     2,     4,     1,     1,     2,     0,     3,     2,     0,

-       2,     2,     1,     1,     1,     1,     1,     1,     1,     1,

-       1,     1,     1,     1,     4,     4,     4,     6,     6,     8,

-       8,     2,     2,    12,     2,     1,     1,     1,     1,     1,

-       1,     1,     1,     1,     1,     1,     1,     6,     2,     4,

-       2,     1,     3,     5,     3,     2,     7,     2,     1,     1,

-       1,     1,     4,     1,     1,     1,     1,     1,     1,     1,

-       3,     0,     2,     2,     1,     1,     1,     1,     1,     1,

-       1,     1,     1,     0,     1,     1,     1,     1,     0,     3,

-       3,     0,     2,     2,     1,     1,     1,     1,     1,     1,

-       1,     1,     4,     2,     2,     1,     2,     1,     2,     1,

-       2,     4,     4,     1,     0,     3,     1,     1,     2,     1,

-       2,     1,     1,     3,     6,     0,     1,     2,     4,     1,

-       3,     1,     1,     1,     1,     1,     1,     1,     1,     1,

-       1,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,     3,     1,     1,     1,     5,     1,     1,

-       1,     2,     1,     1,     2,     1,     2,     6,     1,     3,

-       1,     1,     1,     1,     1,     4,     1,     1,     1,     1,

-       1,     1,     2,     1,     1,     5,     1,     2,     1,     1,

-       5,     2,     0,     6,     3,     0,     1,     1,     1,     1,

-       1,     2,     1,     1,     2,     4,     4,     0,     3,     1,

-       1,     1,     2,     1,     1,     1,     1,     5,     1,     3,

-       5,     5,     1,     3,     5,     1,     1,     1,     1,     1,

-       1,     1,     1,     1,     3,     5,     7,     9,     2,     2,

-       1,     1,     0,     0,     4,     1,     0,     0,     3,     3,

-       1,     5,     2,     2,     2,     2,     3,     2,     3,     0,

-       1,     1,     0,     1,     1,     0,     1,     1,     0,     1,

-       1,     0,     3,     0,     3,     0,     3,     1,     1,     1,

-       4,     1,     1

-};

-

-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state

-   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero

-   means the default is an error.  */

-static const yytype_uint16 yydefact[] =

-{

-       0,     3,     4,     0,     6,     1,     9,     0,     5,   246,

-     281,   282,     0,   247,     0,     0,     0,     2,     0,     0,

-       0,     0,     0,     0,     0,   242,     0,     0,     8,     0,

-      12,    13,    14,    15,    16,    17,    18,    19,    21,    22,

-      23,    20,     0,    96,    97,   121,   122,    98,     0,    99,

-     100,   101,   245,     7,     0,     0,     0,     0,     0,    65,

-       0,    88,    64,     0,     0,     0,     0,     0,    76,     0,

-       0,    94,   240,   241,    31,    32,    83,     0,     0,     0,

-      10,    11,     0,   243,   250,   248,     0,     0,   125,   242,

-     123,   259,   257,   253,   255,   252,   271,   254,   242,    84,

-      85,    86,    87,    91,   242,   242,   242,   242,   242,   242,

-      78,    55,    81,    80,    82,    92,   233,   232,     0,     0,

-       0,     0,    60,     0,   242,    83,     0,    61,    63,   134,

-     135,   213,   214,   136,   229,   230,     0,   242,     0,     0,

-       0,   280,   102,   126,     0,   127,   131,   132,   133,   227,

-     228,   231,     0,   261,   260,   262,     0,   256,     0,     0,

-      54,     0,     0,     0,    26,     0,    25,    24,   268,   119,

-     117,   271,   104,     0,     0,     0,     0,     0,     0,   265,

-       0,   265,     0,     0,   275,   271,   142,   143,   144,   145,

-     147,   146,   148,   149,   150,   151,     0,   152,   268,   109,

-       0,   107,   105,   271,     0,   114,   103,    83,     0,    52,

-       0,     0,     0,     0,   244,   249,     0,   239,   238,   263,

-     264,   258,   277,     0,   242,    95,     0,     0,    83,   242,

-       0,    48,     0,    51,     0,   242,   269,   270,   118,   120,

-       0,     0,     0,   212,   183,   184,   182,     0,   165,   267,

-     266,   164,     0,     0,     0,     0,   207,   203,     0,   202,

-     271,   195,   189,   188,   187,     0,     0,     0,     0,   108,

-       0,   110,     0,     0,   106,     0,   242,   234,    69,     0,

-      67,    68,     0,   242,   242,   251,     0,   124,   272,    28,

-      89,    90,    93,    27,     0,    79,    50,   273,     0,     0,

-     225,     0,   226,     0,   186,     0,   174,     0,   166,     0,

-     171,   172,   155,   156,   173,   153,   154,     0,     0,   201,

-       0,   204,   197,   199,   198,   194,   196,   279,     0,   170,

-     169,   176,   177,     0,     0,   116,     0,   113,     0,     0,

-      53,     0,    62,    77,    71,    47,     0,     0,     0,   242,

-      49,     0,    34,     0,   242,   220,   224,     0,     0,   265,

-     211,     0,   209,     0,   210,     0,   276,   181,   180,   178,

-     179,   175,   200,     0,   111,   112,   115,   242,   235,     0,

-       0,    70,   242,    58,    57,    59,   242,     0,     0,     0,

-     129,   137,   140,   138,   215,   216,   139,   278,     0,    35,

-      36,    37,    38,    39,    40,    41,    42,    43,    44,    45,

-      46,    30,    29,   185,   160,   162,   159,     0,   157,   158,

-       0,   206,   208,   205,   190,     0,    74,    72,    75,    73,

-       0,     0,     0,     0,   141,   192,   242,   128,   274,   163,

-     161,   167,   168,   242,   236,   242,     0,     0,     0,     0,

-     191,   130,     0,     0,     0,     0,   218,     0,   222,     0,

-     237,   242,     0,   217,     0,   221,     0,     0,    56,    33,

-     219,   223,     0,     0,   193

-};

-

-/* YYDEFGOTO[NTERM-NUM].  */

-static const yytype_int16 yydefgoto[] =

-{

-      -1,     3,     4,     6,     8,     9,    28,    29,    30,    31,

-      32,    33,    34,    35,    36,    37,    38,    39,    40,   298,

-     411,    41,   161,   231,    74,    60,    69,   345,   346,   384,

-     232,    61,   126,   279,   280,   281,   381,   427,   429,    70,

-     344,   111,   296,   115,   103,   160,    75,   227,    76,   228,

-      42,    43,   127,   206,   338,   274,   336,   172,    44,    45,

-      46,   144,    90,   287,   389,   145,   128,   390,   391,   129,

-     186,   315,   187,   418,   440,   188,   251,   189,   441,   190,

-     330,   316,   307,   191,   333,   371,   192,   246,   193,   305,

-     194,   264,   195,   434,   450,   196,   325,   326,   373,   261,

-     319,   363,   365,   361,   197,   130,   393,   394,   455,   131,

-     395,   457,   132,   301,   303,   396,   133,   149,   134,   135,

-     151,    77,    47,   139,    48,    49,    54,    85,    50,    62,

-      97,   155,   221,   252,   238,   157,   352,   266,   223,   398,

-     328,    51,    12

-};

-

-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing

-   STATE-NUM.  */

-#define YYPACT_NINF -401

-static const yytype_int16 yypact[] =

-{

-     193,  -401,  -401,    27,  -401,  -401,    62,   143,  -401,    24,

-    -401,  -401,   -30,  -401,   -18,    12,    83,  -401,    15,    15,

-      15,    15,    15,    15,    67,    61,    15,    15,  -401,   127,

-    -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,

-    -401,  -401,   144,  -401,  -401,  -401,  -401,  -401,   204,  -401,

-    -401,  -401,  -401,  -401,   155,   136,   138,    34,   140,  -401,

-     147,   108,  -401,   150,   156,   157,   158,   160,  -401,   162,

-     159,  -401,  -401,  -401,  -401,  -401,   102,   -13,   163,   164,

-    -401,  -401,   165,  -401,  -401,   166,   170,    10,   235,     0,

-    -401,   141,  -401,  -401,  -401,  -401,   167,  -401,   131,  -401,

-    -401,  -401,  -401,   168,   131,   131,   131,   131,   131,   131,

-    -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,   104,    97,

-     114,    38,   169,    30,   131,   102,   171,  -401,  -401,  -401,

-    -401,  -401,  -401,  -401,  -401,  -401,    30,   131,   172,   155,

-     175,  -401,  -401,  -401,   173,  -401,  -401,  -401,  -401,  -401,

-    -401,  -401,   223,  -401,  -401,   123,   253,  -401,   177,   149,

-    -401,   178,   -10,   181,  -401,   182,  -401,  -401,   134,  -401,

-    -401,   167,  -401,   183,   184,   185,   213,    99,   186,   154,

-     187,   146,   153,     7,   188,   167,  -401,  -401,  -401,  -401,

-    -401,  -401,  -401,  -401,  -401,  -401,   215,  -401,   134,  -401,

-     190,  -401,  -401,   167,   191,   192,  -401,   102,   -48,  -401,

-       1,   195,   196,   214,   166,  -401,   189,  -401,  -401,  -401,

-    -401,  -401,  -401,   180,   131,  -401,   194,   197,   102,   131,

-      30,  -401,   203,   205,   201,   131,  -401,  -401,  -401,  -401,

-     285,   288,   289,  -401,  -401,  -401,  -401,   291,  -401,  -401,

-    -401,  -401,   248,   291,    33,   206,   207,  -401,   208,  -401,

-     167,    14,  -401,  -401,  -401,   293,   292,    92,   209,  -401,

-     299,  -401,   301,   299,  -401,   216,   131,  -401,  -401,   217,

-    -401,  -401,   221,   131,   131,  -401,   212,  -401,  -401,  -401,

-    -401,  -401,  -401,  -401,   218,  -401,  -401,   220,   224,   225,

-    -401,   226,  -401,   227,  -401,   228,  -401,   230,  -401,   231,

-    -401,  -401,  -401,  -401,  -401,  -401,  -401,   304,   309,  -401,

-     312,  -401,  -401,  -401,  -401,  -401,  -401,  -401,   232,  -401,

-    -401,  -401,  -401,   161,   313,  -401,   233,  -401,   234,   238,

-    -401,    13,  -401,  -401,   137,  -401,   242,   -15,   243,     3,

-    -401,   314,  -401,   133,   131,  -401,  -401,   296,    94,   146,

-    -401,   245,  -401,   246,  -401,   247,  -401,  -401,  -401,  -401,

-    -401,  -401,  -401,   249,  -401,  -401,  -401,   131,  -401,   332,

-     337,  -401,   131,  -401,  -401,  -401,   131,   142,   114,    28,

-    -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,   250,  -401,

-    -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,

-    -401,  -401,  -401,  -401,  -401,  -401,  -401,   331,  -401,  -401,

-      68,  -401,  -401,  -401,  -401,    43,  -401,  -401,  -401,  -401,

-     255,   256,   257,   258,  -401,   300,     3,  -401,  -401,  -401,

-    -401,  -401,  -401,   131,  -401,   131,   201,   285,   288,   259,

-    -401,  -401,   252,   264,   265,   263,   261,   266,   270,   313,

-    -401,   131,   133,  -401,   285,  -401,   288,    80,  -401,  -401,

-    -401,  -401,   313,   267,  -401

-};

-

-/* YYPGOTO[NTERM-NUM].  */

-static const yytype_int16 yypgoto[] =

-{

-    -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,

-    -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,   -69,

-     -82,  -401,  -100,   151,   -86,   210,  -401,  -401,  -366,  -401,

-     -54,  -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,   174,

-    -401,  -401,  -401,  -118,  -401,  -401,   229,  -401,  -401,  -401,

-    -401,  -401,   295,  -401,  -401,  -401,   110,  -401,  -401,  -401,

-    -401,  -401,  -401,  -401,  -401,  -401,  -401,   -51,  -401,   -88,

-    -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,

-    -401,  -311,   139,  -401,  -401,  -401,  -401,  -401,  -401,  -401,

-    -401,  -401,  -401,  -401,  -401,    -2,  -401,  -401,  -400,  -401,

-    -401,  -401,  -401,  -401,  -401,   298,  -401,  -401,  -401,  -401,

-    -401,  -401,  -401,  -390,  -295,   302,  -401,  -401,  -136,   -87,

-    -120,   -89,  -401,  -401,  -401,  -401,  -401,   251,  -401,   176,

-    -401,  -401,  -401,  -176,   198,  -153,  -401,  -401,  -401,  -401,

-    -401,  -401,    -6

-};

-

-/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If

-   positive, shift that token.  If negative, reduce the rule which

-   number is the opposite.  If zero, do what YYDEFACT says.

-   If YYTABLE_NINF, syntax error.  */

-#define YYTABLE_NINF -230

-static const yytype_int16 yytable[] =

-{

-     152,   146,   150,    52,   208,   254,   164,   209,   383,   167,

-     116,   117,   158,   116,   117,   162,   430,   162,   239,   163,

-     162,   165,   166,   125,   278,   118,   233,     5,   118,    13,

-      14,    15,   267,   262,    16,   152,    17,    18,    19,    20,

-      21,    22,    23,    24,    25,    26,    27,   419,   118,   119,

-     271,   212,   119,   116,   117,   322,   323,   456,   310,   467,

-     120,   276,   119,   120,   311,   387,   312,   198,   118,   207,

-       7,   277,   473,   120,   470,   199,   388,   263,    53,   453,

-      58,    55,   211,   121,    10,    11,   121,   122,   200,   275,

-     122,   201,   119,   310,   233,   468,   324,   123,   202,   311,

-     230,    68,   313,   120,   314,   124,   121,   321,   124,   442,

-     292,    56,   203,    72,    73,    59,    72,    73,   124,   310,

-     414,   124,   377,    10,    11,   311,   121,   331,   244,   293,

-     122,   173,   378,   168,   415,   204,   205,   436,   289,   314,

-     162,   169,   175,   174,   176,    88,   332,   437,   124,   299,

-     177,    89,   443,   458,   416,   245,   341,   178,   179,   180,

-      71,   181,   444,   182,   170,   314,   417,    68,   153,    91,

-      92,   471,   183,   249,    72,    73,   432,    93,   171,   248,

-     154,   249,    57,   420,   219,   250,   472,   152,   433,   184,

-     185,   220,   424,   250,   347,   236,     1,     2,   348,    94,

-      95,   255,   237,   112,   256,   257,   113,   114,   258,    99,

-     100,   101,   102,    82,    96,    83,   259,   399,   400,   401,

-     402,   403,   404,   405,   406,   407,   408,   409,   410,    63,

-      64,    65,    66,    67,   260,    80,    78,    79,   367,   368,

-     369,   370,    10,    11,    72,    73,   217,   218,    71,   225,

-     379,   380,    81,    86,    84,    87,    98,   425,   143,   104,

-     152,   392,   150,   110,   138,   105,   106,   107,   412,   108,

-     141,   109,   136,   137,   215,   140,   222,   243,   156,    58,

-     -66,   268,   210,   159,   297,   216,   224,   229,   152,   213,

-     234,   235,   288,   347,   240,   241,   242,   247,   253,   265,

-     431,   270,   272,   273,   283,   284,   286,   295,   300,  -229,

-     290,   302,   304,   291,   306,   308,   327,   317,   318,   320,

-     334,   329,   335,   452,   337,   343,   340,   360,   350,   342,

-     349,   351,   362,   353,   354,   364,   372,   397,   355,   356,

-     357,   385,   358,   359,   366,   374,   375,   152,   392,   150,

-     376,   382,   386,   413,   152,   426,   347,   421,   422,   423,

-     428,   424,   438,   439,   445,   446,   449,   464,   447,   448,

-     459,   460,   347,   461,   462,   463,   466,   454,   465,   474,

-     469,   294,   142,   339,   282,   451,   435,   147,   226,   285,

-     214,   148,   309,     0,     0,     0,   269

-};

-

-static const yytype_int16 yycheck[] =

-{

-      89,    89,    89,     9,   124,   181,   106,   125,    23,   109,

-      23,    24,    98,    23,    24,   104,   382,   106,   171,   105,

-     109,   107,   108,    77,    23,    38,   162,     0,    38,     5,

-       6,     7,   185,    26,    10,   124,    12,    13,    14,    15,

-      16,    17,    18,    19,    20,    21,    22,   358,    38,    62,

-     203,   137,    62,    23,    24,    41,    42,   447,    25,   459,

-      73,   109,    62,    73,    31,    62,    33,    29,    38,   123,

-       8,   119,   472,    73,   464,    37,    73,    70,   108,   445,

-      65,    99,   136,    96,    99,   100,    96,   100,    50,   207,

-     100,    53,    62,    25,   230,   461,    82,   110,    60,    31,

-     110,   100,    69,    73,    71,   118,    96,   260,   118,   420,

-     228,    99,    74,   113,   114,   100,   113,   114,   118,    25,

-      26,   118,   109,    99,   100,    31,    96,    35,    29,   229,

-     100,    34,   119,    29,    40,    97,    98,   109,   224,    71,

-     229,    37,    28,    46,    30,   111,    54,   119,   118,   235,

-      36,   117,   109,   448,    60,    56,   276,    43,    44,    45,

-      99,    47,   119,    49,    60,    71,    72,   100,    27,    29,

-      30,   466,    58,    27,   113,   114,    34,    37,    74,    25,

-      39,    27,    99,   359,    61,    39,   106,   276,    46,    75,

-      76,    68,   112,    39,   283,    61,     3,     4,   284,    59,

-      60,    48,    68,   101,    51,    52,   104,   105,    55,   101,

-     102,   103,   104,     9,    74,    11,    63,    84,    85,    86,

-      87,    88,    89,    90,    91,    92,    93,    94,    95,    19,

-      20,    21,    22,    23,    81,   108,    26,    27,    77,    78,

-      79,    80,    99,   100,   113,   114,    23,    24,    99,   100,

-     113,   114,   108,   117,    99,   117,   109,   377,    23,   109,

-     349,   349,   349,   104,    99,   109,   109,   109,   354,   109,

-     100,   109,   109,   109,    99,   109,    23,    64,   111,    65,

-     111,    66,   111,   115,    83,   112,   109,   109,   377,   117,

-     109,   109,   112,   382,   111,   111,   111,   111,   111,   111,

-     386,   111,   111,   111,   109,   109,   117,   104,    23,   104,

-     116,    23,    23,   116,    23,    67,    23,   111,   111,   111,

-     111,    29,    23,   443,    23,   104,   110,    23,   110,   112,

-     118,   111,    23,   109,   109,    23,    23,    23,   112,   112,

-     112,   347,   112,   112,   112,   112,   112,   436,   436,   436,

-     112,   109,   109,    57,   443,    23,   445,   112,   112,   112,

-      23,   112,   112,    32,   109,   109,    66,   106,   111,   111,

-     111,   119,   461,   109,   109,   112,   106,   446,   112,   112,

-     462,   230,    87,   273,   210,   436,   388,    89,   159,   213,

-     139,    89,   253,    -1,    -1,    -1,   198

-};

-

-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing

-   symbol of state STATE-NUM.  */

-static const yytype_uint16 yystos[] =

-{

-       0,     3,     4,   121,   122,     0,   123,     8,   124,   125,

-      99,   100,   262,     5,     6,     7,    10,    12,    13,    14,

-      15,    16,    17,    18,    19,    20,    21,    22,   126,   127,

-     128,   129,   130,   131,   132,   133,   134,   135,   136,   137,

-     138,   141,   170,   171,   178,   179,   180,   242,   244,   245,

-     248,   261,   262,   108,   246,    99,    99,    99,    65,   100,

-     145,   151,   249,   145,   145,   145,   145,   145,   100,   146,

-     159,    99,   113,   114,   144,   166,   168,   241,   145,   145,

-     108,   108,     9,    11,    99,   247,   117,   117,   111,   117,

-     182,    29,    30,    37,    59,    60,    74,   250,   109,   101,

-     102,   103,   104,   164,   109,   109,   109,   109,   109,   109,

-     104,   161,   101,   104,   105,   163,    23,    24,    38,    62,

-      73,    96,   100,   110,   118,   150,   152,   172,   186,   189,

-     225,   229,   232,   236,   238,   239,   109,   109,    99,   243,

-     109,   100,   172,    23,   181,   185,   189,   225,   235,   237,

-     239,   240,   241,    27,    39,   251,   111,   255,   144,   115,

-     165,   142,   241,   144,   142,   144,   144,   142,    29,    37,

-      60,    74,   177,    34,    46,    28,    30,    36,    43,    44,

-      45,    47,    49,    58,    75,    76,   190,   192,   195,   197,

-     199,   203,   206,   208,   210,   212,   215,   224,    29,    37,

-      50,    53,    60,    74,    97,    98,   173,   150,   240,   163,

-     111,   150,   144,   117,   247,    99,   112,    23,    24,    61,

-      68,   252,    23,   258,   109,   100,   166,   167,   169,   109,

-     110,   143,   150,   238,   109,   109,    61,    68,   254,   255,

-     111,   111,   111,    64,    29,    56,   207,   111,    25,    27,

-      39,   196,   253,   111,   253,    48,    51,    52,    55,    63,

-      81,   219,    26,    70,   211,   111,   257,   255,    66,   254,

-     111,   255,   111,   111,   175,   163,   109,   119,    23,   153,

-     154,   155,   159,   109,   109,   249,   117,   183,   112,   144,

-     116,   116,   163,   142,   143,   104,   162,    83,   139,   144,

-      23,   233,    23,   234,    23,   209,    23,   202,    67,   202,

-      25,    31,    33,    69,    71,   191,   201,   111,   111,   220,

-     111,   255,    41,    42,    82,   216,   217,    23,   260,    29,

-     200,    35,    54,   204,   111,    23,   176,    23,   174,   176,

-     110,   240,   112,   104,   160,   147,   148,   241,   144,   118,

-     110,   111,   256,   109,   109,   112,   112,   112,   112,   112,

-      23,   223,    23,   221,    23,   222,   112,    77,    78,    79,

-      80,   205,    23,   218,   112,   112,   112,   109,   119,   113,

-     114,   156,   109,    23,   149,   262,   109,    62,    73,   184,

-     187,   188,   189,   226,   227,   230,   235,    23,   259,    84,

-      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,

-      95,   140,   144,    57,    26,    40,    60,    72,   193,   201,

-     253,   112,   112,   112,   112,   240,    23,   157,    23,   158,

-     148,   144,    34,    46,   213,   215,   109,   119,   112,    32,

-     194,   198,   201,   109,   119,   109,   109,   111,   111,    66,

-     214,   187,   240,   148,   139,   228,   233,   231,   234,   111,

-     119,   109,   109,   112,   106,   112,   106,   218,   148,   140,

-     233,   234,   106,   218,   112

-};

-

-#define yyerrok		(yyerrstatus = 0)

-#define yyclearin	(yychar = YYEMPTY)

-#define YYEMPTY		(-2)

-#define YYEOF		0

-

-#define YYACCEPT	goto yyacceptlab

-#define YYABORT		goto yyabortlab

-#define YYERROR		goto yyerrorlab

-

-

-/* Like YYERROR except do call yyerror.  This remains here temporarily

-   to ease the transition to the new meaning of YYERROR, for GCC.

-   Once GCC version 2 has supplanted version 1, this can go.  */

-

-#define YYFAIL		goto yyerrlab

-

-#define YYRECOVERING()  (!!yyerrstatus)

-

-#define YYBACKUP(Token, Value)					\

-do								\

-  if (yychar == YYEMPTY && yylen == 1)				\

-    {								\

-      yychar = (Token);						\

-      yylval = (Value);						\

-      yytoken = YYTRANSLATE (yychar);				\

-      YYPOPSTACK (1);						\

-      goto yybackup;						\

-    }								\

-  else								\

-    {								\

-      yyerror (&yylloc, state, YY_("syntax error: cannot back up")); \

-      YYERROR;							\

-    }								\

-while (YYID (0))

-

-

-#define YYTERROR	1

-#define YYERRCODE	256

-

-

-/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].

-   If N is 0, then set CURRENT to the empty location which ends

-   the previous symbol: RHS[0] (always defined).  */

-

-#define YYRHSLOC(Rhs, K) ((Rhs)[K])

-#ifndef YYLLOC_DEFAULT

-# define YYLLOC_DEFAULT(Current, Rhs, N)				\

-    do									\

-      if (YYID (N))                                                    \

-	{								\

-	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\

-	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\

-	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\

-	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\

-	}								\

-      else								\

-	{								\

-	  (Current).first_line   = (Current).last_line   =		\

-	    YYRHSLOC (Rhs, 0).last_line;				\

-	  (Current).first_column = (Current).last_column =		\

-	    YYRHSLOC (Rhs, 0).last_column;				\

-	}								\

-    while (YYID (0))

-#endif

-

-

-/* YY_LOCATION_PRINT -- Print the location on the stream.

-   This macro was not mandated originally: define only if we know

-   we won't break user code: when these are the locations we know.  */

-

-#ifndef YY_LOCATION_PRINT

-# if YYLTYPE_IS_TRIVIAL

-#  define YY_LOCATION_PRINT(File, Loc)			\

-     fprintf (File, "%d.%d-%d.%d",			\

-	      (Loc).first_line, (Loc).first_column,	\

-	      (Loc).last_line,  (Loc).last_column)

-# else

-#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)

-# endif

-#endif

-

-

-/* YYLEX -- calling `yylex' with the right arguments.  */

-

-#ifdef YYLEX_PARAM

-# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM)

-#else

-# define YYLEX yylex (&yylval, &yylloc, scanner)

-#endif

-

-/* Enable debugging if requested.  */

-#if YYDEBUG

-

-# ifndef YYFPRINTF

-#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */

-#  define YYFPRINTF fprintf

-# endif

-

-# define YYDPRINTF(Args)			\

-do {						\

-  if (yydebug)					\

-    YYFPRINTF Args;				\

-} while (YYID (0))

-

-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \

-do {									  \

-  if (yydebug)								  \

-    {									  \

-      YYFPRINTF (stderr, "%s ", Title);					  \

-      yy_symbol_print (stderr,						  \

-		  Type, Value, Location, state); \

-      YYFPRINTF (stderr, "\n");						  \

-    }									  \

-} while (YYID (0))

-

-

-/*--------------------------------.

-| Print this symbol on YYOUTPUT.  |

-`--------------------------------*/

-

-/*ARGSUSED*/

-#if (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-static void

-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, struct asm_parser_state *state)

-#else

-static void

-yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp, state)

-    FILE *yyoutput;

-    int yytype;

-    YYSTYPE const * const yyvaluep;

-    YYLTYPE const * const yylocationp;

-    struct asm_parser_state *state;

-#endif

-{

-  if (!yyvaluep)

-    return;

-  YYUSE (yylocationp);

-  YYUSE (state);

-# ifdef YYPRINT

-  if (yytype < YYNTOKENS)

-    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);

-# else

-  YYUSE (yyoutput);

-# endif

-  switch (yytype)

-    {

-      default:

-	break;

-    }

-}

-

-

-/*--------------------------------.

-| Print this symbol on YYOUTPUT.  |

-`--------------------------------*/

-

-#if (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-static void

-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, struct asm_parser_state *state)

-#else

-static void

-yy_symbol_print (yyoutput, yytype, yyvaluep, yylocationp, state)

-    FILE *yyoutput;

-    int yytype;

-    YYSTYPE const * const yyvaluep;

-    YYLTYPE const * const yylocationp;

-    struct asm_parser_state *state;

-#endif

-{

-  if (yytype < YYNTOKENS)

-    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);

-  else

-    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);

-

-  YY_LOCATION_PRINT (yyoutput, *yylocationp);

-  YYFPRINTF (yyoutput, ": ");

-  yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp, state);

-  YYFPRINTF (yyoutput, ")");

-}

-

-/*------------------------------------------------------------------.

-| yy_stack_print -- Print the state stack from its BOTTOM up to its |

-| TOP (included).                                                   |

-`------------------------------------------------------------------*/

-

-#if (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-static void

-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)

-#else

-static void

-yy_stack_print (yybottom, yytop)

-    yytype_int16 *yybottom;

-    yytype_int16 *yytop;

-#endif

-{

-  YYFPRINTF (stderr, "Stack now");

-  for (; yybottom <= yytop; yybottom++)

-    {

-      int yybot = *yybottom;

-      YYFPRINTF (stderr, " %d", yybot);

-    }

-  YYFPRINTF (stderr, "\n");

-}

-

-# define YY_STACK_PRINT(Bottom, Top)				\

-do {								\

-  if (yydebug)							\

-    yy_stack_print ((Bottom), (Top));				\

-} while (YYID (0))

-

-

-/*------------------------------------------------.

-| Report that the YYRULE is going to be reduced.  |

-`------------------------------------------------*/

-

-#if (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-static void

-yy_reduce_print (YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule, struct asm_parser_state *state)

-#else

-static void

-yy_reduce_print (yyvsp, yylsp, yyrule, state)

-    YYSTYPE *yyvsp;

-    YYLTYPE *yylsp;

-    int yyrule;

-    struct asm_parser_state *state;

-#endif

-{

-  int yynrhs = yyr2[yyrule];

-  int yyi;

-  unsigned long int yylno = yyrline[yyrule];

-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",

-	     yyrule - 1, yylno);

-  /* The symbols being reduced.  */

-  for (yyi = 0; yyi < yynrhs; yyi++)

-    {

-      YYFPRINTF (stderr, "   $%d = ", yyi + 1);

-      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],

-		       &(yyvsp[(yyi + 1) - (yynrhs)])

-		       , &(yylsp[(yyi + 1) - (yynrhs)])		       , state);

-      YYFPRINTF (stderr, "\n");

-    }

-}

-

-# define YY_REDUCE_PRINT(Rule)		\

-do {					\

-  if (yydebug)				\

-    yy_reduce_print (yyvsp, yylsp, Rule, state); \

-} while (YYID (0))

-

-/* Nonzero means print parse trace.  It is left uninitialized so that

-   multiple parsers can coexist.  */

-int yydebug;

-#else /* !YYDEBUG */

-# define YYDPRINTF(Args)

-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)

-# define YY_STACK_PRINT(Bottom, Top)

-# define YY_REDUCE_PRINT(Rule)

-#endif /* !YYDEBUG */

-

-

-/* YYINITDEPTH -- initial size of the parser's stacks.  */

-#ifndef	YYINITDEPTH

-# define YYINITDEPTH 200

-#endif

-

-/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only

-   if the built-in stack extension method is used).

-

-   Do not make this value too large; the results are undefined if

-   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)

-   evaluated with infinite-precision integer arithmetic.  */

-

-#ifndef YYMAXDEPTH

-# define YYMAXDEPTH 10000

-#endif

-

-

-

-#if YYERROR_VERBOSE

-

-# ifndef yystrlen

-#  if defined __GLIBC__ && defined _STRING_H

-#   define yystrlen strlen

-#  else

-/* Return the length of YYSTR.  */

-#if (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-static YYSIZE_T

-yystrlen (const char *yystr)

-#else

-static YYSIZE_T

-yystrlen (yystr)

-    const char *yystr;

-#endif

-{

-  YYSIZE_T yylen;

-  for (yylen = 0; yystr[yylen]; yylen++)

-    continue;

-  return yylen;

-}

-#  endif

-# endif

-

-# ifndef yystpcpy

-#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE

-#   define yystpcpy stpcpy

-#  else

-/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in

-   YYDEST.  */

-#if (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-static char *

-yystpcpy (char *yydest, const char *yysrc)

-#else

-static char *

-yystpcpy (yydest, yysrc)

-    char *yydest;

-    const char *yysrc;

-#endif

-{

-  char *yyd = yydest;

-  const char *yys = yysrc;

-

-  while ((*yyd++ = *yys++) != '\0')

-    continue;

-

-  return yyd - 1;

-}

-#  endif

-# endif

-

-# ifndef yytnamerr

-/* Copy to YYRES the contents of YYSTR after stripping away unnecessary

-   quotes and backslashes, so that it's suitable for yyerror.  The

-   heuristic is that double-quoting is unnecessary unless the string

-   contains an apostrophe, a comma, or backslash (other than

-   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is

-   null, do not copy; instead, return the length of what the result

-   would have been.  */

-static YYSIZE_T

-yytnamerr (char *yyres, const char *yystr)

-{

-  if (*yystr == '"')

-    {

-      YYSIZE_T yyn = 0;

-      char const *yyp = yystr;

-

-      for (;;)

-	switch (*++yyp)

-	  {

-	  case '\'':

-	  case ',':

-	    goto do_not_strip_quotes;

-

-	  case '\\':

-	    if (*++yyp != '\\')

-	      goto do_not_strip_quotes;

-	    /* Fall through.  */

-	  default:

-	    if (yyres)

-	      yyres[yyn] = *yyp;

-	    yyn++;

-	    break;

-

-	  case '"':

-	    if (yyres)

-	      yyres[yyn] = '\0';

-	    return yyn;

-	  }

-    do_not_strip_quotes: ;

-    }

-

-  if (! yyres)

-    return yystrlen (yystr);

-

-  return yystpcpy (yyres, yystr) - yyres;

-}

-# endif

-

-/* Copy into YYRESULT an error message about the unexpected token

-   YYCHAR while in state YYSTATE.  Return the number of bytes copied,

-   including the terminating null byte.  If YYRESULT is null, do not

-   copy anything; just return the number of bytes that would be

-   copied.  As a special case, return 0 if an ordinary "syntax error"

-   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during

-   size calculation.  */

-static YYSIZE_T

-yysyntax_error (char *yyresult, int yystate, int yychar)

-{

-  int yyn = yypact[yystate];

-

-  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))

-    return 0;

-  else

-    {

-      int yytype = YYTRANSLATE (yychar);

-      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);

-      YYSIZE_T yysize = yysize0;

-      YYSIZE_T yysize1;

-      int yysize_overflow = 0;

-      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };

-      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];

-      int yyx;

-

-# if 0

-      /* This is so xgettext sees the translatable formats that are

-	 constructed on the fly.  */

-      YY_("syntax error, unexpected %s");

-      YY_("syntax error, unexpected %s, expecting %s");

-      YY_("syntax error, unexpected %s, expecting %s or %s");

-      YY_("syntax error, unexpected %s, expecting %s or %s or %s");

-      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");

-# endif

-      char *yyfmt;

-      char const *yyf;

-      static char const yyunexpected[] = "syntax error, unexpected %s";

-      static char const yyexpecting[] = ", expecting %s";

-      static char const yyor[] = " or %s";

-      char yyformat[sizeof yyunexpected

-		    + sizeof yyexpecting - 1

-		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)

-		       * (sizeof yyor - 1))];

-      char const *yyprefix = yyexpecting;

-

-      /* Start YYX at -YYN if negative to avoid negative indexes in

-	 YYCHECK.  */

-      int yyxbegin = yyn < 0 ? -yyn : 0;

-

-      /* Stay within bounds of both yycheck and yytname.  */

-      int yychecklim = YYLAST - yyn + 1;

-      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;

-      int yycount = 1;

-

-      yyarg[0] = yytname[yytype];

-      yyfmt = yystpcpy (yyformat, yyunexpected);

-

-      for (yyx = yyxbegin; yyx < yyxend; ++yyx)

-	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)

-	  {

-	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)

-	      {

-		yycount = 1;

-		yysize = yysize0;

-		yyformat[sizeof yyunexpected - 1] = '\0';

-		break;

-	      }

-	    yyarg[yycount++] = yytname[yyx];

-	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);

-	    yysize_overflow |= (yysize1 < yysize);

-	    yysize = yysize1;

-	    yyfmt = yystpcpy (yyfmt, yyprefix);

-	    yyprefix = yyor;

-	  }

-

-      yyf = YY_(yyformat);

-      yysize1 = yysize + yystrlen (yyf);

-      yysize_overflow |= (yysize1 < yysize);

-      yysize = yysize1;

-

-      if (yysize_overflow)

-	return YYSIZE_MAXIMUM;

-

-      if (yyresult)

-	{

-	  /* Avoid sprintf, as that infringes on the user's name space.

-	     Don't have undefined behavior even if the translation

-	     produced a string with the wrong number of "%s"s.  */

-	  char *yyp = yyresult;

-	  int yyi = 0;

-	  while ((*yyp = *yyf) != '\0')

-	    {

-	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)

-		{

-		  yyp += yytnamerr (yyp, yyarg[yyi++]);

-		  yyf += 2;

-		}

-	      else

-		{

-		  yyp++;

-		  yyf++;

-		}

-	    }

-	}

-      return yysize;

-    }

-}

-#endif /* YYERROR_VERBOSE */

-

-

-/*-----------------------------------------------.

-| Release the memory associated to this symbol.  |

-`-----------------------------------------------*/

-

-/*ARGSUSED*/

-#if (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-static void

-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp, struct asm_parser_state *state)

-#else

-static void

-yydestruct (yymsg, yytype, yyvaluep, yylocationp, state)

-    const char *yymsg;

-    int yytype;

-    YYSTYPE *yyvaluep;

-    YYLTYPE *yylocationp;

-    struct asm_parser_state *state;

-#endif

-{

-  YYUSE (yyvaluep);

-  YYUSE (yylocationp);

-  YYUSE (state);

-

-  if (!yymsg)

-    yymsg = "Deleting";

-  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);

-

-  switch (yytype)

-    {

-

-      default:

-	break;

-    }

-}

-

-/* Prevent warnings from -Wmissing-prototypes.  */

-#ifdef YYPARSE_PARAM

-#if defined __STDC__ || defined __cplusplus

-int yyparse (void *YYPARSE_PARAM);

-#else

-int yyparse ();

-#endif

-#else /* ! YYPARSE_PARAM */

-#if defined __STDC__ || defined __cplusplus

-int yyparse (struct asm_parser_state *state);

-#else

-int yyparse ();

-#endif

-#endif /* ! YYPARSE_PARAM */

-

-

-

-

-

-/*-------------------------.

-| yyparse or yypush_parse.  |

-`-------------------------*/

-

-#ifdef YYPARSE_PARAM

-#if (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-int

-yyparse (void *YYPARSE_PARAM)

-#else

-int

-yyparse (YYPARSE_PARAM)

-    void *YYPARSE_PARAM;

-#endif

-#else /* ! YYPARSE_PARAM */

-#if (defined __STDC__ || defined __C99__FUNC__ \

-     || defined __cplusplus || defined _MSC_VER)

-int

-yyparse (struct asm_parser_state *state)

-#else

-int

-yyparse (state)

-    struct asm_parser_state *state;

-#endif

-#endif

-{

-/* The lookahead symbol.  */

-int yychar;

-

-/* The semantic value of the lookahead symbol.  */

-YYSTYPE yylval;

-

-/* Location data for the lookahead symbol.  */

-YYLTYPE yylloc;

-

-    /* Number of syntax errors so far.  */

-    int yynerrs;

-

-    int yystate;

-    /* Number of tokens to shift before error messages enabled.  */

-    int yyerrstatus;

-

-    /* The stacks and their tools:

-       `yyss': related to states.

-       `yyvs': related to semantic values.

-       `yyls': related to locations.

-

-       Refer to the stacks thru separate pointers, to allow yyoverflow

-       to reallocate them elsewhere.  */

-

-    /* The state stack.  */

-    yytype_int16 yyssa[YYINITDEPTH];

-    yytype_int16 *yyss;

-    yytype_int16 *yyssp;

-

-    /* The semantic value stack.  */

-    YYSTYPE yyvsa[YYINITDEPTH];

-    YYSTYPE *yyvs;

-    YYSTYPE *yyvsp;

-

-    /* The location stack.  */

-    YYLTYPE yylsa[YYINITDEPTH];

-    YYLTYPE *yyls;

-    YYLTYPE *yylsp;

-

-    /* The locations where the error started and ended.  */

-    YYLTYPE yyerror_range[2];

-

-    YYSIZE_T yystacksize;

-

-  int yyn;

-  int yyresult;

-  /* Lookahead token as an internal (translated) token number.  */

-  int yytoken;

-  /* The variables used to return semantic value and location from the

-     action routines.  */

-  YYSTYPE yyval;

-  YYLTYPE yyloc;

-

-#if YYERROR_VERBOSE

-  /* Buffer for error messages, and its allocated size.  */

-  char yymsgbuf[128];

-  char *yymsg = yymsgbuf;

-  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;

-#endif

-

-#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N), yylsp -= (N))

-

-  /* The number of symbols on the RHS of the reduced rule.

-     Keep to zero when no symbol should be popped.  */

-  int yylen = 0;

-

-  yytoken = 0;

-  yyss = yyssa;

-  yyvs = yyvsa;

-  yyls = yylsa;

-  yystacksize = YYINITDEPTH;

-

-  YYDPRINTF ((stderr, "Starting parse\n"));

-

-  yystate = 0;

-  yyerrstatus = 0;

-  yynerrs = 0;

-  yychar = YYEMPTY; /* Cause a token to be read.  */

-

-  /* Initialize stack pointers.

-     Waste one element of value and location stack

-     so that they stay on the same level as the state stack.

-     The wasted elements are never initialized.  */

-  yyssp = yyss;

-  yyvsp = yyvs;

-  yylsp = yyls;

-

-#if YYLTYPE_IS_TRIVIAL

-  /* Initialize the default location before parsing starts.  */

-  yylloc.first_line   = yylloc.last_line   = 1;

-  yylloc.first_column = yylloc.last_column = 1;

-#endif

-

-  goto yysetstate;

-

-/*------------------------------------------------------------.

-| yynewstate -- Push a new state, which is found in yystate.  |

-`------------------------------------------------------------*/

- yynewstate:

-  /* In all cases, when you get here, the value and location stacks

-     have just been pushed.  So pushing a state here evens the stacks.  */

-  yyssp++;

-

- yysetstate:

-  *yyssp = yystate;

-

-  if (yyss + yystacksize - 1 <= yyssp)

-    {

-      /* Get the current used size of the three stacks, in elements.  */

-      YYSIZE_T yysize = yyssp - yyss + 1;

-

-#ifdef yyoverflow

-      {

-	/* Give user a chance to reallocate the stack.  Use copies of

-	   these so that the &'s don't force the real ones into

-	   memory.  */

-	YYSTYPE *yyvs1 = yyvs;

-	yytype_int16 *yyss1 = yyss;

-	YYLTYPE *yyls1 = yyls;

-

-	/* Each stack pointer address is followed by the size of the

-	   data in use in that stack, in bytes.  This used to be a

-	   conditional around just the two extra args, but that might

-	   be undefined if yyoverflow is a macro.  */

-	yyoverflow (YY_("memory exhausted"),

-		    &yyss1, yysize * sizeof (*yyssp),

-		    &yyvs1, yysize * sizeof (*yyvsp),

-		    &yyls1, yysize * sizeof (*yylsp),

-		    &yystacksize);

-

-	yyls = yyls1;

-	yyss = yyss1;

-	yyvs = yyvs1;

-      }

-#else /* no yyoverflow */

-# ifndef YYSTACK_RELOCATE

-      goto yyexhaustedlab;

-# else

-      /* Extend the stack our own way.  */

-      if (YYMAXDEPTH <= yystacksize)

-	goto yyexhaustedlab;

-      yystacksize *= 2;

-      if (YYMAXDEPTH < yystacksize)

-	yystacksize = YYMAXDEPTH;

-

-      {

-	yytype_int16 *yyss1 = yyss;

-	union yyalloc *yyptr =

-	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));

-	if (! yyptr)

-	  goto yyexhaustedlab;

-	YYSTACK_RELOCATE (yyss_alloc, yyss);

-	YYSTACK_RELOCATE (yyvs_alloc, yyvs);

-	YYSTACK_RELOCATE (yyls_alloc, yyls);

-#  undef YYSTACK_RELOCATE

-	if (yyss1 != yyssa)

-	  YYSTACK_FREE (yyss1);

-      }

-# endif

-#endif /* no yyoverflow */

-

-      yyssp = yyss + yysize - 1;

-      yyvsp = yyvs + yysize - 1;

-      yylsp = yyls + yysize - 1;

-

-      YYDPRINTF ((stderr, "Stack size increased to %lu\n",

-		  (unsigned long int) yystacksize));

-

-      if (yyss + yystacksize - 1 <= yyssp)

-	YYABORT;

-    }

-

-  YYDPRINTF ((stderr, "Entering state %d\n", yystate));

-

-  if (yystate == YYFINAL)

-    YYACCEPT;

-

-  goto yybackup;

-

-/*-----------.

-| yybackup.  |

-`-----------*/

-yybackup:

-

-  /* Do appropriate processing given the current state.  Read a

-     lookahead token if we need one and don't already have one.  */

-

-  /* First try to decide what to do without reference to lookahead token.  */

-  yyn = yypact[yystate];

-  if (yyn == YYPACT_NINF)

-    goto yydefault;

-

-  /* Not known => get a lookahead token if don't already have one.  */

-

-  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */

-  if (yychar == YYEMPTY)

-    {

-      YYDPRINTF ((stderr, "Reading a token: "));

-      yychar = YYLEX;

-    }

-

-  if (yychar <= YYEOF)

-    {

-      yychar = yytoken = YYEOF;

-      YYDPRINTF ((stderr, "Now at end of input.\n"));

-    }

-  else

-    {

-      yytoken = YYTRANSLATE (yychar);

-      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);

-    }

-

-  /* If the proper action on seeing token YYTOKEN is to reduce or to

-     detect an error, take that action.  */

-  yyn += yytoken;

-  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)

-    goto yydefault;

-  yyn = yytable[yyn];

-  if (yyn <= 0)

-    {

-      if (yyn == 0 || yyn == YYTABLE_NINF)

-	goto yyerrlab;

-      yyn = -yyn;

-      goto yyreduce;

-    }

-

-  /* Count tokens shifted since error; after three, turn off error

-     status.  */

-  if (yyerrstatus)

-    yyerrstatus--;

-

-  /* Shift the lookahead token.  */

-  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);

-

-  /* Discard the shifted token.  */

-  yychar = YYEMPTY;

-

-  yystate = yyn;

-  *++yyvsp = yylval;

-  *++yylsp = yylloc;

-  goto yynewstate;

-

-

-/*-----------------------------------------------------------.

-| yydefault -- do the default action for the current state.  |

-`-----------------------------------------------------------*/

-yydefault:

-  yyn = yydefact[yystate];

-  if (yyn == 0)

-    goto yyerrlab;

-  goto yyreduce;

-

-

-/*-----------------------------.

-| yyreduce -- Do a reduction.  |

-`-----------------------------*/

-yyreduce:

-  /* yyn is the number of a rule to reduce with.  */

-  yylen = yyr2[yyn];

-

-  /* If YYLEN is nonzero, implement the default value of the action:

-     `$$ = $1'.

-

-     Otherwise, the following line sets YYVAL to garbage.

-     This behavior is undocumented and Bison

-     users should not rely upon it.  Assigning to YYVAL

-     unconditionally makes the parser a bit smaller, and it avoids a

-     GCC warning that YYVAL may be used uninitialized.  */

-  yyval = yyvsp[1-yylen];

-

-  /* Default location.  */

-  YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);

-  YY_REDUCE_PRINT (yyn);

-  switch (yyn)

-    {

-        case 3:

-

-/* Line 1455 of yacc.c  */

-#line 282 "program_parse.y"

-    {

-	   if (state->prog->Target != GL_VERTEX_PROGRAM_ARB) {

-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid fragment program header");

-

-	   }

-	   state->mode = ARB_vertex;

-	;}

-    break;

-

-  case 4:

-

-/* Line 1455 of yacc.c  */

-#line 290 "program_parse.y"

-    {

-	   if (state->prog->Target != GL_FRAGMENT_PROGRAM_ARB) {

-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid vertex program header");

-	   }

-	   state->mode = ARB_fragment;

-

-	   state->option.TexRect =

-	      (state->ctx->Extensions.NV_texture_rectangle != GL_FALSE);

-	;}

-    break;

-

-  case 7:

-

-/* Line 1455 of yacc.c  */

-#line 306 "program_parse.y"

-    {

-	   int valid = 0;

-

-	   if (state->mode == ARB_vertex) {

-	      valid = _mesa_ARBvp_parse_option(state, (yyvsp[(2) - (3)].string));

-	   } else if (state->mode == ARB_fragment) {

-	      valid = _mesa_ARBfp_parse_option(state, (yyvsp[(2) - (3)].string));

-	   }

-

-

-	   free((yyvsp[(2) - (3)].string));

-

-	   if (!valid) {

-	      const char *const err_str = (state->mode == ARB_vertex)

-		 ? "invalid ARB vertex program option"

-		 : "invalid ARB fragment program option";

-

-	      yyerror(& (yylsp[(2) - (3)]), state, err_str);

-	      YYERROR;

-	   }

-	;}

-    break;

-

-  case 10:

-

-/* Line 1455 of yacc.c  */

-#line 334 "program_parse.y"

-    {

-	   if ((yyvsp[(1) - (2)].inst) != NULL) {

-	      if (state->inst_tail == NULL) {

-		 state->inst_head = (yyvsp[(1) - (2)].inst);

-	      } else {

-		 state->inst_tail->next = (yyvsp[(1) - (2)].inst);

-	      }

-

-	      state->inst_tail = (yyvsp[(1) - (2)].inst);

-	      (yyvsp[(1) - (2)].inst)->next = NULL;

-

-	      state->prog->NumInstructions++;

-	   }

-	;}

-    break;

-

-  case 12:

-

-/* Line 1455 of yacc.c  */

-#line 352 "program_parse.y"

-    {

-	   (yyval.inst) = (yyvsp[(1) - (1)].inst);

-	   state->prog->NumAluInstructions++;

-	;}

-    break;

-

-  case 13:

-

-/* Line 1455 of yacc.c  */

-#line 357 "program_parse.y"

-    {

-	   (yyval.inst) = (yyvsp[(1) - (1)].inst);

-	   state->prog->NumTexInstructions++;

-	;}

-    break;

-

-  case 24:

-

-/* Line 1455 of yacc.c  */

-#line 378 "program_parse.y"

-    {

-	   (yyval.inst) = asm_instruction_ctor(OPCODE_ARL, & (yyvsp[(2) - (4)].dst_reg), & (yyvsp[(4) - (4)].src_reg), NULL, NULL);

-	;}

-    break;

-

-  case 25:

-

-/* Line 1455 of yacc.c  */

-#line 384 "program_parse.y"

-    {

-	   (yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (4)].temp_inst), & (yyvsp[(2) - (4)].dst_reg), & (yyvsp[(4) - (4)].src_reg), NULL, NULL);

-	;}

-    break;

-

-  case 26:

-

-/* Line 1455 of yacc.c  */

-#line 390 "program_parse.y"

-    {

-	   (yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (4)].temp_inst), & (yyvsp[(2) - (4)].dst_reg), & (yyvsp[(4) - (4)].src_reg), NULL, NULL);

-	;}

-    break;

-

-  case 27:

-

-/* Line 1455 of yacc.c  */

-#line 396 "program_parse.y"

-    {

-	   (yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (6)].temp_inst), & (yyvsp[(2) - (6)].dst_reg), & (yyvsp[(4) - (6)].src_reg), & (yyvsp[(6) - (6)].src_reg), NULL);

-	;}

-    break;

-

-  case 28:

-

-/* Line 1455 of yacc.c  */

-#line 403 "program_parse.y"

-    {

-	   (yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (6)].temp_inst), & (yyvsp[(2) - (6)].dst_reg), & (yyvsp[(4) - (6)].src_reg), & (yyvsp[(6) - (6)].src_reg), NULL);

-	;}

-    break;

-

-  case 29:

-

-/* Line 1455 of yacc.c  */

-#line 410 "program_parse.y"

-    {

-	   (yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (8)].temp_inst), & (yyvsp[(2) - (8)].dst_reg), & (yyvsp[(4) - (8)].src_reg), & (yyvsp[(6) - (8)].src_reg), & (yyvsp[(8) - (8)].src_reg));

-	;}

-    break;

-

-  case 30:

-

-/* Line 1455 of yacc.c  */

-#line 416 "program_parse.y"

-    {

-	   (yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (8)].temp_inst), & (yyvsp[(2) - (8)].dst_reg), & (yyvsp[(4) - (8)].src_reg), NULL, NULL);

-	   if ((yyval.inst) != NULL) {

-	      const GLbitfield tex_mask = (1U << (yyvsp[(6) - (8)].integer));

-	      GLbitfield shadow_tex = 0;

-	      GLbitfield target_mask = 0;

-

-

-	      (yyval.inst)->Base.TexSrcUnit = (yyvsp[(6) - (8)].integer);

-

-	      if ((yyvsp[(8) - (8)].integer) < 0) {

-		 shadow_tex = tex_mask;

-

-		 (yyval.inst)->Base.TexSrcTarget = -(yyvsp[(8) - (8)].integer);

-		 (yyval.inst)->Base.TexShadow = 1;

-	      } else {

-		 (yyval.inst)->Base.TexSrcTarget = (yyvsp[(8) - (8)].integer);

-	      }

-

-	      target_mask = (1U << (yyval.inst)->Base.TexSrcTarget);

-

-	      /* If this texture unit was previously accessed and that access

-	       * had a different texture target, generate an error.

-	       *

-	       * If this texture unit was previously accessed and that access

-	       * had a different shadow mode, generate an error.

-	       */

-	      if ((state->prog->TexturesUsed[(yyvsp[(6) - (8)].integer)] != 0)

-		  && ((state->prog->TexturesUsed[(yyvsp[(6) - (8)].integer)] != target_mask)

-		      || ((state->prog->ShadowSamplers & tex_mask)

-			  != shadow_tex))) {

-		 yyerror(& (yylsp[(8) - (8)]), state,

-			 "multiple targets used on one texture image unit");

-		 YYERROR;

-	      }

-

-

-	      state->prog->TexturesUsed[(yyvsp[(6) - (8)].integer)] |= target_mask;

-	      state->prog->ShadowSamplers |= shadow_tex;

-	   }

-	;}

-    break;

-

-  case 31:

-

-/* Line 1455 of yacc.c  */

-#line 460 "program_parse.y"

-    {

-	   (yyval.inst) = asm_instruction_ctor(OPCODE_KIL, NULL, & (yyvsp[(2) - (2)].src_reg), NULL, NULL);

-	   state->fragment.UsesKill = 1;

-	;}

-    break;

-

-  case 32:

-

-/* Line 1455 of yacc.c  */

-#line 465 "program_parse.y"

-    {

-	   (yyval.inst) = asm_instruction_ctor(OPCODE_KIL_NV, NULL, NULL, NULL, NULL);

-	   (yyval.inst)->Base.DstReg.CondMask = (yyvsp[(2) - (2)].dst_reg).CondMask;

-	   (yyval.inst)->Base.DstReg.CondSwizzle = (yyvsp[(2) - (2)].dst_reg).CondSwizzle;

-	   (yyval.inst)->Base.DstReg.CondSrc = (yyvsp[(2) - (2)].dst_reg).CondSrc;

-	   state->fragment.UsesKill = 1;

-	;}

-    break;

-

-  case 33:

-

-/* Line 1455 of yacc.c  */

-#line 475 "program_parse.y"

-    {

-	   (yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (12)].temp_inst), & (yyvsp[(2) - (12)].dst_reg), & (yyvsp[(4) - (12)].src_reg), & (yyvsp[(6) - (12)].src_reg), & (yyvsp[(8) - (12)].src_reg));

-	   if ((yyval.inst) != NULL) {

-	      const GLbitfield tex_mask = (1U << (yyvsp[(10) - (12)].integer));

-	      GLbitfield shadow_tex = 0;

-	      GLbitfield target_mask = 0;

-

-

-	      (yyval.inst)->Base.TexSrcUnit = (yyvsp[(10) - (12)].integer);

-

-	      if ((yyvsp[(12) - (12)].integer) < 0) {

-		 shadow_tex = tex_mask;

-

-		 (yyval.inst)->Base.TexSrcTarget = -(yyvsp[(12) - (12)].integer);

-		 (yyval.inst)->Base.TexShadow = 1;

-	      } else {

-		 (yyval.inst)->Base.TexSrcTarget = (yyvsp[(12) - (12)].integer);

-	      }

-

-	      target_mask = (1U << (yyval.inst)->Base.TexSrcTarget);

-

-	      /* If this texture unit was previously accessed and that access

-	       * had a different texture target, generate an error.

-	       *

-	       * If this texture unit was previously accessed and that access

-	       * had a different shadow mode, generate an error.

-	       */

-	      if ((state->prog->TexturesUsed[(yyvsp[(10) - (12)].integer)] != 0)

-		  && ((state->prog->TexturesUsed[(yyvsp[(10) - (12)].integer)] != target_mask)

-		      || ((state->prog->ShadowSamplers & tex_mask)

-			  != shadow_tex))) {

-		 yyerror(& (yylsp[(12) - (12)]), state,

-			 "multiple targets used on one texture image unit");

-		 YYERROR;

-	      }

-

-

-	      state->prog->TexturesUsed[(yyvsp[(10) - (12)].integer)] |= target_mask;

-	      state->prog->ShadowSamplers |= shadow_tex;

-	   }

-	;}

-    break;

-

-  case 34:

-

-/* Line 1455 of yacc.c  */

-#line 519 "program_parse.y"

-    {

-	   (yyval.integer) = (yyvsp[(2) - (2)].integer);

-	;}

-    break;

-

-  case 35:

-

-/* Line 1455 of yacc.c  */

-#line 524 "program_parse.y"

-    { (yyval.integer) = TEXTURE_1D_INDEX; ;}

-    break;

-

-  case 36:

-

-/* Line 1455 of yacc.c  */

-#line 525 "program_parse.y"

-    { (yyval.integer) = TEXTURE_2D_INDEX; ;}

-    break;

-

-  case 37:

-

-/* Line 1455 of yacc.c  */

-#line 526 "program_parse.y"

-    { (yyval.integer) = TEXTURE_3D_INDEX; ;}

-    break;

-

-  case 38:

-

-/* Line 1455 of yacc.c  */

-#line 527 "program_parse.y"

-    { (yyval.integer) = TEXTURE_CUBE_INDEX; ;}

-    break;

-

-  case 39:

-

-/* Line 1455 of yacc.c  */

-#line 528 "program_parse.y"

-    { (yyval.integer) = TEXTURE_RECT_INDEX; ;}

-    break;

-

-  case 40:

-

-/* Line 1455 of yacc.c  */

-#line 529 "program_parse.y"

-    { (yyval.integer) = -TEXTURE_1D_INDEX; ;}

-    break;

-

-  case 41:

-

-/* Line 1455 of yacc.c  */

-#line 530 "program_parse.y"

-    { (yyval.integer) = -TEXTURE_2D_INDEX; ;}

-    break;

-

-  case 42:

-

-/* Line 1455 of yacc.c  */

-#line 531 "program_parse.y"

-    { (yyval.integer) = -TEXTURE_RECT_INDEX; ;}

-    break;

-

-  case 43:

-

-/* Line 1455 of yacc.c  */

-#line 532 "program_parse.y"

-    { (yyval.integer) = TEXTURE_1D_ARRAY_INDEX; ;}

-    break;

-

-  case 44:

-

-/* Line 1455 of yacc.c  */

-#line 533 "program_parse.y"

-    { (yyval.integer) = TEXTURE_2D_ARRAY_INDEX; ;}

-    break;

-

-  case 45:

-

-/* Line 1455 of yacc.c  */

-#line 534 "program_parse.y"

-    { (yyval.integer) = -TEXTURE_1D_ARRAY_INDEX; ;}

-    break;

-

-  case 46:

-

-/* Line 1455 of yacc.c  */

-#line 535 "program_parse.y"

-    { (yyval.integer) = -TEXTURE_2D_ARRAY_INDEX; ;}

-    break;

-

-  case 47:

-

-/* Line 1455 of yacc.c  */

-#line 539 "program_parse.y"

-    {

-	   /* FIXME: Is this correct?  Should the extenedSwizzle be applied

-	    * FIXME: to the existing swizzle?

-	    */

-	   (yyvsp[(4) - (6)].src_reg).Base.Swizzle = (yyvsp[(6) - (6)].swiz_mask).swizzle;

-	   (yyvsp[(4) - (6)].src_reg).Base.Negate = (yyvsp[(6) - (6)].swiz_mask).mask;

-

-	   (yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (6)].temp_inst), & (yyvsp[(2) - (6)].dst_reg), & (yyvsp[(4) - (6)].src_reg), NULL, NULL);

-	;}

-    break;

-

-  case 48:

-

-/* Line 1455 of yacc.c  */

-#line 551 "program_parse.y"

-    {

-	   (yyval.src_reg) = (yyvsp[(2) - (2)].src_reg);

-

-	   if ((yyvsp[(1) - (2)].negate)) {

-	      (yyval.src_reg).Base.Negate = ~(yyval.src_reg).Base.Negate;

-	   }

-	;}

-    break;

-

-  case 49:

-

-/* Line 1455 of yacc.c  */

-#line 559 "program_parse.y"

-    {

-	   (yyval.src_reg) = (yyvsp[(3) - (4)].src_reg);

-

-	   if (!state->option.NV_fragment) {

-	      yyerror(& (yylsp[(2) - (4)]), state, "unexpected character '|'");

-	      YYERROR;

-	   }

-

-	   if ((yyvsp[(1) - (4)].negate)) {

-	      (yyval.src_reg).Base.Negate = ~(yyval.src_reg).Base.Negate;

-	   }

-

-	   (yyval.src_reg).Base.Abs = 1;

-	;}

-    break;

-

-  case 50:

-

-/* Line 1455 of yacc.c  */

-#line 576 "program_parse.y"

-    {

-	   (yyval.src_reg) = (yyvsp[(1) - (2)].src_reg);

-

-	   (yyval.src_reg).Base.Swizzle = _mesa_combine_swizzles((yyval.src_reg).Base.Swizzle,

-						    (yyvsp[(2) - (2)].swiz_mask).swizzle);

-	;}

-    break;

-

-  case 51:

-

-/* Line 1455 of yacc.c  */

-#line 583 "program_parse.y"

-    {

-	   struct asm_symbol temp_sym;

-

-	   if (!state->option.NV_fragment) {

-	      yyerror(& (yylsp[(1) - (1)]), state, "expected scalar suffix");

-	      YYERROR;

-	   }

-

-	   memset(& temp_sym, 0, sizeof(temp_sym));

-	   temp_sym.param_binding_begin = ~0;

-	   initialize_symbol_from_const(state->prog, & temp_sym, & (yyvsp[(1) - (1)].vector), GL_TRUE);

-

-	   set_src_reg_swz(& (yyval.src_reg), PROGRAM_CONSTANT,

-                           temp_sym.param_binding_begin,

-                           temp_sym.param_binding_swizzle);

-	;}

-    break;

-

-  case 52:

-

-/* Line 1455 of yacc.c  */

-#line 602 "program_parse.y"

-    {

-	   (yyval.src_reg) = (yyvsp[(2) - (3)].src_reg);

-

-	   if ((yyvsp[(1) - (3)].negate)) {

-	      (yyval.src_reg).Base.Negate = ~(yyval.src_reg).Base.Negate;

-	   }

-

-	   (yyval.src_reg).Base.Swizzle = _mesa_combine_swizzles((yyval.src_reg).Base.Swizzle,

-						    (yyvsp[(3) - (3)].swiz_mask).swizzle);

-	;}

-    break;

-

-  case 53:

-

-/* Line 1455 of yacc.c  */

-#line 613 "program_parse.y"

-    {

-	   (yyval.src_reg) = (yyvsp[(3) - (5)].src_reg);

-

-	   if (!state->option.NV_fragment) {

-	      yyerror(& (yylsp[(2) - (5)]), state, "unexpected character '|'");

-	      YYERROR;

-	   }

-

-	   if ((yyvsp[(1) - (5)].negate)) {

-	      (yyval.src_reg).Base.Negate = ~(yyval.src_reg).Base.Negate;

-	   }

-

-	   (yyval.src_reg).Base.Abs = 1;

-	   (yyval.src_reg).Base.Swizzle = _mesa_combine_swizzles((yyval.src_reg).Base.Swizzle,

-						    (yyvsp[(4) - (5)].swiz_mask).swizzle);

-	;}

-    break;

-

-  case 54:

-

-/* Line 1455 of yacc.c  */

-#line 633 "program_parse.y"

-    {

-	   (yyval.dst_reg) = (yyvsp[(1) - (3)].dst_reg);

-	   (yyval.dst_reg).WriteMask = (yyvsp[(2) - (3)].swiz_mask).mask;

-	   (yyval.dst_reg).CondMask = (yyvsp[(3) - (3)].dst_reg).CondMask;

-	   (yyval.dst_reg).CondSwizzle = (yyvsp[(3) - (3)].dst_reg).CondSwizzle;

-	   (yyval.dst_reg).CondSrc = (yyvsp[(3) - (3)].dst_reg).CondSrc;

-

-	   if ((yyval.dst_reg).File == PROGRAM_OUTPUT) {

-	      /* Technically speaking, this should check that it is in

-	       * vertex program mode.  However, PositionInvariant can never be

-	       * set in fragment program mode, so it is somewhat irrelevant.

-	       */

-	      if (state->option.PositionInvariant

-	       && ((yyval.dst_reg).Index == VERT_RESULT_HPOS)) {

-		 yyerror(& (yylsp[(1) - (3)]), state, "position-invariant programs cannot "

-			 "write position");

-		 YYERROR;

-	      }

-

-	      state->prog->OutputsWritten |= BITFIELD64_BIT((yyval.dst_reg).Index);

-	   }

-	;}

-    break;

-

-  case 55:

-

-/* Line 1455 of yacc.c  */

-#line 658 "program_parse.y"

-    {

-	   set_dst_reg(& (yyval.dst_reg), PROGRAM_ADDRESS, 0);

-	   (yyval.dst_reg).WriteMask = (yyvsp[(2) - (2)].swiz_mask).mask;

-	;}

-    break;

-

-  case 56:

-

-/* Line 1455 of yacc.c  */

-#line 665 "program_parse.y"

-    {

-	   const unsigned xyzw_valid =

-	      ((yyvsp[(1) - (7)].ext_swizzle).xyzw_valid << 0)

-	      | ((yyvsp[(3) - (7)].ext_swizzle).xyzw_valid << 1)

-	      | ((yyvsp[(5) - (7)].ext_swizzle).xyzw_valid << 2)

-	      | ((yyvsp[(7) - (7)].ext_swizzle).xyzw_valid << 3);

-	   const unsigned rgba_valid =

-	      ((yyvsp[(1) - (7)].ext_swizzle).rgba_valid << 0)

-	      | ((yyvsp[(3) - (7)].ext_swizzle).rgba_valid << 1)

-	      | ((yyvsp[(5) - (7)].ext_swizzle).rgba_valid << 2)

-	      | ((yyvsp[(7) - (7)].ext_swizzle).rgba_valid << 3);

-

-	   /* All of the swizzle components have to be valid in either RGBA

-	    * or XYZW.  Note that 0 and 1 are valid in both, so both masks

-	    * can have some bits set.

-	    *

-	    * We somewhat deviate from the spec here.  It would be really hard

-	    * to figure out which component is the error, and there probably

-	    * isn't a lot of benefit.

-	    */

-	   if ((rgba_valid != 0x0f) && (xyzw_valid != 0x0f)) {

-	      yyerror(& (yylsp[(1) - (7)]), state, "cannot combine RGBA and XYZW swizzle "

-		      "components");

-	      YYERROR;

-	   }

-

-	   (yyval.swiz_mask).swizzle = MAKE_SWIZZLE4((yyvsp[(1) - (7)].ext_swizzle).swz, (yyvsp[(3) - (7)].ext_swizzle).swz, (yyvsp[(5) - (7)].ext_swizzle).swz, (yyvsp[(7) - (7)].ext_swizzle).swz);

-	   (yyval.swiz_mask).mask = ((yyvsp[(1) - (7)].ext_swizzle).negate) | ((yyvsp[(3) - (7)].ext_swizzle).negate << 1) | ((yyvsp[(5) - (7)].ext_swizzle).negate << 2)

-	      | ((yyvsp[(7) - (7)].ext_swizzle).negate << 3);

-	;}

-    break;

-

-  case 57:

-

-/* Line 1455 of yacc.c  */

-#line 698 "program_parse.y"

-    {

-	   (yyval.ext_swizzle) = (yyvsp[(2) - (2)].ext_swizzle);

-	   (yyval.ext_swizzle).negate = ((yyvsp[(1) - (2)].negate)) ? 1 : 0;

-	;}

-    break;

-

-  case 58:

-

-/* Line 1455 of yacc.c  */

-#line 705 "program_parse.y"

-    {

-	   if (((yyvsp[(1) - (1)].integer) != 0) && ((yyvsp[(1) - (1)].integer) != 1)) {

-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid extended swizzle selector");

-	      YYERROR;

-	   }

-

-	   (yyval.ext_swizzle).swz = ((yyvsp[(1) - (1)].integer) == 0) ? SWIZZLE_ZERO : SWIZZLE_ONE;

-

-	   /* 0 and 1 are valid for both RGBA swizzle names and XYZW

-	    * swizzle names.

-	    */

-	   (yyval.ext_swizzle).xyzw_valid = 1;

-	   (yyval.ext_swizzle).rgba_valid = 1;

-	;}

-    break;

-

-  case 59:

-

-/* Line 1455 of yacc.c  */

-#line 720 "program_parse.y"

-    {

-	   char s;

-

-	   if (strlen((yyvsp[(1) - (1)].string)) > 1) {

-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid extended swizzle selector");

-	      YYERROR;

-	   }

-

-	   s = (yyvsp[(1) - (1)].string)[0];

-	   free((yyvsp[(1) - (1)].string));

-

-	   switch (s) {

-	   case 'x':

-	      (yyval.ext_swizzle).swz = SWIZZLE_X;

-	      (yyval.ext_swizzle).xyzw_valid = 1;

-	      break;

-	   case 'y':

-	      (yyval.ext_swizzle).swz = SWIZZLE_Y;

-	      (yyval.ext_swizzle).xyzw_valid = 1;

-	      break;

-	   case 'z':

-	      (yyval.ext_swizzle).swz = SWIZZLE_Z;

-	      (yyval.ext_swizzle).xyzw_valid = 1;

-	      break;

-	   case 'w':

-	      (yyval.ext_swizzle).swz = SWIZZLE_W;

-	      (yyval.ext_swizzle).xyzw_valid = 1;

-	      break;

-

-	   case 'r':

-	      (yyval.ext_swizzle).swz = SWIZZLE_X;

-	      (yyval.ext_swizzle).rgba_valid = 1;

-	      break;

-	   case 'g':

-	      (yyval.ext_swizzle).swz = SWIZZLE_Y;

-	      (yyval.ext_swizzle).rgba_valid = 1;

-	      break;

-	   case 'b':

-	      (yyval.ext_swizzle).swz = SWIZZLE_Z;

-	      (yyval.ext_swizzle).rgba_valid = 1;

-	      break;

-	   case 'a':

-	      (yyval.ext_swizzle).swz = SWIZZLE_W;

-	      (yyval.ext_swizzle).rgba_valid = 1;

-	      break;

-

-	   default:

-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid extended swizzle selector");

-	      YYERROR;

-	      break;

-	   }

-	;}

-    break;

-

-  case 60:

-

-/* Line 1455 of yacc.c  */

-#line 775 "program_parse.y"

-    {

-	   struct asm_symbol *const s = (struct asm_symbol *)

-	      _mesa_symbol_table_find_symbol(state->st, 0, (yyvsp[(1) - (1)].string));

-

-	   free((yyvsp[(1) - (1)].string));

-

-	   if (s == NULL) {

-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid operand variable");

-	      YYERROR;

-	   } else if ((s->type != at_param) && (s->type != at_temp)

-		      && (s->type != at_attrib)) {

-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid operand variable");

-	      YYERROR;

-	   } else if ((s->type == at_param) && s->param_is_array) {

-	      yyerror(& (yylsp[(1) - (1)]), state, "non-array access to array PARAM");

-	      YYERROR;

-	   }

-

-	   init_src_reg(& (yyval.src_reg));

-	   switch (s->type) {

-	   case at_temp:

-	      set_src_reg(& (yyval.src_reg), PROGRAM_TEMPORARY, s->temp_binding);

-	      break;

-	   case at_param:

-              set_src_reg_swz(& (yyval.src_reg), s->param_binding_type,

-                              s->param_binding_begin,

-                              s->param_binding_swizzle);

-	      break;

-	   case at_attrib:

-	      set_src_reg(& (yyval.src_reg), PROGRAM_INPUT, s->attrib_binding);

-	      state->prog->InputsRead |= (1U << (yyval.src_reg).Base.Index);

-

-	      if (!validate_inputs(& (yylsp[(1) - (1)]), state)) {

-		 YYERROR;

-	      }

-	      break;

-

-	   default:

-	      YYERROR;

-	      break;

-	   }

-	;}

-    break;

-

-  case 61:

-

-/* Line 1455 of yacc.c  */

-#line 818 "program_parse.y"

-    {

-	   set_src_reg(& (yyval.src_reg), PROGRAM_INPUT, (yyvsp[(1) - (1)].attrib));

-	   state->prog->InputsRead |= (1U << (yyval.src_reg).Base.Index);

-

-	   if (!validate_inputs(& (yylsp[(1) - (1)]), state)) {

-	      YYERROR;

-	   }

-	;}

-    break;

-

-  case 62:

-

-/* Line 1455 of yacc.c  */

-#line 827 "program_parse.y"

-    {

-	   if (! (yyvsp[(3) - (4)].src_reg).Base.RelAddr

-	       && ((unsigned) (yyvsp[(3) - (4)].src_reg).Base.Index >= (yyvsp[(1) - (4)].sym)->param_binding_length)) {

-	      yyerror(& (yylsp[(3) - (4)]), state, "out of bounds array access");

-	      YYERROR;

-	   }

-

-	   init_src_reg(& (yyval.src_reg));

-	   (yyval.src_reg).Base.File = (yyvsp[(1) - (4)].sym)->param_binding_type;

-

-	   if ((yyvsp[(3) - (4)].src_reg).Base.RelAddr) {

-              state->prog->IndirectRegisterFiles |= (1 << (yyval.src_reg).Base.File);

-	      (yyvsp[(1) - (4)].sym)->param_accessed_indirectly = 1;

-

-	      (yyval.src_reg).Base.RelAddr = 1;

-	      (yyval.src_reg).Base.Index = (yyvsp[(3) - (4)].src_reg).Base.Index;

-	      (yyval.src_reg).Symbol = (yyvsp[(1) - (4)].sym);

-	   } else {

-	      (yyval.src_reg).Base.Index = (yyvsp[(1) - (4)].sym)->param_binding_begin + (yyvsp[(3) - (4)].src_reg).Base.Index;

-	   }

-	;}

-    break;

-

-  case 63:

-

-/* Line 1455 of yacc.c  */

-#line 849 "program_parse.y"

-    {

-           gl_register_file file = ((yyvsp[(1) - (1)].temp_sym).name != NULL) 

-	      ? (yyvsp[(1) - (1)].temp_sym).param_binding_type

-	      : PROGRAM_CONSTANT;

-           set_src_reg_swz(& (yyval.src_reg), file, (yyvsp[(1) - (1)].temp_sym).param_binding_begin,

-                           (yyvsp[(1) - (1)].temp_sym).param_binding_swizzle);

-	;}

-    break;

-

-  case 64:

-

-/* Line 1455 of yacc.c  */

-#line 859 "program_parse.y"

-    {

-	   set_dst_reg(& (yyval.dst_reg), PROGRAM_OUTPUT, (yyvsp[(1) - (1)].result));

-	;}

-    break;

-

-  case 65:

-

-/* Line 1455 of yacc.c  */

-#line 863 "program_parse.y"

-    {

-	   struct asm_symbol *const s = (struct asm_symbol *)

-	      _mesa_symbol_table_find_symbol(state->st, 0, (yyvsp[(1) - (1)].string));

-

-	   free((yyvsp[(1) - (1)].string));

-

-	   if (s == NULL) {

-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid operand variable");

-	      YYERROR;

-	   } else if ((s->type != at_output) && (s->type != at_temp)) {

-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid operand variable");

-	      YYERROR;

-	   }

-

-	   switch (s->type) {

-	   case at_temp:

-	      set_dst_reg(& (yyval.dst_reg), PROGRAM_TEMPORARY, s->temp_binding);

-	      break;

-	   case at_output:

-	      set_dst_reg(& (yyval.dst_reg), PROGRAM_OUTPUT, s->output_binding);

-	      break;

-	   default:

-	      set_dst_reg(& (yyval.dst_reg), s->param_binding_type, s->param_binding_begin);

-	      break;

-	   }

-	;}

-    break;

-

-  case 66:

-

-/* Line 1455 of yacc.c  */

-#line 892 "program_parse.y"

-    {

-	   struct asm_symbol *const s = (struct asm_symbol *)

-	      _mesa_symbol_table_find_symbol(state->st, 0, (yyvsp[(1) - (1)].string));

-

-	   free((yyvsp[(1) - (1)].string));

-

-	   if (s == NULL) {

-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid operand variable");

-	      YYERROR;

-	   } else if ((s->type != at_param) || !s->param_is_array) {

-	      yyerror(& (yylsp[(1) - (1)]), state, "array access to non-PARAM variable");

-	      YYERROR;

-	   } else {

-	      (yyval.sym) = s;

-	   }

-	;}

-    break;

-

-  case 69:

-

-/* Line 1455 of yacc.c  */

-#line 913 "program_parse.y"

-    {

-	   init_src_reg(& (yyval.src_reg));

-	   (yyval.src_reg).Base.Index = (yyvsp[(1) - (1)].integer);

-	;}

-    break;

-

-  case 70:

-

-/* Line 1455 of yacc.c  */

-#line 920 "program_parse.y"

-    {

-	   /* FINISHME: Add support for multiple address registers.

-	    */

-	   /* FINISHME: Add support for 4-component address registers.

-	    */

-	   init_src_reg(& (yyval.src_reg));

-	   (yyval.src_reg).Base.RelAddr = 1;

-	   (yyval.src_reg).Base.Index = (yyvsp[(3) - (3)].integer);

-	;}

-    break;

-

-  case 71:

-

-/* Line 1455 of yacc.c  */

-#line 931 "program_parse.y"

-    { (yyval.integer) = 0; ;}

-    break;

-

-  case 72:

-

-/* Line 1455 of yacc.c  */

-#line 932 "program_parse.y"

-    { (yyval.integer) = (yyvsp[(2) - (2)].integer); ;}

-    break;

-

-  case 73:

-

-/* Line 1455 of yacc.c  */

-#line 933 "program_parse.y"

-    { (yyval.integer) = -(yyvsp[(2) - (2)].integer); ;}

-    break;

-

-  case 74:

-

-/* Line 1455 of yacc.c  */

-#line 937 "program_parse.y"

-    {

-	   if (((yyvsp[(1) - (1)].integer) < 0) || ((yyvsp[(1) - (1)].integer) > 4095)) {

-              char s[100];

-              _mesa_snprintf(s, sizeof(s),

-                             "relative address offset too large (%d)", (yyvsp[(1) - (1)].integer));

-	      yyerror(& (yylsp[(1) - (1)]), state, s);

-	      YYERROR;

-	   } else {

-	      (yyval.integer) = (yyvsp[(1) - (1)].integer);

-	   }

-	;}

-    break;

-

-  case 75:

-

-/* Line 1455 of yacc.c  */

-#line 951 "program_parse.y"

-    {

-	   if (((yyvsp[(1) - (1)].integer) < 0) || ((yyvsp[(1) - (1)].integer) > 4096)) {

-              char s[100];

-              _mesa_snprintf(s, sizeof(s),

-                             "relative address offset too large (%d)", (yyvsp[(1) - (1)].integer));

-	      yyerror(& (yylsp[(1) - (1)]), state, s);

-	      YYERROR;

-	   } else {

-	      (yyval.integer) = (yyvsp[(1) - (1)].integer);

-	   }

-	;}

-    break;

-

-  case 76:

-

-/* Line 1455 of yacc.c  */

-#line 965 "program_parse.y"

-    {

-	   struct asm_symbol *const s = (struct asm_symbol *)

-	      _mesa_symbol_table_find_symbol(state->st, 0, (yyvsp[(1) - (1)].string));

-

-	   free((yyvsp[(1) - (1)].string));

-

-	   if (s == NULL) {

-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid array member");

-	      YYERROR;

-	   } else if (s->type != at_address) {

-	      yyerror(& (yylsp[(1) - (1)]), state,

-		      "invalid variable for indexed array access");

-	      YYERROR;

-	   } else {

-	      (yyval.sym) = s;

-	   }

-	;}

-    break;

-

-  case 77:

-

-/* Line 1455 of yacc.c  */

-#line 985 "program_parse.y"

-    {

-	   if ((yyvsp[(1) - (1)].swiz_mask).mask != WRITEMASK_X) {

-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid address component selector");

-	      YYERROR;

-	   } else {

-	      (yyval.swiz_mask) = (yyvsp[(1) - (1)].swiz_mask);

-	   }

-	;}

-    break;

-

-  case 78:

-

-/* Line 1455 of yacc.c  */

-#line 996 "program_parse.y"

-    {

-	   if ((yyvsp[(1) - (1)].swiz_mask).mask != WRITEMASK_X) {

-	      yyerror(& (yylsp[(1) - (1)]), state,

-		      "address register write mask must be \".x\"");

-	      YYERROR;

-	   } else {

-	      (yyval.swiz_mask) = (yyvsp[(1) - (1)].swiz_mask);

-	   }

-	;}

-    break;

-

-  case 83:

-

-/* Line 1455 of yacc.c  */

-#line 1012 "program_parse.y"

-    { (yyval.swiz_mask).swizzle = SWIZZLE_NOOP; (yyval.swiz_mask).mask = WRITEMASK_XYZW; ;}

-    break;

-

-  case 88:

-

-/* Line 1455 of yacc.c  */

-#line 1016 "program_parse.y"

-    { (yyval.swiz_mask).swizzle = SWIZZLE_NOOP; (yyval.swiz_mask).mask = WRITEMASK_XYZW; ;}

-    break;

-

-  case 89:

-

-/* Line 1455 of yacc.c  */

-#line 1020 "program_parse.y"

-    {

-	   (yyval.dst_reg) = (yyvsp[(2) - (3)].dst_reg);

-	;}

-    break;

-

-  case 90:

-

-/* Line 1455 of yacc.c  */

-#line 1024 "program_parse.y"

-    {

-	   (yyval.dst_reg) = (yyvsp[(2) - (3)].dst_reg);

-	;}

-    break;

-

-  case 91:

-

-/* Line 1455 of yacc.c  */

-#line 1028 "program_parse.y"

-    {

-	   (yyval.dst_reg).CondMask = COND_TR;

-	   (yyval.dst_reg).CondSwizzle = SWIZZLE_NOOP;

-	   (yyval.dst_reg).CondSrc = 0;

-	;}

-    break;

-

-  case 92:

-

-/* Line 1455 of yacc.c  */

-#line 1036 "program_parse.y"

-    {

-	   (yyval.dst_reg) = (yyvsp[(1) - (2)].dst_reg);

-	   (yyval.dst_reg).CondSwizzle = (yyvsp[(2) - (2)].swiz_mask).swizzle;

-	;}

-    break;

-

-  case 93:

-

-/* Line 1455 of yacc.c  */

-#line 1043 "program_parse.y"

-    {

-	   (yyval.dst_reg) = (yyvsp[(1) - (2)].dst_reg);

-	   (yyval.dst_reg).CondSwizzle = (yyvsp[(2) - (2)].swiz_mask).swizzle;

-	;}

-    break;

-

-  case 94:

-

-/* Line 1455 of yacc.c  */

-#line 1050 "program_parse.y"

-    {

-	   const int cond = _mesa_parse_cc((yyvsp[(1) - (1)].string));

-	   if ((cond == 0) || ((yyvsp[(1) - (1)].string)[2] != '\0')) {

-	      char *const err_str =

-		 make_error_string("invalid condition code \"%s\"", (yyvsp[(1) - (1)].string));

-

-	      yyerror(& (yylsp[(1) - (1)]), state, (err_str != NULL)

-		      ? err_str : "invalid condition code");

-

-	      if (err_str != NULL) {

-		 free(err_str);

-	      }

-

-	      YYERROR;

-	   }

-

-	   (yyval.dst_reg).CondMask = cond;

-	   (yyval.dst_reg).CondSwizzle = SWIZZLE_NOOP;

-	   (yyval.dst_reg).CondSrc = 0;

-	;}

-    break;

-

-  case 95:

-

-/* Line 1455 of yacc.c  */

-#line 1073 "program_parse.y"

-    {

-	   const int cond = _mesa_parse_cc((yyvsp[(1) - (1)].string));

-	   if ((cond == 0) || ((yyvsp[(1) - (1)].string)[2] != '\0')) {

-	      char *const err_str =

-		 make_error_string("invalid condition code \"%s\"", (yyvsp[(1) - (1)].string));

-

-	      yyerror(& (yylsp[(1) - (1)]), state, (err_str != NULL)

-		      ? err_str : "invalid condition code");

-

-	      if (err_str != NULL) {

-		 free(err_str);

-	      }

-

-	      YYERROR;

-	   }

-

-	   (yyval.dst_reg).CondMask = cond;

-	   (yyval.dst_reg).CondSwizzle = SWIZZLE_NOOP;

-	   (yyval.dst_reg).CondSrc = 0;

-	;}

-    break;

-

-  case 102:

-

-/* Line 1455 of yacc.c  */

-#line 1104 "program_parse.y"

-    {

-	   struct asm_symbol *const s =

-	      declare_variable(state, (yyvsp[(2) - (4)].string), at_attrib, & (yylsp[(2) - (4)]));

-

-	   if (s == NULL) {

-	      free((yyvsp[(2) - (4)].string));

-	      YYERROR;

-	   } else {

-	      s->attrib_binding = (yyvsp[(4) - (4)].attrib);

-	      state->InputsBound |= (1U << s->attrib_binding);

-

-	      if (!validate_inputs(& (yylsp[(4) - (4)]), state)) {

-		 YYERROR;

-	      }

-	   }

-	;}

-    break;

-

-  case 103:

-

-/* Line 1455 of yacc.c  */

-#line 1123 "program_parse.y"

-    {

-	   (yyval.attrib) = (yyvsp[(2) - (2)].attrib);

-	;}

-    break;

-

-  case 104:

-

-/* Line 1455 of yacc.c  */

-#line 1127 "program_parse.y"

-    {

-	   (yyval.attrib) = (yyvsp[(2) - (2)].attrib);

-	;}

-    break;

-

-  case 105:

-

-/* Line 1455 of yacc.c  */

-#line 1133 "program_parse.y"

-    {

-	   (yyval.attrib) = VERT_ATTRIB_POS;

-	;}

-    break;

-

-  case 106:

-

-/* Line 1455 of yacc.c  */

-#line 1137 "program_parse.y"

-    {

-	   (yyval.attrib) = VERT_ATTRIB_WEIGHT;

-	;}

-    break;

-

-  case 107:

-

-/* Line 1455 of yacc.c  */

-#line 1141 "program_parse.y"

-    {

-	   (yyval.attrib) = VERT_ATTRIB_NORMAL;

-	;}

-    break;

-

-  case 108:

-

-/* Line 1455 of yacc.c  */

-#line 1145 "program_parse.y"

-    {

-	   if (!state->ctx->Extensions.EXT_secondary_color) {

-	      yyerror(& (yylsp[(2) - (2)]), state, "GL_EXT_secondary_color not supported");

-	      YYERROR;

-	   }

-

-	   (yyval.attrib) = VERT_ATTRIB_COLOR0 + (yyvsp[(2) - (2)].integer);

-	;}

-    break;

-

-  case 109:

-

-/* Line 1455 of yacc.c  */

-#line 1154 "program_parse.y"

-    {

-	   if (!state->ctx->Extensions.EXT_fog_coord) {

-	      yyerror(& (yylsp[(1) - (1)]), state, "GL_EXT_fog_coord not supported");

-	      YYERROR;

-	   }

-

-	   (yyval.attrib) = VERT_ATTRIB_FOG;

-	;}

-    break;

-

-  case 110:

-

-/* Line 1455 of yacc.c  */

-#line 1163 "program_parse.y"

-    {

-	   (yyval.attrib) = VERT_ATTRIB_TEX0 + (yyvsp[(2) - (2)].integer);

-	;}

-    break;

-

-  case 111:

-

-/* Line 1455 of yacc.c  */

-#line 1167 "program_parse.y"

-    {

-	   yyerror(& (yylsp[(1) - (4)]), state, "GL_ARB_matrix_palette not supported");

-	   YYERROR;

-	;}

-    break;

-

-  case 112:

-

-/* Line 1455 of yacc.c  */

-#line 1172 "program_parse.y"

-    {

-	   (yyval.attrib) = VERT_ATTRIB_GENERIC0 + (yyvsp[(3) - (4)].integer);

-	;}

-    break;

-

-  case 113:

-

-/* Line 1455 of yacc.c  */

-#line 1178 "program_parse.y"

-    {

-	   if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->limits->MaxAttribs) {

-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid vertex attribute reference");

-	      YYERROR;

-	   }

-

-	   (yyval.integer) = (yyvsp[(1) - (1)].integer);

-	;}

-    break;

-

-  case 117:

-

-/* Line 1455 of yacc.c  */

-#line 1192 "program_parse.y"

-    {

-	   (yyval.attrib) = FRAG_ATTRIB_WPOS;

-	;}

-    break;

-

-  case 118:

-

-/* Line 1455 of yacc.c  */

-#line 1196 "program_parse.y"

-    {

-	   (yyval.attrib) = FRAG_ATTRIB_COL0 + (yyvsp[(2) - (2)].integer);

-	;}

-    break;

-

-  case 119:

-

-/* Line 1455 of yacc.c  */

-#line 1200 "program_parse.y"

-    {

-	   (yyval.attrib) = FRAG_ATTRIB_FOGC;

-	;}

-    break;

-

-  case 120:

-

-/* Line 1455 of yacc.c  */

-#line 1204 "program_parse.y"

-    {

-	   (yyval.attrib) = FRAG_ATTRIB_TEX0 + (yyvsp[(2) - (2)].integer);

-	;}

-    break;

-

-  case 123:

-

-/* Line 1455 of yacc.c  */

-#line 1212 "program_parse.y"

-    {

-	   struct asm_symbol *const s =

-	      declare_variable(state, (yyvsp[(2) - (3)].string), at_param, & (yylsp[(2) - (3)]));

-

-	   if (s == NULL) {

-	      free((yyvsp[(2) - (3)].string));

-	      YYERROR;

-	   } else {

-	      s->param_binding_type = (yyvsp[(3) - (3)].temp_sym).param_binding_type;

-	      s->param_binding_begin = (yyvsp[(3) - (3)].temp_sym).param_binding_begin;

-	      s->param_binding_length = (yyvsp[(3) - (3)].temp_sym).param_binding_length;

-              s->param_binding_swizzle = (yyvsp[(3) - (3)].temp_sym).param_binding_swizzle;

-	      s->param_is_array = 0;

-	   }

-	;}

-    break;

-

-  case 124:

-

-/* Line 1455 of yacc.c  */

-#line 1230 "program_parse.y"

-    {

-	   if (((yyvsp[(4) - (6)].integer) != 0) && ((unsigned) (yyvsp[(4) - (6)].integer) != (yyvsp[(6) - (6)].temp_sym).param_binding_length)) {

-	      free((yyvsp[(2) - (6)].string));

-	      yyerror(& (yylsp[(4) - (6)]), state, 

-		      "parameter array size and number of bindings must match");

-	      YYERROR;

-	   } else {

-	      struct asm_symbol *const s =

-		 declare_variable(state, (yyvsp[(2) - (6)].string), (yyvsp[(6) - (6)].temp_sym).type, & (yylsp[(2) - (6)]));

-

-	      if (s == NULL) {

-		 free((yyvsp[(2) - (6)].string));

-		 YYERROR;

-	      } else {

-		 s->param_binding_type = (yyvsp[(6) - (6)].temp_sym).param_binding_type;

-		 s->param_binding_begin = (yyvsp[(6) - (6)].temp_sym).param_binding_begin;

-		 s->param_binding_length = (yyvsp[(6) - (6)].temp_sym).param_binding_length;

-                 s->param_binding_swizzle = SWIZZLE_XYZW;

-		 s->param_is_array = 1;

-	      }

-	   }

-	;}

-    break;

-

-  case 125:

-

-/* Line 1455 of yacc.c  */

-#line 1255 "program_parse.y"

-    {

-	   (yyval.integer) = 0;

-	;}

-    break;

-

-  case 126:

-

-/* Line 1455 of yacc.c  */

-#line 1259 "program_parse.y"

-    {

-	   if (((yyvsp[(1) - (1)].integer) < 1) || ((unsigned) (yyvsp[(1) - (1)].integer) > state->limits->MaxParameters)) {

-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid parameter array size");

-	      YYERROR;

-	   } else {

-	      (yyval.integer) = (yyvsp[(1) - (1)].integer);

-	   }

-	;}

-    break;

-

-  case 127:

-

-/* Line 1455 of yacc.c  */

-#line 1270 "program_parse.y"

-    {

-	   (yyval.temp_sym) = (yyvsp[(2) - (2)].temp_sym);

-	;}

-    break;

-

-  case 128:

-

-/* Line 1455 of yacc.c  */

-#line 1276 "program_parse.y"

-    {

-	   (yyval.temp_sym) = (yyvsp[(3) - (4)].temp_sym);

-	;}

-    break;

-

-  case 130:

-

-/* Line 1455 of yacc.c  */

-#line 1283 "program_parse.y"

-    {

-	   (yyvsp[(1) - (3)].temp_sym).param_binding_length += (yyvsp[(3) - (3)].temp_sym).param_binding_length;

-	   (yyval.temp_sym) = (yyvsp[(1) - (3)].temp_sym);

-	;}

-    break;

-

-  case 131:

-

-/* Line 1455 of yacc.c  */

-#line 1290 "program_parse.y"

-    {

-	   memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));

-	   (yyval.temp_sym).param_binding_begin = ~0;

-	   initialize_symbol_from_state(state->prog, & (yyval.temp_sym), (yyvsp[(1) - (1)].state));

-	;}

-    break;

-

-  case 132:

-

-/* Line 1455 of yacc.c  */

-#line 1296 "program_parse.y"

-    {

-	   memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));

-	   (yyval.temp_sym).param_binding_begin = ~0;

-	   initialize_symbol_from_param(state->prog, & (yyval.temp_sym), (yyvsp[(1) - (1)].state));

-	;}

-    break;

-

-  case 133:

-

-/* Line 1455 of yacc.c  */

-#line 1302 "program_parse.y"

-    {

-	   memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));

-	   (yyval.temp_sym).param_binding_begin = ~0;

-	   initialize_symbol_from_const(state->prog, & (yyval.temp_sym), & (yyvsp[(1) - (1)].vector), GL_TRUE);

-	;}

-    break;

-

-  case 134:

-

-/* Line 1455 of yacc.c  */

-#line 1310 "program_parse.y"

-    {

-	   memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));

-	   (yyval.temp_sym).param_binding_begin = ~0;

-	   initialize_symbol_from_state(state->prog, & (yyval.temp_sym), (yyvsp[(1) - (1)].state));

-	;}

-    break;

-

-  case 135:

-

-/* Line 1455 of yacc.c  */

-#line 1316 "program_parse.y"

-    {

-	   memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));

-	   (yyval.temp_sym).param_binding_begin = ~0;

-	   initialize_symbol_from_param(state->prog, & (yyval.temp_sym), (yyvsp[(1) - (1)].state));

-	;}

-    break;

-

-  case 136:

-

-/* Line 1455 of yacc.c  */

-#line 1322 "program_parse.y"

-    {

-	   memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));

-	   (yyval.temp_sym).param_binding_begin = ~0;

-	   initialize_symbol_from_const(state->prog, & (yyval.temp_sym), & (yyvsp[(1) - (1)].vector), GL_TRUE);

-	;}

-    break;

-

-  case 137:

-

-/* Line 1455 of yacc.c  */

-#line 1330 "program_parse.y"

-    {

-	   memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));

-	   (yyval.temp_sym).param_binding_begin = ~0;

-	   initialize_symbol_from_state(state->prog, & (yyval.temp_sym), (yyvsp[(1) - (1)].state));

-	;}

-    break;

-

-  case 138:

-

-/* Line 1455 of yacc.c  */

-#line 1336 "program_parse.y"

-    {

-	   memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));

-	   (yyval.temp_sym).param_binding_begin = ~0;

-	   initialize_symbol_from_param(state->prog, & (yyval.temp_sym), (yyvsp[(1) - (1)].state));

-	;}

-    break;

-

-  case 139:

-

-/* Line 1455 of yacc.c  */

-#line 1342 "program_parse.y"

-    {

-	   memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));

-	   (yyval.temp_sym).param_binding_begin = ~0;

-	   initialize_symbol_from_const(state->prog, & (yyval.temp_sym), & (yyvsp[(1) - (1)].vector), GL_FALSE);

-	;}

-    break;

-

-  case 140:

-

-/* Line 1455 of yacc.c  */

-#line 1349 "program_parse.y"

-    { memcpy((yyval.state), (yyvsp[(1) - (1)].state), sizeof((yyval.state))); ;}

-    break;

-

-  case 141:

-

-/* Line 1455 of yacc.c  */

-#line 1350 "program_parse.y"

-    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}

-    break;

-

-  case 142:

-

-/* Line 1455 of yacc.c  */

-#line 1353 "program_parse.y"

-    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}

-    break;

-

-  case 143:

-

-/* Line 1455 of yacc.c  */

-#line 1354 "program_parse.y"

-    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}

-    break;

-

-  case 144:

-

-/* Line 1455 of yacc.c  */

-#line 1355 "program_parse.y"

-    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}

-    break;

-

-  case 145:

-

-/* Line 1455 of yacc.c  */

-#line 1356 "program_parse.y"

-    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}

-    break;

-

-  case 146:

-

-/* Line 1455 of yacc.c  */

-#line 1357 "program_parse.y"

-    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}

-    break;

-

-  case 147:

-

-/* Line 1455 of yacc.c  */

-#line 1358 "program_parse.y"

-    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}

-    break;

-

-  case 148:

-

-/* Line 1455 of yacc.c  */

-#line 1359 "program_parse.y"

-    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}

-    break;

-

-  case 149:

-

-/* Line 1455 of yacc.c  */

-#line 1360 "program_parse.y"

-    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}

-    break;

-

-  case 150:

-

-/* Line 1455 of yacc.c  */

-#line 1361 "program_parse.y"

-    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}

-    break;

-

-  case 151:

-

-/* Line 1455 of yacc.c  */

-#line 1362 "program_parse.y"

-    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}

-    break;

-

-  case 152:

-

-/* Line 1455 of yacc.c  */

-#line 1363 "program_parse.y"

-    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}

-    break;

-

-  case 153:

-

-/* Line 1455 of yacc.c  */

-#line 1367 "program_parse.y"

-    {

-	   memset((yyval.state), 0, sizeof((yyval.state)));

-	   (yyval.state)[0] = STATE_MATERIAL;

-	   (yyval.state)[1] = (yyvsp[(2) - (3)].integer);

-	   (yyval.state)[2] = (yyvsp[(3) - (3)].integer);

-	;}

-    break;

-

-  case 154:

-

-/* Line 1455 of yacc.c  */

-#line 1376 "program_parse.y"

-    {

-	   (yyval.integer) = (yyvsp[(1) - (1)].integer);

-	;}

-    break;

-

-  case 155:

-

-/* Line 1455 of yacc.c  */

-#line 1380 "program_parse.y"

-    {

-	   (yyval.integer) = STATE_EMISSION;

-	;}

-    break;

-

-  case 156:

-

-/* Line 1455 of yacc.c  */

-#line 1384 "program_parse.y"

-    {

-	   (yyval.integer) = STATE_SHININESS;

-	;}

-    break;

-

-  case 157:

-

-/* Line 1455 of yacc.c  */

-#line 1390 "program_parse.y"

-    {

-	   memset((yyval.state), 0, sizeof((yyval.state)));

-	   (yyval.state)[0] = STATE_LIGHT;

-	   (yyval.state)[1] = (yyvsp[(3) - (5)].integer);

-	   (yyval.state)[2] = (yyvsp[(5) - (5)].integer);

-	;}

-    break;

-

-  case 158:

-

-/* Line 1455 of yacc.c  */

-#line 1399 "program_parse.y"

-    {

-	   (yyval.integer) = (yyvsp[(1) - (1)].integer);

-	;}

-    break;

-

-  case 159:

-

-/* Line 1455 of yacc.c  */

-#line 1403 "program_parse.y"

-    {

-	   (yyval.integer) = STATE_POSITION;

-	;}

-    break;

-

-  case 160:

-

-/* Line 1455 of yacc.c  */

-#line 1407 "program_parse.y"

-    {

-	   if (!state->ctx->Extensions.EXT_point_parameters) {

-	      yyerror(& (yylsp[(1) - (1)]), state, "GL_ARB_point_parameters not supported");

-	      YYERROR;

-	   }

-

-	   (yyval.integer) = STATE_ATTENUATION;

-	;}

-    break;

-

-  case 161:

-

-/* Line 1455 of yacc.c  */

-#line 1416 "program_parse.y"

-    {

-	   (yyval.integer) = (yyvsp[(2) - (2)].integer);

-	;}

-    break;

-

-  case 162:

-

-/* Line 1455 of yacc.c  */

-#line 1420 "program_parse.y"

-    {

-	   (yyval.integer) = STATE_HALF_VECTOR;

-	;}

-    break;

-

-  case 163:

-

-/* Line 1455 of yacc.c  */

-#line 1426 "program_parse.y"

-    {

-	   (yyval.integer) = STATE_SPOT_DIRECTION;

-	;}

-    break;

-

-  case 164:

-

-/* Line 1455 of yacc.c  */

-#line 1432 "program_parse.y"

-    {

-	   (yyval.state)[0] = (yyvsp[(2) - (2)].state)[0];

-	   (yyval.state)[1] = (yyvsp[(2) - (2)].state)[1];

-	;}

-    break;

-

-  case 165:

-

-/* Line 1455 of yacc.c  */

-#line 1439 "program_parse.y"

-    {

-	   memset((yyval.state), 0, sizeof((yyval.state)));

-	   (yyval.state)[0] = STATE_LIGHTMODEL_AMBIENT;

-	;}

-    break;

-

-  case 166:

-

-/* Line 1455 of yacc.c  */

-#line 1444 "program_parse.y"

-    {

-	   memset((yyval.state), 0, sizeof((yyval.state)));

-	   (yyval.state)[0] = STATE_LIGHTMODEL_SCENECOLOR;

-	   (yyval.state)[1] = (yyvsp[(1) - (2)].integer);

-	;}

-    break;

-

-  case 167:

-

-/* Line 1455 of yacc.c  */

-#line 1452 "program_parse.y"

-    {

-	   memset((yyval.state), 0, sizeof((yyval.state)));

-	   (yyval.state)[0] = STATE_LIGHTPROD;

-	   (yyval.state)[1] = (yyvsp[(3) - (6)].integer);

-	   (yyval.state)[2] = (yyvsp[(5) - (6)].integer);

-	   (yyval.state)[3] = (yyvsp[(6) - (6)].integer);

-	;}

-    break;

-

-  case 169:

-

-/* Line 1455 of yacc.c  */

-#line 1464 "program_parse.y"

-    {

-	   memset((yyval.state), 0, sizeof((yyval.state)));

-	   (yyval.state)[0] = (yyvsp[(3) - (3)].integer);

-	   (yyval.state)[1] = (yyvsp[(2) - (3)].integer);

-	;}

-    break;

-

-  case 170:

-

-/* Line 1455 of yacc.c  */

-#line 1472 "program_parse.y"

-    {

-	   (yyval.integer) = STATE_TEXENV_COLOR;

-	;}

-    break;

-

-  case 171:

-

-/* Line 1455 of yacc.c  */

-#line 1478 "program_parse.y"

-    {

-	   (yyval.integer) = STATE_AMBIENT;

-	;}

-    break;

-

-  case 172:

-

-/* Line 1455 of yacc.c  */

-#line 1482 "program_parse.y"

-    {

-	   (yyval.integer) = STATE_DIFFUSE;

-	;}

-    break;

-

-  case 173:

-

-/* Line 1455 of yacc.c  */

-#line 1486 "program_parse.y"

-    {

-	   (yyval.integer) = STATE_SPECULAR;

-	;}

-    break;

-

-  case 174:

-

-/* Line 1455 of yacc.c  */

-#line 1492 "program_parse.y"

-    {

-	   if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->MaxLights) {

-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid light selector");

-	      YYERROR;

-	   }

-

-	   (yyval.integer) = (yyvsp[(1) - (1)].integer);

-	;}

-    break;

-

-  case 175:

-

-/* Line 1455 of yacc.c  */

-#line 1503 "program_parse.y"

-    {

-	   memset((yyval.state), 0, sizeof((yyval.state)));

-	   (yyval.state)[0] = STATE_TEXGEN;

-	   (yyval.state)[1] = (yyvsp[(2) - (4)].integer);

-	   (yyval.state)[2] = (yyvsp[(3) - (4)].integer) + (yyvsp[(4) - (4)].integer);

-	;}

-    break;

-

-  case 176:

-

-/* Line 1455 of yacc.c  */

-#line 1512 "program_parse.y"

-    {

-	   (yyval.integer) = STATE_TEXGEN_EYE_S;

-	;}

-    break;

-

-  case 177:

-

-/* Line 1455 of yacc.c  */

-#line 1516 "program_parse.y"

-    {

-	   (yyval.integer) = STATE_TEXGEN_OBJECT_S;

-	;}

-    break;

-

-  case 178:

-

-/* Line 1455 of yacc.c  */

-#line 1521 "program_parse.y"

-    {

-	   (yyval.integer) = STATE_TEXGEN_EYE_S - STATE_TEXGEN_EYE_S;

-	;}

-    break;

-

-  case 179:

-

-/* Line 1455 of yacc.c  */

-#line 1525 "program_parse.y"

-    {

-	   (yyval.integer) = STATE_TEXGEN_EYE_T - STATE_TEXGEN_EYE_S;

-	;}

-    break;

-

-  case 180:

-

-/* Line 1455 of yacc.c  */

-#line 1529 "program_parse.y"

-    {

-	   (yyval.integer) = STATE_TEXGEN_EYE_R - STATE_TEXGEN_EYE_S;

-	;}

-    break;

-

-  case 181:

-

-/* Line 1455 of yacc.c  */

-#line 1533 "program_parse.y"

-    {

-	   (yyval.integer) = STATE_TEXGEN_EYE_Q - STATE_TEXGEN_EYE_S;

-	;}

-    break;

-

-  case 182:

-

-/* Line 1455 of yacc.c  */

-#line 1539 "program_parse.y"

-    {

-	   memset((yyval.state), 0, sizeof((yyval.state)));

-	   (yyval.state)[0] = (yyvsp[(2) - (2)].integer);

-	;}

-    break;

-

-  case 183:

-

-/* Line 1455 of yacc.c  */

-#line 1546 "program_parse.y"

-    {

-	   (yyval.integer) = STATE_FOG_COLOR;

-	;}

-    break;

-

-  case 184:

-

-/* Line 1455 of yacc.c  */

-#line 1550 "program_parse.y"

-    {

-	   (yyval.integer) = STATE_FOG_PARAMS;

-	;}

-    break;

-

-  case 185:

-

-/* Line 1455 of yacc.c  */

-#line 1556 "program_parse.y"

-    {

-	   memset((yyval.state), 0, sizeof((yyval.state)));

-	   (yyval.state)[0] = STATE_CLIPPLANE;

-	   (yyval.state)[1] = (yyvsp[(3) - (5)].integer);

-	;}

-    break;

-

-  case 186:

-

-/* Line 1455 of yacc.c  */

-#line 1564 "program_parse.y"

-    {

-	   if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->MaxClipPlanes) {

-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid clip plane selector");

-	      YYERROR;

-	   }

-

-	   (yyval.integer) = (yyvsp[(1) - (1)].integer);

-	;}

-    break;

-

-  case 187:

-

-/* Line 1455 of yacc.c  */

-#line 1575 "program_parse.y"

-    {

-	   memset((yyval.state), 0, sizeof((yyval.state)));

-	   (yyval.state)[0] = (yyvsp[(2) - (2)].integer);

-	;}

-    break;

-

-  case 188:

-

-/* Line 1455 of yacc.c  */

-#line 1582 "program_parse.y"

-    {

-	   (yyval.integer) = STATE_POINT_SIZE;

-	;}

-    break;

-

-  case 189:

-

-/* Line 1455 of yacc.c  */

-#line 1586 "program_parse.y"

-    {

-	   (yyval.integer) = STATE_POINT_ATTENUATION;

-	;}

-    break;

-

-  case 190:

-

-/* Line 1455 of yacc.c  */

-#line 1592 "program_parse.y"

-    {

-	   (yyval.state)[0] = (yyvsp[(1) - (5)].state)[0];

-	   (yyval.state)[1] = (yyvsp[(1) - (5)].state)[1];

-	   (yyval.state)[2] = (yyvsp[(4) - (5)].integer);

-	   (yyval.state)[3] = (yyvsp[(4) - (5)].integer);

-	   (yyval.state)[4] = (yyvsp[(1) - (5)].state)[2];

-	;}

-    break;

-

-  case 191:

-

-/* Line 1455 of yacc.c  */

-#line 1602 "program_parse.y"

-    {

-	   (yyval.state)[0] = (yyvsp[(1) - (2)].state)[0];

-	   (yyval.state)[1] = (yyvsp[(1) - (2)].state)[1];

-	   (yyval.state)[2] = (yyvsp[(2) - (2)].state)[2];

-	   (yyval.state)[3] = (yyvsp[(2) - (2)].state)[3];

-	   (yyval.state)[4] = (yyvsp[(1) - (2)].state)[2];

-	;}

-    break;

-

-  case 192:

-

-/* Line 1455 of yacc.c  */

-#line 1612 "program_parse.y"

-    {

-	   (yyval.state)[2] = 0;

-	   (yyval.state)[3] = 3;

-	;}

-    break;

-

-  case 193:

-

-/* Line 1455 of yacc.c  */

-#line 1617 "program_parse.y"

-    {

-	   /* It seems logical that the matrix row range specifier would have

-	    * to specify a range or more than one row (i.e., $5 > $3).

-	    * However, the ARB_vertex_program spec says "a program will fail

-	    * to load if <a> is greater than <b>."  This means that $3 == $5

-	    * is valid.

-	    */

-	   if ((yyvsp[(3) - (6)].integer) > (yyvsp[(5) - (6)].integer)) {

-	      yyerror(& (yylsp[(3) - (6)]), state, "invalid matrix row range");

-	      YYERROR;

-	   }

-

-	   (yyval.state)[2] = (yyvsp[(3) - (6)].integer);

-	   (yyval.state)[3] = (yyvsp[(5) - (6)].integer);

-	;}

-    break;

-

-  case 194:

-

-/* Line 1455 of yacc.c  */

-#line 1635 "program_parse.y"

-    {

-	   (yyval.state)[0] = (yyvsp[(2) - (3)].state)[0];

-	   (yyval.state)[1] = (yyvsp[(2) - (3)].state)[1];

-	   (yyval.state)[2] = (yyvsp[(3) - (3)].integer);

-	;}

-    break;

-

-  case 195:

-

-/* Line 1455 of yacc.c  */

-#line 1643 "program_parse.y"

-    {

-	   (yyval.integer) = 0;

-	;}

-    break;

-

-  case 196:

-

-/* Line 1455 of yacc.c  */

-#line 1647 "program_parse.y"

-    {

-	   (yyval.integer) = (yyvsp[(1) - (1)].integer);

-	;}

-    break;

-

-  case 197:

-

-/* Line 1455 of yacc.c  */

-#line 1653 "program_parse.y"

-    {

-	   (yyval.integer) = STATE_MATRIX_INVERSE;

-	;}

-    break;

-

-  case 198:

-

-/* Line 1455 of yacc.c  */

-#line 1657 "program_parse.y"

-    {

-	   (yyval.integer) = STATE_MATRIX_TRANSPOSE;

-	;}

-    break;

-

-  case 199:

-

-/* Line 1455 of yacc.c  */

-#line 1661 "program_parse.y"

-    {

-	   (yyval.integer) = STATE_MATRIX_INVTRANS;

-	;}

-    break;

-

-  case 200:

-

-/* Line 1455 of yacc.c  */

-#line 1667 "program_parse.y"

-    {

-	   if ((yyvsp[(1) - (1)].integer) > 3) {

-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid matrix row reference");

-	      YYERROR;

-	   }

-

-	   (yyval.integer) = (yyvsp[(1) - (1)].integer);

-	;}

-    break;

-

-  case 201:

-

-/* Line 1455 of yacc.c  */

-#line 1678 "program_parse.y"

-    {

-	   (yyval.state)[0] = STATE_MODELVIEW_MATRIX;

-	   (yyval.state)[1] = (yyvsp[(2) - (2)].integer);

-	;}

-    break;

-

-  case 202:

-

-/* Line 1455 of yacc.c  */

-#line 1683 "program_parse.y"

-    {

-	   (yyval.state)[0] = STATE_PROJECTION_MATRIX;

-	   (yyval.state)[1] = 0;

-	;}

-    break;

-

-  case 203:

-

-/* Line 1455 of yacc.c  */

-#line 1688 "program_parse.y"

-    {

-	   (yyval.state)[0] = STATE_MVP_MATRIX;

-	   (yyval.state)[1] = 0;

-	;}

-    break;

-

-  case 204:

-

-/* Line 1455 of yacc.c  */

-#line 1693 "program_parse.y"

-    {

-	   (yyval.state)[0] = STATE_TEXTURE_MATRIX;

-	   (yyval.state)[1] = (yyvsp[(2) - (2)].integer);

-	;}

-    break;

-

-  case 205:

-

-/* Line 1455 of yacc.c  */

-#line 1698 "program_parse.y"

-    {

-	   yyerror(& (yylsp[(1) - (4)]), state, "GL_ARB_matrix_palette not supported");

-	   YYERROR;

-	;}

-    break;

-

-  case 206:

-

-/* Line 1455 of yacc.c  */

-#line 1703 "program_parse.y"

-    {

-	   (yyval.state)[0] = STATE_PROGRAM_MATRIX;

-	   (yyval.state)[1] = (yyvsp[(3) - (4)].integer);

-	;}

-    break;

-

-  case 207:

-

-/* Line 1455 of yacc.c  */

-#line 1710 "program_parse.y"

-    {

-	   (yyval.integer) = 0;

-	;}

-    break;

-

-  case 208:

-

-/* Line 1455 of yacc.c  */

-#line 1714 "program_parse.y"

-    {

-	   (yyval.integer) = (yyvsp[(2) - (3)].integer);

-	;}

-    break;

-

-  case 209:

-

-/* Line 1455 of yacc.c  */

-#line 1719 "program_parse.y"

-    {

-	   /* Since GL_ARB_vertex_blend isn't supported, only modelview matrix

-	    * zero is valid.

-	    */

-	   if ((yyvsp[(1) - (1)].integer) != 0) {

-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid modelview matrix index");

-	      YYERROR;

-	   }

-

-	   (yyval.integer) = (yyvsp[(1) - (1)].integer);

-	;}

-    break;

-

-  case 210:

-

-/* Line 1455 of yacc.c  */

-#line 1732 "program_parse.y"

-    {

-	   /* Since GL_ARB_matrix_palette isn't supported, just let any value

-	    * through here.  The error will be generated later.

-	    */

-	   (yyval.integer) = (yyvsp[(1) - (1)].integer);

-	;}

-    break;

-

-  case 211:

-

-/* Line 1455 of yacc.c  */

-#line 1740 "program_parse.y"

-    {

-	   if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->MaxProgramMatrices) {

-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid program matrix selector");

-	      YYERROR;

-	   }

-

-	   (yyval.integer) = (yyvsp[(1) - (1)].integer);

-	;}

-    break;

-

-  case 212:

-

-/* Line 1455 of yacc.c  */

-#line 1751 "program_parse.y"

-    {

-	   memset((yyval.state), 0, sizeof((yyval.state)));

-	   (yyval.state)[0] = STATE_DEPTH_RANGE;

-	;}

-    break;

-

-  case 217:

-

-/* Line 1455 of yacc.c  */

-#line 1763 "program_parse.y"

-    {

-	   memset((yyval.state), 0, sizeof((yyval.state)));

-	   (yyval.state)[0] = state->state_param_enum;

-	   (yyval.state)[1] = STATE_ENV;

-	   (yyval.state)[2] = (yyvsp[(4) - (5)].state)[0];

-	   (yyval.state)[3] = (yyvsp[(4) - (5)].state)[1];

-	;}

-    break;

-

-  case 218:

-

-/* Line 1455 of yacc.c  */

-#line 1773 "program_parse.y"

-    {

-	   (yyval.state)[0] = (yyvsp[(1) - (1)].integer);

-	   (yyval.state)[1] = (yyvsp[(1) - (1)].integer);

-	;}

-    break;

-

-  case 219:

-

-/* Line 1455 of yacc.c  */

-#line 1778 "program_parse.y"

-    {

-	   (yyval.state)[0] = (yyvsp[(1) - (3)].integer);

-	   (yyval.state)[1] = (yyvsp[(3) - (3)].integer);

-	;}

-    break;

-

-  case 220:

-

-/* Line 1455 of yacc.c  */

-#line 1785 "program_parse.y"

-    {

-	   memset((yyval.state), 0, sizeof((yyval.state)));

-	   (yyval.state)[0] = state->state_param_enum;

-	   (yyval.state)[1] = STATE_ENV;

-	   (yyval.state)[2] = (yyvsp[(4) - (5)].integer);

-	   (yyval.state)[3] = (yyvsp[(4) - (5)].integer);

-	;}

-    break;

-

-  case 221:

-

-/* Line 1455 of yacc.c  */

-#line 1795 "program_parse.y"

-    {

-	   memset((yyval.state), 0, sizeof((yyval.state)));

-	   (yyval.state)[0] = state->state_param_enum;

-	   (yyval.state)[1] = STATE_LOCAL;

-	   (yyval.state)[2] = (yyvsp[(4) - (5)].state)[0];

-	   (yyval.state)[3] = (yyvsp[(4) - (5)].state)[1];

-	;}

-    break;

-

-  case 222:

-

-/* Line 1455 of yacc.c  */

-#line 1804 "program_parse.y"

-    {

-	   (yyval.state)[0] = (yyvsp[(1) - (1)].integer);

-	   (yyval.state)[1] = (yyvsp[(1) - (1)].integer);

-	;}

-    break;

-

-  case 223:

-

-/* Line 1455 of yacc.c  */

-#line 1809 "program_parse.y"

-    {

-	   (yyval.state)[0] = (yyvsp[(1) - (3)].integer);

-	   (yyval.state)[1] = (yyvsp[(3) - (3)].integer);

-	;}

-    break;

-

-  case 224:

-

-/* Line 1455 of yacc.c  */

-#line 1816 "program_parse.y"

-    {

-	   memset((yyval.state), 0, sizeof((yyval.state)));

-	   (yyval.state)[0] = state->state_param_enum;

-	   (yyval.state)[1] = STATE_LOCAL;

-	   (yyval.state)[2] = (yyvsp[(4) - (5)].integer);

-	   (yyval.state)[3] = (yyvsp[(4) - (5)].integer);

-	;}

-    break;

-

-  case 225:

-

-/* Line 1455 of yacc.c  */

-#line 1826 "program_parse.y"

-    {

-	   if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->limits->MaxEnvParams) {

-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid environment parameter reference");

-	      YYERROR;

-	   }

-	   (yyval.integer) = (yyvsp[(1) - (1)].integer);

-	;}

-    break;

-

-  case 226:

-

-/* Line 1455 of yacc.c  */

-#line 1836 "program_parse.y"

-    {

-	   if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->limits->MaxLocalParams) {

-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid local parameter reference");

-	      YYERROR;

-	   }

-	   (yyval.integer) = (yyvsp[(1) - (1)].integer);

-	;}

-    break;

-

-  case 231:

-

-/* Line 1455 of yacc.c  */

-#line 1851 "program_parse.y"

-    {

-	   (yyval.vector).count = 4;

-	   (yyval.vector).data[0] = (yyvsp[(1) - (1)].real);

-	   (yyval.vector).data[1] = (yyvsp[(1) - (1)].real);

-	   (yyval.vector).data[2] = (yyvsp[(1) - (1)].real);

-	   (yyval.vector).data[3] = (yyvsp[(1) - (1)].real);

-	;}

-    break;

-

-  case 232:

-

-/* Line 1455 of yacc.c  */

-#line 1861 "program_parse.y"

-    {

-	   (yyval.vector).count = 1;

-	   (yyval.vector).data[0] = (yyvsp[(1) - (1)].real);

-	   (yyval.vector).data[1] = (yyvsp[(1) - (1)].real);

-	   (yyval.vector).data[2] = (yyvsp[(1) - (1)].real);

-	   (yyval.vector).data[3] = (yyvsp[(1) - (1)].real);

-	;}

-    break;

-

-  case 233:

-

-/* Line 1455 of yacc.c  */

-#line 1869 "program_parse.y"

-    {

-	   (yyval.vector).count = 1;

-	   (yyval.vector).data[0] = (float) (yyvsp[(1) - (1)].integer);

-	   (yyval.vector).data[1] = (float) (yyvsp[(1) - (1)].integer);

-	   (yyval.vector).data[2] = (float) (yyvsp[(1) - (1)].integer);

-	   (yyval.vector).data[3] = (float) (yyvsp[(1) - (1)].integer);

-	;}

-    break;

-

-  case 234:

-

-/* Line 1455 of yacc.c  */

-#line 1879 "program_parse.y"

-    {

-	   (yyval.vector).count = 4;

-	   (yyval.vector).data[0] = (yyvsp[(2) - (3)].real);

-	   (yyval.vector).data[1] = 0.0f;

-	   (yyval.vector).data[2] = 0.0f;

-	   (yyval.vector).data[3] = 1.0f;

-	;}

-    break;

-

-  case 235:

-

-/* Line 1455 of yacc.c  */

-#line 1887 "program_parse.y"

-    {

-	   (yyval.vector).count = 4;

-	   (yyval.vector).data[0] = (yyvsp[(2) - (5)].real);

-	   (yyval.vector).data[1] = (yyvsp[(4) - (5)].real);

-	   (yyval.vector).data[2] = 0.0f;

-	   (yyval.vector).data[3] = 1.0f;

-	;}

-    break;

-

-  case 236:

-

-/* Line 1455 of yacc.c  */

-#line 1896 "program_parse.y"

-    {

-	   (yyval.vector).count = 4;

-	   (yyval.vector).data[0] = (yyvsp[(2) - (7)].real);

-	   (yyval.vector).data[1] = (yyvsp[(4) - (7)].real);

-	   (yyval.vector).data[2] = (yyvsp[(6) - (7)].real);

-	   (yyval.vector).data[3] = 1.0f;

-	;}

-    break;

-

-  case 237:

-

-/* Line 1455 of yacc.c  */

-#line 1905 "program_parse.y"

-    {

-	   (yyval.vector).count = 4;

-	   (yyval.vector).data[0] = (yyvsp[(2) - (9)].real);

-	   (yyval.vector).data[1] = (yyvsp[(4) - (9)].real);

-	   (yyval.vector).data[2] = (yyvsp[(6) - (9)].real);

-	   (yyval.vector).data[3] = (yyvsp[(8) - (9)].real);

-	;}

-    break;

-

-  case 238:

-

-/* Line 1455 of yacc.c  */

-#line 1915 "program_parse.y"

-    {

-	   (yyval.real) = ((yyvsp[(1) - (2)].negate)) ? -(yyvsp[(2) - (2)].real) : (yyvsp[(2) - (2)].real);

-	;}

-    break;

-

-  case 239:

-

-/* Line 1455 of yacc.c  */

-#line 1919 "program_parse.y"

-    {

-	   (yyval.real) = (float)(((yyvsp[(1) - (2)].negate)) ? -(yyvsp[(2) - (2)].integer) : (yyvsp[(2) - (2)].integer));

-	;}

-    break;

-

-  case 240:

-

-/* Line 1455 of yacc.c  */

-#line 1924 "program_parse.y"

-    { (yyval.negate) = FALSE; ;}

-    break;

-

-  case 241:

-

-/* Line 1455 of yacc.c  */

-#line 1925 "program_parse.y"

-    { (yyval.negate) = TRUE;  ;}

-    break;

-

-  case 242:

-

-/* Line 1455 of yacc.c  */

-#line 1926 "program_parse.y"

-    { (yyval.negate) = FALSE; ;}

-    break;

-

-  case 243:

-

-/* Line 1455 of yacc.c  */

-#line 1929 "program_parse.y"

-    { (yyval.integer) = (yyvsp[(2) - (2)].integer); ;}

-    break;

-

-  case 245:

-

-/* Line 1455 of yacc.c  */

-#line 1933 "program_parse.y"

-    {

-	   /* NV_fragment_program_option defines the size qualifiers in a

-	    * fairly broken way.  "SHORT" or "LONG" can optionally be used

-	    * before TEMP or OUTPUT.  However, neither is a reserved word!

-	    * This means that we have to parse it as an identifier, then check

-	    * to make sure it's one of the valid values.  *sigh*

-	    *

-	    * In addition, the grammar in the extension spec does *not* allow

-	    * the size specifier to be optional, but all known implementations

-	    * do.

-	    */

-	   if (!state->option.NV_fragment) {

-	      yyerror(& (yylsp[(1) - (1)]), state, "unexpected IDENTIFIER");

-	      YYERROR;

-	   }

-

-	   if (strcmp("SHORT", (yyvsp[(1) - (1)].string)) == 0) {

-	   } else if (strcmp("LONG", (yyvsp[(1) - (1)].string)) == 0) {

-	   } else {

-	      char *const err_str =

-		 make_error_string("invalid storage size specifier \"%s\"",

-				   (yyvsp[(1) - (1)].string));

-

-	      yyerror(& (yylsp[(1) - (1)]), state, (err_str != NULL)

-		      ? err_str : "invalid storage size specifier");

-

-	      if (err_str != NULL) {

-		 free(err_str);

-	      }

-

-	      YYERROR;

-	   }

-	;}

-    break;

-

-  case 246:

-

-/* Line 1455 of yacc.c  */

-#line 1967 "program_parse.y"

-    {

-	;}

-    break;

-

-  case 247:

-

-/* Line 1455 of yacc.c  */

-#line 1971 "program_parse.y"

-    { (yyval.integer) = (yyvsp[(1) - (1)].integer); ;}

-    break;

-

-  case 249:

-

-/* Line 1455 of yacc.c  */

-#line 1975 "program_parse.y"

-    {

-	   if (!declare_variable(state, (yyvsp[(3) - (3)].string), (yyvsp[(0) - (3)].integer), & (yylsp[(3) - (3)]))) {

-	      free((yyvsp[(3) - (3)].string));

-	      YYERROR;

-	   }

-	;}

-    break;

-

-  case 250:

-

-/* Line 1455 of yacc.c  */

-#line 1982 "program_parse.y"

-    {

-	   if (!declare_variable(state, (yyvsp[(1) - (1)].string), (yyvsp[(0) - (1)].integer), & (yylsp[(1) - (1)]))) {

-	      free((yyvsp[(1) - (1)].string));

-	      YYERROR;

-	   }

-	;}

-    break;

-

-  case 251:

-

-/* Line 1455 of yacc.c  */

-#line 1991 "program_parse.y"

-    {

-	   struct asm_symbol *const s =

-	      declare_variable(state, (yyvsp[(3) - (5)].string), at_output, & (yylsp[(3) - (5)]));

-

-	   if (s == NULL) {

-	      free((yyvsp[(3) - (5)].string));

-	      YYERROR;

-	   } else {

-	      s->output_binding = (yyvsp[(5) - (5)].result);

-	   }

-	;}

-    break;

-

-  case 252:

-

-/* Line 1455 of yacc.c  */

-#line 2005 "program_parse.y"

-    {

-	   if (state->mode == ARB_vertex) {

-	      (yyval.result) = VERT_RESULT_HPOS;

-	   } else {

-	      yyerror(& (yylsp[(2) - (2)]), state, "invalid program result name");

-	      YYERROR;

-	   }

-	;}

-    break;

-

-  case 253:

-

-/* Line 1455 of yacc.c  */

-#line 2014 "program_parse.y"

-    {

-	   if (state->mode == ARB_vertex) {

-	      (yyval.result) = VERT_RESULT_FOGC;

-	   } else {

-	      yyerror(& (yylsp[(2) - (2)]), state, "invalid program result name");

-	      YYERROR;

-	   }

-	;}

-    break;

-

-  case 254:

-

-/* Line 1455 of yacc.c  */

-#line 2023 "program_parse.y"

-    {

-	   (yyval.result) = (yyvsp[(2) - (2)].result);

-	;}

-    break;

-

-  case 255:

-

-/* Line 1455 of yacc.c  */

-#line 2027 "program_parse.y"

-    {

-	   if (state->mode == ARB_vertex) {

-	      (yyval.result) = VERT_RESULT_PSIZ;

-	   } else {

-	      yyerror(& (yylsp[(2) - (2)]), state, "invalid program result name");

-	      YYERROR;

-	   }

-	;}

-    break;

-

-  case 256:

-

-/* Line 1455 of yacc.c  */

-#line 2036 "program_parse.y"

-    {

-	   if (state->mode == ARB_vertex) {

-	      (yyval.result) = VERT_RESULT_TEX0 + (yyvsp[(3) - (3)].integer);

-	   } else {

-	      yyerror(& (yylsp[(2) - (3)]), state, "invalid program result name");

-	      YYERROR;

-	   }

-	;}

-    break;

-

-  case 257:

-

-/* Line 1455 of yacc.c  */

-#line 2045 "program_parse.y"

-    {

-	   if (state->mode == ARB_fragment) {

-	      (yyval.result) = FRAG_RESULT_DEPTH;

-	   } else {

-	      yyerror(& (yylsp[(2) - (2)]), state, "invalid program result name");

-	      YYERROR;

-	   }

-	;}

-    break;

-

-  case 258:

-

-/* Line 1455 of yacc.c  */

-#line 2056 "program_parse.y"

-    {

-	   (yyval.result) = (yyvsp[(2) - (3)].integer) + (yyvsp[(3) - (3)].integer);

-	;}

-    break;

-

-  case 259:

-

-/* Line 1455 of yacc.c  */

-#line 2062 "program_parse.y"

-    {

-	   (yyval.integer) = (state->mode == ARB_vertex)

-	      ? VERT_RESULT_COL0

-	      : FRAG_RESULT_COLOR;

-	;}

-    break;

-

-  case 260:

-

-/* Line 1455 of yacc.c  */

-#line 2068 "program_parse.y"

-    {

-	   if (state->mode == ARB_vertex) {

-	      (yyval.integer) = VERT_RESULT_COL0;

-	   } else {

-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid program result name");

-	      YYERROR;

-	   }

-	;}

-    break;

-

-  case 261:

-

-/* Line 1455 of yacc.c  */

-#line 2077 "program_parse.y"

-    {

-	   if (state->mode == ARB_vertex) {

-	      (yyval.integer) = VERT_RESULT_BFC0;

-	   } else {

-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid program result name");

-	      YYERROR;

-	   }

-	;}

-    break;

-

-  case 262:

-

-/* Line 1455 of yacc.c  */

-#line 2088 "program_parse.y"

-    {

-	   (yyval.integer) = 0; 

-	;}

-    break;

-

-  case 263:

-

-/* Line 1455 of yacc.c  */

-#line 2092 "program_parse.y"

-    {

-	   if (state->mode == ARB_vertex) {

-	      (yyval.integer) = 0;

-	   } else {

-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid program result name");

-	      YYERROR;

-	   }

-	;}

-    break;

-

-  case 264:

-

-/* Line 1455 of yacc.c  */

-#line 2101 "program_parse.y"

-    {

-	   if (state->mode == ARB_vertex) {

-	      (yyval.integer) = 1;

-	   } else {

-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid program result name");

-	      YYERROR;

-	   }

-	;}

-    break;

-

-  case 265:

-

-/* Line 1455 of yacc.c  */

-#line 2111 "program_parse.y"

-    { (yyval.integer) = 0; ;}

-    break;

-

-  case 266:

-

-/* Line 1455 of yacc.c  */

-#line 2112 "program_parse.y"

-    { (yyval.integer) = 0; ;}

-    break;

-

-  case 267:

-

-/* Line 1455 of yacc.c  */

-#line 2113 "program_parse.y"

-    { (yyval.integer) = 1; ;}

-    break;

-

-  case 268:

-

-/* Line 1455 of yacc.c  */

-#line 2116 "program_parse.y"

-    { (yyval.integer) = 0; ;}

-    break;

-

-  case 269:

-

-/* Line 1455 of yacc.c  */

-#line 2117 "program_parse.y"

-    { (yyval.integer) = 0; ;}

-    break;

-

-  case 270:

-

-/* Line 1455 of yacc.c  */

-#line 2118 "program_parse.y"

-    { (yyval.integer) = 1; ;}

-    break;

-

-  case 271:

-

-/* Line 1455 of yacc.c  */

-#line 2121 "program_parse.y"

-    { (yyval.integer) = 0; ;}

-    break;

-

-  case 272:

-

-/* Line 1455 of yacc.c  */

-#line 2122 "program_parse.y"

-    { (yyval.integer) = (yyvsp[(2) - (3)].integer); ;}

-    break;

-

-  case 273:

-

-/* Line 1455 of yacc.c  */

-#line 2125 "program_parse.y"

-    { (yyval.integer) = 0; ;}

-    break;

-

-  case 274:

-

-/* Line 1455 of yacc.c  */

-#line 2126 "program_parse.y"

-    { (yyval.integer) = (yyvsp[(2) - (3)].integer); ;}

-    break;

-

-  case 275:

-

-/* Line 1455 of yacc.c  */

-#line 2129 "program_parse.y"

-    { (yyval.integer) = 0; ;}

-    break;

-

-  case 276:

-

-/* Line 1455 of yacc.c  */

-#line 2130 "program_parse.y"

-    { (yyval.integer) = (yyvsp[(2) - (3)].integer); ;}

-    break;

-

-  case 277:

-

-/* Line 1455 of yacc.c  */

-#line 2134 "program_parse.y"

-    {

-	   if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->MaxTextureCoordUnits) {

-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid texture coordinate unit selector");

-	      YYERROR;

-	   }

-

-	   (yyval.integer) = (yyvsp[(1) - (1)].integer);

-	;}

-    break;

-

-  case 278:

-

-/* Line 1455 of yacc.c  */

-#line 2145 "program_parse.y"

-    {

-	   if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->MaxTextureImageUnits) {

-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid texture image unit selector");

-	      YYERROR;

-	   }

-

-	   (yyval.integer) = (yyvsp[(1) - (1)].integer);

-	;}

-    break;

-

-  case 279:

-

-/* Line 1455 of yacc.c  */

-#line 2156 "program_parse.y"

-    {

-	   if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->MaxTextureUnits) {

-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid texture unit selector");

-	      YYERROR;

-	   }

-

-	   (yyval.integer) = (yyvsp[(1) - (1)].integer);

-	;}

-    break;

-

-  case 280:

-

-/* Line 1455 of yacc.c  */

-#line 2167 "program_parse.y"

-    {

-	   struct asm_symbol *exist = (struct asm_symbol *)

-	      _mesa_symbol_table_find_symbol(state->st, 0, (yyvsp[(2) - (4)].string));

-	   struct asm_symbol *target = (struct asm_symbol *)

-	      _mesa_symbol_table_find_symbol(state->st, 0, (yyvsp[(4) - (4)].string));

-

-	   free((yyvsp[(4) - (4)].string));

-

-	   if (exist != NULL) {

-	      char m[1000];

-	      _mesa_snprintf(m, sizeof(m), "redeclared identifier: %s", (yyvsp[(2) - (4)].string));

-	      free((yyvsp[(2) - (4)].string));

-	      yyerror(& (yylsp[(2) - (4)]), state, m);

-	      YYERROR;

-	   } else if (target == NULL) {

-	      free((yyvsp[(2) - (4)].string));

-	      yyerror(& (yylsp[(4) - (4)]), state,

-		      "undefined variable binding in ALIAS statement");

-	      YYERROR;

-	   } else {

-	      _mesa_symbol_table_add_symbol(state->st, 0, (yyvsp[(2) - (4)].string), target);

-	   }

-	;}

-    break;

-

-

-

-/* Line 1455 of yacc.c  */

-#line 4938 "program_parse.tab.c"

-      default: break;

-    }

-  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);

-

-  YYPOPSTACK (yylen);

-  yylen = 0;

-  YY_STACK_PRINT (yyss, yyssp);

-

-  *++yyvsp = yyval;

-  *++yylsp = yyloc;

-

-  /* Now `shift' the result of the reduction.  Determine what state

-     that goes to, based on the state we popped back to and the rule

-     number reduced by.  */

-

-  yyn = yyr1[yyn];

-

-  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;

-  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)

-    yystate = yytable[yystate];

-  else

-    yystate = yydefgoto[yyn - YYNTOKENS];

-

-  goto yynewstate;

-

-

-/*------------------------------------.

-| yyerrlab -- here on detecting error |

-`------------------------------------*/

-yyerrlab:

-  /* If not already recovering from an error, report this error.  */

-  if (!yyerrstatus)

-    {

-      ++yynerrs;

-#if ! YYERROR_VERBOSE

-      yyerror (&yylloc, state, YY_("syntax error"));

-#else

-      {

-	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);

-	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)

-	  {

-	    YYSIZE_T yyalloc = 2 * yysize;

-	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))

-	      yyalloc = YYSTACK_ALLOC_MAXIMUM;

-	    if (yymsg != yymsgbuf)

-	      YYSTACK_FREE (yymsg);

-	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);

-	    if (yymsg)

-	      yymsg_alloc = yyalloc;

-	    else

-	      {

-		yymsg = yymsgbuf;

-		yymsg_alloc = sizeof yymsgbuf;

-	      }

-	  }

-

-	if (0 < yysize && yysize <= yymsg_alloc)

-	  {

-	    (void) yysyntax_error (yymsg, yystate, yychar);

-	    yyerror (&yylloc, state, yymsg);

-	  }

-	else

-	  {

-	    yyerror (&yylloc, state, YY_("syntax error"));

-	    if (yysize != 0)

-	      goto yyexhaustedlab;

-	  }

-      }

-#endif

-    }

-

-  yyerror_range[0] = yylloc;

-

-  if (yyerrstatus == 3)

-    {

-      /* If just tried and failed to reuse lookahead token after an

-	 error, discard it.  */

-

-      if (yychar <= YYEOF)

-	{

-	  /* Return failure if at end of input.  */

-	  if (yychar == YYEOF)

-	    YYABORT;

-	}

-      else

-	{

-	  yydestruct ("Error: discarding",

-		      yytoken, &yylval, &yylloc, state);

-	  yychar = YYEMPTY;

-	}

-    }

-

-  /* Else will try to reuse lookahead token after shifting the error

-     token.  */

-  goto yyerrlab1;

-

-

-/*---------------------------------------------------.

-| yyerrorlab -- error raised explicitly by YYERROR.  |

-`---------------------------------------------------*/

-yyerrorlab:

-

-  /* Pacify compilers like GCC when the user code never invokes

-     YYERROR and the label yyerrorlab therefore never appears in user

-     code.  */

-  if (/*CONSTCOND*/ 0)

-     goto yyerrorlab;

-

-  yyerror_range[0] = yylsp[1-yylen];

-  /* Do not reclaim the symbols of the rule which action triggered

-     this YYERROR.  */

-  YYPOPSTACK (yylen);

-  yylen = 0;

-  YY_STACK_PRINT (yyss, yyssp);

-  yystate = *yyssp;

-  goto yyerrlab1;

-

-

-/*-------------------------------------------------------------.

-| yyerrlab1 -- common code for both syntax error and YYERROR.  |

-`-------------------------------------------------------------*/

-yyerrlab1:

-  yyerrstatus = 3;	/* Each real token shifted decrements this.  */

-

-  for (;;)

-    {

-      yyn = yypact[yystate];

-      if (yyn != YYPACT_NINF)

-	{

-	  yyn += YYTERROR;

-	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)

-	    {

-	      yyn = yytable[yyn];

-	      if (0 < yyn)

-		break;

-	    }

-	}

-

-      /* Pop the current state because it cannot handle the error token.  */

-      if (yyssp == yyss)

-	YYABORT;

-

-      yyerror_range[0] = *yylsp;

-      yydestruct ("Error: popping",

-		  yystos[yystate], yyvsp, yylsp, state);

-      YYPOPSTACK (1);

-      yystate = *yyssp;

-      YY_STACK_PRINT (yyss, yyssp);

-    }

-

-  *++yyvsp = yylval;

-

-  yyerror_range[1] = yylloc;

-  /* Using YYLLOC is tempting, but would change the location of

-     the lookahead.  YYLOC is available though.  */

-  YYLLOC_DEFAULT (yyloc, (yyerror_range - 1), 2);

-  *++yylsp = yyloc;

-

-  /* Shift the error token.  */

-  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);

-

-  yystate = yyn;

-  goto yynewstate;

-

-

-/*-------------------------------------.

-| yyacceptlab -- YYACCEPT comes here.  |

-`-------------------------------------*/

-yyacceptlab:

-  yyresult = 0;

-  goto yyreturn;

-

-/*-----------------------------------.

-| yyabortlab -- YYABORT comes here.  |

-`-----------------------------------*/

-yyabortlab:

-  yyresult = 1;

-  goto yyreturn;

-

-#if !defined(yyoverflow) || YYERROR_VERBOSE

-/*-------------------------------------------------.

-| yyexhaustedlab -- memory exhaustion comes here.  |

-`-------------------------------------------------*/

-yyexhaustedlab:

-  yyerror (&yylloc, state, YY_("memory exhausted"));

-  yyresult = 2;

-  /* Fall through.  */

-#endif

-

-yyreturn:

-  if (yychar != YYEMPTY)

-     yydestruct ("Cleanup: discarding lookahead",

-		 yytoken, &yylval, &yylloc, state);

-  /* Do not reclaim the symbols of the rule which action triggered

-     this YYABORT or YYACCEPT.  */

-  YYPOPSTACK (yylen);

-  YY_STACK_PRINT (yyss, yyssp);

-  while (yyssp != yyss)

-    {

-      yydestruct ("Cleanup: popping",

-		  yystos[*yyssp], yyvsp, yylsp, state);

-      YYPOPSTACK (1);

-    }

-#ifndef yyoverflow

-  if (yyss != yyssa)

-    YYSTACK_FREE (yyss);

-#endif

-#if YYERROR_VERBOSE

-  if (yymsg != yymsgbuf)

-    YYSTACK_FREE (yymsg);

-#endif

-  /* Make sure YYID is used.  */

-  return YYID (yyresult);

-}

-

-

-

-/* Line 1675 of yacc.c  */

-#line 2196 "program_parse.y"

-

-

-void

-asm_instruction_set_operands(struct asm_instruction *inst,

-			     const struct prog_dst_register *dst,

-			     const struct asm_src_register *src0,

-			     const struct asm_src_register *src1,

-			     const struct asm_src_register *src2)

-{

-   /* In the core ARB extensions only the KIL instruction doesn't have a

-    * destination register.

-    */

-   if (dst == NULL) {

-      init_dst_reg(& inst->Base.DstReg);

-   } else {

-      inst->Base.DstReg = *dst;

-   }

-

-   /* The only instruction that doesn't have any source registers is the

-    * condition-code based KIL instruction added by NV_fragment_program_option.

-    */

-   if (src0 != NULL) {

-      inst->Base.SrcReg[0] = src0->Base;

-      inst->SrcReg[0] = *src0;

-   } else {

-      init_src_reg(& inst->SrcReg[0]);

-   }

-

-   if (src1 != NULL) {

-      inst->Base.SrcReg[1] = src1->Base;

-      inst->SrcReg[1] = *src1;

-   } else {

-      init_src_reg(& inst->SrcReg[1]);

-   }

-

-   if (src2 != NULL) {

-      inst->Base.SrcReg[2] = src2->Base;

-      inst->SrcReg[2] = *src2;

-   } else {

-      init_src_reg(& inst->SrcReg[2]);

-   }

-}

-

-

-struct asm_instruction *

-asm_instruction_ctor(gl_inst_opcode op,

-		     const struct prog_dst_register *dst,

-		     const struct asm_src_register *src0,

-		     const struct asm_src_register *src1,

-		     const struct asm_src_register *src2)

-{

-   struct asm_instruction *inst = CALLOC_STRUCT(asm_instruction);

-

-   if (inst) {

-      _mesa_init_instructions(& inst->Base, 1);

-      inst->Base.Opcode = op;

-

-      asm_instruction_set_operands(inst, dst, src0, src1, src2);

-   }

-

-   return inst;

-}

-

-

-struct asm_instruction *

-asm_instruction_copy_ctor(const struct prog_instruction *base,

-			  const struct prog_dst_register *dst,

-			  const struct asm_src_register *src0,

-			  const struct asm_src_register *src1,

-			  const struct asm_src_register *src2)

-{

-   struct asm_instruction *inst = CALLOC_STRUCT(asm_instruction);

-

-   if (inst) {

-      _mesa_init_instructions(& inst->Base, 1);

-      inst->Base.Opcode = base->Opcode;

-      inst->Base.CondUpdate = base->CondUpdate;

-      inst->Base.CondDst = base->CondDst;

-      inst->Base.SaturateMode = base->SaturateMode;

-      inst->Base.Precision = base->Precision;

-

-      asm_instruction_set_operands(inst, dst, src0, src1, src2);

-   }

-

-   return inst;

-}

-

-

-void

-init_dst_reg(struct prog_dst_register *r)

-{

-   memset(r, 0, sizeof(*r));

-   r->File = PROGRAM_UNDEFINED;

-   r->WriteMask = WRITEMASK_XYZW;

-   r->CondMask = COND_TR;

-   r->CondSwizzle = SWIZZLE_NOOP;

-}

-

-

-/** Like init_dst_reg() but set the File and Index fields. */

-void

-set_dst_reg(struct prog_dst_register *r, gl_register_file file, GLint index)

-{

-   const GLint maxIndex = 1 << INST_INDEX_BITS;

-   const GLint minIndex = 0;

-   ASSERT(index >= minIndex);

-   (void) minIndex;

-   ASSERT(index <= maxIndex);

-   (void) maxIndex;

-   ASSERT(file == PROGRAM_TEMPORARY ||

-	  file == PROGRAM_ADDRESS ||

-	  file == PROGRAM_OUTPUT);

-   memset(r, 0, sizeof(*r));

-   r->File = file;

-   r->Index = index;

-   r->WriteMask = WRITEMASK_XYZW;

-   r->CondMask = COND_TR;

-   r->CondSwizzle = SWIZZLE_NOOP;

-}

-

-

-void

-init_src_reg(struct asm_src_register *r)

-{

-   memset(r, 0, sizeof(*r));

-   r->Base.File = PROGRAM_UNDEFINED;

-   r->Base.Swizzle = SWIZZLE_NOOP;

-   r->Symbol = NULL;

-}

-

-

-/** Like init_src_reg() but set the File and Index fields.

- * \return GL_TRUE if a valid src register, GL_FALSE otherwise

- */

-void

-set_src_reg(struct asm_src_register *r, gl_register_file file, GLint index)

-{

-   set_src_reg_swz(r, file, index, SWIZZLE_XYZW);

-}

-

-

-void

-set_src_reg_swz(struct asm_src_register *r, gl_register_file file, GLint index,

-                GLuint swizzle)

-{

-   const GLint maxIndex = (1 << INST_INDEX_BITS) - 1;

-   const GLint minIndex = -(1 << INST_INDEX_BITS);

-   ASSERT(file < PROGRAM_FILE_MAX);

-   ASSERT(index >= minIndex);

-   (void) minIndex;

-   ASSERT(index <= maxIndex);

-   (void) maxIndex;

-   memset(r, 0, sizeof(*r));

-   r->Base.File = file;

-   r->Base.Index = index;

-   r->Base.Swizzle = swizzle;

-   r->Symbol = NULL;

-}

-

-

-/**

- * Validate the set of inputs used by a program

- *

- * Validates that legal sets of inputs are used by the program.  In this case

- * "used" included both reading the input or binding the input to a name using

- * the \c ATTRIB command.

- *

- * \return

- * \c TRUE if the combination of inputs used is valid, \c FALSE otherwise.

- */

-int

-validate_inputs(struct YYLTYPE *locp, struct asm_parser_state *state)

-{

-   const int inputs = state->prog->InputsRead | state->InputsBound;

-

-   if (((inputs & 0x0ffff) & (inputs >> 16)) != 0) {

-      yyerror(locp, state, "illegal use of generic attribute and name attribute");

-      return 0;

-   }

-

-   return 1;

-}

-

-

-struct asm_symbol *

-declare_variable(struct asm_parser_state *state, char *name, enum asm_type t,

-		 struct YYLTYPE *locp)

-{

-   struct asm_symbol *s = NULL;

-   struct asm_symbol *exist = (struct asm_symbol *)

-      _mesa_symbol_table_find_symbol(state->st, 0, name);

-

-

-   if (exist != NULL) {

-      yyerror(locp, state, "redeclared identifier");

-   } else {

-      s = calloc(1, sizeof(struct asm_symbol));

-      s->name = name;

-      s->type = t;

-

-      switch (t) {

-      case at_temp:

-	 if (state->prog->NumTemporaries >= state->limits->MaxTemps) {

-	    yyerror(locp, state, "too many temporaries declared");

-	    free(s);

-	    return NULL;

-	 }

-

-	 s->temp_binding = state->prog->NumTemporaries;

-	 state->prog->NumTemporaries++;

-	 break;

-

-      case at_address:

-	 if (state->prog->NumAddressRegs >= state->limits->MaxAddressRegs) {

-	    yyerror(locp, state, "too many address registers declared");

-	    free(s);

-	    return NULL;

-	 }

-

-	 /* FINISHME: Add support for multiple address registers.

-	  */

-	 state->prog->NumAddressRegs++;

-	 break;

-

-      default:

-	 break;

-      }

-

-      _mesa_symbol_table_add_symbol(state->st, 0, s->name, s);

-      s->next = state->sym;

-      state->sym = s;

-   }

-

-   return s;

-}

-

-

-int add_state_reference(struct gl_program_parameter_list *param_list,

-			const gl_state_index tokens[STATE_LENGTH])

-{

-   const GLuint size = 4; /* XXX fix */

-   char *name;

-   GLint index;

-

-   name = _mesa_program_state_string(tokens);

-   index = _mesa_add_parameter(param_list, PROGRAM_STATE_VAR, name,

-                               size, GL_NONE, NULL, tokens, 0x0);

-   param_list->StateFlags |= _mesa_program_state_flags(tokens);

-

-   /* free name string here since we duplicated it in add_parameter() */

-   free(name);

-

-   return index;

-}

-

-

-int

-initialize_symbol_from_state(struct gl_program *prog,

-			     struct asm_symbol *param_var, 

-			     const gl_state_index tokens[STATE_LENGTH])

-{

-   int idx = -1;

-   gl_state_index state_tokens[STATE_LENGTH];

-

-

-   memcpy(state_tokens, tokens, sizeof(state_tokens));

-

-   param_var->type = at_param;

-   param_var->param_binding_type = PROGRAM_STATE_VAR;

-

-   /* If we are adding a STATE_MATRIX that has multiple rows, we need to

-    * unroll it and call add_state_reference() for each row

-    */

-   if ((state_tokens[0] == STATE_MODELVIEW_MATRIX ||

-	state_tokens[0] == STATE_PROJECTION_MATRIX ||

-	state_tokens[0] == STATE_MVP_MATRIX ||

-	state_tokens[0] == STATE_TEXTURE_MATRIX ||

-	state_tokens[0] == STATE_PROGRAM_MATRIX)

-       && (state_tokens[2] != state_tokens[3])) {

-      int row;

-      const int first_row = state_tokens[2];

-      const int last_row = state_tokens[3];

-

-      for (row = first_row; row <= last_row; row++) {

-	 state_tokens[2] = state_tokens[3] = row;

-

-	 idx = add_state_reference(prog->Parameters, state_tokens);

-	 if (param_var->param_binding_begin == ~0U) {

-	    param_var->param_binding_begin = idx;

-            param_var->param_binding_swizzle = SWIZZLE_XYZW;

-         }

-

-	 param_var->param_binding_length++;

-      }

-   }

-   else {

-      idx = add_state_reference(prog->Parameters, state_tokens);

-      if (param_var->param_binding_begin == ~0U) {

-	 param_var->param_binding_begin = idx;

-         param_var->param_binding_swizzle = SWIZZLE_XYZW;

-      }

-      param_var->param_binding_length++;

-   }

-

-   return idx;

-}

-

-

-int

-initialize_symbol_from_param(struct gl_program *prog,

-			     struct asm_symbol *param_var, 

-			     const gl_state_index tokens[STATE_LENGTH])

-{

-   int idx = -1;

-   gl_state_index state_tokens[STATE_LENGTH];

-

-

-   memcpy(state_tokens, tokens, sizeof(state_tokens));

-

-   assert((state_tokens[0] == STATE_VERTEX_PROGRAM)

-	  || (state_tokens[0] == STATE_FRAGMENT_PROGRAM));

-   assert((state_tokens[1] == STATE_ENV)

-	  || (state_tokens[1] == STATE_LOCAL));

-

-   /*

-    * The param type is STATE_VAR.  The program parameter entry will

-    * effectively be a pointer into the LOCAL or ENV parameter array.

-    */

-   param_var->type = at_param;

-   param_var->param_binding_type = PROGRAM_STATE_VAR;

-

-   /* If we are adding a STATE_ENV or STATE_LOCAL that has multiple elements,

-    * we need to unroll it and call add_state_reference() for each row

-    */

-   if (state_tokens[2] != state_tokens[3]) {

-      int row;

-      const int first_row = state_tokens[2];

-      const int last_row = state_tokens[3];

-

-      for (row = first_row; row <= last_row; row++) {

-	 state_tokens[2] = state_tokens[3] = row;

-

-	 idx = add_state_reference(prog->Parameters, state_tokens);

-	 if (param_var->param_binding_begin == ~0U) {

-	    param_var->param_binding_begin = idx;

-            param_var->param_binding_swizzle = SWIZZLE_XYZW;

-         }

-	 param_var->param_binding_length++;

-      }

-   }

-   else {

-      idx = add_state_reference(prog->Parameters, state_tokens);

-      if (param_var->param_binding_begin == ~0U) {

-	 param_var->param_binding_begin = idx;

-         param_var->param_binding_swizzle = SWIZZLE_XYZW;

-      }

-      param_var->param_binding_length++;

-   }

-

-   return idx;

-}

-

-

-/**

- * Put a float/vector constant/literal into the parameter list.

- * \param param_var  returns info about the parameter/constant's location,

- *                   binding, type, etc.

- * \param vec  the vector/constant to add

- * \param allowSwizzle  if true, try to consolidate constants which only differ

- *                      by a swizzle.  We don't want to do this when building

- *                      arrays of constants that may be indexed indirectly.

- * \return index of the constant in the parameter list.

- */

-int

-initialize_symbol_from_const(struct gl_program *prog,

-			     struct asm_symbol *param_var, 

-			     const struct asm_vector *vec,

-                             GLboolean allowSwizzle)

-{

-   unsigned swizzle;

-   const int idx = _mesa_add_unnamed_constant(prog->Parameters,

-                                              vec->data, vec->count,

-                                              allowSwizzle ? &swizzle : NULL);

-

-   param_var->type = at_param;

-   param_var->param_binding_type = PROGRAM_CONSTANT;

-

-   if (param_var->param_binding_begin == ~0U) {

-      param_var->param_binding_begin = idx;

-      param_var->param_binding_swizzle = allowSwizzle ? swizzle : SWIZZLE_XYZW;

-   }

-   param_var->param_binding_length++;

-

-   return idx;

-}

-

-

-char *

-make_error_string(const char *fmt, ...)

-{

-   int length;

-   char *str;

-   va_list args;

-

-

-   /* Call vsnprintf once to determine how large the final string is.  Call it

-    * again to do the actual formatting.  from the vsnprintf manual page:

-    *

-    *    Upon successful return, these functions return the number of

-    *    characters printed  (not including the trailing '\0' used to end

-    *    output to strings).

-    */

-   va_start(args, fmt);

-   length = 1 + vsnprintf(NULL, 0, fmt, args);

-   va_end(args);

-

-   str = malloc(length);

-   if (str) {

-      va_start(args, fmt);

-      vsnprintf(str, length, fmt, args);

-      va_end(args);

-   }

-

-   return str;

-}

-

-

-void

-yyerror(YYLTYPE *locp, struct asm_parser_state *state, const char *s)

-{

-   char *err_str;

-

-

-   err_str = make_error_string("glProgramStringARB(%s)\n", s);

-   if (err_str) {

-      _mesa_error(state->ctx, GL_INVALID_OPERATION, "%s", err_str);

-      free(err_str);

-   }

-

-   err_str = make_error_string("line %u, char %u: error: %s\n",

-			       locp->first_line, locp->first_column, s);

-   _mesa_set_program_error(state->ctx, locp->position, err_str);

-

-   if (err_str) {

-      free(err_str);

-   }

-}

-

-

-GLboolean

-_mesa_parse_arb_program(struct gl_context *ctx, GLenum target, const GLubyte *str,

-			GLsizei len, struct asm_parser_state *state)

-{

-   struct asm_instruction *inst;

-   unsigned i;

-   GLubyte *strz;

-   GLboolean result = GL_FALSE;

-   void *temp;

-   struct asm_symbol *sym;

-

-   state->ctx = ctx;

-   state->prog->Target = target;

-   state->prog->Parameters = _mesa_new_parameter_list();

-

-   /* Make a copy of the program string and force it to be NUL-terminated.

-    */

-   strz = (GLubyte *) malloc(len + 1);

-   if (strz == NULL) {

-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glProgramStringARB");

-      return GL_FALSE;

-   }

-   memcpy (strz, str, len);

-   strz[len] = '\0';

-

-   state->prog->String = strz;

-

-   state->st = _mesa_symbol_table_ctor();

-

-   state->limits = (target == GL_VERTEX_PROGRAM_ARB)

-      ? & ctx->Const.VertexProgram

-      : & ctx->Const.FragmentProgram;

-

-   state->MaxTextureImageUnits = ctx->Const.MaxTextureImageUnits;

-   state->MaxTextureCoordUnits = ctx->Const.MaxTextureCoordUnits;

-   state->MaxTextureUnits = ctx->Const.MaxTextureUnits;

-   state->MaxClipPlanes = ctx->Const.MaxClipPlanes;

-   state->MaxLights = ctx->Const.MaxLights;

-   state->MaxProgramMatrices = ctx->Const.MaxProgramMatrices;

-

-   state->state_param_enum = (target == GL_VERTEX_PROGRAM_ARB)

-      ? STATE_VERTEX_PROGRAM : STATE_FRAGMENT_PROGRAM;

-

-   _mesa_set_program_error(ctx, -1, NULL);

-

-   _mesa_program_lexer_ctor(& state->scanner, state, (const char *) str, len);

-   yyparse(state);

-   _mesa_program_lexer_dtor(state->scanner);

-

-

-   if (ctx->Program.ErrorPos != -1) {

-      goto error;

-   }

-

-   if (! _mesa_layout_parameters(state)) {

-      struct YYLTYPE loc;

-

-      loc.first_line = 0;

-      loc.first_column = 0;

-      loc.position = len;

-

-      yyerror(& loc, state, "invalid PARAM usage");

-      goto error;

-   }

-

-

-   

-   /* Add one instruction to store the "END" instruction.

-    */

-   state->prog->Instructions =

-      _mesa_alloc_instructions(state->prog->NumInstructions + 1);

-   inst = state->inst_head;

-   for (i = 0; i < state->prog->NumInstructions; i++) {

-      struct asm_instruction *const temp = inst->next;

-

-      state->prog->Instructions[i] = inst->Base;

-      inst = temp;

-   }

-

-   /* Finally, tag on an OPCODE_END instruction */

-   {

-      const GLuint numInst = state->prog->NumInstructions;

-      _mesa_init_instructions(state->prog->Instructions + numInst, 1);

-      state->prog->Instructions[numInst].Opcode = OPCODE_END;

-   }

-   state->prog->NumInstructions++;

-

-   state->prog->NumParameters = state->prog->Parameters->NumParameters;

-   state->prog->NumAttributes = _mesa_bitcount(state->prog->InputsRead);

-

-   /*

-    * Initialize native counts to logical counts.  The device driver may

-    * change them if program is translated into a hardware program.

-    */

-   state->prog->NumNativeInstructions = state->prog->NumInstructions;

-   state->prog->NumNativeTemporaries = state->prog->NumTemporaries;

-   state->prog->NumNativeParameters = state->prog->NumParameters;

-   state->prog->NumNativeAttributes = state->prog->NumAttributes;

-   state->prog->NumNativeAddressRegs = state->prog->NumAddressRegs;

-

-   result = GL_TRUE;

-

-error:

-   for (inst = state->inst_head; inst != NULL; inst = temp) {

-      temp = inst->next;

-      free(inst);

-   }

-

-   state->inst_head = NULL;

-   state->inst_tail = NULL;

-

-   for (sym = state->sym; sym != NULL; sym = temp) {

-      temp = sym->next;

-

-      free((void *) sym->name);

-      free(sym);

-   }

-   state->sym = NULL;

-

-   _mesa_symbol_table_dtor(state->st);

-   state->st = NULL;

-

-   return result;

-}

-

diff --git a/mesalib/src/mesa/program/program_parse.tab.h b/mesalib/src/mesa/program/program_parse.tab.h
deleted file mode 100644
index 045241d9e..000000000
--- a/mesalib/src/mesa/program/program_parse.tab.h
+++ /dev/null
@@ -1,209 +0,0 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1.  */
-
-/* Skeleton interface for Bison's Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
-   
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* As a special exception, you may create a larger work that contains
-   part or all of the Bison parser skeleton and distribute that work
-   under terms of your choice, so long as that work isn't itself a
-   parser generator using the skeleton or a modified version thereof
-   as a parser skeleton.  Alternatively, if you modify or redistribute
-   the parser skeleton itself, you may (at your option) remove this
-   special exception, which will cause the skeleton and the resulting
-   Bison output files to be licensed under the GNU General Public
-   License without this special exception.
-   
-   This special exception was added by the Free Software Foundation in
-   version 2.2 of Bison.  */
-
-
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     ARBvp_10 = 258,
-     ARBfp_10 = 259,
-     ADDRESS = 260,
-     ALIAS = 261,
-     ATTRIB = 262,
-     OPTION = 263,
-     OUTPUT = 264,
-     PARAM = 265,
-     TEMP = 266,
-     END = 267,
-     BIN_OP = 268,
-     BINSC_OP = 269,
-     SAMPLE_OP = 270,
-     SCALAR_OP = 271,
-     TRI_OP = 272,
-     VECTOR_OP = 273,
-     ARL = 274,
-     KIL = 275,
-     SWZ = 276,
-     TXD_OP = 277,
-     INTEGER = 278,
-     REAL = 279,
-     AMBIENT = 280,
-     ATTENUATION = 281,
-     BACK = 282,
-     CLIP = 283,
-     COLOR = 284,
-     DEPTH = 285,
-     DIFFUSE = 286,
-     DIRECTION = 287,
-     EMISSION = 288,
-     ENV = 289,
-     EYE = 290,
-     FOG = 291,
-     FOGCOORD = 292,
-     FRAGMENT = 293,
-     FRONT = 294,
-     HALF = 295,
-     INVERSE = 296,
-     INVTRANS = 297,
-     LIGHT = 298,
-     LIGHTMODEL = 299,
-     LIGHTPROD = 300,
-     LOCAL = 301,
-     MATERIAL = 302,
-     MAT_PROGRAM = 303,
-     MATRIX = 304,
-     MATRIXINDEX = 305,
-     MODELVIEW = 306,
-     MVP = 307,
-     NORMAL = 308,
-     OBJECT = 309,
-     PALETTE = 310,
-     PARAMS = 311,
-     PLANE = 312,
-     POINT_TOK = 313,
-     POINTSIZE = 314,
-     POSITION = 315,
-     PRIMARY = 316,
-     PROGRAM = 317,
-     PROJECTION = 318,
-     RANGE = 319,
-     RESULT = 320,
-     ROW = 321,
-     SCENECOLOR = 322,
-     SECONDARY = 323,
-     SHININESS = 324,
-     SIZE_TOK = 325,
-     SPECULAR = 326,
-     SPOT = 327,
-     STATE = 328,
-     TEXCOORD = 329,
-     TEXENV = 330,
-     TEXGEN = 331,
-     TEXGEN_Q = 332,
-     TEXGEN_R = 333,
-     TEXGEN_S = 334,
-     TEXGEN_T = 335,
-     TEXTURE = 336,
-     TRANSPOSE = 337,
-     TEXTURE_UNIT = 338,
-     TEX_1D = 339,
-     TEX_2D = 340,
-     TEX_3D = 341,
-     TEX_CUBE = 342,
-     TEX_RECT = 343,
-     TEX_SHADOW1D = 344,
-     TEX_SHADOW2D = 345,
-     TEX_SHADOWRECT = 346,
-     TEX_ARRAY1D = 347,
-     TEX_ARRAY2D = 348,
-     TEX_ARRAYSHADOW1D = 349,
-     TEX_ARRAYSHADOW2D = 350,
-     VERTEX = 351,
-     VTXATTRIB = 352,
-     WEIGHT = 353,
-     IDENTIFIER = 354,
-     USED_IDENTIFIER = 355,
-     MASK4 = 356,
-     MASK3 = 357,
-     MASK2 = 358,
-     MASK1 = 359,
-     SWIZZLE = 360,
-     DOT_DOT = 361,
-     DOT = 362
-   };
-#endif
-
-
-
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
-{
-
-/* Line 1676 of yacc.c  */
-#line 126 "program_parse.y"
-
-   struct asm_instruction *inst;
-   struct asm_symbol *sym;
-   struct asm_symbol temp_sym;
-   struct asm_swizzle_mask swiz_mask;
-   struct asm_src_register src_reg;
-   struct prog_dst_register dst_reg;
-   struct prog_instruction temp_inst;
-   char *string;
-   unsigned result;
-   unsigned attrib;
-   int integer;
-   float real;
-   gl_state_index state[STATE_LENGTH];
-   int negate;
-   struct asm_vector vector;
-   gl_inst_opcode opcode;
-
-   struct {
-      unsigned swz;
-      unsigned rgba_valid:1;
-      unsigned xyzw_valid:1;
-      unsigned negate:1;
-   } ext_swizzle;
-
-
-
-/* Line 1676 of yacc.c  */
-#line 187 "program_parse.tab.h"
-} YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
-#endif
-
-
-
-#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
-typedef struct YYLTYPE
-{
-  int first_line;
-  int first_column;
-  int last_line;
-  int last_column;
-} YYLTYPE;
-# define yyltype YYLTYPE /* obsolescent; will be withdrawn */
-# define YYLTYPE_IS_DECLARED 1
-# define YYLTYPE_IS_TRIVIAL 1
-#endif
-
-
-
diff --git a/mesalib/src/mesa/state_tracker/st_draw.c b/mesalib/src/mesa/state_tracker/st_draw.c
index c99eafbad..d6e67b7fb 100644
--- a/mesalib/src/mesa/state_tracker/st_draw.c
+++ b/mesalib/src/mesa/state_tracker/st_draw.c
@@ -307,7 +307,8 @@ setup_interleaved_attribs(struct gl_context *ctx,
                           const struct gl_client_array **arrays,
                           struct pipe_vertex_buffer *vbuffer,
                           struct pipe_vertex_element velements[],
-                          unsigned max_index)
+                          unsigned max_index,
+                          unsigned num_instances)
 {
    struct st_context *st = st_context(ctx);
    struct pipe_context *pipe = st->pipe;
@@ -336,9 +337,11 @@ setup_interleaved_attribs(struct gl_context *ctx,
             pipe_resource_reference(&vbuffer->buffer, stobj->buffer);
             vbuffer->buffer_offset = pointer_to_offset(low_addr);
          } else {
+            uint divisor = arrays[mesaAttr]->InstanceDivisor;
+            uint length = (divisor ? num_instances / divisor : max_index) + 1;
             vbuffer->buffer =
                pipe_user_buffer_create(pipe->screen, (void*)low_addr,
-                                       stride * (max_index + 1),
+                                       stride * length,
 				       PIPE_BIND_VERTEX_BUFFER);
             vbuffer->buffer_offset = 0;
 
@@ -377,7 +380,8 @@ setup_non_interleaved_attribs(struct gl_context *ctx,
                               const struct gl_client_array **arrays,
                               struct pipe_vertex_buffer vbuffer[],
                               struct pipe_vertex_element velements[],
-                              unsigned max_index)
+                              unsigned max_index,
+                              unsigned num_instances)
 {
    struct st_context *st = st_context(ctx);
    struct pipe_context *pipe = st->pipe;
@@ -403,16 +407,18 @@ setup_non_interleaved_attribs(struct gl_context *ctx,
       else {
          /* wrap user data */
          if (arrays[mesaAttr]->Ptr) {
-            vbuffer[attr].buffer = 
+            uint divisor = arrays[mesaAttr]->InstanceDivisor;
+            uint length = (divisor ? num_instances / divisor : max_index) + 1;
+            vbuffer[attr].buffer =
 	       pipe_user_buffer_create(pipe->screen,
 				       (void *) arrays[mesaAttr]->Ptr,
-				       stride * (max_index + 1),
+				       stride * length,
 				       PIPE_BIND_VERTEX_BUFFER);
          }
          else {
             /* no array, use ctx->Current.Attrib[] value */
             uint bytes = sizeof(ctx->Current.Attrib[0]);
-            vbuffer[attr].buffer = 
+            vbuffer[attr].buffer =
 	       pipe_user_buffer_create(pipe->screen,
 				       (void *) ctx->Current.Attrib[mesaAttr],
 				       bytes,
@@ -550,7 +556,8 @@ translate_prim(const struct gl_context *ctx, unsigned prim)
 static void
 st_validate_varrays(struct gl_context *ctx,
                     const struct gl_client_array **arrays,
-                    unsigned max_index)
+                    unsigned max_index,
+                    unsigned num_instances)
 {
    struct st_context *st = st_context(ctx);
    const struct st_vertex_program *vp;
@@ -578,7 +585,7 @@ st_validate_varrays(struct gl_context *ctx,
     */
    if (is_interleaved_arrays(vp, vpv, arrays)) {
       setup_interleaved_attribs(ctx, vp, vpv, arrays, vbuffer, velements,
-                                max_index);
+                                max_index, num_instances);
 
       num_vbuffers = 1;
       num_velements = vpv->num_inputs;
@@ -587,7 +594,7 @@ st_validate_varrays(struct gl_context *ctx,
    }
    else {
       setup_non_interleaved_attribs(ctx, vp, vpv, arrays,
-                                    vbuffer, velements, max_index);
+                                    vbuffer, velements, max_index, num_instances);
       num_vbuffers = vpv->num_inputs;
       num_velements = vpv->num_inputs;
    }
@@ -624,7 +631,7 @@ st_draw_vbo(struct gl_context *ctx,
    struct pipe_context *pipe = st->pipe;
    struct pipe_index_buffer ibuffer;
    struct pipe_draw_info info;
-   unsigned i;
+   unsigned i, num_instances = 1;
    GLboolean new_array = GL_TRUE;
    /* Fix this (Bug 34378):
    GLboolean new_array =
@@ -638,6 +645,10 @@ st_draw_vbo(struct gl_context *ctx,
       if (!index_bounds_valid)
          if (!vbo_all_varyings_in_vbos(arrays))
             vbo_get_minmax_index(ctx, prims, ib, &min_index, &max_index);
+
+      for (i = 0; i < nr_prims; i++) {
+         num_instances = MAX2(num_instances, prims[i].num_instances);
+      }
    } else {
       /* Get min/max index for non-indexed drawing. */
       min_index = ~0;
@@ -646,7 +657,7 @@ st_draw_vbo(struct gl_context *ctx,
       for (i = 0; i < nr_prims; i++) {
          min_index = MIN2(min_index, prims[i].start);
          max_index = MAX2(max_index, prims[i].start + prims[i].count - 1);
-         max_index = MAX2(max_index, prims[i].num_instances);
+         num_instances = MAX2(num_instances, prims[i].num_instances);
       }
    }
 
@@ -667,7 +678,7 @@ st_draw_vbo(struct gl_context *ctx,
       st_validate_state(st);
 
       if (new_array) {
-         st_validate_varrays(ctx, arrays, max_index);
+         st_validate_varrays(ctx, arrays, max_index, num_instances);
       }
 
 #if 0
diff --git a/mesalib/src/mesa/state_tracker/st_format.c b/mesalib/src/mesa/state_tracker/st_format.c
index c58ec9267..22a1450cf 100644
--- a/mesalib/src/mesa/state_tracker/st_format.c
+++ b/mesalib/src/mesa/state_tracker/st_format.c
@@ -674,8 +674,6 @@ st_choose_format(struct pipe_screen *screen, GLenum internalFormat,
       }
       return PIPE_FORMAT_NONE;
 
-   case GL_COMPRESSED_RED:
-   case GL_COMPRESSED_RG:
    case GL_COMPRESSED_RGB:
       /* can only sample from compressed formats */
       if (bindings & ~PIPE_BIND_SAMPLER_VIEW)
@@ -871,10 +869,14 @@ st_choose_format(struct pipe_screen *screen, GLenum internalFormat,
 	      return PIPE_FORMAT_R16G16_UNORM;
       return PIPE_FORMAT_NONE;
 
+   case GL_COMPRESSED_RED:
    case GL_COMPRESSED_RED_RGTC1:
       if (screen->is_format_supported(screen, PIPE_FORMAT_RGTC1_UNORM, target,
 				      sample_count, bindings, geom_flags))
 	      return PIPE_FORMAT_RGTC1_UNORM;
+      if (screen->is_format_supported(screen, PIPE_FORMAT_R8_UNORM, target,
+				      sample_count, bindings, geom_flags))
+	      return PIPE_FORMAT_R8_UNORM;
       return PIPE_FORMAT_NONE;
 
    case GL_COMPRESSED_SIGNED_RED_RGTC1:
@@ -883,10 +885,14 @@ st_choose_format(struct pipe_screen *screen, GLenum internalFormat,
 	      return PIPE_FORMAT_RGTC1_SNORM;
       return PIPE_FORMAT_NONE;
 
+   case GL_COMPRESSED_RG:
    case GL_COMPRESSED_RG_RGTC2:
       if (screen->is_format_supported(screen, PIPE_FORMAT_RGTC2_UNORM, target,
 				      sample_count, bindings, geom_flags))
 	      return PIPE_FORMAT_RGTC2_UNORM;
+      if (screen->is_format_supported(screen, PIPE_FORMAT_R8G8_UNORM, target,
+				      sample_count, bindings, geom_flags))
+	      return PIPE_FORMAT_R8G8_UNORM;
       return PIPE_FORMAT_NONE;
 
    case GL_COMPRESSED_SIGNED_RG_RGTC2:
diff --git a/mesalib/src/mesa/state_tracker/st_gen_mipmap.c b/mesalib/src/mesa/state_tracker/st_gen_mipmap.c
index 4bf682808..a12a32e11 100644
--- a/mesalib/src/mesa/state_tracker/st_gen_mipmap.c
+++ b/mesalib/src/mesa/state_tracker/st_gen_mipmap.c
@@ -103,52 +103,78 @@ st_render_mipmap(struct st_context *st,
  * image with stride==width.
  */
 static void
-decompress_image(enum pipe_format format,
-                 const uint8_t *src, uint8_t *dst,
+decompress_image(enum pipe_format format, int datatype,
+                 const uint8_t *src, void *dst,
                  unsigned width, unsigned height, unsigned src_stride)
 {
    const struct util_format_description *desc = util_format_description(format);
    const uint bw = util_format_get_blockwidth(format);
    const uint bh = util_format_get_blockheight(format);
-   const uint dst_stride = 4 * MAX2(width, bw);
-
-   desc->unpack_rgba_8unorm(dst, dst_stride, src, src_stride, width, height);
-
-   if (width < bw || height < bh) {
-      /* We're decompressing an image smaller than the compression
-       * block size.  We don't want garbage pixel values in the region
-       * outside (width x height) so replicate pixels from the (width
-       * x height) region to fill out the (bw x bh) block size.
-       */
-      uint x, y;
-      for (y = 0; y < bh; y++) {
-         for (x = 0; x < bw; x++) {
-            if (x >= width || y >= height) {
-               uint p = (y * bw + x) * 4;
-               dst[p + 0] = dst[0];
-               dst[p + 1] = dst[1];
-               dst[p + 2] = dst[2];
-               dst[p + 3] = dst[3];
-            }
-         }
+   uint dst_stride = 4 * MAX2(width, bw);
+
+   if (datatype == GL_FLOAT) {
+      desc->unpack_rgba_float((float *)dst, dst_stride * sizeof(GLfloat), src, src_stride, width, height);
+      if (width < bw || height < bh) {
+	 float *dst_p = (float *)dst;
+	 /* We're decompressing an image smaller than the compression
+	  * block size.  We don't want garbage pixel values in the region
+	  * outside (width x height) so replicate pixels from the (width
+	  * x height) region to fill out the (bw x bh) block size.
+	  */
+	 uint x, y;
+	 for (y = 0; y < bh; y++) {
+	    for (x = 0; x < bw; x++) {
+	       if (x >= width || y >= height) {
+		  uint p = (y * bw + x) * 4;
+		  dst_p[p + 0] = dst_p[0];
+		  dst_p[p + 1] = dst_p[1];
+		  dst_p[p + 2] = dst_p[2];
+		  dst_p[p + 3] = dst_p[3];
+	       }
+	    }
+	 }
+      }
+   } else {
+      desc->unpack_rgba_8unorm((uint8_t *)dst, dst_stride, src, src_stride, width, height);
+      if (width < bw || height < bh) {
+	 uint8_t *dst_p = (uint8_t *)dst;
+	 /* We're decompressing an image smaller than the compression
+	  * block size.  We don't want garbage pixel values in the region
+	  * outside (width x height) so replicate pixels from the (width
+	  * x height) region to fill out the (bw x bh) block size.
+	  */
+	 uint x, y;
+	 for (y = 0; y < bh; y++) {
+	    for (x = 0; x < bw; x++) {
+	       if (x >= width || y >= height) {
+		  uint p = (y * bw + x) * 4;
+		  dst_p[p + 0] = dst_p[0];
+		  dst_p[p + 1] = dst_p[1];
+		  dst_p[p + 2] = dst_p[2];
+		  dst_p[p + 3] = dst_p[3];
+	       }
+	    }
+	 }
       }
    }
 }
 
-
 /**
  * Helper function to compress an image.  The source is a 32-bpp RGBA image
  * with stride==width.
  */
 static void
-compress_image(enum pipe_format format,
-               const uint8_t *src, uint8_t *dst,
+compress_image(enum pipe_format format, int datatype,
+               const void *src, uint8_t *dst,
                unsigned width, unsigned height, unsigned dst_stride)
 {
    const struct util_format_description *desc = util_format_description(format);
    const uint src_stride = 4 * width;
 
-   desc->pack_rgba_8unorm(dst, dst_stride, src, src_stride, width, height);
+   if (datatype == GL_FLOAT)
+      desc->pack_rgba_float(dst, dst_stride, (GLfloat *)src, src_stride * sizeof(GLfloat), width, height);
+   else
+      desc->pack_rgba_8unorm(dst, dst_stride, (uint8_t *)src, src_stride, width, height);
 }
 
 
@@ -178,7 +204,12 @@ fallback_generate_mipmap(struct gl_context *ctx, GLenum target,
       _mesa_is_format_compressed(texObj->Image[face][baseLevel]->TexFormat);
 
    if (compressed) {
-      datatype = GL_UNSIGNED_BYTE;
+      if (texObj->Image[face][baseLevel]->TexFormat == MESA_FORMAT_SIGNED_RED_RGTC1 ||
+	  texObj->Image[face][baseLevel]->TexFormat == MESA_FORMAT_SIGNED_RG_RGTC2)
+         datatype = GL_FLOAT;
+      else
+         datatype = GL_UNSIGNED_BYTE;
+      
       comps = 4;
    }
    else {
@@ -230,11 +261,11 @@ fallback_generate_mipmap(struct gl_context *ctx, GLenum target,
 
          assert(comps == 4);
 
-         srcTemp = malloc(srcWidth2 * srcHeight2 * comps + 000);
-         dstTemp = malloc(dstWidth2 * dstHeight2 * comps + 000);
+         srcTemp = malloc(srcWidth2 * srcHeight2 * comps * (datatype == GL_FLOAT ? 4 : 1));
+         dstTemp = malloc(dstWidth2 * dstHeight2 * comps * (datatype == GL_FLOAT ? 4 : 1));
 
          /* decompress the src image: srcData -> srcTemp */
-         decompress_image(format, srcData, srcTemp, srcWidth, srcHeight, srcTrans->stride);
+         decompress_image(format, datatype, srcData, srcTemp, srcWidth2, srcHeight2, srcTrans->stride);
 
          _mesa_generate_mipmap_level(target, datatype, comps,
                                      0 /*border*/,
@@ -246,7 +277,7 @@ fallback_generate_mipmap(struct gl_context *ctx, GLenum target,
                                      dstWidth2); /* stride in texels */
 
          /* compress the new image: dstTemp -> dstData */
-         compress_image(format, dstTemp, dstData, dstWidth, dstHeight, dstTrans->stride);
+         compress_image(format, datatype, dstTemp, dstData, dstWidth2, dstHeight2, dstTrans->stride);
 
          free(srcTemp);
          free(dstTemp);
diff --git a/mesalib/src/mesa/vbo/vbo.h b/mesalib/src/mesa/vbo/vbo.h
index 6834f3b5a..26c3d4e0a 100644
--- a/mesalib/src/mesa/vbo/vbo.h
+++ b/mesalib/src/mesa/vbo/vbo.h
@@ -127,6 +127,7 @@ vbo_get_minmax_index(struct gl_context *ctx, const struct _mesa_prim *prim,
 
 void vbo_use_buffer_objects(struct gl_context *ctx);
 
+void vbo_always_unmap_buffers(struct gl_context *ctx);
 
 void vbo_set_draw_func(struct gl_context *ctx, vbo_draw_func func);
 
diff --git a/mesalib/src/mesa/vbo/vbo_attrib_tmp.h b/mesalib/src/mesa/vbo/vbo_attrib_tmp.h
index 654f0eaae..c793ce0dc 100644
--- a/mesalib/src/mesa/vbo/vbo_attrib_tmp.h
+++ b/mesalib/src/mesa/vbo/vbo_attrib_tmp.h
@@ -1,740 +1,740 @@
-/**************************************************************************

-

-Copyright 2002 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

-on the rights to use, copy, modify, merge, publish, distribute, sub

-license, and/or sell copies of the Software, and to permit persons to whom

-the Software is furnished to do so, subject to the following conditions:

-

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

-paragraph) shall be included in all copies or substantial portions of the

-Software.

-

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

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL

-TUNGSTEN GRAPHICS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,

-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR

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

-USE OR OTHER DEALINGS IN THE SOFTWARE.

-

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

-

-/* float */

-#define ATTR1FV( A, V ) ATTR( A, 1, (V)[0], 0, 0, 1 )

-#define ATTR2FV( A, V ) ATTR( A, 2, (V)[0], (V)[1], 0, 1 )

-#define ATTR3FV( A, V ) ATTR( A, 3, (V)[0], (V)[1], (V)[2], 1 )

-#define ATTR4FV( A, V ) ATTR( A, 4, (V)[0], (V)[1], (V)[2], (V)[3] )

-

-#define ATTR1F( A, X )          ATTR( A, 1, X, 0, 0, 1 )

-#define ATTR2F( A, X, Y )       ATTR( A, 2, X, Y, 0, 1 )

-#define ATTR3F( A, X, Y, Z )    ATTR( A, 3, X, Y, Z, 1 )

-#define ATTR4F( A, X, Y, Z, W ) ATTR( A, 4, X, Y, Z, W )

-

-/* int */

-#define ATTR2IV( A, V ) ATTR( A, 2, (V)[0], (V)[1], 0, 1 )

-#define ATTR3IV( A, V ) ATTR( A, 3, (V)[0], (V)[1], (V)[2], 1 )

-#define ATTR4IV( A, V ) ATTR( A, 4, (V)[0], (V)[1], (V)[2], (V)[3] )

-

-#define ATTR1I( A, X )          ATTR( A, 1, X, 0, 0, 1 )

-#define ATTR2I( A, X, Y )       ATTR( A, 2, X, Y, 0, 1 )

-#define ATTR3I( A, X, Y, Z )    ATTR( A, 3, X, Y, Z, 1 )

-#define ATTR4I( A, X, Y, Z, W ) ATTR( A, 4, X, Y, Z, W )

-

-

-/* uint */

-#define ATTR2UIV( A, V ) ATTR( A, 2, (V)[0], (V)[1], 0, 1 )

-#define ATTR3UIV( A, V ) ATTR( A, 3, (V)[0], (V)[1], (V)[2], 1 )

-#define ATTR4UIV( A, V ) ATTR( A, 4, (V)[0], (V)[1], (V)[2], (V)[3] )

-

-#define ATTR1UI( A, X )          ATTR( A, 1, X, 0, 0, 1 )

-#define ATTR2UI( A, X, Y )       ATTR( A, 2, X, Y, 0, 1 )

-#define ATTR3UI( A, X, Y, Z )    ATTR( A, 3, X, Y, Z, 1 )

-#define ATTR4UI( A, X, Y, Z, W ) ATTR( A, 4, X, Y, Z, W )

-

-#define MAT_ATTR( A, N, V ) ATTR( A, N, (V)[0], (V)[1], (V)[2], (V)[3] )

-

-

-

-static void GLAPIENTRY

-TAG(Vertex2f)(GLfloat x, GLfloat y)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR2F(VBO_ATTRIB_POS, x, y);

-}

-

-static void GLAPIENTRY

-TAG(Vertex2fv)(const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR2FV(VBO_ATTRIB_POS, v);

-}

-

-static void GLAPIENTRY

-TAG(Vertex3f)(GLfloat x, GLfloat y, GLfloat z)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR3F(VBO_ATTRIB_POS, x, y, z);

-}

-

-static void GLAPIENTRY

-TAG(Vertex3fv)(const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR3FV(VBO_ATTRIB_POS, v);

-}

-

-static void GLAPIENTRY

-TAG(Vertex4f)(GLfloat x, GLfloat y, GLfloat z, GLfloat w)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR4F(VBO_ATTRIB_POS, x, y, z, w);

-}

-

-static void GLAPIENTRY

-TAG(Vertex4fv)(const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR4FV(VBO_ATTRIB_POS, v);

-}

-

-

-

-static void GLAPIENTRY

-TAG(TexCoord1f)(GLfloat x)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR1F(VBO_ATTRIB_TEX0, x);

-}

-

-static void GLAPIENTRY

-TAG(TexCoord1fv)(const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR1FV(VBO_ATTRIB_TEX0, v);

-}

-

-static void GLAPIENTRY

-TAG(TexCoord2f)(GLfloat x, GLfloat y)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR2F(VBO_ATTRIB_TEX0, x, y);

-}

-

-static void GLAPIENTRY

-TAG(TexCoord2fv)(const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR2FV(VBO_ATTRIB_TEX0, v);

-}

-

-static void GLAPIENTRY

-TAG(TexCoord3f)(GLfloat x, GLfloat y, GLfloat z)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR3F(VBO_ATTRIB_TEX0, x, y, z);

-}

-

-static void GLAPIENTRY

-TAG(TexCoord3fv)(const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR3FV(VBO_ATTRIB_TEX0, v);

-}

-

-static void GLAPIENTRY

-TAG(TexCoord4f)(GLfloat x, GLfloat y, GLfloat z, GLfloat w)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR4F(VBO_ATTRIB_TEX0, x, y, z, w);

-}

-

-static void GLAPIENTRY

-TAG(TexCoord4fv)(const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR4FV(VBO_ATTRIB_TEX0, v);

-}

-

-

-

-static void GLAPIENTRY

-TAG(Normal3f)(GLfloat x, GLfloat y, GLfloat z)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR3F(VBO_ATTRIB_NORMAL, x, y, z);

-}

-

-static void GLAPIENTRY

-TAG(Normal3fv)(const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR3FV(VBO_ATTRIB_NORMAL, v);

-}

-

-

-

-static void GLAPIENTRY

-TAG(FogCoordfEXT)(GLfloat x)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR1F(VBO_ATTRIB_FOG, x);

-}

-

-

-

-static void GLAPIENTRY

-TAG(FogCoordfvEXT)(const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR1FV(VBO_ATTRIB_FOG, v);

-}

-

-static void GLAPIENTRY

-TAG(Color3f)(GLfloat x, GLfloat y, GLfloat z)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR3F(VBO_ATTRIB_COLOR0, x, y, z);

-}

-

-static void GLAPIENTRY

-TAG(Color3fv)(const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR3FV(VBO_ATTRIB_COLOR0, v);

-}

-

-static void GLAPIENTRY

-TAG(Color4f)(GLfloat x, GLfloat y, GLfloat z, GLfloat w)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR4F(VBO_ATTRIB_COLOR0, x, y, z, w);

-}

-

-static void GLAPIENTRY

-TAG(Color4fv)(const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR4FV(VBO_ATTRIB_COLOR0, v);

-}

-

-

-

-static void GLAPIENTRY

-TAG(SecondaryColor3fEXT)(GLfloat x, GLfloat y, GLfloat z)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR3F(VBO_ATTRIB_COLOR1, x, y, z);

-}

-

-static void GLAPIENTRY

-TAG(SecondaryColor3fvEXT)(const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR3FV(VBO_ATTRIB_COLOR1, v);

-}

-

-

-

-static void GLAPIENTRY

-TAG(EdgeFlag)(GLboolean b)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR1F(VBO_ATTRIB_EDGEFLAG, (GLfloat) b);

-}

-

-

-

-static void GLAPIENTRY

-TAG(Indexf)(GLfloat f)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR1F(VBO_ATTRIB_INDEX, f);

-}

-

-static void GLAPIENTRY

-TAG(Indexfv)(const GLfloat * f)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR1FV(VBO_ATTRIB_INDEX, f);

-}

-

-

-

-static void GLAPIENTRY

-TAG(MultiTexCoord1f)(GLenum target, GLfloat x)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;

-   ATTR1F(attr, x);

-}

-

-static void GLAPIENTRY

-TAG(MultiTexCoord1fv)(GLenum target, const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;

-   ATTR1FV(attr, v);

-}

-

-static void GLAPIENTRY

-TAG(MultiTexCoord2f)(GLenum target, GLfloat x, GLfloat y)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;

-   ATTR2F(attr, x, y);

-}

-

-static void GLAPIENTRY

-TAG(MultiTexCoord2fv)(GLenum target, const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;

-   ATTR2FV(attr, v);

-}

-

-static void GLAPIENTRY

-TAG(MultiTexCoord3f)(GLenum target, GLfloat x, GLfloat y, GLfloat z)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;

-   ATTR3F(attr, x, y, z);

-}

-

-static void GLAPIENTRY

-TAG(MultiTexCoord3fv)(GLenum target, const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;

-   ATTR3FV(attr, v);

-}

-

-static void GLAPIENTRY

-TAG(MultiTexCoord4f)(GLenum target, GLfloat x, GLfloat y, GLfloat z, GLfloat w)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;

-   ATTR4F(attr, x, y, z, w);

-}

-

-static void GLAPIENTRY

-TAG(MultiTexCoord4fv)(GLenum target, const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;

-   ATTR4FV(attr, v);

-}

-

-

-

-static void GLAPIENTRY

-TAG(VertexAttrib1fARB)(GLuint index, GLfloat x)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR1F(0, x);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR1F(VBO_ATTRIB_GENERIC0 + index, x);

-   else

-      ERROR();

-}

-

-static void GLAPIENTRY

-TAG(VertexAttrib1fvARB)(GLuint index, const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR1FV(0, v);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR1FV(VBO_ATTRIB_GENERIC0 + index, v);

-   else

-      ERROR();

-}

-

-static void GLAPIENTRY

-TAG(VertexAttrib2fARB)(GLuint index, GLfloat x, GLfloat y)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR2F(0, x, y);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR2F(VBO_ATTRIB_GENERIC0 + index, x, y);

-   else

-      ERROR();

-}

-

-static void GLAPIENTRY

-TAG(VertexAttrib2fvARB)(GLuint index, const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR2FV(0, v);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR2FV(VBO_ATTRIB_GENERIC0 + index, v);

-   else

-      ERROR();

-}

-

-static void GLAPIENTRY

-TAG(VertexAttrib3fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR3F(0, x, y, z);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR3F(VBO_ATTRIB_GENERIC0 + index, x, y, z);

-   else

-      ERROR();

-}

-

-static void GLAPIENTRY

-TAG(VertexAttrib3fvARB)(GLuint index, const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR3FV(0, v);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR3FV(VBO_ATTRIB_GENERIC0 + index, v);

-   else

-      ERROR();

-}

-

-static void GLAPIENTRY

-TAG(VertexAttrib4fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR4F(0, x, y, z, w);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR4F(VBO_ATTRIB_GENERIC0 + index, x, y, z, w);

-   else

-      ERROR();

-}

-

-static void GLAPIENTRY

-TAG(VertexAttrib4fvARB)(GLuint index, const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR4FV(0, v);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR4FV(VBO_ATTRIB_GENERIC0 + index, v);

-   else

-      ERROR();

-}

-

-

-

-/* Integer-valued generic attributes.

- * XXX: the integers just get converted to floats at this time

- */

-static void GLAPIENTRY

-TAG(VertexAttribI1i)(GLuint index, GLint x)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR1I(0, x);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR1I(VBO_ATTRIB_GENERIC0 + index, x);

-   else

-      ERROR();

-}

-

-static void GLAPIENTRY

-TAG(VertexAttribI2i)(GLuint index, GLint x, GLint y)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR2I(0, x, y);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR2I(VBO_ATTRIB_GENERIC0 + index, x, y);

-   else

-      ERROR();

-}

-

-static void GLAPIENTRY

-TAG(VertexAttribI3i)(GLuint index, GLint x, GLint y, GLint z)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR3I(0, x, y, z);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR3I(VBO_ATTRIB_GENERIC0 + index, x, y, z);

-   else

-      ERROR();

-}

-

-static void GLAPIENTRY

-TAG(VertexAttribI4i)(GLuint index, GLint x, GLint y, GLint z, GLint w)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR4I(0, x, y, z, w);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR4I(VBO_ATTRIB_GENERIC0 + index, x, y, z, w);

-   else

-      ERROR();

-}

-

-static void GLAPIENTRY

-TAG(VertexAttribI2iv)(GLuint index, const GLint *v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR2IV(0, v);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR2IV(VBO_ATTRIB_GENERIC0 + index, v);

-   else

-      ERROR();

-}

-

-static void GLAPIENTRY

-TAG(VertexAttribI3iv)(GLuint index, const GLint *v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR3IV(0, v);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR3IV(VBO_ATTRIB_GENERIC0 + index, v);

-   else

-      ERROR();

-}

-

-static void GLAPIENTRY

-TAG(VertexAttribI4iv)(GLuint index, const GLint *v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR4IV(0, v);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR4IV(VBO_ATTRIB_GENERIC0 + index, v);

-   else

-      ERROR();

-}

-

-

-

-/* Unsigned integer-valued generic attributes.

- * XXX: the integers just get converted to floats at this time

- */

-static void GLAPIENTRY

-TAG(VertexAttribI1ui)(GLuint index, GLuint x)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR1UI(0, x);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR1UI(VBO_ATTRIB_GENERIC0 + index, x);

-   else

-      ERROR();

-}

-

-static void GLAPIENTRY

-TAG(VertexAttribI2ui)(GLuint index, GLuint x, GLuint y)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR2UI(0, x, y);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR2UI(VBO_ATTRIB_GENERIC0 + index, x, y);

-   else

-      ERROR();

-}

-

-static void GLAPIENTRY

-TAG(VertexAttribI3ui)(GLuint index, GLuint x, GLuint y, GLuint z)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR3UI(0, x, y, z);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR3UI(VBO_ATTRIB_GENERIC0 + index, x, y, z);

-   else

-      ERROR();

-}

-

-static void GLAPIENTRY

-TAG(VertexAttribI4ui)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR4UI(0, x, y, z, w);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR4UI(VBO_ATTRIB_GENERIC0 + index, x, y, z, w);

-   else

-      ERROR();

-}

-

-static void GLAPIENTRY

-TAG(VertexAttribI2uiv)(GLuint index, const GLuint *v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR2UIV(0, v);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR2UIV(VBO_ATTRIB_GENERIC0 + index, v);

-   else

-      ERROR();

-}

-

-static void GLAPIENTRY

-TAG(VertexAttribI3uiv)(GLuint index, const GLuint *v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR3UIV(0, v);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR3UIV(VBO_ATTRIB_GENERIC0 + index, v);

-   else

-      ERROR();

-}

-

-static void GLAPIENTRY

-TAG(VertexAttribI4uiv)(GLuint index, const GLuint *v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR4UIV(0, v);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR4UIV(VBO_ATTRIB_GENERIC0 + index, v);

-   else

-      ERROR();

-}

-

-

-

-/* In addition to supporting NV_vertex_program, these entrypoints are

- * used by the display list and other code specifically because of

- * their property of aliasing with other attributes.  (See

- * vbo_save_loopback.c)

- */

-static void GLAPIENTRY

-TAG(VertexAttrib1fNV)(GLuint index, GLfloat x)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index < VBO_ATTRIB_MAX)

-      ATTR1F(index, x);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttrib1fvNV)(GLuint index, const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index < VBO_ATTRIB_MAX)

-      ATTR1FV(index, v);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index < VBO_ATTRIB_MAX)

-      ATTR2F(index, x, y);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttrib2fvNV)(GLuint index, const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index < VBO_ATTRIB_MAX)

-      ATTR2FV(index, v);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index < VBO_ATTRIB_MAX)

-      ATTR3F(index, x, y, z);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttrib3fvNV)(GLuint index,

- const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index < VBO_ATTRIB_MAX)

-      ATTR3FV(index, v);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index < VBO_ATTRIB_MAX)

-      ATTR4F(index, x, y, z, w);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttrib4fvNV)(GLuint index, const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index < VBO_ATTRIB_MAX)

-      ATTR4FV(index, v);

-}

-

-

-

-#define MAT( ATTR, N, face, params )			\

-do {							\

-   if (face != GL_BACK)					\

-      MAT_ATTR( ATTR, N, params ); /* front */		\

-   if (face != GL_FRONT)				\

-      MAT_ATTR( ATTR + 1, N, params ); /* back */	\

-} while (0)

-

-

-/* Colormaterial conflicts are dealt with later.

- */

-static void GLAPIENTRY

-TAG(Materialfv)(GLenum face, GLenum pname,

-                 const GLfloat * params)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   switch (pname) {

-   case GL_EMISSION:

-      MAT(VBO_ATTRIB_MAT_FRONT_EMISSION, 4, face, params);

-      break;

-   case GL_AMBIENT:

-      MAT(VBO_ATTRIB_MAT_FRONT_AMBIENT, 4, face, params);

-      break;

-   case GL_DIFFUSE:

-      MAT(VBO_ATTRIB_MAT_FRONT_DIFFUSE, 4, face, params);

-      break;

-   case GL_SPECULAR:

-      MAT(VBO_ATTRIB_MAT_FRONT_SPECULAR, 4, face, params);

-      break;

-   case GL_SHININESS:

-      MAT(VBO_ATTRIB_MAT_FRONT_SHININESS, 1, face, params);

-      break;

-   case GL_COLOR_INDEXES:

-      MAT(VBO_ATTRIB_MAT_FRONT_INDEXES, 3, face, params);

-      break;

-   case GL_AMBIENT_AND_DIFFUSE:

-      MAT(VBO_ATTRIB_MAT_FRONT_AMBIENT, 4, face, params);

-      MAT(VBO_ATTRIB_MAT_FRONT_DIFFUSE, 4, face, params);

-      break;

-   default:

-      ERROR();

-      return;

-   }

-}

-

-

-#undef ATTR1FV

-#undef ATTR2FV

-#undef ATTR3FV

-#undef ATTR4FV

-

-#undef ATTR1F

-#undef ATTR2F

-#undef ATTR3F

-#undef ATTR4F

-

-#undef MAT

-#undef MAT_ATTR

+/**************************************************************************
+
+Copyright 2002 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
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+TUNGSTEN GRAPHICS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/* float */
+#define ATTR1FV( A, V ) ATTR( A, 1, (V)[0], 0, 0, 1 )
+#define ATTR2FV( A, V ) ATTR( A, 2, (V)[0], (V)[1], 0, 1 )
+#define ATTR3FV( A, V ) ATTR( A, 3, (V)[0], (V)[1], (V)[2], 1 )
+#define ATTR4FV( A, V ) ATTR( A, 4, (V)[0], (V)[1], (V)[2], (V)[3] )
+
+#define ATTR1F( A, X )          ATTR( A, 1, X, 0, 0, 1 )
+#define ATTR2F( A, X, Y )       ATTR( A, 2, X, Y, 0, 1 )
+#define ATTR3F( A, X, Y, Z )    ATTR( A, 3, X, Y, Z, 1 )
+#define ATTR4F( A, X, Y, Z, W ) ATTR( A, 4, X, Y, Z, W )
+
+/* int */
+#define ATTR2IV( A, V ) ATTR( A, 2, (V)[0], (V)[1], 0, 1 )
+#define ATTR3IV( A, V ) ATTR( A, 3, (V)[0], (V)[1], (V)[2], 1 )
+#define ATTR4IV( A, V ) ATTR( A, 4, (V)[0], (V)[1], (V)[2], (V)[3] )
+
+#define ATTR1I( A, X )          ATTR( A, 1, X, 0, 0, 1 )
+#define ATTR2I( A, X, Y )       ATTR( A, 2, X, Y, 0, 1 )
+#define ATTR3I( A, X, Y, Z )    ATTR( A, 3, X, Y, Z, 1 )
+#define ATTR4I( A, X, Y, Z, W ) ATTR( A, 4, X, Y, Z, W )
+
+
+/* uint */
+#define ATTR2UIV( A, V ) ATTR( A, 2, (V)[0], (V)[1], 0, 1 )
+#define ATTR3UIV( A, V ) ATTR( A, 3, (V)[0], (V)[1], (V)[2], 1 )
+#define ATTR4UIV( A, V ) ATTR( A, 4, (V)[0], (V)[1], (V)[2], (V)[3] )
+
+#define ATTR1UI( A, X )          ATTR( A, 1, X, 0, 0, 1 )
+#define ATTR2UI( A, X, Y )       ATTR( A, 2, X, Y, 0, 1 )
+#define ATTR3UI( A, X, Y, Z )    ATTR( A, 3, X, Y, Z, 1 )
+#define ATTR4UI( A, X, Y, Z, W ) ATTR( A, 4, X, Y, Z, W )
+
+#define MAT_ATTR( A, N, V ) ATTR( A, N, (V)[0], (V)[1], (V)[2], (V)[3] )
+
+
+
+static void GLAPIENTRY
+TAG(Vertex2f)(GLfloat x, GLfloat y)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR2F(VBO_ATTRIB_POS, x, y);
+}
+
+static void GLAPIENTRY
+TAG(Vertex2fv)(const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR2FV(VBO_ATTRIB_POS, v);
+}
+
+static void GLAPIENTRY
+TAG(Vertex3f)(GLfloat x, GLfloat y, GLfloat z)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR3F(VBO_ATTRIB_POS, x, y, z);
+}
+
+static void GLAPIENTRY
+TAG(Vertex3fv)(const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR3FV(VBO_ATTRIB_POS, v);
+}
+
+static void GLAPIENTRY
+TAG(Vertex4f)(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR4F(VBO_ATTRIB_POS, x, y, z, w);
+}
+
+static void GLAPIENTRY
+TAG(Vertex4fv)(const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR4FV(VBO_ATTRIB_POS, v);
+}
+
+
+
+static void GLAPIENTRY
+TAG(TexCoord1f)(GLfloat x)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR1F(VBO_ATTRIB_TEX0, x);
+}
+
+static void GLAPIENTRY
+TAG(TexCoord1fv)(const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR1FV(VBO_ATTRIB_TEX0, v);
+}
+
+static void GLAPIENTRY
+TAG(TexCoord2f)(GLfloat x, GLfloat y)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR2F(VBO_ATTRIB_TEX0, x, y);
+}
+
+static void GLAPIENTRY
+TAG(TexCoord2fv)(const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR2FV(VBO_ATTRIB_TEX0, v);
+}
+
+static void GLAPIENTRY
+TAG(TexCoord3f)(GLfloat x, GLfloat y, GLfloat z)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR3F(VBO_ATTRIB_TEX0, x, y, z);
+}
+
+static void GLAPIENTRY
+TAG(TexCoord3fv)(const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR3FV(VBO_ATTRIB_TEX0, v);
+}
+
+static void GLAPIENTRY
+TAG(TexCoord4f)(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR4F(VBO_ATTRIB_TEX0, x, y, z, w);
+}
+
+static void GLAPIENTRY
+TAG(TexCoord4fv)(const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR4FV(VBO_ATTRIB_TEX0, v);
+}
+
+
+
+static void GLAPIENTRY
+TAG(Normal3f)(GLfloat x, GLfloat y, GLfloat z)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR3F(VBO_ATTRIB_NORMAL, x, y, z);
+}
+
+static void GLAPIENTRY
+TAG(Normal3fv)(const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR3FV(VBO_ATTRIB_NORMAL, v);
+}
+
+
+
+static void GLAPIENTRY
+TAG(FogCoordfEXT)(GLfloat x)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR1F(VBO_ATTRIB_FOG, x);
+}
+
+
+
+static void GLAPIENTRY
+TAG(FogCoordfvEXT)(const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR1FV(VBO_ATTRIB_FOG, v);
+}
+
+static void GLAPIENTRY
+TAG(Color3f)(GLfloat x, GLfloat y, GLfloat z)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR3F(VBO_ATTRIB_COLOR0, x, y, z);
+}
+
+static void GLAPIENTRY
+TAG(Color3fv)(const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR3FV(VBO_ATTRIB_COLOR0, v);
+}
+
+static void GLAPIENTRY
+TAG(Color4f)(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR4F(VBO_ATTRIB_COLOR0, x, y, z, w);
+}
+
+static void GLAPIENTRY
+TAG(Color4fv)(const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR4FV(VBO_ATTRIB_COLOR0, v);
+}
+
+
+
+static void GLAPIENTRY
+TAG(SecondaryColor3fEXT)(GLfloat x, GLfloat y, GLfloat z)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR3F(VBO_ATTRIB_COLOR1, x, y, z);
+}
+
+static void GLAPIENTRY
+TAG(SecondaryColor3fvEXT)(const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR3FV(VBO_ATTRIB_COLOR1, v);
+}
+
+
+
+static void GLAPIENTRY
+TAG(EdgeFlag)(GLboolean b)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR1F(VBO_ATTRIB_EDGEFLAG, (GLfloat) b);
+}
+
+
+
+static void GLAPIENTRY
+TAG(Indexf)(GLfloat f)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR1F(VBO_ATTRIB_INDEX, f);
+}
+
+static void GLAPIENTRY
+TAG(Indexfv)(const GLfloat * f)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR1FV(VBO_ATTRIB_INDEX, f);
+}
+
+
+
+static void GLAPIENTRY
+TAG(MultiTexCoord1f)(GLenum target, GLfloat x)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
+   ATTR1F(attr, x);
+}
+
+static void GLAPIENTRY
+TAG(MultiTexCoord1fv)(GLenum target, const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
+   ATTR1FV(attr, v);
+}
+
+static void GLAPIENTRY
+TAG(MultiTexCoord2f)(GLenum target, GLfloat x, GLfloat y)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
+   ATTR2F(attr, x, y);
+}
+
+static void GLAPIENTRY
+TAG(MultiTexCoord2fv)(GLenum target, const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
+   ATTR2FV(attr, v);
+}
+
+static void GLAPIENTRY
+TAG(MultiTexCoord3f)(GLenum target, GLfloat x, GLfloat y, GLfloat z)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
+   ATTR3F(attr, x, y, z);
+}
+
+static void GLAPIENTRY
+TAG(MultiTexCoord3fv)(GLenum target, const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
+   ATTR3FV(attr, v);
+}
+
+static void GLAPIENTRY
+TAG(MultiTexCoord4f)(GLenum target, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
+   ATTR4F(attr, x, y, z, w);
+}
+
+static void GLAPIENTRY
+TAG(MultiTexCoord4fv)(GLenum target, const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
+   ATTR4FV(attr, v);
+}
+
+
+
+static void GLAPIENTRY
+TAG(VertexAttrib1fARB)(GLuint index, GLfloat x)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR1F(0, x);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR1F(VBO_ATTRIB_GENERIC0 + index, x);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttrib1fvARB)(GLuint index, const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR1FV(0, v);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR1FV(VBO_ATTRIB_GENERIC0 + index, v);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttrib2fARB)(GLuint index, GLfloat x, GLfloat y)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR2F(0, x, y);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR2F(VBO_ATTRIB_GENERIC0 + index, x, y);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttrib2fvARB)(GLuint index, const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR2FV(0, v);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR2FV(VBO_ATTRIB_GENERIC0 + index, v);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttrib3fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR3F(0, x, y, z);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR3F(VBO_ATTRIB_GENERIC0 + index, x, y, z);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttrib3fvARB)(GLuint index, const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR3FV(0, v);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR3FV(VBO_ATTRIB_GENERIC0 + index, v);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttrib4fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR4F(0, x, y, z, w);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR4F(VBO_ATTRIB_GENERIC0 + index, x, y, z, w);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttrib4fvARB)(GLuint index, const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR4FV(0, v);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR4FV(VBO_ATTRIB_GENERIC0 + index, v);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+
+
+/* Integer-valued generic attributes.
+ * XXX: the integers just get converted to floats at this time
+ */
+static void GLAPIENTRY
+TAG(VertexAttribI1i)(GLuint index, GLint x)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR1I(0, x);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR1I(VBO_ATTRIB_GENERIC0 + index, x);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttribI2i)(GLuint index, GLint x, GLint y)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR2I(0, x, y);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR2I(VBO_ATTRIB_GENERIC0 + index, x, y);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttribI3i)(GLuint index, GLint x, GLint y, GLint z)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR3I(0, x, y, z);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR3I(VBO_ATTRIB_GENERIC0 + index, x, y, z);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttribI4i)(GLuint index, GLint x, GLint y, GLint z, GLint w)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR4I(0, x, y, z, w);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR4I(VBO_ATTRIB_GENERIC0 + index, x, y, z, w);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttribI2iv)(GLuint index, const GLint *v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR2IV(0, v);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR2IV(VBO_ATTRIB_GENERIC0 + index, v);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttribI3iv)(GLuint index, const GLint *v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR3IV(0, v);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR3IV(VBO_ATTRIB_GENERIC0 + index, v);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttribI4iv)(GLuint index, const GLint *v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR4IV(0, v);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR4IV(VBO_ATTRIB_GENERIC0 + index, v);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+
+
+/* Unsigned integer-valued generic attributes.
+ * XXX: the integers just get converted to floats at this time
+ */
+static void GLAPIENTRY
+TAG(VertexAttribI1ui)(GLuint index, GLuint x)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR1UI(0, x);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR1UI(VBO_ATTRIB_GENERIC0 + index, x);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttribI2ui)(GLuint index, GLuint x, GLuint y)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR2UI(0, x, y);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR2UI(VBO_ATTRIB_GENERIC0 + index, x, y);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttribI3ui)(GLuint index, GLuint x, GLuint y, GLuint z)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR3UI(0, x, y, z);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR3UI(VBO_ATTRIB_GENERIC0 + index, x, y, z);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttribI4ui)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR4UI(0, x, y, z, w);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR4UI(VBO_ATTRIB_GENERIC0 + index, x, y, z, w);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttribI2uiv)(GLuint index, const GLuint *v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR2UIV(0, v);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR2UIV(VBO_ATTRIB_GENERIC0 + index, v);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttribI3uiv)(GLuint index, const GLuint *v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR3UIV(0, v);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR3UIV(VBO_ATTRIB_GENERIC0 + index, v);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttribI4uiv)(GLuint index, const GLuint *v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR4UIV(0, v);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR4UIV(VBO_ATTRIB_GENERIC0 + index, v);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+
+
+/* In addition to supporting NV_vertex_program, these entrypoints are
+ * used by the display list and other code specifically because of
+ * their property of aliasing with other attributes.  (See
+ * vbo_save_loopback.c)
+ */
+static void GLAPIENTRY
+TAG(VertexAttrib1fNV)(GLuint index, GLfloat x)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index < VBO_ATTRIB_MAX)
+      ATTR1F(index, x);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttrib1fvNV)(GLuint index, const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index < VBO_ATTRIB_MAX)
+      ATTR1FV(index, v);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index < VBO_ATTRIB_MAX)
+      ATTR2F(index, x, y);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttrib2fvNV)(GLuint index, const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index < VBO_ATTRIB_MAX)
+      ATTR2FV(index, v);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index < VBO_ATTRIB_MAX)
+      ATTR3F(index, x, y, z);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttrib3fvNV)(GLuint index,
+ const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index < VBO_ATTRIB_MAX)
+      ATTR3FV(index, v);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index < VBO_ATTRIB_MAX)
+      ATTR4F(index, x, y, z, w);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttrib4fvNV)(GLuint index, const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index < VBO_ATTRIB_MAX)
+      ATTR4FV(index, v);
+}
+
+
+
+#define MAT( ATTR, N, face, params )			\
+do {							\
+   if (face != GL_BACK)					\
+      MAT_ATTR( ATTR, N, params ); /* front */		\
+   if (face != GL_FRONT)				\
+      MAT_ATTR( ATTR + 1, N, params ); /* back */	\
+} while (0)
+
+
+/* Colormaterial conflicts are dealt with later.
+ */
+static void GLAPIENTRY
+TAG(Materialfv)(GLenum face, GLenum pname,
+                 const GLfloat * params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   switch (pname) {
+   case GL_EMISSION:
+      MAT(VBO_ATTRIB_MAT_FRONT_EMISSION, 4, face, params);
+      break;
+   case GL_AMBIENT:
+      MAT(VBO_ATTRIB_MAT_FRONT_AMBIENT, 4, face, params);
+      break;
+   case GL_DIFFUSE:
+      MAT(VBO_ATTRIB_MAT_FRONT_DIFFUSE, 4, face, params);
+      break;
+   case GL_SPECULAR:
+      MAT(VBO_ATTRIB_MAT_FRONT_SPECULAR, 4, face, params);
+      break;
+   case GL_SHININESS:
+      MAT(VBO_ATTRIB_MAT_FRONT_SHININESS, 1, face, params);
+      break;
+   case GL_COLOR_INDEXES:
+      MAT(VBO_ATTRIB_MAT_FRONT_INDEXES, 3, face, params);
+      break;
+   case GL_AMBIENT_AND_DIFFUSE:
+      MAT(VBO_ATTRIB_MAT_FRONT_AMBIENT, 4, face, params);
+      MAT(VBO_ATTRIB_MAT_FRONT_DIFFUSE, 4, face, params);
+      break;
+   default:
+      ERROR(GL_INVALID_ENUM);
+      return;
+   }
+}
+
+
+#undef ATTR1FV
+#undef ATTR2FV
+#undef ATTR3FV
+#undef ATTR4FV
+
+#undef ATTR1F
+#undef ATTR2F
+#undef ATTR3F
+#undef ATTR4F
+
+#undef MAT
+#undef MAT_ATTR
diff --git a/mesalib/src/mesa/vbo/vbo_exec.h b/mesalib/src/mesa/vbo/vbo_exec.h
index 1b0ed7947..d52a557e0 100644
--- a/mesalib/src/mesa/vbo/vbo_exec.h
+++ b/mesalib/src/mesa/vbo/vbo_exec.h
@@ -143,6 +143,9 @@ struct vbo_exec_context
       const struct gl_client_array *inputs[VERT_ATTRIB_MAX];
    } array;
 
+   /* Which flags to set in vbo_exec_BeginVertices() */
+   GLbitfield begin_vertices_flags;
+
 #ifdef DEBUG
    GLint flush_call_depth;
 #endif
diff --git a/mesalib/src/mesa/vbo/vbo_exec_api.c b/mesalib/src/mesa/vbo/vbo_exec_api.c
index 2f9f3ec7c..fcd544de7 100644
--- a/mesalib/src/mesa/vbo/vbo_exec_api.c
+++ b/mesalib/src/mesa/vbo/vbo_exec_api.c
@@ -423,7 +423,7 @@ do {									\
 } while (0)
 
 
-#define ERROR() _mesa_error( ctx, GL_INVALID_ENUM, __FUNCTION__ )
+#define ERROR(err) _mesa_error( ctx, err, __FUNCTION__ )
 #define TAG(x) vbo_##x
 
 #include "vbo_attrib_tmp.h"
@@ -839,6 +839,19 @@ void vbo_use_buffer_objects(struct gl_context *ctx)
 }
 
 
+/**
+ * If this function is called, all VBO buffers will be unmapped when
+ * we flush.
+ * Otherwise, if a simple command like glColor3f() is called and we flush,
+ * the current VBO may be left mapped.
+ */
+void
+vbo_always_unmap_buffers(struct gl_context *ctx)
+{
+   struct vbo_exec_context *exec = &vbo_context(ctx)->exec;
+   exec->begin_vertices_flags |= FLUSH_STORED_VERTICES;
+}
+
 
 void vbo_exec_vtx_init( struct vbo_exec_context *exec )
 {
@@ -894,6 +907,8 @@ void vbo_exec_vtx_init( struct vbo_exec_context *exec )
    }
 
    exec->vtx.vertex_size = 0;
+
+   exec->begin_vertices_flags = FLUSH_UPDATE_CURRENT;
 }
 
 
@@ -942,7 +957,9 @@ void vbo_exec_BeginVertices( struct gl_context *ctx )
    vbo_exec_vtx_map( exec );
 
    assert((ctx->Driver.NeedFlush & FLUSH_UPDATE_CURRENT) == 0);
-   ctx->Driver.NeedFlush |= FLUSH_UPDATE_CURRENT;
+   assert(exec->begin_vertices_flags);
+
+   ctx->Driver.NeedFlush |= exec->begin_vertices_flags;
 }
 
 
@@ -1045,7 +1062,7 @@ VertexAttrib4f_nopos(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
    if (index < MAX_VERTEX_GENERIC_ATTRIBS)
       ATTR(VBO_ATTRIB_GENERIC0 + index, 4, x, y, z, w);
    else
-      ERROR();
+      ERROR(GL_INVALID_VALUE);
 }
 
 void GLAPIENTRY
diff --git a/mesalib/src/mesa/vbo/vbo_save_api.c b/mesalib/src/mesa/vbo/vbo_save_api.c
index 90ff39e55..fc5f60e92 100644
--- a/mesalib/src/mesa/vbo/vbo_save_api.c
+++ b/mesalib/src/mesa/vbo/vbo_save_api.c
@@ -1,1310 +1,1310 @@
-/**************************************************************************

-

-Copyright 2002-2008 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

-on the rights to use, copy, modify, merge, publish, distribute, sub

-license, and/or sell copies of the Software, and to permit persons to whom

-the Software is furnished to do so, subject to the following conditions:

-

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

-paragraph) shall be included in all copies or substantial portions of the

-Software.

-

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

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL

-TUNGSTEN GRAPHICS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,

-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR

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

-USE OR OTHER DEALINGS IN THE SOFTWARE.

-

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

-

-/*

- * Authors:

- *   Keith Whitwell <keith@tungstengraphics.com>

- */

-

-

-

-/* Display list compiler attempts to store lists of vertices with the

- * same vertex layout.  Additionally it attempts to minimize the need

- * for execute-time fixup of these vertex lists, allowing them to be

- * cached on hardware.

- *

- * There are still some circumstances where this can be thwarted, for

- * example by building a list that consists of one very long primitive

- * (eg Begin(Triangles), 1000 vertices, End), and calling that list

- * from inside a different begin/end object (Begin(Lines), CallList,

- * End).  

- *

- * In that case the code will have to replay the list as individual

- * commands through the Exec dispatch table, or fix up the copied

- * vertices at execute-time.

- *

- * The other case where fixup is required is when a vertex attribute

- * is introduced in the middle of a primitive.  Eg:

- *  Begin(Lines)

- *  TexCoord1f()           Vertex2f()

- *  TexCoord1f() Color3f() Vertex2f()

- *  End()

- *

- *  If the current value of Color isn't known at compile-time, this

- *  primitive will require fixup.

- *

- *

- * The list compiler currently doesn't attempt to compile lists

- * containing EvalCoord or EvalPoint commands.  On encountering one of

- * these, compilation falls back to opcodes.  

- *

- * This could be improved to fallback only when a mix of EvalCoord and

- * Vertex commands are issued within a single primitive.

- */

-

-

-#include "main/glheader.h"

-#include "main/bufferobj.h"

-#include "main/context.h"

-#include "main/dlist.h"

-#include "main/enums.h"

-#include "main/eval.h"

-#include "main/macros.h"

-#include "main/mfeatures.h"

-#include "main/api_noop.h"

-#include "main/api_validate.h"

-#include "main/api_arrayelt.h"

-#include "main/vtxfmt.h"

-#include "main/dispatch.h"

-

-#include "vbo_context.h"

-

-

-#if FEATURE_dlist

-

-

-#ifdef ERROR

-#undef ERROR

-#endif

-

-

-/* An interesting VBO number/name to help with debugging */

-#define VBO_BUF_ID  12345

-

-

-/*

- * NOTE: Old 'parity' issue is gone, but copying can still be

- * wrong-footed on replay.

- */

-static GLuint _save_copy_vertices( struct gl_context *ctx, 

-				   const struct vbo_save_vertex_list *node,

-				   const GLfloat *src_buffer)

-{

-   struct vbo_save_context *save = &vbo_context( ctx )->save;

-   const struct _mesa_prim *prim = &node->prim[node->prim_count-1];

-   GLuint nr = prim->count;

-   GLuint sz = save->vertex_size;

-   const GLfloat *src = src_buffer + prim->start * sz;

-   GLfloat *dst = save->copied.buffer;

-   GLuint ovf, i;

-

-   if (prim->end)

-      return 0;

-	 

-   switch( prim->mode )

-   {

-   case GL_POINTS:

-      return 0;

-   case GL_LINES:

-      ovf = nr&1;

-      for (i = 0 ; i < ovf ; i++)

-	 memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz*sizeof(GLfloat) );

-      return i;

-   case GL_TRIANGLES:

-      ovf = nr%3;

-      for (i = 0 ; i < ovf ; i++)

-	 memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz*sizeof(GLfloat) );

-      return i;

-   case GL_QUADS:

-      ovf = nr&3;

-      for (i = 0 ; i < ovf ; i++)

-	 memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz*sizeof(GLfloat) );

-      return i;

-   case GL_LINE_STRIP:

-      if (nr == 0) 

-	 return 0;

-      else {

-	 memcpy( dst, src+(nr-1)*sz, sz*sizeof(GLfloat) );

-	 return 1;

-      }

-   case GL_LINE_LOOP:

-   case GL_TRIANGLE_FAN:

-   case GL_POLYGON:

-      if (nr == 0) 

-	 return 0;

-      else if (nr == 1) {

-	 memcpy( dst, src+0, sz*sizeof(GLfloat) );

-	 return 1;

-      } else {

-	 memcpy( dst, src+0, sz*sizeof(GLfloat) );

-	 memcpy( dst+sz, src+(nr-1)*sz, sz*sizeof(GLfloat) );

-	 return 2;

-      }

-   case GL_TRIANGLE_STRIP:

-   case GL_QUAD_STRIP:

-      switch (nr) {

-      case 0: ovf = 0; break;

-      case 1: ovf = 1; break;

-      default: ovf = 2 + (nr&1); break;

-      }

-      for (i = 0 ; i < ovf ; i++)

-	 memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz*sizeof(GLfloat) );

-      return i;

-   default:

-      assert(0);

-      return 0;

-   }

-}

-

-

-static struct vbo_save_vertex_store *alloc_vertex_store( struct gl_context *ctx )

-{

-   struct vbo_save_vertex_store *vertex_store = CALLOC_STRUCT(vbo_save_vertex_store);

-

-   /* obj->Name needs to be non-zero, but won't ever be examined more

-    * closely than that.  In particular these buffers won't be entered

-    * into the hash and can never be confused with ones visible to the

-    * user.  Perhaps there could be a special number for internal

-    * buffers:

-    */

-   vertex_store->bufferobj = ctx->Driver.NewBufferObject(ctx,

-                                                         VBO_BUF_ID,

-                                                         GL_ARRAY_BUFFER_ARB);

-

-   ctx->Driver.BufferData( ctx, 

-			   GL_ARRAY_BUFFER_ARB, 

-			   VBO_SAVE_BUFFER_SIZE * sizeof(GLfloat),

-			   NULL,

-			   GL_STATIC_DRAW_ARB,

-			   vertex_store->bufferobj);

-

-   vertex_store->buffer = NULL;

-   vertex_store->used = 0;

-   vertex_store->refcount = 1;

-

-   return vertex_store;

-}

-

-static void free_vertex_store( struct gl_context *ctx, struct vbo_save_vertex_store *vertex_store )

-{

-   assert(!vertex_store->buffer);

-

-   if (vertex_store->bufferobj) {

-      _mesa_reference_buffer_object(ctx, &vertex_store->bufferobj, NULL);

-   }

-

-   FREE( vertex_store );

-}

-

-static GLfloat *map_vertex_store( struct gl_context *ctx, struct vbo_save_vertex_store *vertex_store )

-{

-   assert(vertex_store->bufferobj);

-   assert(!vertex_store->buffer);

-   vertex_store->buffer = (GLfloat *)ctx->Driver.MapBuffer(ctx, 

-							   GL_ARRAY_BUFFER_ARB,	/* not used */

-							   GL_WRITE_ONLY, /* not used */

-							   vertex_store->bufferobj); 

-

-   assert(vertex_store->buffer);

-   return vertex_store->buffer + vertex_store->used;

-}

-

-static void unmap_vertex_store( struct gl_context *ctx, struct vbo_save_vertex_store *vertex_store )

-{

-   ctx->Driver.UnmapBuffer( ctx, GL_ARRAY_BUFFER_ARB, vertex_store->bufferobj );

-   vertex_store->buffer = NULL;

-}

-

-

-static struct vbo_save_primitive_store *alloc_prim_store( struct gl_context *ctx )

-{

-   struct vbo_save_primitive_store *store = CALLOC_STRUCT(vbo_save_primitive_store);

-   (void) ctx;

-   store->used = 0;

-   store->refcount = 1;

-   return store;

-}

-

-static void _save_reset_counters( struct gl_context *ctx )

-{

-   struct vbo_save_context *save = &vbo_context(ctx)->save;

-

-   save->prim = save->prim_store->buffer + save->prim_store->used;

-   save->buffer = (save->vertex_store->buffer + 

-		   save->vertex_store->used);

-

-   assert(save->buffer == save->buffer_ptr);

-

-   if (save->vertex_size)

-      save->max_vert = ((VBO_SAVE_BUFFER_SIZE - save->vertex_store->used) / 

-			 save->vertex_size);

-   else

-      save->max_vert = 0;

-

-   save->vert_count = 0;

-   save->prim_count = 0;

-   save->prim_max = VBO_SAVE_PRIM_SIZE - save->prim_store->used;

-   save->dangling_attr_ref = 0;

-}

-

-

-/* Insert the active immediate struct onto the display list currently

- * being built.

- */

-static void _save_compile_vertex_list( struct gl_context *ctx )

-{

-   struct vbo_save_context *save = &vbo_context(ctx)->save;

-   struct vbo_save_vertex_list *node;

-

-   /* Allocate space for this structure in the display list currently

-    * being compiled.

-    */

-   node = (struct vbo_save_vertex_list *)

-      _mesa_dlist_alloc(ctx, save->opcode_vertex_list, sizeof(*node));

-

-   if (!node)

-      return;

-

-   /* Duplicate our template, increment refcounts to the storage structs:

-    */

-   memcpy(node->attrsz, save->attrsz, sizeof(node->attrsz));

-   node->vertex_size = save->vertex_size;

-   node->buffer_offset = (save->buffer - save->vertex_store->buffer) * sizeof(GLfloat); 

-   node->count = save->vert_count;

-   node->wrap_count = save->copied.nr;

-   node->dangling_attr_ref = save->dangling_attr_ref;

-   node->prim = save->prim;

-   node->prim_count = save->prim_count;

-   node->vertex_store = save->vertex_store;

-   node->prim_store = save->prim_store;

-

-   node->vertex_store->refcount++;

-   node->prim_store->refcount++;

-

-   if (node->prim[0].no_current_update) {

-      node->current_size = 0;

-      node->current_data = NULL;

-   } else {

-      node->current_size = node->vertex_size - node->attrsz[0];

-      node->current_data = NULL;

-     

-      if (node->current_size) {

-         /* If the malloc fails, we just pull the data out of the VBO

-          * later instead.

-          */

-         node->current_data = MALLOC( node->current_size * sizeof(GLfloat) );

-         if (node->current_data) {

-            const char *buffer = (const char *)save->vertex_store->buffer;

-            unsigned attr_offset = node->attrsz[0] * sizeof(GLfloat);

-            unsigned vertex_offset = 0;

-            

-            if (node->count)

-               vertex_offset = (node->count-1) * node->vertex_size * sizeof(GLfloat);

-         

-            memcpy( node->current_data,

-                    buffer + node->buffer_offset + vertex_offset + attr_offset,

-                    node->current_size * sizeof(GLfloat) );

-         }

-      }

-   }

-

-

-

-   assert(node->attrsz[VBO_ATTRIB_POS] != 0 ||

-	  node->count == 0);

-

-   if (save->dangling_attr_ref)

-      ctx->ListState.CurrentList->Flags |= DLIST_DANGLING_REFS;

-

-   save->vertex_store->used += save->vertex_size * node->count;

-   save->prim_store->used += node->prim_count;

-

-

-   /* Copy duplicated vertices 

-    */

-   save->copied.nr = _save_copy_vertices( ctx, node, save->buffer );

-

-

-   /* Deal with GL_COMPILE_AND_EXECUTE:

-    */

-   if (ctx->ExecuteFlag) {

-      struct _glapi_table *dispatch = GET_DISPATCH();

-

-      _glapi_set_dispatch(ctx->Exec);

-

-      vbo_loopback_vertex_list( ctx,

-				(const GLfloat *)((const char *)save->vertex_store->buffer + 

-						  node->buffer_offset),

-				node->attrsz,

-				node->prim,

-				node->prim_count,

-				node->wrap_count,

-				node->vertex_size);

-

-      _glapi_set_dispatch(dispatch);

-   }

-

-

-   /* Decide whether the storage structs are full, or can be used for

-    * the next vertex lists as well.

-    */

-   if (save->vertex_store->used > 

-       VBO_SAVE_BUFFER_SIZE - 16 * (save->vertex_size + 4)) {

-

-      /* Unmap old store:

-       */

-      unmap_vertex_store( ctx, save->vertex_store );

-

-      /* Release old reference:

-       */

-      save->vertex_store->refcount--; 

-      assert(save->vertex_store->refcount != 0);

-      save->vertex_store = NULL;

-

-      /* Allocate and map new store:

-       */

-      save->vertex_store = alloc_vertex_store( ctx );

-      save->buffer_ptr = map_vertex_store( ctx, save->vertex_store );

-   } 

-

-   if (save->prim_store->used > VBO_SAVE_PRIM_SIZE - 6) {

-      save->prim_store->refcount--; 

-      assert(save->prim_store->refcount != 0);

-      save->prim_store = alloc_prim_store( ctx );

-   } 

-

-   /* Reset our structures for the next run of vertices:

-    */

-   _save_reset_counters( ctx );

-}

-

-

-/* TODO -- If no new vertices have been stored, don't bother saving

- * it.

- */

-static void _save_wrap_buffers( struct gl_context *ctx )

-{

-   struct vbo_save_context *save = &vbo_context(ctx)->save;

-   GLint i = save->prim_count - 1;

-   GLenum mode;

-   GLboolean weak;

-   GLboolean no_current_update;

-

-   assert(i < (GLint) save->prim_max);

-   assert(i >= 0);

-

-   /* Close off in-progress primitive.

-    */

-   save->prim[i].count = (save->vert_count - 

-			  save->prim[i].start);

-   mode = save->prim[i].mode;

-   weak = save->prim[i].weak;

-   no_current_update = save->prim[i].no_current_update;

-   

-   /* store the copied vertices, and allocate a new list.

-    */

-   _save_compile_vertex_list( ctx );

-

-   /* Restart interrupted primitive

-    */

-   save->prim[0].mode = mode;

-   save->prim[0].weak = weak;

-   save->prim[0].no_current_update = no_current_update;

-   save->prim[0].begin = 0;

-   save->prim[0].end = 0;

-   save->prim[0].pad = 0;

-   save->prim[0].start = 0;

-   save->prim[0].count = 0;

-   save->prim[0].num_instances = 1;

-   save->prim_count = 1;

-}

-

-

-

-/* Called only when buffers are wrapped as the result of filling the

- * vertex_store struct.  

- */

-static void _save_wrap_filled_vertex( struct gl_context *ctx )

-{

-   struct vbo_save_context *save = &vbo_context(ctx)->save;

-   GLfloat *data = save->copied.buffer;

-   GLuint i;

-

-   /* Emit a glEnd to close off the last vertex list.

-    */

-   _save_wrap_buffers( ctx );

-   

-    /* Copy stored stored vertices to start of new list.

-    */

-   assert(save->max_vert - save->vert_count > save->copied.nr);

-

-   for (i = 0 ; i < save->copied.nr ; i++) {

-      memcpy( save->buffer_ptr, data, save->vertex_size * sizeof(GLfloat));

-      data += save->vertex_size;

-      save->buffer_ptr += save->vertex_size;

-      save->vert_count++;

-   }

-}

-

-

-static void _save_copy_to_current( struct gl_context *ctx )

-{

-   struct vbo_save_context *save = &vbo_context(ctx)->save; 

-   GLuint i;

-

-   for (i = VBO_ATTRIB_POS+1 ; i < VBO_ATTRIB_MAX ; i++) {

-      if (save->attrsz[i]) {

-	 save->currentsz[i][0] = save->attrsz[i];

-	 COPY_CLEAN_4V(save->current[i], 

-		       save->attrsz[i], 

-		       save->attrptr[i]);

-      }

-   }

-}

-

-

-static void _save_copy_from_current( struct gl_context *ctx )

-{

-   struct vbo_save_context *save = &vbo_context(ctx)->save; 

-   GLint i;

-

-   for (i = VBO_ATTRIB_POS+1 ; i < VBO_ATTRIB_MAX ; i++) {

-      switch (save->attrsz[i]) {

-      case 4: save->attrptr[i][3] = save->current[i][3];

-      case 3: save->attrptr[i][2] = save->current[i][2];

-      case 2: save->attrptr[i][1] = save->current[i][1];

-      case 1: save->attrptr[i][0] = save->current[i][0];

-      case 0: break;

-      }

-   }

-}

-

-

-

-

-/* Flush existing data, set new attrib size, replay copied vertices.

- */ 

-static void _save_upgrade_vertex( struct gl_context *ctx, 

-				 GLuint attr,

-				 GLuint newsz )

-{

-   struct vbo_save_context *save = &vbo_context(ctx)->save;

-   GLuint oldsz;

-   GLuint i;

-   GLfloat *tmp;

-

-   /* Store the current run of vertices, and emit a GL_END.  Emit a

-    * BEGIN in the new buffer.

-    */

-   if (save->vert_count) 

-      _save_wrap_buffers( ctx );

-   else

-      assert( save->copied.nr == 0 );

-

-   /* Do a COPY_TO_CURRENT to ensure back-copying works for the case

-    * when the attribute already exists in the vertex and is having

-    * its size increased.  

-    */

-   _save_copy_to_current( ctx );

-

-   /* Fix up sizes:

-    */

-   oldsz = save->attrsz[attr];

-   save->attrsz[attr] = newsz;

-

-   save->vertex_size += newsz - oldsz;

-   save->max_vert = ((VBO_SAVE_BUFFER_SIZE - save->vertex_store->used) / 

-		      save->vertex_size);

-   save->vert_count = 0;

-

-   /* Recalculate all the attrptr[] values:

-    */

-   for (i = 0, tmp = save->vertex ; i < VBO_ATTRIB_MAX ; i++) {

-      if (save->attrsz[i]) {

-	 save->attrptr[i] = tmp;

-	 tmp += save->attrsz[i];

-      }

-      else 

-	 save->attrptr[i] = NULL; /* will not be dereferenced. */

-   }

-

-   /* Copy from current to repopulate the vertex with correct values.

-    */

-   _save_copy_from_current( ctx );

-

-   /* Replay stored vertices to translate them to new format here.

-    *

-    * If there are copied vertices and the new (upgraded) attribute

-    * has not been defined before, this list is somewhat degenerate,

-    * and will need fixup at runtime.

-    */

-   if (save->copied.nr)

-   {

-      GLfloat *data = save->copied.buffer;

-      GLfloat *dest = save->buffer;

-      GLuint j;

-

-      /* Need to note this and fix up at runtime (or loopback):

-       */

-      if (attr != VBO_ATTRIB_POS && save->currentsz[attr][0] == 0) {

-	 assert(oldsz == 0);

-	 save->dangling_attr_ref = GL_TRUE;

-      }

-

-      for (i = 0 ; i < save->copied.nr ; i++) {

-	 for (j = 0 ; j < VBO_ATTRIB_MAX ; j++) {

-	    if (save->attrsz[j]) {

-	       if (j == attr) {

-		  if (oldsz) {

-		     COPY_CLEAN_4V( dest, oldsz, data );

-		     data += oldsz;

-		     dest += newsz;

-		  }

-		  else {

-		     COPY_SZ_4V( dest, newsz, save->current[attr] );

-		     dest += newsz;

-		  }

-	       }

-	       else {

-		  GLint sz = save->attrsz[j];

-		  COPY_SZ_4V( dest, sz, data );

-		  data += sz;

-		  dest += sz;

-	       }

-	    }

-	 }

-      }

-

-      save->buffer_ptr = dest;

-      save->vert_count += save->copied.nr;

-   }

-}

-

-static void save_fixup_vertex( struct gl_context *ctx, GLuint attr, GLuint sz )

-{

-   struct vbo_save_context *save = &vbo_context(ctx)->save; 

-

-   if (sz > save->attrsz[attr]) {

-      /* New size is larger.  Need to flush existing vertices and get

-       * an enlarged vertex format.

-       */

-      _save_upgrade_vertex( ctx, attr, sz );

-   }

-   else if (sz < save->active_sz[attr]) {

-      static GLfloat id[4] = { 0, 0, 0, 1 };

-      GLuint i;

-

-      /* New size is equal or smaller - just need to fill in some

-       * zeros.

-       */

-      for (i = sz ; i <= save->attrsz[attr] ; i++)

-	 save->attrptr[attr][i-1] = id[i-1];

-   }

-

-   save->active_sz[attr] = sz;

-}

-

-static void _save_reset_vertex( struct gl_context *ctx )

-{

-   struct vbo_save_context *save = &vbo_context(ctx)->save;

-   GLuint i;

-

-   for (i = 0 ; i < VBO_ATTRIB_MAX ; i++) {

-      save->attrsz[i] = 0;

-      save->active_sz[i] = 0;

-   }

-      

-   save->vertex_size = 0;

-}

-

-

-

-#define ERROR()   _mesa_compile_error( ctx, GL_INVALID_ENUM, __FUNCTION__ );

-

-

-/* Only one size for each attribute may be active at once.  Eg. if

- * Color3f is installed/active, then Color4f may not be, even if the

- * vertex actually contains 4 color coordinates.  This is because the

- * 3f version won't otherwise set color[3] to 1.0 -- this is the job

- * of the chooser function when switching between Color4f and Color3f.

- */

-#define ATTR( A, N, V0, V1, V2, V3 )				\

-do {								\

-   struct vbo_save_context *save = &vbo_context(ctx)->save;	\

-								\

-   if (save->active_sz[A] != N)				\

-      save_fixup_vertex(ctx, A, N);				\

-								\

-   {								\

-      GLfloat *dest = save->attrptr[A];			\

-      if (N>0) dest[0] = V0;					\

-      if (N>1) dest[1] = V1;					\

-      if (N>2) dest[2] = V2;					\

-      if (N>3) dest[3] = V3;					\

-   }								\

-								\

-   if ((A) == 0) {						\

-      GLuint i;							\

-								\

-      for (i = 0; i < save->vertex_size; i++)			\

-	 save->buffer_ptr[i] = save->vertex[i];			\

-								\

-      save->buffer_ptr += save->vertex_size;				\

-								\

-      if (++save->vert_count >= save->max_vert)			\

-	 _save_wrap_filled_vertex( ctx );			\

-   }								\

-} while (0)

-

-#define TAG(x) _save_##x

-

-#include "vbo_attrib_tmp.h"

-

-

-

-

-/* Cope with EvalCoord/CallList called within a begin/end object:

- *     -- Flush current buffer

- *     -- Fallback to opcodes for the rest of the begin/end object.

- */

-static void DO_FALLBACK( struct gl_context *ctx )

-{

-   struct vbo_save_context *save = &vbo_context(ctx)->save;

-

-   if (save->vert_count || save->prim_count) {

-      GLint i = save->prim_count - 1;

-

-      /* Close off in-progress primitive.

-       */

-      save->prim[i].count = (save->vert_count - 

-                             save->prim[i].start);

-

-      /* Need to replay this display list with loopback,

-       * unfortunately, otherwise this primitive won't be handled

-       * properly:

-       */

-      save->dangling_attr_ref = 1;

-      

-      _save_compile_vertex_list( ctx );

-   }

-

-   _save_copy_to_current( ctx );

-   _save_reset_vertex( ctx );

-   _save_reset_counters( ctx );

-   _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );

-   ctx->Driver.SaveNeedFlush = 0;

-}

-

-static void GLAPIENTRY _save_EvalCoord1f( GLfloat u )

-{

-   GET_CURRENT_CONTEXT(ctx);

-   DO_FALLBACK(ctx);

-   CALL_EvalCoord1f(ctx->Save, (u));

-}

-

-static void GLAPIENTRY _save_EvalCoord1fv( const GLfloat *v )

-{

-   GET_CURRENT_CONTEXT(ctx);

-   DO_FALLBACK(ctx);

-   CALL_EvalCoord1fv(ctx->Save, (v));

-}

-

-static void GLAPIENTRY _save_EvalCoord2f( GLfloat u, GLfloat v )

-{

-   GET_CURRENT_CONTEXT(ctx);

-   DO_FALLBACK(ctx);

-   CALL_EvalCoord2f(ctx->Save, (u, v));

-}

-

-static void GLAPIENTRY _save_EvalCoord2fv( const GLfloat *v )

-{

-   GET_CURRENT_CONTEXT(ctx);

-   DO_FALLBACK(ctx);

-   CALL_EvalCoord2fv(ctx->Save, (v));

-}

-

-static void GLAPIENTRY _save_EvalPoint1( GLint i )

-{

-   GET_CURRENT_CONTEXT(ctx);

-   DO_FALLBACK(ctx);

-   CALL_EvalPoint1(ctx->Save, (i));

-}

-

-static void GLAPIENTRY _save_EvalPoint2( GLint i, GLint j )

-{

-   GET_CURRENT_CONTEXT(ctx);

-   DO_FALLBACK(ctx);

-   CALL_EvalPoint2(ctx->Save, (i, j));

-}

-

-static void GLAPIENTRY _save_CallList( GLuint l )

-{

-   GET_CURRENT_CONTEXT(ctx);

-   DO_FALLBACK(ctx);

-   CALL_CallList(ctx->Save, (l));

-}

-

-static void GLAPIENTRY _save_CallLists( GLsizei n, GLenum type, const GLvoid *v )

-{

-   GET_CURRENT_CONTEXT(ctx);

-   DO_FALLBACK(ctx);

-   CALL_CallLists(ctx->Save, (n, type, v));

-}

-

-

-

-

-/* This begin is hooked into ...  Updating of

- * ctx->Driver.CurrentSavePrimitive is already taken care of.

- */

-GLboolean vbo_save_NotifyBegin( struct gl_context *ctx, GLenum mode )

-{

-   struct vbo_save_context *save = &vbo_context(ctx)->save; 

-

-   GLuint i = save->prim_count++;

-

-   assert(i < save->prim_max);

-   save->prim[i].mode = mode & VBO_SAVE_PRIM_MODE_MASK;

-   save->prim[i].begin = 1;

-   save->prim[i].end = 0;

-   save->prim[i].weak = (mode & VBO_SAVE_PRIM_WEAK) ? 1 : 0;

-   save->prim[i].no_current_update = (mode & VBO_SAVE_PRIM_NO_CURRENT_UPDATE) ? 1 : 0;

-   save->prim[i].pad = 0;

-   save->prim[i].start = save->vert_count;

-   save->prim[i].count = 0;   

-   save->prim[i].num_instances = 1;   

-

-   _mesa_install_save_vtxfmt( ctx, &save->vtxfmt );      

-   ctx->Driver.SaveNeedFlush = 1;

-   return GL_TRUE;

-}

-

-

-

-static void GLAPIENTRY _save_End( void )

-{

-   GET_CURRENT_CONTEXT( ctx ); 

-   struct vbo_save_context *save = &vbo_context(ctx)->save; 

-   GLint i = save->prim_count - 1;

-

-   ctx->Driver.CurrentSavePrimitive = PRIM_OUTSIDE_BEGIN_END;

-   save->prim[i].end = 1;

-   save->prim[i].count = (save->vert_count - 

-			  save->prim[i].start);

-

-   if (i == (GLint) save->prim_max - 1) {

-      _save_compile_vertex_list( ctx );

-      assert(save->copied.nr == 0);

-   }

-

-   /* Swap out this vertex format while outside begin/end.  Any color,

-    * etc. received between here and the next begin will be compiled

-    * as opcodes.

-    */   

-   _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );

-}

-

-

-/* These are all errors as this vtxfmt is only installed inside

- * begin/end pairs.

- */

-static void GLAPIENTRY _save_DrawElements(GLenum mode, GLsizei count, GLenum type,

-			       const GLvoid *indices)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   (void) mode; (void) count; (void) type; (void) indices;

-   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glDrawElements" );

-}

-

-

-static void GLAPIENTRY _save_DrawRangeElements(GLenum mode,

-				    GLuint start, GLuint end,

-				    GLsizei count, GLenum type,

-				    const GLvoid *indices)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   (void) mode; (void) start; (void) end; (void) count; (void) type; (void) indices;

-   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glDrawRangeElements" );

-}

-

-static void GLAPIENTRY _save_DrawElementsBaseVertex(GLenum mode,

-						    GLsizei count,

-						    GLenum type,

-						    const GLvoid *indices,

-						    GLint basevertex)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   (void) mode; (void) count; (void) type; (void) indices; (void)basevertex;

-

-   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glDrawElements" );

-}

-

-static void GLAPIENTRY _save_DrawRangeElementsBaseVertex(GLenum mode,

-							 GLuint start,

-							 GLuint end,

-							 GLsizei count,

-							 GLenum type,

-							 const GLvoid *indices,

-							 GLint basevertex)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   (void) mode; (void) start; (void) end; (void) count; (void) type;

-   (void) indices; (void)basevertex;

-

-   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glDrawRangeElements" );

-}

-

-static void GLAPIENTRY _save_DrawArrays(GLenum mode, GLint start, GLsizei count)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   (void) mode; (void) start; (void) count;

-   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glDrawArrays" );

-}

-

-static void GLAPIENTRY _save_Rectf( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 )

-{

-   GET_CURRENT_CONTEXT(ctx);

-   (void) x1; (void) y1; (void) x2; (void) y2;

-   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glRectf" );

-}

-

-static void GLAPIENTRY _save_EvalMesh1( GLenum mode, GLint i1, GLint i2 )

-{

-   GET_CURRENT_CONTEXT(ctx);

-   (void) mode; (void) i1; (void) i2;

-   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glEvalMesh1" );

-}

-

-static void GLAPIENTRY _save_EvalMesh2( GLenum mode, GLint i1, GLint i2,

-				  GLint j1, GLint j2 )

-{

-   GET_CURRENT_CONTEXT(ctx);

-   (void) mode; (void) i1; (void) i2; (void) j1; (void) j2;

-   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glEvalMesh2" );

-}

-

-static void GLAPIENTRY _save_Begin( GLenum mode )

-{

-   GET_CURRENT_CONTEXT( ctx );

-   (void) mode;

-   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "Recursive glBegin" );

-}

-

-

-static void GLAPIENTRY _save_PrimitiveRestartNV( void )

-{

-   GLenum curPrim;

-   GET_CURRENT_CONTEXT( ctx ); 

-

-   curPrim = ctx->Driver.CurrentSavePrimitive;

-

-   _save_End();

-   _save_Begin(curPrim);

-}

-

-

-/* Unlike the functions above, these are to be hooked into the vtxfmt

- * maintained in ctx->ListState, active when the list is known or

- * suspected to be outside any begin/end primitive.

- */

-static void GLAPIENTRY _save_OBE_Rectf( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 )

-{

-   GET_CURRENT_CONTEXT(ctx);

-   vbo_save_NotifyBegin( ctx, GL_QUADS | VBO_SAVE_PRIM_WEAK );

-   CALL_Vertex2f(GET_DISPATCH(), ( x1, y1 ));

-   CALL_Vertex2f(GET_DISPATCH(), ( x2, y1 ));

-   CALL_Vertex2f(GET_DISPATCH(), ( x2, y2 ));

-   CALL_Vertex2f(GET_DISPATCH(), ( x1, y2 ));

-   CALL_End(GET_DISPATCH(), ());

-}

-

-

-static void GLAPIENTRY _save_OBE_DrawArrays(GLenum mode, GLint start, GLsizei count)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   GLint i;

-

-   if (!_mesa_validate_DrawArrays( ctx, mode, start, count ))

-      return;

-

-   _ae_map_vbos( ctx );

-

-   vbo_save_NotifyBegin( ctx, mode | VBO_SAVE_PRIM_WEAK | VBO_SAVE_PRIM_NO_CURRENT_UPDATE);

-

-   for (i = 0; i < count; i++)

-       CALL_ArrayElement(GET_DISPATCH(), (start + i));

-   CALL_End(GET_DISPATCH(), ());

-

-   _ae_unmap_vbos( ctx );

-}

-

-/* Could do better by copying the arrays and element list intact and

- * then emitting an indexed prim at runtime.

- */

-static void GLAPIENTRY _save_OBE_DrawElements(GLenum mode, GLsizei count, GLenum type,

-				   const GLvoid *indices)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   GLint i;

-

-   if (!_mesa_validate_DrawElements( ctx, mode, count, type, indices, 0 ))

-      return;

-

-   _ae_map_vbos( ctx );

-

-   if (_mesa_is_bufferobj(ctx->Array.ElementArrayBufferObj))

-      indices = ADD_POINTERS(ctx->Array.ElementArrayBufferObj->Pointer, indices);

-

-   vbo_save_NotifyBegin( ctx, mode | VBO_SAVE_PRIM_WEAK | VBO_SAVE_PRIM_NO_CURRENT_UPDATE );

-

-   switch (type) {

-   case GL_UNSIGNED_BYTE:

-      for (i = 0 ; i < count ; i++)

-	  CALL_ArrayElement(GET_DISPATCH(), ( ((GLubyte *)indices)[i] ));

-      break;

-   case GL_UNSIGNED_SHORT:

-      for (i = 0 ; i < count ; i++)

-	  CALL_ArrayElement(GET_DISPATCH(), ( ((GLushort *)indices)[i] ));

-      break;

-   case GL_UNSIGNED_INT:

-      for (i = 0 ; i < count ; i++)

-	  CALL_ArrayElement(GET_DISPATCH(), ( ((GLuint *)indices)[i] ));

-      break;

-   default:

-      _mesa_error( ctx, GL_INVALID_ENUM, "glDrawElements(type)" );

-      break;

-   }

-

-   CALL_End(GET_DISPATCH(), ());

-

-   _ae_unmap_vbos( ctx );

-}

-

-static void GLAPIENTRY _save_OBE_DrawRangeElements(GLenum mode,

-					GLuint start, GLuint end,

-					GLsizei count, GLenum type,

-					const GLvoid *indices)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (_mesa_validate_DrawRangeElements( ctx, mode,

-					 start, end,

-					 count, type, indices, 0 ))

-      _save_OBE_DrawElements( mode, count, type, indices );

-}

-

-

-

-

-

-static void _save_vtxfmt_init( struct gl_context *ctx )

-{

-   struct vbo_save_context *save = &vbo_context(ctx)->save;

-   GLvertexformat *vfmt = &save->vtxfmt;

-

-   _MESA_INIT_ARRAYELT_VTXFMT(vfmt, _ae_);

-

-   vfmt->Begin = _save_Begin;

-   vfmt->Color3f = _save_Color3f;

-   vfmt->Color3fv = _save_Color3fv;

-   vfmt->Color4f = _save_Color4f;

-   vfmt->Color4fv = _save_Color4fv;

-   vfmt->EdgeFlag = _save_EdgeFlag;

-   vfmt->End = _save_End;

-   vfmt->PrimitiveRestartNV = _save_PrimitiveRestartNV;

-   vfmt->FogCoordfEXT = _save_FogCoordfEXT;

-   vfmt->FogCoordfvEXT = _save_FogCoordfvEXT;

-   vfmt->Indexf = _save_Indexf;

-   vfmt->Indexfv = _save_Indexfv;

-   vfmt->Materialfv = _save_Materialfv;

-   vfmt->MultiTexCoord1fARB = _save_MultiTexCoord1f;

-   vfmt->MultiTexCoord1fvARB = _save_MultiTexCoord1fv;

-   vfmt->MultiTexCoord2fARB = _save_MultiTexCoord2f;

-   vfmt->MultiTexCoord2fvARB = _save_MultiTexCoord2fv;

-   vfmt->MultiTexCoord3fARB = _save_MultiTexCoord3f;

-   vfmt->MultiTexCoord3fvARB = _save_MultiTexCoord3fv;

-   vfmt->MultiTexCoord4fARB = _save_MultiTexCoord4f;

-   vfmt->MultiTexCoord4fvARB = _save_MultiTexCoord4fv;

-   vfmt->Normal3f = _save_Normal3f;

-   vfmt->Normal3fv = _save_Normal3fv;

-   vfmt->SecondaryColor3fEXT = _save_SecondaryColor3fEXT;

-   vfmt->SecondaryColor3fvEXT = _save_SecondaryColor3fvEXT;

-   vfmt->TexCoord1f = _save_TexCoord1f;

-   vfmt->TexCoord1fv = _save_TexCoord1fv;

-   vfmt->TexCoord2f = _save_TexCoord2f;

-   vfmt->TexCoord2fv = _save_TexCoord2fv;

-   vfmt->TexCoord3f = _save_TexCoord3f;

-   vfmt->TexCoord3fv = _save_TexCoord3fv;

-   vfmt->TexCoord4f = _save_TexCoord4f;

-   vfmt->TexCoord4fv = _save_TexCoord4fv;

-   vfmt->Vertex2f = _save_Vertex2f;

-   vfmt->Vertex2fv = _save_Vertex2fv;

-   vfmt->Vertex3f = _save_Vertex3f;

-   vfmt->Vertex3fv = _save_Vertex3fv;

-   vfmt->Vertex4f = _save_Vertex4f;

-   vfmt->Vertex4fv = _save_Vertex4fv;

-   vfmt->VertexAttrib1fARB = _save_VertexAttrib1fARB;

-   vfmt->VertexAttrib1fvARB = _save_VertexAttrib1fvARB;

-   vfmt->VertexAttrib2fARB = _save_VertexAttrib2fARB;

-   vfmt->VertexAttrib2fvARB = _save_VertexAttrib2fvARB;

-   vfmt->VertexAttrib3fARB = _save_VertexAttrib3fARB;

-   vfmt->VertexAttrib3fvARB = _save_VertexAttrib3fvARB;

-   vfmt->VertexAttrib4fARB = _save_VertexAttrib4fARB;

-   vfmt->VertexAttrib4fvARB = _save_VertexAttrib4fvARB;

-

-   vfmt->VertexAttrib1fNV = _save_VertexAttrib1fNV;

-   vfmt->VertexAttrib1fvNV = _save_VertexAttrib1fvNV;

-   vfmt->VertexAttrib2fNV = _save_VertexAttrib2fNV;

-   vfmt->VertexAttrib2fvNV = _save_VertexAttrib2fvNV;

-   vfmt->VertexAttrib3fNV = _save_VertexAttrib3fNV;

-   vfmt->VertexAttrib3fvNV = _save_VertexAttrib3fvNV;

-   vfmt->VertexAttrib4fNV = _save_VertexAttrib4fNV;

-   vfmt->VertexAttrib4fvNV = _save_VertexAttrib4fvNV;

-   

-   /* integer-valued */

-   vfmt->VertexAttribI1i = _save_VertexAttribI1i;

-   vfmt->VertexAttribI2i = _save_VertexAttribI2i;

-   vfmt->VertexAttribI3i = _save_VertexAttribI3i;

-   vfmt->VertexAttribI4i = _save_VertexAttribI4i;

-   vfmt->VertexAttribI2iv = _save_VertexAttribI2iv;

-   vfmt->VertexAttribI3iv = _save_VertexAttribI3iv;

-   vfmt->VertexAttribI4iv = _save_VertexAttribI4iv;

-

-   /* unsigned integer-valued */

-   vfmt->VertexAttribI1ui = _save_VertexAttribI1ui;

-   vfmt->VertexAttribI2ui = _save_VertexAttribI2ui;

-   vfmt->VertexAttribI3ui = _save_VertexAttribI3ui;

-   vfmt->VertexAttribI4ui = _save_VertexAttribI4ui;

-   vfmt->VertexAttribI2uiv = _save_VertexAttribI2uiv;

-   vfmt->VertexAttribI3uiv = _save_VertexAttribI3uiv;

-   vfmt->VertexAttribI4uiv = _save_VertexAttribI4uiv;

-

-   /* This will all require us to fallback to saving the list as opcodes:

-    */ 

-   _MESA_INIT_DLIST_VTXFMT(vfmt, _save_); /* inside begin/end */

-

-   _MESA_INIT_EVAL_VTXFMT(vfmt, _save_);

-

-   /* These are all errors as we at least know we are in some sort of

-    * begin/end pair:

-    */

-   vfmt->Begin = _save_Begin;

-   vfmt->Rectf = _save_Rectf;

-   vfmt->DrawArrays = _save_DrawArrays;

-   vfmt->DrawElements = _save_DrawElements;

-   vfmt->DrawRangeElements = _save_DrawRangeElements;

-   vfmt->DrawElementsBaseVertex = _save_DrawElementsBaseVertex;

-   vfmt->DrawRangeElementsBaseVertex = _save_DrawRangeElementsBaseVertex;

-   /* Loops back into vfmt->DrawElements */

-   vfmt->MultiDrawElementsEXT = _mesa_noop_MultiDrawElements;

-   vfmt->MultiDrawElementsBaseVertex = _mesa_noop_MultiDrawElementsBaseVertex;

-}

-

-

-void vbo_save_SaveFlushVertices( struct gl_context *ctx )

-{

-   struct vbo_save_context *save = &vbo_context(ctx)->save;

-

-   /* Noop when we are actually active:

-    */

-   if (ctx->Driver.CurrentSavePrimitive == PRIM_INSIDE_UNKNOWN_PRIM ||

-       ctx->Driver.CurrentSavePrimitive <= GL_POLYGON)

-      return;

-

-   if (save->vert_count ||

-       save->prim_count) 

-      _save_compile_vertex_list( ctx );

-   

-   _save_copy_to_current( ctx );

-   _save_reset_vertex( ctx );

-   _save_reset_counters( ctx );  

-   ctx->Driver.SaveNeedFlush = 0;

-}

-

-void vbo_save_NewList( struct gl_context *ctx, GLuint list, GLenum mode )

-{

-   struct vbo_save_context *save = &vbo_context(ctx)->save;

-

-   (void) list; (void) mode;

-

-   if (!save->prim_store)

-      save->prim_store = alloc_prim_store( ctx );

-

-   if (!save->vertex_store) 

-      save->vertex_store = alloc_vertex_store( ctx );

-      

-   save->buffer_ptr = map_vertex_store( ctx, save->vertex_store );

-   

-   _save_reset_vertex( ctx );

-   _save_reset_counters( ctx );  

-   ctx->Driver.SaveNeedFlush = 0;

-}

-

-void vbo_save_EndList( struct gl_context *ctx )

-{

-   struct vbo_save_context *save = &vbo_context(ctx)->save;

-

-   /* EndList called inside a (saved) Begin/End pair?

-    */

-   if (ctx->Driver.CurrentSavePrimitive != PRIM_OUTSIDE_BEGIN_END) {

-

-      if (save->prim_count > 0) {

-         GLint i = save->prim_count - 1;

-         ctx->Driver.CurrentSavePrimitive = PRIM_OUTSIDE_BEGIN_END;

-         save->prim[i].end = 0;

-         save->prim[i].count = (save->vert_count - 

-                                save->prim[i].start);

-      }

-

-      /* Make sure this vertex list gets replayed by the "loopback"

-       * mechanism:

-       */

-      save->dangling_attr_ref = 1;

-      vbo_save_SaveFlushVertices( ctx );

-

-      /* Swap out this vertex format while outside begin/end.  Any color,

-       * etc. received between here and the next begin will be compiled

-       * as opcodes.

-       */   

-      _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );

-   }

-

-   unmap_vertex_store( ctx, save->vertex_store );

-

-   assert(save->vertex_size == 0);

-}

- 

-void vbo_save_BeginCallList( struct gl_context *ctx, struct gl_display_list *dlist )

-{

-   struct vbo_save_context *save = &vbo_context(ctx)->save;

-   save->replay_flags |= dlist->Flags;

-}

-

-void vbo_save_EndCallList( struct gl_context *ctx )

-{

-   struct vbo_save_context *save = &vbo_context(ctx)->save;

-   

-   if (ctx->ListState.CallDepth == 1) {

-      /* This is correct: want to keep only the VBO_SAVE_FALLBACK

-       * flag, if it is set:

-       */

-      save->replay_flags &= VBO_SAVE_FALLBACK;

-   }

-}

-

-

-static void vbo_destroy_vertex_list( struct gl_context *ctx, void *data )

-{

-   struct vbo_save_vertex_list *node = (struct vbo_save_vertex_list *)data;

-   (void) ctx;

-

-   if ( --node->vertex_store->refcount == 0 ) 

-      free_vertex_store( ctx, node->vertex_store );

-

-   if ( --node->prim_store->refcount == 0 )

-      FREE( node->prim_store );

-

-   if (node->current_data) {

-      FREE(node->current_data);

-      node->current_data = NULL;

-   }

-}

-

-

-static void vbo_print_vertex_list( struct gl_context *ctx, void *data )

-{

-   struct vbo_save_vertex_list *node = (struct vbo_save_vertex_list *)data;

-   GLuint i;

-   (void) ctx;

-

-   printf("VBO-VERTEX-LIST, %u vertices %d primitives, %d vertsize\n",

-	  node->count,

-	  node->prim_count,

-	  node->vertex_size);

-

-   for (i = 0 ; i < node->prim_count ; i++) {

-      struct _mesa_prim *prim = &node->prim[i];

-      _mesa_debug(NULL, "   prim %d: %s%s %d..%d %s %s\n",

-		  i, 

-		  _mesa_lookup_prim_by_nr(prim->mode),

-		  prim->weak ? " (weak)" : "",

-		  prim->start, 

-		  prim->start + prim->count,

-		  (prim->begin) ? "BEGIN" : "(wrap)",

-		  (prim->end) ? "END" : "(wrap)");

-   }

-}

-

-

-static void _save_current_init( struct gl_context *ctx ) 

-{

-   struct vbo_save_context *save = &vbo_context(ctx)->save;

-   GLint i;

-

-   for (i = VBO_ATTRIB_POS; i <= VBO_ATTRIB_GENERIC15; i++) {

-      const GLuint j = i - VBO_ATTRIB_POS;

-      ASSERT(j < VERT_ATTRIB_MAX);

-      save->currentsz[i] = &ctx->ListState.ActiveAttribSize[j];

-      save->current[i] = ctx->ListState.CurrentAttrib[j];

-   }

-

-   for (i = VBO_ATTRIB_FIRST_MATERIAL; i <= VBO_ATTRIB_LAST_MATERIAL; i++) {

-      const GLuint j = i - VBO_ATTRIB_FIRST_MATERIAL;

-      ASSERT(j < MAT_ATTRIB_MAX);

-      save->currentsz[i] = &ctx->ListState.ActiveMaterialSize[j];

-      save->current[i] = ctx->ListState.CurrentMaterial[j];

-   }

-}

-

-/**

- * Initialize the display list compiler

- */

-void vbo_save_api_init( struct vbo_save_context *save )

-{

-   struct gl_context *ctx = save->ctx;

-   GLuint i;

-

-   save->opcode_vertex_list =

-      _mesa_dlist_alloc_opcode( ctx,

-                                sizeof(struct vbo_save_vertex_list),

-                                vbo_save_playback_vertex_list,

-                                vbo_destroy_vertex_list,

-                                vbo_print_vertex_list );

-

-   ctx->Driver.NotifySaveBegin = vbo_save_NotifyBegin;

-

-   _save_vtxfmt_init( ctx );

-   _save_current_init( ctx );

-

-   /* These will actually get set again when binding/drawing */

-   for (i = 0; i < VBO_ATTRIB_MAX; i++)

-      save->inputs[i] = &save->arrays[i];

-

-   /* Hook our array functions into the outside-begin-end vtxfmt in 

-    * ctx->ListState.

-    */

-   ctx->ListState.ListVtxfmt.Rectf = _save_OBE_Rectf;

-   ctx->ListState.ListVtxfmt.DrawArrays = _save_OBE_DrawArrays;

-   ctx->ListState.ListVtxfmt.DrawElements = _save_OBE_DrawElements;

-   ctx->ListState.ListVtxfmt.DrawRangeElements = _save_OBE_DrawRangeElements;

-   /* loops back into _save_OBE_DrawElements */

-   ctx->ListState.ListVtxfmt.MultiDrawElementsEXT = _mesa_noop_MultiDrawElements;

-   ctx->ListState.ListVtxfmt.MultiDrawElementsBaseVertex = _mesa_noop_MultiDrawElementsBaseVertex;

-   _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );

-}

-

-

-#endif /* FEATURE_dlist */

+/**************************************************************************
+
+Copyright 2002-2008 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
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+TUNGSTEN GRAPHICS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+
+
+/* Display list compiler attempts to store lists of vertices with the
+ * same vertex layout.  Additionally it attempts to minimize the need
+ * for execute-time fixup of these vertex lists, allowing them to be
+ * cached on hardware.
+ *
+ * There are still some circumstances where this can be thwarted, for
+ * example by building a list that consists of one very long primitive
+ * (eg Begin(Triangles), 1000 vertices, End), and calling that list
+ * from inside a different begin/end object (Begin(Lines), CallList,
+ * End).  
+ *
+ * In that case the code will have to replay the list as individual
+ * commands through the Exec dispatch table, or fix up the copied
+ * vertices at execute-time.
+ *
+ * The other case where fixup is required is when a vertex attribute
+ * is introduced in the middle of a primitive.  Eg:
+ *  Begin(Lines)
+ *  TexCoord1f()           Vertex2f()
+ *  TexCoord1f() Color3f() Vertex2f()
+ *  End()
+ *
+ *  If the current value of Color isn't known at compile-time, this
+ *  primitive will require fixup.
+ *
+ *
+ * The list compiler currently doesn't attempt to compile lists
+ * containing EvalCoord or EvalPoint commands.  On encountering one of
+ * these, compilation falls back to opcodes.  
+ *
+ * This could be improved to fallback only when a mix of EvalCoord and
+ * Vertex commands are issued within a single primitive.
+ */
+
+
+#include "main/glheader.h"
+#include "main/bufferobj.h"
+#include "main/context.h"
+#include "main/dlist.h"
+#include "main/enums.h"
+#include "main/eval.h"
+#include "main/macros.h"
+#include "main/mfeatures.h"
+#include "main/api_noop.h"
+#include "main/api_validate.h"
+#include "main/api_arrayelt.h"
+#include "main/vtxfmt.h"
+#include "main/dispatch.h"
+
+#include "vbo_context.h"
+
+
+#if FEATURE_dlist
+
+
+#ifdef ERROR
+#undef ERROR
+#endif
+
+
+/* An interesting VBO number/name to help with debugging */
+#define VBO_BUF_ID  12345
+
+
+/*
+ * NOTE: Old 'parity' issue is gone, but copying can still be
+ * wrong-footed on replay.
+ */
+static GLuint _save_copy_vertices( struct gl_context *ctx, 
+				   const struct vbo_save_vertex_list *node,
+				   const GLfloat *src_buffer)
+{
+   struct vbo_save_context *save = &vbo_context( ctx )->save;
+   const struct _mesa_prim *prim = &node->prim[node->prim_count-1];
+   GLuint nr = prim->count;
+   GLuint sz = save->vertex_size;
+   const GLfloat *src = src_buffer + prim->start * sz;
+   GLfloat *dst = save->copied.buffer;
+   GLuint ovf, i;
+
+   if (prim->end)
+      return 0;
+	 
+   switch( prim->mode )
+   {
+   case GL_POINTS:
+      return 0;
+   case GL_LINES:
+      ovf = nr&1;
+      for (i = 0 ; i < ovf ; i++)
+	 memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz*sizeof(GLfloat) );
+      return i;
+   case GL_TRIANGLES:
+      ovf = nr%3;
+      for (i = 0 ; i < ovf ; i++)
+	 memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz*sizeof(GLfloat) );
+      return i;
+   case GL_QUADS:
+      ovf = nr&3;
+      for (i = 0 ; i < ovf ; i++)
+	 memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz*sizeof(GLfloat) );
+      return i;
+   case GL_LINE_STRIP:
+      if (nr == 0) 
+	 return 0;
+      else {
+	 memcpy( dst, src+(nr-1)*sz, sz*sizeof(GLfloat) );
+	 return 1;
+      }
+   case GL_LINE_LOOP:
+   case GL_TRIANGLE_FAN:
+   case GL_POLYGON:
+      if (nr == 0) 
+	 return 0;
+      else if (nr == 1) {
+	 memcpy( dst, src+0, sz*sizeof(GLfloat) );
+	 return 1;
+      } else {
+	 memcpy( dst, src+0, sz*sizeof(GLfloat) );
+	 memcpy( dst+sz, src+(nr-1)*sz, sz*sizeof(GLfloat) );
+	 return 2;
+      }
+   case GL_TRIANGLE_STRIP:
+   case GL_QUAD_STRIP:
+      switch (nr) {
+      case 0: ovf = 0; break;
+      case 1: ovf = 1; break;
+      default: ovf = 2 + (nr&1); break;
+      }
+      for (i = 0 ; i < ovf ; i++)
+	 memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz*sizeof(GLfloat) );
+      return i;
+   default:
+      assert(0);
+      return 0;
+   }
+}
+
+
+static struct vbo_save_vertex_store *alloc_vertex_store( struct gl_context *ctx )
+{
+   struct vbo_save_vertex_store *vertex_store = CALLOC_STRUCT(vbo_save_vertex_store);
+
+   /* obj->Name needs to be non-zero, but won't ever be examined more
+    * closely than that.  In particular these buffers won't be entered
+    * into the hash and can never be confused with ones visible to the
+    * user.  Perhaps there could be a special number for internal
+    * buffers:
+    */
+   vertex_store->bufferobj = ctx->Driver.NewBufferObject(ctx,
+                                                         VBO_BUF_ID,
+                                                         GL_ARRAY_BUFFER_ARB);
+
+   ctx->Driver.BufferData( ctx, 
+			   GL_ARRAY_BUFFER_ARB, 
+			   VBO_SAVE_BUFFER_SIZE * sizeof(GLfloat),
+			   NULL,
+			   GL_STATIC_DRAW_ARB,
+			   vertex_store->bufferobj);
+
+   vertex_store->buffer = NULL;
+   vertex_store->used = 0;
+   vertex_store->refcount = 1;
+
+   return vertex_store;
+}
+
+static void free_vertex_store( struct gl_context *ctx, struct vbo_save_vertex_store *vertex_store )
+{
+   assert(!vertex_store->buffer);
+
+   if (vertex_store->bufferobj) {
+      _mesa_reference_buffer_object(ctx, &vertex_store->bufferobj, NULL);
+   }
+
+   FREE( vertex_store );
+}
+
+static GLfloat *map_vertex_store( struct gl_context *ctx, struct vbo_save_vertex_store *vertex_store )
+{
+   assert(vertex_store->bufferobj);
+   assert(!vertex_store->buffer);
+   vertex_store->buffer = (GLfloat *)ctx->Driver.MapBuffer(ctx, 
+							   GL_ARRAY_BUFFER_ARB,	/* not used */
+							   GL_WRITE_ONLY, /* not used */
+							   vertex_store->bufferobj); 
+
+   assert(vertex_store->buffer);
+   return vertex_store->buffer + vertex_store->used;
+}
+
+static void unmap_vertex_store( struct gl_context *ctx, struct vbo_save_vertex_store *vertex_store )
+{
+   ctx->Driver.UnmapBuffer( ctx, GL_ARRAY_BUFFER_ARB, vertex_store->bufferobj );
+   vertex_store->buffer = NULL;
+}
+
+
+static struct vbo_save_primitive_store *alloc_prim_store( struct gl_context *ctx )
+{
+   struct vbo_save_primitive_store *store = CALLOC_STRUCT(vbo_save_primitive_store);
+   (void) ctx;
+   store->used = 0;
+   store->refcount = 1;
+   return store;
+}
+
+static void _save_reset_counters( struct gl_context *ctx )
+{
+   struct vbo_save_context *save = &vbo_context(ctx)->save;
+
+   save->prim = save->prim_store->buffer + save->prim_store->used;
+   save->buffer = (save->vertex_store->buffer + 
+		   save->vertex_store->used);
+
+   assert(save->buffer == save->buffer_ptr);
+
+   if (save->vertex_size)
+      save->max_vert = ((VBO_SAVE_BUFFER_SIZE - save->vertex_store->used) / 
+			 save->vertex_size);
+   else
+      save->max_vert = 0;
+
+   save->vert_count = 0;
+   save->prim_count = 0;
+   save->prim_max = VBO_SAVE_PRIM_SIZE - save->prim_store->used;
+   save->dangling_attr_ref = 0;
+}
+
+
+/* Insert the active immediate struct onto the display list currently
+ * being built.
+ */
+static void _save_compile_vertex_list( struct gl_context *ctx )
+{
+   struct vbo_save_context *save = &vbo_context(ctx)->save;
+   struct vbo_save_vertex_list *node;
+
+   /* Allocate space for this structure in the display list currently
+    * being compiled.
+    */
+   node = (struct vbo_save_vertex_list *)
+      _mesa_dlist_alloc(ctx, save->opcode_vertex_list, sizeof(*node));
+
+   if (!node)
+      return;
+
+   /* Duplicate our template, increment refcounts to the storage structs:
+    */
+   memcpy(node->attrsz, save->attrsz, sizeof(node->attrsz));
+   node->vertex_size = save->vertex_size;
+   node->buffer_offset = (save->buffer - save->vertex_store->buffer) * sizeof(GLfloat); 
+   node->count = save->vert_count;
+   node->wrap_count = save->copied.nr;
+   node->dangling_attr_ref = save->dangling_attr_ref;
+   node->prim = save->prim;
+   node->prim_count = save->prim_count;
+   node->vertex_store = save->vertex_store;
+   node->prim_store = save->prim_store;
+
+   node->vertex_store->refcount++;
+   node->prim_store->refcount++;
+
+   if (node->prim[0].no_current_update) {
+      node->current_size = 0;
+      node->current_data = NULL;
+   } else {
+      node->current_size = node->vertex_size - node->attrsz[0];
+      node->current_data = NULL;
+     
+      if (node->current_size) {
+         /* If the malloc fails, we just pull the data out of the VBO
+          * later instead.
+          */
+         node->current_data = MALLOC( node->current_size * sizeof(GLfloat) );
+         if (node->current_data) {
+            const char *buffer = (const char *)save->vertex_store->buffer;
+            unsigned attr_offset = node->attrsz[0] * sizeof(GLfloat);
+            unsigned vertex_offset = 0;
+            
+            if (node->count)
+               vertex_offset = (node->count-1) * node->vertex_size * sizeof(GLfloat);
+         
+            memcpy( node->current_data,
+                    buffer + node->buffer_offset + vertex_offset + attr_offset,
+                    node->current_size * sizeof(GLfloat) );
+         }
+      }
+   }
+
+
+
+   assert(node->attrsz[VBO_ATTRIB_POS] != 0 ||
+	  node->count == 0);
+
+   if (save->dangling_attr_ref)
+      ctx->ListState.CurrentList->Flags |= DLIST_DANGLING_REFS;
+
+   save->vertex_store->used += save->vertex_size * node->count;
+   save->prim_store->used += node->prim_count;
+
+
+   /* Copy duplicated vertices 
+    */
+   save->copied.nr = _save_copy_vertices( ctx, node, save->buffer );
+
+
+   /* Deal with GL_COMPILE_AND_EXECUTE:
+    */
+   if (ctx->ExecuteFlag) {
+      struct _glapi_table *dispatch = GET_DISPATCH();
+
+      _glapi_set_dispatch(ctx->Exec);
+
+      vbo_loopback_vertex_list( ctx,
+				(const GLfloat *)((const char *)save->vertex_store->buffer + 
+						  node->buffer_offset),
+				node->attrsz,
+				node->prim,
+				node->prim_count,
+				node->wrap_count,
+				node->vertex_size);
+
+      _glapi_set_dispatch(dispatch);
+   }
+
+
+   /* Decide whether the storage structs are full, or can be used for
+    * the next vertex lists as well.
+    */
+   if (save->vertex_store->used > 
+       VBO_SAVE_BUFFER_SIZE - 16 * (save->vertex_size + 4)) {
+
+      /* Unmap old store:
+       */
+      unmap_vertex_store( ctx, save->vertex_store );
+
+      /* Release old reference:
+       */
+      save->vertex_store->refcount--; 
+      assert(save->vertex_store->refcount != 0);
+      save->vertex_store = NULL;
+
+      /* Allocate and map new store:
+       */
+      save->vertex_store = alloc_vertex_store( ctx );
+      save->buffer_ptr = map_vertex_store( ctx, save->vertex_store );
+   } 
+
+   if (save->prim_store->used > VBO_SAVE_PRIM_SIZE - 6) {
+      save->prim_store->refcount--; 
+      assert(save->prim_store->refcount != 0);
+      save->prim_store = alloc_prim_store( ctx );
+   } 
+
+   /* Reset our structures for the next run of vertices:
+    */
+   _save_reset_counters( ctx );
+}
+
+
+/* TODO -- If no new vertices have been stored, don't bother saving
+ * it.
+ */
+static void _save_wrap_buffers( struct gl_context *ctx )
+{
+   struct vbo_save_context *save = &vbo_context(ctx)->save;
+   GLint i = save->prim_count - 1;
+   GLenum mode;
+   GLboolean weak;
+   GLboolean no_current_update;
+
+   assert(i < (GLint) save->prim_max);
+   assert(i >= 0);
+
+   /* Close off in-progress primitive.
+    */
+   save->prim[i].count = (save->vert_count - 
+			  save->prim[i].start);
+   mode = save->prim[i].mode;
+   weak = save->prim[i].weak;
+   no_current_update = save->prim[i].no_current_update;
+   
+   /* store the copied vertices, and allocate a new list.
+    */
+   _save_compile_vertex_list( ctx );
+
+   /* Restart interrupted primitive
+    */
+   save->prim[0].mode = mode;
+   save->prim[0].weak = weak;
+   save->prim[0].no_current_update = no_current_update;
+   save->prim[0].begin = 0;
+   save->prim[0].end = 0;
+   save->prim[0].pad = 0;
+   save->prim[0].start = 0;
+   save->prim[0].count = 0;
+   save->prim[0].num_instances = 1;
+   save->prim_count = 1;
+}
+
+
+
+/* Called only when buffers are wrapped as the result of filling the
+ * vertex_store struct.  
+ */
+static void _save_wrap_filled_vertex( struct gl_context *ctx )
+{
+   struct vbo_save_context *save = &vbo_context(ctx)->save;
+   GLfloat *data = save->copied.buffer;
+   GLuint i;
+
+   /* Emit a glEnd to close off the last vertex list.
+    */
+   _save_wrap_buffers( ctx );
+   
+    /* Copy stored stored vertices to start of new list.
+    */
+   assert(save->max_vert - save->vert_count > save->copied.nr);
+
+   for (i = 0 ; i < save->copied.nr ; i++) {
+      memcpy( save->buffer_ptr, data, save->vertex_size * sizeof(GLfloat));
+      data += save->vertex_size;
+      save->buffer_ptr += save->vertex_size;
+      save->vert_count++;
+   }
+}
+
+
+static void _save_copy_to_current( struct gl_context *ctx )
+{
+   struct vbo_save_context *save = &vbo_context(ctx)->save; 
+   GLuint i;
+
+   for (i = VBO_ATTRIB_POS+1 ; i < VBO_ATTRIB_MAX ; i++) {
+      if (save->attrsz[i]) {
+	 save->currentsz[i][0] = save->attrsz[i];
+	 COPY_CLEAN_4V(save->current[i], 
+		       save->attrsz[i], 
+		       save->attrptr[i]);
+      }
+   }
+}
+
+
+static void _save_copy_from_current( struct gl_context *ctx )
+{
+   struct vbo_save_context *save = &vbo_context(ctx)->save; 
+   GLint i;
+
+   for (i = VBO_ATTRIB_POS+1 ; i < VBO_ATTRIB_MAX ; i++) {
+      switch (save->attrsz[i]) {
+      case 4: save->attrptr[i][3] = save->current[i][3];
+      case 3: save->attrptr[i][2] = save->current[i][2];
+      case 2: save->attrptr[i][1] = save->current[i][1];
+      case 1: save->attrptr[i][0] = save->current[i][0];
+      case 0: break;
+      }
+   }
+}
+
+
+
+
+/* Flush existing data, set new attrib size, replay copied vertices.
+ */ 
+static void _save_upgrade_vertex( struct gl_context *ctx, 
+				 GLuint attr,
+				 GLuint newsz )
+{
+   struct vbo_save_context *save = &vbo_context(ctx)->save;
+   GLuint oldsz;
+   GLuint i;
+   GLfloat *tmp;
+
+   /* Store the current run of vertices, and emit a GL_END.  Emit a
+    * BEGIN in the new buffer.
+    */
+   if (save->vert_count) 
+      _save_wrap_buffers( ctx );
+   else
+      assert( save->copied.nr == 0 );
+
+   /* Do a COPY_TO_CURRENT to ensure back-copying works for the case
+    * when the attribute already exists in the vertex and is having
+    * its size increased.  
+    */
+   _save_copy_to_current( ctx );
+
+   /* Fix up sizes:
+    */
+   oldsz = save->attrsz[attr];
+   save->attrsz[attr] = newsz;
+
+   save->vertex_size += newsz - oldsz;
+   save->max_vert = ((VBO_SAVE_BUFFER_SIZE - save->vertex_store->used) / 
+		      save->vertex_size);
+   save->vert_count = 0;
+
+   /* Recalculate all the attrptr[] values:
+    */
+   for (i = 0, tmp = save->vertex ; i < VBO_ATTRIB_MAX ; i++) {
+      if (save->attrsz[i]) {
+	 save->attrptr[i] = tmp;
+	 tmp += save->attrsz[i];
+      }
+      else 
+	 save->attrptr[i] = NULL; /* will not be dereferenced. */
+   }
+
+   /* Copy from current to repopulate the vertex with correct values.
+    */
+   _save_copy_from_current( ctx );
+
+   /* Replay stored vertices to translate them to new format here.
+    *
+    * If there are copied vertices and the new (upgraded) attribute
+    * has not been defined before, this list is somewhat degenerate,
+    * and will need fixup at runtime.
+    */
+   if (save->copied.nr)
+   {
+      GLfloat *data = save->copied.buffer;
+      GLfloat *dest = save->buffer;
+      GLuint j;
+
+      /* Need to note this and fix up at runtime (or loopback):
+       */
+      if (attr != VBO_ATTRIB_POS && save->currentsz[attr][0] == 0) {
+	 assert(oldsz == 0);
+	 save->dangling_attr_ref = GL_TRUE;
+      }
+
+      for (i = 0 ; i < save->copied.nr ; i++) {
+	 for (j = 0 ; j < VBO_ATTRIB_MAX ; j++) {
+	    if (save->attrsz[j]) {
+	       if (j == attr) {
+		  if (oldsz) {
+		     COPY_CLEAN_4V( dest, oldsz, data );
+		     data += oldsz;
+		     dest += newsz;
+		  }
+		  else {
+		     COPY_SZ_4V( dest, newsz, save->current[attr] );
+		     dest += newsz;
+		  }
+	       }
+	       else {
+		  GLint sz = save->attrsz[j];
+		  COPY_SZ_4V( dest, sz, data );
+		  data += sz;
+		  dest += sz;
+	       }
+	    }
+	 }
+      }
+
+      save->buffer_ptr = dest;
+      save->vert_count += save->copied.nr;
+   }
+}
+
+static void save_fixup_vertex( struct gl_context *ctx, GLuint attr, GLuint sz )
+{
+   struct vbo_save_context *save = &vbo_context(ctx)->save; 
+
+   if (sz > save->attrsz[attr]) {
+      /* New size is larger.  Need to flush existing vertices and get
+       * an enlarged vertex format.
+       */
+      _save_upgrade_vertex( ctx, attr, sz );
+   }
+   else if (sz < save->active_sz[attr]) {
+      static GLfloat id[4] = { 0, 0, 0, 1 };
+      GLuint i;
+
+      /* New size is equal or smaller - just need to fill in some
+       * zeros.
+       */
+      for (i = sz ; i <= save->attrsz[attr] ; i++)
+	 save->attrptr[attr][i-1] = id[i-1];
+   }
+
+   save->active_sz[attr] = sz;
+}
+
+static void _save_reset_vertex( struct gl_context *ctx )
+{
+   struct vbo_save_context *save = &vbo_context(ctx)->save;
+   GLuint i;
+
+   for (i = 0 ; i < VBO_ATTRIB_MAX ; i++) {
+      save->attrsz[i] = 0;
+      save->active_sz[i] = 0;
+   }
+      
+   save->vertex_size = 0;
+}
+
+
+
+#define ERROR(err)   _mesa_compile_error( ctx, GL_INVALID_ENUM, __FUNCTION__ );
+
+
+/* Only one size for each attribute may be active at once.  Eg. if
+ * Color3f is installed/active, then Color4f may not be, even if the
+ * vertex actually contains 4 color coordinates.  This is because the
+ * 3f version won't otherwise set color[3] to 1.0 -- this is the job
+ * of the chooser function when switching between Color4f and Color3f.
+ */
+#define ATTR( A, N, V0, V1, V2, V3 )				\
+do {								\
+   struct vbo_save_context *save = &vbo_context(ctx)->save;	\
+								\
+   if (save->active_sz[A] != N)					\
+      save_fixup_vertex(ctx, A, N);				\
+								\
+   {								\
+      GLfloat *dest = save->attrptr[A];				\
+      if (N>0) dest[0] = V0;					\
+      if (N>1) dest[1] = V1;					\
+      if (N>2) dest[2] = V2;					\
+      if (N>3) dest[3] = V3;					\
+   }								\
+								\
+   if ((A) == 0) {						\
+      GLuint i;							\
+								\
+      for (i = 0; i < save->vertex_size; i++)			\
+	 save->buffer_ptr[i] = save->vertex[i];			\
+								\
+      save->buffer_ptr += save->vertex_size;			\
+								\
+      if (++save->vert_count >= save->max_vert)			\
+	 _save_wrap_filled_vertex( ctx );			\
+   }								\
+} while (0)
+
+#define TAG(x) _save_##x
+
+#include "vbo_attrib_tmp.h"
+
+
+
+
+/* Cope with EvalCoord/CallList called within a begin/end object:
+ *     -- Flush current buffer
+ *     -- Fallback to opcodes for the rest of the begin/end object.
+ */
+static void DO_FALLBACK( struct gl_context *ctx )
+{
+   struct vbo_save_context *save = &vbo_context(ctx)->save;
+
+   if (save->vert_count || save->prim_count) {
+      GLint i = save->prim_count - 1;
+
+      /* Close off in-progress primitive.
+       */
+      save->prim[i].count = (save->vert_count - 
+                             save->prim[i].start);
+
+      /* Need to replay this display list with loopback,
+       * unfortunately, otherwise this primitive won't be handled
+       * properly:
+       */
+      save->dangling_attr_ref = 1;
+      
+      _save_compile_vertex_list( ctx );
+   }
+
+   _save_copy_to_current( ctx );
+   _save_reset_vertex( ctx );
+   _save_reset_counters( ctx );
+   _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );
+   ctx->Driver.SaveNeedFlush = 0;
+}
+
+static void GLAPIENTRY _save_EvalCoord1f( GLfloat u )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   DO_FALLBACK(ctx);
+   CALL_EvalCoord1f(ctx->Save, (u));
+}
+
+static void GLAPIENTRY _save_EvalCoord1fv( const GLfloat *v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   DO_FALLBACK(ctx);
+   CALL_EvalCoord1fv(ctx->Save, (v));
+}
+
+static void GLAPIENTRY _save_EvalCoord2f( GLfloat u, GLfloat v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   DO_FALLBACK(ctx);
+   CALL_EvalCoord2f(ctx->Save, (u, v));
+}
+
+static void GLAPIENTRY _save_EvalCoord2fv( const GLfloat *v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   DO_FALLBACK(ctx);
+   CALL_EvalCoord2fv(ctx->Save, (v));
+}
+
+static void GLAPIENTRY _save_EvalPoint1( GLint i )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   DO_FALLBACK(ctx);
+   CALL_EvalPoint1(ctx->Save, (i));
+}
+
+static void GLAPIENTRY _save_EvalPoint2( GLint i, GLint j )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   DO_FALLBACK(ctx);
+   CALL_EvalPoint2(ctx->Save, (i, j));
+}
+
+static void GLAPIENTRY _save_CallList( GLuint l )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   DO_FALLBACK(ctx);
+   CALL_CallList(ctx->Save, (l));
+}
+
+static void GLAPIENTRY _save_CallLists( GLsizei n, GLenum type, const GLvoid *v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   DO_FALLBACK(ctx);
+   CALL_CallLists(ctx->Save, (n, type, v));
+}
+
+
+
+
+/* This begin is hooked into ...  Updating of
+ * ctx->Driver.CurrentSavePrimitive is already taken care of.
+ */
+GLboolean vbo_save_NotifyBegin( struct gl_context *ctx, GLenum mode )
+{
+   struct vbo_save_context *save = &vbo_context(ctx)->save; 
+
+   GLuint i = save->prim_count++;
+
+   assert(i < save->prim_max);
+   save->prim[i].mode = mode & VBO_SAVE_PRIM_MODE_MASK;
+   save->prim[i].begin = 1;
+   save->prim[i].end = 0;
+   save->prim[i].weak = (mode & VBO_SAVE_PRIM_WEAK) ? 1 : 0;
+   save->prim[i].no_current_update = (mode & VBO_SAVE_PRIM_NO_CURRENT_UPDATE) ? 1 : 0;
+   save->prim[i].pad = 0;
+   save->prim[i].start = save->vert_count;
+   save->prim[i].count = 0;   
+   save->prim[i].num_instances = 1;   
+
+   _mesa_install_save_vtxfmt( ctx, &save->vtxfmt );      
+   ctx->Driver.SaveNeedFlush = 1;
+   return GL_TRUE;
+}
+
+
+
+static void GLAPIENTRY _save_End( void )
+{
+   GET_CURRENT_CONTEXT( ctx ); 
+   struct vbo_save_context *save = &vbo_context(ctx)->save; 
+   GLint i = save->prim_count - 1;
+
+   ctx->Driver.CurrentSavePrimitive = PRIM_OUTSIDE_BEGIN_END;
+   save->prim[i].end = 1;
+   save->prim[i].count = (save->vert_count - 
+			  save->prim[i].start);
+
+   if (i == (GLint) save->prim_max - 1) {
+      _save_compile_vertex_list( ctx );
+      assert(save->copied.nr == 0);
+   }
+
+   /* Swap out this vertex format while outside begin/end.  Any color,
+    * etc. received between here and the next begin will be compiled
+    * as opcodes.
+    */   
+   _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );
+}
+
+
+/* These are all errors as this vtxfmt is only installed inside
+ * begin/end pairs.
+ */
+static void GLAPIENTRY _save_DrawElements(GLenum mode, GLsizei count, GLenum type,
+			       const GLvoid *indices)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   (void) mode; (void) count; (void) type; (void) indices;
+   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glDrawElements" );
+}
+
+
+static void GLAPIENTRY _save_DrawRangeElements(GLenum mode,
+				    GLuint start, GLuint end,
+				    GLsizei count, GLenum type,
+				    const GLvoid *indices)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   (void) mode; (void) start; (void) end; (void) count; (void) type; (void) indices;
+   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glDrawRangeElements" );
+}
+
+static void GLAPIENTRY _save_DrawElementsBaseVertex(GLenum mode,
+						    GLsizei count,
+						    GLenum type,
+						    const GLvoid *indices,
+						    GLint basevertex)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   (void) mode; (void) count; (void) type; (void) indices; (void)basevertex;
+
+   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glDrawElements" );
+}
+
+static void GLAPIENTRY _save_DrawRangeElementsBaseVertex(GLenum mode,
+							 GLuint start,
+							 GLuint end,
+							 GLsizei count,
+							 GLenum type,
+							 const GLvoid *indices,
+							 GLint basevertex)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   (void) mode; (void) start; (void) end; (void) count; (void) type;
+   (void) indices; (void)basevertex;
+
+   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glDrawRangeElements" );
+}
+
+static void GLAPIENTRY _save_DrawArrays(GLenum mode, GLint start, GLsizei count)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   (void) mode; (void) start; (void) count;
+   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glDrawArrays" );
+}
+
+static void GLAPIENTRY _save_Rectf( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   (void) x1; (void) y1; (void) x2; (void) y2;
+   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glRectf" );
+}
+
+static void GLAPIENTRY _save_EvalMesh1( GLenum mode, GLint i1, GLint i2 )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   (void) mode; (void) i1; (void) i2;
+   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glEvalMesh1" );
+}
+
+static void GLAPIENTRY _save_EvalMesh2( GLenum mode, GLint i1, GLint i2,
+				  GLint j1, GLint j2 )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   (void) mode; (void) i1; (void) i2; (void) j1; (void) j2;
+   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glEvalMesh2" );
+}
+
+static void GLAPIENTRY _save_Begin( GLenum mode )
+{
+   GET_CURRENT_CONTEXT( ctx );
+   (void) mode;
+   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "Recursive glBegin" );
+}
+
+
+static void GLAPIENTRY _save_PrimitiveRestartNV( void )
+{
+   GLenum curPrim;
+   GET_CURRENT_CONTEXT( ctx ); 
+
+   curPrim = ctx->Driver.CurrentSavePrimitive;
+
+   _save_End();
+   _save_Begin(curPrim);
+}
+
+
+/* Unlike the functions above, these are to be hooked into the vtxfmt
+ * maintained in ctx->ListState, active when the list is known or
+ * suspected to be outside any begin/end primitive.
+ */
+static void GLAPIENTRY _save_OBE_Rectf( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   vbo_save_NotifyBegin( ctx, GL_QUADS | VBO_SAVE_PRIM_WEAK );
+   CALL_Vertex2f(GET_DISPATCH(), ( x1, y1 ));
+   CALL_Vertex2f(GET_DISPATCH(), ( x2, y1 ));
+   CALL_Vertex2f(GET_DISPATCH(), ( x2, y2 ));
+   CALL_Vertex2f(GET_DISPATCH(), ( x1, y2 ));
+   CALL_End(GET_DISPATCH(), ());
+}
+
+
+static void GLAPIENTRY _save_OBE_DrawArrays(GLenum mode, GLint start, GLsizei count)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint i;
+
+   if (!_mesa_validate_DrawArrays( ctx, mode, start, count ))
+      return;
+
+   _ae_map_vbos( ctx );
+
+   vbo_save_NotifyBegin( ctx, mode | VBO_SAVE_PRIM_WEAK | VBO_SAVE_PRIM_NO_CURRENT_UPDATE);
+
+   for (i = 0; i < count; i++)
+       CALL_ArrayElement(GET_DISPATCH(), (start + i));
+   CALL_End(GET_DISPATCH(), ());
+
+   _ae_unmap_vbos( ctx );
+}
+
+/* Could do better by copying the arrays and element list intact and
+ * then emitting an indexed prim at runtime.
+ */
+static void GLAPIENTRY _save_OBE_DrawElements(GLenum mode, GLsizei count, GLenum type,
+				   const GLvoid *indices)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint i;
+
+   if (!_mesa_validate_DrawElements( ctx, mode, count, type, indices, 0 ))
+      return;
+
+   _ae_map_vbos( ctx );
+
+   if (_mesa_is_bufferobj(ctx->Array.ElementArrayBufferObj))
+      indices = ADD_POINTERS(ctx->Array.ElementArrayBufferObj->Pointer, indices);
+
+   vbo_save_NotifyBegin( ctx, mode | VBO_SAVE_PRIM_WEAK | VBO_SAVE_PRIM_NO_CURRENT_UPDATE );
+
+   switch (type) {
+   case GL_UNSIGNED_BYTE:
+      for (i = 0 ; i < count ; i++)
+	  CALL_ArrayElement(GET_DISPATCH(), ( ((GLubyte *)indices)[i] ));
+      break;
+   case GL_UNSIGNED_SHORT:
+      for (i = 0 ; i < count ; i++)
+	  CALL_ArrayElement(GET_DISPATCH(), ( ((GLushort *)indices)[i] ));
+      break;
+   case GL_UNSIGNED_INT:
+      for (i = 0 ; i < count ; i++)
+	  CALL_ArrayElement(GET_DISPATCH(), ( ((GLuint *)indices)[i] ));
+      break;
+   default:
+      _mesa_error( ctx, GL_INVALID_ENUM, "glDrawElements(type)" );
+      break;
+   }
+
+   CALL_End(GET_DISPATCH(), ());
+
+   _ae_unmap_vbos( ctx );
+}
+
+static void GLAPIENTRY _save_OBE_DrawRangeElements(GLenum mode,
+					GLuint start, GLuint end,
+					GLsizei count, GLenum type,
+					const GLvoid *indices)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (_mesa_validate_DrawRangeElements( ctx, mode,
+					 start, end,
+					 count, type, indices, 0 ))
+      _save_OBE_DrawElements( mode, count, type, indices );
+}
+
+
+
+
+
+static void _save_vtxfmt_init( struct gl_context *ctx )
+{
+   struct vbo_save_context *save = &vbo_context(ctx)->save;
+   GLvertexformat *vfmt = &save->vtxfmt;
+
+   _MESA_INIT_ARRAYELT_VTXFMT(vfmt, _ae_);
+
+   vfmt->Begin = _save_Begin;
+   vfmt->Color3f = _save_Color3f;
+   vfmt->Color3fv = _save_Color3fv;
+   vfmt->Color4f = _save_Color4f;
+   vfmt->Color4fv = _save_Color4fv;
+   vfmt->EdgeFlag = _save_EdgeFlag;
+   vfmt->End = _save_End;
+   vfmt->PrimitiveRestartNV = _save_PrimitiveRestartNV;
+   vfmt->FogCoordfEXT = _save_FogCoordfEXT;
+   vfmt->FogCoordfvEXT = _save_FogCoordfvEXT;
+   vfmt->Indexf = _save_Indexf;
+   vfmt->Indexfv = _save_Indexfv;
+   vfmt->Materialfv = _save_Materialfv;
+   vfmt->MultiTexCoord1fARB = _save_MultiTexCoord1f;
+   vfmt->MultiTexCoord1fvARB = _save_MultiTexCoord1fv;
+   vfmt->MultiTexCoord2fARB = _save_MultiTexCoord2f;
+   vfmt->MultiTexCoord2fvARB = _save_MultiTexCoord2fv;
+   vfmt->MultiTexCoord3fARB = _save_MultiTexCoord3f;
+   vfmt->MultiTexCoord3fvARB = _save_MultiTexCoord3fv;
+   vfmt->MultiTexCoord4fARB = _save_MultiTexCoord4f;
+   vfmt->MultiTexCoord4fvARB = _save_MultiTexCoord4fv;
+   vfmt->Normal3f = _save_Normal3f;
+   vfmt->Normal3fv = _save_Normal3fv;
+   vfmt->SecondaryColor3fEXT = _save_SecondaryColor3fEXT;
+   vfmt->SecondaryColor3fvEXT = _save_SecondaryColor3fvEXT;
+   vfmt->TexCoord1f = _save_TexCoord1f;
+   vfmt->TexCoord1fv = _save_TexCoord1fv;
+   vfmt->TexCoord2f = _save_TexCoord2f;
+   vfmt->TexCoord2fv = _save_TexCoord2fv;
+   vfmt->TexCoord3f = _save_TexCoord3f;
+   vfmt->TexCoord3fv = _save_TexCoord3fv;
+   vfmt->TexCoord4f = _save_TexCoord4f;
+   vfmt->TexCoord4fv = _save_TexCoord4fv;
+   vfmt->Vertex2f = _save_Vertex2f;
+   vfmt->Vertex2fv = _save_Vertex2fv;
+   vfmt->Vertex3f = _save_Vertex3f;
+   vfmt->Vertex3fv = _save_Vertex3fv;
+   vfmt->Vertex4f = _save_Vertex4f;
+   vfmt->Vertex4fv = _save_Vertex4fv;
+   vfmt->VertexAttrib1fARB = _save_VertexAttrib1fARB;
+   vfmt->VertexAttrib1fvARB = _save_VertexAttrib1fvARB;
+   vfmt->VertexAttrib2fARB = _save_VertexAttrib2fARB;
+   vfmt->VertexAttrib2fvARB = _save_VertexAttrib2fvARB;
+   vfmt->VertexAttrib3fARB = _save_VertexAttrib3fARB;
+   vfmt->VertexAttrib3fvARB = _save_VertexAttrib3fvARB;
+   vfmt->VertexAttrib4fARB = _save_VertexAttrib4fARB;
+   vfmt->VertexAttrib4fvARB = _save_VertexAttrib4fvARB;
+
+   vfmt->VertexAttrib1fNV = _save_VertexAttrib1fNV;
+   vfmt->VertexAttrib1fvNV = _save_VertexAttrib1fvNV;
+   vfmt->VertexAttrib2fNV = _save_VertexAttrib2fNV;
+   vfmt->VertexAttrib2fvNV = _save_VertexAttrib2fvNV;
+   vfmt->VertexAttrib3fNV = _save_VertexAttrib3fNV;
+   vfmt->VertexAttrib3fvNV = _save_VertexAttrib3fvNV;
+   vfmt->VertexAttrib4fNV = _save_VertexAttrib4fNV;
+   vfmt->VertexAttrib4fvNV = _save_VertexAttrib4fvNV;
+   
+   /* integer-valued */
+   vfmt->VertexAttribI1i = _save_VertexAttribI1i;
+   vfmt->VertexAttribI2i = _save_VertexAttribI2i;
+   vfmt->VertexAttribI3i = _save_VertexAttribI3i;
+   vfmt->VertexAttribI4i = _save_VertexAttribI4i;
+   vfmt->VertexAttribI2iv = _save_VertexAttribI2iv;
+   vfmt->VertexAttribI3iv = _save_VertexAttribI3iv;
+   vfmt->VertexAttribI4iv = _save_VertexAttribI4iv;
+
+   /* unsigned integer-valued */
+   vfmt->VertexAttribI1ui = _save_VertexAttribI1ui;
+   vfmt->VertexAttribI2ui = _save_VertexAttribI2ui;
+   vfmt->VertexAttribI3ui = _save_VertexAttribI3ui;
+   vfmt->VertexAttribI4ui = _save_VertexAttribI4ui;
+   vfmt->VertexAttribI2uiv = _save_VertexAttribI2uiv;
+   vfmt->VertexAttribI3uiv = _save_VertexAttribI3uiv;
+   vfmt->VertexAttribI4uiv = _save_VertexAttribI4uiv;
+
+   /* This will all require us to fallback to saving the list as opcodes:
+    */ 
+   _MESA_INIT_DLIST_VTXFMT(vfmt, _save_); /* inside begin/end */
+
+   _MESA_INIT_EVAL_VTXFMT(vfmt, _save_);
+
+   /* These are all errors as we at least know we are in some sort of
+    * begin/end pair:
+    */
+   vfmt->Begin = _save_Begin;
+   vfmt->Rectf = _save_Rectf;
+   vfmt->DrawArrays = _save_DrawArrays;
+   vfmt->DrawElements = _save_DrawElements;
+   vfmt->DrawRangeElements = _save_DrawRangeElements;
+   vfmt->DrawElementsBaseVertex = _save_DrawElementsBaseVertex;
+   vfmt->DrawRangeElementsBaseVertex = _save_DrawRangeElementsBaseVertex;
+   /* Loops back into vfmt->DrawElements */
+   vfmt->MultiDrawElementsEXT = _mesa_noop_MultiDrawElements;
+   vfmt->MultiDrawElementsBaseVertex = _mesa_noop_MultiDrawElementsBaseVertex;
+}
+
+
+void vbo_save_SaveFlushVertices( struct gl_context *ctx )
+{
+   struct vbo_save_context *save = &vbo_context(ctx)->save;
+
+   /* Noop when we are actually active:
+    */
+   if (ctx->Driver.CurrentSavePrimitive == PRIM_INSIDE_UNKNOWN_PRIM ||
+       ctx->Driver.CurrentSavePrimitive <= GL_POLYGON)
+      return;
+
+   if (save->vert_count ||
+       save->prim_count) 
+      _save_compile_vertex_list( ctx );
+   
+   _save_copy_to_current( ctx );
+   _save_reset_vertex( ctx );
+   _save_reset_counters( ctx );  
+   ctx->Driver.SaveNeedFlush = 0;
+}
+
+void vbo_save_NewList( struct gl_context *ctx, GLuint list, GLenum mode )
+{
+   struct vbo_save_context *save = &vbo_context(ctx)->save;
+
+   (void) list; (void) mode;
+
+   if (!save->prim_store)
+      save->prim_store = alloc_prim_store( ctx );
+
+   if (!save->vertex_store) 
+      save->vertex_store = alloc_vertex_store( ctx );
+      
+   save->buffer_ptr = map_vertex_store( ctx, save->vertex_store );
+   
+   _save_reset_vertex( ctx );
+   _save_reset_counters( ctx );  
+   ctx->Driver.SaveNeedFlush = 0;
+}
+
+void vbo_save_EndList( struct gl_context *ctx )
+{
+   struct vbo_save_context *save = &vbo_context(ctx)->save;
+
+   /* EndList called inside a (saved) Begin/End pair?
+    */
+   if (ctx->Driver.CurrentSavePrimitive != PRIM_OUTSIDE_BEGIN_END) {
+
+      if (save->prim_count > 0) {
+         GLint i = save->prim_count - 1;
+         ctx->Driver.CurrentSavePrimitive = PRIM_OUTSIDE_BEGIN_END;
+         save->prim[i].end = 0;
+         save->prim[i].count = (save->vert_count - 
+                                save->prim[i].start);
+      }
+
+      /* Make sure this vertex list gets replayed by the "loopback"
+       * mechanism:
+       */
+      save->dangling_attr_ref = 1;
+      vbo_save_SaveFlushVertices( ctx );
+
+      /* Swap out this vertex format while outside begin/end.  Any color,
+       * etc. received between here and the next begin will be compiled
+       * as opcodes.
+       */   
+      _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );
+   }
+
+   unmap_vertex_store( ctx, save->vertex_store );
+
+   assert(save->vertex_size == 0);
+}
+ 
+void vbo_save_BeginCallList( struct gl_context *ctx, struct gl_display_list *dlist )
+{
+   struct vbo_save_context *save = &vbo_context(ctx)->save;
+   save->replay_flags |= dlist->Flags;
+}
+
+void vbo_save_EndCallList( struct gl_context *ctx )
+{
+   struct vbo_save_context *save = &vbo_context(ctx)->save;
+   
+   if (ctx->ListState.CallDepth == 1) {
+      /* This is correct: want to keep only the VBO_SAVE_FALLBACK
+       * flag, if it is set:
+       */
+      save->replay_flags &= VBO_SAVE_FALLBACK;
+   }
+}
+
+
+static void vbo_destroy_vertex_list( struct gl_context *ctx, void *data )
+{
+   struct vbo_save_vertex_list *node = (struct vbo_save_vertex_list *)data;
+   (void) ctx;
+
+   if ( --node->vertex_store->refcount == 0 ) 
+      free_vertex_store( ctx, node->vertex_store );
+
+   if ( --node->prim_store->refcount == 0 )
+      FREE( node->prim_store );
+
+   if (node->current_data) {
+      FREE(node->current_data);
+      node->current_data = NULL;
+   }
+}
+
+
+static void vbo_print_vertex_list( struct gl_context *ctx, void *data )
+{
+   struct vbo_save_vertex_list *node = (struct vbo_save_vertex_list *)data;
+   GLuint i;
+   (void) ctx;
+
+   printf("VBO-VERTEX-LIST, %u vertices %d primitives, %d vertsize\n",
+	  node->count,
+	  node->prim_count,
+	  node->vertex_size);
+
+   for (i = 0 ; i < node->prim_count ; i++) {
+      struct _mesa_prim *prim = &node->prim[i];
+      _mesa_debug(NULL, "   prim %d: %s%s %d..%d %s %s\n",
+		  i, 
+		  _mesa_lookup_prim_by_nr(prim->mode),
+		  prim->weak ? " (weak)" : "",
+		  prim->start, 
+		  prim->start + prim->count,
+		  (prim->begin) ? "BEGIN" : "(wrap)",
+		  (prim->end) ? "END" : "(wrap)");
+   }
+}
+
+
+static void _save_current_init( struct gl_context *ctx ) 
+{
+   struct vbo_save_context *save = &vbo_context(ctx)->save;
+   GLint i;
+
+   for (i = VBO_ATTRIB_POS; i <= VBO_ATTRIB_GENERIC15; i++) {
+      const GLuint j = i - VBO_ATTRIB_POS;
+      ASSERT(j < VERT_ATTRIB_MAX);
+      save->currentsz[i] = &ctx->ListState.ActiveAttribSize[j];
+      save->current[i] = ctx->ListState.CurrentAttrib[j];
+   }
+
+   for (i = VBO_ATTRIB_FIRST_MATERIAL; i <= VBO_ATTRIB_LAST_MATERIAL; i++) {
+      const GLuint j = i - VBO_ATTRIB_FIRST_MATERIAL;
+      ASSERT(j < MAT_ATTRIB_MAX);
+      save->currentsz[i] = &ctx->ListState.ActiveMaterialSize[j];
+      save->current[i] = ctx->ListState.CurrentMaterial[j];
+   }
+}
+
+/**
+ * Initialize the display list compiler
+ */
+void vbo_save_api_init( struct vbo_save_context *save )
+{
+   struct gl_context *ctx = save->ctx;
+   GLuint i;
+
+   save->opcode_vertex_list =
+      _mesa_dlist_alloc_opcode( ctx,
+                                sizeof(struct vbo_save_vertex_list),
+                                vbo_save_playback_vertex_list,
+                                vbo_destroy_vertex_list,
+                                vbo_print_vertex_list );
+
+   ctx->Driver.NotifySaveBegin = vbo_save_NotifyBegin;
+
+   _save_vtxfmt_init( ctx );
+   _save_current_init( ctx );
+
+   /* These will actually get set again when binding/drawing */
+   for (i = 0; i < VBO_ATTRIB_MAX; i++)
+      save->inputs[i] = &save->arrays[i];
+
+   /* Hook our array functions into the outside-begin-end vtxfmt in 
+    * ctx->ListState.
+    */
+   ctx->ListState.ListVtxfmt.Rectf = _save_OBE_Rectf;
+   ctx->ListState.ListVtxfmt.DrawArrays = _save_OBE_DrawArrays;
+   ctx->ListState.ListVtxfmt.DrawElements = _save_OBE_DrawElements;
+   ctx->ListState.ListVtxfmt.DrawRangeElements = _save_OBE_DrawRangeElements;
+   /* loops back into _save_OBE_DrawElements */
+   ctx->ListState.ListVtxfmt.MultiDrawElementsEXT = _mesa_noop_MultiDrawElements;
+   ctx->ListState.ListVtxfmt.MultiDrawElementsBaseVertex = _mesa_noop_MultiDrawElementsBaseVertex;
+   _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );
+}
+
+
+#endif /* FEATURE_dlist */
diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
index ca4d42c49..7089d049e 100644
--- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
@@ -1,102 +1,102 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!DOCTYPE xkbConfigRegistry SYSTEM "xkb.dtd">

-<xkbConfigRegistry>

-  <modelList/>

-  <layoutList>

-    <layout>

-      <configItem>

-        <name>apl</name>

-        <_shortDescription>APL</_shortDescription>

-        <_description>APL</_description>

-        <languageList><iso639Id>eng</iso639Id></languageList>

-      </configItem>

-      <variantList/>

-    </layout>

-    <layout>

-      <configItem>

-        <name>ir</name>

-        <_shortDescription>Iran</_shortDescription>

-        <_description>Iran</_description>

-        <languageList><iso639Id>per</iso639Id></languageList>

-      </configItem>

-      <variantList>

-        <variant>

-          <configItem>

-            <name>ave</name>

-            <_description>Avestan</_description>

-            <languageList><iso639Id>ave</iso639Id></languageList>

-          </configItem>

-        </variant>

-      </variantList>

-    </layout>

-    <layout>

-      <configItem>

-        <name>us</name>

-        <_shortDescription>USA</_shortDescription>

-        <_description>USA</_description>

-        <languageList><iso639Id>eng</iso639Id></languageList>

-      </configItem>

-      <variantList>

-        <variant>

-          <configItem>

-            <name>intl-unicode</name>

-            <_description>International (AltGr Unicode combining)</_description>

-          </configItem>

-        </variant>

-        <variant>

-          <configItem>

-            <name>alt-intl-unicode</name>

-            <_description>International (AltGr Unicode combining, alternative)</_description>

-          </configItem>

-        </variant>

-        <variant>

-          <configItem>

-            <name>ats</name>

-            <_description>Atsina</_description>

-            <!-- No ISO code in ISO639-2, only draft ISO693-3 -->

-          </configItem>

-        </variant>

-        <variant>

-          <configItem>

-            <name>crd</name>

-            <_description>Couer D'alene Salish</_description>

-            <languageList><iso639Id>crd</iso639Id></languageList>

-          </configItem>

-        </variant>

-      </variantList>

-    </layout>

-    <layout>

-      <configItem>

-        <name>rs</name>

-        <_shortDescription>SRB</_shortDescription>

-        <_description>Serbia</_description>

-        <languageList><iso639Id>srp</iso639Id></languageList>

-      </configItem>

-      <variantList>

-        <variant>

-          <configItem>

-            <name>combiningkeys</name>

-            <_description>Combining accents instead of dead keys</_description>

-          </configItem>

-        </variant>

-      </variantList>

-    </layout>

-    <layout>

-      <configItem>

-        <name>ru</name>

-        <shortDescription>Rus</shortDescription>

-        <description>Russia</description>

-      </configItem>

-      <variantList>

-        <variant>

-          <configItem>

-            <name>chu</name>

-            <description>Church Slavonic</description>

-            <languageList><iso639Id>chu</iso639Id></languageList>

-          </configItem>

-        </variant>

-      </variantList>

-    </layout>

-  </layoutList>

-  <optionList/>

-</xkbConfigRegistry>

+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE xkbConfigRegistry SYSTEM "xkb.dtd">
+<xkbConfigRegistry>
+  <modelList/>
+  <layoutList>
+    <layout>
+      <configItem>
+        <name>apl</name>
+        <_shortDescription>APL</_shortDescription>
+        <_description>APL</_description>
+        <languageList><iso639Id>eng</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ir</name>
+        <_shortDescription>Iran</_shortDescription>
+        <_description>Iran</_description>
+        <languageList><iso639Id>per</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>ave</name>
+            <_description>Iran Avestan</_description>
+            <languageList><iso639Id>ave</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>us</name>
+        <_shortDescription>USA</_shortDescription>
+        <_description>USA</_description>
+        <languageList><iso639Id>eng</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>intl-unicode</name>
+            <_description>USA International (AltGr Unicode combining)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>alt-intl-unicode</name>
+            <_description>USA International (AltGr Unicode combining, alternative)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ats</name>
+            <_description>USA Atsina</_description>
+            <!-- No ISO code in ISO639-2, only draft ISO693-3 -->
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>crd</name>
+            <_description>USA Couer D'alene Salish</_description>
+            <languageList><iso639Id>crd</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>rs</name>
+        <_shortDescription>SRB</_shortDescription>
+        <_description>Serbia</_description>
+        <languageList><iso639Id>srp</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>combiningkeys</name>
+            <_description>Serbia Combining accents instead of dead keys</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ru</name>
+        <_shortDescription>Rus</_shortDescription>
+        <_description>Russia</_description>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>chu</name>
+            <description>Russia Church Slavonic</description>
+            <languageList><iso639Id>chu</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+  </layoutList>
+  <optionList/>
+</xkbConfigRegistry>
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index ef97ab8d2..a870a24fc 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE xkbConfigRegistry SYSTEM "xkb.dtd">
-<xkbConfigRegistry>
+<xkbConfigRegistry version="1.1">
   <modelList>
     <model>
       <configItem>
@@ -1238,99 +1238,105 @@
         <name>us</name>
         <_shortDescription>USA</_shortDescription>
         <_description>USA</_description>
-        <languageList><iso639Id>eng</iso639Id></languageList>
+        <languageList>
+          <iso639Id>eng</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>chr</name>
-            <_description>Cherokee</_description>
-            <languageList><iso639Id>chr</iso639Id></languageList>
+            <_description>USA - Cherokee</_description>
+            <languageList>
+              <iso639Id>chr</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>euro</name>
-            <_description>With EuroSign on 5</_description>
+            <_description>USA - With EuroSign on 5</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>intl</name>
-            <_description>International (with dead keys)</_description>
+            <_description>USA - International (with dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>alt-intl</name>
-            <_description>Alternative international</_description>
+            <_description>USA - Alternative international</_description>
           </configItem>
         </variant>
-	<variant>
+        <variant>
           <configItem>
             <name>colemak</name>
-            <_description>Colemak</_description>
+            <_description>USA - Colemak</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Dvorak</_description>
+            <_description>USA - Dvorak</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak-intl</name>
-            <_description>Dvorak international (with dead keys)</_description>
+            <_description>USA - Dvorak international (with dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak-alt-intl</name>
-            <_description>Dvorak alternative international (no dead keys)</_description>
+            <_description>USA - Dvorak alternative international (no dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak-l</name>
-            <_description>Left handed Dvorak</_description>
+            <_description>USA - Left handed Dvorak</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak-r</name>
-            <_description>Right handed Dvorak</_description>
+            <_description>USA - Right handed Dvorak</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak-classic</name>
-            <_description>Classic Dvorak</_description>
+            <_description>USA - Classic Dvorak</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvp</name>
-            <_description>Programmer Dvorak</_description>
+            <_description>USA - Programmer Dvorak</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>rus</name>
-            <_description>Russian phonetic</_description>
-            <languageList><iso639Id>rus</iso639Id></languageList>
+            <_description>USA - Russian phonetic</_description>
+            <languageList>
+              <iso639Id>rus</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Macintosh</_description>
+            <_description>USA - Macintosh</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>altgr-intl</name>
-            <_description>International (AltGr dead keys)</_description>
+            <_description>USA - International (AltGr dead keys)</_description>
             <languageList><iso639Id>eng</iso639Id>
                           <iso639Id>fra</iso639Id>
                           <iso639Id>ger</iso639Id></languageList>
@@ -1339,13 +1345,13 @@
         <variant>
           <configItem>
             <name>olpc2</name>
-            <_description>Layout toggle on multiply/divide key</_description>
+            <_description>USA - Layout toggle on multiply/divide key</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>hbs</name>
-            <_description>Serbo-Croatian</_description>
+            <_description>USA - Serbo-Croatian</_description>
             <languageList><iso639Id>eng</iso639Id>
                           <iso639Id>bos</iso639Id>
                           <iso639Id>hbs</iso639Id>
@@ -1360,7 +1366,9 @@
         <name>ad</name>
         <_shortDescription>And</_shortDescription>
         <_description>Andorra</_description>
-        <languageList><iso639Id>cat</iso639Id></languageList>
+        <languageList>
+          <iso639Id>cat</iso639Id>
+        </languageList>
       </configItem>
       <variantList/>
     </layout>
@@ -1374,36 +1382,43 @@
         <variant>
           <configItem>
             <name>ps</name>
-            <_description>Pashto</_description>
-            <languageList><iso639Id>pus</iso639Id></languageList>
+            <_description>Afghanistan - Pashto</_description>
+            <languageList>
+              <iso639Id>pus</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>uz</name>
-            <_description>Southern Uzbek</_description>
-            <languageList><iso639Id>uzb</iso639Id></languageList>
+            <_description>Afghanistan - Southern Uzbek</_description>
+            <languageList>
+              <iso639Id>uzb</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>olpc-ps</name>
-            <_description>OLPC Pashto</_description>
-            <languageList><iso639Id>pus</iso639Id></languageList>
+            <_description>Afghanistan - OLPC Pashto</_description>
+            <languageList>
+              <iso639Id>pus</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>fa-olpc</name>
-            <_description>OLPC Dari</_description>
-            <!-- No ISO code in ISO639-2, only draft ISO693-3 -->
+            <_description>Afghanistan - OLPC Dari</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>uz-olpc</name>
-            <_description>OLPC Southern Uzbek</_description>
-            <languageList><iso639Id>uzb</iso639Id></languageList>
+            <_description>Afghanistan - OLPC Southern Uzbek</_description>
+            <languageList>
+              <iso639Id>uzb</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -1434,43 +1449,45 @@
           <iso3166Id>TN</iso3166Id>
           <iso3166Id>YE</iso3166Id>
         </countryList>
-        <languageList><iso639Id>ara</iso639Id></languageList>
+        <languageList>
+          <iso639Id>ara</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>azerty</name>
-            <_description>azerty</_description>
+            <_description>Arabic - azerty</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>azerty_digits</name>
-            <_description>azerty/digits</_description>
+            <_description>Arabic - azerty/digits</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>digits</name>
-            <_description>digits</_description>
+            <_description>Arabic - digits</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>qwerty</name>
-            <_description>qwerty</_description>
+            <_description>Arabic - qwerty</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>qwerty_digits</name>
-            <_description>qwerty/digits</_description>
+            <_description>Arabic - qwerty/digits</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>buckwalter</name>
-            <_description>Buckwalter</_description>
+            <_description>Arabic - Buckwalter</_description>
           </configItem>
         </variant>
       </variantList>
@@ -1480,7 +1497,9 @@
         <name>al</name>
         <_shortDescription>Alb</_shortDescription>
         <_description>Albania</_description>
-        <languageList><iso639Id>alb</iso639Id></languageList>
+        <languageList>
+          <iso639Id>alb</iso639Id>
+        </languageList>
       </configItem>
       <variantList/>
     </layout>
@@ -1489,37 +1508,39 @@
         <name>am</name>
         <_shortDescription>Arm</_shortDescription>
         <_description>Armenia</_description>
-        <languageList><iso639Id>hye</iso639Id></languageList>
+        <languageList>
+          <iso639Id>hye</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>phonetic</name>
-            <_description>Phonetic</_description>
+            <_description>Armenia - Phonetic</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>phonetic-alt</name>
-            <_description>Alternative Phonetic</_description>
+            <_description>Armenia - Alternative Phonetic</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>eastern</name>
-            <_description>Eastern</_description>
+            <_description>Armenia - Eastern</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>western</name>
-            <_description>Western</_description>
+            <_description>Armenia - Western</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>eastern-alt</name>
-            <_description>Alternative Eastern</_description>
+            <_description>Armenia - Alternative Eastern</_description>
           </configItem>
         </variant>
       </variantList>
@@ -1529,25 +1550,27 @@
         <name>at</name>
         <_shortDescription>Aut</_shortDescription>
         <_description>Austria</_description>
-        <languageList><iso639Id>ger</iso639Id></languageList>
+        <languageList>
+          <iso639Id>ger</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
+            <_description>Austria - Eliminate dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>sundeadkeys</name>
-            <_description>Sun dead keys</_description>
+            <_description>Austria - Sun dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Macintosh</_description>
+            <_description>Austria - Macintosh</_description>
           </configItem>
         </variant>
       </variantList>
@@ -1557,13 +1580,15 @@
         <name>az</name>
         <_shortDescription>Aze</_shortDescription>
         <_description>Azerbaijan</_description>
-        <languageList><iso639Id>aze</iso639Id></languageList>
+        <languageList>
+          <iso639Id>aze</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>cyrillic</name>
-            <_description>Cyrillic</_description>
+            <_description>Azerbaijan - Cyrillic</_description>
           </configItem>
         </variant>
       </variantList>
@@ -1573,19 +1598,21 @@
         <name>by</name>
         <_shortDescription>Blr</_shortDescription>
         <_description>Belarus</_description>
-        <languageList><iso639Id>bel</iso639Id></languageList>
+        <languageList>
+          <iso639Id>bel</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>legacy</name>
-            <_description>Legacy</_description>
+            <_description>Belarus - Legacy</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latin</name>
-            <_description>Latin</_description>
+            <_description>Belarus - Latin</_description>
           </configItem>
         </variant>
       </variantList>
@@ -1603,43 +1630,43 @@
         <variant>
           <configItem>
             <name>oss</name>
-            <_description>Alternative</_description>
+            <_description>Belgium - Alternative</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>oss_latin9</name>
-            <_description>Alternative, latin-9 only</_description>
+            <_description>Belgium - Alternative, latin-9 only</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>oss_sundeadkeys</name>
-            <_description>Alternative, Sun dead keys</_description>
+            <_description>Belgium - Alternative, Sun dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>iso-alternate</name>
-            <_description>ISO Alternate</_description>
+            <_description>Belgium - ISO Alternate</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
+            <_description>Belgium - Eliminate dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>sundeadkeys</name>
-            <_description>Sun dead keys</_description>
+            <_description>Belgium - Sun dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>wang</name>
-            <_description>Wang model 724 azerty</_description>
+            <_description>Belgium - Wang model 724 azerty</_description>
           </configItem>
         </variant>
       </variantList>
@@ -1649,13 +1676,15 @@
         <name>bd</name>
         <_shortDescription>Bgd</_shortDescription>
         <_description>Bangladesh</_description>
-        <languageList><iso639Id>ben</iso639Id></languageList>
+        <languageList>
+          <iso639Id>ben</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>probhat</name>
-            <_description>Probhat</_description>
+            <_description>Bangladesh - Probhat</_description>
           </configItem>
         </variant>
       </variantList>
@@ -1670,148 +1699,190 @@
         <variant>
           <configItem>
             <name>ben</name>
-            <_description>Bengali</_description>
-            <languageList><iso639Id>ben</iso639Id></languageList>
+            <_description>India - Bengali</_description>
+            <languageList>
+              <iso639Id>ben</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ben_probhat</name>
-            <_description>Bengali Probhat</_description>
-            <languageList><iso639Id>ben</iso639Id></languageList>
+            <_description>India - Bengali Probhat</_description>
+            <languageList>
+              <iso639Id>ben</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>guj</name>
-            <_description>Gujarati</_description>
-            <languageList><iso639Id>guj</iso639Id></languageList>
+            <_description>India - Gujarati</_description>
+            <languageList>
+              <iso639Id>guj</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>guru</name>
-            <_description>Gurmukhi</_description>
-            <languageList><iso639Id>pan</iso639Id></languageList>
+            <_description>India - Gurmukhi</_description>
+            <languageList>
+              <iso639Id>pan</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>jhelum</name>
-            <_description>Gurmukhi Jhelum</_description>
-            <languageList><iso639Id>pan</iso639Id></languageList>
+            <_description>India - Gurmukhi Jhelum</_description>
+            <languageList>
+              <iso639Id>pan</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>kan</name>
-            <_description>Kannada</_description>
-            <languageList><iso639Id>kan</iso639Id></languageList>
+            <_description>India - Kannada</_description>
+            <languageList>
+              <iso639Id>kan</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mal</name>
-            <_description>Malayalam</_description>
-            <languageList><iso639Id>mal</iso639Id></languageList>
-         </configItem>
+            <_description>India - Malayalam</_description>
+            <languageList>
+              <iso639Id>mal</iso639Id>
+            </languageList>
+          </configItem>
         </variant>
-	<variant>
+        <variant>
           <configItem>
             <name>mal_lalitha</name>
-            <_description>Malayalam Lalitha</_description>
-            <languageList><iso639Id>mal</iso639Id></languageList>
-         </configItem>
+            <_description>India - Malayalam Lalitha</_description>
+            <languageList>
+              <iso639Id>mal</iso639Id>
+            </languageList>
+          </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ori</name>
-            <_description>Oriya</_description>
-            <languageList><iso639Id>ori</iso639Id></languageList>
+            <_description>India - Oriya</_description>
+            <languageList>
+              <iso639Id>ori</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>tam_unicode</name>
-            <_description>Tamil Unicode</_description>
-            <languageList><iso639Id>tam</iso639Id></languageList>
+            <_description>India - Tamil Unicode</_description>
+            <languageList>
+              <iso639Id>tam</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>tam_keyboard_with_numerals</name>
-            <_description>Tamil Keyboard with Numerals</_description>
-            <languageList><iso639Id>tam</iso639Id></languageList>
+            <_description>India - Tamil Keyboard with Numerals</_description>
+            <languageList>
+              <iso639Id>tam</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>tam_TAB</name>
-            <_description>Tamil TAB Typewriter</_description>
-            <languageList><iso639Id>tam</iso639Id></languageList>
+            <_description>India - Tamil TAB Typewriter</_description>
+            <languageList>
+              <iso639Id>tam</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>tam_TSCII</name>
-            <_description>Tamil TSCII Typewriter</_description>
-            <languageList><iso639Id>tam</iso639Id></languageList>
+            <_description>India - Tamil TSCII Typewriter</_description>
+            <languageList>
+              <iso639Id>tam</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>tam</name>
-            <_description>Tamil</_description>
-            <languageList><iso639Id>tam</iso639Id></languageList>
+            <_description>India - Tamil</_description>
+            <languageList>
+              <iso639Id>tam</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>tel</name>
-            <_description>Telugu</_description>
-            <languageList><iso639Id>tel</iso639Id></languageList>
+            <_description>India - Telugu</_description>
+            <languageList>
+              <iso639Id>tel</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>urd-phonetic</name>
-            <_description>Urdu, Phonetic</_description>
-            <languageList><iso639Id>urd</iso639Id></languageList>
+            <_description>India - Urdu, Phonetic</_description>
+            <languageList>
+              <iso639Id>urd</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>urd-phonetic3</name>
-            <_description>Urdu, Alternative phonetic</_description>
-            <languageList><iso639Id>urd</iso639Id></languageList>
+            <_description>India - Urdu, Alternative phonetic</_description>
+            <languageList>
+              <iso639Id>urd</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>urd-winkeys</name>
-            <_description>Urdu, Winkeys</_description>
-            <languageList><iso639Id>urd</iso639Id></languageList>
+            <_description>India - Urdu, Winkeys</_description>
+            <languageList>
+              <iso639Id>urd</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>bolnagri</name>
-            <_description>Hindi Bolnagri</_description>
-            <languageList><iso639Id>hin</iso639Id></languageList>
+            <_description>India - Hindi Bolnagri</_description>
+            <languageList>
+              <iso639Id>hin</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>hin-wx</name>
-            <_description>Hindi Wx</_description>
-            <languageList><iso639Id>hin</iso639Id></languageList>
+            <_description>India - Hindi Wx</_description>
+            <languageList>
+              <iso639Id>hin</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>eng</name>
-            <_description>English with RupeeSign</_description>
-            <languageList><iso639Id>eng</iso639Id></languageList>
+            <_description>India - English with RupeeSign</_description>
+            <languageList>
+              <iso639Id>eng</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -1821,31 +1892,33 @@
         <name>ba</name>
         <_shortDescription>Bih</_shortDescription>
         <_description>Bosnia and Herzegovina</_description>
-        <languageList><iso639Id>bos</iso639Id></languageList>
+        <languageList>
+          <iso639Id>bos</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>alternatequotes</name>
-            <_description> Use guillemets for quotes</_description>
+            <_description>Bosnia and Herzegovina -  Use guillemets for quotes</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>unicode</name>
-            <_description>Use Bosnian digraphs</_description>
+            <_description>Bosnia and Herzegovina - Use Bosnian digraphs</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>unicodeus</name>
-            <_description>US keyboard with Bosnian digraphs</_description>
+            <_description>Bosnia and Herzegovina - US keyboard with Bosnian digraphs</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>us</name>
-            <_description>US keyboard with Bosnian letters</_description>
+            <_description>Bosnia and Herzegovina - US keyboard with Bosnian letters</_description>
           </configItem>
         </variant>
       </variantList>
@@ -1855,38 +1928,42 @@
         <name>br</name>
         <_shortDescription>Bra</_shortDescription>
         <_description>Brazil</_description>
-        <languageList><iso639Id>por</iso639Id></languageList>
+        <languageList>
+          <iso639Id>por</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
+            <_description>Brazil - Eliminate dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Dvorak</_description>
+            <_description>Brazil - Dvorak</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nativo</name>
-            <_description>Nativo</_description>
+            <_description>Brazil - Nativo</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nativo-us</name>
-            <_description>Nativo for USA keyboards</_description>
+            <_description>Brazil - Nativo for USA keyboards</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nativo-epo</name>
-            <_description>Nativo for Esperanto</_description>
-            <languageList><iso639Id>epo</iso639Id></languageList>
+            <_description>Brazil - Nativo for Esperanto</_description>
+            <languageList>
+              <iso639Id>epo</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -1896,21 +1973,21 @@
         <name>bg</name>
         <_shortDescription>Bgr</_shortDescription>
         <_description>Bulgaria</_description>
-        <languageList><iso639Id>bul</iso639Id></languageList>
+        <languageList>
+          <iso639Id>bul</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>phonetic</name>
-            <_description>Traditional phonetic</_description>
+            <_description>Bulgaria - Traditional phonetic</_description>
           </configItem>
         </variant>
-      </variantList>
-      <variantList>
         <variant>
           <configItem>
             <name>bas_phonetic</name>
-            <_description>New phonetic</_description>
+            <_description>Bulgaria - New phonetic</_description>
           </configItem>
         </variant>
       </variantList>
@@ -1924,50 +2001,64 @@
         <variant>
           <configItem>
             <name>french</name>
-            <_description>French</_description>
-            <languageList><iso639Id>fra</iso639Id></languageList>
+            <_description>Morocco - French</_description>
+            <languageList>
+              <iso639Id>fra</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>tifinagh</name>
-            <_description>Tifinagh</_description>
-            <languageList><iso639Id>ber</iso639Id></languageList>
+            <_description>Morocco - Tifinagh</_description>
+            <languageList>
+              <iso639Id>ber</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>tifinagh-alt</name>
-            <_description>Tifinagh alternative</_description>
-            <languageList><iso639Id>ber</iso639Id></languageList>
+            <_description>Morocco - Tifinagh alternative</_description>
+            <languageList>
+              <iso639Id>ber</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>tifinagh-alt-phonetic</name>
-            <_description>Tifinagh alternative phonetic</_description>
-            <languageList><iso639Id>ber</iso639Id></languageList>
+            <_description>Morocco - Tifinagh alternative phonetic</_description>
+            <languageList>
+              <iso639Id>ber</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>tifinagh-extended</name>
-            <_description>Tifinagh extended</_description>
-            <languageList><iso639Id>ber</iso639Id></languageList>
+            <_description>Morocco - Tifinagh extended</_description>
+            <languageList>
+              <iso639Id>ber</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>tifinagh-phonetic</name>
-            <_description>Tifinagh phonetic</_description>
-            <languageList><iso639Id>ber</iso639Id></languageList>
+            <_description>Morocco - Tifinagh phonetic</_description>
+            <languageList>
+              <iso639Id>ber</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>tifinagh-extended-phonetic</name>
-            <_description>Tifinagh extended phonetic</_description>
-            <languageList><iso639Id>ber</iso639Id></languageList>
+            <_description>Morocco - Tifinagh extended phonetic</_description>
+            <languageList>
+              <iso639Id>ber</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -1977,7 +2068,9 @@
         <name>mm</name>
         <_shortDescription>Mmr</_shortDescription>
         <_description>Myanmar</_description>
-        <languageList><iso639Id>mya</iso639Id></languageList>
+        <languageList>
+          <iso639Id>mya</iso639Id>
+        </languageList>
       </configItem>
       <variantList/>
     </layout>
@@ -1986,64 +2079,69 @@
         <name>ca</name>
         <_shortDescription>Can</_shortDescription>
         <_description>Canada</_description>
-        <languageList><iso639Id>fra</iso639Id></languageList>
+        <languageList>
+          <iso639Id>fra</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>fr-dvorak</name>
-            <_description>French Dvorak</_description>
+            <_description>Canada - French Dvorak</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>fr-legacy</name>
-            <_description>French (legacy)</_description>
+            <_description>Canada - French (legacy)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>multix</name>
-            <_description>Multilingual</_description>
+            <_description>Canada - Multilingual</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>multi</name>
-            <_description>Multilingual, first part</_description>
+            <_description>Canada - Multilingual, first part</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>multi-2gr</name>
-            <_description>Multilingual, second part</_description>
+            <_description>Canada - Multilingual, second part</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ike</name>
-            <_description>Inuktitut</_description>
-            <languageList><iso639Id>iku</iso639Id></languageList>
+            <_description>Canada - Inuktitut</_description>
+            <languageList>
+              <iso639Id>iku</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>shs</name>
-            <_description>Secwepemctsin</_description>
-            <!-- No ISO code in ISO639-2, only draft ISO693-3 -->
+            <_description>Canada - Secwepemctsin</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>kut</name>
-            <_description>Ktunaxa</_description>
+            <_description>Canada - Ktunaxa</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>eng</name>
-            <_description>English</_description>
-            <languageList><iso639Id>eng</iso639Id></languageList>
+            <_description>Canada - English</_description>
+            <languageList>
+              <iso639Id>eng</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -2053,7 +2151,9 @@
         <name>cd</name>
         <_shortDescription>COD</_shortDescription>
         <_description>Congo, Democratic Republic of the</_description>
-        <languageList><iso639Id>fra</iso639Id></languageList>
+        <languageList>
+          <iso639Id>fra</iso639Id>
+        </languageList>
       </configItem>
       <variantList/>
     </layout>
@@ -2062,28 +2162,36 @@
         <name>cn</name>
         <_shortDescription>Chn</_shortDescription>
         <_description>China</_description>
-        <languageList><iso639Id>chi</iso639Id></languageList>
+        <languageList>
+          <iso639Id>chi</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>tib</name>
-            <_description>Tibetan</_description>
-            <languageList><iso639Id>tib</iso639Id></languageList>
+            <_description>China - Tibetan</_description>
+            <languageList>
+              <iso639Id>tib</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>tib_asciinum</name>
-            <_description>Tibetan (with ASCII numerals)</_description>
-            <languageList><iso639Id>tib</iso639Id></languageList>
+            <_description>China - Tibetan (with ASCII numerals)</_description>
+            <languageList>
+              <iso639Id>tib</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>uig</name>
-            <_description>Uyghur</_description>
-            <languageList><iso639Id>uig</iso639Id></languageList>
+            <_description>China - Uyghur</_description>
+            <languageList>
+              <iso639Id>uig</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -2093,31 +2201,33 @@
         <name>hr</name>
         <_shortDescription>Hrv</_shortDescription>
         <_description>Croatia</_description>
-        <languageList><iso639Id>scr</iso639Id></languageList>
+        <languageList>
+          <iso639Id>scr</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>alternatequotes</name>
-            <_description>Use guillemets for quotes</_description>
+            <_description>Croatia - Use guillemets for quotes</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>unicode</name>
-            <_description>Use Croatian digraphs</_description>
+            <_description>Croatia - Use Croatian digraphs</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>unicodeus</name>
-            <_description>US keyboard with Croatian digraphs</_description>
+            <_description>Croatia - US keyboard with Croatian digraphs</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>us</name>
-            <_description>US keyboard with Croatian letters</_description>
+            <_description>Croatia - US keyboard with Croatian letters</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2127,39 +2237,41 @@
         <name>cz</name>
         <_shortDescription>Cze</_shortDescription>
         <_description>Czechia</_description>
-        <languageList><iso639Id>cze</iso639Id></languageList>
+        <languageList>
+          <iso639Id>cze</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>bksl</name>
-            <_description>With &lt;\|&gt; key</_description>
+            <_description>Czechia - With &lt;\|&gt; key</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>qwerty</name>
-            <_description>qwerty</_description>
+            <_description>Czechia - qwerty</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>qwerty_bksl</name>
-            <_description>qwerty, extended Backslash</_description>
-          </configItem>
-        </variant>
-	<variant>
-	  <configItem>
-	    <name>ucw</name>
-	    <_description>UCW layout (accented letters only)</_description>
-	 </configItem>
-	</variant>
-	<variant>
-	  <configItem>
-	    <name>dvorak-ucw</name>
-	    <_description>US Dvorak with CZ UCW support</_description>
-	 </configItem>
-	</variant>
+            <_description>Czechia - qwerty, extended Backslash</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ucw</name>
+            <_description>Czechia - UCW layout (accented letters only)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak-ucw</name>
+            <_description>Czechia - US Dvorak with CZ UCW support</_description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -2167,31 +2279,33 @@
         <name>dk</name>
         <_shortDescription>Dnk</_shortDescription>
         <_description>Denmark</_description>
-        <languageList><iso639Id>dan</iso639Id></languageList>
+        <languageList>
+          <iso639Id>dan</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
+            <_description>Denmark - Eliminate dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Macintosh</_description>
+            <_description>Denmark - Macintosh</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac_nodeadkeys</name>
-            <_description>Macintosh, eliminate dead keys</_description>
+            <_description>Denmark - Macintosh, eliminate dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Dvorak</_description>
+            <_description>Denmark - Dvorak</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2201,25 +2315,27 @@
         <name>nl</name>
         <_shortDescription>Nld</_shortDescription>
         <_description>Netherlands</_description>
-        <languageList><iso639Id>nld</iso639Id></languageList>
+        <languageList>
+          <iso639Id>nld</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>sundeadkeys</name>
-            <_description>Sun dead keys</_description>
+            <_description>Netherlands - Sun dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Macintosh</_description>
+            <_description>Netherlands - Macintosh</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>std</name>
-            <_description>Standard</_description>
+            <_description>Netherlands - Standard</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2229,7 +2345,9 @@
         <name>bt</name>
         <_shortDescription>Btn</_shortDescription>
         <_description>Bhutan</_description>
-        <languageList><iso639Id>dzo</iso639Id></languageList>
+        <languageList>
+          <iso639Id>dzo</iso639Id>
+        </languageList>
       </configItem>
     </layout>
     <layout>
@@ -2237,25 +2355,27 @@
         <name>ee</name>
         <_shortDescription>Est</_shortDescription>
         <_description>Estonia</_description>
-        <languageList><iso639Id>est</iso639Id></languageList>
+        <languageList>
+          <iso639Id>est</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
+            <_description>Estonia - Eliminate dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Dvorak</_description>
+            <_description>Estonia - Dvorak</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>us</name>
-            <_description>US keyboard with Estonian letters</_description>
+            <_description>Estonia - US keyboard with Estonian letters</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2265,41 +2385,51 @@
         <name>ir</name>
         <_shortDescription>Irn</_shortDescription>
         <_description>Iran</_description>
-        <languageList><iso639Id>per</iso639Id></languageList>
+        <languageList>
+          <iso639Id>per</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>pes_keypad</name>
-            <_description>Persian, with Persian Keypad</_description>
+            <_description>Iran - Persian, with Persian Keypad</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ku</name>
-            <_description>Kurdish, Latin Q</_description>
-            <languageList><iso639Id>kur</iso639Id></languageList>
+            <_description>Iran - Kurdish, Latin Q</_description>
+            <languageList>
+              <iso639Id>kur</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ku_f</name>
-            <_description>Kurdish, (F)</_description>
-            <languageList><iso639Id>kur</iso639Id></languageList>
+            <_description>Iran - Kurdish, (F)</_description>
+            <languageList>
+              <iso639Id>kur</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ku_alt</name>
-            <_description>Kurdish, Latin Alt-Q</_description>
-            <languageList><iso639Id>kur</iso639Id></languageList>
+            <_description>Iran - Kurdish, Latin Alt-Q</_description>
+            <languageList>
+              <iso639Id>kur</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ku_ara</name>
-            <_description>Kurdish, Arabic-Latin</_description>
-            <languageList><iso639Id>kur</iso639Id></languageList>
+            <_description>Iran - Kurdish, Arabic-Latin</_description>
+            <languageList>
+              <iso639Id>kur</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -2316,29 +2446,37 @@
         <variant>
           <configItem>
             <name>ku</name>
-            <_description>Kurdish, Latin Q</_description>
-            <languageList><iso639Id>kur</iso639Id></languageList>
+            <_description>Iraq - Kurdish, Latin Q</_description>
+            <languageList>
+              <iso639Id>kur</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ku_f</name>
-            <_description>Kurdish, (F)</_description>
-            <languageList><iso639Id>kur</iso639Id></languageList>
+            <_description>Iraq - Kurdish, (F)</_description>
+            <languageList>
+              <iso639Id>kur</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ku_alt</name>
-            <_description>Kurdish, Latin Alt-Q</_description>
-            <languageList><iso639Id>kur</iso639Id></languageList>
+            <_description>Iraq - Kurdish, Latin Alt-Q</_description>
+            <languageList>
+              <iso639Id>kur</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ku_ara</name>
-            <_description>Kurdish, Arabic-Latin</_description>
-            <languageList><iso639Id>kur</iso639Id></languageList>
+            <_description>Iraq - Kurdish, Arabic-Latin</_description>
+            <languageList>
+              <iso639Id>kur</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -2348,13 +2486,15 @@
         <name>fo</name>
         <_shortDescription>Fro</_shortDescription>
         <_description>Faroe Islands</_description>
-        <languageList><iso639Id>fao</iso639Id></languageList>
+        <languageList>
+          <iso639Id>fao</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
+            <_description>Faroe Islands - Eliminate dead keys</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2364,25 +2504,27 @@
         <name>fi</name>
         <_shortDescription>Fin</_shortDescription>
         <_description>Finland</_description>
-        <languageList><iso639Id>fin</iso639Id></languageList>
+        <languageList>
+          <iso639Id>fin</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>classic</name>
-            <_description>Classic</_description>
+            <_description>Finland - Classic</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Classic, eliminate dead keys</_description>
+            <_description>Finland - Classic, eliminate dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>smi</name>
-            <_description>Northern Saami</_description>
+            <_description>Finland - Northern Saami</_description>
             <languageList><iso639Id>smi</iso639Id>
                           <iso639Id>sme</iso639Id></languageList>
           </configItem>
@@ -2390,7 +2532,7 @@
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Macintosh</_description>
+            <_description>Finland - Macintosh</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2400,105 +2542,111 @@
         <name>fr</name>
         <_shortDescription>Fra</_shortDescription>
         <_description>France</_description>
-        <languageList><iso639Id>fra</iso639Id></languageList>
+        <languageList>
+          <iso639Id>fra</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
+            <_description>France - Eliminate dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>sundeadkeys</name>
-            <_description>Sun dead keys</_description>
+            <_description>France - Sun dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>oss</name>
-            <_description>Alternative</_description>
+            <_description>France - Alternative</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>oss_latin9</name>
-            <_description>Alternative, latin-9 only</_description>
+            <_description>France - Alternative, latin-9 only</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>oss_nodeadkeys</name>
-            <_description>Alternative, eliminate dead keys</_description>
+            <_description>France - Alternative, eliminate dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>oss_sundeadkeys</name>
-            <_description>Alternative, Sun dead keys</_description>
+            <_description>France - Alternative, Sun dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latin9</name>
-            <_description>(Legacy) Alternative</_description>
+            <_description>France - (Legacy) Alternative</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latin9_nodeadkeys</name>
-            <_description>(Legacy) Alternative, eliminate dead keys</_description>
+            <_description>France - (Legacy) Alternative, eliminate dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latin9_sundeadkeys</name>
-            <_description>(Legacy) Alternative, Sun dead keys</_description>
+            <_description>France - (Legacy) Alternative, Sun dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>bepo</name>
-            <_description>Bepo, ergonomic, Dvorak way</_description>
+            <_description>France - Bepo, ergonomic, Dvorak way</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>bepo_latin9</name>
-            <_description>Bepo, ergonomic, Dvorak way, latin-9 only</_description>
+            <_description>France - Bepo, ergonomic, Dvorak way, latin-9 only</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Dvorak</_description>
+            <_description>France - Dvorak</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Macintosh</_description>
+            <_description>France - Macintosh</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>bre</name>
-            <_description>Breton</_description>
+            <_description>France - Breton</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>oci</name>
-            <_description>Occitan</_description>
-            <languageList><iso639Id>oci</iso639Id></languageList>
+            <_description>France - Occitan</_description>
+            <languageList>
+              <iso639Id>oci</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>geo</name>
-            <_description>Georgian AZERTY Tskapo</_description>
-            <languageList><iso639Id>geo</iso639Id></languageList>
+            <_description>France - Georgian AZERTY Tskapo</_description>
+            <languageList>
+              <iso639Id>geo</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -2508,61 +2656,75 @@
         <name>gh</name>
         <_shortDescription>Gha</_shortDescription>
         <_description>Ghana</_description>
-        <languageList><iso639Id>eng</iso639Id></languageList>
+        <languageList>
+          <iso639Id>eng</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>generic</name>
-            <_description>Multilingual</_description>
+            <_description>Ghana - Multilingual</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>akan</name>
-            <_description>Akan</_description>
-            <languageList><iso639Id>aka</iso639Id></languageList>
+            <_description>Ghana - Akan</_description>
+            <languageList>
+              <iso639Id>aka</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ewe</name>
-            <_description>Ewe</_description>
-            <languageList><iso639Id>ewe</iso639Id></languageList>
+            <_description>Ghana - Ewe</_description>
+            <languageList>
+              <iso639Id>ewe</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>fula</name>
-            <_description>Fula</_description>
-            <languageList><iso639Id>ful</iso639Id></languageList>
+            <_description>Ghana - Fula</_description>
+            <languageList>
+              <iso639Id>ful</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ga</name>
-            <_description>Ga</_description>
-            <languageList><iso639Id>gaa</iso639Id></languageList>
+            <_description>Ghana - Ga</_description>
+            <languageList>
+              <iso639Id>gaa</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>hausa</name>
-            <_description>Hausa</_description>
-            <languageList><iso639Id>hau</iso639Id></languageList>
+            <_description>Ghana - Hausa</_description>
+            <languageList>
+              <iso639Id>hau</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>avn</name>
-            <_description>Avatime</_description>
-            <languageList><iso639Id>avn</iso639Id></languageList>
+            <_description>Ghana - Avatime</_description>
+            <languageList>
+              <iso639Id>avn</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>gillbt</name>
-            <_description>GILLBT</_description>
+            <_description>Ghana - GILLBT</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2572,7 +2734,9 @@
         <name>gn</name>
         <_shortDescription>Gin</_shortDescription>
         <_description>Guinea</_description>
-        <languageList><iso639Id>fra</iso639Id></languageList>
+        <languageList>
+          <iso639Id>fra</iso639Id>
+        </languageList>
       </configItem>
       <variantList/>
     </layout>
@@ -2581,33 +2745,39 @@
         <name>ge</name>
         <_shortDescription>Geo</_shortDescription>
         <_description>Georgia</_description>
-        <languageList><iso639Id>geo</iso639Id></languageList>
+        <languageList>
+          <iso639Id>geo</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>ergonomic</name>
-            <_description>Ergonomic</_description>
+            <_description>Georgia - Ergonomic</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mess</name>
-            <_description>MESS</_description>
+            <_description>Georgia - MESS</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ru</name>
-            <_description>Russian</_description>
-            <languageList><iso639Id>rus</iso639Id></languageList>
+            <_description>Georgia - Russian</_description>
+            <languageList>
+              <iso639Id>rus</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>os</name>
-            <_description>Ossetian</_description>
-            <languageList><iso639Id>oss</iso639Id></languageList>
+            <_description>Georgia - Ossetian</_description>
+            <languageList>
+              <iso639Id>oss</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -2617,94 +2787,102 @@
         <name>de</name>
         <_shortDescription>Deu</_shortDescription>
         <_description>Germany</_description>
-        <languageList><iso639Id>ger</iso639Id></languageList>
+        <languageList>
+          <iso639Id>ger</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>deadacute</name>
-            <_description>Dead acute</_description>
+            <_description>Germany - Dead acute</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>deadgraveacute</name>
-            <_description>Dead grave acute</_description>
+            <_description>Germany - Dead grave acute</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
+            <_description>Germany - Eliminate dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ro</name>
-            <_description>Romanian keyboard with German letters</_description>
+            <_description>Germany - Romanian keyboard with German letters</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ro_nodeadkeys</name>
-            <_description>Romanian keyboard with German letters, eliminate dead keys</_description>
+            <_description>Germany - Romanian keyboard with German letters, eliminate dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Dvorak</_description>
+            <_description>Germany - Dvorak</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>sundeadkeys</name>
-            <_description>Sun dead keys</_description>
+            <_description>Germany - Sun dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>neo</name>
-            <_description>Neo 2</_description>
+            <_description>Germany - Neo 2</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Macintosh</_description>
+            <_description>Germany - Macintosh</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac_nodeadkeys</name>
-            <_description>Macintosh, eliminate dead keys</_description>
+            <_description>Germany - Macintosh, eliminate dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dsb</name>
-            <_description>Lower Sorbian</_description>
-            <languageList><iso639Id>dsb</iso639Id></languageList>
+            <_description>Germany - Lower Sorbian</_description>
+            <languageList>
+              <iso639Id>dsb</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dsb_qwertz</name>
-            <_description>Lower Sorbian (qwertz)</_description>
-            <languageList><iso639Id>dsb</iso639Id></languageList>
+            <_description>Germany - Lower Sorbian (qwertz)</_description>
+            <languageList>
+              <iso639Id>dsb</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>qwerty</name>
-            <_description>qwerty</_description>
+            <_description>Germany - qwerty</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ru</name>
-            <_description>Russian phonetic</_description>
-            <languageList><iso639Id>rus</iso639Id></languageList>
+            <_description>Germany - Russian phonetic</_description>
+            <languageList>
+              <iso639Id>rus</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -2714,31 +2892,33 @@
         <name>gr</name>
         <_shortDescription>Grc</_shortDescription>
         <_description>Greece</_description>
-        <languageList><iso639Id>gre</iso639Id></languageList>
+        <languageList>
+          <iso639Id>gre</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>simple</name>
-            <_description>Simple</_description>
+            <_description>Greece - Simple</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>extended</name>
-            <_description>Extended</_description>
+            <_description>Greece - Extended</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
+            <_description>Greece - Eliminate dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>polytonic</name>
-            <_description>Polytonic</_description>
+            <_description>Greece - Polytonic</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2748,126 +2928,123 @@
         <name>hu</name>
         <_shortDescription>Hun</_shortDescription>
         <_description>Hungary</_description>
-        <languageList><iso639Id>hun</iso639Id></languageList>
+        <languageList>
+          <iso639Id>hun</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>standard</name>
-            <_description>Standard</_description>
+            <_description>Hungary - Standard</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
+            <_description>Hungary - Eliminate dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>qwerty</name>
-            <_description>qwerty</_description>
+            <_description>Hungary - qwerty</_description>
           </configItem>
         </variant>
-
-        <!-- 101 keys -->
         <variant>
           <configItem>
             <name>101_qwertz_comma_dead</name>
-            <_description>101/qwertz/comma/Dead keys</_description>
+            <_description>Hungary - 101/qwertz/comma/Dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>101_qwertz_comma_nodead</name>
-            <_description>101/qwertz/comma/Eliminate dead keys</_description>
+            <_description>Hungary - 101/qwertz/comma/Eliminate dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>101_qwertz_dot_dead</name>
-            <_description>101/qwertz/dot/Dead keys</_description>
+            <_description>Hungary - 101/qwertz/dot/Dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>101_qwertz_dot_nodead</name>
-            <_description>101/qwertz/dot/Eliminate dead keys</_description>
+            <_description>Hungary - 101/qwertz/dot/Eliminate dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>101_qwerty_comma_dead</name>
-            <_description>101/qwerty/comma/Dead keys</_description>
+            <_description>Hungary - 101/qwerty/comma/Dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>101_qwerty_comma_nodead</name>
-            <_description>101/qwerty/comma/Eliminate dead keys</_description>
+            <_description>Hungary - 101/qwerty/comma/Eliminate dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>101_qwerty_dot_dead</name>
-            <_description>101/qwerty/dot/Dead keys</_description>
+            <_description>Hungary - 101/qwerty/dot/Dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>101_qwerty_dot_nodead</name>
-            <_description>101/qwerty/dot/Eliminate dead keys</_description>
+            <_description>Hungary - 101/qwerty/dot/Eliminate dead keys</_description>
           </configItem>
         </variant>
-
-
-        <!-- 102 keys -->
         <variant>
           <configItem>
             <name>102_qwertz_comma_dead</name>
-            <_description>102/qwertz/comma/Dead keys</_description>
+            <_description>Hungary - 102/qwertz/comma/Dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>102_qwertz_comma_nodead</name>
-            <_description>102/qwertz/comma/Eliminate dead keys</_description>
+            <_description>Hungary - 102/qwertz/comma/Eliminate dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>102_qwertz_dot_dead</name>
-            <_description>102/qwertz/dot/Dead keys</_description>
+            <_description>Hungary - 102/qwertz/dot/Dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>102_qwertz_dot_nodead</name>
-            <_description>102/qwertz/dot/Eliminate dead keys</_description>
+            <_description>Hungary - 102/qwertz/dot/Eliminate dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>102_qwerty_comma_dead</name>
-            <_description>102/qwerty/comma/Dead keys</_description>
+            <_description>Hungary - 102/qwerty/comma/Dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>102_qwerty_comma_nodead</name>
-            <_description>102/qwerty/comma/Eliminate dead keys</_description>
+            <_description>Hungary - 102/qwerty/comma/Eliminate dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>102_qwerty_dot_dead</name>
-            <_description>102/qwerty/dot/Dead keys</_description>
+            <_description>Hungary - 102/qwerty/dot/Dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>102_qwerty_dot_nodead</name>
-            <_description>102/qwerty/dot/Eliminate dead keys</_description>
+            <_description>Hungary - 102/qwerty/dot/Eliminate dead keys</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2877,31 +3054,33 @@
         <name>is</name>
         <_shortDescription>Isl</_shortDescription>
         <_description>Iceland</_description>
-        <languageList><iso639Id>ice</iso639Id></languageList>
+        <languageList>
+          <iso639Id>ice</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>Sundeadkeys</name>
-            <_description>Sun dead keys</_description>
+            <_description>Iceland - Sun dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
+            <_description>Iceland - Eliminate dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Macintosh</_description>
+            <_description>Iceland - Macintosh</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Dvorak</_description>
+            <_description>Iceland - Dvorak</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2911,25 +3090,27 @@
         <name>il</name>
         <_shortDescription>Isr</_shortDescription>
         <_description>Israel</_description>
-        <languageList><iso639Id>heb</iso639Id></languageList>
+        <languageList>
+          <iso639Id>heb</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>lyx</name>
-            <_description>lyx</_description>
+            <_description>Israel - lyx</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>phonetic</name>
-            <_description>Phonetic</_description>
+            <_description>Israel - Phonetic</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>biblical</name>
-            <_description>Biblical Hebrew (Tiro)</_description>
+            <_description>Israel - Biblical Hebrew (Tiro)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2939,32 +3120,36 @@
         <name>it</name>
         <_shortDescription>Ita</_shortDescription>
         <_description>Italy</_description>
-        <languageList><iso639Id>ita</iso639Id></languageList>
+        <languageList>
+          <iso639Id>ita</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
+            <_description>Italy - Eliminate dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Macintosh</_description>
+            <_description>Italy - Macintosh</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>us</name>
-            <_description>US keyboard with Italian letters</_description>
+            <_description>Italy - US keyboard with Italian letters</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>geo</name>
-            <_description>Georgian</_description>
-            <languageList><iso639Id>geo</iso639Id></languageList>
+            <_description>Italy - Georgian</_description>
+            <languageList>
+              <iso639Id>geo</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -2974,31 +3159,33 @@
         <name>jp</name>
         <_shortDescription>Jpn</_shortDescription>
         <_description>Japan</_description>
-        <languageList><iso639Id>jpn</iso639Id></languageList>
+        <languageList>
+          <iso639Id>jpn</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>kana</name>
-            <_description>Kana</_description>
+            <_description>Japan - Kana</_description>
           </configItem>
         </variant>
-	<variant>
+        <variant>
           <configItem>
             <name>kana86</name>
-            <_description>Kana 86</_description>
+            <_description>Japan - Kana 86</_description>
           </configItem>
-	</variant>
-	<variant>
+        </variant>
+        <variant>
           <configItem>
             <name>OADG109A</name>
-            <_description>OADG 109A</_description>
+            <_description>Japan - OADG 109A</_description>
           </configItem>
-	</variant>
+        </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Macintosh</_description>
+            <_description>Japan - Macintosh</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3008,13 +3195,15 @@
         <name>kg</name>
         <_shortDescription>Kgz</_shortDescription>
         <_description>Kyrgyzstan</_description>
-        <languageList><iso639Id>kir</iso639Id></languageList>
+        <languageList>
+          <iso639Id>kir</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
-       <variant>
+        <variant>
           <configItem>
             <name>phonetic</name>
-            <_description>Phonetic</_description>
+            <_description>Kyrgyzstan - Phonetic</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3024,7 +3213,9 @@
         <name>kh</name>
         <_shortDescription>Khm</_shortDescription>
         <_description>Cambodia</_description>
-        <languageList><iso639Id>khm</iso639Id></languageList>
+        <languageList>
+          <iso639Id>khm</iso639Id>
+        </languageList>
       </configItem>
       <variantList/>
     </layout>
@@ -3033,25 +3224,27 @@
         <name>kz</name>
         <_shortDescription>Kaz</_shortDescription>
         <_description>Kazakhstan</_description>
-        <languageList><iso639Id>kaz</iso639Id></languageList>
+        <languageList>
+          <iso639Id>kaz</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
-	<variant>
-	  <configItem>
-	    <name>ruskaz</name>
-	    <_description>Russian with Kazakh</_description>
+        <variant>
+          <configItem>
+            <name>ruskaz</name>
+            <_description>Kazakhstan - Russian with Kazakh</_description>
             <languageList><iso639Id>kaz</iso639Id>
                           <iso639Id>rus</iso639Id></languageList>
-	  </configItem>
-	</variant>
-	<variant>
-	  <configItem>
-	    <name>kazrus</name>
-	    <_description>Kazakh with Russian</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>kazrus</name>
+            <_description>Kazakhstan - Kazakh with Russian</_description>
             <languageList><iso639Id>kaz</iso639Id>
                           <iso639Id>rus</iso639Id></languageList>
-	  </configItem>
-	</variant>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -3059,25 +3252,19 @@
         <name>la</name>
         <_shortDescription>Lao</_shortDescription>
         <_description>Laos</_description>
-        <languageList><iso639Id>lao</iso639Id></languageList>
+        <languageList>
+          <iso639Id>lao</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
-	<variant>
-	  <configItem>
-	    <name>basic</name>
-	    <_description>Laos</_description>
-            <languageList><iso639Id>lao</iso639Id>
-            </languageList>
-	  </configItem>
-	</variant>
-	<variant>
-	  <configItem>
-	    <name>stea</name>
-	    <_description>Laos - STEA (proposed standard layout)</_description>
+        <variant>
+          <configItem>
+            <name>stea</name>
+            <_description>Laos - STEA (proposed standard layout)</_description>
             <languageList><iso639Id>lao</iso639Id>
             </languageList>
-	  </configItem>
-	</variant>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -3108,25 +3295,27 @@
           <iso3166Id>UY</iso3166Id>
           <iso3166Id>VE</iso3166Id>
         </countryList>
-        <languageList><iso639Id>spa</iso639Id></languageList>
+        <languageList>
+          <iso639Id>spa</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
+            <_description>Latin American - Eliminate dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>deadtilde</name>
-            <_description>Include dead tilde</_description>
+            <_description>Latin American - Include dead tilde</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>sundeadkeys</name>
-            <_description>Sun dead keys</_description>
+            <_description>Latin American - Sun dead keys</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3136,37 +3325,39 @@
         <name>lt</name>
         <_shortDescription>Ltu</_shortDescription>
         <_description>Lithuania</_description>
-        <languageList><iso639Id>lit</iso639Id></languageList>
+        <languageList>
+          <iso639Id>lit</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>std</name>
-            <_description>Standard</_description>
+            <_description>Lithuania - Standard</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>us</name>
-            <_description>US keyboard with Lithuanian letters</_description>
+            <_description>Lithuania - US keyboard with Lithuanian letters</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ibm</name>
-            <_description>IBM (LST 1205-92)</_description>
+            <_description>Lithuania - IBM (LST 1205-92)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>lekp</name>
-            <_description>LEKP</_description>
+            <_description>Lithuania - LEKP</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>lekpa</name>
-            <_description>LEKPa</_description>
+            <_description>Lithuania - LEKPa</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3176,25 +3367,27 @@
         <name>lv</name>
         <_shortDescription>Lva</_shortDescription>
         <_description>Latvia</_description>
-        <languageList><iso639Id>lav</iso639Id></languageList>
+        <languageList>
+          <iso639Id>lav</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>apostrophe</name>
-            <_description>Apostrophe (') variant</_description>
+            <_description>Latvia - Apostrophe (') variant</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>tilde</name>
-            <_description>Tilde (~) variant</_description>
+            <_description>Latvia - Tilde (~) variant</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>fkey</name>
-            <_description>F-letter (F) variant</_description>
+            <_description>Latvia - F-letter (F) variant</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3204,7 +3397,9 @@
         <name>mao</name>
         <_shortDescription>Mao</_shortDescription>
         <_description>Maori</_description>
-        <languageList><iso639Id>mao</iso639Id></languageList>
+        <languageList>
+          <iso639Id>mao</iso639Id>
+        </languageList>
       </configItem>
       <variantList/>
     </layout>
@@ -3213,49 +3408,51 @@
         <name>me</name>
         <_shortDescription>MNE</_shortDescription>
         <_description>Montenegro</_description>
-        <languageList><iso639Id>srp</iso639Id></languageList>
+        <languageList>
+          <iso639Id>srp</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>cyrillic</name>
-            <_description>Cyrillic</_description>
+            <_description>Montenegro - Cyrillic</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>cyrillicyz</name>
-            <_description>Cyrillic, Z and ZHE swapped</_description>
+            <_description>Montenegro - Cyrillic, Z and ZHE swapped</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latinunicode</name>
-            <_description>Latin unicode</_description>
+            <_description>Montenegro - Latin unicode</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latinyz</name>
-            <_description>Latin qwerty</_description>
+            <_description>Montenegro - Latin qwerty</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latinunicodeyz</name>
-            <_description>Latin unicode qwerty</_description>
+            <_description>Montenegro - Latin unicode qwerty</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>cyrillicalternatequotes</name>
-            <_description>Cyrillic with guillemets</_description>
+            <_description>Montenegro - Cyrillic with guillemets</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latinalternatequotes</name>
-            <_description>Latin with guillemets</_description>
+            <_description>Montenegro - Latin with guillemets</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3265,13 +3462,15 @@
         <name>mk</name>
         <_shortDescription>Mkd</_shortDescription>
         <_description>Macedonia</_description>
-        <languageList><iso639Id>mkd</iso639Id></languageList>
+        <languageList>
+          <iso639Id>mkd</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
+            <_description>Macedonia - Eliminate dead keys</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3281,13 +3480,15 @@
         <name>mt</name>
         <_shortDescription>Mlt</_shortDescription>
         <_description>Malta</_description>
-        <languageList><iso639Id>mlt</iso639Id></languageList>
+        <languageList>
+          <iso639Id>mlt</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>us</name>
-            <_description>Maltese keyboard with US layout</_description>
+            <_description>Malta - Maltese keyboard with US layout</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3297,7 +3498,9 @@
         <name>mn</name>
         <_shortDescription>Mng</_shortDescription>
         <_description>Mongolia</_description>
-        <languageList><iso639Id>mng</iso639Id></languageList>
+        <languageList>
+          <iso639Id>mng</iso639Id>
+        </languageList>
       </configItem>
       <variantList/>
     </layout>
@@ -3306,45 +3509,51 @@
         <name>no</name>
         <_shortDescription>Nor</_shortDescription>
         <_description>Norway</_description>
-        <languageList><iso639Id>nor</iso639Id></languageList>
+        <languageList>
+          <iso639Id>nor</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
+            <_description>Norway - Eliminate dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Dvorak</_description>
+            <_description>Norway - Dvorak</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>smi</name>
-            <_description>Northern Saami</_description>
-            <languageList><iso639Id>sme</iso639Id></languageList>
+            <_description>Norway - Northern Saami</_description>
+            <languageList>
+              <iso639Id>sme</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>smi_nodeadkeys</name>
-            <_description>Northern Saami, eliminate dead keys</_description>
-            <languageList><iso639Id>sme</iso639Id></languageList>
+            <_description>Norway - Northern Saami, eliminate dead keys</_description>
+            <languageList>
+              <iso639Id>sme</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Macintosh</_description>
+            <_description>Norway - Macintosh</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac_nodeadkeys</name>
-            <_description>Macintosh, eliminate dead keys</_description>
+            <_description>Norway - Macintosh, eliminate dead keys</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3354,51 +3563,57 @@
         <name>pl</name>
         <_shortDescription>Pol</_shortDescription>
         <_description>Poland</_description>
-        <languageList><iso639Id>pol</iso639Id></languageList>
+        <languageList>
+          <iso639Id>pol</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>qwertz</name>
-            <_description>qwertz</_description>
+            <_description>Poland - qwertz</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Dvorak</_description>
+            <_description>Poland - Dvorak</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak_quotes</name>
-            <_description>Dvorak, Polish quotes on quotemark key</_description>
+            <_description>Poland - Dvorak, Polish quotes on quotemark key</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak_altquotes</name>
-            <_description>Dvorak, Polish quotes on key 1</_description>
+            <_description>Poland - Dvorak, Polish quotes on key 1</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>csb</name>
-            <_description>Kashubian</_description>
-            <languageList><iso639Id>csb</iso639Id></languageList>
+            <_description>Poland - Kashubian</_description>
+            <languageList>
+              <iso639Id>csb</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ru_phonetic_dvorak</name>
-            <_description>Russian phonetic Dvorak</_description>
-            <languageList><iso639Id>rus</iso639Id></languageList>
+            <_description>Poland - Russian phonetic Dvorak</_description>
+            <languageList>
+              <iso639Id>rus</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvp</name>
-            <_description>Programmer Dvorak</_description>
+            <_description>Poland - Programmer Dvorak</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3408,56 +3623,60 @@
         <name>pt</name>
         <_shortDescription>Prt</_shortDescription>
         <_description>Portugal</_description>
-        <languageList><iso639Id>por</iso639Id></languageList>
+        <languageList>
+          <iso639Id>por</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
+            <_description>Portugal - Eliminate dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>sundeadkeys</name>
-            <_description>Sun dead keys</_description>
+            <_description>Portugal - Sun dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Macintosh</_description>
+            <_description>Portugal - Macintosh</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac_nodeadkeys</name>
-            <_description>Macintosh, eliminate dead keys</_description>
+            <_description>Portugal - Macintosh, eliminate dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac_sundeadkeys</name>
-            <_description>Macintosh, Sun dead keys</_description>
+            <_description>Portugal - Macintosh, Sun dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nativo</name>
-            <_description>Nativo</_description>
+            <_description>Portugal - Nativo</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nativo-us</name>
-            <_description>Nativo for USA keyboards</_description>
+            <_description>Portugal - Nativo for USA keyboards</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nativo-epo</name>
-            <_description>Nativo for Esperanto</_description>
-            <languageList><iso639Id>epo</iso639Id></languageList>
+            <_description>Portugal - Nativo for Esperanto</_description>
+            <languageList>
+              <iso639Id>epo</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -3467,59 +3686,69 @@
         <name>ro</name>
         <_shortDescription>Rou</_shortDescription>
         <_description>Romania</_description>
-        <languageList><iso639Id>rum</iso639Id></languageList>
+        <languageList>
+          <iso639Id>rum</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>cedilla</name>
-            <_description>Cedilla</_description>
+            <_description>Romania - Cedilla</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>std</name>
-            <_description>Standard</_description>
+            <_description>Romania - Standard</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>std_cedilla</name>
-            <_description>Standard (Cedilla)</_description>
+            <_description>Romania - Standard (Cedilla)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>winkeys</name>
-            <_description>Winkeys</_description>
+            <_description>Romania - Winkeys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>crh_f</name>
-            <_description>Crimean Tatar (Turkish F)</_description>
-            <languageList><iso639Id>crh</iso639Id></languageList>
+            <_description>Romania - Crimean Tatar (Turkish F)</_description>
+            <languageList>
+              <iso639Id>crh</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>crh_alt</name>
-            <_description>Crimean Tatar (Turkish Alt-Q)</_description>
-            <languageList><iso639Id>crh</iso639Id></languageList>
+            <_description>Romania - Crimean Tatar (Turkish Alt-Q)</_description>
+            <languageList>
+              <iso639Id>crh</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>crh_dobruca1</name>
-            <_description>Crimean Tatar (Dobruca-1 Q)</_description>
-            <languageList><iso639Id>crh</iso639Id></languageList>
+            <_description>Romania - Crimean Tatar (Dobruca-1 Q)</_description>
+            <languageList>
+              <iso639Id>crh</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>crh_dobruca2</name>
-            <_description>Crimean Tatar (Dobruca-2 Q)</_description>
-            <languageList><iso639Id>crh</iso639Id></languageList>
+            <_description>Romania - Crimean Tatar (Dobruca-2 Q)</_description>
+            <languageList>
+              <iso639Id>crh</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -3529,112 +3758,132 @@
         <name>ru</name>
         <_shortDescription>Rus</_shortDescription>
         <_description>Russia</_description>
-        <languageList><iso639Id>rus</iso639Id></languageList>
+        <languageList>
+          <iso639Id>rus</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>phonetic</name>
-            <_description>Phonetic</_description>
+            <_description>Russia - Phonetic</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>phonetic_winkeys</name>
-            <_description>Phonetic Winkeys</_description>
+            <_description>Russia - Phonetic Winkeys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>typewriter</name>
-            <_description>Typewriter</_description>
+            <_description>Russia - Typewriter</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>legacy</name>
-            <_description>Legacy</_description>
+            <_description>Russia - Legacy</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>typewriter-legacy</name>
-            <_description>Typewriter, legacy</_description>
+            <_description>Russia - Typewriter, legacy</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>tt</name>
-            <_description>Tatar</_description>
-            <languageList><iso639Id>tat</iso639Id></languageList>
+            <_description>Russia - Tatar</_description>
+            <languageList>
+              <iso639Id>tat</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>os_legacy</name>
-            <_description>Ossetian, legacy</_description>
-            <languageList><iso639Id>oss</iso639Id></languageList>
+            <_description>Russia - Ossetian, legacy</_description>
+            <languageList>
+              <iso639Id>oss</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>os_winkeys</name>
-            <_description>Ossetian, Winkeys</_description>
-            <languageList><iso639Id>oss</iso639Id></languageList>
+            <_description>Russia - Ossetian, Winkeys</_description>
+            <languageList>
+              <iso639Id>oss</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>cv</name>
-            <_description>Chuvash</_description>
-            <languageList><iso639Id>chv</iso639Id></languageList>
+            <_description>Russia - Chuvash</_description>
+            <languageList>
+              <iso639Id>chv</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>cv_latin</name>
-            <_description>Chuvash Latin</_description>
-            <languageList><iso639Id>chv</iso639Id></languageList>
+            <_description>Russia - Chuvash Latin</_description>
+            <languageList>
+              <iso639Id>chv</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>udm</name>
-            <_description>Udmurt</_description>
-            <languageList><iso639Id>udm</iso639Id></languageList>
+            <_description>Russia - Udmurt</_description>
+            <languageList>
+              <iso639Id>udm</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>kom</name>
-            <_description>Komi</_description>
-            <languageList><iso639Id>kom</iso639Id></languageList>
+            <_description>Russia - Komi</_description>
+            <languageList>
+              <iso639Id>kom</iso639Id>
+            </languageList>
           </configItem>
         </variant>
-	<variant>
+        <variant>
           <configItem>
             <name>sah</name>
-            <_description>Yakut</_description>
-            <languageList><iso639Id>sah</iso639Id></languageList>
+            <_description>Russia - Yakut</_description>
+            <languageList>
+              <iso639Id>sah</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>xal</name>
-            <_description>Kalmyk</_description>
-            <languageList><iso639Id>xal</iso639Id></languageList>
+            <_description>Russia - Kalmyk</_description>
+            <languageList>
+              <iso639Id>xal</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dos</name>
-            <_description>DOS</_description>
+            <_description>Russia - DOS</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>srp</name>
-            <_description>Serbian</_description>
+            <_description>Russia - Serbian</_description>
             <languageList><iso639Id>rus</iso639Id>
                           <iso639Id>srp</iso639Id></languageList>
           </configItem>
@@ -3642,15 +3891,19 @@
         <variant>
           <configItem>
             <name>bak</name>
-            <_description>Bashkirian</_description>
-            <languageList><iso639Id>bak</iso639Id></languageList>
+            <_description>Russia - Bashkirian</_description>
+            <languageList>
+              <iso639Id>bak</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>chm</name>
-            <_description>Mari</_description>
-            <languageList><iso639Id>chm</iso639Id></languageList>
+            <_description>Russia - Mari</_description>
+            <languageList>
+              <iso639Id>chm</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -3660,56 +3913,60 @@
         <name>rs</name>
         <_shortDescription>SRB</_shortDescription>
         <_description>Serbia</_description>
-        <languageList><iso639Id>srp</iso639Id></languageList>
+        <languageList>
+          <iso639Id>srp</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>yz</name>
-            <_description>Z and ZHE swapped</_description>
+            <_description>Serbia - Z and ZHE swapped</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latin</name>
-            <_description>Latin</_description>
+            <_description>Serbia - Latin</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latinunicode</name>
-            <_description>Latin Unicode</_description>
+            <_description>Serbia - Latin Unicode</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latinyz</name>
-            <_description>Latin qwerty</_description>
+            <_description>Serbia - Latin qwerty</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latinunicodeyz</name>
-            <_description>Latin Unicode qwerty</_description>
+            <_description>Serbia - Latin Unicode qwerty</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>alternatequotes</name>
-            <_description>With guillemets</_description>
+            <_description>Serbia - With guillemets</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latinalternatequotes</name>
-            <_description>Latin with guillemets</_description>
+            <_description>Serbia - Latin with guillemets</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>rue</name>
-            <_description>Pannonian Rusyn Homophonic</_description>
-            <languageList><iso639Id>rue</iso639Id></languageList>
+            <_description>Serbia - Pannonian Rusyn Homophonic</_description>
+            <languageList>
+              <iso639Id>rue</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -3719,19 +3976,21 @@
         <name>si</name>
         <_shortDescription>Svn</_shortDescription>
         <_description>Slovenia</_description>
-        <languageList><iso639Id>slv</iso639Id></languageList>
+        <languageList>
+          <iso639Id>slv</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>alternatequotes</name>
-            <_description>Use guillemets for quotes</_description>
+            <_description>Slovenia - Use guillemets for quotes</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>us</name>
-            <_description>US keyboard with Slovenian letters</_description>
+            <_description>Slovenia - US keyboard with Slovenian letters</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3741,25 +4000,27 @@
         <name>sk</name>
         <_shortDescription>Svk</_shortDescription>
         <_description>Slovakia</_description>
-        <languageList><iso639Id>slo</iso639Id></languageList>
+        <languageList>
+          <iso639Id>slo</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>bksl</name>
-            <_description>Extended Backslash</_description>
+            <_description>Slovakia - Extended Backslash</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>qwerty</name>
-            <_description>qwerty</_description>
+            <_description>Slovakia - qwerty</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>qwerty_bksl</name>
-            <_description>qwerty, extended Backslash</_description>
+            <_description>Slovakia - qwerty, extended Backslash</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3769,51 +4030,57 @@
         <name>es</name>
         <_shortDescription>Esp</_shortDescription>
         <_description>Spain</_description>
-        <languageList><iso639Id>spa</iso639Id></languageList>
+        <languageList>
+          <iso639Id>spa</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
+            <_description>Spain - Eliminate dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>deadtilde</name>
-            <_description>Include dead tilde</_description>
+            <_description>Spain - Include dead tilde</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>sundeadkeys</name>
-            <_description>Sun dead keys</_description>
+            <_description>Spain - Sun dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Dvorak</_description>
+            <_description>Spain - Dvorak</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ast</name>
-            <_description>Asturian variant with bottom-dot H and bottom-dot L</_description>
-            <languageList><iso639Id>ast</iso639Id></languageList>
+            <_description>Spain - Asturian variant with bottom-dot H and bottom-dot L</_description>
+            <languageList>
+              <iso639Id>ast</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>cat</name>
-            <_description>Catalan variant with middle-dot L</_description>
-            <languageList><iso639Id>cat</iso639Id></languageList>
+            <_description>Spain - Catalan variant with middle-dot L</_description>
+            <languageList>
+              <iso639Id>cat</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Macintosh</_description>
+            <_description>Spain - Macintosh</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3823,52 +4090,60 @@
         <name>se</name>
         <_shortDescription>Swe</_shortDescription>
         <_description>Sweden</_description>
-        <languageList><iso639Id>swe</iso639Id></languageList>
+        <languageList>
+          <iso639Id>swe</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Eliminate dead keys</_description>
+            <_description>Sweden - Eliminate dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Dvorak</_description>
+            <_description>Sweden - Dvorak</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>rus</name>
-            <_description>Russian phonetic</_description>
-            <languageList><iso639Id>rus</iso639Id></languageList>
+            <_description>Sweden - Russian phonetic</_description>
+            <languageList>
+              <iso639Id>rus</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>rus_nodeadkeys</name>
-            <_description>Russian phonetic, eliminate dead keys</_description>
-            <languageList><iso639Id>rus</iso639Id></languageList>
+            <_description>Sweden - Russian phonetic, eliminate dead keys</_description>
+            <languageList>
+              <iso639Id>rus</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>smi</name>
-            <_description>Northern Saami</_description>
-            <languageList><iso639Id>sme</iso639Id></languageList>
+            <_description>Sweden - Northern Saami</_description>
+            <languageList>
+              <iso639Id>sme</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Macintosh</_description>
+            <_description>Sweden - Macintosh</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>svdvorak</name>
-            <_description>Svdvorak</_description>
+            <_description>Sweden - Svdvorak</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3885,53 +4160,61 @@
         <variant>
           <configItem>
             <name>legacy</name>
-            <_description>Legacy</_description>
+            <_description>Switzerland - Legacy</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>de_nodeadkeys</name>
-            <_description>German, eliminate dead keys</_description>
+            <_description>Switzerland - German, eliminate dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>de_sundeadkeys</name>
-            <_description>German, Sun dead keys</_description>
+            <_description>Switzerland - German, Sun dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>fr</name>
-            <_description>French</_description>
-            <languageList><iso639Id>fra</iso639Id></languageList>
+            <_description>Switzerland - French</_description>
+            <languageList>
+              <iso639Id>fra</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>fr_nodeadkeys</name>
-            <_description>French, eliminate dead keys</_description>
-            <languageList><iso639Id>fra</iso639Id></languageList>
+            <_description>Switzerland - French, eliminate dead keys</_description>
+            <languageList>
+              <iso639Id>fra</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>fr_sundeadkeys</name>
-            <_description>French, Sun dead keys</_description>
-            <languageList><iso639Id>fra</iso639Id></languageList>
+            <_description>Switzerland - French, Sun dead keys</_description>
+            <languageList>
+              <iso639Id>fra</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>fr_mac</name>
-            <_description>French (Macintosh)</_description>
-            <languageList><iso639Id>fra</iso639Id></languageList>
+            <_description>Switzerland - French (Macintosh)</_description>
+            <languageList>
+              <iso639Id>fra</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>de_mac</name>
-            <_description>German (Macintosh)</_description>
+            <_description>Switzerland - German (Macintosh)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3941,40 +4224,48 @@
         <name>sy</name>
         <_shortDescription>Syr</_shortDescription>
         <_description>Syria</_description>
-        <languageList><iso639Id>syr</iso639Id></languageList>
+        <languageList>
+          <iso639Id>syr</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>syc</name>
-            <_description>Syriac</_description>
+            <_description>Syria - Syriac</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>syc_phonetic</name>
-            <_description>Syriac phonetic</_description>
+            <_description>Syria - Syriac phonetic</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ku</name>
-            <_description>Kurdish, Latin Q</_description>
-            <languageList><iso639Id>kur</iso639Id></languageList>
+            <_description>Syria - Kurdish, Latin Q</_description>
+            <languageList>
+              <iso639Id>kur</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ku_f</name>
-            <_description>Kurdish, (F)</_description>
-            <languageList><iso639Id>kur</iso639Id></languageList>
+            <_description>Syria - Kurdish, (F)</_description>
+            <languageList>
+              <iso639Id>kur</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ku_alt</name>
-            <_description>Kurdish, Latin Alt-Q</_description>
-            <languageList><iso639Id>kur</iso639Id></languageList>
+            <_description>Syria - Kurdish, Latin Alt-Q</_description>
+            <languageList>
+              <iso639Id>kur</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -3984,13 +4275,15 @@
         <name>tj</name>
         <_shortDescription>Tjk</_shortDescription>
         <_description>Tajikistan</_description>
-        <languageList><iso639Id>tgk</iso639Id></languageList>
+        <languageList>
+          <iso639Id>tgk</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>legacy</name>
-            <_description>Legacy</_description>
+            <_description>Tajikistan - Legacy</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4000,21 +4293,27 @@
         <name>lk</name>
         <_shortDescription>Lka</_shortDescription>
         <_description>Sri Lanka</_description>
-        <languageList><iso639Id>sin</iso639Id></languageList>
+        <languageList>
+          <iso639Id>sin</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>tam_unicode</name>
-            <_description>Tamil Unicode</_description>
-            <languageList><iso639Id>tam</iso639Id></languageList>
+            <_description>Sri Lanka - Tamil Unicode</_description>
+            <languageList>
+              <iso639Id>tam</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>tam_TAB</name>
-            <_description>Tamil TAB Typewriter</_description>
-            <languageList><iso639Id>tam</iso639Id></languageList>
+            <_description>Sri Lanka - Tamil TAB Typewriter</_description>
+            <languageList>
+              <iso639Id>tam</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -4024,19 +4323,21 @@
         <name>th</name>
         <_shortDescription>Tha</_shortDescription>
         <_description>Thailand</_description>
-        <languageList><iso639Id>tha</iso639Id></languageList>
+        <languageList>
+          <iso639Id>tha</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>tis</name>
-            <_description>TIS-820.2538</_description>
+            <_description>Thailand - TIS-820.2538</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>pat</name>
-            <_description>Pattachote</_description>
+            <_description>Thailand - Pattachote</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4046,73 +4347,87 @@
         <name>tr</name>
         <_shortDescription>Tur</_shortDescription>
         <_description>Turkey</_description>
-        <languageList><iso639Id>tur</iso639Id></languageList>
+        <languageList>
+          <iso639Id>tur</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>f</name>
-            <_description>(F)</_description>
+            <_description>Turkey - (F)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>alt</name>
-            <_description>Alt-Q</_description>
+            <_description>Turkey - Alt-Q</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>sundeadkeys</name>
-            <_description>Sun dead keys</_description>
+            <_description>Turkey - Sun dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ku</name>
-            <_description>Kurdish, Latin Q</_description>
-            <languageList><iso639Id>kur</iso639Id></languageList>
+            <_description>Turkey - Kurdish, Latin Q</_description>
+            <languageList>
+              <iso639Id>kur</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ku_f</name>
-            <_description>Kurdish, (F)</_description>
-            <languageList><iso639Id>kur</iso639Id></languageList>
+            <_description>Turkey - Kurdish, (F)</_description>
+            <languageList>
+              <iso639Id>kur</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ku_alt</name>
-            <_description>Kurdish, Latin Alt-Q</_description>
-            <languageList><iso639Id>kur</iso639Id></languageList>
+            <_description>Turkey - Kurdish, Latin Alt-Q</_description>
+            <languageList>
+              <iso639Id>kur</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>intl</name>
-            <_description>International (with dead keys)</_description>
+            <_description>Turkey - International (with dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>crh</name>
-            <_description>Crimean Tatar (Turkish Q)</_description>
-            <languageList><iso639Id>crh</iso639Id></languageList>
+            <_description>Turkey - Crimean Tatar (Turkish Q)</_description>
+            <languageList>
+              <iso639Id>crh</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>crh_f</name>
-            <_description>Crimean Tatar (Turkish F)</_description>
-            <languageList><iso639Id>crh</iso639Id></languageList>
+            <_description>Turkey - Crimean Tatar (Turkish F)</_description>
+            <languageList>
+              <iso639Id>crh</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>crh_alt</name>
-            <_description>Crimean Tatar (Turkish Alt-Q)</_description>
-            <languageList><iso639Id>crh</iso639Id></languageList>
+            <_description>Turkey - Crimean Tatar (Turkish Alt-Q)</_description>
+            <languageList>
+              <iso639Id>crh</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -4122,72 +4437,78 @@
         <name>ua</name>
         <_shortDescription>Ukr</_shortDescription>
         <_description>Ukraine</_description>
-        <languageList><iso639Id>ukr</iso639Id></languageList>
+        <languageList>
+          <iso639Id>ukr</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>phonetic</name>
-            <_description>Phonetic</_description>
+            <_description>Ukraine - Phonetic</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>typewriter</name>
-            <_description>Typewriter</_description>
+            <_description>Ukraine - Typewriter</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>winkeys</name>
-            <_description>Winkeys</_description>
+            <_description>Ukraine - Winkeys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>legacy</name>
-            <_description>Legacy</_description>
+            <_description>Ukraine - Legacy</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>rstu</name>
-<!-- RSTU 2019-91 -->
-            <_description>Standard RSTU</_description>
+            <_description>Ukraine - Standard RSTU</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>rstu_ru</name>
-<!-- RSTU 2019-91 -->
-            <_description>Standard RSTU on Russian layout</_description>
+            <_description>Ukraine - Standard RSTU on Russian layout</_description>
           </configItem>
         </variant>
-	<variant>
+        <variant>
           <configItem>
             <name>homophonic</name>
-            <_description>Homophonic</_description>
+            <_description>Ukraine - Homophonic</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>crh</name>
-            <_description>Crimean Tatar (Turkish Q)</_description>
-            <languageList><iso639Id>crh</iso639Id></languageList>
+            <_description>Ukraine - Crimean Tatar (Turkish Q)</_description>
+            <languageList>
+              <iso639Id>crh</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>crh_f</name>
-            <_description>Crimean Tatar (Turkish F)</_description>
-            <languageList><iso639Id>crh</iso639Id></languageList>
+            <_description>Ukraine - Crimean Tatar (Turkish F)</_description>
+            <languageList>
+              <iso639Id>crh</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>crh_alt</name>
-            <_description>Crimean Tatar (Turkish Alt-Q)</_description>
-            <languageList><iso639Id>crh</iso639Id></languageList>
+            <_description>Ukraine - Crimean Tatar (Turkish Alt-Q)</_description>
+            <languageList>
+              <iso639Id>crh</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -4197,49 +4518,51 @@
         <name>gb</name>
         <_shortDescription>GBr</_shortDescription>
         <_description>United Kingdom</_description>
-        <languageList><iso639Id>eng</iso639Id></languageList>
+        <languageList>
+          <iso639Id>eng</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>extd</name>
-            <_description>Extended - Winkeys</_description>
+            <_description>United Kingdom - Extended - Winkeys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>intl</name>
-            <_description>International (with dead keys)</_description>
+            <_description>United Kingdom - International (with dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Dvorak</_description>
+            <_description>United Kingdom - Dvorak</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorakukp</name>
-            <_description>Dvorak (UK Punctuation)</_description>
+            <_description>United Kingdom - Dvorak (UK Punctuation)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Macintosh</_description>
+            <_description>United Kingdom - Macintosh</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac_intl</name>
-            <_description>Macintosh (International)</_description>
+            <_description>United Kingdom - Macintosh (International)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>colemak</name>
-            <_description>Colemak</_description>
+            <_description>United Kingdom - Colemak</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4249,34 +4572,42 @@
         <name>uz</name>
         <_shortDescription>Uzb</_shortDescription>
         <_description>Uzbekistan</_description>
-        <languageList><iso639Id>uzb</iso639Id></languageList>
+        <languageList>
+          <iso639Id>uzb</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>latin</name>
-            <_description>Latin</_description>
+            <_description>Uzbekistan - Latin</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>crh</name>
-            <_description>Crimean Tatar (Turkish Q)</_description>
-            <languageList><iso639Id>crh</iso639Id></languageList>
+            <_description>Uzbekistan - Crimean Tatar (Turkish Q)</_description>
+            <languageList>
+              <iso639Id>crh</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>crh_f</name>
-            <_description>Crimean Tatar (Turkish F)</_description>
-            <languageList><iso639Id>crh</iso639Id></languageList>
+            <_description>Uzbekistan - Crimean Tatar (Turkish F)</_description>
+            <languageList>
+              <iso639Id>crh</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>crh_alt</name>
-            <_description>Crimean Tatar (Turkish Alt-Q)</_description>
-            <languageList><iso639Id>crh</iso639Id></languageList>
+            <_description>Uzbekistan - Crimean Tatar (Turkish Alt-Q)</_description>
+            <languageList>
+              <iso639Id>crh</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -4286,24 +4617,28 @@
         <name>vn</name>
         <_shortDescription>Vnm</_shortDescription>
         <_description>Vietnam</_description>
-        <languageList><iso639Id>vie</iso639Id></languageList>
+        <languageList>
+          <iso639Id>vie</iso639Id>
+        </languageList>
       </configItem>
       <variantList/>
     </layout>
     <layout>
-       <configItem>
+      <configItem>
         <name>kr</name>
         <_shortDescription>Kor</_shortDescription>
         <_description>Korea, Republic of</_description>
-        <languageList><iso639Id>kor</iso639Id></languageList>
+        <languageList>
+          <iso639Id>kor</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
-	<variant>
-	  <configItem>
-	    <name>kr104</name>
-	    <_description>101/104 key Compatible</_description>
-	  </configItem>
-	</variant>
+        <variant>
+          <configItem>
+            <name>kr104</name>
+            <_description>Korea, Republic of - 101/104 key Compatible</_description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -4311,8 +4646,12 @@
         <name>nec_vndr/jp</name>
         <_shortDescription>Jpn</_shortDescription>
         <_description>Japan (PC-98xx Series)</_description>
-        <countryList><iso3166Id>JP</iso3166Id></countryList>
-        <languageList><iso639Id>jpn</iso639Id></languageList>
+        <countryList>
+          <iso3166Id>JP</iso3166Id>
+        </countryList>
+        <languageList>
+          <iso639Id>jpn</iso639Id>
+        </languageList>
       </configItem>
       <variantList/>
     </layout>
@@ -4321,34 +4660,36 @@
         <name>ie</name>
         <_shortDescription>Irl</_shortDescription>
         <_description>Ireland</_description>
-        <languageList><iso639Id>eng</iso639Id></languageList>
+        <languageList>
+          <iso639Id>eng</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>CloGaelach</name>
-            <_description>CloGaelach</_description>
-            <languageList><iso639Id>gla</iso639Id></languageList>
+            <_description>Ireland - CloGaelach</_description>
+            <languageList>
+              <iso639Id>gla</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>UnicodeExpert</name>
-            <_description>UnicodeExpert</_description>
+            <_description>Ireland - UnicodeExpert</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ogam</name>
-            <_description>Ogham</_description>
-            <!-- No ISO code in ISO639 -->
-         </configItem>
+            <_description>Ireland - Ogham</_description>
+          </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ogam_is434</name>
-            <_description>Ogham IS434</_description>
-            <!-- No ISO code in ISO639 -->
+            <_description>Ireland - Ogham IS434</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4358,35 +4699,45 @@
         <name>pk</name>
         <_shortDescription>Pak</_shortDescription>
         <_description>Pakistan</_description>
-        <languageList><iso639Id>urd</iso639Id></languageList>
+        <languageList>
+          <iso639Id>urd</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>urd-crulp</name>
-            <_description>CRULP</_description>
-            <languageList><iso639Id>urd</iso639Id></languageList>
+            <_description>Pakistan - CRULP</_description>
+            <languageList>
+              <iso639Id>urd</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>urd-nla</name>
-            <_description>NLA</_description>
-            <languageList><iso639Id>urd</iso639Id></languageList>
+            <_description>Pakistan - NLA</_description>
+            <languageList>
+              <iso639Id>urd</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ara</name>
-            <_description>Arabic</_description>
-            <languageList><iso639Id>ara</iso639Id></languageList>
+            <_description>Pakistan - Arabic</_description>
+            <languageList>
+              <iso639Id>ara</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>snd</name>
-            <_description>Sindhi</_description>
-            <languageList><iso639Id>sd</iso639Id></languageList>
+            <_description>Pakistan - Sindhi</_description>
+            <languageList>
+              <iso639Id>sd</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -4396,30 +4747,36 @@
         <name>mv</name>
         <_shortDescription>Mdv</_shortDescription>
         <_description>Maldives</_description>
-        <languageList><iso639Id>div</iso639Id></languageList>
+        <languageList>
+          <iso639Id>div</iso639Id>
+        </languageList>
       </configItem>
       <variantList/>
     </layout>
     <layout>
-       <configItem>
+      <configItem>
         <name>za</name>
         <_shortDescription>Zaf</_shortDescription>
         <_description>South Africa</_description>
-        <languageList><iso639Id>eng</iso639Id></languageList>
+        <languageList>
+          <iso639Id>eng</iso639Id>
+        </languageList>
       </configItem>
     </layout>
     <layout>
       <configItem>
         <name>epo</name>
         <_shortDescription>Epo</_shortDescription>
-	<_description>Esperanto</_description>
-        <languageList><iso639Id>epo</iso639Id></languageList>
+        <_description>Esperanto</_description>
+        <languageList>
+          <iso639Id>epo</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>legacy</name>
-            <_description>displaced semicolon and quote (obsolete)</_description>
+            <_description>Esperanto - displaced semicolon and quote (obsolete)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4428,37 +4785,47 @@
       <configItem>
         <name>np</name>
         <_shortDescription>Npl</_shortDescription>
-	<_description>Nepal</_description>
-        <languageList><iso639Id>nep</iso639Id></languageList>
+        <_description>Nepal</_description>
+        <languageList>
+          <iso639Id>nep</iso639Id>
+        </languageList>
       </configItem>
     </layout>
     <layout>
       <configItem>
         <name>ng</name>
         <_shortDescription>Nga</_shortDescription>
-	<_description>Nigeria</_description>
-        <languageList><iso639Id>eng</iso639Id></languageList>
+        <_description>Nigeria</_description>
+        <languageList>
+          <iso639Id>eng</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>igbo</name>
-            <_description>Igbo</_description>
-            <languageList><iso639Id>ibo</iso639Id></languageList>
+            <_description>Nigeria - Igbo</_description>
+            <languageList>
+              <iso639Id>ibo</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>yoruba</name>
-            <_description>Yoruba</_description>
-            <languageList><iso639Id>yor</iso639Id></languageList>
+            <_description>Nigeria - Yoruba</_description>
+            <languageList>
+              <iso639Id>yor</iso639Id>
+            </languageList>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>hausa</name>
-            <_description>Hausa</_description>
-            <languageList><iso639Id>hau</iso639Id></languageList>
+            <_description>Nigeria - Hausa</_description>
+            <languageList>
+              <iso639Id>hau</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -4468,7 +4835,9 @@
         <name>et</name>
         <_shortDescription>Eth</_shortDescription>
         <_description>Ethiopia</_description>
-        <languageList><iso639Id>amh</iso639Id></languageList>
+        <languageList>
+          <iso639Id>amh</iso639Id>
+        </languageList>
       </configItem>
       <variantList/>
     </layout>
@@ -4477,7 +4846,9 @@
         <name>sn</name>
         <_shortDescription>Sen</_shortDescription>
         <_description>Senegal</_description>
-        <languageList><iso639Id>wol</iso639Id></languageList>
+        <languageList>
+          <iso639Id>wol</iso639Id>
+        </languageList>
       </configItem>
       <variantList/>
     </layout>
@@ -4491,13 +4862,13 @@
         <variant>
           <configItem>
             <name>left_hand</name>
-            <_description>Left hand</_description>
+            <_description>Braille - Left hand</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>right_hand</name>
-            <_description>Right hand</_description>
+            <_description>Braille - Right hand</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4507,13 +4878,15 @@
         <name>tm</name>
         <_shortDescription>Tkm</_shortDescription>
         <_description>Turkmenistan</_description>
-        <languageList><iso639Id>tuk</iso639Id></languageList>
+        <languageList>
+          <iso639Id>tuk</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>alt</name>
-            <_description>Alt-Q</_description>
+            <_description>Turkmenistan - Alt-Q</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4523,25 +4896,27 @@
         <name>ml</name>
         <_shortDescription>Mli</_shortDescription>
         <_description>Mali</_description>
-        <languageList><iso639Id>bam</iso639Id></languageList>
+        <languageList>
+          <iso639Id>bam</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>fr-oss</name>
-            <_description>Français (France Alternative)</_description>
+            <_description>Mali - Français (France Alternative)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>us-mac</name>
-            <_description>English (USA Macintosh)</_description>
+            <_description>Mali - English (USA Macintosh)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>us-intl</name>
-            <_description>English (USA International)</_description>
+            <_description>Mali - English (USA International)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4550,23 +4925,29 @@
       <configItem>
         <name>tz</name>
         <_shortDescription>Tza</_shortDescription>
-	<_description>Tanzania</_description>
-        <languageList><iso639Id>swa</iso639Id></languageList>
+        <_description>Tanzania</_description>
+        <languageList>
+          <iso639Id>swa</iso639Id>
+        </languageList>
       </configItem>
     </layout>
     <layout>
       <configItem>
         <name>ke</name>
         <_shortDescription>Ken</_shortDescription>
-	<_description>Kenya</_description>
-        <languageList><iso639Id>swa</iso639Id></languageList>
+        <_description>Kenya</_description>
+        <languageList>
+          <iso639Id>swa</iso639Id>
+        </languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>kik</name>
-            <_description>Kikuyu</_description>
-            <languageList><iso639Id>kik</iso639Id></languageList>
+            <_description>Kenya - Kikuyu</_description>
+            <languageList>
+              <iso639Id>kik</iso639Id>
+            </languageList>
           </configItem>
         </variant>
       </variantList>
@@ -4575,8 +4956,10 @@
       <configItem>
         <name>bw</name>
         <_shortDescription>Bwa</_shortDescription>
-	<_description>Botswana</_description>
-        <languageList><iso639Id>tsn</iso639Id></languageList>
+        <_description>Botswana</_description>
+        <languageList>
+          <iso639Id>tsn</iso639Id>
+        </languageList>
       </configItem>
     </layout>
     <layout>
@@ -4600,7 +4983,7 @@
         <variant>
           <configItem>
             <name>qwerty-bay</name>
-            <_description>QWERTY (Baybayin)</_description>
+            <_description>Philippines - QWERTY (Baybayin)</_description>
             <languageList><iso639Id>bik</iso639Id>
                           <iso639Id>ceb</iso639Id>
                           <iso639Id>fil</iso639Id>
@@ -4616,13 +4999,13 @@
         <variant>
           <configItem>
             <name>capewell-dvorak</name>
-            <_description>Capewell-Dvorak (Latin)</_description>
+            <_description>Philippines - Capewell-Dvorak (Latin)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>capewell-dvorak-bay</name>
-            <_description>Capewell-Dvorak (Baybayin)</_description>
+            <_description>Philippines - Capewell-Dvorak (Baybayin)</_description>
             <languageList><iso639Id>bik</iso639Id>
                           <iso639Id>ceb</iso639Id>
                           <iso639Id>fil</iso639Id>
@@ -4638,13 +5021,13 @@
         <variant>
           <configItem>
             <name>capewell-qwerf2k6</name>
-            <_description>Capewell-QWERF 2006 (Latin)</_description>
+            <_description>Philippines - Capewell-QWERF 2006 (Latin)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>capewell-qwerf2k6-bay</name>
-            <_description>Capewell-QWERF 2006 (Baybayin)</_description>
+            <_description>Philippines - Capewell-QWERF 2006 (Baybayin)</_description>
             <languageList><iso639Id>bik</iso639Id>
                           <iso639Id>ceb</iso639Id>
                           <iso639Id>fil</iso639Id>
@@ -4660,13 +5043,13 @@
         <variant>
           <configItem>
             <name>colemak</name>
-            <_description>Colemak (Latin)</_description>
+            <_description>Philippines - Colemak (Latin)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>colemak-bay</name>
-            <_description>Colemak (Baybayin)</_description>
+            <_description>Philippines - Colemak (Baybayin)</_description>
             <languageList><iso639Id>bik</iso639Id>
                           <iso639Id>ceb</iso639Id>
                           <iso639Id>fil</iso639Id>
@@ -4682,13 +5065,13 @@
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Dvorak (Latin)</_description>
+            <_description>Philippines - Dvorak (Latin)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak-bay</name>
-            <_description>Dvorak (Baybayin)</_description>
+            <_description>Philippines - Dvorak (Baybayin)</_description>
             <languageList><iso639Id>bik</iso639Id>
                           <iso639Id>ceb</iso639Id>
                           <iso639Id>fil</iso639Id>
diff --git a/xorg-server/xkeyboard-config/rules/xkb.dtd b/xorg-server/xkeyboard-config/rules/xkb.dtd
index 4452712fd..0afa0df12 100644
--- a/xorg-server/xkeyboard-config/rules/xkb.dtd
+++ b/xorg-server/xkeyboard-config/rules/xkb.dtd
@@ -10,7 +10,7 @@
 <!ELEMENT xkbConfigRegistry (modelList,layoutList,optionList)>
 
 <!ATTLIST xkbConfigRegistry 
-          version CDATA "1.0">
+          version CDATA "1.1">
 
 <!ELEMENT modelList (model*)>
 
@@ -40,12 +40,8 @@
 <!ELEMENT name (#PCDATA)>
 
 <!ELEMENT shortDescription (#PCDATA)>
-<!ATTLIST shortDescription
-          xml:lang CDATA #IMPLIED>
 
 <!ELEMENT description (#PCDATA)>
-<!ATTLIST description
-          xml:lang CDATA #IMPLIED>
 
 <!ELEMENT vendor (#PCDATA)>
 
diff --git a/xorg-server/xkeyboard-config/rules/xml2lst.pl b/xorg-server/xkeyboard-config/rules/xml2lst.pl
index 478fce89c..0c6540d1e 100644
--- a/xorg-server/xkeyboard-config/rules/xml2lst.pl
+++ b/xorg-server/xkeyboard-config/rules/xml2lst.pl
@@ -4,16 +4,10 @@
 #
 # Usage:
 #
-# perl xml2lst.pl [lang] < filename.xml > filename.lst
+# perl xml2lst.pl < filename.xml > filename.lst
 #
 # author Ivan Pascal
 
-if (@ARGV) {
-   $lang = shift @ARGV;
-} else {
-   $lang = '';
-}
-
 $doc = new_document( 0, '');
 parse('', $doc);
 
@@ -25,22 +19,14 @@ parse('', $doc);
 print "! model\n";
 for $i (@models) {
    ($name) = node_by_name($i, 'name');
-    @desc =  node_by_name($i, 'description');
-    $descr = with_attribute(\@desc, 'xml:lang='.$lang);
-    if (! defined $descr) {
-        $descr = with_attribute(\@desc, 'xml:lang=');
-    }
+   ($descr) = node_by_name($i, 'description');
     printf("  %-15s %s\n", text_child($name), text_child($descr));
 }
 
 print "\n! layout\n";
 for $i (@layouts) {
    ($name) = node_by_name($i, 'name');
-    @desc =  node_by_name($i, 'description');
-    $descr = with_attribute(\@desc, 'xml:lang='.$lang);
-    if (! defined $descr ) {
-        $descr = with_attribute(\@desc, 'xml:lang=');
-    }
+   ($descr) = node_by_name($i, 'description');
     printf("  %-15s %s\n", text_child($name), text_child($descr));
 }
 
@@ -50,11 +36,7 @@ for $l (@layouts) {
     @variants = node_by_name($l, '../variantList/variant/configItem');
     for $v (@variants) {
       ($name) = node_by_name($v, 'name');
-       @desc  = node_by_name($v, 'description');
-       $descr = with_attribute(\@desc, 'xml:lang='.$lang);
-       if (! defined $descr) {
-           $descr = with_attribute(\@desc, 'xml:lang=');
-       }
+      ($descr) = node_by_name($v, 'description');
        printf("  %-15s %s: %s\n",
                text_child($name), text_child($lname), text_child($descr));
     }
@@ -63,21 +45,13 @@ for $l (@layouts) {
 print "\n! option\n";
 for $g (@options) {
    ($name) = node_by_name($g, 'name');
-    @desc =  node_by_name($g, 'description');
-    $descr = with_attribute(\@desc, 'xml:lang='.$lang);
-    if (! defined $descr) {
-        $descr = with_attribute(\@desc, 'xml:lang=');
-    }
+   ($descr) = node_by_name($g, 'description');
     printf("  %-20s %s\n", text_child($name), text_child($descr));
 
     @opts = node_by_name($g, '../option/configItem');
     for $o (@opts) {
       ($name) = node_by_name($o, 'name');
-       @desc  = node_by_name($o, 'description');
-       $descr = with_attribute(\@desc, 'xml:lang='.$lang);
-       if (! defined $descr) {
-           $descr = with_attribute(\@desc, 'xml:lang=');
-       }
+      ($descr) = node_by_name($o, 'description');
        printf("  %-20s %s\n",
                text_child($name), text_child($descr));
     }
diff --git a/xorg-server/xkeyboard-config/xslt/reg2ll.xsl b/xorg-server/xkeyboard-config/xslt/reg2ll.xsl
index 5cb4c8bec..598eb0fca 100644
--- a/xorg-server/xkeyboard-config/xslt/reg2ll.xsl
+++ b/xorg-server/xkeyboard-config/xslt/reg2ll.xsl
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xsl:stylesheet version="1.0" 

-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"

-  >

-<xsl:output method="text"

-            encoding="UTF-8"

-            doctype-system="xkb.dtd"

-            indent="no"/>

-

-<xsl:template match="modelList|optionList|name|description|shortDescription|configItem"/>

-<xsl:strip-space elements="*"/>

-

-<xsl:template match="layoutList"><xsl:apply-templates select="./layout"/></xsl:template>

-

-<xsl:template match="variantList"><xsl:apply-templates select="./variant"/></xsl:template>

-

-<xsl:template match="layout"><xsl:text>

-</xsl:text><xsl:value-of select="./configItem/name"/>:"<xsl:value-of select="./configItem/description"/>"<xsl:apply-templates match="./variantList/variant"/></xsl:template>

-  

-<xsl:template match="variant"><xsl:text>

-</xsl:text><xsl:value-of select="../../configItem/name"/>(<xsl:value-of select="./configItem/name"/>):"<xsl:value-of select="../../configItem/description"/> - <xsl:value-of select="./configItem/description"/>"</xsl:template>

-

-</xsl:stylesheet>

+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  >
+<xsl:output method="text"
+            encoding="UTF-8"
+            doctype-system="xkb.dtd"
+            indent="no"/>
+
+<xsl:template match="modelList|optionList|name|description|shortDescription|configItem"/>
+<xsl:strip-space elements="*"/>
+
+<xsl:template match="layoutList"><xsl:apply-templates select="./layout"/></xsl:template>
+
+<xsl:template match="variantList"><xsl:apply-templates select="./variant"/></xsl:template>
+
+<xsl:template match="layout"><xsl:text>
+</xsl:text><xsl:value-of select="./configItem/name"/>:"<xsl:value-of select="./configItem/description"/>"<xsl:apply-templates match="./variantList/variant"/></xsl:template>
+  
+<xsl:template match="variant"><xsl:text>
+</xsl:text><xsl:value-of select="../../configItem/name"/>(<xsl:value-of select="./configItem/name"/>):"<xsl:value-of select="./configItem/description"/>"</xsl:template>
+
+</xsl:stylesheet>