Updated to mesalib 7.9

307 files changed, 26703 insertions, 74063 deletions

diff --git a/mesalib/src/mesa/Makefile b/mesalib/src/mesa/Makefile
index 8c0ebf84c..c41c38cba 100644
--- a/mesalib/src/mesa/Makefile
+++ b/mesalib/src/mesa/Makefile
@@ -3,27 +3,98 @@
 TOP = ../..
 include $(TOP)/configs/current
 
+MESA_LIBS := libmesa.a libmesagallium.a
+DEPENDS := depend
+
+ifeq ($(GLES_OVERLAY),1)
+ES1_LIBS := libes1gallium.a
+ES2_LIBS := libes2gallium.a
+DEPENDS += depend.es1 depend.es2
+endif
+
+MESA_OBJ_DIR := .
+ES1_OBJ_DIR := objs-es1
+ES2_OBJ_DIR := objs-es2
+
+
 include sources.mak
 
-.SUFFIXES : .cpp
+# adjust object dirs
+ES1_OBJECTS := $(addprefix $(ES1_OBJ_DIR)/, $(MESA_OBJECTS))
+ES2_OBJECTS := $(addprefix $(ES2_OBJ_DIR)/, $(MESA_OBJECTS))
+MESA_OBJECTS := $(addprefix $(MESA_OBJ_DIR)/, $(MESA_OBJECTS))
+
+ES1_GALLIUM_OBJECTS := $(addprefix $(ES1_OBJ_DIR)/, $(MESA_GALLIUM_OBJECTS))
+ES2_GALLIUM_OBJECTS := $(addprefix $(ES2_OBJ_DIR)/, $(MESA_GALLIUM_OBJECTS))
+MESA_GALLIUM_OBJECTS := $(addprefix $(MESA_OBJ_DIR)/, $(MESA_GALLIUM_OBJECTS))
+
+# define preprocessor flags
+MESA_CPPFLAGS := $(API_DEFINES) $(DEFINES)
+ES1_CPPFLAGS := -DFEATURE_ES1=1 $(DEFINES)
+ES2_CPPFLAGS := -DFEATURE_ES2=1 $(DEFINES)
+
+# append include dirs
+MESA_CPPFLAGS += $(INCLUDE_DIRS)
+ES1_CPPFLAGS += -I$(TOP)/src/mapi/es1api $(INCLUDE_DIRS)
+ES2_CPPFLAGS += -I$(TOP)/src/mapi/es2api $(INCLUDE_DIRS)
+
+# tidy compiler flags
+CFLAGS := $(filter-out $(DEFINES), $(CFLAGS))
+CXXFLAGS := $(filter-out $(DEFINES), $(CXXFLAGS))
+
+# LLVM is needed for the state tracker
+MESA_CFLAGS := $(LLVM_CFLAGS)
+ES1_CFLAGS := $(LLVM_CFLAGS)
+ES2_CFLAGS := $(LLVM_CFLAGS)
 
-.c.o:
-	$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
+define mesa-cc-c
+	@mkdir -p $(dir $@)
+	$(CC) -c -o $@ $< $($(1)_CPPFLAGS) $($(1)_CFLAGS) $(CFLAGS)
+endef
 
-.cpp.o:
-	$(CXX) -c $(INCLUDE_DIRS) $(CXXFLAGS) $< -o $@
+define mesa-cxx-c
+	@mkdir -p $(dir $@)
+	$(CXX) -c -o $@ $< $($(1)_CPPFLAGS) $($(1)_CFLAGS) $(CXXFLAGS)
+endef
 
-.S.o:
-	$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
+$(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)
+
+$(ES1_OBJ_DIR)/%.o: %.c
+	$(call mesa-cc-c,ES1)
+
+$(ES1_OBJ_DIR)/%.o: %.cpp
+	$(call mesa-cxx-c,ES1)
+
+$(ES1_OBJ_DIR)/%.o: %.S
+	$(call mesa-cc-c,ES1)
+
+$(ES2_OBJ_DIR)/%.o: %.c
+	$(call mesa-cc-c,ES2)
+
+$(ES2_OBJ_DIR)/%.o: %.cpp
+	$(call mesa-cxx-c,ES2)
+
+$(ES2_OBJ_DIR)/%.o: %.S
+	$(call mesa-cc-c,ES2)
 
 
 # Default: build dependencies, then asm_subdirs, GLSL built-in lib,
 # then convenience libs (.a) and finally the device drivers:
-default: depend asm_subdirs glsl_builtin libmesa.a libmesagallium.a \
-	libglapi.a driver_subdirs
+default: $(DEPENDS) asm_subdirs \
+	$(MESA_LIBS) $(ES1_LIBS) $(ES2_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:
@@ -32,17 +103,25 @@ default: depend asm_subdirs glsl_builtin libmesa.a libmesagallium.a \
 libmesa.a: $(MESA_OBJECTS) $(GLSL_LIBS)
 	@ $(MKLIB) -o mesa -static $(MESA_OBJECTS) $(GLSL_LIBS)
 
+libes1.a: $(ES1_OBJECTS) $(GLSL_LIBS)
+	@$(MKLIB) -o es1 -static $(ES1_OBJECTS) $(GLSL_LIBS)
+
+libes2.a: $(ES2_OBJECTS) $(GLSL_LIBS)
+	@$(MKLIB) -o es2 -static $(ES2_OBJECTS) $(GLSL_LIBS)
+
 # 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)
 
-# Make archive of gl* API dispatcher functions only
-libglapi.a: $(GLAPI_OBJECTS)
-	@ $(MKLIB) -o glapi -static $(GLAPI_OBJECTS)
+libes1gallium.a: $(ES1_GALLIUM_OBJECTS) $(GLSL_LIBS)
+	@$(MKLIB) -o es1gallium -static $(ES1_GALLIUM_OBJECTS) $(GLSL_LIBS)
+
+libes2gallium.a: $(ES2_GALLIUM_OBJECTS) $(GLSL_LIBS)
+	@$(MKLIB) -o es2gallium -static $(ES2_GALLIUM_OBJECTS) $(GLSL_LIBS)
 
 ######################################################################
 # Device drivers
-driver_subdirs: libmesa.a libglapi.a libmesagallium.a
+driver_subdirs: $(MESA_LIBS)
 	@ (cd drivers && $(MAKE))
 
 
@@ -59,20 +138,25 @@ asm_subdirs:
 
 
 ######################################################################
-# GLSL built-in library
-glsl_builtin:
-	(cd shader/slang/library && $(MAKE)) || exit 1 ;
-
-
-######################################################################
 # Dependency generation
 
 depend: $(ALL_SOURCES)
 	@ echo "running $(MKDEP)"
 	@ touch depend
-	@$(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) $(ALL_SOURCES) \
-		> /dev/null 2>/dev/null
+	@$(MKDEP) $(MKDEP_OPTIONS) -p$(MESA_OBJ_DIR)/ $(MESA_CPPFLAGS) \
+		$(ALL_SOURCES) > /dev/null 2>/dev/null
+
+depend.es1: $(ALL_SOURCES)
+	@echo "running $(MKDEP) for ES1"
+	@touch $@
+	@$(MKDEP) $(MKDEP_OPTIONS) -f$@ -p$(ES1_OBJ_DIR)/ $(ES1_CPPFLAGS) \
+		$(ALL_SOURCES) > /dev/null 2>/dev/null
 
+depend.es2: $(ALL_SOURCES)
+	@echo "running $(MKDEP) for ES2"
+	@touch $@
+	@$(MKDEP) $(MKDEP_OPTIONS) -f$@ -p$(ES2_OBJ_DIR)/ $(ES2_CPPFLAGS) \
+		$(ALL_SOURCES) > /dev/null 2>/dev/null
 
 ######################################################################
 # Installation rules
@@ -96,12 +180,15 @@ install: default
 	  esac ; \
 	done
 
-
-gl_pcedit = sed \
+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),' \
@@ -111,10 +198,7 @@ gl.pc: gl.pc.in
 	$(gl_pcedit) $< > $@
 
 osmesa_pcedit = sed \
-	-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),' \
+	$(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),'
@@ -150,14 +234,22 @@ install-dri: default
 tags:
 	etags `find . -name \*.[ch]` $(TOP)/include/GL/*.h
 
+clean-es1:
+	-rm -f $(ES1_LIBS)
+	-rm -rf $(ES1_OBJ_DIR)
+	-rm -f depend.es1 depend.es1.bak
+
+clean-es2:
+	-rm -f $(ES2_LIBS)
+	-rm -rf $(ES2_OBJ_DIR)
+	-rm -f depend.es2 depend.es2.bak
 
-clean:
+clean: clean-es1 clean-es2
 	-rm -f */*.o
 	-rm -f */*/*.o
-	-rm -f depend depend.bak libmesa.a libglapi.a libmesagallium.a
+	-rm -f depend depend.bak libmesa.a libmesagallium.a
 	-rm -f drivers/*/*.o
 	-rm -f *.pc
-	-rm -f shader/slang/library/*_gc.h
 	-@cd drivers/dri && $(MAKE) clean
 	-@cd drivers/x11 && $(MAKE) clean
 	-@cd drivers/osmesa && $(MAKE) clean
@@ -165,4 +257,4 @@ clean:
 	-@cd x86-64 && $(MAKE) clean
 
 
--include depend
+-include $(DEPENDS)
diff --git a/mesalib/src/mesa/Makefile.mgw b/mesalib/src/mesa/Makefile.mgw
index b90384d04..fc0ff28d6 100644
--- a/mesalib/src/mesa/Makefile.mgw
+++ b/mesalib/src/mesa/Makefile.mgw
@@ -216,8 +216,8 @@ clean:
 	-$(call UNLINK,main/*.o)
 	-$(call UNLINK,math/*.o)
 	-$(call UNLINK,vbo/*.o)
-	-$(call UNLINK,shader/*.o)
-	-$(call UNLINK,shader/slang/*.o)
+	-$(call UNLINK,program/*.o)
+	-$(call UNLINK,slang/*.o)
 	-$(call UNLINK,sparc/*.o)
 	-$(call UNLINK,ppc/*.o)
 	-$(call UNLINK,swrast/*.o)
diff --git a/mesalib/src/mesa/drivers/common/driverfuncs.c b/mesalib/src/mesa/drivers/common/driverfuncs.c
index ebfaa2f07..f92cdc5a7 100644
--- a/mesalib/src/mesa/drivers/common/driverfuncs.c
+++ b/mesalib/src/mesa/drivers/common/driverfuncs.c
@@ -31,25 +31,20 @@
 #include "main/mipmap.h"
 #include "main/queryobj.h"
 #include "main/renderbuffer.h"
+#include "main/shaderobj.h"
 #include "main/texcompress.h"
 #include "main/texformat.h"
 #include "main/texgetimage.h"
 #include "main/teximage.h"
 #include "main/texobj.h"
 #include "main/texstore.h"
-#if FEATURE_ARB_vertex_buffer_object
 #include "main/bufferobj.h"
-#endif
-#if FEATURE_EXT_framebuffer_object
 #include "main/fbobject.h"
 #include "main/texrender.h"
-#endif
-#if FEATURE_ARB_sync
 #include "main/syncobj.h"
-#endif
+#include "main/transformfeedback.h"
 
-#include "shader/program.h"
-#include "shader/shader_api.h"
+#include "program/program.h"
 #include "tnl/tnl.h"
 #include "swrast/swrast.h"
 
@@ -178,41 +173,31 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
    driver->TexParameter = NULL;
    driver->Viewport = NULL;
 
-   /* state queries */
-   driver->GetBooleanv = NULL;
-   driver->GetDoublev = NULL;
-   driver->GetFloatv = NULL;
-   driver->GetIntegerv = NULL;
-   driver->GetInteger64v = NULL;
-   driver->GetPointerv = NULL;
-   
    /* buffer objects */
    _mesa_init_buffer_object_functions(driver);
 
    /* query objects */
    _mesa_init_query_object_functions(driver);
 
-#if FEATURE_ARB_sync
    _mesa_init_sync_object_functions(driver);
-#endif
 
-#if FEATURE_EXT_framebuffer_object
    driver->NewFramebuffer = _mesa_new_framebuffer;
    driver->NewRenderbuffer = _mesa_new_soft_renderbuffer;
    driver->RenderTexture = _mesa_render_texture;
    driver->FinishRenderTexture = _mesa_finish_render_texture;
    driver->FramebufferRenderbuffer = _mesa_framebuffer_renderbuffer;
-#endif
 
-#if FEATURE_EXT_framebuffer_blit
    driver->BlitFramebuffer = _swrast_BlitFramebuffer;
-#endif
 
    /* APPLE_vertex_array_object */
    driver->NewArrayObject = _mesa_new_array_object;
    driver->DeleteArrayObject = _mesa_delete_array_object;
    driver->BindArrayObject = NULL;
 
+   _mesa_init_shader_object_functions(driver);
+
+   _mesa_init_transform_feedback_functions(driver);
+
    /* T&L stuff */
    driver->NeedValidate = GL_FALSE;
    driver->ValidateTnlModule = NULL;
@@ -232,10 +217,6 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
    driver->EndList = NULL;
    driver->BeginCallList = NULL;
    driver->EndCallList = NULL;
-
-
-   /* XXX temporary here */
-   _mesa_init_glsl_driver_functions(driver);
 }
 
 
diff --git a/mesalib/src/mesa/drivers/common/meta.c b/mesalib/src/mesa/drivers/common/meta.c
index 89ca476f9..a03cb68ec 100644
--- a/mesalib/src/mesa/drivers/common/meta.c
+++ b/mesalib/src/mesa/drivers/common/meta.c
@@ -34,6 +34,7 @@
 #include "main/glheader.h"
 #include "main/mtypes.h"
 #include "main/imports.h"
+#include "main/arbprogram.h"
 #include "main/arrayobj.h"
 #include "main/blend.h"
 #include "main/bufferobj.h"
@@ -51,7 +52,7 @@
 #include "main/polygon.h"
 #include "main/readpix.h"
 #include "main/scissor.h"
-#include "main/shaders.h"
+#include "main/shaderapi.h"
 #include "main/state.h"
 #include "main/stencil.h"
 #include "main/texobj.h"
@@ -61,8 +62,7 @@
 #include "main/texstate.h"
 #include "main/varray.h"
 #include "main/viewport.h"
-#include "shader/program.h"
-#include "shader/arbprogram.h"
+#include "program/program.h"
 #include "swrast/swrast.h"
 #include "drivers/common/meta.h"
 
@@ -430,13 +430,15 @@ _mesa_meta_begin(GLcontext *ctx, GLbitfield state)
    if (state & META_SHADER) {
       if (ctx->Extensions.ARB_vertex_program) {
          save->VertexProgramEnabled = ctx->VertexProgram.Enabled;
-         save->VertexProgram = ctx->VertexProgram.Current;
+         _mesa_reference_vertprog(ctx, &save->VertexProgram,
+				  ctx->VertexProgram.Current);
          _mesa_set_enable(ctx, GL_VERTEX_PROGRAM_ARB, GL_FALSE);
       }
 
       if (ctx->Extensions.ARB_fragment_program) {
          save->FragmentProgramEnabled = ctx->FragmentProgram.Enabled;
-         save->FragmentProgram = ctx->FragmentProgram.Current;
+         _mesa_reference_fragprog(ctx, &save->FragmentProgram,
+				  ctx->FragmentProgram.Current);
          _mesa_set_enable(ctx, GL_FRAGMENT_PROGRAM_ARB, GL_FALSE);
       }
 
@@ -664,6 +666,7 @@ _mesa_meta_end(GLcontext *ctx)
                           save->VertexProgramEnabled);
          _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current, 
                                   save->VertexProgram);
+	 _mesa_reference_vertprog(ctx, &save->VertexProgram, NULL);
       }
 
       if (ctx->Extensions.ARB_fragment_program) {
@@ -671,6 +674,7 @@ _mesa_meta_end(GLcontext *ctx)
                           save->FragmentProgramEnabled);
          _mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current,
                                   save->FragmentProgram);
+	 _mesa_reference_fragprog(ctx, &save->FragmentProgram, NULL);
       }
 
       if (ctx->Extensions.ARB_shader_objects) {
@@ -721,6 +725,7 @@ _mesa_meta_end(GLcontext *ctx)
       for (tgt = 0; tgt < NUM_TEXTURE_TARGETS; tgt++) {
          _mesa_reference_texobj(&ctx->Texture.Unit[0].CurrentTex[tgt],
                                 save->CurrentTexture[tgt]);
+         _mesa_reference_texobj(&save->CurrentTexture[tgt], NULL);
       }
 
       /* Re-enable textures, texgen */
@@ -2082,8 +2087,10 @@ _mesa_meta_Bitmap(GLcontext *ctx,
    }
 
    bitmap1 = _mesa_map_pbo_source(ctx, &unpackSave, bitmap1);
-   if (!bitmap1)
+   if (!bitmap1) {
+      _mesa_meta_end(ctx);
       return;
+   }
 
    bitmap8 = (GLubyte *) calloc(1, width * height);
    if (bitmap8) {
@@ -2393,6 +2400,9 @@ _mesa_meta_GenerateMipmap(GLcontext *ctx, GLenum target,
          break;
       }
 
+      /* Set MaxLevel large enough to hold the new level when we allocate it  */
+      _mesa_TexParameteri(target, GL_TEXTURE_MAX_LEVEL, dstLevel);
+
       /* Create empty dest image */
       if (target == GL_TEXTURE_1D) {
          _mesa_TexImage1D(target, dstLevel, srcImage->InternalFormat,
@@ -2560,12 +2570,6 @@ copy_tex_image(GLcontext *ctx, GLuint dims, GLenum target, GLint level,
       return;
    }
 
-   if (texImage->TexFormat == MESA_FORMAT_NONE)
-      texImage->TexFormat = ctx->Driver.ChooseTextureFormat(ctx,
-                                                            internalFormat,
-                                                            format,
-                                                            type);
-
    _mesa_unlock_texture(ctx, texObj); /* need to unlock first */
 
    /*
@@ -2579,12 +2583,10 @@ copy_tex_image(GLcontext *ctx, GLuint dims, GLenum target, GLint level,
    /*
     * Prepare for new texture image size/data
     */
-#if FEATURE_convolve
    if (_mesa_is_color_format(internalFormat)) {
       _mesa_adjust_image_for_convolution(ctx, 2,
                                          &postConvWidth, &postConvHeight);
    }
-#endif
 
    if (texImage->Data) {
       ctx->Driver.FreeTexImageData(ctx, texImage);
@@ -2594,6 +2596,9 @@ copy_tex_image(GLcontext *ctx, GLuint dims, GLenum target, GLint level,
                               postConvWidth, postConvHeight, 1,
                               border, internalFormat);
 
+   _mesa_choose_texture_format(ctx, texObj, texImage, target, level,
+                               internalFormat, GL_NONE, GL_NONE);
+
    /*
     * Store texture data (with pixel transfer ops)
     */
diff --git a/mesalib/src/mesa/drivers/dri/Makefile.template b/mesalib/src/mesa/drivers/dri/Makefile.template
index a0c25d26c..a00018caf 100644
--- a/mesalib/src/mesa/drivers/dri/Makefile.template
+++ b/mesalib/src/mesa/drivers/dri/Makefile.template
@@ -17,6 +17,7 @@ COMMON_SOURCES = $(COMMON_GALLIUM_SOURCES) \
 INCLUDES = $(SHARED_INCLUDES) $(EXPAT_INCLUDES)
 
 OBJECTS = $(C_SOURCES:.c=.o) \
+	  $(CXX_SOURCES:.cpp=.o) \
 	  $(ASM_SOURCES:.S=.o) 
 
 
@@ -26,17 +27,23 @@ SHARED_INCLUDES = \
 	-I$(TOP)/src/mesa/drivers/dri/common \
 	-Iserver \
 	-I$(TOP)/include \
+	-I$(TOP)/src/mapi \
 	-I$(TOP)/src/mesa \
 	-I$(TOP)/src/egl/main \
 	-I$(TOP)/src/egl/drivers/dri \
 	$(LIBDRM_CFLAGS)
 
+CFLAGS += $(API_DEFINES)
+CXXFLAGS += $(API_DEFINES)
 
 ##### RULES #####
 
 .c.o:
 	$(CC) -c $(INCLUDES) $(CFLAGS) $(DRIVER_DEFINES) $< -o $@
 
+.cpp.o:
+	$(CC) -c $(INCLUDES) $(CXXFLAGS) $(DRIVER_DEFINES) $< -o $@
+
 .S.o:
 	$(CC) -c $(INCLUDES) $(CFLAGS) $(DRIVER_DEFINES) $< -o $@
 
@@ -51,9 +58,12 @@ lib: symlinks subdirs depend
 	@$(MAKE) $(LIBNAME) $(TOP)/$(LIB_DIR)/$(LIBNAME)
 
 $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) Makefile \
-		$(TOP)/src/mesa/drivers/dri/Makefile.template
-	$(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
+		$(TOP)/src/mesa/drivers/dri/Makefile.template $(TOP)/src/mesa/drivers/dri/common/dri_test.o
+	$(MKLIB) -o $@.tmp -noprefix -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
 		$(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(DRI_LIB_DEPS)
+	$(CXX) $(CFLAGS) -o $@.test $(TOP)/src/mesa/drivers/dri/common/dri_test.o $@.tmp $(DRI_LIB_DEPS)
+	@rm -f $@.test
+	mv -f $@.tmp $@
 
 
 $(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)
diff --git a/mesalib/src/mesa/drivers/dri/common/dri_metaops.c b/mesalib/src/mesa/drivers/dri/common/dri_metaops.c
index dfb7d6404..a2f404b61 100644
--- a/mesalib/src/mesa/drivers/dri/common/dri_metaops.c
+++ b/mesalib/src/mesa/drivers/dri/common/dri_metaops.c
@@ -26,15 +26,16 @@
  *
  **************************************************************************/
 
+#include "main/arbprogram.h"
 #include "main/arrayobj.h"
 #include "main/bufferobj.h"
+#include "main/context.h"
 #include "main/enable.h"
 #include "main/matrix.h"
 #include "main/texstate.h"
 #include "main/varray.h"
 #include "main/viewport.h"
-#include "shader/arbprogram.h"
-#include "shader/program.h"
+#include "program/program.h"
 #include "dri_metaops.h"
 
 void
diff --git a/mesalib/src/mesa/drivers/dri/common/dri_test.c b/mesalib/src/mesa/drivers/dri/common/dri_test.c
new file mode 100644
index 000000000..793f0c37d
--- /dev/null
+++ b/mesalib/src/mesa/drivers/dri/common/dri_test.c
@@ -0,0 +1,89 @@
+#include "main/glheader.h"
+#include "main/compiler.h"
+#include "glapi/glapi.h"
+
+/* This is just supposed to make sure we get a reference to
+   the driver entry symbol that the compiler doesn't optimize away */
+
+extern char __driDriverExtensions[];
+
+/* provide glapi symbols */
+
+#if defined(GLX_USE_TLS)
+
+PUBLIC __thread struct _glapi_table * _glapi_tls_Dispatch
+    __attribute__((tls_model("initial-exec")));
+
+PUBLIC __thread void * _glapi_tls_Context
+    __attribute__((tls_model("initial-exec")));
+
+PUBLIC const struct _glapi_table *_glapi_Dispatch;
+PUBLIC const void *_glapi_Context;
+
+#else
+
+PUBLIC struct _glapi_table *_glapi_Dispatch;
+PUBLIC void *_glapi_Context;
+
+#endif
+
+PUBLIC void
+_glapi_check_multithread(void)
+{}
+
+PUBLIC void
+_glapi_set_context(void *context)
+{}
+
+PUBLIC void *
+_glapi_get_context(void)
+{
+	return 0;
+}
+
+PUBLIC void
+_glapi_set_dispatch(struct _glapi_table *dispatch)
+{}
+
+PUBLIC struct _glapi_table *
+_glapi_get_dispatch(void)
+{
+	return 0;
+}
+
+PUBLIC int
+_glapi_add_dispatch( const char * const * function_names,
+		     const char * parameter_signature )
+{
+	return 0;
+}
+
+PUBLIC GLint
+_glapi_get_proc_offset(const char *funcName)
+{
+	return 0;
+}
+
+PUBLIC _glapi_proc
+_glapi_get_proc_address(const char *funcName)
+{
+	return 0;
+}
+
+PUBLIC GLuint
+_glapi_get_dispatch_table_size(void)
+{
+	return 0;
+}
+
+PUBLIC unsigned long
+_glthread_GetID(void)
+{
+   return 0;
+}
+
+int main(int argc, char** argv)
+{
+   void* p = __driDriverExtensions;
+   return (int)(unsigned long)p;
+}
diff --git a/mesalib/src/mesa/drivers/dri/common/dri_util.c b/mesalib/src/mesa/drivers/dri/common/dri_util.c
index 75c98825b..d46f622d5 100644
--- a/mesalib/src/mesa/drivers/dri/common/dri_util.c
+++ b/mesalib/src/mesa/drivers/dri/common/dri_util.c
@@ -31,6 +31,17 @@
 #include "dri_util.h"
 #include "drm_sarea.h"
 #include "utils.h"
+#include "xmlpool.h"
+#include "../glsl/glsl_parser_extras.h"
+
+PUBLIC const char __dri2ConfigOptions[] =
+   DRI_CONF_BEGIN
+      DRI_CONF_SECTION_PERFORMANCE
+         DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_DEF_INTERVAL_1)
+      DRI_CONF_SECTION_END
+   DRI_CONF_END;
+
+static const uint __dri2NConfigOptions = 1;
 
 #ifndef GLX_OML_sync_control
 typedef GLboolean ( * PFNGLXGETMSCRATEOMLPROC) (__DRIdrawable *drawable, int32_t *numerator, int32_t *denominator);
@@ -47,28 +58,6 @@ const __DRIextension driReadDrawableExtension = {
     __DRI_READ_DRAWABLE, __DRI_READ_DRAWABLE_VERSION
 };
 
-/**
- * Print message to \c stderr if the \c LIBGL_DEBUG environment variable
- * is set. 
- * 
- * Is called from the drivers.
- * 
- * \param f \c printf like format string.
- */
-void
-__driUtilMessage(const char *f, ...)
-{
-    va_list args;
-
-    if (getenv("LIBGL_DEBUG")) {
-        fprintf(stderr, "libGL: ");
-        va_start(args, f);
-        vfprintf(stderr, f, args);
-        va_end(args);
-        fprintf(stderr, "\n");
-    }
-}
-
 GLint
 driIntersectArea( drm_clip_rect_t rect1, drm_clip_rect_t rect2 )
 {
@@ -151,11 +140,6 @@ static int driUnbindContext(__DRIcontext *pcp)
      */
     pcp->driDrawablePriv = pcp->driReadablePriv = NULL;
 
-#if 0
-    /* Unbind the drawable */
-    pdp->driContextPriv = &psp->dummyContextPriv;
-#endif
-
     return GL_TRUE;
 }
 
@@ -170,19 +154,24 @@ static int driBindContext(__DRIcontext *pcp,
 {
     __DRIscreen *psp = NULL;
 
-    /* Bind the drawable to the context */
+    /*
+    ** Assume error checking is done properly in glXMakeCurrent before
+    ** calling driUnbindContext.
+    */
 
-    if (pcp) {
-	psp = pcp->driScreenPriv;
-	pcp->driDrawablePriv = pdp;
-	pcp->driReadablePriv = prp;
-	if (pdp) {
-	    pdp->driContextPriv = pcp;
-    	    dri_get_drawable(pdp);
-	}
-	if ( prp && pdp != prp ) {
-    	    dri_get_drawable(prp);
-	}
+    if (!pcp)
+	return GL_FALSE;
+
+    /* Bind the drawable to the context */
+    psp = pcp->driScreenPriv;
+    pcp->driDrawablePriv = pdp;
+    pcp->driReadablePriv = prp;
+    if (pdp) {
+	pdp->driContextPriv = pcp;
+	dri_get_drawable(pdp);
+    }
+    if (prp && pdp != prp) {
+	dri_get_drawable(prp);
     }
 
     /*
@@ -190,7 +179,6 @@ static int driBindContext(__DRIcontext *pcp,
     ** initialize the drawable information if has not been done before.
     */
 
-    assert(psp);
     if (!psp->dri2.enabled) {
 	if (pdp && !pdp->pStamp) {
 	    DRM_SPINLOCK(&psp->pSAREA->drawable_lock, psp->drawLockID);
@@ -205,7 +193,6 @@ static int driBindContext(__DRIcontext *pcp,
     }
 
     /* Call device-specific MakeCurrent */
-
     return (*psp->DriverAPI.MakeCurrent)(pcp, pdp, prp);
 }
 
@@ -437,6 +424,7 @@ driCreateNewDrawable(__DRIscreen *psp, const __DRIconfig *config,
 	return NULL;
     }
 
+    pdp->driContextPriv = NULL;
     pdp->loaderPrivate = data;
     pdp->hHWDrawable = hwDrawable;
     pdp->refcount = 1;
@@ -455,7 +443,6 @@ driCreateNewDrawable(__DRIscreen *psp, const __DRIconfig *config,
     pdp->vblFlags = 0;
 
     pdp->driScreenPriv = psp;
-    pdp->driContextPriv = &psp->dummyContextPriv;
 
     if (!(*psp->DriverAPI.CreateBuffer)(psp, pdp, &config->modes,
 					renderType == GLX_PIXMAP_BIT)) {
@@ -495,6 +482,41 @@ dri2CreateNewDrawable(__DRIscreen *screen,
     return pdraw;
 }
 
+static int
+dri2ConfigQueryb(__DRIscreen *screen, const char *var, GLboolean *val)
+{
+   if (!driCheckOption(&screen->optionCache, var, DRI_BOOL))
+      return -1;
+
+   *val = driQueryOptionb(&screen->optionCache, var);
+
+   return 0;
+}
+
+static int
+dri2ConfigQueryi(__DRIscreen *screen, const char *var, GLint *val)
+{
+   if (!driCheckOption(&screen->optionCache, var, DRI_INT) &&
+       !driCheckOption(&screen->optionCache, var, DRI_ENUM))
+      return -1;
+
+    *val = driQueryOptioni(&screen->optionCache, var);
+
+    return 0;
+}
+
+static int
+dri2ConfigQueryf(__DRIscreen *screen, const char *var, GLfloat *val)
+{
+   if (!driCheckOption(&screen->optionCache, var, DRI_FLOAT))
+      return -1;
+
+    *val = driQueryOptionf(&screen->optionCache, var);
+
+    return 0;
+}
+
+
 static void dri_get_drawable(__DRIdrawable *pdp)
 {
     pdp->refcount++;
@@ -589,21 +611,11 @@ driCreateNewContext(__DRIscreen *psp, const __DRIconfig *config,
     
     pcp->dri2.draw_stamp = 0;
     pcp->dri2.read_stamp = 0;
-    /* When the first context is created for a screen, initialize a "dummy"
-     * context.
-     */
-
-    if (!psp->dri2.enabled && !psp->dummyContextPriv.driScreenPriv) {
-        psp->dummyContextPriv.hHWContext = psp->pSAREA->dummy_context;
-        psp->dummyContextPriv.driScreenPriv = psp;
-        psp->dummyContextPriv.driDrawablePriv = NULL;
-        psp->dummyContextPriv.driverPrivate = NULL;
-	/* No other fields should be used! */
-    }
 
     pcp->hHWContext = hwContext;
 
-    if ( !(*psp->DriverAPI.CreateContext)(&config->modes, pcp, shareCtx) ) {
+    if ( !(*psp->DriverAPI.CreateContext)(API_OPENGL,
+					  &config->modes, pcp, shareCtx) ) {
         free(pcp);
         return NULL;
     }
@@ -611,15 +623,65 @@ driCreateNewContext(__DRIscreen *psp, const __DRIconfig *config,
     return pcp;
 }
 
+static unsigned int
+dri2GetAPIMask(__DRIscreen *screen)
+{
+    return screen->api_mask;
+}
+
+static __DRIcontext *
+dri2CreateNewContextForAPI(__DRIscreen *screen, int api,
+			   const __DRIconfig *config,
+			   __DRIcontext *shared, void *data)
+{
+    __DRIcontext *context;
+    const __GLcontextModes *modes = (config != NULL) ? &config->modes : NULL;
+    void *shareCtx = (shared != NULL) ? shared->driverPrivate : NULL;
+    gl_api mesa_api;
+
+    if (!(screen->api_mask & (1 << api)))
+	return NULL;
+
+    switch (api) {
+    case __DRI_API_OPENGL:
+	    mesa_api = API_OPENGL;
+	    break;
+    case __DRI_API_GLES:
+	    mesa_api = API_OPENGLES;
+	    break;
+    case __DRI_API_GLES2:
+	    mesa_api = API_OPENGLES2;
+	    break;
+    default:
+	    return NULL;
+    }
+
+    context = malloc(sizeof *context);
+    if (!context)
+	return NULL;
+
+    context->driScreenPriv = screen;
+    context->driDrawablePriv = NULL;
+    context->loaderPrivate = data;
+    
+    if (!(*screen->DriverAPI.CreateContext)(mesa_api, modes,
+					    context, shareCtx) ) {
+        free(context);
+        return NULL;
+    }
+
+    return context;
+}
+
 
 static __DRIcontext *
 dri2CreateNewContext(__DRIscreen *screen, const __DRIconfig *config,
 		      __DRIcontext *shared, void *data)
 {
-    return driCreateNewContext(screen, config, 0, shared, 0, data);
+   return dri2CreateNewContextForAPI(screen, __DRI_API_OPENGL,
+				     config, shared, data);
 }
 
-
 static int
 driCopyContext(__DRIcontext *dest, __DRIcontext *src, unsigned long mask)
 {
@@ -649,6 +711,8 @@ static void driDestroyScreen(__DRIscreen *psp)
 	 * stream open to the X-server anymore.
 	 */
 
+       _mesa_destroy_shader_compiler();
+
 	if (psp->DriverAPI.DestroyScreen)
 	    (*psp->DriverAPI.DestroyScreen)(psp);
 
@@ -656,6 +720,9 @@ static void driDestroyScreen(__DRIscreen *psp)
 	   (void)drmUnmap((drmAddress)psp->pSAREA, SAREA_MAX);
 	   (void)drmUnmap((drmAddress)psp->pFB, psp->fbSize);
 	   (void)drmCloseOnce(psp->fd);
+	} else {
+	   driDestroyOptionCache(&psp->optionCache);
+	   driDestroyOptionInfo(&psp->optionInfo);
 	}
 
 	free(psp);
@@ -679,6 +746,8 @@ setupLoaderExtensions(__DRIscreen *psp,
 	    psp->dri2.loader = (__DRIdri2LoaderExtension *) extensions[i];
 	if (strcmp(extensions[i]->name, __DRI_IMAGE_LOOKUP) == 0)
 	    psp->dri2.image = (__DRIimageLookupExtension *) extensions[i];
+	if (strcmp(extensions[i]->name, __DRI_USE_INVALIDATE) == 0)
+	    psp->dri2.useInvalidate = (__DRIuseInvalidateExtension *) extensions[i];
     }
 }
 
@@ -756,14 +825,8 @@ driCreateNewScreen(int scrn,
     psp->myNum = scrn;
     psp->dri2.enabled = GL_FALSE;
 
-    /*
-    ** Do not init dummy context here; actual initialization will be
-    ** done when the first DRI context is created.  Init screen priv ptr
-    ** to NULL to let CreateContext routine that it needs to be inited.
-    */
-    psp->dummyContextPriv.driScreenPriv = NULL;
-
     psp->DriverAPI = driDriverAPI;
+    psp->api_mask = (1 << __DRI_API_OPENGL);
 
     *driver_modes = driDriverAPI.InitScreen(psp);
     if (*driver_modes == NULL) {
@@ -809,6 +872,7 @@ dri2CreateNewScreen(int scrn, int fd,
     psp->dri2.enabled = GL_TRUE;
 
     psp->DriverAPI = driDriverAPI;
+    psp->api_mask = (1 << __DRI_API_OPENGL);
     *driver_configs = driDriverAPI.InitScreen2(psp);
     if (*driver_configs == NULL) {
 	free(psp);
@@ -816,6 +880,12 @@ dri2CreateNewScreen(int scrn, int fd,
     }
 
     psp->DriverAPI = driDriverAPI;
+    psp->loaderPrivate = data;
+
+    driParseOptionInfo(&psp->optionInfo, __dri2ConfigOptions,
+		       __dri2NConfigOptions);
+    driParseConfigFiles(&psp->optionCache, &psp->optionInfo, psp->myNum,
+			"dri2");
 
     return psp;
 }
@@ -857,41 +927,15 @@ const __DRIdri2Extension driDRI2Extension = {
     dri2CreateNewScreen,
     dri2CreateNewDrawable,
     dri2CreateNewContext,
+    dri2GetAPIMask,
+    dri2CreateNewContextForAPI
 };
 
-static int
-driFrameTracking(__DRIdrawable *drawable, GLboolean enable)
-{
-    return GLX_BAD_CONTEXT;
-}
-
-static int
-driQueryFrameTracking(__DRIdrawable *dpriv,
-		      int64_t * sbc, int64_t * missedFrames,
-		      float * lastMissedUsage, float * usage)
-{
-   __DRIswapInfo   sInfo;
-   int             status;
-   int64_t         ust;
-   __DRIscreen *psp = dpriv->driScreenPriv;
-
-   status = dpriv->driScreenPriv->DriverAPI.GetSwapInfo( dpriv, & sInfo );
-   if ( status == 0 ) {
-      *sbc = sInfo.swap_count;
-      *missedFrames = sInfo.swap_missed_count;
-      *lastMissedUsage = sInfo.swap_missed_usage;
-
-      (*psp->systemTime->getUST)( & ust );
-      *usage = driCalculateSwapUsage( dpriv, sInfo.swap_ust, ust );
-   }
-
-   return status;
-}
-
-const __DRIframeTrackingExtension driFrameTrackingExtension = {
-    { __DRI_FRAME_TRACKING, __DRI_FRAME_TRACKING_VERSION },
-    driFrameTracking,
-    driQueryFrameTracking    
+const __DRI2configQueryExtension dri2ConfigQueryExtension = {
+   { __DRI2_CONFIG_QUERY, __DRI2_CONFIG_QUERY_VERSION },
+   dri2ConfigQueryb,
+   dri2ConfigQueryi,
+   dri2ConfigQueryf,
 };
 
 /**
diff --git a/mesalib/src/mesa/drivers/dri/common/dri_util.h b/mesalib/src/mesa/drivers/dri/common/dri_util.h
index 99c0f1e44..785beacd8 100644
--- a/mesalib/src/mesa/drivers/dri/common/dri_util.h
+++ b/mesalib/src/mesa/drivers/dri/common/dri_util.h
@@ -51,7 +51,9 @@
 #include <drm.h>
 #include <drm_sarea.h>
 #include <xf86drm.h>
+#include "xmlconfig.h"
 #include "main/glheader.h"
+#include "main/mtypes.h"
 #include "GL/internal/glcore.h"
 #include "GL/internal/dri_interface.h"
 
@@ -68,8 +70,8 @@ extern const __DRIdri2Extension driDRI2Extension;
 extern const __DRIextension driReadDrawableExtension;
 extern const __DRIcopySubBufferExtension driCopySubBufferExtension;
 extern const __DRIswapControlExtension driSwapControlExtension;
-extern const __DRIframeTrackingExtension driFrameTrackingExtension;
 extern const __DRImediaStreamCounterExtension driMediaStreamCounterExtension;
+extern const __DRI2configQueryExtension dri2ConfigQueryExtension;
 
 /**
  * Used by DRI_VALIDATE_DRAWABLE_INFO
@@ -146,8 +148,9 @@ struct __DriverAPIRec {
     /**
      * Context creation callback
      */	    	    
-    GLboolean (*CreateContext)(const __GLcontextModes *glVis,
-                               __DRIcontext *driContextPriv,
+    GLboolean (*CreateContext)(gl_api api,
+			       const __GLcontextModes *glVis,
+			       __DRIcontext *driContextPriv,
                                void *sharedContextPrivate);
 
     /**
@@ -399,11 +402,6 @@ struct __DRIcontextRec {
     void *driverPrivate;
 
     /**
-     * Pointer back to the \c __DRIcontext that contains this structure.
-     */
-    __DRIcontext *pctx;
-
-    /**
      * Pointer to drawable currently bound to this context for drawing.
      */
     __DRIdrawable *driDrawablePriv;
@@ -511,28 +509,15 @@ struct __DRIscreenRec {
     /*@}*/
 
     /**
-     * Dummy context to which drawables are bound when not bound to any
-     * other context. 
-     *
-     * A dummy hHWContext is created for this context, and is used by the GL
-     * core when a hardware lock is required but the drawable is not currently
-     * bound (e.g., potentially during a SwapBuffers request).  The dummy
-     * context is created when the first "real" context is created on this
-     * screen.
-     */
-    __DRIcontext dummyContextPriv;
-
-    /**
      * Device-dependent private information (not stored in the SAREA).
      * 
      * This pointer is never touched by the DRI layer.
      */
+#ifdef __cplusplus
+    void *priv;
+#else
     void *private;
-
-    /**
-     * Pointer back to the \c __DRIscreen that contains this structure.
-     */
-    __DRIscreen *psc;
+#endif
 
     /* Extensions provided by the loader. */
     const __DRIgetDrawableInfoExtension *getDrawableInfo;
@@ -545,15 +530,17 @@ struct __DRIscreenRec {
 	int enabled;
 	__DRIdri2LoaderExtension *loader;
 	__DRIimageLookupExtension *image;
+	__DRIuseInvalidateExtension *useInvalidate;
     } dri2;
 
     /* The lock actually in use, old sarea or DRI2 */
     drmLock *lock;
-};
-
-extern void
-__driUtilMessage(const char *f, ...);
 
+    driOptionCache optionInfo;
+    driOptionCache optionCache;
+   unsigned int api_mask;
+   void *loaderPrivate;
+};
 
 extern void
 __driUtilUpdateDrawableInfo(__DRIdrawable *pdp);
diff --git a/mesalib/src/mesa/drivers/dri/common/drisw_util.c b/mesalib/src/mesa/drivers/dri/common/drisw_util.c
new file mode 100644
index 000000000..1529c23b1
--- /dev/null
+++ b/mesalib/src/mesa/drivers/dri/common/drisw_util.c
@@ -0,0 +1,273 @@
+/*
+ * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ * Copyright 2010 George Sapountzis <gsapountzis@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * 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 drisw_util.c
+ *
+ * DRISW utility functions, i.e. dri_util.c stripped from drm-specific bits.
+ */
+
+#include "drisw_util.h"
+#include "utils.h"
+
+
+/**
+ * Screen functions
+ */
+
+static void
+setupLoaderExtensions(__DRIscreen *psp,
+		      const __DRIextension **extensions)
+{
+    int i;
+
+    for (i = 0; extensions[i]; i++) {
+	if (strcmp(extensions[i]->name, __DRI_SWRAST_LOADER) == 0)
+	    psp->swrast_loader = (__DRIswrastLoaderExtension *) extensions[i];
+    }
+}
+
+static __DRIscreen *
+driCreateNewScreen(int scrn, const __DRIextension **extensions,
+		   const __DRIconfig ***driver_configs, void *data)
+{
+    static const __DRIextension *emptyExtensionList[] = { NULL };
+    __DRIscreen *psp;
+
+    (void) data;
+
+    psp = CALLOC_STRUCT(__DRIscreenRec);
+    if (!psp)
+	return NULL;
+
+    setupLoaderExtensions(psp, extensions);
+
+    psp->extensions = emptyExtensionList;
+    psp->fd = -1;
+    psp->myNum = scrn;
+
+    *driver_configs = driDriverAPI.InitScreen(psp);
+
+    if (*driver_configs == NULL) {
+	FREE(psp);
+	return NULL;
+    }
+
+    return psp;
+}
+
+static void driDestroyScreen(__DRIscreen *psp)
+{
+    if (psp) {
+	driDriverAPI.DestroyScreen(psp);
+
+	FREE(psp);
+    }
+}
+
+static const __DRIextension **driGetExtensions(__DRIscreen *psp)
+{
+    return psp->extensions;
+}
+
+
+/**
+ * Context functions
+ */
+
+static __DRIcontext *
+driCreateNewContext(__DRIscreen *psp, const __DRIconfig *config,
+		    __DRIcontext *shared, void *data)
+{
+    __DRIcontext *pcp;
+    void * const shareCtx = (shared != NULL) ? shared->driverPrivate : NULL;
+
+    pcp = CALLOC_STRUCT(__DRIcontextRec);
+    if (!pcp)
+	return NULL;
+
+    pcp->loaderPrivate = data;
+
+    pcp->driScreenPriv = psp;
+    pcp->driDrawablePriv = NULL;
+    pcp->driReadablePriv = NULL;
+
+    if (!driDriverAPI.CreateContext(API_OPENGL,
+			    &config->modes, pcp, shareCtx)) {
+	FREE(pcp);
+	return NULL;
+    }
+
+    return pcp;
+}
+
+static void
+driDestroyContext(__DRIcontext *pcp)
+{
+    if (pcp) {
+	driDriverAPI.DestroyContext(pcp);
+	FREE(pcp);
+    }
+}
+
+static int
+driCopyContext(__DRIcontext *dst, __DRIcontext *src, unsigned long mask)
+{
+    return GL_FALSE;
+}
+
+static void dri_get_drawable(__DRIdrawable *pdp);
+static void dri_put_drawable(__DRIdrawable *pdp);
+
+static int driBindContext(__DRIcontext *pcp,
+			  __DRIdrawable *pdp,
+			  __DRIdrawable *prp)
+{
+    /* Bind the drawable to the context */
+    if (pcp) {
+	pcp->driDrawablePriv = pdp;
+	pcp->driReadablePriv = prp;
+	if (pdp) {
+	    pdp->driContextPriv = pcp;
+	    dri_get_drawable(pdp);
+	}
+	if ( prp && pdp != prp ) {
+	    dri_get_drawable(prp);
+	}
+    }
+
+    return driDriverAPI.MakeCurrent(pcp, pdp, prp);
+}
+
+static int driUnbindContext(__DRIcontext *pcp)
+{
+    __DRIdrawable *pdp;
+    __DRIdrawable *prp;
+
+    if (pcp == NULL)
+	return GL_FALSE;
+
+    pdp = pcp->driDrawablePriv;
+    prp = pcp->driReadablePriv;
+
+    /* already unbound */
+    if (!pdp && !prp)
+	return GL_TRUE;
+
+    driDriverAPI.UnbindContext(pcp);
+
+    dri_put_drawable(pdp);
+
+    if (prp != pdp) {
+	dri_put_drawable(prp);
+    }
+
+    pcp->driDrawablePriv = NULL;
+    pcp->driReadablePriv = NULL;
+
+    return GL_TRUE;
+}
+
+
+/**
+ * Drawable functions
+ */
+
+static void dri_get_drawable(__DRIdrawable *pdp)
+{
+    pdp->refcount++;
+}
+
+static void dri_put_drawable(__DRIdrawable *pdp)
+{
+    if (pdp) {
+	pdp->refcount--;
+	if (pdp->refcount)
+	    return;
+
+	driDriverAPI.DestroyBuffer(pdp);
+
+	FREE(pdp);
+    }
+}
+
+static __DRIdrawable *
+driCreateNewDrawable(__DRIscreen *psp,
+		     const __DRIconfig *config, void *data)
+{
+    __DRIdrawable *pdp;
+
+    pdp = CALLOC_STRUCT(__DRIdrawableRec);
+    if (!pdp)
+	return NULL;
+
+    pdp->loaderPrivate = data;
+
+    pdp->driScreenPriv = psp;
+    pdp->driContextPriv = NULL;
+
+    dri_get_drawable(pdp);
+
+    if (!driDriverAPI.CreateBuffer(psp, pdp, &config->modes, GL_FALSE)) {
+	FREE(pdp);
+	return NULL;
+    }
+
+    pdp->lastStamp = 1; /* const */
+
+    return pdp;
+}
+
+static void
+driDestroyDrawable(__DRIdrawable *pdp)
+{
+    dri_put_drawable(pdp);
+}
+
+static void driSwapBuffers(__DRIdrawable *pdp)
+{
+    driDriverAPI.SwapBuffers(pdp);
+}
+
+const __DRIcoreExtension driCoreExtension = {
+    { __DRI_CORE, __DRI_CORE_VERSION },
+    NULL, /* driCreateNewScreen */
+    driDestroyScreen,
+    driGetExtensions,
+    driGetConfigAttrib,
+    driIndexConfigAttrib,
+    NULL, /* driCreateNewDrawable */
+    driDestroyDrawable,
+    driSwapBuffers,
+    driCreateNewContext,
+    driCopyContext,
+    driDestroyContext,
+    driBindContext,
+    driUnbindContext
+};
+
+const __DRIswrastExtension driSWRastExtension = {
+    { __DRI_SWRAST, __DRI_SWRAST_VERSION },
+    driCreateNewScreen,
+    driCreateNewDrawable
+};
diff --git a/mesalib/src/mesa/drivers/dri/common/drisw_util.h b/mesalib/src/mesa/drivers/dri/common/drisw_util.h
new file mode 100644
index 000000000..9c3d01c99
--- /dev/null
+++ b/mesalib/src/mesa/drivers/dri/common/drisw_util.h
@@ -0,0 +1,135 @@
+/*
+ * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ * Copyright 2010 George Sapountzis <gsapountzis@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * 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
+ * Binding of the DRI interface (dri_interface.h) for DRISW.
+ *
+ * The DRISW structs are 'base classes' of the corresponding DRI1 / DRI2 (DRM)
+ * structs. The bindings for SW and DRM can be unified by making the DRM structs
+ * 'sub-classes' of the SW structs, either proper or with field re-ordering.
+ *
+ * The code can also be unified but that requires cluttering the common code
+ * with ifdef's and guarding with (__DRIscreen::fd >= 0) for DRM.
+ */
+
+#ifndef _DRISW_UTIL_H
+#define _DRISW_UTIL_H
+
+#include "main/mtypes.h"
+
+#include <GL/gl.h>
+#include <GL/internal/glcore.h>
+#include <GL/internal/dri_interface.h>
+typedef struct _drmLock drmLock;
+
+
+/**
+ * Extensions
+ */
+extern const __DRIcoreExtension driCoreExtension;
+extern const __DRIswrastExtension driSWRastExtension;
+
+
+/**
+ * Driver callback functions
+ */
+struct __DriverAPIRec {
+    const __DRIconfig **(*InitScreen) (__DRIscreen * priv);
+
+    void (*DestroyScreen)(__DRIscreen *driScrnPriv);
+
+    GLboolean (*CreateContext)(gl_api glapi,
+                               const __GLcontextModes *glVis,
+                               __DRIcontext *driContextPriv,
+                               void *sharedContextPrivate);
+
+    void (*DestroyContext)(__DRIcontext *driContextPriv);
+
+    GLboolean (*CreateBuffer)(__DRIscreen *driScrnPriv,
+                              __DRIdrawable *driDrawPriv,
+                              const __GLcontextModes *glVis,
+                              GLboolean pixmapBuffer);
+
+    void (*DestroyBuffer)(__DRIdrawable *driDrawPriv);
+
+    void (*SwapBuffers)(__DRIdrawable *driDrawPriv);
+
+    GLboolean (*MakeCurrent)(__DRIcontext *driContextPriv,
+                             __DRIdrawable *driDrawPriv,
+                             __DRIdrawable *driReadPriv);
+
+    GLboolean (*UnbindContext)(__DRIcontext *driContextPriv);
+};
+
+extern const struct __DriverAPIRec driDriverAPI;
+
+
+/**
+ * Data types
+ */
+struct __DRIscreenRec {
+    int myNum;
+
+    int fd;
+
+    void *private;
+
+    const __DRIextension **extensions;
+
+    const __DRIswrastLoaderExtension *swrast_loader;
+};
+
+struct __DRIcontextRec {
+
+    void *driverPrivate;
+
+    void *loaderPrivate;
+
+    __DRIdrawable *driDrawablePriv;
+
+    __DRIdrawable *driReadablePriv;
+
+    __DRIscreen *driScreenPriv;
+};
+
+struct __DRIdrawableRec {
+
+    void *driverPrivate;
+
+    void *loaderPrivate;
+
+    __DRIcontext *driContextPriv;
+
+    __DRIscreen *driScreenPriv;
+
+    int refcount;
+
+    /* gallium */
+    unsigned int lastStamp;
+
+    int w;
+    int h;
+};
+
+#endif /* _DRISW_UTIL_H */
diff --git a/mesalib/src/mesa/drivers/dri/common/spantmp2.h b/mesalib/src/mesa/drivers/dri/common/spantmp2.h
index 98422a856..1dab7336b 100644
--- a/mesalib/src/mesa/drivers/dri/common/spantmp2.h
+++ b/mesalib/src/mesa/drivers/dri/common/spantmp2.h
@@ -413,6 +413,38 @@
      } while (0)
 # endif
 
+#elif (SPANTMP_PIXEL_FMT == GL_ALPHA) && (SPANTMP_PIXEL_TYPE == GL_UNSIGNED_BYTE)
+
+/**
+ ** GL_ALPHA, GL_UNSIGNED_BYTE
+ **/
+
+#ifndef GET_VALUE
+#ifndef GET_PTR
+#define GET_PTR(_x, _y) (     buf + (_x) + (_y) * pitch)
+#endif
+
+#define GET_VALUE(_x, _y) *(volatile GLubyte *)(GET_PTR(_x, _y))
+#define PUT_VALUE(_x, _y, _v) *(volatile GLubyte *)(GET_PTR(_x, _y)) = (_v)
+#endif /* GET_VALUE */
+
+# define INIT_MONO_PIXEL(p, color)                       \
+     p = color[3]
+
+# define WRITE_RGBA(_x, _y, r, g, b, a)                                 \
+   PUT_VALUE(_x, _y, a | (r & 0 /* quiet warnings */))
+
+#define WRITE_PIXEL(_x, _y, p) PUT_VALUE(_x, _y, p)
+
+#define READ_RGBA( rgba, _x, _y )				        \
+     do {								\
+        GLubyte p = GET_VALUE(_x, _y);					\
+	rgba[0] = 0;							\
+	rgba[1] = 0;							\
+	rgba[2] = 0;							\
+	rgba[3] = p;							\
+     } while (0)
+
 #else
 #error SPANTMP_PIXEL_FMT must be set to a valid value!
 #endif
diff --git a/mesalib/src/mesa/drivers/dri/common/utils.c b/mesalib/src/mesa/drivers/dri/common/utils.c
index b85b364c5..0dd879abc 100644
--- a/mesalib/src/mesa/drivers/dri/common/utils.c
+++ b/mesalib/src/mesa/drivers/dri/common/utils.c
@@ -37,6 +37,29 @@
 #include "utils.h"
 
 
+/**
+ * Print message to \c stderr if the \c LIBGL_DEBUG environment variable
+ * is set. 
+ * 
+ * Is called from the drivers.
+ * 
+ * \param f \c printf like format string.
+ */
+void
+__driUtilMessage(const char *f, ...)
+{
+    va_list args;
+
+    if (getenv("LIBGL_DEBUG")) {
+        fprintf(stderr, "libGL: ");
+        va_start(args, f);
+        vfprintf(stderr, f, args);
+        va_end(args);
+        fprintf(stderr, "\n");
+    }
+}
+
+
 unsigned
 driParseDebugString( const char * debug, 
 		     const struct dri_debug_control * control  )
@@ -230,9 +253,6 @@ void driInitSingleExtension( GLcontext * ctx,
 /**
  * Utility function used by drivers to test the verions of other components.
  *
- * If one of the version requirements is not met, a message is logged using
- * \c __driUtilMessage.
- *
  * \param driver_name  Name of the driver.  Used in error messages.
  * \param driActual    Actual DRI version supplied __driCreateNewScreen.
  * \param driExpected  Minimum DRI version required by the driver.
@@ -244,7 +264,7 @@ void driInitSingleExtension( GLcontext * ctx,
  * \returns \c GL_TRUE if all version requirements are met.  Otherwise,
  *          \c GL_FALSE is returned.
  * 
- * \sa __driCreateNewScreen, driCheckDriDdxDrmVersions2, __driUtilMessage
+ * \sa __driCreateNewScreen, driCheckDriDdxDrmVersions2
  *
  * \todo
  * Now that the old \c driCheckDriDdxDrmVersions function is gone, this
diff --git a/mesalib/src/mesa/drivers/dri/common/utils.h b/mesalib/src/mesa/drivers/dri/common/utils.h
index 02ca3feb7..de6070c39 100644
--- a/mesalib/src/mesa/drivers/dri/common/utils.h
+++ b/mesalib/src/mesa/drivers/dri/common/utils.h
@@ -69,6 +69,9 @@ struct __DRIutilversionRec2 {
     int    patch;        /**< Patch-level. */
 };
 
+extern void
+__driUtilMessage(const char *f, ...);
+
 extern unsigned driParseDebugString( const char * debug,
     const struct dri_debug_control * control );
 
diff --git a/mesalib/src/mesa/drivers/dri/common/xmlconfig.c b/mesalib/src/mesa/drivers/dri/common/xmlconfig.c
index a6d6c999a..738b1ae97 100644
--- a/mesalib/src/mesa/drivers/dri/common/xmlconfig.c
+++ b/mesalib/src/mesa/drivers/dri/common/xmlconfig.c
@@ -36,7 +36,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include "main/imports.h"
-#include "dri_util.h"
+#include "utils.h"
 #include "xmlconfig.h"
 
 #undef GET_PROGRAM_NAME
diff --git a/mesalib/src/mesa/drivers/dri/swrast/Makefile b/mesalib/src/mesa/drivers/dri/swrast/Makefile
index 771169c1f..d2cf6dbc5 100644
--- a/mesalib/src/mesa/drivers/dri/swrast/Makefile
+++ b/mesalib/src/mesa/drivers/dri/swrast/Makefile
@@ -5,6 +5,8 @@ include $(TOP)/configs/current
 
 LIBNAME = swrast_dri.so
 
+DRIVER_DEFINES = -D__NOT_HAVE_DRM_H
+
 DRIVER_SOURCES = \
 	swrast.c \
 	swrast_span.c
@@ -17,7 +19,8 @@ ASM_SOURCES =
 
 SWRAST_COMMON_SOURCES = \
 	../../common/driverfuncs.c \
-	../common/utils.c
+	../common/utils.c \
+	../common/drisw_util.c
 
 include ../Makefile.template
 
diff --git a/mesalib/src/mesa/drivers/dri/swrast/swrast.c b/mesalib/src/mesa/drivers/dri/swrast/swrast.c
index 03c672ecf..ff53ffd0d 100644
--- a/mesalib/src/mesa/drivers/dri/swrast/swrast.c
+++ b/mesalib/src/mesa/drivers/dri/swrast/swrast.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 George Sapountzis <gsap7@yahoo.gr>
+ * Copyright 2008, 2010 George Sapountzis <gsapountzis@gmail.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -47,6 +47,11 @@
 #include "drivers/common/meta.h"
 #include "utils.h"
 
+#include "main/teximage.h"
+#include "main/texfetch.h"
+#include "main/texformat.h"
+#include "main/texstate.h"
+
 #include "swrast_priv.h"
 
 
@@ -54,18 +59,62 @@
  * Screen and config-related functions
  */
 
-static void
-setupLoaderExtensions(__DRIscreen *psp,
-		      const __DRIextension **extensions)
+static void swrastSetTexBuffer2(__DRIcontext *pDRICtx, GLint target,
+				GLint texture_format, __DRIdrawable *dPriv)
 {
-    int i;
+    struct dri_context *dri_ctx;
+    int x, y, w, h;
+    __DRIscreen *sPriv = dPriv->driScreenPriv;
+    struct gl_texture_unit *texUnit;
+    struct gl_texture_object *texObj;
+    struct gl_texture_image *texImage;
+    uint32_t internalFormat;
 
-    for (i = 0; extensions[i]; i++) {
-	if (strcmp(extensions[i]->name, __DRI_SWRAST_LOADER) == 0)
-	    psp->swrast_loader = (__DRIswrastLoaderExtension *) extensions[i];
-    }
+    dri_ctx = pDRICtx->driverPrivate;
+
+    internalFormat = (texture_format == __DRI_TEXTURE_FORMAT_RGB ? 3 : 4);
+
+    texUnit = _mesa_get_current_tex_unit(&dri_ctx->Base);
+    texObj = _mesa_select_tex_object(&dri_ctx->Base, texUnit, target);
+    texImage = _mesa_get_tex_image(&dri_ctx->Base, texObj, target, 0);
+
+    _mesa_lock_texture(&dri_ctx->Base, texObj);
+
+    sPriv->swrast_loader->getDrawableInfo(dPriv, &x, &y, &w, &h, dPriv->loaderPrivate);
+
+    _mesa_init_teximage_fields(&dri_ctx->Base, target, texImage,
+			       w, h, 1, 0, internalFormat);
+
+    if (texture_format == __DRI_TEXTURE_FORMAT_RGB)
+	texImage->TexFormat = MESA_FORMAT_XRGB8888;
+    else
+	texImage->TexFormat = MESA_FORMAT_ARGB8888;
+
+    _mesa_set_fetch_functions(texImage, 2);
+
+    sPriv->swrast_loader->getImage(dPriv, x, y, w, h, (char *)texImage->Data,
+				   dPriv->loaderPrivate);
+
+    _mesa_unlock_texture(&dri_ctx->Base, texObj);
 }
 
+static void swrastSetTexBuffer(__DRIcontext *pDRICtx, GLint target,
+			       __DRIdrawable *dPriv)
+{
+    swrastSetTexBuffer2(pDRICtx, target, __DRI_TEXTURE_FORMAT_RGBA, dPriv);
+}
+
+static const __DRItexBufferExtension swrastTexBufferExtension = {
+    { __DRI_TEX_BUFFER, __DRI_TEX_BUFFER_VERSION },
+    swrastSetTexBuffer,
+    swrastSetTexBuffer2,
+};
+
+static const __DRIextension *dri_screen_extensions[] = {
+    &swrastTexBufferExtension.base,
+    NULL
+};
+
 static __DRIconfig **
 swrastFillInModes(__DRIscreen *psp,
 		  unsigned pixel_bits, unsigned depth_bits,
@@ -143,26 +192,14 @@ swrastFillInModes(__DRIscreen *psp,
     return configs;
 }
 
-static __DRIscreen *
-driCreateNewScreen(int scrn, const __DRIextension **extensions,
-		   const __DRIconfig ***driver_configs, void *data)
+static const __DRIconfig **
+dri_init_screen(__DRIscreen * psp)
 {
-    static const __DRIextension *emptyExtensionList[] = { NULL };
-    __DRIscreen *psp;
     __DRIconfig **configs8, **configs16, **configs24, **configs32;
 
-    (void) data;
-
     TRACE;
 
-    psp = calloc(1, sizeof(*psp));
-    if (!psp)
-	return NULL;
-
-    setupLoaderExtensions(psp, extensions);
-
-    psp->num = scrn;
-    psp->extensions = emptyExtensionList;
+    psp->extensions = dri_screen_extensions;
 
     configs8  = swrastFillInModes(psp,  8,  8, 0, 1);
     configs16 = swrastFillInModes(psp, 16, 16, 0, 1);
@@ -171,28 +208,15 @@ driCreateNewScreen(int scrn, const __DRIextension **extensions,
 
     configs16 = driConcatConfigs(configs8, configs16);
     configs24 = driConcatConfigs(configs16, configs24);
-    *driver_configs = (const __DRIconfig **)
-       driConcatConfigs(configs24, configs32);
-
-    driInitExtensions( NULL, NULL, GL_FALSE );
-
-    return psp;
-}
+    configs32 = driConcatConfigs(configs24, configs32);
 
-static void driDestroyScreen(__DRIscreen *psp)
-{
-    TRACE;
-
-    if (psp) {
-	free(psp);
-    }
+    return (const __DRIconfig **)configs32;
 }
 
-static const __DRIextension **driGetExtensions(__DRIscreen *psp)
+static void
+dri_destroy_screen(__DRIscreen * sPriv)
 {
     TRACE;
-
-    return psp->extensions;
 }
 
 
@@ -239,12 +263,20 @@ swrast_delete_renderbuffer(struct gl_renderbuffer *rb)
     free(rb);
 }
 
+/* see bytes_per_line in libGL */
+static INLINE int
+bytes_per_line(unsigned pitch_bits, unsigned mul)
+{
+   unsigned mask = mul - 1;
+
+   return ((pitch_bits + mask) & ~mask) / 8;
+}
+
 static GLboolean
 swrast_alloc_front_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
 			   GLenum internalFormat, GLuint width, GLuint height)
 {
     struct swrast_renderbuffer *xrb = swrast_renderbuffer(rb);
-    unsigned mask = PITCH_ALIGN_BITS - 1;
 
     TRACE;
 
@@ -252,8 +284,7 @@ swrast_alloc_front_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
     rb->Width = width;
     rb->Height = height;
 
-    /* always pad to PITCH_ALIGN_BITS */
-    xrb->pitch = ((width * xrb->bpp + mask) & ~mask) / 8;
+    xrb->pitch = bytes_per_line(width * xrb->bpp, 32);
 
     return GL_TRUE;
 }
@@ -336,94 +367,118 @@ swrast_new_renderbuffer(const GLvisual *visual, GLboolean front)
     return xrb;
 }
 
-static __DRIdrawable *
-driCreateNewDrawable(__DRIscreen *screen,
-		     const __DRIconfig *config, void *data)
+static GLboolean
+dri_create_buffer(__DRIscreen * sPriv,
+		  __DRIdrawable * dPriv,
+		  const __GLcontextModes * visual, GLboolean isPixmap)
 {
-    __DRIdrawable *buf;
+    struct dri_drawable *drawable = NULL;
+    GLframebuffer *fb;
     struct swrast_renderbuffer *frontrb, *backrb;
 
     TRACE;
 
-    buf = calloc(1, sizeof *buf);
-    if (!buf)
-	return NULL;
+    drawable = CALLOC_STRUCT(dri_drawable);
+    if (drawable == NULL)
+	goto drawable_fail;
 
-    buf->loaderPrivate = data;
+    dPriv->driverPrivate = drawable;
+    drawable->dPriv = dPriv;
 
-    buf->driScreenPriv = screen;
+    drawable->row = malloc(MAX_WIDTH * 4);
+    if (drawable->row == NULL)
+	goto drawable_fail;
 
-    buf->row = malloc(MAX_WIDTH * 4);
+    fb = &drawable->Base;
 
     /* basic framebuffer setup */
-    _mesa_initialize_window_framebuffer(&buf->Base, &config->modes);
+    _mesa_initialize_window_framebuffer(fb, visual);
 
     /* add front renderbuffer */
-    frontrb = swrast_new_renderbuffer(&config->modes, GL_TRUE);
-    _mesa_add_renderbuffer(&buf->Base, BUFFER_FRONT_LEFT, &frontrb->Base);
+    frontrb = swrast_new_renderbuffer(visual, GL_TRUE);
+    _mesa_add_renderbuffer(fb, BUFFER_FRONT_LEFT, &frontrb->Base);
 
     /* add back renderbuffer */
-    if (config->modes.doubleBufferMode) {
-	backrb = swrast_new_renderbuffer(&config->modes, GL_FALSE);
-	_mesa_add_renderbuffer(&buf->Base, BUFFER_BACK_LEFT, &backrb->Base);
+    if (visual->doubleBufferMode) {
+	backrb = swrast_new_renderbuffer(visual, GL_FALSE);
+	_mesa_add_renderbuffer(fb, BUFFER_BACK_LEFT, &backrb->Base);
     }
 
     /* add software renderbuffers */
-    _mesa_add_soft_renderbuffers(&buf->Base,
+    _mesa_add_soft_renderbuffers(fb,
 				 GL_FALSE, /* color */
-				 config->modes.haveDepthBuffer,
-				 config->modes.haveStencilBuffer,
-				 config->modes.haveAccumBuffer,
+				 visual->haveDepthBuffer,
+				 visual->haveStencilBuffer,
+				 visual->haveAccumBuffer,
 				 GL_FALSE, /* alpha */
 				 GL_FALSE /* aux bufs */);
 
-    return buf;
+    return GL_TRUE;
+
+drawable_fail:
+
+    if (drawable)
+	free(drawable->row);
+
+    FREE(drawable);
+
+    return GL_FALSE;
 }
 
 static void
-driDestroyDrawable(__DRIdrawable *buf)
+dri_destroy_buffer(__DRIdrawable * dPriv)
 {
     TRACE;
 
-    if (buf) {
-	struct gl_framebuffer *fb = &buf->Base;
+    if (dPriv) {
+	struct dri_drawable *drawable = dri_drawable(dPriv);
+	GLframebuffer *fb;
 
-	free(buf->row);
+	free(drawable->row);
+
+	fb = &drawable->Base;
 
 	fb->DeletePending = GL_TRUE;
 	_mesa_reference_framebuffer(&fb, NULL);
     }
 }
 
-static void driSwapBuffers(__DRIdrawable *buf)
+static void
+dri_swap_buffers(__DRIdrawable * dPriv)
 {
-    GET_CURRENT_CONTEXT(ctx);
+    __DRIscreen *sPriv = dPriv->driScreenPriv;
 
-    struct swrast_renderbuffer *frontrb =
-	swrast_renderbuffer(buf->Base.Attachment[BUFFER_FRONT_LEFT].Renderbuffer);
-    struct swrast_renderbuffer *backrb =
-	swrast_renderbuffer(buf->Base.Attachment[BUFFER_BACK_LEFT].Renderbuffer);
+    GET_CURRENT_CONTEXT(ctx);
 
-    __DRIscreen *screen = buf->driScreenPriv;
+    struct dri_drawable *drawable = dri_drawable(dPriv);
+    GLframebuffer *fb;
+    struct swrast_renderbuffer *frontrb, *backrb;
 
     TRACE;
 
+    fb = &drawable->Base;
+
+    frontrb =
+	swrast_renderbuffer(fb->Attachment[BUFFER_FRONT_LEFT].Renderbuffer);
+    backrb =
+	swrast_renderbuffer(fb->Attachment[BUFFER_BACK_LEFT].Renderbuffer);
+
     /* check for signle-buffered */
     if (backrb == NULL)
 	return;
 
     /* check if swapping currently bound buffer */
-    if (ctx && ctx->DrawBuffer == &(buf->Base)) {
+    if (ctx && ctx->DrawBuffer == fb) {
 	/* flush pending rendering */
 	_mesa_notifySwapBuffers(ctx);
     }
 
-    screen->swrast_loader->putImage(buf, __DRI_SWRAST_IMAGE_OP_SWAP,
-				    0, 0,
-				    frontrb->Base.Width,
-				    frontrb->Base.Height,
-				    backrb->Base.Data,
-				    buf->loaderPrivate);
+    sPriv->swrast_loader->putImage(dPriv, __DRI_SWRAST_IMAGE_OP_SWAP,
+				   0, 0,
+				   frontrb->Base.Width,
+				   frontrb->Base.Height,
+				   backrb->Base.Data,
+				   dPriv->loaderPrivate);
 }
 
 
@@ -434,13 +489,13 @@ static void driSwapBuffers(__DRIdrawable *buf)
 static void
 get_window_size( GLframebuffer *fb, GLsizei *w, GLsizei *h )
 {
-    __DRIdrawable *buf = swrast_drawable(fb);
-    __DRIscreen *screen = buf->driScreenPriv;
+    __DRIdrawable *dPriv = swrast_drawable(fb)->dPriv;
+    __DRIscreen *sPriv = dPriv->driScreenPriv;
     int x, y;
 
-    screen->swrast_loader->getDrawableInfo(buf,
-					   &x, &y, w, h,
-					   buf->loaderPrivate);
+    sPriv->swrast_loader->getDrawableInfo(dPriv,
+					  &x, &y, w, h,
+					  dPriv->loaderPrivate);
 }
 
 static void
@@ -488,6 +543,16 @@ viewport(GLcontext *ctx, GLint x, GLint y, GLsizei w, GLsizei h)
     swrast_check_and_update_window_size(ctx, read);
 }
 
+static gl_format swrastChooseTextureFormat(GLcontext * ctx,
+					   GLint internalFormat,
+					   GLenum format,
+					   GLenum type)
+{
+    if (internalFormat == GL_RGB)
+	return MESA_FORMAT_XRGB8888;
+    return _mesa_choose_tex_format(ctx, internalFormat, format, type);
+}
+
 static void
 swrast_init_driver_functions(struct dd_function_table *driver)
 {
@@ -495,6 +560,7 @@ swrast_init_driver_functions(struct dd_function_table *driver)
     driver->UpdateState = update_state;
     driver->GetBufferSize = NULL;
     driver->Viewport = viewport;
+    driver->ChooseTextureFormat = swrastChooseTextureFormat;
 }
 
 
@@ -502,37 +568,41 @@ swrast_init_driver_functions(struct dd_function_table *driver)
  * Context-related functions.
  */
 
-static __DRIcontext *
-driCreateNewContext(__DRIscreen *screen, const __DRIconfig *config,
-		    __DRIcontext *shared, void *data)
+static GLboolean
+dri_create_context(gl_api api,
+		   const __GLcontextModes * visual,
+		   __DRIcontext * cPriv, void *sharedContextPrivate)
 {
-    __DRIcontext *ctx;
-    GLcontext *mesaCtx;
+    struct dri_context *ctx = NULL;
+    struct dri_context *share = (struct dri_context *)sharedContextPrivate;
+    GLcontext *mesaCtx = NULL;
+    GLcontext *sharedCtx = NULL;
     struct dd_function_table functions;
 
     TRACE;
 
-    ctx = calloc(1, sizeof *ctx);
-    if (!ctx)
-	return NULL;
-
-    ctx->loaderPrivate = data;
+    ctx = CALLOC_STRUCT(dri_context);
+    if (ctx == NULL)
+	goto context_fail;
 
-    ctx->driScreenPriv = screen;
+    cPriv->driverPrivate = ctx;
+    ctx->cPriv = cPriv;
 
     /* build table of device driver functions */
     _mesa_init_driver_functions(&functions);
     swrast_init_driver_functions(&functions);
 
-    if (!_mesa_initialize_context(&ctx->Base, &config->modes,
-				  shared ? &shared->Base : NULL,
-				  &functions, (void *) ctx)) {
-      free(ctx);
-      return NULL;
+    if (share) {
+	sharedCtx = &share->Base;
     }
 
     mesaCtx = &ctx->Base;
 
+    /* basic context setup */
+    if (!_mesa_initialize_context(mesaCtx, visual, sharedCtx, &functions, (void *) cPriv)) {
+	goto context_fail;
+    }
+
     /* do bounds checking to prevent segfaults and server crashes! */
     mesaCtx->Const.CheckArrayBounds = GL_TRUE;
 
@@ -558,17 +628,28 @@ driCreateNewContext(__DRIscreen *screen, const __DRIconfig *config,
 
     _mesa_meta_init(mesaCtx);
 
-    return ctx;
+    driInitExtensions( mesaCtx, NULL, GL_FALSE );
+
+    return GL_TRUE;
+
+context_fail:
+
+    FREE(ctx);
+
+    return GL_FALSE;
 }
 
 static void
-driDestroyContext(__DRIcontext *ctx)
+dri_destroy_context(__DRIcontext * cPriv)
 {
-    GLcontext *mesaCtx;
     TRACE;
 
-    if (ctx) {
+    if (cPriv) {
+	struct dri_context *ctx = dri_context(cPriv);
+	GLcontext *mesaCtx;
+
 	mesaCtx = &ctx->Base;
+
         _mesa_meta_free(mesaCtx);
 	_swsetup_DestroyContext( mesaCtx );
 	_swrast_DestroyContext( mesaCtx );
@@ -578,28 +659,26 @@ driDestroyContext(__DRIcontext *ctx)
     }
 }
 
-static int
-driCopyContext(__DRIcontext *dst, __DRIcontext *src, unsigned long mask)
-{
-    TRACE;
-
-    _mesa_copy_context(&src->Base, &dst->Base, mask);
-    return GL_TRUE;
-}
-
-static int driBindContext(__DRIcontext *ctx,
-			  __DRIdrawable *draw,
-			  __DRIdrawable *read)
+static GLboolean
+dri_make_current(__DRIcontext * cPriv,
+		 __DRIdrawable * driDrawPriv,
+		 __DRIdrawable * driReadPriv)
 {
     GLcontext *mesaCtx;
     GLframebuffer *mesaDraw;
     GLframebuffer *mesaRead;
     TRACE;
 
-    if (ctx) {
-	if (!draw || !read)
+    if (cPriv) {
+	struct dri_context *ctx = dri_context(cPriv);
+	struct dri_drawable *draw;
+	struct dri_drawable *read;
+
+	if (!driDrawPriv || !driReadPriv)
 	    return GL_FALSE;
 
+	draw = dri_drawable(driDrawPriv);
+	read = dri_drawable(driReadPriv);
 	mesaCtx = &ctx->Base;
 	mesaDraw = &draw->Base;
 	mesaRead = &read->Base;
@@ -614,7 +693,7 @@ static int driBindContext(__DRIcontext *ctx,
 	_glapi_check_multithread();
 
 	swrast_check_and_update_window_size(mesaCtx, mesaDraw);
-	if (read != draw)
+	if (mesaRead != mesaDraw)
 	    swrast_check_and_update_window_size(mesaCtx, mesaRead);
 
 	_mesa_make_current( mesaCtx,
@@ -629,35 +708,29 @@ static int driBindContext(__DRIcontext *ctx,
     return GL_TRUE;
 }
 
-static int driUnbindContext(__DRIcontext *ctx)
+static GLboolean
+dri_unbind_context(__DRIcontext * cPriv)
 {
     TRACE;
-    (void) ctx;
+    (void) cPriv;
+
+    /* Unset current context and dispath table */
+    _mesa_make_current(NULL, NULL, NULL);
+
     return GL_TRUE;
 }
 
 
-static const __DRIcoreExtension driCoreExtension = {
-    { __DRI_CORE, __DRI_CORE_VERSION },
-    NULL, /* driCreateNewScreen */
-    driDestroyScreen,
-    driGetExtensions,
-    driGetConfigAttrib,
-    driIndexConfigAttrib,
-    NULL, /* driCreateNewDrawable */
-    driDestroyDrawable,
-    driSwapBuffers,
-    driCreateNewContext,
-    driCopyContext,
-    driDestroyContext,
-    driBindContext,
-    driUnbindContext
-};
-
-static const __DRIswrastExtension driSWRastExtension = {
-    { __DRI_SWRAST, __DRI_SWRAST_VERSION },
-    driCreateNewScreen,
-    driCreateNewDrawable
+const struct __DriverAPIRec driDriverAPI = {
+    .InitScreen = dri_init_screen,
+    .DestroyScreen = dri_destroy_screen,
+    .CreateContext = dri_create_context,
+    .DestroyContext = dri_destroy_context,
+    .CreateBuffer = dri_create_buffer,
+    .DestroyBuffer = dri_destroy_buffer,
+    .SwapBuffers = dri_swap_buffers,
+    .MakeCurrent = dri_make_current,
+    .UnbindContext = dri_unbind_context,
 };
 
 /* This is the table of extensions that the loader will dlsym() for. */
diff --git a/mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h b/mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h
index 4722007f9..6679061a9 100644
--- a/mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h
+++ b/mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h
@@ -3,6 +3,7 @@
  * Version:  7.1
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright 2008, 2010 George Sapountzis <gsapountzis@gmail.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,11 +23,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/*
- * Authors:
- *    George Sapountzis <gsap7@yahoo.gr>
- */
-
 
 #ifndef _SWRAST_PRIV_H
 #define _SWRAST_PRIV_H
@@ -34,6 +30,7 @@
 #include <GL/gl.h>
 #include <GL/internal/dri_interface.h>
 #include "main/mtypes.h"
+#include "drisw_util.h"
 
 
 /**
@@ -58,33 +55,51 @@
 /**
  * Data types
  */
-struct __DRIscreenRec {
-    int num;
-
-    const __DRIextension **extensions;
+struct dri_context
+{
+    /* mesa, base class, must be first */
+    GLcontext Base;
 
-    const __DRIswrastLoaderExtension *swrast_loader;
+    /* dri */
+    __DRIcontext *cPriv;
 };
 
-struct __DRIcontextRec {
-    GLcontext Base;
-
-    void *loaderPrivate;
+static INLINE struct dri_context *
+dri_context(__DRIcontext * driContextPriv)
+{
+    return (struct dri_context *)driContextPriv->driverPrivate;
+}
 
-    __DRIscreen *driScreenPriv;
-};
+static INLINE struct dri_context *
+swrast_context(GLcontext *ctx)
+{
+    return (struct dri_context *) ctx;
+}
 
-struct __DRIdrawableRec {
+struct dri_drawable
+{
+    /* mesa, base class, must be first */
     GLframebuffer Base;
 
-    void *loaderPrivate;
-
-    __DRIscreen *driScreenPriv;
+    /* dri */
+    __DRIdrawable *dPriv;
 
     /* scratch row for optimized front-buffer rendering */
     char *row;
 };
 
+static INLINE struct dri_drawable *
+dri_drawable(__DRIdrawable * driDrawPriv)
+{
+    return (struct dri_drawable *)driDrawPriv->driverPrivate;
+}
+
+static INLINE struct dri_drawable *
+swrast_drawable(GLframebuffer *fb)
+{
+    return (struct dri_drawable *) fb;
+}
+
 struct swrast_renderbuffer {
     struct gl_renderbuffer Base;
 
@@ -94,18 +109,6 @@ struct swrast_renderbuffer {
     GLuint bpp;
 };
 
-static INLINE __DRIcontext *
-swrast_context(GLcontext *ctx)
-{
-    return (__DRIcontext *) ctx;
-}
-
-static INLINE __DRIdrawable *
-swrast_drawable(GLframebuffer *fb)
-{
-    return (__DRIdrawable *) fb;
-}
-
 static INLINE struct swrast_renderbuffer *
 swrast_renderbuffer(struct gl_renderbuffer *rb)
 {
@@ -121,14 +124,6 @@ swrast_renderbuffer(struct gl_renderbuffer *rb)
 #define PF_R3G3B2     3		/**<  8bpp TrueColor:  3-R, 3-G, 2-B bits */
 #define PF_X8R8G8B8   4		/**< 32bpp TrueColor:  8-R, 8-G, 8-B bits */
 
-/**
- * Renderbuffer pitch alignment (in bits).
- *
- * The xorg loader requires padding images to 32 bits. However, this should
- * become a screen/drawable parameter XXX
- */
-#define PITCH_ALIGN_BITS 32
-
 
 /* swrast_span.c */
 
diff --git a/mesalib/src/mesa/drivers/dri/swrast/swrast_span.c b/mesalib/src/mesa/drivers/dri/swrast/swrast_span.c
index d896e154f..c7d0bfdac 100644
--- a/mesalib/src/mesa/drivers/dri/swrast/swrast_span.c
+++ b/mesalib/src/mesa/drivers/dri/swrast/swrast_span.c
@@ -3,6 +3,7 @@
  * Version:  7.1
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright 2008, 2010 George Sapountzis <gsapountzis@gmail.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,11 +23,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/*
- * Authors:
- *    George Sapountzis <gsap7@yahoo.gr>
- */
-
 #include "swrast_priv.h"
 
 #define YFLIP(_xrb, Y) ((_xrb)->Base.Height - (Y) - 1)
diff --git a/mesalib/src/mesa/drivers/dri/swrast/swrast_spantemp.h b/mesalib/src/mesa/drivers/dri/swrast/swrast_spantemp.h
index 848736171..1e9405eeb 100644
--- a/mesalib/src/mesa/drivers/dri/swrast/swrast_spantemp.h
+++ b/mesalib/src/mesa/drivers/dri/swrast/swrast_spantemp.h
@@ -39,8 +39,8 @@
 static INLINE void
 PUT_PIXEL( GLcontext *glCtx, GLint x, GLint y, GLvoid *p )
 {
-    __DRIcontext *ctx = swrast_context(glCtx);
-    __DRIdrawable *draw = swrast_drawable(glCtx->DrawBuffer);
+    __DRIcontext *ctx = swrast_context(glCtx)->cPriv;
+    __DRIdrawable *draw = swrast_drawable(glCtx->DrawBuffer)->dPriv;
 
     __DRIscreen *screen = ctx->driScreenPriv;
 
@@ -53,8 +53,8 @@ PUT_PIXEL( GLcontext *glCtx, GLint x, GLint y, GLvoid *p )
 static INLINE void
 GET_PIXEL( GLcontext *glCtx, GLint x, GLint y, GLubyte *p )
 {
-    __DRIcontext *ctx = swrast_context(glCtx);
-    __DRIdrawable *read = swrast_drawable(glCtx->ReadBuffer);
+    __DRIcontext *ctx = swrast_context(glCtx)->cPriv;
+    __DRIdrawable *read = swrast_drawable(glCtx->ReadBuffer)->dPriv;
 
     __DRIscreen *screen = ctx->driScreenPriv;
 
@@ -65,8 +65,8 @@ GET_PIXEL( GLcontext *glCtx, GLint x, GLint y, GLubyte *p )
 static INLINE void
 PUT_ROW( GLcontext *glCtx, GLint x, GLint y, GLuint n, char *row )
 {
-    __DRIcontext *ctx = swrast_context(glCtx);
-    __DRIdrawable *draw = swrast_drawable(glCtx->DrawBuffer);
+    __DRIcontext *ctx = swrast_context(glCtx)->cPriv;
+    __DRIdrawable *draw = swrast_drawable(glCtx->DrawBuffer)->dPriv;
 
     __DRIscreen *screen = ctx->driScreenPriv;
 
@@ -78,8 +78,8 @@ PUT_ROW( GLcontext *glCtx, GLint x, GLint y, GLuint n, char *row )
 static INLINE void
 GET_ROW( GLcontext *glCtx, GLint x, GLint y, GLuint n, char *row )
 {
-    __DRIcontext *ctx = swrast_context(glCtx);
-    __DRIdrawable *read = swrast_drawable(glCtx->ReadBuffer);
+    __DRIcontext *ctx = swrast_context(glCtx)->cPriv;
+    __DRIdrawable *read = swrast_drawable(glCtx->ReadBuffer)->dPriv;
 
     __DRIscreen *screen = ctx->driScreenPriv;
 
diff --git a/mesalib/src/mesa/main/APIspec.dtd b/mesalib/src/mesa/main/APIspec.dtd
new file mode 100644
index 000000000..efcfa31f1
--- /dev/null
+++ b/mesalib/src/mesa/main/APIspec.dtd
@@ -0,0 +1,52 @@
+<!ELEMENT apispec (template|api)+>
+
+<!ELEMENT api (category*, function*)>
+<!ELEMENT category EMPTY>
+<!ELEMENT function EMPTY>
+
+<!ELEMENT template (proto, desc*)>
+<!ELEMENT proto (return, (param|vector)*)>
+<!ELEMENT return EMPTY>
+<!ELEMENT param EMPTY>
+<!ELEMENT vector (param*)>
+<!ELEMENT desc ((value|range)*, desc*)>
+<!ELEMENT value EMPTY>
+<!ELEMENT range EMPTY>
+
+<!ATTLIST api      name                NMTOKEN #REQUIRED
+                   implementation      (true | false) "false">
+<!ATTLIST category name                NMTOKEN #REQUIRED>
+<!ATTLIST function name                NMTOKEN #REQUIRED
+                   default_prefix      NMTOKEN "_mesa_"
+                   external            (true | false) "false"
+                   template            NMTOKEN #REQUIRED
+                   gltype              CDATA #IMPLIED
+                   vector_size         NMTOKEN #IMPLIED
+                   expand_vector       (true | false) "false"
+                   skip_desc           (true | false) "false">
+
+<!ATTLIST template name                NMTOKEN #REQUIRED
+                   direction           (set | get) "set">
+
+<!ATTLIST return   type                CDATA #REQUIRED>
+<!ATTLIST param    name                NMTOKEN #REQUIRED
+                   type                CDATA #REQUIRED
+                   hide_if_expanded    (true | false) "false"
+                   category            NMTOKEN #IMPLIED>
+<!ATTLIST vector   name                NMTOKEN #REQUIRED
+                   type                CDATA #REQUIRED
+                   size                NMTOKEN #REQUIRED
+                   category            NMTOKEN #IMPLIED>
+
+<!ATTLIST desc     name                NMTOKEN #REQUIRED
+                   vector_size         CDATA #IMPLIED
+                   convert             (true | false) #IMPLIED
+                   error               NMTOKEN "GL_INVALID_ENUM"
+                   category            NMTOKEN #IMPLIED>
+
+<!ATTLIST value    name                CDATA #REQUIRED
+                   category            NMTOKEN #IMPLIED>
+<!ATTLIST range    from                NMTOKEN #REQUIRED
+                   to                  NMTOKEN #REQUIRED
+                   base                NMTOKEN #IMPLIED
+                   category            NMTOKEN #IMPLIED>
diff --git a/mesalib/src/mesa/main/APIspec.py b/mesalib/src/mesa/main/APIspec.py
new file mode 100644
index 000000000..6947f7301
--- /dev/null
+++ b/mesalib/src/mesa/main/APIspec.py
@@ -0,0 +1,617 @@
+#!/usr/bin/python
+#
+# Copyright (C) 2009 Chia-I Wu <olv@0xlab.org>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# 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
+# IBM AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+"""
+A parser for APIspec.
+"""
+
+class SpecError(Exception):
+    """Error in the spec file."""
+
+
+class Spec(object):
+    """A Spec is an abstraction of the API spec."""
+
+    def __init__(self, doc):
+        self.doc = doc
+
+        self.spec_node = doc.getRootElement()
+        self.tmpl_nodes = {}
+        self.api_nodes = {}
+        self.impl_node = None
+
+        # parse <apispec>
+        node = self.spec_node.children
+        while node:
+            if node.type == "element":
+                if node.name == "template":
+                    self.tmpl_nodes[node.prop("name")] = node
+                elif node.name == "api":
+                    self.api_nodes[node.prop("name")] = node
+                else:
+                    raise SpecError("unexpected node %s in apispec" %
+                            node.name)
+            node = node.next
+
+        # find an implementation
+        for name, node in self.api_nodes.iteritems():
+            if node.prop("implementation") == "true":
+                self.impl_node = node
+                break
+        if not self.impl_node:
+            raise SpecError("unable to find an implementation")
+
+    def get_impl(self):
+        """Return the implementation."""
+        return API(self, self.impl_node)
+
+    def get_api(self, name):
+        """Return an API."""
+        return API(self, self.api_nodes[name])
+
+
+class API(object):
+    """An API consists of categories and functions."""
+
+    def __init__(self, spec, api_node):
+        self.name = api_node.prop("name")
+        self.is_impl = (api_node.prop("implementation") == "true")
+
+        self.categories = []
+        self.functions = []
+
+        # parse <api>
+        func_nodes = []
+        node = api_node.children
+        while node:
+            if node.type == "element":
+                if node.name == "category":
+                    cat = node.prop("name")
+                    self.categories.append(cat)
+                elif node.name == "function":
+                    func_nodes.append(node)
+                else:
+                    raise SpecError("unexpected node %s in api" % node.name)
+            node = node.next
+
+        # realize functions
+        for func_node in func_nodes:
+            tmpl_node = spec.tmpl_nodes[func_node.prop("template")]
+            try:
+                func = Function(tmpl_node, func_node, self.is_impl,
+                                self.categories)
+            except SpecError, e:
+                func_name = func_node.prop("name")
+                raise SpecError("failed to parse %s: %s" % (func_name, e))
+            self.functions.append(func)
+
+    def match(self, func, conversions={}):
+        """Find a matching function in the API."""
+        match = None
+        need_conv = False
+        for f in self.functions:
+            matched, conv = f.match(func, conversions)
+            if matched:
+                match = f
+                need_conv = conv
+                # exact match
+                if not need_conv:
+                    break
+        return (match, need_conv)
+
+
+class Function(object):
+    """Parse and realize a <template> node."""
+
+    def __init__(self, tmpl_node, func_node, force_skip_desc=False, categories=[]):
+        self.tmpl_name = tmpl_node.prop("name")
+        self.direction = tmpl_node.prop("direction")
+
+        self.name = func_node.prop("name")
+        self.prefix = func_node.prop("default_prefix")
+        self.is_external = (func_node.prop("external") == "true")
+
+        if force_skip_desc:
+            self._skip_desc = True
+        else:
+            self._skip_desc = (func_node.prop("skip_desc") == "true")
+
+        self._categories = categories
+
+        # these attributes decide how the template is realized
+        self._gltype = func_node.prop("gltype")
+        if func_node.hasProp("vector_size"):
+            self._vector_size = int(func_node.prop("vector_size"))
+        else:
+            self._vector_size = 0
+        self._expand_vector = (func_node.prop("expand_vector") == "true")
+
+        self.return_type = "void"
+        param_nodes = []
+
+        # find <proto>
+        proto_node = tmpl_node.children
+        while proto_node:
+            if proto_node.type == "element" and proto_node.name == "proto":
+                break
+            proto_node = proto_node.next
+        if not proto_node:
+            raise SpecError("no proto")
+        # and parse it
+        node = proto_node.children
+        while node:
+            if node.type == "element":
+                if node.name == "return":
+                    self.return_type = node.prop("type")
+                elif node.name == "param" or node.name == "vector":
+                    if self.support_node(node):
+                        # make sure the node is not hidden
+                        if not (self._expand_vector and
+                                (node.prop("hide_if_expanded") == "true")):
+                            param_nodes.append(node)
+                else:
+                    raise SpecError("unexpected node %s in proto" % node.name)
+            node = node.next
+
+        self._init_params(param_nodes)
+        self._init_descs(tmpl_node, param_nodes)
+
+    def __str__(self):
+        return "%s %s%s(%s)" % (self.return_type, self.prefix, self.name,
+                self.param_string(True))
+
+    def _init_params(self, param_nodes):
+        """Parse and initialize parameters."""
+        self.params = []
+
+        for param_node in param_nodes:
+            size = self.param_node_size(param_node)
+            # when no expansion, vector is just like param
+            if param_node.name == "param" or not self._expand_vector:
+                param = Parameter(param_node, self._gltype, size)
+                self.params.append(param)
+                continue
+
+            if not size or size > param_node.lsCountNode():
+                raise SpecError("could not expand %s with unknown or "
+                                "mismatch sizes" % param.name)
+
+            # expand the vector
+            expanded_params = []
+            child = param_node.children
+            while child:
+                if (child.type == "element" and child.name == "param" and
+                    self.support_node(child)):
+                    expanded_params.append(Parameter(child, self._gltype))
+                    if len(expanded_params) == size:
+                        break
+                child = child.next
+            # just in case that lsCountNode counts unknown nodes
+            if len(expanded_params) < size:
+                raise SpecError("not enough named parameters")
+
+            self.params.extend(expanded_params)
+
+    def _init_descs(self, tmpl_node, param_nodes):
+        """Parse and initialize parameter descriptions."""
+        self.checker = Checker()
+        if self._skip_desc:
+            return
+
+        node = tmpl_node.children
+        while node:
+            if node.type == "element" and node.name == "desc":
+                if self.support_node(node):
+                    # parse <desc>
+                    desc = Description(node, self._categories)
+                    self.checker.add_desc(desc)
+            node = node.next
+
+        self.checker.validate(self, param_nodes)
+
+    def support_node(self, node):
+        """Return true if a node is in the supported category."""
+        return (not node.hasProp("category") or
+                node.prop("category") in self._categories)
+
+    def get_param(self, name):
+        """Return the named parameter."""
+        for param in self.params:
+            if param.name == name:
+                return param
+        return None
+
+    def param_node_size(self, param):
+        """Return the size of a vector."""
+        if param.name != "vector":
+            return 0
+
+        size = param.prop("size")
+        if size.isdigit():
+            size = int(size)
+        else:
+            size = 0
+        if not size:
+            size = self._vector_size
+            if not size and self._expand_vector:
+                # return the number of named parameters
+                size = param.lsCountNode()
+        return size
+
+    def param_string(self, declaration):
+        """Return the C code of the parameters."""
+        args = []
+        if declaration:
+            for param in self.params:
+                sep = "" if param.type.endswith("*") else " "
+                args.append("%s%s%s" % (param.type, sep, param.name))
+            if not args:
+                args.append("void")
+        else:
+            for param in self.params:
+                args.append(param.name)
+        return ", ".join(args)
+
+    def match(self, other, conversions={}):
+        """Return true if the functions match, probably with a conversion."""
+        if (self.tmpl_name != other.tmpl_name or
+            self.return_type != other.return_type or
+            len(self.params) != len(other.params)):
+            return (False, False)
+
+        need_conv = False
+        for i in xrange(len(self.params)):
+            src = other.params[i]
+            dst = self.params[i]
+            if (src.is_vector != dst.is_vector or src.size != dst.size):
+                return (False, False)
+            if src.type != dst.type:
+                if dst.base_type() in conversions.get(src.base_type(), []):
+                    need_conv = True
+                else:
+                    # unable to convert
+                    return (False, False)
+
+        return (True, need_conv)
+
+
+class Parameter(object):
+    """A parameter of a function."""
+
+    def __init__(self, param_node, gltype=None, size=0):
+        self.is_vector = (param_node.name == "vector")
+
+        self.name = param_node.prop("name")
+        self.size = size
+
+        type = param_node.prop("type")
+        if gltype:
+            type = type.replace("GLtype", gltype)
+        elif type.find("GLtype") != -1:
+            raise SpecError("parameter %s has unresolved type" % self.name)
+
+        self.type = type
+
+    def base_type(self):
+        """Return the base GL type by stripping qualifiers."""
+        return [t for t in self.type.split(" ") if t.startswith("GL")][0]
+
+
+class Checker(object):
+    """A checker is the collection of all descriptions on the same level.
+    Descriptions of the same parameter are concatenated.
+    """
+
+    def __init__(self):
+        self.switches = {}
+        self.switch_constants = {}
+
+    def add_desc(self, desc):
+        """Add a description."""
+        # TODO allow index to vary
+        const_attrs = ["index", "error", "convert", "size_str"]
+        if desc.name not in self.switches:
+            self.switches[desc.name] = []
+            self.switch_constants[desc.name] = {}
+            for attr in const_attrs:
+                self.switch_constants[desc.name][attr] = None
+
+        # some attributes, like error code, should be the same for all descs
+        consts = self.switch_constants[desc.name]
+        for attr in const_attrs:
+            if getattr(desc, attr) is not None:
+                if (consts[attr] is not None and
+                    consts[attr] != getattr(desc, attr)):
+                    raise SpecError("mismatch %s for %s" % (attr, desc.name))
+                consts[attr] = getattr(desc, attr)
+
+        self.switches[desc.name].append(desc)
+
+    def validate(self, func, param_nodes):
+        """Validate the checker against a function."""
+        tmp = Checker()
+
+        for switch in self.switches.itervalues():
+            valid_descs = []
+            for desc in switch:
+                if desc.validate(func, param_nodes):
+                    valid_descs.append(desc)
+            # no possible values
+            if not valid_descs:
+                return False
+            for desc in valid_descs:
+                if not desc._is_noop:
+                    tmp.add_desc(desc)
+
+        self.switches = tmp.switches
+        self.switch_constants = tmp.switch_constants
+        return True
+
+    def flatten(self, name=None):
+        """Return a flat list of all descriptions of the named parameter."""
+        flat_list = []
+        for switch in self.switches.itervalues():
+            for desc in switch:
+                if not name or desc.name == name:
+                    flat_list.append(desc)
+                flat_list.extend(desc.checker.flatten(name))
+        return flat_list
+
+    def always_check(self, name):
+        """Return true if the parameter is checked in all possible pathes."""
+        if name in self.switches:
+            return True
+
+        # a param is always checked if any of the switch always checks it
+        for switch in self.switches.itervalues():
+            # a switch always checks it if all of the descs always check it
+            always = True
+            for desc in switch:
+                if not desc.checker.always_check(name):
+                    always = False
+                    break
+            if always:
+                return True
+        return False
+
+    def _c_switch(self, name, indent="\t"):
+        """Output C switch-statement for the named parameter, for debug."""
+        switch = self.switches.get(name, [])
+        # make sure there are valid values
+        need_switch = False
+        for desc in switch:
+            if desc.values:
+                need_switch = True
+        if not need_switch:
+            return []
+
+        stmts = []
+        var = switch[0].name
+        if switch[0].index >= 0:
+            var += "[%d]" % switch[0].index
+        stmts.append("switch (%s) { /* assume GLenum */" % var)
+
+        for desc in switch:
+            if desc.values:
+                for val in desc.values:
+                    stmts.append("case %s:" % val)
+                for dep_name in desc.checker.switches.iterkeys():
+                    dep_stmts = [indent + s for s in desc.checker._c_switch(dep_name, indent)]
+                    stmts.extend(dep_stmts)
+                stmts.append(indent + "break;")
+
+        stmts.append("default:")
+        stmts.append(indent + "ON_ERROR(%s);" % switch[0].error);
+        stmts.append(indent + "break;")
+        stmts.append("}")
+
+        return stmts
+
+    def dump(self, indent="\t"):
+        """Dump the descriptions in C code."""
+        stmts = []
+        for name in self.switches.iterkeys():
+            c_switch = self._c_switch(name)
+            print "\n".join(c_switch)
+
+
+class Description(object):
+    """A description desribes a parameter and its relationship with other
+    parameters.
+    """
+
+    def __init__(self, desc_node, categories=[]):
+        self._categories = categories
+        self._is_noop = False
+
+        self.name = desc_node.prop("name")
+        self.index = -1
+
+        self.error = desc_node.prop("error") or "GL_INVALID_ENUM"
+        # vector_size may be C code
+        self.size_str = desc_node.prop("vector_size")
+
+        self._has_enum = False
+        self.values = []
+        dep_nodes = []
+
+        # parse <desc>
+        valid_names = ["value", "range", "desc"]
+        node = desc_node.children
+        while node:
+            if node.type == "element":
+                if node.name in valid_names:
+                    # ignore nodes that require unsupported categories
+                    if (node.prop("category") and
+                        node.prop("category") not in self._categories):
+                        node = node.next
+                        continue
+                else:
+                    raise SpecError("unexpected node %s in desc" % node.name)
+
+                if node.name == "value":
+                    val = node.prop("name")
+                    if not self._has_enum and val.startswith("GL_"):
+                        self._has_enum = True
+                    self.values.append(val)
+                elif node.name == "range":
+                    first = int(node.prop("from"))
+                    last = int(node.prop("to"))
+                    base = node.prop("base") or ""
+                    if not self._has_enum and base.startswith("GL_"):
+                        self._has_enum = True
+                    # expand range
+                    for i in xrange(first, last + 1):
+                        self.values.append("%s%d" % (base, i))
+                else: # dependent desc
+                    dep_nodes.append(node)
+            node = node.next
+
+        # default to convert if there is no enum
+        self.convert = not self._has_enum
+        if desc_node.hasProp("convert"):
+            self.convert = (desc_node.prop("convert") == "true")
+
+        self._init_deps(dep_nodes)
+
+    def _init_deps(self, dep_nodes):
+        """Parse and initialize dependents."""
+        self.checker = Checker()
+
+        for dep_node in dep_nodes:
+            # recursion!
+            dep = Description(dep_node, self._categories)
+            self.checker.add_desc(dep)
+
+    def _search_param_node(self, param_nodes, name=None):
+        """Search the template parameters for the named node."""
+        param_node = None
+        param_index = -1
+
+        if not name:
+            name = self.name
+        for node in param_nodes:
+            if name == node.prop("name"):
+                param_node = node
+            elif node.name == "vector":
+                child = node.children
+                idx = 0
+                while child:
+                    if child.type == "element" and child.name == "param":
+                        if name == child.prop("name"):
+                            param_node = node
+                            param_index = idx
+                            break
+                        idx += 1
+                    child = child.next
+            if param_node:
+                break
+        return (param_node, param_index)
+
+    def _find_final(self, func, param_nodes):
+        """Find the final parameter."""
+        param = func.get_param(self.name)
+        param_index = -1
+
+        # the described param is not in the final function
+        if not param:
+            # search the template parameters
+            node, index = self._search_param_node(param_nodes)
+            if not node:
+                raise SpecError("invalid desc %s in %s" %
+                        (self.name, func.name))
+
+            # a named parameter of a vector
+            if index >= 0:
+                param = func.get_param(node.prop("name"))
+                param_index = index
+            elif node.name == "vector":
+                # must be an expanded vector, check its size
+                if self.size_str and self.size_str.isdigit():
+                    size = int(self.size_str)
+                    expanded_size = func.param_node_size(node)
+                    if size != expanded_size:
+                        return (False, None, -1)
+            # otherwise, it is a valid, but no-op, description
+
+        return (True, param, param_index)
+
+    def validate(self, func, param_nodes):
+        """Validate a description against certain function."""
+        if self.checker.switches and not self.values:
+            raise SpecError("no valid values for %s" % self.name)
+
+        valid, param, param_index = self._find_final(func, param_nodes)
+        if not valid:
+            return False
+
+        # the description is valid, but the param is gone
+        # mark it no-op so that it will be skipped
+        if not param:
+            self._is_noop = True
+            return True
+
+        if param.is_vector:
+            # if param was known, this should have been done in __init__
+            if self._has_enum:
+                self.size_str = "1"
+            # size mismatch
+            if (param.size and self.size_str and self.size_str.isdigit() and
+                param.size != int(self.size_str)):
+                return False
+        elif self.size_str:
+            # only vector accepts vector_size
+            raise SpecError("vector_size is invalid for %s" % param.name)
+
+        if not self.checker.validate(func, param_nodes):
+            return False
+
+        # update the description
+        self.name = param.name
+        self.index = param_index
+
+        return True
+
+
+def main():
+    import libxml2
+
+    filename = "APIspec.xml"
+    apinames = ["GLES1.1", "GLES2.0"]
+
+    doc = libxml2.readFile(filename, None,
+            libxml2.XML_PARSE_DTDLOAD +
+            libxml2.XML_PARSE_DTDVALID +
+            libxml2.XML_PARSE_NOBLANKS)
+
+    spec = Spec(doc)
+    impl = spec.get_impl()
+    for apiname in apinames:
+        spec.get_api(apiname)
+
+    doc.freeDoc()
+
+    print "%s is successfully parsed" % filename
+
+
+if __name__ == "__main__":
+    main()
diff --git a/mesalib/src/mesa/main/APIspec.xml b/mesalib/src/mesa/main/APIspec.xml
new file mode 100644
index 000000000..4c5fd59d4
--- /dev/null
+++ b/mesalib/src/mesa/main/APIspec.xml
@@ -0,0 +1,4332 @@
+<?xml version="1.0"?>
+<!DOCTYPE apispec SYSTEM "APIspec.dtd">
+
+<!-- A function is generated from a template.  Multiple functions can be
+     generated from a single template with different arguments.  For example,
+     glColor3f can be generated from
+
+     <function name="Color3f" template="Color" gltype="GLfloat" vector_size="3" expand_vector="true"/>
+
+     and glColor4iv can be generated from
+
+     <function name="Color4iv" template="Color" gltype="GLint" vector_size="4"/>
+
+     In a template, there are <desc>s that describe the properties of
+     parameters.  A <desc> can enumerate the valid values of a parameter.  It
+     can also specify the error code when an invalid value is given, and etc.
+     By nesting <desc>s, they can create dependency between parameters.
+
+     A function can be marked as external.  It means that the function cannot
+     be dispatched to the corresponding mesa function, if one exists, directly,
+     and requires an external implementation.
+-->
+
+<apispec>
+
+<template name="Color">
+	<proto>
+		<return type="void"/>
+		<vector name="v" type="const GLtype *" size="dynamic">
+			<param name="red" type="GLtype"/>
+			<param name="green" type="GLtype"/>
+			<param name="blue" type="GLtype"/>
+			<param name="alpha" type="GLtype"/>
+		</vector>
+	</proto>
+</template>
+
+<template name="ClipPlane">
+	<proto>
+		<return type="void"/>
+		<param name="plane" type="GLenum"/>
+		<vector name="equation" type="const GLtype *" size="4"/>
+	</proto>
+
+	<desc name="plane">
+		<range base="GL_CLIP_PLANE" from="0" to="5"/>
+	</desc>
+</template>
+
+<template name="CullFace">
+	<proto>
+		<return type="void"/>
+		<param name="mode" type="GLenum"/>
+	</proto>
+
+	<desc name="mode">
+		<value name="GL_FRONT"/>
+		<value name="GL_BACK"/>
+		<value name="GL_FRONT_AND_BACK"/>
+	</desc>
+</template>
+
+<template name="Fog">
+	<proto>
+		<return type="void"/>
+		<param name="pname" type="GLenum"/>
+		<vector name="params" type="const GLtype *" size="dynamic">
+			<param name="param" type="GLtype"/>
+		</vector>
+	</proto>
+
+        <desc name="pname">
+		<value name="GL_FOG_MODE"/>
+		<desc name="param">
+			<value name="GL_EXP"/>
+			<value name="GL_EXP2"/>
+			<value name="GL_LINEAR"/>
+		</desc>
+        </desc>
+
+	<desc name="pname">
+		<value name="GL_FOG_COLOR"/>
+
+		<desc name="params" vector_size="4"/>
+	</desc>
+
+	<desc name="pname">
+		<value name="GL_FOG_DENSITY"/>
+		<value name="GL_FOG_START"/>
+		<value name="GL_FOG_END"/>
+
+		<desc name="params" vector_size="1"/>
+	</desc>
+</template>
+
+<template name="FrontFace">
+	<proto>
+		<return type="void"/>
+		<param name="mode" type="GLenum"/>
+	</proto>
+
+	<desc name="mode">
+		<value name="GL_CW"/>
+		<value name="GL_CCW"/>
+	</desc>
+</template>
+
+<template name="Hint">
+	<proto>
+		<return type="void"/>
+		<param name="target" type="GLenum"/>
+		<param name="mode" type="GLenum"/>
+	</proto>
+
+	<desc name="target" category="GLES1.1">
+		<value name="GL_FOG_HINT"/>
+		<value name="GL_LINE_SMOOTH_HINT"/>
+		<value name="GL_PERSPECTIVE_CORRECTION_HINT"/>
+		<value name="GL_POINT_SMOOTH_HINT"/>
+	</desc>
+	<desc name="target" category="OES_standard_derivatives">
+		<value name="GL_FRAGMENT_SHADER_DERIVATIVE_HINT_OES"/>
+	</desc>
+	<desc name="target">
+		<value name="GL_GENERATE_MIPMAP_HINT"/>
+	</desc>
+
+	<desc name="mode">
+		<value name="GL_FASTEST"/>
+		<value name="GL_NICEST"/>
+		<value name="GL_DONT_CARE"/>
+	</desc>
+</template>
+
+<template name="Light">
+	<proto>
+		<return type="void"/>
+		<param name="light" type="GLenum"/>
+		<param name="pname" type="GLenum"/>
+		<vector name="params" type="const GLtype *" size="dynamic">
+			<param name="param" type="GLtype"/>
+		</vector>
+	</proto>
+
+	<desc name="light">
+		<range base="GL_LIGHT" from="0" to="7"/>
+	</desc>
+
+	<desc name="pname">
+		<value name="GL_AMBIENT"/>
+		<value name="GL_DIFFUSE"/>
+		<value name="GL_SPECULAR"/>
+		<value name="GL_POSITION"/>
+
+		<desc name="params" vector_size="4"/>
+	</desc>
+
+	<desc name="pname">
+		<value name="GL_SPOT_DIRECTION"/>
+
+		<desc name="params" vector_size="3"/>
+	</desc>
+
+	<desc name="pname">
+		<value name="GL_SPOT_EXPONENT"/>
+		<value name="GL_SPOT_CUTOFF"/>
+		<value name="GL_CONSTANT_ATTENUATION"/>
+		<value name="GL_LINEAR_ATTENUATION"/>
+		<value name="GL_QUADRATIC_ATTENUATION"/>
+
+		<desc name="params" vector_size="1"/>
+	</desc>
+</template>
+
+<template name="LightModel">
+	<proto>
+		<return type="void"/>
+		<param name="pname" type="GLenum"/>
+		<vector name="params" type="const GLtype *" size="dynamic">
+			<param name="param" type="GLtype"/>
+		</vector>
+	</proto>
+
+	<desc name="pname">
+		<value name="GL_LIGHT_MODEL_AMBIENT"/>
+
+		<desc name="params" vector_size="4"/>
+	</desc>
+
+	<desc name="pname">
+		<value name="GL_LIGHT_MODEL_TWO_SIDE"/>
+		<desc name="param">
+			<value name="GL_TRUE"/>
+			<value name="GL_FALSE"/>
+		</desc>
+	</desc>
+</template>
+
+<template name="LineWidth">
+	<proto>
+		<return type="void"/>
+		<param name="width" type="GLtype"/>
+	</proto>
+</template>
+
+<template name="Material">
+	<proto>
+		<return type="void"/>
+		<param name="face" type="GLenum"/>
+		<param name="pname" type="GLenum"/>
+		<vector name="params" type="const GLtype *" size="dynamic">
+			<param name="param" type="GLtype"/>
+		</vector>
+	</proto>
+
+	<desc name="face">
+		<value name="GL_FRONT_AND_BACK"/>
+	</desc>
+
+	<desc name="pname">
+		<value name="GL_AMBIENT"/>
+		<value name="GL_DIFFUSE"/>
+		<value name="GL_AMBIENT_AND_DIFFUSE"/>
+		<value name="GL_SPECULAR"/>
+		<value name="GL_EMISSION"/>
+
+		<desc name="params" vector_size="4"/>
+	</desc>
+
+	<desc name="pname">
+		<value name="GL_SHININESS"/>
+
+		<desc name="params" vector_size="1"/>
+	</desc>
+</template>
+
+<template name="PointSize">
+	<proto>
+		<return type="void"/>
+		<param name="size" type="GLtype"/>
+	</proto>
+</template>
+
+<template name="PointSizePointer">
+	<proto>
+		<return type="void"/>
+		<param name="type" type="GLenum"/>
+		<param name="stride" type="GLsizei"/>
+		<param name="pointer" type="const GLvoid *"/>
+	</proto>
+
+	<desc name="type">
+		<value name="GL_FLOAT"/>
+		<value name="GL_FIXED"/>
+	</desc>
+</template>
+
+<template name="Scissor">
+	<proto>
+		<return type="void"/>
+		<param name="x" type="GLint"/>
+		<param name="y" type="GLint"/>
+		<param name="width" type="GLsizei"/>
+		<param name="height" type="GLsizei"/>
+	</proto>
+</template>
+
+<template name="ShadeModel">
+	<proto>
+		<return type="void"/>
+		<param name="mode" type="GLenum"/>
+	</proto>
+
+	<desc name="mode">
+		<value name="GL_FLAT"/>
+		<value name="GL_SMOOTH"/>
+	</desc>
+</template>
+
+<template name="TexParameter">
+	<proto>
+		<return type="void"/>
+		<param name="target" type="GLenum"/>
+		<param name="pname" type="GLenum"/>
+		<vector name="params" type="const GLtype *" size="dynamic">
+			<param name="param" type="GLtype"/>
+		</vector>
+	</proto>
+
+	<desc name="target">
+		<value name="GL_TEXTURE_2D"/>
+		<value name="GL_TEXTURE_CUBE_MAP" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_3D_OES" category="OES_texture_3D"/>
+	</desc>
+
+	<desc name="pname">
+		<value name="GL_TEXTURE_WRAP_S"/>
+		<value name="GL_TEXTURE_WRAP_T"/>
+		<value name="GL_TEXTURE_WRAP_R_OES" category="OES_texture_3D"/>
+
+		<desc name="param">
+			<value name="GL_CLAMP_TO_EDGE"/>
+			<value name="GL_REPEAT"/>
+			<value name="GL_MIRRORED_REPEAT" category="GLES2.0"/>
+			<value name="GL_MIRRORED_REPEAT_OES" category="OES_texture_mirrored_repeat"/>
+		</desc>
+	</desc>
+
+	<desc name="pname">
+		<value name="GL_TEXTURE_MIN_FILTER"/>
+
+		<desc name="param">
+			<value name="GL_NEAREST"/>
+			<value name="GL_LINEAR"/>
+			<value name="GL_NEAREST_MIPMAP_NEAREST"/>
+			<value name="GL_NEAREST_MIPMAP_LINEAR"/>
+			<value name="GL_LINEAR_MIPMAP_NEAREST"/>
+			<value name="GL_LINEAR_MIPMAP_LINEAR"/>
+		</desc>
+	</desc>
+
+	<desc name="pname">
+		<value name="GL_TEXTURE_MAG_FILTER"/>
+
+		<desc name="param">
+			<value name="GL_NEAREST"/>
+			<value name="GL_LINEAR"/>
+		</desc>
+	</desc>
+
+	<desc name="pname" category="GLES1.1">
+		<value name="GL_GENERATE_MIPMAP"/>
+
+		<desc name="param">
+			<value name="GL_TRUE"/>
+			<value name="GL_FALSE"/>
+		</desc>
+	</desc>
+
+	<desc name="pname" category="EXT_texture_filter_anisotropic">
+		<value name="GL_TEXTURE_MAX_ANISOTROPY_EXT"/>
+		<desc name="params" vector_size="1"/>
+	</desc>
+
+	<desc name="pname" category="OES_draw_texture">
+		<value name="GL_TEXTURE_CROP_RECT_OES"/>
+		<desc name="params" vector_size="4"/>
+	</desc>
+</template>
+
+<template name="TexImage2D">
+	<proto>
+		<return type="void"/>
+		<param name="target" type="GLenum"/>
+		<param name="level" type="GLint"/>
+		<param name="internalFormat" type="GLint"/> <!-- should be GLenum -->
+		<param name="width" type="GLsizei"/>
+		<param name="height" type="GLsizei"/>
+		<param name="border" type="GLint"/>
+		<param name="format" type="GLenum"/>
+		<param name="type" type="GLenum"/>
+		<param name="pixels" type="const GLvoid *"/>
+	</proto>
+
+	<desc name="target">
+		<value name="GL_TEXTURE_2D"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES" category="OES_texture_cube_map"/>
+	</desc>
+
+	<desc name="internalFormat" error="GL_INVALID_VALUE">
+		<value name="GL_ALPHA"/>
+		<value name="GL_RGB"/>
+		<value name="GL_RGBA"/>
+		<value name="GL_LUMINANCE"/>
+		<value name="GL_LUMINANCE_ALPHA"/>
+		<value name="GL_DEPTH_COMPONENT" category="OES_depth_texture"/>
+		<value name="GL_DEPTH_STENCIL_OES" category="OES_packed_depth_stencil"/>
+	</desc>
+
+	<desc name="border" error="GL_INVALID_VALUE">
+		<value name="0"/>
+	</desc>
+
+	<desc name="format">
+		<value name="GL_ALPHA"/>
+
+		<desc name="type" error="GL_INVALID_OPERATION">
+			<value name="GL_UNSIGNED_BYTE"/>
+			<value name="GL_FLOAT" category="OES_texture_float"/>
+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
+		</desc>
+	</desc>
+
+	<desc name="format">
+		<value name="GL_RGB"/>
+
+		<desc name="type" error="GL_INVALID_OPERATION">
+			<value name="GL_UNSIGNED_BYTE"/>
+			<value name="GL_UNSIGNED_SHORT_5_6_5"/>
+			<value name="GL_FLOAT" category="OES_texture_float"/>
+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
+		</desc>
+	</desc>
+
+	<desc name="format">
+		<value name="GL_RGBA"/>
+
+		<desc name="type" error="GL_INVALID_OPERATION">
+			<value name="GL_UNSIGNED_BYTE"/>
+			<value name="GL_UNSIGNED_SHORT_4_4_4_4"/>
+			<value name="GL_UNSIGNED_SHORT_5_5_5_1"/>
+			<value name="GL_FLOAT" category="OES_texture_float"/>
+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
+			<value name="GL_UNSIGNED_INT_2_10_10_10_REV_EXT" category="EXT_texture_type_2_10_10_10_REV"/>
+		</desc>
+	</desc>
+
+	<desc name="format">
+		<value name="GL_LUMINANCE"/>
+
+		<desc name="type" error="GL_INVALID_OPERATION">
+			<value name="GL_UNSIGNED_BYTE"/>
+			<value name="GL_FLOAT" category="OES_texture_float"/>
+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
+		</desc>
+	</desc>
+
+	<desc name="format">
+		<value name="GL_LUMINANCE_ALPHA"/>
+
+		<desc name="type" error="GL_INVALID_OPERATION">
+			<value name="GL_UNSIGNED_BYTE"/>
+			<value name="GL_FLOAT" category="OES_texture_float"/>
+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
+		</desc>
+	</desc>
+
+	<desc name="format" category="OES_depth_texture">
+		<value name="GL_DEPTH_COMPONENT"/>
+
+		<desc name="type" error="GL_INVALID_OPERATION">
+			<value name="GL_UNSIGNED_SHORT"/>
+			<value name="GL_UNSIGNED_INT"/>
+		</desc>
+	</desc>
+
+	<desc name="format" category="OES_packed_depth_stencil">
+		<value name="GL_DEPTH_STENCIL_OES"/>
+
+		<desc name="type" error="GL_INVALID_OPERATION">
+			<value name="GL_UNSIGNED_INT_24_8_OES"/>
+		</desc>
+	</desc>
+</template>
+
+<template name="TexEnv">
+	<proto>
+		<return type="void"/>
+		<param name="target" type="GLenum"/>
+		<param name="pname" type="GLenum"/>
+		<vector name="params" type="const GLtype *" size="dynamic">
+			<param name="param" type="GLtype"/>
+		</vector>
+	</proto>
+
+	<desc name="target" category="OES_point_sprite">
+		<value name="GL_POINT_SPRITE_OES"/>
+
+		<desc name="pname">
+			<value name="GL_COORD_REPLACE_OES"/>
+		</desc>
+	</desc>
+
+	<desc name="pname" category="OES_point_sprite">
+		<value name="GL_COORD_REPLACE_OES"/>
+
+		<desc name="param">
+			<value name="GL_TRUE"/>
+			<value name="GL_FALSE"/>
+		</desc>
+	</desc>
+
+	<desc name="target" category="EXT_texture_lod_bias">
+		<value name="GL_TEXTURE_FILTER_CONTROL_EXT"/>
+
+		<desc name="pname">
+			<value name="GL_TEXTURE_LOD_BIAS_EXT"/>
+		</desc>
+	</desc>
+
+	<desc name="pname" category="EXT_texture_lod_bias">
+		<value name="GL_TEXTURE_LOD_BIAS_EXT"/>
+		<desc name="params" vector_size="1"/>
+	</desc>
+
+	<desc name="target">
+		<value name="GL_TEXTURE_ENV"/>
+
+		<desc name="pname">
+			<value name="GL_TEXTURE_ENV_MODE"/>
+			<value name="GL_COMBINE_RGB"/>
+			<value name="GL_COMBINE_ALPHA"/>
+			<value name="GL_RGB_SCALE"/>
+			<value name="GL_ALPHA_SCALE"/>
+			<value name="GL_SRC0_RGB"/>
+			<value name="GL_SRC1_RGB"/>
+			<value name="GL_SRC2_RGB"/>
+			<value name="GL_SRC0_ALPHA"/>
+			<value name="GL_SRC1_ALPHA"/>
+			<value name="GL_SRC2_ALPHA"/>
+			<value name="GL_OPERAND0_RGB"/>
+			<value name="GL_OPERAND1_RGB"/>
+			<value name="GL_OPERAND2_RGB"/>
+			<value name="GL_OPERAND0_ALPHA"/>
+			<value name="GL_OPERAND1_ALPHA"/>
+			<value name="GL_OPERAND2_ALPHA"/>
+			<value name="GL_TEXTURE_ENV_COLOR"/>
+		</desc>
+	</desc>
+
+	<desc name="pname">
+		<value name="GL_TEXTURE_ENV_MODE"/>
+
+		<desc name="param">
+			<value name="GL_REPLACE"/>
+			<value name="GL_MODULATE"/>
+			<value name="GL_DECAL"/>
+			<value name="GL_BLEND"/>
+			<value name="GL_ADD"/>
+			<value name="GL_COMBINE"/>
+		</desc>
+	</desc>
+
+	<desc name="pname">
+		<value name="GL_COMBINE_RGB"/>
+
+		<desc name="param">
+			<value name="GL_REPLACE"/>
+			<value name="GL_MODULATE"/>
+			<value name="GL_ADD"/>
+			<value name="GL_ADD_SIGNED"/>
+			<value name="GL_INTERPOLATE"/>
+			<value name="GL_SUBTRACT"/>
+			<value name="GL_DOT3_RGB"/>
+			<value name="GL_DOT3_RGBA"/>
+		</desc>
+	</desc>
+
+	<desc name="pname">
+		<value name="GL_COMBINE_ALPHA"/>
+
+		<desc name="param">
+			<value name="GL_REPLACE"/>
+			<value name="GL_MODULATE"/>
+			<value name="GL_ADD"/>
+			<value name="GL_ADD_SIGNED"/>
+			<value name="GL_INTERPOLATE"/>
+			<value name="GL_SUBTRACT"/>
+		</desc>
+	</desc>
+
+	<desc name="pname">
+		<value name="GL_RGB_SCALE"/>
+		<value name="GL_ALPHA_SCALE"/>
+
+		<desc name="param" convert="true" error="GL_INVALID_VALUE">
+			<value name="1.0"/>
+			<value name="2.0"/>
+			<value name="4.0"/>
+		</desc>
+	</desc>
+
+	<desc name="pname">
+		<value name="GL_SRC0_RGB"/>
+		<value name="GL_SRC1_RGB"/>
+		<value name="GL_SRC2_RGB"/>
+		<value name="GL_SRC0_ALPHA"/>
+		<value name="GL_SRC1_ALPHA"/>
+		<value name="GL_SRC2_ALPHA"/>
+
+		<desc name="param">
+			<value name="GL_TEXTURE"/>
+			<value name="GL_CONSTANT"/>
+			<value name="GL_PRIMARY_COLOR"/>
+			<value name="GL_PREVIOUS"/>
+
+			<range base="GL_TEXTURE" from="0" to="31" category="OES_texture_env_crossbar"/>
+		</desc>
+	</desc>
+
+	<desc name="pname">
+		<value name="GL_OPERAND0_RGB"/>
+		<value name="GL_OPERAND1_RGB"/>
+		<value name="GL_OPERAND2_RGB"/>
+
+		<desc name="param">
+			<value name="GL_SRC_COLOR"/>
+			<value name="GL_ONE_MINUS_SRC_COLOR"/>
+			<value name="GL_SRC_ALPHA"/>
+			<value name="GL_ONE_MINUS_SRC_ALPHA"/>
+		</desc>
+	</desc>
+
+	<desc name="pname">
+		<value name="GL_OPERAND0_ALPHA"/>
+		<value name="GL_OPERAND1_ALPHA"/>
+		<value name="GL_OPERAND2_ALPHA"/>
+
+		<desc name="param">
+			<value name="GL_SRC_ALPHA"/>
+			<value name="GL_ONE_MINUS_SRC_ALPHA"/>
+		</desc>
+	</desc>
+
+	<desc name="pname">
+		<value name="GL_TEXTURE_ENV_COLOR"/>
+
+		<desc name="params" vector_size="4"/>
+	</desc>
+</template>
+
+<template name="TexGen">
+	<proto>
+		<return type="void"/>
+		<param name="coord" type="GLenum"/>
+		<param name="pname" type="GLenum"/>
+		<vector name="params" type="const GLtype *" size="dynamic">
+			<param name="param" type="GLtype"/>
+		</vector>
+	</proto>
+
+	<desc name="coord" category="OES_texture_cube_map">
+		<value name="GL_TEXTURE_GEN_STR_OES"/>
+	</desc>
+
+	<desc name="pname" category="OES_texture_cube_map">
+		<value name="GL_TEXTURE_GEN_MODE_OES"/>
+
+		<desc name="param">
+			<value name="GL_NORMAL_MAP_OES"/>
+			<value name="GL_REFLECTION_MAP_OES"/>
+		</desc>
+	</desc>
+</template>
+
+<template name="Clear">
+	<proto>
+		<return type="void"/>
+		<param name="mask" type="GLbitfield"/>
+	</proto>
+
+	<desc name="mask" error="GL_INVALID_VALUE">
+		<value name="0"/>
+		<value name="(GL_COLOR_BUFFER_BIT)"/>
+		<value name="(GL_DEPTH_BUFFER_BIT)"/>
+		<value name="(GL_STENCIL_BUFFER_BIT)"/>
+		<value name="(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT)"/>
+		<value name="(GL_COLOR_BUFFER_BIT|GL_STENCIL_BUFFER_BIT)"/>
+		<value name="(GL_DEPTH_BUFFER_BIT|GL_STENCIL_BUFFER_BIT)"/>
+		<value name="(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT|GL_STENCIL_BUFFER_BIT)"/>
+	</desc>
+</template>
+
+<template name="ClearColor">
+	<proto>
+		<return type="void"/>
+		<param name="red" type="GLtype"/>
+		<param name="green" type="GLtype"/>
+		<param name="blue" type="GLtype"/>
+		<param name="alpha" type="GLtype"/>
+	</proto>
+</template>
+
+<template name="ClearStencil">
+	<proto>
+		<return type="void"/>
+		<param name="s" type="GLint"/>
+	</proto>
+</template>
+
+<template name="ClearDepth">
+	<proto>
+		<return type="void"/>
+		<param name="depth" type="GLtype"/>
+	</proto>
+</template>
+
+<template name="StencilMask">
+	<proto>
+		<return type="void"/>
+		<param name="mask" type="GLuint"/>
+	</proto>
+</template>
+
+<template name="StencilMaskSeparate">
+	<proto>
+		<return type="void"/>
+		<param name="face" type="GLenum"/>
+		<param name="mask" type="GLuint"/>
+	</proto>
+
+	<desc name="face">
+		<value name="GL_FRONT"/>
+		<value name="GL_BACK"/>
+		<value name="GL_FRONT_AND_BACK"/>
+	</desc>
+</template>
+
+<template name="ColorMask">
+	<proto>
+		<return type="void"/>
+		<param name="red" type="GLboolean"/>
+		<param name="green" type="GLboolean"/>
+		<param name="blue" type="GLboolean"/>
+		<param name="alpha" type="GLboolean"/>
+	</proto>
+</template>
+
+<template name="DepthMask">
+	<proto>
+		<return type="void"/>
+		<param name="flag" type="GLboolean"/>
+	</proto>
+</template>
+
+<template name="Disable">
+	<proto>
+		<return type="void"/>
+		<param name="cap" type="GLenum"/>
+	</proto>
+
+	<desc name="cap" category="GLES1.1">
+		<value name="GL_NORMALIZE"/>
+		<value name="GL_RESCALE_NORMAL"/>
+
+		<range base="GL_CLIP_PLANE" from="0" to="5"/>
+
+		<value name="GL_FOG"/>
+		<value name="GL_LIGHTING"/>
+		<value name="GL_COLOR_MATERIAL"/>
+
+		<range base="GL_LIGHT" from="0" to="7"/>
+
+		<value name="GL_POINT_SMOOTH"/>
+		<value name="GL_LINE_SMOOTH"/>
+		<value name="GL_CULL_FACE"/>
+		<value name="GL_POLYGON_OFFSET_FILL"/>
+		<value name="GL_MULTISAMPLE"/>
+		<value name="GL_SAMPLE_ALPHA_TO_COVERAGE"/>
+		<value name="GL_SAMPLE_ALPHA_TO_ONE"/>
+		<value name="GL_SAMPLE_COVERAGE"/>
+		<value name="GL_TEXTURE_2D"/>
+		<value name="GL_SCISSOR_TEST"/>
+		<value name="GL_ALPHA_TEST"/>
+		<value name="GL_STENCIL_TEST"/>
+		<value name="GL_DEPTH_TEST"/>
+		<value name="GL_BLEND"/>
+		<value name="GL_DITHER"/>
+		<value name="GL_COLOR_LOGIC_OP"/>
+
+		<value name="GL_POINT_SPRITE_OES" category="OES_point_sprite"/>
+		<value name="GL_MATRIX_PALETTE_OES" category="OES_matrix_palette"/>
+		<value name="GL_TEXTURE_CUBE_MAP_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_GEN_STR_OES" category="OES_texture_cube_map"/>
+	</desc>
+
+	<desc name="cap" category="GLES2.0">
+		<value name="GL_CULL_FACE"/>
+		<value name="GL_SCISSOR_TEST"/>
+		<value name="GL_POLYGON_OFFSET_FILL"/>
+		<value name="GL_SAMPLE_ALPHA_TO_COVERAGE"/>
+		<value name="GL_SAMPLE_COVERAGE"/>
+		<value name="GL_STENCIL_TEST"/>
+		<value name="GL_DEPTH_TEST"/>
+		<value name="GL_DITHER"/>
+		<value name="GL_BLEND"/>
+	</desc>
+</template>
+
+<!-- it is exactly the same as Disable -->
+<template name="Enable">
+	<proto>
+		<return type="void"/>
+		<param name="cap" type="GLenum"/>
+	</proto>
+
+	<desc name="cap" category="GLES1.1">
+		<value name="GL_NORMALIZE"/>
+		<value name="GL_RESCALE_NORMAL"/>
+
+		<range base="GL_CLIP_PLANE" from="0" to="5"/>
+
+		<value name="GL_FOG"/>
+		<value name="GL_LIGHTING"/>
+		<value name="GL_COLOR_MATERIAL"/>
+
+		<range base="GL_LIGHT" from="0" to="7"/>
+
+		<value name="GL_POINT_SMOOTH"/>
+		<value name="GL_LINE_SMOOTH"/>
+		<value name="GL_CULL_FACE"/>
+		<value name="GL_POLYGON_OFFSET_FILL"/>
+		<value name="GL_MULTISAMPLE"/>
+		<value name="GL_SAMPLE_ALPHA_TO_COVERAGE"/>
+		<value name="GL_SAMPLE_ALPHA_TO_ONE"/>
+		<value name="GL_SAMPLE_COVERAGE"/>
+		<value name="GL_TEXTURE_2D"/>
+		<value name="GL_SCISSOR_TEST"/>
+		<value name="GL_ALPHA_TEST"/>
+		<value name="GL_STENCIL_TEST"/>
+		<value name="GL_DEPTH_TEST"/>
+		<value name="GL_BLEND"/>
+		<value name="GL_DITHER"/>
+		<value name="GL_COLOR_LOGIC_OP"/>
+
+		<value name="GL_POINT_SPRITE_OES" category="OES_point_sprite"/>
+		<value name="GL_MATRIX_PALETTE_OES" category="OES_matrix_palette"/>
+		<value name="GL_TEXTURE_CUBE_MAP_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_GEN_STR_OES" category="OES_texture_cube_map"/>
+	</desc>
+
+	<desc name="cap" category="GLES2.0">
+		<value name="GL_CULL_FACE"/>
+		<value name="GL_SCISSOR_TEST"/>
+		<value name="GL_POLYGON_OFFSET_FILL"/>
+		<value name="GL_SAMPLE_ALPHA_TO_COVERAGE"/>
+		<value name="GL_SAMPLE_COVERAGE"/>
+		<value name="GL_STENCIL_TEST"/>
+		<value name="GL_DEPTH_TEST"/>
+		<value name="GL_DITHER"/>
+		<value name="GL_BLEND"/>
+	</desc>
+</template>
+
+<template name="Finish">
+	<proto>
+		<return type="void"/>
+	</proto>
+</template>
+
+<template name="Flush">
+	<proto>
+		<return type="void"/>
+	</proto>
+</template>
+
+<template name="AlphaFunc">
+	<proto>
+		<return type="void"/>
+		<param name="func" type="GLenum"/>
+		<param name="ref" type="GLtype"/>
+	</proto>
+	<desc name="func">
+		<value name="GL_NEVER"/>
+		<value name="GL_LESS"/>
+		<value name="GL_EQUAL"/>
+		<value name="GL_LEQUAL"/>
+		<value name="GL_GREATER"/>
+		<value name="GL_NOTEQUAL"/>
+		<value name="GL_GEQUAL"/>
+		<value name="GL_ALWAYS"/>
+	</desc>
+</template>
+
+<template name="BlendFunc">
+	<proto>
+		<return type="void"/>
+		<param name="sfactor" type="GLenum"/>
+		<param name="dfactor" type="GLenum"/>
+	</proto>
+
+	<desc name="sfactor">
+		<value name="GL_ZERO"/>
+		<value name="GL_ONE"/>
+		<value name="GL_SRC_COLOR"/>
+		<value name="GL_ONE_MINUS_SRC_COLOR"/>
+		<value name="GL_SRC_ALPHA"/>
+		<value name="GL_ONE_MINUS_SRC_ALPHA"/>
+		<value name="GL_DST_ALPHA"/>
+		<value name="GL_ONE_MINUS_DST_ALPHA"/>
+		<value name="GL_DST_COLOR"/>
+		<value name="GL_ONE_MINUS_DST_COLOR"/>
+		<value name="GL_SRC_ALPHA_SATURATE"/>
+
+		<value name="GL_CONSTANT_COLOR" category="GLES2.0"/>
+		<value name="GL_CONSTANT_ALPHA" category="GLES2.0"/>
+		<value name="GL_ONE_MINUS_CONSTANT_COLOR" category="GLES2.0"/>
+		<value name="GL_ONE_MINUS_CONSTANT_ALPHA" category="GLES2.0"/>
+	</desc>
+
+	<desc name="dfactor">
+		<value name="GL_ZERO"/>
+		<value name="GL_ONE"/>
+		<value name="GL_SRC_COLOR"/>
+		<value name="GL_ONE_MINUS_SRC_COLOR"/>
+		<value name="GL_SRC_ALPHA"/>
+		<value name="GL_ONE_MINUS_SRC_ALPHA"/>
+		<value name="GL_DST_ALPHA"/>
+		<value name="GL_ONE_MINUS_DST_ALPHA"/>
+		<value name="GL_DST_COLOR"/>
+		<value name="GL_ONE_MINUS_DST_COLOR"/>
+
+		<value name="GL_CONSTANT_COLOR" category="GLES2.0"/>
+		<value name="GL_CONSTANT_ALPHA" category="GLES2.0"/>
+		<value name="GL_ONE_MINUS_CONSTANT_COLOR" category="GLES2.0"/>
+		<value name="GL_ONE_MINUS_CONSTANT_ALPHA" category="GLES2.0"/>
+	</desc>
+</template>
+
+<template name="LogicOp">
+	<proto>
+		<return type="void"/>
+		<param name="opcode" type="GLenum"/>
+	</proto>
+
+	<desc name="opcode">
+		<value name="GL_CLEAR"/>
+		<value name="GL_SET"/>
+		<value name="GL_COPY"/>
+		<value name="GL_COPY_INVERTED"/>
+		<value name="GL_NOOP"/>
+		<value name="GL_INVERT"/>
+		<value name="GL_AND"/>
+		<value name="GL_NAND"/>
+		<value name="GL_OR"/>
+		<value name="GL_NOR"/>
+		<value name="GL_XOR"/>
+		<value name="GL_EQUIV"/>
+		<value name="GL_AND_REVERSE"/>
+		<value name="GL_AND_INVERTED"/>
+		<value name="GL_OR_REVERSE"/>
+		<value name="GL_OR_INVERTED"/>
+	</desc>
+</template>
+
+<template name="StencilFunc">
+	<proto>
+		<return type="void"/>
+		<param name="func" type="GLenum"/>
+		<param name="ref" type="GLint"/>
+		<param name="mask" type="GLuint"/>
+	</proto>
+
+	<desc name="func">
+		<value name="GL_NEVER"/>
+		<value name="GL_LESS"/>
+		<value name="GL_LEQUAL"/>
+		<value name="GL_GREATER"/>
+		<value name="GL_GEQUAL"/>
+		<value name="GL_EQUAL"/>
+		<value name="GL_NOTEQUAL"/>
+		<value name="GL_ALWAYS"/>
+	</desc>
+</template>
+
+<template name="StencilFuncSeparate">
+	<proto>
+		<return type="void"/>
+		<param name="face" type="GLenum"/>
+		<param name="func" type="GLenum"/>
+		<param name="ref" type="GLint"/>
+		<param name="mask" type="GLuint"/>
+	</proto>
+
+	<desc name="face">
+		<value name="GL_FRONT"/>
+		<value name="GL_BACK"/>
+		<value name="GL_FRONT_AND_BACK"/>
+	</desc>
+
+	<desc name="func">
+		<value name="GL_NEVER"/>
+		<value name="GL_LESS"/>
+		<value name="GL_LEQUAL"/>
+		<value name="GL_GREATER"/>
+		<value name="GL_GEQUAL"/>
+		<value name="GL_EQUAL"/>
+		<value name="GL_NOTEQUAL"/>
+		<value name="GL_ALWAYS"/>
+	</desc>
+</template>
+
+<template name="StencilOp">
+	<proto>
+		<return type="void"/>
+		<param name="fail" type="GLenum"/>
+		<param name="zfail" type="GLenum"/>
+		<param name="zpass" type="GLenum"/>
+	</proto>
+
+	<desc name="fail">
+		<value name="GL_KEEP"/>
+		<value name="GL_ZERO"/>
+		<value name="GL_REPLACE"/>
+		<value name="GL_INCR"/>
+		<value name="GL_DECR"/>
+		<value name="GL_INVERT"/>
+		<value name="GL_INCR_WRAP" category="GLES2.0"/>
+		<value name="GL_DECR_WRAP" category="GLES2.0"/>
+		<value name="GL_INCR_WRAP_OES" category="OES_stencil_wrap"/>
+		<value name="GL_DECR_WRAP_OES" category="OES_stencil_wrap"/>
+	</desc>
+
+	<desc name="zfail">
+		<value name="GL_KEEP"/>
+		<value name="GL_ZERO"/>
+		<value name="GL_REPLACE"/>
+		<value name="GL_INCR"/>
+		<value name="GL_DECR"/>
+		<value name="GL_INVERT"/>
+		<value name="GL_INCR_WRAP" category="GLES2.0"/>
+		<value name="GL_DECR_WRAP" category="GLES2.0"/>
+		<value name="GL_INCR_WRAP_OES" category="OES_stencil_wrap"/>
+		<value name="GL_DECR_WRAP_OES" category="OES_stencil_wrap"/>
+	</desc>
+
+	<desc name="zpass">
+		<value name="GL_KEEP"/>
+		<value name="GL_ZERO"/>
+		<value name="GL_REPLACE"/>
+		<value name="GL_INCR"/>
+		<value name="GL_DECR"/>
+		<value name="GL_INVERT"/>
+		<value name="GL_INCR_WRAP" category="GLES2.0"/>
+		<value name="GL_DECR_WRAP" category="GLES2.0"/>
+		<value name="GL_INCR_WRAP_OES" category="OES_stencil_wrap"/>
+		<value name="GL_DECR_WRAP_OES" category="OES_stencil_wrap"/>
+	</desc>
+</template>
+
+<template name="StencilOpSeparate">
+	<proto>
+		<return type="void"/>
+		<param name="face" type="GLenum"/>
+		<param name="fail" type="GLenum"/>
+		<param name="zfail" type="GLenum"/>
+		<param name="zpass" type="GLenum"/>
+	</proto>
+
+	<desc name="face">
+		<value name="GL_FRONT"/>
+		<value name="GL_BACK"/>
+		<value name="GL_FRONT_AND_BACK"/>
+	</desc>
+
+	<desc name="fail">
+		<value name="GL_KEEP"/>
+		<value name="GL_ZERO"/>
+		<value name="GL_REPLACE"/>
+		<value name="GL_INCR"/>
+		<value name="GL_DECR"/>
+		<value name="GL_INVERT"/>
+		<value name="GL_INCR_WRAP"/>
+		<value name="GL_DECR_WRAP"/>
+	</desc>
+
+	<desc name="zfail">
+		<value name="GL_KEEP"/>
+		<value name="GL_ZERO"/>
+		<value name="GL_REPLACE"/>
+		<value name="GL_INCR"/>
+		<value name="GL_DECR"/>
+		<value name="GL_INVERT"/>
+		<value name="GL_INCR_WRAP"/>
+		<value name="GL_DECR_WRAP"/>
+	</desc>
+
+	<desc name="zpass">
+		<value name="GL_KEEP"/>
+		<value name="GL_ZERO"/>
+		<value name="GL_REPLACE"/>
+		<value name="GL_INCR"/>
+		<value name="GL_DECR"/>
+		<value name="GL_INVERT"/>
+		<value name="GL_INCR_WRAP"/>
+		<value name="GL_DECR_WRAP"/>
+	</desc>
+</template>
+
+<template name="DepthFunc">
+	<proto>
+		<return type="void"/>
+		<param name="func" type="GLenum"/>
+	</proto>
+
+	<desc name="func">
+		<value name="GL_NEVER"/>
+		<value name="GL_LESS"/>
+		<value name="GL_EQUAL"/>
+		<value name="GL_LEQUAL"/>
+		<value name="GL_GREATER"/>
+		<value name="GL_NOTEQUAL"/>
+		<value name="GL_GEQUAL"/>
+		<value name="GL_ALWAYS"/>
+	</desc>
+</template>
+
+<template name="PixelStore">
+	<proto>
+		<return type="void"/>
+		<param name="pname" type="GLenum"/>
+		<param name="param" type="GLtype"/>
+	</proto>
+
+	<desc name="pname">
+		<value name="GL_PACK_ALIGNMENT"/>
+		<value name="GL_UNPACK_ALIGNMENT"/>
+	</desc>
+
+	<desc name="param" error="GL_INVALID_VALUE">
+		<value name="1"/>
+		<value name="2"/>
+		<value name="4"/>
+		<value name="8"/>
+	</desc>
+</template>
+
+<template name="ReadPixels" direction="get">
+	<proto>
+		<return type="void"/>
+		<param name="x" type="GLint"/>
+		<param name="y" type="GLint"/>
+		<param name="width" type="GLsizei"/>
+		<param name="height" type="GLsizei"/>
+		<param name="format" type="GLenum"/>
+		<param name="type" type="GLenum"/>
+		<param name="pixels" type="GLvoid *"/>
+	</proto>
+
+	<!-- Technically, only two combinations are actually allowed:
+	     GL_RGBA/GL_UNSIGNED_BYTE, and some implementation-specific
+	     internal preferred combination.  I don't know what that is, so I'm
+	     allowing any valid combination for now; the underlying support
+	     should fail when necessary.-->
+	<desc name="format">
+		<value name="GL_ALPHA"/>
+		<desc name="type" error="GL_INVALID_OPERATION">
+			<value name="GL_UNSIGNED_BYTE"/>
+		</desc>
+	</desc>
+
+	<desc name="format">
+		<value name="GL_RGB"/>
+		<desc name="type" error="GL_INVALID_OPERATION">
+			<value name="GL_UNSIGNED_BYTE"/>
+			<value name="GL_UNSIGNED_SHORT_5_6_5"/>
+		</desc>
+	</desc>
+
+	<desc name="format">
+		<value name="GL_RGBA"/>
+		<desc name="type" error="GL_INVALID_OPERATION">
+			<value name="GL_UNSIGNED_BYTE"/>
+			<value name="GL_UNSIGNED_SHORT_4_4_4_4"/>
+			<value name="GL_UNSIGNED_SHORT_5_5_5_1"/>
+		</desc>
+	</desc>
+
+	<desc name="format">
+		<value name="GL_LUMINANCE"/>
+		<desc name="type" error="GL_INVALID_OPERATION">
+			<value name="GL_UNSIGNED_BYTE"/>
+		</desc>
+	</desc>
+
+	<desc name="format">
+		<value name="GL_LUMINANCE_ALPHA"/>
+		<desc name="type" error="GL_INVALID_OPERATION">
+			<value name="GL_UNSIGNED_BYTE"/>
+		</desc>
+	</desc>
+
+	<desc name="format" category="EXT_read_format_bgra">
+		<value name="GL_BGRA_EXT"/>
+
+		<desc name="type" error="GL_INVALID_OPERATION">
+			<value name="GL_UNSIGNED_BYTE"/>
+			<value name="GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT"/>
+			<value name="GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT"/>
+		</desc>
+	</desc>
+</template>
+
+<template name="GetClipPlane" direction="get">
+	<proto>
+		<return type="void"/>
+		<param name="plane" type="GLenum"/>
+		<vector name="equation" type="GLtype *" size="4"/>
+	</proto>
+
+	<desc name="plane">
+		<range base="GL_CLIP_PLANE" from="0" to="5"/>
+	</desc>
+</template>
+
+<template name="GetError" direction="get">
+	<proto>
+		<return type="GLenum"/>
+	</proto>
+</template>
+
+<!-- template for GetFloatv, GetIntegerv, GetBoolean, and GetFixedv -->
+<template name="GetState" direction="get">
+	<proto>
+		<return type="void"/>
+		<param name="pname" type="GLenum"/>
+		<vector name="params" type="GLtype *" size="dynamic"/>
+	</proto>
+	<!-- param checking is done in mesa -->
+</template>
+
+<template name="GetLight" direction="get">
+	<proto>
+		<return type="void"/>
+		<param name="light" type="GLenum"/>
+		<param name="pname" type="GLenum"/>
+		<vector name="params" type="GLtype *" size="dynamic"/>
+	</proto>
+
+	<desc name="light">
+		<range base="GL_LIGHT" from="0" to="7"/>
+	</desc>
+
+	<desc name="pname">
+		<value name="GL_AMBIENT"/>
+		<value name="GL_DIFFUSE"/>
+		<value name="GL_SPECULAR"/>
+		<value name="GL_POSITION"/>
+
+		<desc name="params" vector_size="4"/>
+	</desc>
+
+	<desc name="pname">
+		<value name="GL_SPOT_DIRECTION"/>
+
+		<desc name="params" vector_size="3"/>
+	</desc>
+
+	<desc name="pname">
+		<value name="GL_SPOT_EXPONENT"/>
+		<value name="GL_SPOT_CUTOFF"/>
+		<value name="GL_CONSTANT_ATTENUATION"/>
+		<value name="GL_LINEAR_ATTENUATION"/>
+		<value name="GL_QUADRATIC_ATTENUATION"/>
+
+		<desc name="params" vector_size="1"/>
+	</desc>
+</template>
+
+<template name="GetMaterial" direction="get">
+	<proto>
+		<return type="void"/>
+		<param name="face" type="GLenum"/>
+		<param name="pname" type="GLenum"/>
+		<vector name="params" type="GLtype *" size="dynamic">
+			<param name="param" type="GLtype"/>
+		</vector>
+	</proto>
+
+	<desc name="face">
+		<value name="GL_FRONT"/>
+		<value name="GL_BACK"/>
+	</desc>
+
+	<desc name="pname">
+		<value name="GL_SHININESS"/>
+		<desc name="params" vector_size="1"/>
+	</desc>
+
+	<desc name="pname">
+		<value name="GL_AMBIENT"/>
+		<value name="GL_DIFFUSE"/>
+		<value name="GL_AMBIENT_AND_DIFFUSE"/>
+		<value name="GL_SPECULAR"/>
+		<value name="GL_EMISSION"/>
+
+		<desc name="params" vector_size="4"/>
+	</desc>
+</template>
+
+<template name="GetString" direction="get">
+	<proto>
+		<return type="const GLubyte *"/>
+		<param name="name" type="GLenum"/>
+	</proto>
+
+	<desc name="name">
+		<value name="GL_VENDOR"/>
+		<value name="GL_RENDERER"/>
+		<value name="GL_VERSION"/>
+		<value name="GL_EXTENSIONS"/>
+		<value name="GL_SHADING_LANGUAGE_VERSION" category="GLES2.0"/>
+	</desc>
+</template>
+
+<template name="GetTexEnv" direction="get">
+	<proto>
+		<return type="void"/>
+		<param name="target" type="GLenum"/>
+		<param name="pname" type="GLenum"/>
+		<vector name="params" type="GLtype *" size="dynamic"/>
+	</proto>
+
+	<desc name="target" category="OES_point_sprite">
+		<value name="GL_POINT_SPRITE_OES"/>
+		<desc name="pname">
+			<value name="GL_COORD_REPLACE_OES"/>
+		</desc>
+	</desc>
+
+	<desc name="pname" category="OES_point_sprite">
+		<value name="GL_COORD_REPLACE_OES"/>
+		<desc name="params" vector_size="1" convert="false"/>
+	</desc>
+
+	<desc name="target" category="EXT_texture_lod_bias">
+		<value name="GL_TEXTURE_FILTER_CONTROL_EXT"/>
+
+		<desc name="pname">
+			<value name="GL_TEXTURE_LOD_BIAS_EXT"/>
+		</desc>
+	</desc>
+
+	<desc name="pname" category="EXT_texture_lod_bias">
+		<value name="GL_TEXTURE_LOD_BIAS_EXT"/>
+		<desc name="params" vector_size="1"/>
+	</desc>
+
+	<desc name="target">
+		<value name="GL_TEXTURE_ENV"/>
+
+		<desc name="pname">
+			<value name="GL_TEXTURE_ENV_COLOR"/>
+			<value name="GL_RGB_SCALE"/>
+			<value name="GL_ALPHA_SCALE"/>
+			<value name="GL_TEXTURE_ENV_MODE"/>
+			<value name="GL_COMBINE_RGB"/>
+			<value name="GL_COMBINE_ALPHA"/>
+			<value name="GL_SRC0_RGB"/>
+			<value name="GL_SRC1_RGB"/>
+			<value name="GL_SRC2_RGB"/>
+			<value name="GL_SRC0_ALPHA"/>
+			<value name="GL_SRC1_ALPHA"/>
+			<value name="GL_SRC2_ALPHA"/>
+			<value name="GL_OPERAND0_RGB"/>
+			<value name="GL_OPERAND1_RGB"/>
+			<value name="GL_OPERAND2_RGB"/>
+			<value name="GL_OPERAND0_ALPHA"/>
+			<value name="GL_OPERAND1_ALPHA"/>
+			<value name="GL_OPERAND2_ALPHA"/>
+		</desc>
+	</desc>
+
+	<desc name="pname">
+		<value name="GL_TEXTURE_ENV_COLOR"/>
+		<desc name="params" vector_size="4"/>
+	</desc>
+
+	<desc name="pname">
+		<value name="GL_RGB_SCALE"/>
+		<value name="GL_ALPHA_SCALE"/>
+
+		<desc name="params" vector_size="1"/>
+	</desc>
+
+	<desc name="pname">
+		<value name="GL_TEXTURE_ENV_MODE"/>
+		<value name="GL_COMBINE_RGB"/>
+		<value name="GL_COMBINE_ALPHA"/>
+		<value name="GL_SRC0_RGB"/>
+		<value name="GL_SRC1_RGB"/>
+		<value name="GL_SRC2_RGB"/>
+		<value name="GL_SRC0_ALPHA"/>
+		<value name="GL_SRC1_ALPHA"/>
+		<value name="GL_SRC2_ALPHA"/>
+		<value name="GL_OPERAND0_RGB"/>
+		<value name="GL_OPERAND1_RGB"/>
+		<value name="GL_OPERAND2_RGB"/>
+		<value name="GL_OPERAND0_ALPHA"/>
+		<value name="GL_OPERAND1_ALPHA"/>
+		<value name="GL_OPERAND2_ALPHA"/>
+
+		<desc name="params" vector_size="1" convert="false"/>
+	</desc>
+</template>
+
+<template name="GetTexGen" direction="get">
+	<proto>
+		<return type="void"/>
+		<param name="coord" type="GLenum"/>
+		<param name="pname" type="GLenum"/>
+		<vector name="params" type="GLtype *" size="dynamic"/>
+	</proto>
+
+	<desc name="coord">
+		<value name="GL_TEXTURE_GEN_STR_OES"/>
+	</desc>
+	<desc name="pname">
+		<value name="GL_TEXTURE_GEN_MODE_OES"/>
+		<desc name="params" vector_size="1" convert="false"/>
+	</desc>
+</template>
+
+<template name="GetTexParameter" direction="get">
+	<proto>
+		<return type="void"/>
+		<param name="target" type="GLenum"/>
+		<param name="pname" type="GLenum"/>
+		<vector name="params" type="GLtype *" size="dynamic"/>
+	</proto>
+
+	<desc name="target">
+		<value name="GL_TEXTURE_2D"/>
+		<value name="GL_TEXTURE_CUBE_MAP" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_3D_OES" category="OES_texture_3D"/>
+	</desc>
+
+	<desc name="pname">
+		<value name="GL_TEXTURE_WRAP_S"/>
+		<value name="GL_TEXTURE_WRAP_T"/>
+		<value name="GL_TEXTURE_WRAP_R_OES" category="OES_texture_3D"/>
+		<value name="GL_TEXTURE_MIN_FILTER"/>
+		<value name="GL_TEXTURE_MAG_FILTER"/>
+		<value name="GL_GENERATE_MIPMAP" category="GLES1.1"/>
+
+		<desc name="params" vector_size="1" convert="false"/>
+	</desc>
+
+	<desc name="pname" category="OES_draw_texture">
+		<value name="GL_TEXTURE_CROP_RECT_OES"/>
+		<desc name="params" vector_size="4"/>
+	</desc>
+</template>
+
+<template name="IsEnabled" direction="get">
+	<proto>
+		<return type="GLboolean"/>
+		<param name="cap" type="GLenum"/>
+	</proto>
+
+	<desc name="cap" category="GLES1.1">
+		<value name="GL_NORMALIZE"/>
+		<value name="GL_RESCALE_NORMAL"/>
+
+		<range base="GL_CLIP_PLANE" from="0" to="5"/>
+
+		<value name="GL_FOG"/>
+		<value name="GL_LIGHTING"/>
+		<value name="GL_COLOR_MATERIAL"/>
+
+		<range base="GL_LIGHT" from="0" to="7"/>
+
+		<value name="GL_POINT_SMOOTH"/>
+		<value name="GL_LINE_SMOOTH"/>
+		<value name="GL_CULL_FACE"/>
+		<value name="GL_POLYGON_OFFSET_FILL"/>
+		<value name="GL_MULTISAMPLE"/>
+		<value name="GL_SAMPLE_ALPHA_TO_COVERAGE"/>
+		<value name="GL_SAMPLE_ALPHA_TO_ONE"/>
+		<value name="GL_SAMPLE_COVERAGE"/>
+		<value name="GL_TEXTURE_2D"/>
+		<value name="GL_SCISSOR_TEST"/>
+		<value name="GL_ALPHA_TEST"/>
+		<value name="GL_STENCIL_TEST"/>
+		<value name="GL_DEPTH_TEST"/>
+		<value name="GL_BLEND"/>
+		<value name="GL_DITHER"/>
+		<value name="GL_COLOR_LOGIC_OP"/>
+
+		<value name="GL_POINT_SPRITE_OES" category="OES_point_sprite"/>
+		<value name="GL_TEXTURE_CUBE_MAP_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_GEN_STR_OES" category="OES_texture_cube_map"/>
+
+		<value name="GL_VERTEX_ARRAY"/>
+		<value name="GL_NORMAL_ARRAY"/>
+		<value name="GL_COLOR_ARRAY"/>
+		<value name="GL_TEXTURE_COORD_ARRAY"/>
+		<value name="GL_MATRIX_INDEX_ARRAY_OES" category="OES_matrix_palette"/>
+		<value name="GL_WEIGHT_ARRAY_OES" category="OES_matrix_palette"/>
+		<value name="GL_POINT_SIZE_ARRAY_OES" category="OES_point_size_array"/>
+	</desc>
+
+	<desc name="cap" category="GLES2.0">
+		<value name="GL_CULL_FACE"/>
+		<value name="GL_SCISSOR_TEST"/>
+		<value name="GL_POLYGON_OFFSET_FILL"/>
+		<value name="GL_SAMPLE_ALPHA_TO_COVERAGE"/>
+		<value name="GL_SAMPLE_COVERAGE"/>
+		<value name="GL_STENCIL_TEST"/>
+		<value name="GL_DEPTH_TEST"/>
+		<value name="GL_DITHER"/>
+		<value name="GL_BLEND"/>
+	</desc>
+</template>
+
+<template name="DepthRange">
+	<proto>
+		<return type="void"/>
+		<param name="zNear" type="GLtype"/>
+		<param name="zFar" type="GLtype"/>
+	</proto>
+</template>
+
+<template name="Frustum">
+	<proto>
+		<return type="void"/>
+		<param name="left" type="GLtype"/>
+		<param name="right" type="GLtype"/>
+		<param name="bottom" type="GLtype"/>
+		<param name="top" type="GLtype"/>
+		<param name="zNear" type="GLtype"/>
+		<param name="zFar" type="GLtype"/>
+	</proto>
+</template>
+
+<template name="LoadIdentity">
+	<proto>
+		<return type="void"/>
+	</proto>
+</template>
+
+<template name="LoadMatrix">
+	<proto>
+		<return type="void"/>
+		<vector name="m" type="const GLtype *" size="16"/>
+	</proto>
+</template>
+
+<template name="MatrixMode">
+	<proto>
+		<return type="void"/>
+		<param name="mode" type="GLenum"/>
+	</proto>
+
+	<desc name="mode">
+		<value name="GL_MODELVIEW"/>
+		<value name="GL_PROJECTION"/>
+		<value name="GL_TEXTURE"/>
+		<value name="GL_MATRIX_PALETTE_OES" category="OES_matrix_palette"/>
+	</desc>
+</template>
+
+<template name="MultMatrix">
+	<proto>
+		<return type="void"/>
+		<vector name="m" type="const GLtype *" size="16"/>
+	</proto>
+</template>
+
+<template name="Ortho">
+	<proto>
+		<return type="void"/>
+		<param name="left" type="GLtype"/>
+		<param name="right" type="GLtype"/>
+		<param name="bottom" type="GLtype"/>
+		<param name="top" type="GLtype"/>
+		<param name="zNear" type="GLtype"/>
+		<param name="zFar" type="GLtype"/>
+	</proto>
+</template>
+
+<template name="PopMatrix">
+	<proto>
+		<return type="void"/>
+	</proto>
+</template>
+
+<template name="PushMatrix">
+	<proto>
+		<return type="void"/>
+	</proto>
+</template>
+
+<template name="Rotate">
+	<proto>
+		<return type="void"/>
+		<param name="angle" type="GLtype"/>
+		<param name="x" type="GLtype"/>
+		<param name="y" type="GLtype"/>
+		<param name="z" type="GLtype"/>
+	</proto>
+</template>
+
+<template name="Scale">
+	<proto>
+		<return type="void"/>
+		<param name="x" type="GLtype"/>
+		<param name="y" type="GLtype"/>
+		<param name="z" type="GLtype"/>
+	</proto>
+</template>
+
+<template name="Translate">
+	<proto>
+		<return type="void"/>
+		<param name="x" type="GLtype"/>
+		<param name="y" type="GLtype"/>
+		<param name="z" type="GLtype"/>
+	</proto>
+</template>
+
+<template name="Viewport">
+	<proto>
+		<return type="void"/>
+		<param name="x" type="GLint"/>
+		<param name="y" type="GLint"/>
+		<param name="width" type="GLsizei"/>
+		<param name="height" type="GLsizei"/>
+	</proto>
+</template>
+
+<template name="ColorPointer">
+	<proto>
+		<return type="void"/>
+		<param name="size" type="GLint"/>
+		<param name="type" type="GLenum"/>
+		<param name="stride" type="GLsizei"/>
+		<param name="pointer" type="const GLvoid *"/>
+	</proto>
+
+	<desc name="size" error="GL_INVALID_VALUE">
+		<value name="4"/>
+	</desc>
+
+	<desc name="type">
+		<value name="GL_UNSIGNED_BYTE"/>
+		<value name="GL_FLOAT"/>
+		<value name="GL_FIXED"/>
+		<value name="GL_HALF_FLOAT_OES" category="OES_vertex_half_float"/>
+	</desc>
+</template>
+
+<template name="DisableClientState">
+	<proto>
+		<return type="void"/>
+		<param name="array" type="GLenum"/>
+	</proto>
+
+	<desc name="array">
+		<value name="GL_VERTEX_ARRAY"/>
+		<value name="GL_NORMAL_ARRAY"/>
+		<value name="GL_COLOR_ARRAY"/>
+		<value name="GL_TEXTURE_COORD_ARRAY"/>
+		<value name="GL_MATRIX_INDEX_ARRAY_OES" category="OES_matrix_palette"/>
+		<value name="GL_WEIGHT_ARRAY_OES" category="OES_matrix_palette"/>
+		<value name="GL_POINT_SIZE_ARRAY_OES" category="OES_point_size_array"/>
+	</desc>
+</template>
+
+<template name="DrawArrays">
+	<proto>
+		<return type="void"/>
+		<param name="mode" type="GLenum"/>
+		<param name="first" type="GLint"/>
+		<param name="count" type="GLsizei"/>
+	</proto>
+
+	<desc name="mode">
+		<value name="GL_POINTS"/>
+		<value name="GL_LINES"/>
+		<value name="GL_LINE_LOOP"/>
+		<value name="GL_LINE_STRIP"/>
+		<value name="GL_TRIANGLES"/>
+		<value name="GL_TRIANGLE_STRIP"/>
+		<value name="GL_TRIANGLE_FAN"/>
+	</desc>
+</template>
+
+<template name="DrawElements">
+	<proto>
+		<return type="void"/>
+		<param name="mode" type="GLenum"/>
+		<param name="count" type="GLsizei"/>
+		<param name="type" type="GLenum"/>
+		<param name="indices" type="const GLvoid *"/>
+	</proto>
+
+	<desc name="mode">
+		<value name="GL_POINTS"/>
+		<value name="GL_LINES"/>
+		<value name="GL_LINE_LOOP"/>
+		<value name="GL_LINE_STRIP"/>
+		<value name="GL_TRIANGLES"/>
+		<value name="GL_TRIANGLE_STRIP"/>
+		<value name="GL_TRIANGLE_FAN"/>
+	</desc>
+
+	<desc name="type">
+		<value name="GL_UNSIGNED_BYTE"/>
+		<value name="GL_UNSIGNED_SHORT"/>
+		<value name="GL_UNSIGNED_INT" category="OES_element_index_uint"/>
+	</desc>
+</template>
+
+<template name="EnableClientState">
+	<proto>
+		<return type="void"/>
+		<param name="array" type="GLenum"/>
+	</proto>
+
+	<desc name="array">
+		<value name="GL_VERTEX_ARRAY"/>
+		<value name="GL_NORMAL_ARRAY"/>
+		<value name="GL_COLOR_ARRAY"/>
+		<value name="GL_TEXTURE_COORD_ARRAY"/>
+		<value name="GL_MATRIX_INDEX_ARRAY_OES" category="OES_matrix_palette"/>
+		<value name="GL_WEIGHT_ARRAY_OES" category="OES_matrix_palette"/>
+		<value name="GL_POINT_SIZE_ARRAY_OES" category="OES_point_size_array"/>
+	</desc>
+</template>
+
+<template name="GetPointer" direction="get">
+	<proto>
+		<return type="void"/>
+		<param name="pname" type="GLenum"/>
+		<vector name="params" type="GLvoid **" size="dynamic"/>
+	</proto>
+
+	<desc name="pname">
+		<value name="GL_VERTEX_ARRAY_POINTER"/>
+		<value name="GL_NORMAL_ARRAY_POINTER"/>
+		<value name="GL_COLOR_ARRAY_POINTER"/>
+		<value name="GL_TEXTURE_COORD_ARRAY_POINTER"/>
+		<value name="GL_MATRIX_INDEX_ARRAY_POINTER_OES" category="OES_matrix_palette"/>
+		<value name="GL_WEIGHT_ARRAY_POINTER_OES" category="OES_matrix_palette"/>
+		<value name="GL_POINT_SIZE_ARRAY_POINTER_OES" category="OES_point_size_array"/>
+	</desc>
+</template>
+
+<template name="Normal">
+	<proto>
+		<return type="void"/>
+		<vector name="v" type="const GLtype *" size="3">
+			<param name="nx" type="GLtype"/>
+			<param name="ny" type="GLtype"/>
+			<param name="nz" type="GLtype"/>
+		</vector>
+	</proto>
+</template>
+
+<template name="NormalPointer">
+	<proto>
+		<return type="void"/>
+		<param name="type" type="GLenum"/>
+		<param name="stride" type="GLsizei"/>
+		<param name="pointer" type="const GLvoid *"/>
+	</proto>
+
+	<desc name="type">
+		<value name="GL_BYTE"/>
+		<value name="GL_SHORT"/>
+		<value name="GL_FLOAT"/>
+		<value name="GL_FIXED"/>
+		<value name="GL_HALF_FLOAT_OES" category="OES_vertex_half_float"/>
+	</desc>
+</template>
+
+<template name="TexCoordPointer">
+	<proto>
+		<return type="void"/>
+		<param name="size" type="GLint"/>
+		<param name="type" type="GLenum"/>
+		<param name="stride" type="GLsizei"/>
+		<param name="pointer" type="const GLvoid *"/>
+	</proto>
+
+	<desc name="size" error="GL_INVALID_VALUE">
+		<value name="2"/>
+		<value name="3"/>
+		<value name="4"/>
+	</desc>
+
+	<desc name="type">
+		<value name="GL_BYTE"/>
+		<value name="GL_SHORT"/>
+		<value name="GL_FLOAT"/>
+		<value name="GL_FIXED"/>
+		<value name="GL_HALF_FLOAT_OES" category="OES_vertex_half_float"/>
+	</desc>
+</template>
+
+<template name="VertexPointer">
+	<proto>
+		<return type="void"/>
+		<param name="size" type="GLint"/>
+		<param name="type" type="GLenum"/>
+		<param name="stride" type="GLsizei"/>
+		<param name="pointer" type="const GLvoid *"/>
+	</proto>
+
+	<desc name="size" error="GL_INVALID_VALUE">
+		<value name="2"/>
+		<value name="3"/>
+		<value name="4"/>
+	</desc>
+
+	<desc name="type">
+		<value name="GL_BYTE"/>
+		<value name="GL_SHORT"/>
+		<value name="GL_FLOAT"/>
+		<value name="GL_FIXED"/>
+		<value name="GL_HALF_FLOAT_OES" category="OES_vertex_half_float"/>
+	</desc>
+</template>
+
+<template name="PolygonOffset">
+	<proto>
+		<return type="void"/>
+		<param name="factor" type="GLtype"/>
+		<param name="units" type="GLtype"/>
+	</proto>
+</template>
+
+<template name="CopyTexImage2D">
+	<proto>
+		<return type="void"/>
+		<param name="target" type="GLenum"/>
+		<param name="level" type="GLint"/>
+		<param name="internalFormat" type="GLenum"/>
+		<param name="x" type="GLint"/>
+		<param name="y" type="GLint"/>
+		<param name="width" type="GLsizei"/>
+		<param name="height" type="GLsizei"/>
+		<param name="border" type="GLint"/>
+	</proto>
+
+	<desc name="target">
+		<value name="GL_TEXTURE_2D"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES" category="OES_texture_cube_map"/>
+	</desc>
+
+	<desc name="internalFormat" error="GL_INVALID_VALUE">
+		<value name="GL_ALPHA"/>
+		<value name="GL_RGB"/>
+		<value name="GL_RGBA"/>
+		<value name="GL_LUMINANCE"/>
+		<value name="GL_LUMINANCE_ALPHA"/>
+	</desc>
+
+	<desc name="border" error="GL_INVALID_VALUE">
+		<value name="0"/>
+	</desc>
+</template>
+
+<template name="CopyTexSubImage2D">
+	<proto>
+		<return type="void"/>
+		<param name="target" type="GLenum"/>
+		<param name="level" type="GLint"/>
+		<param name="xoffset" type="GLint"/>
+		<param name="yoffset" type="GLint"/>
+		<param name="x" type="GLint"/>
+		<param name="y" type="GLint"/>
+		<param name="width" type="GLsizei"/>
+		<param name="height" type="GLsizei"/>
+	</proto>
+
+	<desc name="target">
+		<value name="GL_TEXTURE_2D"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES" category="OES_texture_cube_map"/>
+	</desc>
+</template>
+
+<template name="TexSubImage2D">
+	<proto>
+		<return type="void"/>
+		<param name="target" type="GLenum"/>
+		<param name="level" type="GLint"/>
+		<param name="xoffset" type="GLint"/>
+		<param name="yoffset" type="GLint"/>
+		<param name="width" type="GLsizei"/>
+		<param name="height" type="GLsizei"/>
+		<param name="format" type="GLenum"/>
+		<param name="type" type="GLenum"/>
+		<param name="pixels" type="const GLvoid *"/>
+	</proto>
+
+	<desc name="target">
+		<value name="GL_TEXTURE_2D"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES" category="OES_texture_cube_map"/>
+	</desc>
+
+	<desc name="format">
+		<value name="GL_ALPHA"/>
+
+		<desc name="type" error="GL_INVALID_OPERATION">
+			<value name="GL_UNSIGNED_BYTE"/>
+			<value name="GL_FLOAT" category="OES_texture_float"/>
+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
+		</desc>
+	</desc>
+
+	<desc name="format">
+		<value name="GL_RGB"/>
+
+		<desc name="type" error="GL_INVALID_OPERATION">
+			<value name="GL_UNSIGNED_BYTE"/>
+			<value name="GL_UNSIGNED_SHORT_5_6_5"/>
+			<value name="GL_FLOAT" category="OES_texture_float"/>
+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
+		</desc>
+	</desc>
+
+	<desc name="format">
+		<value name="GL_RGBA"/>
+
+		<desc name="type" error="GL_INVALID_OPERATION">
+			<value name="GL_UNSIGNED_BYTE"/>
+			<value name="GL_UNSIGNED_SHORT_4_4_4_4"/>
+			<value name="GL_UNSIGNED_SHORT_5_5_5_1"/>
+			<value name="GL_FLOAT" category="OES_texture_float"/>
+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
+			<value name="GL_UNSIGNED_INT_2_10_10_10_REV_EXT" category="EXT_texture_type_2_10_10_10_REV"/>
+		</desc>
+	</desc>
+
+	<desc name="format">
+		<value name="GL_LUMINANCE"/>
+
+		<desc name="type" error="GL_INVALID_OPERATION">
+			<value name="GL_UNSIGNED_BYTE"/>
+			<value name="GL_FLOAT" category="OES_texture_float"/>
+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
+		</desc>
+	</desc>
+
+	<desc name="format">
+		<value name="GL_LUMINANCE_ALPHA"/>
+
+		<desc name="type" error="GL_INVALID_OPERATION">
+			<value name="GL_UNSIGNED_BYTE"/>
+			<value name="GL_FLOAT" category="OES_texture_float"/>
+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
+		</desc>
+	</desc>
+
+	<desc name="format" category="OES_depth_texture">
+		<value name="GL_DEPTH_COMPONENT"/>
+
+		<desc name="type" error="GL_INVALID_OPERATION">
+			<value name="GL_UNSIGNED_SHORT"/>
+			<value name="GL_UNSIGNED_INT"/>
+		</desc>
+	</desc>
+
+	<desc name="format" category="OES_packed_depth_stencil">
+		<value name="GL_DEPTH_STENCIL_OES"/>
+
+		<desc name="type" error="GL_INVALID_OPERATION">
+			<value name="GL_UNSIGNED_INT_24_8_OES"/>
+		</desc>
+	</desc>
+</template>
+
+<template name="BindTexture">
+	<proto>
+		<return type="void"/>
+		<param name="target" type="GLenum"/>
+		<param name="texture" type="GLuint"/>
+	</proto>
+
+	<desc name="target">
+		<value name="GL_TEXTURE_2D"/>
+		<value name="GL_TEXTURE_CUBE_MAP" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_3D_OES" category="OES_texture_3D"/>
+	</desc>
+</template>
+
+<template name="DeleteTextures">
+	<proto>
+		<return type="void"/>
+		<param name="n" type="GLsizei"/>
+		<param name="textures" type="const GLuint *"/>
+	</proto>
+</template>
+
+<template name="GenTextures" direction="get">
+	<proto>
+		<return type="void"/>
+		<param name="n" type="GLsizei"/>
+		<param name="textures" type="GLuint *"/>
+	</proto>
+</template>
+
+<template name="IsTexture" direction="get">
+	<proto>
+		<return type="GLboolean"/>
+		<param name="texture" type="GLuint"/>
+	</proto>
+</template>
+
+<template name="BlendColor">
+	<proto>
+		<return type="void"/>
+		<param name="red" type="GLtype"/>
+		<param name="green" type="GLtype"/>
+		<param name="blue" type="GLtype"/>
+		<param name="alpha" type="GLtype"/>
+	</proto>
+</template>
+
+<template name="BlendEquation">
+	<proto>
+		<return type="void"/>
+		<param name="mode" type="GLenum"/>
+	</proto>
+
+	<desc name="mode">
+		<value name="GL_FUNC_ADD" category="GLES2.0"/>
+		<value name="GL_FUNC_SUBTRACT" category="GLES2.0"/>
+		<value name="GL_FUNC_REVERSE_SUBTRACT" category="GLES2.0"/>
+		<value name="GL_FUNC_ADD_OES" category="OES_blend_subtract"/>
+		<value name="GL_FUNC_SUBTRACT_OES" category="OES_blend_subtract"/>
+		<value name="GL_FUNC_REVERSE_SUBTRACT_OES" category="OES_blend_subtract"/>
+
+		<value name="GL_MIN_EXT" category="EXT_blend_minmax"/>
+		<value name="GL_MAX_EXT" category="EXT_blend_minmax"/>
+	</desc>
+</template>
+
+<template name="BlendEquationSeparate">
+	<proto>
+		<return type="void"/>
+		<param name="modeRGB" type="GLenum"/>
+		<param name="modeAlpha" type="GLenum"/>
+	</proto>
+
+	<desc name="modeRGB">
+		<value name="GL_FUNC_ADD" category="GLES2.0"/>
+		<value name="GL_FUNC_SUBTRACT" category="GLES2.0"/>
+		<value name="GL_FUNC_REVERSE_SUBTRACT" category="GLES2.0"/>
+		<value name="GL_FUNC_ADD_OES" category="OES_blend_subtract"/>
+		<value name="GL_FUNC_SUBTRACT_OES" category="OES_blend_subtract"/>
+		<value name="GL_FUNC_REVERSE_SUBTRACT_OES" category="OES_blend_subtract"/>
+
+		<value name="GL_MIN_EXT" category="EXT_blend_minmax"/>
+		<value name="GL_MAX_EXT" category="EXT_blend_minmax"/>
+	</desc>
+
+	<desc name="modeAlpha">
+		<value name="GL_FUNC_ADD" category="GLES2.0"/>
+		<value name="GL_FUNC_SUBTRACT" category="GLES2.0"/>
+		<value name="GL_FUNC_REVERSE_SUBTRACT" category="GLES2.0"/>
+		<value name="GL_FUNC_ADD_OES" category="OES_blend_subtract"/>
+		<value name="GL_FUNC_SUBTRACT_OES" category="OES_blend_subtract"/>
+		<value name="GL_FUNC_REVERSE_SUBTRACT_OES" category="OES_blend_subtract"/>
+
+		<value name="GL_MIN_EXT" category="EXT_blend_minmax"/>
+		<value name="GL_MAX_EXT" category="EXT_blend_minmax"/>
+	</desc>
+</template>
+
+<template name="TexImage3D">
+	<proto>
+		<return type="void"/>
+		<param name="target" type="GLenum"/>
+		<param name="level" type="GLint"/>
+		<param name="internalFormat" type="GLenum"/>
+		<param name="width" type="GLsizei"/>
+		<param name="height" type="GLsizei"/>
+		<param name="depth" type="GLsizei"/>
+		<param name="border" type="GLint"/>
+		<param name="format" type="GLenum"/>
+		<param name="type" type="GLenum"/>
+		<param name="pixels" type="const GLvoid *"/>
+	</proto>
+
+	<desc name="target">
+		<value name="GL_TEXTURE_3D_OES"/>
+	</desc>
+
+	<desc name="internalFormat">
+		<value name="GL_ALPHA"/>
+		<value name="GL_RGB"/>
+		<value name="GL_RGBA"/>
+		<value name="GL_LUMINANCE"/>
+		<value name="GL_LUMINANCE_ALPHA"/>
+	</desc>
+
+	<desc name="format">
+		<value name="GL_ALPHA"/>
+
+		<desc name="type" error="GL_INVALID_OPERATION">
+			<value name="GL_UNSIGNED_BYTE"/>
+			<value name="GL_FLOAT" category="OES_texture_float"/>
+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
+		</desc>
+	</desc>
+
+	<desc name="format">
+		<value name="GL_RGB"/>
+
+		<desc name="type" error="GL_INVALID_OPERATION">
+			<value name="GL_UNSIGNED_BYTE"/>
+			<value name="GL_UNSIGNED_SHORT_5_6_5"/>
+			<value name="GL_FLOAT" category="OES_texture_float"/>
+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
+		</desc>
+	</desc>
+
+	<desc name="format">
+		<value name="GL_RGBA"/>
+
+		<desc name="type" error="GL_INVALID_OPERATION">
+			<value name="GL_UNSIGNED_BYTE"/>
+			<value name="GL_UNSIGNED_SHORT_4_4_4_4"/>
+			<value name="GL_UNSIGNED_SHORT_5_5_5_1"/>
+			<value name="GL_FLOAT" category="OES_texture_float"/>
+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
+			<value name="GL_UNSIGNED_INT_2_10_10_10_REV_EXT" category="EXT_texture_type_2_10_10_10_REV"/>
+		</desc>
+	</desc>
+
+	<desc name="format">
+		<value name="GL_LUMINANCE"/>
+
+		<desc name="type" error="GL_INVALID_OPERATION">
+			<value name="GL_UNSIGNED_BYTE"/>
+			<value name="GL_FLOAT" category="OES_texture_float"/>
+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
+		</desc>
+	</desc>
+
+	<desc name="format">
+		<value name="GL_LUMINANCE_ALPHA"/>
+
+		<desc name="type" error="GL_INVALID_OPERATION">
+			<value name="GL_UNSIGNED_BYTE"/>
+			<value name="GL_FLOAT" category="OES_texture_float"/>
+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
+		</desc>
+	</desc>
+</template>
+
+<template name="TexSubImage3D">
+	<proto>
+		<return type="void"/>
+		<param name="target" type="GLenum"/>
+		<param name="level" type="GLint"/>
+		<param name="xoffset" type="GLint"/>
+		<param name="yoffset" type="GLint"/>
+		<param name="zoffset" type="GLint"/>
+		<param name="width" type="GLsizei"/>
+		<param name="height" type="GLsizei"/>
+		<param name="depth" type="GLsizei"/>
+		<param name="format" type="GLenum"/>
+		<param name="type" type="GLenum"/>
+		<param name="pixels" type="const GLvoid *"/>
+	</proto>
+
+	<desc name="target">
+		<value name="GL_TEXTURE_3D_OES"/>
+	</desc>
+
+	<desc name="format">
+		<value name="GL_ALPHA"/>
+
+		<desc name="type" error="GL_INVALID_OPERATION">
+			<value name="GL_UNSIGNED_BYTE"/>
+			<value name="GL_FLOAT" category="OES_texture_float"/>
+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
+		</desc>
+	</desc>
+
+	<desc name="format">
+		<value name="GL_RGB"/>
+
+		<desc name="type" error="GL_INVALID_OPERATION">
+			<value name="GL_UNSIGNED_BYTE"/>
+			<value name="GL_UNSIGNED_SHORT_5_6_5"/>
+			<value name="GL_FLOAT" category="OES_texture_float"/>
+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
+		</desc>
+	</desc>
+
+	<desc name="format">
+		<value name="GL_RGBA"/>
+
+		<desc name="type" error="GL_INVALID_OPERATION">
+			<value name="GL_UNSIGNED_BYTE"/>
+			<value name="GL_UNSIGNED_SHORT_4_4_4_4"/>
+			<value name="GL_UNSIGNED_SHORT_5_5_5_1"/>
+			<value name="GL_FLOAT" category="OES_texture_float"/>
+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
+			<value name="GL_UNSIGNED_INT_2_10_10_10_REV_EXT" category="EXT_texture_type_2_10_10_10_REV"/>
+		</desc>
+	</desc>
+
+	<desc name="format">
+		<value name="GL_LUMINANCE"/>
+
+		<desc name="type" error="GL_INVALID_OPERATION">
+			<value name="GL_UNSIGNED_BYTE"/>
+			<value name="GL_FLOAT" category="OES_texture_float"/>
+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
+		</desc>
+	</desc>
+
+	<desc name="format">
+		<value name="GL_LUMINANCE_ALPHA"/>
+
+		<desc name="type" error="GL_INVALID_OPERATION">
+			<value name="GL_UNSIGNED_BYTE"/>
+			<value name="GL_FLOAT" category="OES_texture_float"/>
+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
+		</desc>
+	</desc>
+</template>
+
+<template name="CopyTexSubImage3D">
+	<proto>
+		<return type="void"/>
+		<param name="target" type="GLenum"/>
+		<param name="level" type="GLint"/>
+		<param name="xoffset" type="GLint"/>
+		<param name="yoffset" type="GLint"/>
+		<param name="zoffset" type="GLint"/>
+		<param name="x" type="GLint"/>
+		<param name="y" type="GLint"/>
+		<param name="width" type="GLsizei"/>
+		<param name="height" type="GLsizei"/>
+	</proto>
+
+	<desc name="target">
+		<value name="GL_TEXTURE_3D_OES"/>
+	</desc>
+</template>
+
+<template name="MultiTexCoord">
+	<proto>
+		<return type="void"/>
+		<param name="texture" type="GLenum"/>
+		<vector name="v" type="const GLtype *" size="dynamic">
+			<param name="s" type="GLtype"/>
+			<param name="t" type="GLtype"/>
+			<param name="r" type="GLtype"/>
+			<param name="q" type="GLtype"/>
+		</vector>
+	</proto>
+
+	<desc name="texture">
+		<range base="GL_TEXTURE" from="0" to="31"/>
+	</desc>
+</template>
+
+<template name="CompressedTexImage3D">
+	<proto>
+		<return type="void"/>
+		<param name="target" type="GLenum"/>
+		<param name="level" type="GLint"/>
+		<param name="internalFormat" type="GLenum"/>
+		<param name="width" type="GLsizei"/>
+		<param name="height" type="GLsizei"/>
+		<param name="depth" type="GLsizei"/>
+		<param name="border" type="GLint"/>
+		<param name="imagesize" type="GLsizei"/>
+		<param name="data" type="const GLvoid *"/>
+	</proto>
+
+	<desc name="target">
+		<value name="GL_TEXTURE_3D_OES"/>
+	</desc>
+
+	<desc name="internalFormat">
+		<value name="GL_3DC_X_AMD" category="AMD_compressed_3DC_texture"/>
+		<value name="GL_3DC_XY_AMD" category="AMD_compressed_3DC_texture"/>
+		<value name="GL_ATC_RGB_AMD" category="AMD_compressed_ATC_texture"/>
+		<value name="GL_ATC_RGBA_EXPLICIT_ALPHA_AMD" category="AMD_compressed_ATC_texture"/>
+		<value name="GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD" category="AMD_compressed_ATC_texture"/>
+	</desc>
+</template>
+
+<template name="CompressedTexSubImage3D">
+	<proto>
+		<return type="void"/>
+		<param name="target" type="GLenum"/>
+		<param name="level" type="GLint"/>
+		<param name="xoffset" type="GLint"/>
+		<param name="yoffset" type="GLint"/>
+		<param name="zoffset" type="GLint"/>
+		<param name="width" type="GLsizei"/>
+		<param name="height" type="GLsizei"/>
+		<param name="depth" type="GLsizei"/>
+		<param name="format" type="GLenum"/>
+		<param name="imagesize" type="GLsizei"/>
+		<param name="data" type="const GLvoid *"/>
+	</proto>
+
+	<desc name="target">
+		<value name="GL_TEXTURE_3D_OES"/>
+	</desc>
+</template>
+
+<template name="ActiveTexture">
+	<proto>
+		<return type="void"/>
+		<param name="texture" type="GLenum"/>
+	</proto>
+
+	<desc name="texture">
+		<range base="GL_TEXTURE" from="0" to="31"/>
+	</desc>
+</template>
+
+<template name="ClientActiveTexture">
+	<proto>
+		<return type="void"/>
+		<param name="texture" type="GLenum"/>
+	</proto>
+
+	<desc name="texture">
+		<range base="GL_TEXTURE" from="0" to="31"/>
+	</desc>
+</template>
+
+<template name="SampleCoverage">
+	<proto>
+		<return type="void"/>
+		<param name="value" type="GLtype"/>
+		<param name="invert" type="GLboolean"/>
+	</proto>
+</template>
+
+<template name="CompressedTexImage2D">
+	<proto>
+		<return type="void"/>
+		<param name="target" type="GLenum"/>
+		<param name="level" type="GLint"/>
+		<param name="internalFormat" type="GLenum"/>
+		<param name="width" type="GLsizei"/>
+		<param name="height" type="GLsizei"/>
+		<param name="border" type="GLint"/>
+		<param name="imageSize" type="GLsizei"/>
+		<param name="data" type="const GLvoid *"/>
+	</proto>
+
+	<desc name="target">
+		<value name="GL_TEXTURE_2D"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES" category="OES_texture_cube_map"/>
+	</desc>
+
+	<desc name="internalFormat">
+		<value name="GL_ETC1_RGB8_OES" category="OES_compressed_ETC1_RGB8_texture"/>
+
+		<value name="GL_PALETTE4_RGB8_OES" category="OES_compressed_paletted_texture"/>
+		<value name="GL_PALETTE4_RGBA8_OES" category="OES_compressed_paletted_texture"/>
+		<value name="GL_PALETTE4_R5_G6_B5_OES" category="OES_compressed_paletted_texture"/>
+		<value name="GL_PALETTE4_RGBA4_OES" category="OES_compressed_paletted_texture"/>
+		<value name="GL_PALETTE4_RGB5_A1_OES" category="OES_compressed_paletted_texture"/>
+		<value name="GL_PALETTE8_RGB8_OES" category="OES_compressed_paletted_texture"/>
+		<value name="GL_PALETTE8_RGBA8_OES" category="OES_compressed_paletted_texture"/>
+		<value name="GL_PALETTE8_R5_G6_B5_OES" category="OES_compressed_paletted_texture"/>
+		<value name="GL_PALETTE8_RGBA4_OES" category="OES_compressed_paletted_texture"/>
+		<value name="GL_PALETTE8_RGB5_A1_OES" category="OES_compressed_paletted_texture"/>
+
+		<value name="GL_3DC_X_AMD" category="AMD_compressed_3DC_texture"/>
+		<value name="GL_3DC_XY_AMD" category="AMD_compressed_3DC_texture"/>
+
+		<value name="GL_ATC_RGB_AMD" category="AMD_compressed_ATC_texture"/>
+		<value name="GL_ATC_RGBA_EXPLICIT_ALPHA_AMD" category="AMD_compressed_ATC_texture"/>
+		<value name="GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD" category="AMD_compressed_ATC_texture"/>
+
+		<value name="GL_COMPRESSED_RGB_S3TC_DXT1_EXT" category="EXT_texture_compression_dxt1"/>
+		<value name="GL_COMPRESSED_RGBA_S3TC_DXT1_EXT" category="EXT_texture_compression_dxt1"/>
+	</desc>
+
+	<desc name="border" error="GL_INVALID_VALUE">
+		<value name="0"/>
+	</desc>
+</template>
+
+<template name="CompressedTexSubImage2D">
+	<proto>
+		<return type="void"/>
+		<param name="target" type="GLenum"/>
+		<param name="level" type="GLint"/>
+		<param name="xoffset" type="GLint"/>
+		<param name="yoffset" type="GLint"/>
+		<param name="width" type="GLsizei"/>
+		<param name="height" type="GLsizei"/>
+		<param name="format" type="GLenum"/>
+		<param name="imageSize" type="GLsizei"/>
+		<param name="data" type="const GLvoid *"/>
+	</proto>
+
+	<desc name="target">
+		<value name="GL_TEXTURE_2D"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES" category="OES_texture_cube_map"/>
+	</desc>
+
+	<desc name="format">
+		<value name="GL_COMPRESSED_RGB_S3TC_DXT1_EXT" category="EXT_texture_compression_dxt1"/>
+		<value name="GL_COMPRESSED_RGBA_S3TC_DXT1_EXT" category="EXT_texture_compression_dxt1"/>
+	</desc>
+</template>
+
+<template name="BlendFuncSeparate">
+	<proto>
+		<return type="void"/>
+		<param name="srcRGB" type="GLenum"/>
+		<param name="dstRGB" type="GLenum"/>
+		<param name="srcAlpha" type="GLenum"/>
+		<param name="dstAlpha" type="GLenum"/>
+	</proto>
+
+	<desc name="srcRGB">
+		<value name="GL_ZERO"/>
+		<value name="GL_ONE"/>
+		<value name="GL_SRC_COLOR"/>
+		<value name="GL_ONE_MINUS_SRC_COLOR"/>
+		<value name="GL_SRC_ALPHA"/>
+		<value name="GL_ONE_MINUS_SRC_ALPHA"/>
+		<value name="GL_DST_ALPHA"/>
+		<value name="GL_ONE_MINUS_DST_ALPHA"/>
+		<value name="GL_DST_COLOR"/>
+		<value name="GL_ONE_MINUS_DST_COLOR"/>
+		<value name="GL_SRC_ALPHA_SATURATE"/>
+
+		<value name="GL_CONSTANT_COLOR" category="GLES2.0"/>
+		<value name="GL_ONE_MINUS_CONSTANT_COLOR" category="GLES2.0"/>
+		<value name="GL_CONSTANT_ALPHA" category="GLES2.0"/>
+		<value name="GL_ONE_MINUS_CONSTANT_ALPHA" category="GLES2.0"/>
+	</desc>
+
+	<desc name="dstRGB">
+		<value name="GL_ZERO"/>
+		<value name="GL_ONE"/>
+		<value name="GL_SRC_COLOR"/>
+		<value name="GL_ONE_MINUS_SRC_COLOR"/>
+		<value name="GL_SRC_ALPHA"/>
+		<value name="GL_ONE_MINUS_SRC_ALPHA"/>
+		<value name="GL_DST_ALPHA"/>
+		<value name="GL_ONE_MINUS_DST_ALPHA"/>
+		<value name="GL_DST_COLOR"/>
+		<value name="GL_ONE_MINUS_DST_COLOR"/>
+
+		<value name="GL_CONSTANT_COLOR" category="GLES2.0"/>
+		<value name="GL_ONE_MINUS_CONSTANT_COLOR" category="GLES2.0"/>
+		<value name="GL_CONSTANT_ALPHA" category="GLES2.0"/>
+		<value name="GL_ONE_MINUS_CONSTANT_ALPHA" category="GLES2.0"/>
+	</desc>
+
+	<desc name="srcAlpha">
+		<value name="GL_ZERO"/>
+		<value name="GL_ONE"/>
+		<value name="GL_SRC_COLOR"/>
+		<value name="GL_ONE_MINUS_SRC_COLOR"/>
+		<value name="GL_SRC_ALPHA"/>
+		<value name="GL_ONE_MINUS_SRC_ALPHA"/>
+		<value name="GL_DST_ALPHA"/>
+		<value name="GL_ONE_MINUS_DST_ALPHA"/>
+		<value name="GL_DST_COLOR"/>
+		<value name="GL_ONE_MINUS_DST_COLOR"/>
+		<value name="GL_SRC_ALPHA_SATURATE"/>
+
+		<value name="GL_CONSTANT_COLOR" category="GLES2.0"/>
+		<value name="GL_ONE_MINUS_CONSTANT_COLOR" category="GLES2.0"/>
+		<value name="GL_CONSTANT_ALPHA" category="GLES2.0"/>
+		<value name="GL_ONE_MINUS_CONSTANT_ALPHA" category="GLES2.0"/>
+	</desc>
+
+	<desc name="dstAlpha">
+		<value name="GL_ZERO"/>
+		<value name="GL_ONE"/>
+		<value name="GL_SRC_COLOR"/>
+		<value name="GL_ONE_MINUS_SRC_COLOR"/>
+		<value name="GL_SRC_ALPHA"/>
+		<value name="GL_ONE_MINUS_SRC_ALPHA"/>
+		<value name="GL_DST_ALPHA"/>
+		<value name="GL_ONE_MINUS_DST_ALPHA"/>
+		<value name="GL_DST_COLOR"/>
+		<value name="GL_ONE_MINUS_DST_COLOR"/>
+
+		<value name="GL_CONSTANT_COLOR" category="GLES2.0"/>
+		<value name="GL_ONE_MINUS_CONSTANT_COLOR" category="GLES2.0"/>
+		<value name="GL_CONSTANT_ALPHA" category="GLES2.0"/>
+		<value name="GL_ONE_MINUS_CONSTANT_ALPHA" category="GLES2.0"/>
+	</desc>
+</template>
+
+<template name="PointParameter">
+	<proto>
+		<return type="void"/>
+		<param name="pname" type="GLenum"/>
+		<vector name="params" type="const GLtype *" size="dynamic">
+			<param name="param" type="GLtype"/>
+		</vector>
+	</proto>
+
+	<desc name="pname">
+		<value name="GL_POINT_SIZE_MIN"/>
+		<value name="GL_POINT_SIZE_MAX"/>
+		<value name="GL_POINT_FADE_THRESHOLD_SIZE"/>
+
+		<desc name="params" vector_size="1"/>
+	</desc>
+
+	<desc name="pname">
+		<value name="GL_POINT_DISTANCE_ATTENUATION"/>
+		<desc name="params" vector_size="3"/>
+	</desc>
+</template>
+
+<template name="VertexAttrib">
+	<proto>
+		<return type="void"/>
+		<param name="index" type="GLuint"/>
+		<vector name="v" type="const GLtype *" size="dynamic">
+			<param name="x" type="GLtype"/>
+			<param name="y" type="GLtype"/>
+			<param name="z" type="GLtype"/>
+			<param name="w" type="GLtype"/>
+		</vector>
+	</proto>
+</template>
+
+<template name="VertexAttribPointer">
+	<proto>
+		<return type="void"/>
+		<param name="index" type="GLuint"/>
+		<param name="size" type="GLint"/>
+		<param name="type" type="GLenum"/>
+		<param name="normalized" type="GLboolean"/>
+		<param name="stride" type="GLsizei"/>
+		<param name="pointer" type="const GLvoid *"/>
+	</proto>
+
+	<desc name="size" error="GL_INVALID_VALUE">
+		<value name="1"/>
+		<value name="2"/>
+		<value name="3"/>
+		<value name="4"/>
+	</desc>
+
+	<desc name="type" error="GL_INVALID_VALUE">
+		<value name="GL_BYTE"/>
+		<value name="GL_UNSIGNED_BYTE"/>
+		<value name="GL_SHORT"/>
+		<value name="GL_UNSIGNED_SHORT"/>
+		<value name="GL_FLOAT"/>
+		<value name="GL_FIXED"/>
+		<value name="GL_HALF_FLOAT_OES" category="OES_vertex_half_float"/>
+		<value name="GL_UNSIGNED_INT_10_10_10_2_OES" category="OES_vertex_type_10_10_10_2"/>
+		<value name="GL_INT_10_10_10_2_OES" category="OES_vertex_type_10_10_10_2"/>
+	</desc>
+
+	<desc name="type" category="OES_vertex_type_10_10_10_2">
+		<value name="GL_UNSIGNED_INT_10_10_10_2_OES"/>
+		<value name="GL_INT_10_10_10_2_OES"/>
+
+		<desc name="size">
+			<value name="3"/>
+			<value name="4"/>
+		</desc>
+	</desc>
+</template>
+
+<template name="EnableVertexAttribArray">
+	<proto>
+		<return type="void"/>
+		<param name="index" type="GLuint"/>
+	</proto>
+</template>
+
+<template name="DisableVertexAttribArray">
+	<proto>
+		<return type="void"/>
+		<param name="index" type="GLuint"/>
+	</proto>
+</template>
+
+<template name="IsProgram" direction="get">
+	<proto>
+		<return type="GLboolean"/>
+		<param name="program" type="GLuint"/>
+	</proto>
+</template>
+
+<template name="GetProgram" direction="get">
+	<proto>
+		<return type="void"/>
+		<param name="program" type="GLuint"/>
+		<param name="pname" type="GLenum"/>
+		<vector name="params" type="GLtype *" size="dynamic"/>
+	</proto>
+
+	<desc name="pname">
+		<value name="GL_DELETE_STATUS"/>
+		<value name="GL_LINK_STATUS"/>
+		<value name="GL_VALIDATE_STATUS"/>
+		<value name="GL_INFO_LOG_LENGTH"/>
+		<value name="GL_ATTACHED_SHADERS"/>
+		<value name="GL_ACTIVE_ATTRIBUTES"/>
+		<value name="GL_ACTIVE_ATTRIBUTE_MAX_LENGTH"/>
+		<value name="GL_ACTIVE_UNIFORMS"/>
+		<value name="GL_ACTIVE_UNIFORM_MAX_LENGTH"/>
+		<value name="GL_PROGRAM_BINARY_LENGTH_OES" category="OES_get_program_binary"/>
+
+		<desc name="params" convert="false"/>
+	</desc>
+</template>
+
+<template name="GetVertexAttrib" direction="get">
+	<proto>
+		<return type="void"/>
+		<param name="index" type="GLuint"/>
+		<param name="pname" type="GLenum"/>
+		<vector name="params" type="GLtype *" size="dynamic"/>
+	</proto>
+
+	<desc name="pname">
+		<value name="GL_VERTEX_ATTRIB_ARRAY_ENABLED"/>
+		<value name="GL_VERTEX_ATTRIB_ARRAY_SIZE"/>
+		<value name="GL_VERTEX_ATTRIB_ARRAY_STRIDE"/>
+		<value name="GL_VERTEX_ATTRIB_ARRAY_TYPE"/>
+		<value name="GL_VERTEX_ATTRIB_ARRAY_NORMALIZED"/>
+		<value name="GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING"/>
+
+		<desc name="params" vector_size="1" convert="false"/>
+	</desc>
+
+	<desc name="pname">
+		<value name="GL_CURRENT_VERTEX_ATTRIB"/>
+		<desc name="params" vector_size="16?" convert="false"/>
+	</desc>
+</template>
+
+<template name="GetVertexAttribPointer" direction="get">
+	<proto>
+		<return type="void"/>
+		<param name="index" type="GLuint"/>
+		<param name="pname" type="GLenum"/>
+		<vector name="pointer" type="GLvoid **" size="dynamic"/>
+	</proto>
+
+	<desc name="pname">
+		<value name="GL_VERTEX_ATTRIB_ARRAY_POINTER"/>
+	</desc>
+</template>
+
+<template name="GetBufferPointer" direction="get">
+	<proto>
+		<return type="void"/>
+		<param name="target" type="GLenum"/>
+		<param name="pname" type="GLenum"/>
+		<vector name="params" type="GLvoid **" size="dynamic"/>
+	</proto>
+
+	<desc name="target">
+		<value name="GL_ARRAY_BUFFER"/>
+		<value name="GL_ELEMENT_ARRAY_BUFFER"/>
+	</desc>
+
+	<desc name="pname">
+		<value name="GL_BUFFER_MAP_POINTER_OES"/>
+	</desc>
+</template>
+
+<template name="MapBuffer" direction="get">
+	<proto>
+		<return type="void *"/>
+		<param name="target" type="GLenum"/>
+		<param name="access" type="GLenum"/>
+	</proto>
+
+	<desc name="target">
+		<value name="GL_ARRAY_BUFFER"/>
+		<value name="GL_ELEMENT_ARRAY_BUFFER"/>
+	</desc>
+
+	<desc name="access">
+		<value name="GL_WRITE_ONLY_OES"/>
+	</desc>
+</template>
+
+<template name="UnmapBuffer" direction="get">
+	<proto>
+		<return type="GLboolean"/>
+		<param name="target" type="GLenum"/>
+	</proto>
+
+	<desc name="target">
+		<value name="GL_ARRAY_BUFFER"/>
+		<value name="GL_ELEMENT_ARRAY_BUFFER"/>
+	</desc>
+</template>
+
+<template name="BindBuffer">
+	<proto>
+		<return type="void"/>
+		<param name="target" type="GLenum"/>
+		<param name="buffer" type="GLuint"/>
+	</proto>
+
+	<desc name="target">
+		<value name="GL_ARRAY_BUFFER"/>
+		<value name="GL_ELEMENT_ARRAY_BUFFER"/>
+	</desc>
+</template>
+
+<template name="BufferData">
+	<proto>
+		<return type="void"/>
+		<param name="target" type="GLenum"/>
+		<param name="size" type="GLsizeiptr"/>
+		<param name="data" type="const GLvoid *"/>
+		<param name="usage" type="GLenum"/>
+	</proto>
+
+	<desc name="target">
+		<value name="GL_ARRAY_BUFFER"/>
+		<value name="GL_ELEMENT_ARRAY_BUFFER"/>
+	</desc>
+
+	<desc name="usage">
+		<value name="GL_STATIC_DRAW"/>
+		<value name="GL_DYNAMIC_DRAW"/>
+		<value name="GL_STREAM_DRAW" category="GLES2.0"/>
+	</desc>
+</template>
+
+<template name="BufferSubData">
+	<proto>
+		<return type="void"/>
+		<param name="target" type="GLenum"/>
+		<param name="offset" type="GLintptr"/>
+		<param name="size" type="GLsizeiptr"/>
+		<param name="data" type="const GLvoid *"/>
+	</proto>
+
+	<desc name="target">
+		<value name="GL_ARRAY_BUFFER"/>
+		<value name="GL_ELEMENT_ARRAY_BUFFER"/>
+	</desc>
+</template>
+
+<template name="DeleteBuffers">
+	<proto>
+		<return type="void"/>
+		<param name="n" type="GLsizei"/>
+		<param name="buffer" type="const GLuint *"/>
+	</proto>
+</template>
+
+<template name="GenBuffers" direction="get">
+	<proto>
+		<return type="void"/>
+		<param name="n" type="GLsizei"/>
+		<param name="buffer" type="GLuint *"/>
+	</proto>
+</template>
+
+<template name="GetBufferParameter" direction="get">
+	<proto>
+		<return type="void"/>
+		<param name="target" type="GLenum"/>
+		<param name="pname" type="GLenum"/>
+		<vector name="params" type="GLtype *" size="dynamic"/>
+	</proto>
+
+	<desc name="target">
+		<value name="GL_ARRAY_BUFFER"/>
+		<value name="GL_ELEMENT_ARRAY_BUFFER"/>
+	</desc>
+
+	<desc name="pname">
+		<value name="GL_BUFFER_SIZE"/>
+		<value name="GL_BUFFER_USAGE"/>
+		<value name="GL_BUFFER_ACCESS_OES" category="OES_mapbuffer"/>
+		<value name="GL_BUFFER_MAPPED_OES" category="OES_mapbuffer"/>
+	</desc>
+</template>
+
+<template name="IsBuffer" direction="get">
+	<proto>
+		<return type="GLboolean"/>
+		<param name="buffer" type="GLuint"/>
+	</proto>
+</template>
+
+<template name="CreateShader">
+	<proto>
+		<return type="GLuint"/>
+		<param name="type" type="GLenum"/>
+	</proto>
+
+	<desc name="type">
+		<value name="GL_VERTEX_SHADER"/>
+		<value name="GL_FRAGMENT_SHADER"/>
+	</desc>
+</template>
+
+<template name="ShaderSource">
+	<proto>
+		<return type="void"/>
+		<param name="shader" type="GLuint"/>
+		<param name="count" type="GLsizei"/>
+		<param name="string" type="const GLchar **"/>
+		<param name="length" type="const int *"/>
+	</proto>
+</template>
+
+<template name="CompileShader">
+	<proto>
+		<return type="void"/>
+		<param name="shader" type="GLuint"/>
+	</proto>
+</template>
+
+<template name="ReleaseShaderCompiler">
+	<proto>
+		<return type="void"/>
+	</proto>
+</template>
+
+<template name="DeleteShader">
+	<proto>
+		<return type="void"/>
+		<param name="shader" type="GLuint"/>
+	</proto>
+</template>
+
+<template name="ShaderBinary">
+	<proto>
+		<return type="void"/>
+		<param name="n" type="GLsizei"/>
+		<param name="shaders" type="const GLuint *"/>
+		<param name="binaryformat" type="GLenum"/>
+		<param name="binary" type="const GLvoid *"/>
+		<param name="length" type="GLsizei"/>
+	</proto>
+</template>
+
+<template name="CreateProgram">
+	<proto>
+		<return type="GLuint"/>
+	</proto>
+</template>
+
+<template name="AttachShader">
+	<proto>
+		<return type="void"/>
+		<param name="program" type="GLuint"/>
+		<param name="shader" type="GLuint"/>
+	</proto>
+</template>
+
+<template name="DetachShader">
+	<proto>
+		<return type="void"/>
+		<param name="program" type="GLuint"/>
+		<param name="shader" type="GLuint"/>
+	</proto>
+</template>
+
+<template name="LinkProgram">
+	<proto>
+		<return type="void"/>
+		<param name="program" type="GLuint"/>
+	</proto>
+</template>
+
+<template name="UseProgram">
+	<proto>
+		<return type="void"/>
+		<param name="program" type="GLuint"/>
+	</proto>
+</template>
+
+<template name="DeleteProgram">
+	<proto>
+		<return type="void"/>
+		<param name="program" type="GLuint"/>
+	</proto>
+</template>
+
+<template name="GetActiveAttrib" direction="get">
+	<proto>
+		<return type="void"/>
+		<param name="program" type="GLuint"/>
+		<param name="index" type="GLuint"/>
+		<param name="bufSize" type="GLsizei"/>
+		<param name="length" type="GLsizei *"/>
+		<param name="size" type="GLint *"/>
+		<param name="type" type="GLenum *"/>
+		<param name="name" type="GLchar *"/>
+	</proto>
+</template>
+
+<template name="GetAttribLocation" direction="get">
+	<proto>
+		<return type="GLint"/>
+		<param name="program" type="GLuint"/>
+		<param name="name" type="const char *"/>
+	</proto>
+</template>
+
+<template name="BindAttribLocation">
+	<proto>
+		<return type="void"/>
+		<param name="program" type="GLuint"/>
+		<param name="index" type="GLuint"/>
+		<param name="name" type="const char *"/>
+	</proto>
+</template>
+
+<template name="GetUniformLocation" direction="get">
+	<proto>
+		<return type="GLint"/>
+		<param name="program" type="GLuint"/>
+		<param name="name" type="const char *"/>
+	</proto>
+</template>
+
+<template name="GetActiveUniform" direction="get">
+	<proto>
+		<return type="void"/>
+		<param name="program" type="GLuint"/>
+		<param name="index" type="GLuint"/>
+		<param name="bufSize" type="GLsizei"/>
+		<param name="length" type="GLsizei *"/>
+		<param name="size" type="GLint *"/>
+		<param name="type" type="GLenum *"/>
+		<param name="name" type="GLchar *"/>
+	</proto>
+</template>
+
+<template name="Uniform">
+	<proto>
+		<return type="void"/>
+		<param name="location" type="GLint"/>
+		<param name="count" type="GLsizei" hide_if_expanded="true"/>
+		<vector name="values" type="const GLtype *" size="dynamic">
+			<param name="v0" type="GLtype"/>
+			<param name="v1" type="GLtype"/>
+			<param name="v2" type="GLtype"/>
+			<param name="v3" type="GLtype"/>
+		</vector>
+	</proto>
+</template>
+
+<template name="UniformMatrix">
+	<proto>
+		<return type="void"/>
+		<param name="location" type="GLint"/>
+		<param name="count" type="GLsizei"/>
+		<param name="transpose" type="GLboolean"/>
+		<vector name="value" type="const GLtype *" size="dynamic"/>
+	</proto>
+</template>
+
+<template name="ValidateProgram">
+	<proto>
+		<return type="void"/>
+		<param name="program" type="GLuint"/>
+	</proto>
+</template>
+
+<template name="GenerateMipmap">
+	<proto>
+		<return type="void"/>
+		<param name="target" type="GLenum"/>
+	</proto>
+
+	<desc name="target">
+		<value name="GL_TEXTURE_2D"/>
+		<value name="GL_TEXTURE_CUBE_MAP" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_3D_OES" category="OES_texture_3D"/>
+	</desc>
+</template>
+
+<template name="BindFramebuffer">
+	<proto>
+		<return type="void"/>
+		<param name="target" type="GLenum"/>
+		<param name="framebuffer" type="GLuint"/>
+	</proto>
+
+	<desc name="target">
+		<value name="GL_FRAMEBUFFER_OES" category="OES_framebuffer_object"/>
+		<value name="GL_FRAMEBUFFER" category="GLES2.0"/>
+	</desc>
+</template>
+
+<template name="DeleteFramebuffers">
+	<proto>
+		<return type="void"/>
+		<param name="n" type="GLsizei"/>
+		<param name="framebuffers" type="const GLuint *"/>
+	</proto>
+</template>
+
+<template name="GenFramebuffers">
+	<proto>
+		<return type="void"/>
+		<param name="n" type="GLsizei"/>
+		<param name="ids" type="GLuint *"/>
+	</proto>
+</template>
+
+<template name="BindRenderbuffer">
+	<proto>
+		<return type="void"/>
+		<param name="target" type="GLenum"/>
+		<param name="renderbuffer" type="GLuint"/>
+	</proto>
+
+	<desc name="target">
+		<value name="GL_RENDERBUFFER_OES" category="OES_framebuffer_object"/>
+		<value name="GL_RENDERBUFFER" category="GLES2.0"/>
+	</desc>
+</template>
+
+<template name="DeleteRenderbuffers">
+	<proto>
+		<return type="void"/>
+		<param name="n" type="GLsizei"/>
+		<param name="renderbuffers" type="const GLuint *"/>
+	</proto>
+</template>
+
+<template name="GenRenderbuffers">
+	<proto>
+		<return type="void"/>
+		<param name="n" type="GLsizei"/>
+		<param name="renderbuffers" type="GLuint *"/>
+	</proto>
+</template>
+
+<template name="RenderbufferStorage">
+	<proto>
+		<return type="void"/>
+		<param name="target" type="GLenum"/>
+		<param name="internalFormat" type="GLenum"/>
+		<param name="width" type="GLsizei"/>
+		<param name="height" type="GLsizei"/>
+	</proto>
+
+	<desc name="target">
+		<value name="GL_RENDERBUFFER_OES" category="OES_framebuffer_object"/>
+		<value name="GL_RENDERBUFFER" category="GLES2.0"/>
+	</desc>
+
+	<desc name="internalFormat">
+		<value name="GL_DEPTH_COMPONENT16_OES" category="OES_framebuffer_object"/>
+		<value name="GL_RGBA4_OES" category="OES_framebuffer_object"/>
+		<value name="GL_RGB5_A1_OES" category="OES_framebuffer_object"/>
+		<value name="GL_RGB565_OES" category="OES_framebuffer_object"/>
+		<value name="GL_STENCIL_INDEX8_OES" category="OES_stencil8"/>
+
+		<value name="GL_DEPTH_COMPONENT16" category="GLES2.0"/>
+		<value name="GL_RGBA4" category="GLES2.0"/>
+		<value name="GL_RGB5_A1" category="GLES2.0"/>
+		<value name="GL_RGB565" category="GLES2.0"/>
+		<value name="GL_STENCIL_INDEX8" category="GLES2.0"/>
+
+		<value name="GL_DEPTH_COMPONENT24_OES" category="OES_depth24"/>
+		<value name="GL_DEPTH_COMPONENT32_OES" category="OES_depth32"/>
+		<value name="GL_RGB8_OES" category="OES_rgb8_rgba8"/>
+		<value name="GL_RGBA8_OES" category="OES_rgb8_rgba8"/>
+		<value name="GL_STENCIL_INDEX1_OES" category="OES_stencil1"/>
+		<value name="GL_STENCIL_INDEX4_OES" category="OES_stencil4"/>
+		<value name="GL_DEPTH24_STENCIL8_OES" category="OES_packed_depth_stencil"/>
+	</desc>
+</template>
+
+<template name="FramebufferRenderbuffer">
+	<proto>
+		<return type="void"/>
+		<param name="target" type="GLenum"/>
+		<param name="attachment" type="GLenum"/>
+		<param name="renderbuffertarget" type="GLenum"/>
+		<param name="renderbuffer" type="GLuint"/>
+	</proto>
+
+	<desc name="target">
+		<value name="GL_FRAMEBUFFER_OES" category="OES_framebuffer_object"/>
+		<value name="GL_FRAMEBUFFER" category="GLES2.0"/>
+	</desc>
+
+	<desc name="attachment">
+		<value name="GL_COLOR_ATTACHMENT0_OES" category="OES_framebuffer_object"/>
+		<value name="GL_DEPTH_ATTACHMENT_OES" category="OES_framebuffer_object"/>
+		<value name="GL_STENCIL_ATTACHMENT_OES" category="OES_framebuffer_object"/>
+		<value name="GL_COLOR_ATTACHMENT0" category="GLES2.0"/>
+		<value name="GL_DEPTH_ATTACHMENT" category="GLES2.0"/>
+		<value name="GL_STENCIL_ATTACHMENT" category="GLES2.0"/>
+	</desc>
+
+	<desc name="renderbuffertarget">
+		<value name="GL_RENDERBUFFER_OES" category="OES_framebuffer_object"/>
+		<value name="GL_RENDERBUFFER" category="GLES2.0"/>
+	</desc>
+</template>
+
+<template name="FramebufferTexture2D">
+	<proto>
+		<return type="void"/>
+		<param name="target" type="GLenum"/>
+		<param name="attachment" type="GLenum"/>
+		<param name="textarget" type="GLenum"/>
+		<param name="texture" type="GLuint"/>
+		<param name="level" type="GLint"/>
+	</proto>
+
+	<desc name="target">
+		<value name="GL_FRAMEBUFFER_OES" category="OES_framebuffer_object"/>
+		<value name="GL_FRAMEBUFFER" category="GLES2.0"/>
+	</desc>
+
+	<desc name="attachment">
+		<value name="GL_COLOR_ATTACHMENT0_OES" category="OES_framebuffer_object"/>
+		<value name="GL_DEPTH_ATTACHMENT_OES" category="OES_framebuffer_object"/>
+		<value name="GL_STENCIL_ATTACHMENT_OES" category="OES_framebuffer_object"/>
+		<value name="GL_COLOR_ATTACHMENT0" category="GLES2.0"/>
+		<value name="GL_DEPTH_ATTACHMENT" category="GLES2.0"/>
+		<value name="GL_STENCIL_ATTACHMENT" category="GLES2.0"/>
+	</desc>
+
+	<desc name="textarget" error="GL_INVALID_OPERATION">
+		<value name="GL_TEXTURE_2D"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z" category="GLES2.0"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES" category="OES_texture_cube_map"/>
+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES" category="OES_texture_cube_map"/>
+	</desc>
+	<!-- According to the base specification, "level" must be 0.  But
+	     extension GL_OES_fbo_render_mipmap lifts that restriction,
+	     so no restriction is placed here. -->
+</template>
+
+<template name="FramebufferTexture3D">
+	<proto>
+		<return type="void"/>
+		<param name="target" type="GLenum"/>
+		<param name="attachment" type="GLenum"/>
+		<param name="textarget" type="GLenum"/>
+		<param name="texture" type="GLuint"/>
+		<param name="level" type="GLint"/>
+		<param name="zoffset" type="GLint"/>
+	</proto>
+
+	<desc name="target">
+		<value name="GL_FRAMEBUFFER_OES" category="OES_framebuffer_object"/>
+		<value name="GL_FRAMEBUFFER" category="GLES2.0"/>
+	</desc>
+
+	<desc name="attachment">
+		<value name="GL_COLOR_ATTACHMENT0_OES" category="OES_framebuffer_object"/>
+		<value name="GL_DEPTH_ATTACHMENT_OES" category="OES_framebuffer_object"/>
+		<value name="GL_STENCIL_ATTACHMENT_OES" category="OES_framebuffer_object"/>
+		<value name="GL_COLOR_ATTACHMENT0" category="GLES2.0"/>
+		<value name="GL_DEPTH_ATTACHMENT" category="GLES2.0"/>
+		<value name="GL_STENCIL_ATTACHMENT" category="GLES2.0"/>
+	</desc>
+
+	<desc name="textarget" error="GL_INVALID_OPERATION">
+		<value name="GL_TEXTURE_3D_OES" category="OES_texture_3D"/>
+	</desc>
+</template>
+
+<template name="CheckFramebufferStatus" direction="get">
+	<proto>
+		<return type="GLenum"/>
+		<param name="target" type="GLenum"/>
+	</proto>
+
+	<desc name="target">
+		<value name="GL_FRAMEBUFFER_OES" category="OES_framebuffer_object"/>
+		<value name="GL_FRAMEBUFFER" category="GLES2.0"/>
+	</desc>
+</template>
+
+<template name="GetFramebufferAttachmentParameter" direction="get">
+	<proto>
+		<return type="void"/>
+		<param name="target" type="GLenum"/>
+		<param name="attachment" type="GLenum"/>
+		<param name="pname" type="GLenum"/>
+		<vector name="params" type="GLtype *" size="dynamic"/>
+	</proto>
+
+	<desc name="target">
+		<value name="GL_FRAMEBUFFER_OES" category="OES_framebuffer_object"/>
+		<value name="GL_FRAMEBUFFER" category="GLES2.0"/>
+	</desc>
+
+	<desc name="pname">
+		<value name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_OES" category="OES_framebuffer_object"/>
+		<value name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_OES" category="OES_framebuffer_object"/>
+		<value name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_OES" category="OES_framebuffer_object"/>
+		<value name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_OES" category="OES_framebuffer_object"/>
+
+		<value name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE" category="GLES2.0"/>
+		<value name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME" category="GLES2.0"/>
+		<value name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL" category="GLES2.0"/>
+		<value name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE" category="GLES2.0"/>
+		<value name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES" category="OES_texture_3D"/>
+
+		<desc name="params" vector_size="1" convert="false"/>
+	</desc>
+</template>
+
+<template name="GetRenderbufferParameter" direction="get">
+	<proto>
+		<return type="void"/>
+		<param name="target" type="GLenum"/>
+		<param name="pname" type="GLenum"/>
+		<vector name="params" type="GLtype *" size="dynamic"/>
+	</proto>
+
+	<desc name="target">
+		<value name="GL_RENDERBUFFER_OES" category="OES_framebuffer_object"/>
+		<value name="GL_RENDERBUFFER" category="GLES2.0"/>
+	</desc>
+
+	<desc name="pname" category="OES_framebuffer_object">
+		<value name="GL_RENDERBUFFER_WIDTH_OES"/>
+		<value name="GL_RENDERBUFFER_HEIGHT_OES"/>
+		<value name="GL_RENDERBUFFER_INTERNAL_FORMAT_OES"/>
+		<value name="GL_RENDERBUFFER_RED_SIZE_OES"/>
+		<value name="GL_RENDERBUFFER_GREEN_SIZE_OES"/>
+		<value name="GL_RENDERBUFFER_BLUE_SIZE_OES"/>
+		<value name="GL_RENDERBUFFER_ALPHA_SIZE_OES"/>
+		<value name="GL_RENDERBUFFER_DEPTH_SIZE_OES"/>
+		<value name="GL_RENDERBUFFER_STENCIL_SIZE_OES"/>
+
+		<desc name="params" vector_size="1" convert="false"/>
+	</desc>
+
+	<desc name="pname" category="GLES2.0">
+		<value name="GL_RENDERBUFFER_WIDTH"/>
+		<value name="GL_RENDERBUFFER_HEIGHT"/>
+		<value name="GL_RENDERBUFFER_INTERNAL_FORMAT"/>
+		<value name="GL_RENDERBUFFER_RED_SIZE"/>
+		<value name="GL_RENDERBUFFER_GREEN_SIZE"/>
+		<value name="GL_RENDERBUFFER_BLUE_SIZE"/>
+		<value name="GL_RENDERBUFFER_ALPHA_SIZE"/>
+		<value name="GL_RENDERBUFFER_DEPTH_SIZE"/>
+		<value name="GL_RENDERBUFFER_STENCIL_SIZE"/>
+
+		<desc name="params" vector_size="1" convert="false"/>
+	</desc>
+</template>
+
+<template name="IsRenderbuffer" direction="get">
+	<proto>
+		<return type="GLboolean"/>
+		<param name="renderbuffer" type="GLuint"/>
+	</proto>
+</template>
+
+<template name="IsFramebuffer" direction="get">
+	<proto>
+		<return type="GLboolean"/>
+		<param name="framebuffer" type="GLuint"/>
+	</proto>
+</template>
+
+<template name="IsShader" direction="get">
+	<proto>
+		<return type="GLboolean"/>
+		<param name="shader" type="GLuint"/>
+	</proto>
+</template>
+
+<template name="GetShader" direction="get">
+	<proto>
+		<return type="void"/>
+		<param name="shader" type="GLuint"/>
+		<param name="pname" type="GLenum"/>
+		<vector name="params" type="GLtype *" size="dynamic"/>
+	</proto>
+
+	<desc name="pname">
+		<value name="GL_SHADER_TYPE"/>
+		<value name="GL_COMPILE_STATUS"/>
+		<value name="GL_DELETE_STATUS"/>
+		<value name="GL_INFO_LOG_LENGTH"/>
+		<value name="GL_SHADER_SOURCE_LENGTH"/>
+	</desc>
+</template>
+
+<template name="GetAttachedShaders" direction="get">
+	<proto>
+		<return type="void"/>
+		<param name="program" type="GLuint"/>
+		<param name="maxCount" type="GLsizei"/>
+		<param name="count" type="GLsizei *"/>
+		<param name="shaders" type="GLuint *"/>
+	</proto>
+</template>
+
+<template name="GetShaderInfoLog" direction="get">
+	<proto>
+		<return type="void"/>
+		<param name="shader" type="GLuint"/>
+		<param name="bufSize" type="GLsizei"/>
+		<param name="length" type="GLsizei *"/>
+		<param name="infoLog" type="GLchar *"/>
+	</proto>
+</template>
+
+<template name="GetProgramInfoLog" direction="get">
+	<proto>
+		<return type="void"/>
+		<param name="program" type="GLuint"/>
+		<param name="bufSize" type="GLsizei"/>
+		<param name="length" type="GLsizei *"/>
+		<param name="infoLog" type="GLchar *"/>
+	</proto>
+</template>
+
+<template name="GetShaderSource" direction="get">
+	<proto>
+		<return type="void"/>
+		<param name="shader" type="GLuint"/>
+		<param name="bufSize" type="GLsizei"/>
+		<param name="length" type="GLsizei *"/>
+		<param name="source" type="GLchar *"/>
+	</proto>
+</template>
+
+<template name="GetShaderPrecisionFormat" direction="get">
+	<proto>
+		<return type="void"/>
+		<param name="shadertype" type="GLenum"/>
+		<param name="precisiontype" type="GLenum"/>
+		<param name="range" type="GLint *"/>
+		<param name="precision" type="GLint *"/>
+	</proto>
+
+	<desc name="shadertype">
+		<value name="GL_VERTEX_SHADER"/>
+		<value name="GL_FRAGMENT_SHADER"/>
+	</desc>
+
+	<desc name="precisiontype">
+		<value name="GL_LOW_FLOAT"/>
+		<value name="GL_MEDIUM_FLOAT"/>
+		<value name="GL_HIGH_FLOAT"/>
+		<value name="GL_LOW_INT"/>
+		<value name="GL_MEDIUM_INT"/>
+		<value name="GL_HIGH_INT"/>
+	</desc>
+</template>
+
+<template name="GetUniform" direction="get">
+	<proto>
+		<return type="void"/>
+		<param name="program" type="GLuint"/>
+		<param name="location" type="GLint"/>
+		<vector name="params" type="GLtype *" size="dynamic"/>
+	</proto>
+</template>
+
+<template name="QueryMatrix" direction="get">
+	<proto>
+		<return type="GLbitfield"/>
+		<vector name="mantissa" type="GLtype *" size="16"/>
+		<vector name="exponent" type="GLint *" size="16"/>
+	</proto>
+</template>
+
+<template name="DrawTex">
+	<proto>
+		<return type="void"/>
+		<vector name="coords" type="const GLtype *" size="5">
+			<param name="x" type="GLtype"/>
+			<param name="y" type="GLtype"/>
+			<param name="z" type="GLtype"/>
+			<param name="w" type="GLtype"/>
+			<param name="h" type="GLtype"/>
+		</vector>
+	</proto>
+</template>
+
+<template name="MultiDrawArrays">
+	<proto>
+		<return type="void"/>
+		<param name="mode" type="GLenum"/>
+		<param name="first" type="const GLint *"/>
+		<param name="count" type="const GLsizei *"/>
+		<param name="primcount" type="GLsizei"/>
+	</proto>
+
+	<desc name="mode">
+		<value name="GL_POINTS"/>
+		<value name="GL_LINES"/>
+		<value name="GL_LINE_LOOP"/>
+		<value name="GL_LINE_STRIP"/>
+		<value name="GL_TRIANGLES"/>
+		<value name="GL_TRIANGLE_STRIP"/>
+		<value name="GL_TRIANGLE_FAN"/>
+	</desc>
+</template>
+
+<template name="MultiDrawElements">
+	<proto>
+		<return type="void"/>
+		<param name="mode" type="GLenum"/>
+		<param name="count" type="const GLsizei *"/>
+		<param name="type" type="GLenum"/>
+		<param name="indices" type="const GLvoid **"/>
+		<param name="primcount" type="GLsizei"/>
+	</proto>
+
+	<desc name="mode">
+		<value name="GL_POINTS"/>
+		<value name="GL_LINES"/>
+		<value name="GL_LINE_LOOP"/>
+		<value name="GL_LINE_STRIP"/>
+		<value name="GL_TRIANGLES"/>
+		<value name="GL_TRIANGLE_STRIP"/>
+		<value name="GL_TRIANGLE_FAN"/>
+	</desc>
+
+	<desc name="type">
+		<value name="GL_UNSIGNED_BYTE"/>
+		<value name="GL_UNSIGNED_SHORT"/>
+		<value name="GL_UNSIGNED_INT" category="OES_element_index_uint"/>
+	</desc>
+</template>
+
+<template name="EGLImageTargetTexture2D">
+	<proto>
+		<return type="void"/>
+		<param name="target" type="GLenum"/>
+		<param name="image" type="GLeglImageOES"/>
+	</proto>
+
+	<desc name="target">
+		<value name="GL_TEXTURE_2D"/>
+	</desc>
+</template>
+
+<template name="EGLImageTargetRenderbufferStorage">
+	<proto>
+		<return type="void"/>
+		<param name="target" type="GLenum"/>
+		<param name="image" type="GLeglImageOES"/>
+	</proto>
+
+	<desc name="target">
+		<value name="GL_RENDERBUFFER_OES" category="OES_framebuffer_object"/>
+		<value name="GL_RENDERBUFFER" category="GLES2.0"/>
+	</desc>
+</template>
+
+<api name="mesa" implementation="true">
+	<category name="MESA"/>
+
+	<function name="Color4f"  default_prefix="_vbo_" template="Color" gltype="GLfloat" vector_size="4" expand_vector="true"/>
+	<function name="ClipPlane" template="ClipPlane" gltype="GLdouble"/>
+	<function name="CullFace" template="CullFace"/>
+
+	<function name="Fogf" template="Fog" gltype="GLfloat" expand_vector="true"/>
+	<function name="Fogfv" template="Fog" gltype="GLfloat"/>
+
+	<function name="FrontFace" template="FrontFace"/>
+	<function name="Hint" template="Hint"/>
+
+	<function name="Lightf" template="Light" gltype="GLfloat" expand_vector="true"/>
+	<function name="Lightfv" template="Light" gltype="GLfloat"/>
+
+	<function name="LightModelf" template="LightModel" gltype="GLfloat" expand_vector="true"/>
+	<function name="LightModelfv" template="LightModel" gltype="GLfloat"/>
+
+	<function name="LineWidth" template="LineWidth" gltype="GLfloat"/>
+
+	<function name="Materialf" default_prefix="_vbo_" template="Material" gltype="GLfloat" expand_vector="true"/>
+	<function name="Materialfv" default_prefix="_vbo_" template="Material" gltype="GLfloat"/>
+
+	<function name="PointSize" template="PointSize" gltype="GLfloat"/>
+	<function name="PointSizePointer" template="PointSizePointer"/>
+
+	<function name="Scissor" template="Scissor"/>
+	<function name="ShadeModel" template="ShadeModel"/>
+
+	<function name="TexParameterf" template="TexParameter" gltype="GLfloat" expand_vector="true"/>
+	<function name="TexParameterfv" template="TexParameter" gltype="GLfloat"/>
+	<function name="TexParameteri" template="TexParameter" gltype="GLint" expand_vector="true"/>
+	<function name="TexParameteriv" template="TexParameter" gltype="GLint"/>
+
+	<function name="TexImage2D" template="TexImage2D"/>
+
+	<function name="TexEnvf" template="TexEnv" gltype="GLfloat" expand_vector="true"/>
+	<function name="TexEnvi" template="TexEnv" gltype="GLint" expand_vector="true"/>
+	<function name="TexEnvfv" template="TexEnv" gltype="GLfloat"/>
+	<function name="TexEnviv" template="TexEnv" gltype="GLint"/>
+
+	<function name="TexGenf" template="TexGen" gltype="GLfloat" expand_vector="true"/>
+	<function name="TexGenfv" template="TexGen" gltype="GLfloat"/>
+
+	<function name="Clear" template="Clear"/>
+	<function name="ClearColor" template="ClearColor" gltype="GLclampf"/>
+	<function name="ClearStencil" template="ClearStencil"/>
+	<function name="ClearDepth" template="ClearDepth" gltype="GLclampd"/>
+
+	<function name="StencilMask" template="StencilMask"/>
+	<function name="StencilMaskSeparate" template="StencilMaskSeparate"/>
+	<function name="ColorMask" template="ColorMask"/>
+	<function name="DepthMask" template="DepthMask"/>
+	<function name="Disable" template="Disable"/>
+	<function name="Enable" template="Enable"/>
+	<function name="Finish" template="Finish"/>
+	<function name="Flush" template="Flush"/>
+
+	<function name="AlphaFunc" template="AlphaFunc" gltype="GLclampf"/>
+
+	<function name="BlendFunc" template="BlendFunc"/>
+	<function name="LogicOp" template="LogicOp"/>
+	<function name="StencilFunc" template="StencilFunc"/>
+	<function name="StencilFuncSeparate" template="StencilFuncSeparate"/>
+	<function name="StencilOp" template="StencilOp"/>
+	<function name="StencilOpSeparate" template="StencilOpSeparate"/>
+	<function name="DepthFunc" template="DepthFunc"/>
+	<function name="PixelStorei" template="PixelStore" gltype="GLint"/>
+
+	<function name="ReadPixels" template="ReadPixels"/>
+	<function name="GetBooleanv" template="GetState" gltype="GLboolean"/>
+	<function name="GetClipPlane" template="GetClipPlane" gltype="GLdouble"/>
+	<function name="GetError" template="GetError"/>
+	<function name="GetFloatv" template="GetState" gltype="GLfloat"/>
+	<function name="GetFixedv" template="GetState" gltype="GLfixed"/>
+	<function name="GetIntegerv" template="GetState" gltype="GLint"/>
+
+	<function name="GetLightfv" template="GetLight" gltype="GLfloat"/>
+	<function name="GetMaterialfv" template="GetMaterial" gltype="GLfloat"/>
+	<function name="GetMaterialiv" template="GetMaterial" gltype="GLint"/>
+
+	<function name="GetString" template="GetString"/>
+
+	<function name="GetTexEnvfv" template="GetTexEnv" gltype="GLfloat"/>
+	<function name="GetTexEnviv" template="GetTexEnv" gltype="GLint"/>
+	<function name="GetTexGenfv" template="GetTexGen" gltype="GLfloat"/>
+	<function name="GetTexParameterfv" template="GetTexParameter" gltype="GLfloat"/>
+	<function name="GetTexParameteriv" template="GetTexParameter" gltype="GLint"/>
+
+	<function name="IsEnabled" template="IsEnabled"/>
+
+	<function name="DepthRange" template="DepthRange" gltype="GLclampd"/>
+	<function name="Frustum" template="Frustum" gltype="GLdouble"/>
+
+	<function name="LoadIdentity" template="LoadIdentity"/>
+	<function name="LoadMatrixf" template="LoadMatrix" gltype="GLfloat"/>
+	<function name="MatrixMode" template="MatrixMode"/>
+
+	<function name="MultMatrixf" template="MultMatrix" gltype="GLfloat"/>
+	<function name="Ortho" template="Ortho" gltype="GLdouble"/>
+	<function name="PopMatrix" template="PopMatrix"/>
+	<function name="PushMatrix" template="PushMatrix"/>
+
+	<function name="Rotatef" template="Rotate" gltype="GLfloat"/>
+	<function name="Scalef" template="Scale" gltype="GLfloat"/>
+	<function name="Translatef" template="Translate" gltype="GLfloat"/>
+
+	<function name="Viewport" template="Viewport"/>
+
+	<function name="ColorPointer" template="ColorPointer"/>
+	<function name="DisableClientState" template="DisableClientState"/>
+	<function name="DrawArrays" template="DrawArrays"/>
+	<function name="DrawElements" template="DrawElements"/>
+	<function name="EnableClientState" template="EnableClientState"/>
+
+	<function name="GetPointerv" template="GetPointer"/>
+	<function name="Normal3f" default_prefix="_vbo_" template="Normal" gltype="GLfloat" expand_vector="true"/>
+	<function name="NormalPointer" template="NormalPointer"/>
+	<function name="TexCoordPointer" template="TexCoordPointer"/>
+	<function name="VertexPointer" template="VertexPointer"/>
+
+	<function name="PolygonOffset" template="PolygonOffset" gltype="GLfloat"/>
+	<function name="CopyTexImage2D" template="CopyTexImage2D"/>
+	<function name="CopyTexSubImage2D" template="CopyTexSubImage2D"/>
+	<function name="TexSubImage2D" template="TexSubImage2D"/>
+
+	<function name="BindTexture" template="BindTexture"/>
+	<function name="DeleteTextures" template="DeleteTextures"/>
+	<function name="GenTextures" template="GenTextures"/>
+	<function name="IsTexture" template="IsTexture"/>
+
+	<function name="BlendColor" template="BlendColor" gltype="GLclampf"/>
+	<function name="BlendEquation" template="BlendEquation"/>
+	<function name="BlendEquationSeparateEXT" template="BlendEquationSeparate"/>
+
+	<function name="TexImage3D" template="TexImage3D"/>
+	<function name="TexSubImage3D" template="TexSubImage3D"/>
+	<function name="CopyTexSubImage3D" template="CopyTexSubImage3D"/>
+
+	<function name="CompressedTexImage3DARB" template="CompressedTexImage3D"/>
+	<function name="CompressedTexSubImage3DARB" template="CompressedTexSubImage3D"/>
+
+	<function name="ActiveTextureARB" template="ActiveTexture"/>
+	<function name="ClientActiveTextureARB" template="ClientActiveTexture"/>
+
+	<function name="MultiTexCoord4f" default_prefix="_vbo_" template="MultiTexCoord" gltype="GLfloat" vector_size="4" expand_vector="true"/>
+
+	<function name="SampleCoverageARB" template="SampleCoverage" gltype="GLclampf"/>
+
+	<function name="CompressedTexImage2DARB" template="CompressedTexImage2D"/>
+	<function name="CompressedTexSubImage2DARB" template="CompressedTexSubImage2D"/>
+
+	<function name="BlendFuncSeparateEXT" template="BlendFuncSeparate"/>
+
+	<function name="PointParameterf" template="PointParameter" gltype="GLfloat" expand_vector="true"/>
+	<function name="PointParameterfv" template="PointParameter" gltype="GLfloat"/>
+
+	<function name="VertexAttrib1f" default_prefix="_vbo_" template="VertexAttrib" gltype="GLfloat" vector_size="1" expand_vector="true"/>
+	<function name="VertexAttrib2f" default_prefix="_vbo_" template="VertexAttrib" gltype="GLfloat" vector_size="2" expand_vector="true"/>
+	<function name="VertexAttrib3f" default_prefix="_vbo_" template="VertexAttrib" gltype="GLfloat" vector_size="3" expand_vector="true"/>
+	<function name="VertexAttrib4f" default_prefix="_vbo_" template="VertexAttrib" gltype="GLfloat" vector_size="4" expand_vector="true"/>
+	<function name="VertexAttrib1fv" default_prefix="_vbo_" template="VertexAttrib" gltype="GLfloat" vector_size="1"/>
+	<function name="VertexAttrib2fv" default_prefix="_vbo_" template="VertexAttrib" gltype="GLfloat" vector_size="2"/>
+	<function name="VertexAttrib3fv" default_prefix="_vbo_" template="VertexAttrib" gltype="GLfloat" vector_size="3"/>
+	<function name="VertexAttrib4fv" default_prefix="_vbo_" template="VertexAttrib" gltype="GLfloat" vector_size="4"/>
+
+	<function name="VertexAttribPointerARB" template="VertexAttribPointer"/>
+	<function name="EnableVertexAttribArrayARB" template="EnableVertexAttribArray"/>
+	<function name="DisableVertexAttribArrayARB" template="DisableVertexAttribArray"/>
+
+	<function name="IsProgram" template="IsProgram"/>
+	<function name="GetProgramiv" template="GetProgram" gltype="GLint"/>
+
+	<function name="GetVertexAttribfvARB" template="GetVertexAttrib" gltype="GLfloat"/>
+	<function name="GetVertexAttribivARB" template="GetVertexAttrib" gltype="GLint"/>
+	<function name="GetVertexAttribPointervARB" template="GetVertexAttribPointer"/>
+
+	<function name="GetBufferPointervARB" template="GetBufferPointer"/>
+	<function name="MapBufferARB" template="MapBuffer"/>
+	<function name="UnmapBufferARB" template="UnmapBuffer"/>
+	<function name="BindBufferARB" template="BindBuffer"/>
+	<function name="BufferDataARB" template="BufferData"/>
+	<function name="BufferSubDataARB" template="BufferSubData"/>
+	<function name="DeleteBuffersARB" template="DeleteBuffers"/>
+	<function name="GenBuffersARB" template="GenBuffers"/>
+	<function name="GetBufferParameterivARB" template="GetBufferParameter" gltype="GLint"/>
+	<function name="IsBufferARB" template="IsBuffer"/>
+
+	<function name="CreateShader" template="CreateShader"/>
+	<function name="ShaderSourceARB" template="ShaderSource"/>
+	<function name="CompileShaderARB" template="CompileShader"/>
+	<function name="ReleaseShaderCompiler" template="ReleaseShaderCompiler"/>
+	<function name="DeleteShader" template="DeleteShader"/>
+	<function name="ShaderBinary" template="ShaderBinary"/>
+	<function name="CreateProgram" template="CreateProgram"/>
+	<function name="AttachShader" template="AttachShader"/>
+	<function name="DetachShader" template="DetachShader"/>
+	<function name="LinkProgramARB" template="LinkProgram"/>
+	<function name="UseProgramObjectARB" template="UseProgram"/>
+	<function name="DeleteProgram" template="DeleteProgram"/>
+
+	<function name="GetActiveAttribARB" template="GetActiveAttrib"/>
+	<function name="GetAttribLocationARB" template="GetAttribLocation"/>
+	<function name="BindAttribLocationARB" template="BindAttribLocation"/>
+	<function name="GetUniformLocationARB" template="GetUniformLocation"/>
+	<function name="GetActiveUniformARB" template="GetActiveUniform"/>
+
+	<function name="Uniform1fARB" template="Uniform" gltype="GLfloat" vector_size="1" expand_vector="true"/>
+	<function name="Uniform2fARB" template="Uniform" gltype="GLfloat" vector_size="2" expand_vector="true"/>
+	<function name="Uniform3fARB" template="Uniform" gltype="GLfloat" vector_size="3" expand_vector="true"/>
+	<function name="Uniform4fARB" template="Uniform" gltype="GLfloat" vector_size="4" expand_vector="true"/>
+	<function name="Uniform1iARB" template="Uniform" gltype="GLint" vector_size="1" expand_vector="true"/>
+	<function name="Uniform2iARB" template="Uniform" gltype="GLint" vector_size="2" expand_vector="true"/>
+	<function name="Uniform3iARB" template="Uniform" gltype="GLint" vector_size="3" expand_vector="true"/>
+	<function name="Uniform4iARB" template="Uniform" gltype="GLint" vector_size="4" expand_vector="true"/>
+	<function name="Uniform1fvARB" template="Uniform" gltype="GLfloat" vector_size="1"/>
+	<function name="Uniform2fvARB" template="Uniform" gltype="GLfloat" vector_size="2"/>
+	<function name="Uniform3fvARB" template="Uniform" gltype="GLfloat" vector_size="3"/>
+	<function name="Uniform4fvARB" template="Uniform" gltype="GLfloat" vector_size="4"/>
+	<function name="Uniform1ivARB" template="Uniform" gltype="GLint" vector_size="1"/>
+	<function name="Uniform2ivARB" template="Uniform" gltype="GLint" vector_size="2"/>
+	<function name="Uniform3ivARB" template="Uniform" gltype="GLint" vector_size="3"/>
+	<function name="Uniform4ivARB" template="Uniform" gltype="GLint" vector_size="4"/>
+
+	<function name="UniformMatrix2fvARB" template="UniformMatrix" gltype="GLfloat" vector_size="2"/>
+	<function name="UniformMatrix3fvARB" template="UniformMatrix" gltype="GLfloat" vector_size="3"/>
+	<function name="UniformMatrix4fvARB" template="UniformMatrix" gltype="GLfloat" vector_size="4"/>
+
+	<function name="ValidateProgramARB" template="ValidateProgram"/>
+
+	<function name="GenerateMipmapEXT" template="GenerateMipmap"/>
+	<function name="BindFramebufferEXT" template="BindFramebuffer"/>
+	<function name="DeleteFramebuffersEXT" template="DeleteFramebuffers"/>
+	<function name="GenFramebuffersEXT" template="GenFramebuffers"/>
+	<function name="BindRenderbufferEXT" template="BindRenderbuffer"/>
+	<function name="DeleteRenderbuffersEXT" template="DeleteRenderbuffers"/>
+	<function name="GenRenderbuffersEXT" template="GenRenderbuffers"/>
+	<function name="RenderbufferStorageEXT" template="RenderbufferStorage"/>
+	<function name="FramebufferRenderbufferEXT" template="FramebufferRenderbuffer"/>
+	<function name="FramebufferTexture2DEXT" template="FramebufferTexture2D"/>
+	<function name="FramebufferTexture3DEXT" template="FramebufferTexture3D"/>
+	<function name="CheckFramebufferStatusEXT" template="CheckFramebufferStatus"/>
+	<function name="GetFramebufferAttachmentParameterivEXT" template="GetFramebufferAttachmentParameter" gltype="GLint"/>
+	<function name="GetRenderbufferParameterivEXT" template="GetRenderbufferParameter" gltype="GLint"/>
+	<function name="IsRenderbufferEXT" template="IsRenderbuffer"/>
+	<function name="IsFramebufferEXT" template="IsFramebuffer"/>
+
+	<function name="IsShader" template="IsShader"/>
+	<function name="GetShaderiv" template="GetShader" gltype="GLint"/>
+	<function name="GetAttachedShaders" template="GetAttachedShaders"/>
+	<function name="GetShaderInfoLog" template="GetShaderInfoLog"/>
+	<function name="GetProgramInfoLog" template="GetProgramInfoLog"/>
+	<function name="GetShaderSourceARB" template="GetShaderSource"/>
+	<function name="GetShaderPrecisionFormat" template="GetShaderPrecisionFormat"/>
+	<function name="GetUniformfvARB" template="GetUniform" gltype="GLfloat"/>
+	<function name="GetUniformivARB" template="GetUniform" gltype="GLint"/>
+
+	<function name="DrawTexf" template="DrawTex" gltype="GLfloat" expand_vector="true"/>
+	<function name="DrawTexfv" template="DrawTex" gltype="GLfloat"/>
+	<function name="DrawTexi" template="DrawTex" gltype="GLint" expand_vector="true"/>
+	<function name="DrawTexiv" template="DrawTex" gltype="GLint"/>
+	<function name="DrawTexs" template="DrawTex" gltype="GLshort" expand_vector="true"/>
+	<function name="DrawTexsv" template="DrawTex" gltype="GLshort"/>
+
+        <!-- EXT_multi_draw_arrays -->
+        <function name="MultiDrawArraysEXT" template="MultiDrawArrays"/>
+        <function name="MultiDrawElementsEXT" template="MultiDrawElements"/>
+
+        <!-- OES_EGL_image -->
+        <function name="EGLImageTargetTexture2DOES" template="EGLImageTargetTexture2D"/>
+        <function name="EGLImageTargetRenderbufferStorageOES" template="EGLImageTargetRenderbufferStorage"/>
+</api>
+
+<api name="GLES1.1">
+	<category name="GLES1.1"/>
+
+	<category name="OES_byte_coordinates"/>
+	<category name="OES_fixed_point"/>
+	<category name="OES_single_precision"/>
+	<category name="OES_matrix_get"/>
+	<category name="OES_read_format"/>
+	<category name="OES_compressed_paletted_texture"/>
+	<category name="OES_point_size_array"/>
+	<category name="OES_point_sprite"/>
+	<category name="OES_query_matrix"/>
+	<category name="OES_draw_texture"/>
+	<category name="OES_blend_equation_separate"/>
+	<category name="OES_blend_func_separate"/>
+	<category name="OES_blend_subtract"/>
+	<category name="OES_stencil_wrap"/>
+	<category name="OES_texture_cube_map"/>
+	<category name="OES_texture_env_crossbar"/>
+	<category name="OES_texture_mirrored_repeat"/>
+	<category name="OES_framebuffer_object"/>
+	<category name="OES_depth24"/>
+	<category name="OES_depth32"/>
+	<category name="OES_fbo_render_mipmap"/>
+	<category name="OES_rgb8_rgba8"/>
+	<category name="OES_stencil1"/>
+	<category name="OES_stencil4"/>
+	<category name="OES_stencil8"/>
+	<category name="OES_element_index_uint"/>
+	<category name="OES_mapbuffer"/>
+	<category name="EXT_texture_filter_anisotropic"/>
+
+	<category name="ARB_texture_non_power_of_two"/>
+	<!-- disabled due to missing enums
+	<category name="EXT_texture_compression_dxt1"/>
+	-->
+	<category name="EXT_texture_lod_bias"/>
+	<category name="EXT_blend_minmax"/>
+	<category name="EXT_multi_draw_arrays"/>
+	<category name="OES_EGL_image"/>
+
+	<category name="OES_matrix_palette"/>
+
+	<function name="Color4f" template="Color" gltype="GLfloat" vector_size="4" expand_vector="true"/>
+	<function name="Color4ub" template="Color" gltype="GLubyte" vector_size="4" expand_vector="true"/>
+	<function name="Color4x" template="Color" gltype="GLfixed" vector_size="4" expand_vector="true"/>
+
+	<function name="ClipPlanef" template="ClipPlane" gltype="GLfloat"/>
+	<function name="ClipPlanex" template="ClipPlane" gltype="GLfixed"/>
+
+	<function name="CullFace" template="CullFace"/>
+
+	<function name="Fogf" template="Fog" gltype="GLfloat" expand_vector="true"/>
+	<function name="Fogx" template="Fog" gltype="GLfixed" expand_vector="true"/>
+	<function name="Fogfv" template="Fog" gltype="GLfloat"/>
+	<function name="Fogxv" template="Fog" gltype="GLfixed"/>
+
+	<function name="FrontFace" template="FrontFace"/>
+	<function name="Hint" template="Hint"/>
+
+	<function name="Lightf" template="Light" gltype="GLfloat" expand_vector="true"/>
+	<function name="Lightx" template="Light" gltype="GLfixed" expand_vector="true"/>
+	<function name="Lightfv" template="Light" gltype="GLfloat"/>
+	<function name="Lightxv" template="Light" gltype="GLfixed"/>
+
+	<function name="LightModelf" template="LightModel" gltype="GLfloat" expand_vector="true"/>
+	<function name="LightModelx" template="LightModel" gltype="GLfixed" expand_vector="true"/>
+	<function name="LightModelfv" template="LightModel" gltype="GLfloat"/>
+	<function name="LightModelxv" template="LightModel" gltype="GLfixed"/>
+
+	<function name="LineWidth" template="LineWidth" gltype="GLfloat"/>
+	<function name="LineWidthx" template="LineWidth" gltype="GLfixed"/>
+
+	<function name="Materialf" template="Material" gltype="GLfloat" expand_vector="true"/>
+	<function name="Materialfv" template="Material" gltype="GLfloat"/>
+	<function name="Materialx" template="Material" gltype="GLfixed" expand_vector="true"/>
+	<function name="Materialxv" template="Material" gltype="GLfixed"/>
+
+	<function name="PointSize" template="PointSize" gltype="GLfloat"/>
+	<function name="PointSizex" template="PointSize" gltype="GLfixed"/>
+	<function name="PointSizePointerOES" template="PointSizePointer"/>
+
+	<function name="Scissor" template="Scissor"/>
+	<function name="ShadeModel" template="ShadeModel"/>
+
+	<function name="TexParameterf" template="TexParameter" gltype="GLfloat" expand_vector="true"/>
+	<function name="TexParameterfv" template="TexParameter" gltype="GLfloat"/>
+	<function name="TexParameteri" template="TexParameter" gltype="GLint" expand_vector="true"/>
+	<function name="TexParameteriv" template="TexParameter" gltype="GLint"/>
+	<function name="TexParameterx" template="TexParameter" gltype="GLfixed" expand_vector="true"/>
+	<function name="TexParameterxv" template="TexParameter" gltype="GLfixed"/>
+
+	<function name="TexImage2D" template="TexImage2D"/>
+
+	<function name="TexEnvf" template="TexEnv" gltype="GLfloat" expand_vector="true"/>
+	<function name="TexEnvfv" template="TexEnv" gltype="GLfloat"/>
+	<function name="TexEnvi" template="TexEnv" gltype="GLint" expand_vector="true"/>
+	<function name="TexEnviv" template="TexEnv" gltype="GLint"/>
+	<function name="TexEnvx" template="TexEnv" gltype="GLfixed" expand_vector="true"/>
+	<function name="TexEnvxv" template="TexEnv" gltype="GLfixed"/>
+
+	<function name="TexGenfOES" external="true" template="TexGen" gltype="GLfloat" expand_vector="true"/>
+	<function name="TexGenfvOES" external="true" template="TexGen" gltype="GLfloat"/>
+	<function name="TexGeniOES" external="true" template="TexGen" gltype="GLint" expand_vector="true"/>
+	<function name="TexGenivOES" external="true" template="TexGen" gltype="GLint"/>
+	<function name="TexGenxOES" external="true" template="TexGen" gltype="GLfixed" expand_vector="true"/>
+	<function name="TexGenxvOES" external="true" template="TexGen" gltype="GLfixed"/>
+
+	<function name="Clear" template="Clear"/>
+	<function name="ClearColor" template="ClearColor" gltype="GLclampf"/>
+	<function name="ClearColorx" template="ClearColor" gltype="GLclampx"/>
+
+	<function name="ClearStencil" template="ClearStencil"/>
+	<function name="ClearDepthf" template="ClearDepth" gltype="GLclampf"/>
+	<function name="ClearDepthx" template="ClearDepth" gltype="GLclampx"/>
+
+	<function name="StencilMask" template="StencilMask"/>
+	<function name="ColorMask" template="ColorMask"/>
+	<function name="DepthMask" template="DepthMask"/>
+
+	<function name="Disable" template="Disable"/>
+	<function name="Enable" template="Enable"/>
+	<function name="Finish" template="Finish"/>
+	<function name="Flush" template="Flush"/>
+
+	<function name="AlphaFunc" template="AlphaFunc" gltype="GLclampf"/>
+	<function name="AlphaFuncx" template="AlphaFunc" gltype="GLclampx"/>
+
+	<function name="BlendFunc" template="BlendFunc"/>
+	<function name="LogicOp" template="LogicOp"/>
+	<function name="StencilFunc" template="StencilFunc"/>
+
+	<function name="StencilOp" template="StencilOp"/>
+	<function name="DepthFunc" template="DepthFunc"/>
+
+	<function name="PixelStorei" template="PixelStore" gltype="GLint"/>
+	<function name="ReadPixels" template="ReadPixels"/>
+
+	<function name="GetBooleanv" template="GetState" gltype="GLboolean"/>
+
+	<function name="GetClipPlanef" template="GetClipPlane" gltype="GLfloat"/>
+	<function name="GetClipPlanex" template="GetClipPlane" gltype="GLfixed"/>
+
+	<function name="GetError" template="GetError"/>
+	<function name="GetFloatv" template="GetState" gltype="GLfloat"/>
+	<function name="GetFixedv" template="GetState" gltype="GLfixed"/>
+	<function name="GetIntegerv" template="GetState" gltype="GLint"/>
+
+	<function name="GetLightfv" template="GetLight" gltype="GLfloat"/>
+	<function name="GetLightxv" template="GetLight" gltype="GLfixed"/>
+
+	<function name="GetMaterialfv" template="GetMaterial" gltype="GLfloat"/>
+	<function name="GetMaterialxv" template="GetMaterial" gltype="GLfixed"/>
+
+	<function name="GetString" template="GetString"/>
+
+	<function name="GetTexEnvfv" template="GetTexEnv" gltype="GLfloat"/>
+	<function name="GetTexEnviv" template="GetTexEnv" gltype="GLint"/>
+	<function name="GetTexEnvxv" template="GetTexEnv" gltype="GLfixed"/>
+
+	<function name="GetTexGenfvOES" external="true" template="GetTexGen" gltype="GLfloat"/>
+	<function name="GetTexGenivOES" external="true" template="GetTexGen" gltype="GLint"/>
+	<function name="GetTexGenxvOES" external="true" template="GetTexGen" gltype="GLfixed"/>
+
+	<function name="GetTexParameterfv" template="GetTexParameter" gltype="GLfloat"/>
+	<function name="GetTexParameteriv" template="GetTexParameter" gltype="GLint"/>
+	<function name="GetTexParameterxv" template="GetTexParameter" gltype="GLfixed"/>
+
+	<function name="IsEnabled" template="IsEnabled"/>
+
+	<function name="DepthRangef" template="DepthRange" gltype="GLclampf"/>
+	<function name="DepthRangex" template="DepthRange" gltype="GLclampx"/>
+
+	<function name="Frustumf" template="Frustum" gltype="GLfloat"/>
+	<function name="Frustumx" template="Frustum" gltype="GLfixed"/>
+
+	<function name="LoadIdentity" template="LoadIdentity"/>
+	<function name="LoadMatrixf" template="LoadMatrix" gltype="GLfloat"/>
+	<function name="LoadMatrixx" template="LoadMatrix" gltype="GLfixed"/>
+	<function name="MatrixMode" template="MatrixMode"/>
+
+	<function name="MultMatrixf" template="MultMatrix" gltype="GLfloat"/>
+	<function name="MultMatrixx" template="MultMatrix" gltype="GLfixed"/>
+	<function name="Orthof" template="Ortho" gltype="GLfloat"/>
+	<function name="Orthox" template="Ortho" gltype="GLfixed"/>
+
+	<function name="PopMatrix" template="PopMatrix"/>
+	<function name="PushMatrix" template="PushMatrix"/>
+
+	<function name="Rotatef" template="Rotate" gltype="GLfloat"/>
+	<function name="Rotatex" template="Rotate" gltype="GLfixed"/>
+	<function name="Scalef" template="Scale" gltype="GLfloat"/>
+	<function name="Scalex" template="Scale" gltype="GLfixed"/>
+	<function name="Translatef" template="Translate" gltype="GLfloat"/>
+	<function name="Translatex" template="Translate" gltype="GLfixed"/>
+
+	<function name="Viewport" template="Viewport"/>
+	<function name="ColorPointer" template="ColorPointer"/>
+	<function name="DisableClientState" template="DisableClientState"/>
+	<function name="DrawArrays" template="DrawArrays"/>
+	<function name="DrawElements" template="DrawElements"/>
+	<function name="EnableClientState" template="EnableClientState"/>
+
+	<function name="GetPointerv" template="GetPointer"/>
+
+	<function name="Normal3f" template="Normal" gltype="GLfloat" expand_vector="true"/>
+	<function name="Normal3x" template="Normal" gltype="GLfixed" expand_vector="true"/>
+	<function name="NormalPointer" template="NormalPointer"/>
+	<function name="TexCoordPointer" template="TexCoordPointer"/>
+	<function name="VertexPointer" template="VertexPointer"/>
+
+	<function name="PolygonOffset" template="PolygonOffset" gltype="GLfloat"/>
+	<function name="PolygonOffsetx" template="PolygonOffset" gltype="GLfixed"/>
+
+	<function name="CopyTexImage2D" template="CopyTexImage2D"/>
+	<function name="CopyTexSubImage2D" template="CopyTexSubImage2D"/>
+
+	<function name="TexSubImage2D" template="TexSubImage2D"/>
+
+	<function name="BindTexture" template="BindTexture"/>
+	<function name="DeleteTextures" template="DeleteTextures"/>
+	<function name="GenTextures" template="GenTextures"/>
+	<function name="IsTexture" template="IsTexture"/>
+
+	<function name="BlendEquationOES" template="BlendEquation"/>
+	<function name="BlendEquationSeparateOES" template="BlendEquationSeparate"/>
+
+	<function name="MultiTexCoord4x" template="MultiTexCoord" gltype="GLfixed" vector_size="4" expand_vector="true"/>
+
+	<function name="ActiveTexture" template="ActiveTexture"/>
+	<function name="ClientActiveTexture" template="ClientActiveTexture"/>
+
+	<function name="MultiTexCoord4f" template="MultiTexCoord" gltype="GLfloat" vector_size="4" expand_vector="true"/>
+
+	<function name="SampleCoverage" template="SampleCoverage" gltype="GLclampf"/>
+	<function name="SampleCoveragex" template="SampleCoverage" gltype="GLclampx"/>
+
+	<!-- CompressedTexImage2D calls out to two different functions based on
+	     whether the image is a paletted image or not -->
+	<function name="CompressedTexImage2D" template="CompressedTexImage2D"/>
+	<function name="CompressedTexSubImage2D" template="CompressedTexSubImage2D"/>
+
+	<function name="BlendFuncSeparateOES" template="BlendFuncSeparate"/>
+
+	<function name="PointParameterf" template="PointParameter" gltype="GLfloat" expand_vector="true"/>
+	<function name="PointParameterfv" template="PointParameter" gltype="GLfloat"/>
+	<function name="PointParameterx" template="PointParameter" gltype="GLfixed" expand_vector="true"/>
+	<function name="PointParameterxv" template="PointParameter" gltype="GLfixed"/>
+
+	<!-- OES_mapbuffer -->
+	<function name="GetBufferPointervOES" template="GetBufferPointer"/>
+	<function name="MapBufferOES" template="MapBuffer"/>
+	<function name="UnmapBufferOES" template="UnmapBuffer"/>
+
+	<function name="BindBuffer" template="BindBuffer"/>
+	<function name="BufferData" template="BufferData"/>
+	<function name="BufferSubData" template="BufferSubData"/>
+	<function name="DeleteBuffers" template="DeleteBuffers"/>
+	<function name="GenBuffers" template="GenBuffers"/>
+	<function name="GetBufferParameteriv" template="GetBufferParameter" gltype="GLint"/>
+	<function name="IsBuffer" template="IsBuffer"/>
+
+	<!-- OES_framebuffer_object -->
+	<function name="GenerateMipmapOES" template="GenerateMipmap"/>
+	<function name="BindFramebufferOES" template="BindFramebuffer"/>
+	<function name="DeleteFramebuffersOES" template="DeleteFramebuffers"/>
+	<function name="GenFramebuffersOES" template="GenFramebuffers"/>
+	<function name="BindRenderbufferOES" template="BindRenderbuffer"/>
+	<function name="DeleteRenderbuffersOES" template="DeleteRenderbuffers"/>
+	<function name="GenRenderbuffersOES" template="GenRenderbuffers"/>
+	<function name="RenderbufferStorageOES" external="true" template="RenderbufferStorage"/>
+	<function name="FramebufferRenderbufferOES" template="FramebufferRenderbuffer"/>
+	<function name="FramebufferTexture2DOES" template="FramebufferTexture2D"/>
+	<function name="CheckFramebufferStatusOES" template="CheckFramebufferStatus"/>
+	<function name="GetFramebufferAttachmentParameterivOES" template="GetFramebufferAttachmentParameter" gltype="GLint"/>
+	<function name="GetRenderbufferParameterivOES" template="GetRenderbufferParameter" gltype="GLint"/>
+	<function name="IsRenderbufferOES" template="IsRenderbuffer"/>
+	<function name="IsFramebufferOES" template="IsFramebuffer"/>
+
+	<!-- OES_query_matrix -->
+	<!-- QueryMatrixx returns values in an unusual, decomposed, fixed-value
+	     form; it has its own code for this -->
+	<function name="QueryMatrixxOES" external="true" template="QueryMatrix" gltype="GLfixed"/>
+
+	<!-- OES_draw_texture -->
+	<function name="DrawTexfOES" template="DrawTex" gltype="GLfloat" expand_vector="true"/>
+	<function name="DrawTexiOES" template="DrawTex" gltype="GLint" expand_vector="true"/>
+	<function name="DrawTexsOES" template="DrawTex" gltype="GLshort" expand_vector="true"/>
+	<function name="DrawTexxOES" template="DrawTex" gltype="GLfixed" expand_vector="true"/>
+	<function name="DrawTexfvOES" template="DrawTex" gltype="GLfloat"/>
+	<function name="DrawTexivOES" template="DrawTex" gltype="GLint"/>
+	<function name="DrawTexsvOES" template="DrawTex" gltype="GLshort"/>
+	<function name="DrawTexxvOES" template="DrawTex" gltype="GLfixed"/>
+
+        <!-- EXT_multi_draw_arrays -->
+        <function name="MultiDrawArraysEXT" template="MultiDrawArrays"/>
+        <function name="MultiDrawElementsEXT" template="MultiDrawElements"/>
+
+        <!-- OES_EGL_image -->
+        <function name="EGLImageTargetTexture2DOES" template="EGLImageTargetTexture2D"/>
+        <function name="EGLImageTargetRenderbufferStorageOES" template="EGLImageTargetRenderbufferStorage"/>
+</api>
+
+<api name="GLES2.0">
+	<category name="GLES2.0"/>
+
+	<category name="OES_compressed_paletted_texture"/>
+	<category name="OES_depth24"/>
+	<category name="OES_depth32"/>
+	<category name="OES_fbo_render_mipmap"/>
+	<category name="OES_rgb8_rgba8"/>
+	<category name="OES_stencil1"/>
+	<category name="OES_stencil4"/>
+	<category name="OES_element_index_uint"/>
+	<category name="OES_mapbuffer"/>
+	<category name="OES_texture_3D"/>
+	<category name="OES_texture_npot"/>
+	<category name="EXT_texture_filter_anisotropic"/>
+	<category name="EXT_texture_type_2_10_10_10_REV"/>
+	<category name="OES_depth_texture"/>
+	<category name="OES_packed_depth_stencil"/>
+	<category name="OES_standard_derivatives"/>
+
+	<category name="EXT_texture_compression_dxt1"/>
+	<category name="EXT_blend_minmax"/>
+	<category name="EXT_multi_draw_arrays"/>
+	<category name="OES_EGL_image"/>
+
+	<function name="CullFace" template="CullFace"/>
+
+	<function name="FrontFace" template="FrontFace"/>
+	<function name="Hint" template="Hint"/>
+
+	<function name="LineWidth" template="LineWidth" gltype="GLfloat"/>
+
+	<function name="Scissor" template="Scissor"/>
+
+	<function name="TexParameterf" template="TexParameter" gltype="GLfloat" expand_vector="true"/>
+	<function name="TexParameterfv" template="TexParameter" gltype="GLfloat"/>
+	<function name="TexParameteri" template="TexParameter" gltype="GLint" expand_vector="true"/>
+	<function name="TexParameteriv" template="TexParameter" gltype="GLint"/>
+
+	<function name="TexImage2D" template="TexImage2D"/>
+
+	<function name="Clear" template="Clear"/>
+	<function name="ClearColor" template="ClearColor" gltype="GLclampf"/>
+	<function name="ClearStencil" template="ClearStencil"/>
+	<function name="ClearDepthf" template="ClearDepth" gltype="GLclampf"/>
+
+	<function name="StencilMask" template="StencilMask"/>
+	<function name="StencilMaskSeparate" template="StencilMaskSeparate"/>
+	<function name="ColorMask" template="ColorMask"/>
+	<function name="DepthMask" template="DepthMask"/>
+	<function name="Disable" template="Disable"/>
+	<function name="Enable" template="Enable"/>
+	<function name="Finish" template="Finish"/>
+	<function name="Flush" template="Flush"/>
+
+	<function name="BlendFunc" template="BlendFunc"/>
+
+	<function name="StencilFunc" template="StencilFunc"/>
+	<function name="StencilFuncSeparate" template="StencilFuncSeparate"/>
+	<function name="StencilOp" template="StencilOp"/>
+	<function name="StencilOpSeparate" template="StencilOpSeparate"/>
+
+	<function name="DepthFunc" template="DepthFunc"/>
+
+	<function name="PixelStorei" template="PixelStore" gltype="GLint"/>
+	<function name="ReadPixels" template="ReadPixels"/>
+
+	<function name="GetBooleanv" template="GetState" gltype="GLboolean"/>
+	<function name="GetError" template="GetError"/>
+	<function name="GetFloatv" template="GetState" gltype="GLfloat"/>
+	<function name="GetIntegerv" template="GetState" gltype="GLint"/>
+
+	<function name="GetString" template="GetString"/>
+
+	<function name="GetTexParameterfv" template="GetTexParameter" gltype="GLfloat"/>
+	<function name="GetTexParameteriv" template="GetTexParameter" gltype="GLint"/>
+
+	<function name="IsEnabled" template="IsEnabled"/>
+
+	<function name="DepthRangef" template="DepthRange" gltype="GLclampf"/>
+
+	<function name="Viewport" template="Viewport"/>
+
+	<function name="DrawArrays" template="DrawArrays"/>
+	<function name="DrawElements" template="DrawElements"/>
+
+	<function name="PolygonOffset" template="PolygonOffset" gltype="GLfloat"/>
+	<function name="CopyTexImage2D" template="CopyTexImage2D"/>
+	<function name="CopyTexSubImage2D" template="CopyTexSubImage2D"/>
+	<function name="TexSubImage2D" template="TexSubImage2D"/>
+
+	<function name="BindTexture" template="BindTexture"/>
+	<function name="DeleteTextures" template="DeleteTextures"/>
+	<function name="GenTextures" template="GenTextures"/>
+	<function name="IsTexture" template="IsTexture"/>
+
+	<function name="BlendColor" template="BlendColor" gltype="GLclampf"/>
+	<function name="BlendEquation" template="BlendEquation"/>
+	<function name="BlendEquationSeparate" template="BlendEquationSeparate"/>
+
+	<function name="TexImage3DOES" template="TexImage3D"/>
+	<function name="TexSubImage3DOES" template="TexSubImage3D"/>
+	<function name="CopyTexSubImage3DOES" template="CopyTexSubImage3D"/>
+
+	<function name="CompressedTexImage3DOES" template="CompressedTexImage3D"/>
+	<function name="CompressedTexSubImage3DOES" template="CompressedTexSubImage3D"/>
+
+	<function name="ActiveTexture" template="ActiveTexture"/>
+
+	<function name="SampleCoverage" template="SampleCoverage" gltype="GLclampf"/>
+
+	<function name="CompressedTexImage2D" template="CompressedTexImage2D"/>
+	<function name="CompressedTexSubImage2D" template="CompressedTexSubImage2D"/>
+
+	<function name="BlendFuncSeparate" template="BlendFuncSeparate"/>
+
+	<function name="VertexAttrib1f" template="VertexAttrib" gltype="GLfloat" vector_size="1" expand_vector="true"/>
+	<function name="VertexAttrib2f" template="VertexAttrib" gltype="GLfloat" vector_size="2" expand_vector="true"/>
+	<function name="VertexAttrib3f" template="VertexAttrib" gltype="GLfloat" vector_size="3" expand_vector="true"/>
+	<function name="VertexAttrib4f" template="VertexAttrib" gltype="GLfloat" vector_size="4" expand_vector="true"/>
+	<function name="VertexAttrib1fv" template="VertexAttrib" gltype="GLfloat" vector_size="1"/>
+	<function name="VertexAttrib2fv" template="VertexAttrib" gltype="GLfloat" vector_size="2"/>
+	<function name="VertexAttrib3fv" template="VertexAttrib" gltype="GLfloat" vector_size="3"/>
+	<function name="VertexAttrib4fv" template="VertexAttrib" gltype="GLfloat" vector_size="4"/>
+
+	<function name="VertexAttribPointer" template="VertexAttribPointer"/>
+
+	<function name="EnableVertexAttribArray" template="EnableVertexAttribArray"/>
+	<function name="DisableVertexAttribArray" template="DisableVertexAttribArray"/>
+
+	<function name="IsProgram" template="IsProgram"/>
+	<function name="GetProgramiv" template="GetProgram" gltype="GLint"/>
+
+	<function name="GetVertexAttribfv" template="GetVertexAttrib" gltype="GLfloat"/>
+	<function name="GetVertexAttribiv" template="GetVertexAttrib" gltype="GLint"/>
+	<function name="GetVertexAttribPointerv" template="GetVertexAttribPointer"/>
+
+	<function name="GetBufferPointervOES" template="GetBufferPointer"/>
+	<function name="MapBufferOES" template="MapBuffer"/>
+	<function name="UnmapBufferOES" template="UnmapBuffer"/>
+	<function name="BindBuffer" template="BindBuffer"/>
+	<function name="BufferData" template="BufferData"/>
+	<function name="BufferSubData" template="BufferSubData"/>
+	<function name="DeleteBuffers" template="DeleteBuffers"/>
+	<function name="GenBuffers" template="GenBuffers"/>
+	<function name="GetBufferParameteriv" template="GetBufferParameter" gltype="GLint"/>
+	<function name="IsBuffer" template="IsBuffer"/>
+
+	<function name="CreateShader" template="CreateShader"/>
+	<function name="ShaderSource" template="ShaderSource"/>
+	<function name="CompileShader" template="CompileShader"/>
+	<function name="ReleaseShaderCompiler" template="ReleaseShaderCompiler"/>
+	<function name="DeleteShader" template="DeleteShader"/>
+	<function name="ShaderBinary" template="ShaderBinary"/>
+	<function name="CreateProgram" template="CreateProgram"/>
+	<function name="AttachShader" template="AttachShader"/>
+	<function name="DetachShader" template="DetachShader"/>
+	<function name="LinkProgram" template="LinkProgram"/>
+	<function name="UseProgram" template="UseProgram"/>
+	<function name="DeleteProgram" template="DeleteProgram"/>
+
+	<function name="GetActiveAttrib" template="GetActiveAttrib"/>
+	<function name="GetAttribLocation" template="GetAttribLocation"/>
+	<function name="BindAttribLocation" template="BindAttribLocation"/>
+	<function name="GetUniformLocation" template="GetUniformLocation"/>
+	<function name="GetActiveUniform" template="GetActiveUniform"/>
+
+	<function name="Uniform1f" template="Uniform" gltype="GLfloat" vector_size="1" expand_vector="true"/>
+	<function name="Uniform2f" template="Uniform" gltype="GLfloat" vector_size="2" expand_vector="true"/>
+	<function name="Uniform3f" template="Uniform" gltype="GLfloat" vector_size="3" expand_vector="true"/>
+	<function name="Uniform4f" template="Uniform" gltype="GLfloat" vector_size="4" expand_vector="true"/>
+	<function name="Uniform1i" template="Uniform" gltype="GLint" vector_size="1" expand_vector="true"/>
+	<function name="Uniform2i" template="Uniform" gltype="GLint" vector_size="2" expand_vector="true"/>
+	<function name="Uniform3i" template="Uniform" gltype="GLint" vector_size="3" expand_vector="true"/>
+	<function name="Uniform4i" template="Uniform" gltype="GLint" vector_size="4" expand_vector="true"/>
+
+	<function name="Uniform1fv" template="Uniform" gltype="GLfloat" vector_size="1"/>
+	<function name="Uniform2fv" template="Uniform" gltype="GLfloat" vector_size="2"/>
+	<function name="Uniform3fv" template="Uniform" gltype="GLfloat" vector_size="3"/>
+	<function name="Uniform4fv" template="Uniform" gltype="GLfloat" vector_size="4"/>
+	<function name="Uniform1iv" template="Uniform" gltype="GLint" vector_size="1"/>
+	<function name="Uniform2iv" template="Uniform" gltype="GLint" vector_size="2"/>
+	<function name="Uniform3iv" template="Uniform" gltype="GLint" vector_size="3"/>
+	<function name="Uniform4iv" template="Uniform" gltype="GLint" vector_size="4"/>
+
+	<function name="UniformMatrix2fv" template="UniformMatrix" gltype="GLfloat" vector_size="2"/>
+	<function name="UniformMatrix3fv" template="UniformMatrix" gltype="GLfloat" vector_size="3"/>
+	<function name="UniformMatrix4fv" template="UniformMatrix" gltype="GLfloat" vector_size="4"/>
+
+	<function name="ValidateProgram" template="ValidateProgram"/>
+
+	<function name="GenerateMipmap" template="GenerateMipmap"/>
+	<function name="BindFramebuffer" template="BindFramebuffer"/>
+	<function name="DeleteFramebuffers" template="DeleteFramebuffers"/>
+	<function name="GenFramebuffers" template="GenFramebuffers"/>
+	<function name="BindRenderbuffer" template="BindRenderbuffer"/>
+	<function name="DeleteRenderbuffers" template="DeleteRenderbuffers"/>
+	<function name="GenRenderbuffers" template="GenRenderbuffers"/>
+	<function name="RenderbufferStorage" external="true" template="RenderbufferStorage"/>
+	<function name="FramebufferRenderbuffer" template="FramebufferRenderbuffer"/>
+	<function name="FramebufferTexture2D" template="FramebufferTexture2D"/>
+	<function name="FramebufferTexture3DOES" template="FramebufferTexture3D"/>
+	<function name="CheckFramebufferStatus" template="CheckFramebufferStatus"/>
+	<function name="GetFramebufferAttachmentParameteriv" template="GetFramebufferAttachmentParameter" gltype="GLint"/>
+	<function name="GetRenderbufferParameteriv" template="GetRenderbufferParameter" gltype="GLint"/>
+	<function name="IsRenderbuffer" template="IsRenderbuffer"/>
+	<function name="IsFramebuffer" template="IsFramebuffer"/>
+
+	<function name="IsShader" template="IsShader"/>
+	<function name="GetShaderiv" template="GetShader" gltype="GLint"/>
+	<function name="GetAttachedShaders" template="GetAttachedShaders"/>
+	<function name="GetShaderInfoLog" template="GetShaderInfoLog"/>
+	<function name="GetProgramInfoLog" template="GetProgramInfoLog"/>
+	<function name="GetShaderSource" template="GetShaderSource"/>
+	<function name="GetShaderPrecisionFormat" template="GetShaderPrecisionFormat"/>
+	<function name="GetUniformfv" template="GetUniform" gltype="GLfloat"/>
+	<function name="GetUniformiv" template="GetUniform" gltype="GLint"/>
+
+        <!-- EXT_multi_draw_arrays -->
+        <function name="MultiDrawArraysEXT" template="MultiDrawArrays"/>
+        <function name="MultiDrawElementsEXT" template="MultiDrawElements"/>
+
+        <!-- OES_EGL_image -->
+        <function name="EGLImageTargetTexture2DOES" template="EGLImageTargetTexture2D"/>
+        <function name="EGLImageTargetRenderbufferStorageOES" template="EGLImageTargetRenderbufferStorage"/>
+</api>
+
+</apispec>
diff --git a/mesalib/src/mesa/main/APIspecutil.py b/mesalib/src/mesa/main/APIspecutil.py
new file mode 100644
index 000000000..9e604bb84
--- /dev/null
+++ b/mesalib/src/mesa/main/APIspecutil.py
@@ -0,0 +1,272 @@
+#!/usr/bin/python
+#
+# Copyright (C) 2009 Chia-I Wu <olv@0xlab.org>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# 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
+# IBM AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+"""
+Minimal apiutil.py interface for use by es_generator.py.
+"""
+
+import sys
+import libxml2
+
+import APIspec
+
+__spec = {}
+__functions = {}
+__aliases = {}
+
+def _ParseXML(filename, apiname):
+    conversions = {
+        # from           to
+        'GLfloat':  [ 'GLdouble' ],
+        'GLclampf': [ 'GLclampd' ],
+        'GLubyte':  [ 'GLfloat', 'GLdouble' ],
+        'GLint':    [ 'GLfloat', 'GLdouble' ],
+        'GLfixed':  [ 'GLfloat', 'GLdouble' ],
+        'GLclampx': [ 'GLclampf', 'GLclampd' ],
+    }
+
+    doc = libxml2.readFile(filename, None,
+            libxml2.XML_PARSE_DTDLOAD +
+            libxml2.XML_PARSE_DTDVALID +
+            libxml2.XML_PARSE_NOBLANKS)
+    spec = APIspec.Spec(doc)
+    impl = spec.get_impl()
+    api = spec.get_api(apiname)
+    doc.freeDoc()
+
+    __spec["impl"] = impl
+    __spec["api"] = api
+
+    for func in api.functions:
+        alias, need_conv = impl.match(func, conversions)
+        if not alias:
+            # external functions are manually dispatched
+            if not func.is_external:
+                print >>sys.stderr, "Error: unable to dispatch %s" % func.name
+            alias = func
+            need_conv = False
+
+        __functions[func.name] = func
+        __aliases[func.name] = (alias, need_conv)
+
+
+def AllSpecials(notused=None):
+    """Return a list of all external functions in the API."""
+    api = __spec["api"]
+
+    specials = []
+    for func in api.functions:
+        if func.is_external:
+            specials.append(func.name)
+
+    return specials
+
+
+def GetAllFunctions(filename, api):
+    """Return sorted list of all functions in the API."""
+    if not __spec:
+        _ParseXML(filename, api)
+
+    api = __spec["api"]
+    names = []
+    for func in api.functions:
+        names.append(func.name)
+    names.sort()
+    return names
+
+
+def ReturnType(funcname):
+    """Return the C return type of named function."""
+    func = __functions[funcname]
+    return func.return_type
+
+
+def Properties(funcname):
+    """Return list of properties of the named GL function."""
+    func = __functions[funcname]
+    return [func.direction]
+
+
+def _ValidValues(func, param):
+    """Return the valid values of a parameter."""
+    valid_values = []
+    switch = func.checker.switches.get(param.name, [])
+    for desc in switch:
+        # no dependent vector
+        if not desc.checker.switches:
+            for val in desc.values:
+                valid_values.append((val, None, None, [], desc.error, None))
+            continue
+
+        items = desc.checker.switches.items()
+        if len(items) > 1:
+            print >>sys.stderr, "%s: more than one parameter depend on %s" % \
+                    (func.name, desc.name)
+        dep_name, dep_switch = items[0]
+
+        for dep_desc in dep_switch:
+            if dep_desc.index >= 0 and dep_desc.index != 0:
+                print >>sys.stderr, "%s: not first element of a vector" % func.name
+            if dep_desc.checker.switches:
+                print >>sys.stderr, "%s: deep nested dependence" % func.name
+
+            convert = None if dep_desc.convert else "noconvert"
+            for val in desc.values:
+                valid_values.append((val, dep_desc.size_str, dep_desc.name,
+                                     dep_desc.values, dep_desc.error, convert))
+    return valid_values
+
+
+def _Conversion(func, src_param):
+    """Return the destination type of the conversion, or None."""
+    alias, need_conv = __aliases[func.name]
+    if need_conv:
+        dst_param = alias.get_param(src_param.name)
+        if src_param.type == dst_param.type:
+            need_conv = False
+    if not need_conv:
+        return (None, "none")
+
+    converts = { True: 0, False: 0 }
+
+    # In Fogx, for example,  pname may be GL_FOG_DENSITY/GL_FOG_START/GL_FOG_END
+    # or GL_FOG_MODE.  In the former three cases, param is not checked and the
+    # default is to convert.
+    if not func.checker.always_check(src_param.name):
+        converts[True] += 1
+
+    for desc in func.checker.flatten(src_param.name):
+        converts[desc.convert] += 1
+        if converts[True] and converts[False]:
+            break
+
+    # it should be "never", "sometimes", and "always"...
+    if converts[False]:
+        if converts[True]:
+            conversion = "some"
+        else:
+            conversion = "none"
+    else:
+        conversion = "all"
+
+    return (dst_param.base_type(), conversion)
+
+
+def _MaxVecSize(func, param):
+    """Return the largest possible size of a vector."""
+    if not param.is_vector:
+        return 0
+    if param.size:
+        return param.size
+
+    # need to look at all descriptions
+    size = 0
+    for desc in func.checker.flatten(param.name):
+        if desc.size_str and desc.size_str.isdigit():
+            s = int(desc.size_str)
+            if s > size:
+                size = s
+    if not size:
+        need_conv = __aliases[func.name][1]
+        if need_conv:
+            print >>sys.stderr, \
+                    "Error: unable to dicide the max size of %s in %s" % \
+                    (param.name, func.name)
+    return size
+
+
+def _ParameterTuple(func, param):
+    """Return a parameter tuple.
+
+    [0] -- parameter name
+    [1] -- parameter type
+    [2] -- max vector size or 0
+    [3] -- dest type the parameter converts to, or None
+    [4] -- valid values
+    [5] -- how often does the conversion happen
+
+    """
+    vec_size = _MaxVecSize(func, param)
+    dst_type, conversion = _Conversion(func, param)
+    valid_values = _ValidValues(func, param)
+
+    return (param.name, param.type, vec_size, dst_type, valid_values, conversion)
+
+
+def Parameters(funcname):
+    """Return list of tuples of function parameters."""
+    func = __functions[funcname]
+    params = []
+    for param in func.params:
+        params.append(_ParameterTuple(func, param))
+
+    return params
+
+
+def FunctionPrefix(funcname):
+    """Return function specific prefix."""
+    func = __functions[funcname]
+
+    return func.prefix
+
+
+def FindParamIndex(params, paramname):
+    """Find the index of a named parameter."""
+    for i in xrange(len(params)):
+        if params[i][0] == paramname:
+            return i
+    return None
+
+
+def MakeDeclarationString(params):
+    """Return a C-style parameter declaration string."""
+    string = []
+    for p in params:
+        sep = "" if p[1].endswith("*") else " "
+        string.append("%s%s%s" % (p[1], sep, p[0]))
+    if not string:
+        return "void"
+    return ", ".join(string)
+
+
+def AliasPrefix(funcname):
+    """Return the prefix of the function the named function is an alias of."""
+    alias = __aliases[funcname][0]
+    return alias.prefix
+
+
+def Alias(funcname):
+    """Return the name of the function the named function is an alias of."""
+    alias, need_conv = __aliases[funcname]
+    return alias.name if not need_conv else None
+
+
+def ConversionFunction(funcname):
+    """Return the name of the function the named function converts to."""
+    alias, need_conv = __aliases[funcname]
+    return alias.name if need_conv else None
+
+
+def Categories(funcname):
+    """Return all the categories of the named GL function."""
+    api = __spec["api"]
+    return [api.name]
diff --git a/mesalib/src/mesa/main/accum.h b/mesalib/src/mesa/main/accum.h
index 63740f07e..4b628bafa 100644
--- a/mesalib/src/mesa/main/accum.h
+++ b/mesalib/src/mesa/main/accum.h
@@ -42,11 +42,6 @@
 
 #if FEATURE_accum
 
-#define _MESA_INIT_ACCUM_FUNCTIONS(driver, impl) \
-   do {                                          \
-      (driver)->Accum = impl ## Accum;           \
-   } while (0)
-
 extern void GLAPIENTRY
 _mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha );
 
@@ -55,7 +50,7 @@ _mesa_init_accum_dispatch(struct _glapi_table *disp);
 
 #else /* FEATURE_accum */
 
-#define _MESA_INIT_ACCUM_FUNCTIONS(driver, impl) do { } while (0)
+#include "main/compiler.h"
 
 static INLINE void
 _mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha )
diff --git a/mesalib/src/mesa/main/api_exec.c b/mesalib/src/mesa/main/api_exec.c
index fa8d409ca..c3c710f5e 100644
--- a/mesalib/src/mesa/main/api_exec.c
+++ b/mesalib/src/mesa/main/api_exec.c
@@ -34,11 +34,9 @@
 #include "api_loopback.h"
 #include "api_exec.h"
 #if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
-#include "shader/arbprogram.h"
-#endif
-#if FEATURE_ATI_fragment_shader
-#include "shader/atifragshader.h"
+#include "arbprogram.h"
 #endif
+#include "atifragshader.h"
 #include "attrib.h"
 #include "blend.h"
 #if FEATURE_ARB_vertex_buffer_object
@@ -89,24 +87,66 @@
 #include "texobj.h"
 #include "texparam.h"
 #include "texstate.h"
+#include "transformfeedback.h"
 #include "mtypes.h"
 #include "varray.h"
 #include "viewport.h"
 #if FEATURE_NV_vertex_program
-#include "shader/nvprogram.h"
+#include "nvprogram.h"
 #endif
 #if FEATURE_NV_fragment_program
-#include "shader/nvprogram.h"
+#include "nvprogram.h"
 #endif
 #if FEATURE_ARB_shader_objects
-#include "shaders.h"
+#include "shaderapi.h"
+#include "uniforms.h"
 #endif
-#if FEATURE_ARB_sync
 #include "syncobj.h"
-#endif
 #include "main/dispatch.h"
 
 
+#if FEATURE_GL
+
+
+#ifdef _GLAPI_USE_REMAP_TABLE
+
+#define need_MESA_remap_table
+#include "main/remap.h"
+#include "main/remap_helper.h"
+
+/* This is shared across all APIs but We define this here since
+ * desktop GL has the biggest remap table. */
+int driDispatchRemapTable[driDispatchRemapTable_size];
+
+/**
+ * Map the functions which are already static.
+ *
+ * When a extension function are incorporated into the ABI, the
+ * extension suffix is usually stripped.  Mapping such functions
+ * makes sure the alternative names are available.
+ *
+ * Note that functions mapped by _mesa_init_remap_table() are
+ * excluded.
+ */
+void
+_mesa_map_static_functions(void)
+{
+   /* Remap static functions which have alternative names and are in the ABI.
+    * This is to be on the safe side.  glapi should have defined those names.
+    */
+   _mesa_map_function_array(MESA_alt_functions);
+}
+
+void
+_mesa_init_remap_table(void)
+{
+   _mesa_do_init_remap_table(_mesa_function_pool,
+			     driDispatchRemapTable_size,
+			     MESA_remap_table_functions);
+}
+
+#endif /* _GLAPI_USE_REMAP_TABLE */
+
 
 /**
  * Initialize a dispatch table with pointers to Mesa's immediate-mode
@@ -118,9 +158,15 @@
  * \param ctx  GL context to which \c exec belongs.
  * \param exec dispatch table.
  */
-void
-_mesa_init_exec_table(struct _glapi_table *exec)
+struct _glapi_table *
+_mesa_create_exec_table(void)
 {
+   struct _glapi_table *exec;
+
+   exec = _mesa_alloc_dispatch_table(sizeof *exec);
+   if (exec == NULL)
+      return NULL;
+
 #if _HAVE_FULL_GL
    _mesa_loopback_init_api_table( exec );
 #endif
@@ -297,33 +343,12 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    SET_StencilFuncSeparate(exec, _mesa_StencilFuncSeparate);
    SET_StencilMaskSeparate(exec, _mesa_StencilMaskSeparate);
    SET_StencilOpSeparate(exec, _mesa_StencilOpSeparate);
+
 #if FEATURE_ARB_shader_objects
-   SET_AttachShader(exec, _mesa_AttachShader);
-   SET_CreateProgram(exec, _mesa_CreateProgram);
-   SET_CreateShader(exec, _mesa_CreateShader);
-   SET_DeleteProgram(exec, _mesa_DeleteProgram);
-   SET_DeleteShader(exec, _mesa_DeleteShader);
-   SET_DetachShader(exec, _mesa_DetachShader);
-   SET_GetAttachedShaders(exec, _mesa_GetAttachedShaders);
-   SET_GetProgramiv(exec, _mesa_GetProgramiv);
-   SET_GetProgramInfoLog(exec, _mesa_GetProgramInfoLog);
-   SET_GetShaderiv(exec, _mesa_GetShaderiv);
-   SET_GetShaderInfoLog(exec, _mesa_GetShaderInfoLog);
-   SET_IsProgram(exec, _mesa_IsProgram);
-   SET_IsShader(exec, _mesa_IsShader);
-#endif
-
-   /* OpenGL 2.1 */
-#if FEATURE_ARB_shader_objects
-   SET_UniformMatrix2x3fv(exec, _mesa_UniformMatrix2x3fv);
-   SET_UniformMatrix3x2fv(exec, _mesa_UniformMatrix3x2fv);
-   SET_UniformMatrix2x4fv(exec, _mesa_UniformMatrix2x4fv);
-   SET_UniformMatrix4x2fv(exec, _mesa_UniformMatrix4x2fv);
-   SET_UniformMatrix3x4fv(exec, _mesa_UniformMatrix3x4fv);
-   SET_UniformMatrix4x3fv(exec, _mesa_UniformMatrix4x3fv);
+   _mesa_init_shader_dispatch(exec);
+   _mesa_init_shader_uniform_dispatch(exec);
 #endif
 
-
    /* 2. GL_EXT_blend_color */
 #if 0
 /*    SET_BlendColorEXT(exec, _mesa_BlendColorEXT); */
@@ -477,6 +502,10 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    /* ???. GL_EXT_depth_bounds_test */
    SET_DepthBoundsEXT(exec, _mesa_DepthBoundsEXT);
 
+   /* 352. GL_EXT_transform_feedback */
+   _mesa_init_transform_feedback_dispatch(exec);
+
+   /* 364. GL_EXT_provoking_vertex */
    SET_ProvokingVertexEXT(exec, _mesa_ProvokingVertexEXT);
 
    /* ARB 1. GL_ARB_multitexture */
@@ -602,82 +631,11 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    SET_DrawBuffersARB(exec, _mesa_DrawBuffersARB);
 #endif
 
-#if FEATURE_ARB_shader_objects
-   SET_DeleteObjectARB(exec, _mesa_DeleteObjectARB);
-   SET_GetHandleARB(exec, _mesa_GetHandleARB);
-   SET_DetachObjectARB(exec, _mesa_DetachObjectARB);
-   SET_CreateShaderObjectARB(exec, _mesa_CreateShaderObjectARB);
-   SET_ShaderSourceARB(exec, _mesa_ShaderSourceARB);
-   SET_CompileShaderARB(exec, _mesa_CompileShaderARB);
-   SET_CreateProgramObjectARB(exec, _mesa_CreateProgramObjectARB);
-   SET_AttachObjectARB(exec, _mesa_AttachObjectARB);
-   SET_LinkProgramARB(exec, _mesa_LinkProgramARB);
-   SET_UseProgramObjectARB(exec, _mesa_UseProgramObjectARB);
-   SET_ValidateProgramARB(exec, _mesa_ValidateProgramARB);
-   SET_Uniform1fARB(exec, _mesa_Uniform1fARB);
-   SET_Uniform2fARB(exec, _mesa_Uniform2fARB);
-   SET_Uniform3fARB(exec, _mesa_Uniform3fARB);
-   SET_Uniform4fARB(exec, _mesa_Uniform4fARB);
-   SET_Uniform1iARB(exec, _mesa_Uniform1iARB);
-   SET_Uniform2iARB(exec, _mesa_Uniform2iARB);
-   SET_Uniform3iARB(exec, _mesa_Uniform3iARB);
-   SET_Uniform4iARB(exec, _mesa_Uniform4iARB);
-   SET_Uniform1fvARB(exec, _mesa_Uniform1fvARB);
-   SET_Uniform2fvARB(exec, _mesa_Uniform2fvARB);
-   SET_Uniform3fvARB(exec, _mesa_Uniform3fvARB);
-   SET_Uniform4fvARB(exec, _mesa_Uniform4fvARB);
-   SET_Uniform1ivARB(exec, _mesa_Uniform1ivARB);
-   SET_Uniform2ivARB(exec, _mesa_Uniform2ivARB);
-   SET_Uniform3ivARB(exec, _mesa_Uniform3ivARB);
-   SET_Uniform4ivARB(exec, _mesa_Uniform4ivARB);
-   SET_UniformMatrix2fvARB(exec, _mesa_UniformMatrix2fvARB);
-   SET_UniformMatrix3fvARB(exec, _mesa_UniformMatrix3fvARB);
-   SET_UniformMatrix4fvARB(exec, _mesa_UniformMatrix4fvARB);
-   SET_GetObjectParameterfvARB(exec, _mesa_GetObjectParameterfvARB);
-   SET_GetObjectParameterivARB(exec, _mesa_GetObjectParameterivARB);
-   SET_GetInfoLogARB(exec, _mesa_GetInfoLogARB);
-   SET_GetAttachedObjectsARB(exec, _mesa_GetAttachedObjectsARB);
-   SET_GetUniformLocationARB(exec, _mesa_GetUniformLocationARB);
-   SET_GetActiveUniformARB(exec, _mesa_GetActiveUniformARB);
-   SET_GetUniformfvARB(exec, _mesa_GetUniformfvARB);
-   SET_GetUniformivARB(exec, _mesa_GetUniformivARB);
-   SET_GetShaderSourceARB(exec, _mesa_GetShaderSourceARB);
-#endif    /* FEATURE_ARB_shader_objects */
-
-#if FEATURE_ARB_vertex_shader
-   SET_BindAttribLocationARB(exec, _mesa_BindAttribLocationARB);
-   SET_GetActiveAttribARB(exec, _mesa_GetActiveAttribARB);
-   SET_GetAttribLocationARB(exec, _mesa_GetAttribLocationARB);
-#endif    /* FEATURE_ARB_vertex_shader */
-
    /* GL_ARB_sync */
-#if FEATURE_ARB_sync
-   SET_IsSync(exec, _mesa_IsSync);
-   SET_DeleteSync(exec, _mesa_DeleteSync);
-   SET_FenceSync(exec, _mesa_FenceSync);
-   SET_ClientWaitSync(exec, _mesa_ClientWaitSync);
-   SET_WaitSync(exec, _mesa_WaitSync);
-   SET_GetInteger64v(exec, _mesa_GetInteger64v);
-   SET_GetSynciv(exec, _mesa_GetSynciv);
-#endif
+   _mesa_init_sync_dispatch(exec);
 
   /* GL_ATI_fragment_shader */
-#if FEATURE_ATI_fragment_shader
-   SET_GenFragmentShadersATI(exec, _mesa_GenFragmentShadersATI);
-   SET_BindFragmentShaderATI(exec, _mesa_BindFragmentShaderATI);
-   SET_DeleteFragmentShaderATI(exec, _mesa_DeleteFragmentShaderATI);
-   SET_BeginFragmentShaderATI(exec, _mesa_BeginFragmentShaderATI);
-   SET_EndFragmentShaderATI(exec, _mesa_EndFragmentShaderATI);
-   SET_PassTexCoordATI(exec, _mesa_PassTexCoordATI);
-   SET_SampleMapATI(exec, _mesa_SampleMapATI);
-   SET_ColorFragmentOp1ATI(exec, _mesa_ColorFragmentOp1ATI);
-   SET_ColorFragmentOp2ATI(exec, _mesa_ColorFragmentOp2ATI);
-   SET_ColorFragmentOp3ATI(exec, _mesa_ColorFragmentOp3ATI);
-   SET_AlphaFragmentOp1ATI(exec, _mesa_AlphaFragmentOp1ATI);
-   SET_AlphaFragmentOp2ATI(exec, _mesa_AlphaFragmentOp2ATI);
-   SET_AlphaFragmentOp3ATI(exec, _mesa_AlphaFragmentOp3ATI);
-   SET_SetFragmentShaderConstantATI(exec, _mesa_SetFragmentShaderConstantATI);
-#endif
+   _mesa_init_ati_fragment_shader_dispatch(exec);
 
   /* GL_ATI_envmap_bumpmap */
    SET_GetTexBumpParameterivATI(exec, _mesa_GetTexBumpParameterivATI);
@@ -764,4 +722,14 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    SET_ObjectUnpurgeableAPPLE(exec, _mesa_ObjectUnpurgeableAPPLE);
    SET_GetObjectParameterivAPPLE(exec, _mesa_GetObjectParameterivAPPLE);
 #endif
+
+#if FEATURE_ARB_geometry_shader4
+   SET_FramebufferTextureARB(exec, _mesa_FramebufferTextureARB);
+   SET_FramebufferTextureFaceARB(exec, _mesa_FramebufferTextureFaceARB);
+#endif
+
+
+   return exec;
 }
+
+#endif /* FEATURE_GL */
diff --git a/mesalib/src/mesa/main/api_exec.h b/mesalib/src/mesa/main/api_exec.h
index 4bd715053..29c953f31 100644
--- a/mesalib/src/mesa/main/api_exec.h
+++ b/mesalib/src/mesa/main/api_exec.h
@@ -29,9 +29,17 @@
 
 struct _glapi_table;
 
+extern struct _glapi_table *
+_mesa_alloc_dispatch_table(int size);
 
-extern void
-_mesa_init_exec_table(struct _glapi_table *exec);
+extern struct _glapi_table *
+_mesa_create_exec_table(void);
+
+extern struct _glapi_table *
+_mesa_create_exec_table_es1(void);
+
+extern struct _glapi_table *
+_mesa_create_exec_table_es2(void);
 
 
 #endif
diff --git a/mesalib/src/mesa/main/api_loopback.c b/mesalib/src/mesa/main/api_loopback.c
index aedc509fb..d1789069c 100644
--- a/mesalib/src/mesa/main/api_loopback.c
+++ b/mesalib/src/mesa/main/api_loopback.c
@@ -1443,6 +1443,135 @@ loopback_VertexAttrib4NuivARB(GLuint index, const GLuint * v)
 
 
 
+/** GL 3.0 Integer-valued attributes **/
+
+static void GLAPIENTRY
+loopback_VertexAttribI1i(GLuint index, GLint x)
+{
+   ATTRIB1ARB(index, (GLfloat) x);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttribI2i(GLuint index, GLint x, GLint y)
+{
+   ATTRIB2ARB(index, (GLfloat) x, (GLfloat) y);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttribI3i(GLuint index, GLint x, GLint y, GLint z)
+{
+   ATTRIB3ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint w)
+{
+   ATTRIB4ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttribI1ui(GLuint index, GLuint x)
+{
+   ATTRIB1ARB(index, (GLfloat) x);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttribI2ui(GLuint index, GLuint x, GLuint y)
+{
+   ATTRIB2ARB(index, (GLfloat) x, (GLfloat) y);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttribI3ui(GLuint index, GLuint x, GLuint y, GLuint z)
+{
+   ATTRIB3ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)
+{
+   ATTRIB4ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttribI1iv(GLuint index, const GLint *v)
+{
+   ATTRIB1ARB(index, (GLfloat) v[0]);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttribI2iv (GLuint index, const GLint *v)
+{
+   ATTRIB2ARB(index, (GLfloat) v[0], (GLfloat) v[1]);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttribI3iv(GLuint index, const GLint *v)
+{
+   ATTRIB3ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2]);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttribI4iv(GLuint index, const GLint *v)
+{
+   ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1],
+              (GLfloat) v[2], (GLfloat) v[3]);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttribI1uiv(GLuint index, const GLuint *v)
+{
+   ATTRIB1ARB(index, (GLfloat) v[0]);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttribI2uiv(GLuint index, const GLuint *v)
+{
+   ATTRIB2ARB(index, (GLfloat) v[0], (GLfloat) v[1]);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttribI3uiv(GLuint index, const GLuint *v)
+{
+   ATTRIB3ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2]);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttribI4uiv(GLuint index, const GLuint *v)
+{
+   ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1],
+              (GLfloat) v[2], (GLfloat) v[3]);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttribI4bv(GLuint index, const GLbyte *v)
+{
+   ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1],
+              (GLfloat) v[2], (GLfloat) v[3]);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttribI4sv(GLuint index, const GLshort *v)
+{
+   ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1],
+              (GLfloat) v[2], (GLfloat) v[3]);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttribI4ubv(GLuint index, const GLubyte *v)
+{
+   ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1],
+              (GLfloat) v[2], (GLfloat) v[3]);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttribI4usv(GLuint index, const GLushort *v)
+{
+   ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1],
+              (GLfloat) v[2], (GLfloat) v[3]);
+}
+
+
 
 /*
  * This code never registers handlers for any of the entry points
@@ -1658,6 +1787,51 @@ _mesa_loopback_init_api_table( struct _glapi_table *dest )
    SET_VertexAttrib4NivARB(dest, loopback_VertexAttrib4NivARB);
    SET_VertexAttrib4NusvARB(dest, loopback_VertexAttrib4NusvARB);
    SET_VertexAttrib4NuivARB(dest, loopback_VertexAttrib4NuivARB);
+
+   /* GL 3.0 */
+#if 0
+   SET_VertexAttribI1i(dest, loopback_VertexAttribI1i);
+   SET_VertexAttribI2i(dest, loopback_VertexAttribI2i);
+   SET_VertexAttribI3i(dest, loopback_VertexAttribI3i);
+   SET_VertexAttribI4i(dest, loopback_VertexAttribI4i);
+   SET_VertexAttribI1ui(dest, loopback_VertexAttribI1ui);
+   SET_VertexAttribI2ui(dest, loopback_VertexAttribI2ui);
+   SET_VertexAttribI3ui(dest, loopback_VertexAttribI3ui);
+   SET_VertexAttribI4ui(dest, loopback_VertexAttribI4ui);
+   SET_VertexAttribI1iv(dest, loopback_VertexAttribI1iv);
+   SET_VertexAttribI2iv(dest, loopback_VertexAttribI2iv);
+   SET_VertexAttribI3iv(dest, loopback_VertexAttribI3iv);
+   SET_VertexAttribI4iv(dest, loopback_VertexAttribI4iv);
+   SET_VertexAttribI1uiv(dest, loopback_VertexAttribI1uiv);
+   SET_VertexAttribI2uiv(dest, loopback_VertexAttribI2uiv);
+   SET_VertexAttribI3uiv(dest, loopback_VertexAttribI3uiv);
+   SET_VertexAttribI4uiv(dest, loopback_VertexAttribI4uiv);
+   SET_VertexAttribI4bv(dest, loopback_VertexAttribI4bv);
+   SET_VertexAttribI4sv(dest, loopback_VertexAttribI4sv);
+   SET_VertexAttribI4ubv(dest, loopback_VertexAttribI4ubv);
+   SET_VertexAttribI4usv(dest, loopback_VertexAttribI4usv);
+#else
+   (void) loopback_VertexAttribI1i;
+   (void) loopback_VertexAttribI2i;
+   (void) loopback_VertexAttribI3i;
+   (void) loopback_VertexAttribI4i;
+   (void) loopback_VertexAttribI1ui;
+   (void) loopback_VertexAttribI2ui;
+   (void) loopback_VertexAttribI3ui;
+   (void) loopback_VertexAttribI4ui;
+   (void) loopback_VertexAttribI1iv;
+   (void) loopback_VertexAttribI2iv;
+   (void) loopback_VertexAttribI3iv;
+   (void) loopback_VertexAttribI4iv;
+   (void) loopback_VertexAttribI1uiv;
+   (void) loopback_VertexAttribI2uiv;
+   (void) loopback_VertexAttribI3uiv;
+   (void) loopback_VertexAttribI4uiv;
+   (void) loopback_VertexAttribI4bv;
+   (void) loopback_VertexAttribI4sv;
+   (void) loopback_VertexAttribI4ubv;
+   (void) loopback_VertexAttribI4usv;
+#endif
 }
 
 
diff --git a/mesalib/src/mesa/main/api_validate.c b/mesalib/src/mesa/main/api_validate.c
index 4fb7b5ad6..b3b5c6cc0 100644
--- a/mesalib/src/mesa/main/api_validate.c
+++ b/mesalib/src/mesa/main/api_validate.c
@@ -105,21 +105,31 @@ check_valid_to_render(GLcontext *ctx, const char *function)
       return GL_FALSE;
    }
 
+   switch (ctx->API) {
 #if FEATURE_es2_glsl
-   /* For ES2, we can draw if any vertex array is enabled (and we should
-    * always have a vertex program/shader).
-    */
-   if (ctx->Array.ArrayObj->_Enabled == 0x0 || !ctx->VertexProgram._Current)
-      return GL_FALSE;
-#else
-   /* For regular OpenGL, only draw if we have vertex positions (regardless
-    * of whether or not we have a vertex program/shader).
-    */
-   if (!ctx->Array.ArrayObj->Vertex.Enabled &&
-       !ctx->Array.ArrayObj->VertexAttrib[0].Enabled)
-      return GL_FALSE;
+   case API_OPENGLES2:
+      /* For ES2, we can draw if any vertex array is enabled (and we
+       * should always have a vertex program/shader). */
+      if (ctx->Array.ArrayObj->_Enabled == 0x0 || !ctx->VertexProgram._Current)
+	 return GL_FALSE;
+      break;
+#endif
+
+#if FEATURE_ES1 || FEATURE_GL
+   case API_OPENGLES:
+   case API_OPENGL:
+      /* For regular OpenGL, only draw if we have vertex positions
+       * (regardless of whether or not we have a vertex program/shader). */
+      if (!ctx->Array.ArrayObj->Vertex.Enabled &&
+	  !ctx->Array.ArrayObj->VertexAttrib[0].Enabled)
+	 return GL_FALSE;
+      break;
 #endif
 
+   default:
+      ASSERT_NO_FEATURE();
+   }
+
    return GL_TRUE;
 }
 
@@ -175,7 +185,7 @@ _mesa_validate_DrawElements(GLcontext *ctx,
 			    GLenum mode, GLsizei count, GLenum type,
 			    const GLvoid *indices, GLint basevertex)
 {
-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx,  GL_FALSE);
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
 
    if (count <= 0) {
       if (count < 0)
@@ -183,7 +193,7 @@ _mesa_validate_DrawElements(GLcontext *ctx,
       return GL_FALSE;
    }
 
-   if (mode > GL_POLYGON) {
+   if (mode > GL_TRIANGLE_STRIP_ADJACENCY_ARB) {
       _mesa_error(ctx, GL_INVALID_ENUM, "glDrawElements(mode)" );
       return GL_FALSE;
    }
@@ -240,7 +250,7 @@ _mesa_validate_DrawRangeElements(GLcontext *ctx, GLenum mode,
       return GL_FALSE;
    }
 
-   if (mode > GL_POLYGON) {
+   if (mode > GL_TRIANGLE_STRIP_ADJACENCY_ARB) {
       _mesa_error(ctx, GL_INVALID_ENUM, "glDrawRangeElements(mode)" );
       return GL_FALSE;
    }
@@ -299,7 +309,7 @@ _mesa_validate_DrawArrays(GLcontext *ctx,
       return GL_FALSE;
    }
 
-   if (mode > GL_POLYGON) {
+   if (mode > GL_TRIANGLE_STRIP_ADJACENCY_ARB) {
       _mesa_error(ctx, GL_INVALID_ENUM, "glDrawArrays(mode)" );
       return GL_FALSE;
    }
@@ -314,3 +324,108 @@ _mesa_validate_DrawArrays(GLcontext *ctx,
 
    return GL_TRUE;
 }
+
+
+GLboolean
+_mesa_validate_DrawArraysInstanced(GLcontext *ctx, GLenum mode, GLint first,
+                                   GLsizei count, GLsizei primcount)
+{
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
+
+   if (count <= 0) {
+      if (count < 0)
+         _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glDrawArraysInstanced(count=%d)", count);
+      return GL_FALSE;
+   }
+
+   if (mode > GL_TRIANGLE_STRIP_ADJACENCY_ARB) {
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glDrawArraysInstanced(mode=0x%x)", mode);
+      return GL_FALSE;
+   }
+
+   if (primcount <= 0) {
+      if (primcount < 0)
+         _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glDrawArraysInstanced(primcount=%d)", primcount);
+      return GL_FALSE;
+   }
+
+   if (!check_valid_to_render(ctx, "glDrawArraysInstanced(invalid to render)"))
+      return GL_FALSE;
+
+   if (ctx->CompileFlag) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glDrawArraysInstanced(display list");
+      return GL_FALSE;
+   }
+
+   if (ctx->Const.CheckArrayBounds) {
+      if (first + count > (GLint) ctx->Array.ArrayObj->_MaxElement)
+         return GL_FALSE;
+   }
+
+   return GL_TRUE;
+}
+
+
+GLboolean
+_mesa_validate_DrawElementsInstanced(GLcontext *ctx,
+                                     GLenum mode, GLsizei count, GLenum type,
+                                     const GLvoid *indices, GLsizei primcount)
+{
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
+
+   if (count <= 0) {
+      if (count < 0)
+	 _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glDrawElementsInstanced(count=%d)", count);
+      return GL_FALSE;
+   }
+
+   if (mode > GL_TRIANGLE_STRIP_ADJACENCY_ARB) {
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glDrawElementsInstanced(mode = 0x%x)", mode);
+      return GL_FALSE;
+   }
+
+   if (type != GL_UNSIGNED_INT &&
+       type != GL_UNSIGNED_BYTE &&
+       type != GL_UNSIGNED_SHORT) {
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glDrawElementsInstanced(type=0x%x)", type);
+      return GL_FALSE;
+   }
+
+   if (primcount <= 0) {
+      if (primcount < 0)
+         _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glDrawElementsInstanced(primcount=%d)", primcount);
+      return GL_FALSE;
+   }
+
+   if (!check_valid_to_render(ctx, "glDrawElementsInstanced"))
+      return GL_FALSE;
+
+   /* Vertex buffer object tests */
+   if (_mesa_is_bufferobj(ctx->Array.ElementArrayBufferObj)) {
+      /* use indices in the buffer object */
+      /* make sure count doesn't go outside buffer bounds */
+      if (index_bytes(type, count) > ctx->Array.ElementArrayBufferObj->Size) {
+         _mesa_warning(ctx,
+                       "glDrawElementsInstanced index out of buffer bounds");
+         return GL_FALSE;
+      }
+   }
+   else {
+      /* not using a VBO */
+      if (!indices)
+         return GL_FALSE;
+   }
+
+   if (!check_index_bounds(ctx, count, type, indices, 0))
+      return GL_FALSE;
+
+   return GL_TRUE;
+}
diff --git a/mesalib/src/mesa/main/api_validate.h b/mesalib/src/mesa/main/api_validate.h
index 6064d15fe..cd27d58aa 100644
--- a/mesalib/src/mesa/main/api_validate.h
+++ b/mesalib/src/mesa/main/api_validate.h
@@ -52,4 +52,14 @@ _mesa_validate_DrawRangeElements(GLcontext *ctx, GLenum mode,
 				 const GLvoid *indices, GLint basevertex);
 
 
+extern GLboolean
+_mesa_validate_DrawArraysInstanced(GLcontext *ctx, GLenum mode, GLint first,
+                                   GLsizei count, GLsizei primcount);
+
+extern GLboolean
+_mesa_validate_DrawElementsInstanced(GLcontext *ctx,
+                                     GLenum mode, GLsizei count, GLenum type,
+                                     const GLvoid *indices, GLsizei primcount);
+
+
 #endif
diff --git a/mesalib/src/mesa/shader/arbprogram.c b/mesalib/src/mesa/main/arbprogram.c
index 75b4274bf..26d781954 100644
--- a/mesalib/src/mesa/shader/arbprogram.c
+++ b/mesalib/src/mesa/main/arbprogram.c
@@ -35,11 +35,11 @@
 #include "main/imports.h"
 #include "main/macros.h"
 #include "main/mtypes.h"
-#include "arbprogram.h"
-#include "arbprogparse.h"
-#include "nvfragparse.h"
-#include "nvvertparse.h"
-#include "program.h"
+#include "main/arbprogram.h"
+#include "program/arbprogparse.h"
+#include "program/nvfragparse.h"
+#include "program/nvvertparse.h"
+#include "program/program.h"
 
 
 
@@ -245,163 +245,6 @@ _mesa_GenPrograms(GLsizei n, GLuint *ids)
 }
 
 
-void GLAPIENTRY
-_mesa_EnableVertexAttribArrayARB(GLuint index)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (index >= ctx->Const.VertexProgram.MaxAttribs) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glEnableVertexAttribArrayARB(index)");
-      return;
-   }
-
-   ASSERT(index < Elements(ctx->Array.ArrayObj->VertexAttrib));
-
-   FLUSH_VERTICES(ctx, _NEW_ARRAY);
-   ctx->Array.ArrayObj->VertexAttrib[index].Enabled = GL_TRUE;
-   ctx->Array.ArrayObj->_Enabled |= _NEW_ARRAY_ATTRIB(index);
-   ctx->Array.NewState |= _NEW_ARRAY_ATTRIB(index);
-}
-
-
-void GLAPIENTRY
-_mesa_DisableVertexAttribArrayARB(GLuint index)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (index >= ctx->Const.VertexProgram.MaxAttribs) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glEnableVertexAttribArrayARB(index)");
-      return;
-   }
-
-   ASSERT(index < Elements(ctx->Array.ArrayObj->VertexAttrib));
-
-   FLUSH_VERTICES(ctx, _NEW_ARRAY);
-   ctx->Array.ArrayObj->VertexAttrib[index].Enabled = GL_FALSE;
-   ctx->Array.ArrayObj->_Enabled &= ~_NEW_ARRAY_ATTRIB(index);
-   ctx->Array.NewState |= _NEW_ARRAY_ATTRIB(index);
-}
-
-
-void GLAPIENTRY
-_mesa_GetVertexAttribdvARB(GLuint index, GLenum pname, GLdouble *params)
-{
-   GLfloat fparams[4];
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   _mesa_GetVertexAttribfvARB(index, pname, fparams);
-   if (ctx->ErrorValue == GL_NO_ERROR) {
-      if (pname == GL_CURRENT_VERTEX_ATTRIB_ARB) {
-         COPY_4V(params, fparams);
-      }
-      else {
-         params[0] = fparams[0];
-      }
-   }
-}
-
-
-/**
- * Return info for a generic vertex attribute array (no alias with
- * legacy vertex attributes (pos, normal, color, etc)).
- */
-void GLAPIENTRY
-_mesa_GetVertexAttribfvARB(GLuint index, GLenum pname, GLfloat *params)
-{
-   const struct gl_client_array *array;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (index >= MAX_VERTEX_GENERIC_ATTRIBS) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glGetVertexAttribfvARB(index)");
-      return;
-   }
-
-   ASSERT(index < Elements(ctx->Array.ArrayObj->VertexAttrib));
-
-   array = &ctx->Array.ArrayObj->VertexAttrib[index];
-
-   switch (pname) {
-      case GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB:
-         params[0] = (GLfloat) array->Enabled;
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB:
-         params[0] = (GLfloat) array->Size;
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB:
-         params[0] = (GLfloat) array->Stride;
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB:
-         params[0] = (GLfloat) array->Type;
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB:
-         params[0] = array->Normalized;
-         break;
-      case GL_CURRENT_VERTEX_ATTRIB_ARB:
-         if (index == 0) {
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glGetVertexAttribfvARB(index==0)");
-            return;
-         }
-         FLUSH_CURRENT(ctx, 0);
-         COPY_4V(params, ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index]);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = (GLfloat) array->BufferObj->Name;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetVertexAttribfvARB(pname)");
-         return;
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_GetVertexAttribivARB(GLuint index, GLenum pname, GLint *params)
-{
-   GLfloat fparams[4];
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   _mesa_GetVertexAttribfvARB(index, pname, fparams);
-   if (ctx->ErrorValue == GL_NO_ERROR) {
-      if (pname == GL_CURRENT_VERTEX_ATTRIB_ARB) {
-         COPY_4V_CAST(params, fparams, GLint);  /* float to int */
-      }
-      else {
-         params[0] = (GLint) fparams[0];
-      }
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_GetVertexAttribPointervARB(GLuint index, GLenum pname, GLvoid **pointer)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (index >= ctx->Const.VertexProgram.MaxAttribs) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glGetVertexAttribPointerARB(index)");
-      return;
-   }
-
-   if (pname != GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetVertexAttribPointerARB(pname)");
-      return;
-   }
-
-   ASSERT(index < Elements(ctx->Array.ArrayObj->VertexAttrib));
-
-   *pointer = (GLvoid *) ctx->Array.ArrayObj->VertexAttrib[index].Ptr;
-}
-
-
 /**
  * Determine if id names a vertex or fragment program.
  * \note Not compiled into display lists.
diff --git a/mesalib/src/mesa/shader/arbprogram.h b/mesalib/src/mesa/main/arbprogram.h
index 6fe76267b..e2e535e91 100644
--- a/mesalib/src/mesa/shader/arbprogram.h
+++ b/mesalib/src/mesa/main/arbprogram.h
@@ -27,6 +27,9 @@
 #define ARBPROGRAM_H
 
 
+#include "glheader.h"
+
+
 extern void GLAPIENTRY
 _mesa_BindProgram(GLenum target, GLuint id);
 
@@ -37,30 +40,6 @@ extern void GLAPIENTRY
 _mesa_GenPrograms(GLsizei n, GLuint *ids);
 
 
-extern void GLAPIENTRY
-_mesa_EnableVertexAttribArrayARB(GLuint index);
-
-
-extern void GLAPIENTRY
-_mesa_DisableVertexAttribArrayARB(GLuint index);
-
-
-extern void GLAPIENTRY
-_mesa_GetVertexAttribdvARB(GLuint index, GLenum pname, GLdouble *params);
-
-
-extern void GLAPIENTRY
-_mesa_GetVertexAttribfvARB(GLuint index, GLenum pname, GLfloat *params);
-
-
-extern void GLAPIENTRY
-_mesa_GetVertexAttribivARB(GLuint index, GLenum pname, GLint *params);
-
-
-extern void GLAPIENTRY
-_mesa_GetVertexAttribPointervARB(GLuint index, GLenum pname, GLvoid **pointer);
-
-
 extern GLboolean GLAPIENTRY
 _mesa_IsProgramARB(GLuint id);
 
diff --git a/mesalib/src/mesa/main/arrayobj.h b/mesalib/src/mesa/main/arrayobj.h
index 8999edc72..fdf7e2bca 100644
--- a/mesalib/src/mesa/main/arrayobj.h
+++ b/mesalib/src/mesa/main/arrayobj.h
@@ -28,7 +28,7 @@
 #ifndef ARRAYOBJ_H
 #define ARRAYOBJ_H
 
-#include "context.h"
+#include "mtypes.h"
 
 /**
  * \file arrayobj.h
diff --git a/mesalib/src/mesa/shader/atifragshader.c b/mesalib/src/mesa/main/atifragshader.c
index 870f77e30..550f50b7a 100644
--- a/mesalib/src/mesa/shader/atifragshader.c
+++ b/mesalib/src/mesa/main/atifragshader.c
@@ -28,13 +28,36 @@
 #include "main/macros.h"
 #include "main/enums.h"
 #include "main/mtypes.h"
-#include "atifragshader.h"
+#include "main/dispatch.h"
+#include "main/atifragshader.h"
+
+#if FEATURE_ATI_fragment_shader
 
 #define MESA_DEBUG_ATI_FS 0
 
 static struct ati_fragment_shader DummyShader;
 
 
+void
+_mesa_init_ati_fragment_shader_dispatch(struct _glapi_table *disp)
+{
+   SET_GenFragmentShadersATI(disp, _mesa_GenFragmentShadersATI);
+   SET_BindFragmentShaderATI(disp, _mesa_BindFragmentShaderATI);
+   SET_DeleteFragmentShaderATI(disp, _mesa_DeleteFragmentShaderATI);
+   SET_BeginFragmentShaderATI(disp, _mesa_BeginFragmentShaderATI);
+   SET_EndFragmentShaderATI(disp, _mesa_EndFragmentShaderATI);
+   SET_PassTexCoordATI(disp, _mesa_PassTexCoordATI);
+   SET_SampleMapATI(disp, _mesa_SampleMapATI);
+   SET_ColorFragmentOp1ATI(disp, _mesa_ColorFragmentOp1ATI);
+   SET_ColorFragmentOp2ATI(disp, _mesa_ColorFragmentOp2ATI);
+   SET_ColorFragmentOp3ATI(disp, _mesa_ColorFragmentOp3ATI);
+   SET_AlphaFragmentOp1ATI(disp, _mesa_AlphaFragmentOp1ATI);
+   SET_AlphaFragmentOp2ATI(disp, _mesa_AlphaFragmentOp2ATI);
+   SET_AlphaFragmentOp3ATI(disp, _mesa_AlphaFragmentOp3ATI);
+   SET_SetFragmentShaderConstantATI(disp, _mesa_SetFragmentShaderConstantATI);
+}
+
+
 /**
  * Allocate and initialize a new ATI fragment shader object.
  */
@@ -767,3 +790,5 @@ _mesa_SetFragmentShaderConstantATI(GLuint dst, const GLfloat * value)
       COPY_4V(ctx->ATIFragmentShader.GlobalConstants[dstindex], value);
    }
 }
+
+#endif /* FEATURE_ATI_fragment_shader */
diff --git a/mesalib/src/mesa/shader/atifragshader.h b/mesalib/src/mesa/main/atifragshader.h
index e1dc20e60..31c335ec8 100644
--- a/mesalib/src/mesa/shader/atifragshader.h
+++ b/mesalib/src/mesa/main/atifragshader.h
@@ -60,6 +60,11 @@ struct atifs_setupinst
 };
 
 
+#if FEATURE_ATI_fragment_shader
+
+extern void
+_mesa_init_ati_fragment_shader_dispatch(struct _glapi_table *disp);
+
 extern struct ati_fragment_shader *
 _mesa_new_ati_fragment_shader(GLcontext *ctx, GLuint id);
 
@@ -120,4 +125,25 @@ _mesa_AlphaFragmentOp3ATI(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1,
 extern void GLAPIENTRY
 _mesa_SetFragmentShaderConstantATI(GLuint dst, const GLfloat * value);
 
-#endif
+#else /* FEATURE_ATI_fragment_shader */
+
+static INLINE void
+_mesa_init_ati_fragment_shader_dispatch(struct _glapi_table *disp)
+{
+}
+
+static INLINE struct ati_fragment_shader *
+_mesa_new_ati_fragment_shader(GLcontext *ctx, GLuint id)
+{
+   return NULL;
+}
+
+static INLINE void
+_mesa_delete_ati_fragment_shader(GLcontext *ctx,
+                                 struct ati_fragment_shader *s)
+{
+}
+
+#endif /* FEATURE_ATI_fragment_shader */
+
+#endif /* ATIFRAGSHADER_H */
diff --git a/mesalib/src/mesa/main/attrib.c b/mesalib/src/mesa/main/attrib.c
index 92fb8d289..753949be5 100644
--- a/mesalib/src/mesa/main/attrib.c
+++ b/mesalib/src/mesa/main/attrib.c
@@ -41,12 +41,12 @@
 #include "hint.h"
 #include "light.h"
 #include "lines.h"
+#include "macros.h"
 #include "matrix.h"
 #include "multisample.h"
 #include "points.h"
 #include "polygon.h"
 #include "scissor.h"
-#include "simple_list.h"
 #include "stencil.h"
 #include "texenv.h"
 #include "texgen.h"
diff --git a/mesalib/src/mesa/main/attrib.h b/mesalib/src/mesa/main/attrib.h
index 6b48a1766..83b28a65b 100644
--- a/mesalib/src/mesa/main/attrib.h
+++ b/mesalib/src/mesa/main/attrib.h
@@ -48,6 +48,8 @@ _mesa_init_attrib_dispatch(struct _glapi_table *disp);
 
 #else /* FEATURE_attrib_stack */
 
+#include "main/compiler.h"
+
 static INLINE void
 _mesa_PushClientAttrib( GLbitfield mask )
 {
diff --git a/mesalib/src/mesa/main/bufferobj.c b/mesalib/src/mesa/main/bufferobj.c
index 71d1514fe..4797f29b4 100644
--- a/mesalib/src/mesa/main/bufferobj.c
+++ b/mesalib/src/mesa/main/bufferobj.c
@@ -32,6 +32,7 @@
 
 
 #include "glheader.h"
+#include "enums.h"
 #include "hash.h"
 #include "imports.h"
 #include "image.h"
@@ -46,7 +47,7 @@
 /*#define BOUNDS_CHECK*/
 
 
-#ifdef FEATURE_OES_mapbuffer
+#if FEATURE_OES_mapbuffer
 #define DEFAULT_ACCESS GL_MAP_WRITE_BIT
 #else
 #define DEFAULT_ACCESS (GL_MAP_READ_BIT | GL_MAP_WRITE_BIT)
@@ -82,6 +83,13 @@ get_buffer_target(GLcontext *ctx, GLenum target)
          return &ctx->CopyWriteBuffer;
       }
       break;
+#if FEATURE_EXT_transform_feedback
+   case GL_TRANSFORM_FEEDBACK_BUFFER:
+      if (ctx->Extensions.EXT_transform_feedback) {
+         return &ctx->TransformFeedback.CurrentBuffer;
+      }
+      break;
+#endif
    default:
       return NULL;
    }
@@ -582,7 +590,7 @@ bind_buffer_object(GLcontext *ctx, GLenum target, GLuint buffer)
 
    bindTarget = get_buffer_target(ctx, target);
    if (!bindTarget) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glBindBufferARB(target 0x%x)");
+      _mesa_error(ctx, GL_INVALID_ENUM, "glBindBufferARB(target 0x%x)", target);
       return;
    }
 
@@ -1376,31 +1384,49 @@ _mesa_GetBufferParameterivARB(GLenum target, GLenum pname, GLint *params)
 
    bufObj = get_buffer(ctx, target);
    if (!bufObj) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "GetBufferParameterivARB(target)" );
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferParameterivARB(target)" );
       return;
    }
    if (!_mesa_is_bufferobj(bufObj)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "GetBufferParameterivARB" );
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetBufferParameterivARB" );
       return;
    }
 
    switch (pname) {
    case GL_BUFFER_SIZE_ARB:
       *params = (GLint) bufObj->Size;
-      break;
+      return;
    case GL_BUFFER_USAGE_ARB:
       *params = bufObj->Usage;
-      break;
+      return;
    case GL_BUFFER_ACCESS_ARB:
       *params = simplified_access_mode(bufObj->AccessFlags);
-      break;
+      return;
    case GL_BUFFER_MAPPED_ARB:
       *params = _mesa_bufferobj_mapped(bufObj);
-      break;
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferParameterivARB(pname)");
       return;
+   case GL_BUFFER_ACCESS_FLAGS:
+      if (ctx->VersionMajor < 3)
+         goto invalid_pname;
+      *params = bufObj->AccessFlags;
+      return;
+   case GL_BUFFER_MAP_OFFSET:
+      if (ctx->VersionMajor < 3)
+         goto invalid_pname;
+      *params = (GLint) bufObj->Offset;
+      return;
+   case GL_BUFFER_MAP_LENGTH:
+      if (ctx->VersionMajor < 3)
+         goto invalid_pname;
+      *params = (GLint) bufObj->Length;
+      return;
+   default:
+      ; /* fall-through */
    }
+
+invalid_pname:
+   _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferParameterivARB(pname=%s)",
+               _mesa_lookup_enum_by_nr(pname));
 }
 
 
@@ -1418,31 +1444,49 @@ _mesa_GetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)
 
    bufObj = get_buffer(ctx, target);
    if (!bufObj) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "GetBufferParameteri64v(target)" );
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferParameteri64v(target)" );
       return;
    }
    if (!_mesa_is_bufferobj(bufObj)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "GetBufferParameteri64v" );
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetBufferParameteri64v" );
       return;
    }
 
    switch (pname) {
    case GL_BUFFER_SIZE_ARB:
       *params = bufObj->Size;
-      break;
+      return;
    case GL_BUFFER_USAGE_ARB:
       *params = bufObj->Usage;
-      break;
+      return;
    case GL_BUFFER_ACCESS_ARB:
       *params = simplified_access_mode(bufObj->AccessFlags);
-      break;
+      return;
+   case GL_BUFFER_ACCESS_FLAGS:
+      if (ctx->VersionMajor < 3)
+         goto invalid_pname;
+      *params = bufObj->AccessFlags;
+      return;
    case GL_BUFFER_MAPPED_ARB:
       *params = _mesa_bufferobj_mapped(bufObj);
-      break;
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferParameteri64v(pname)");
       return;
+   case GL_BUFFER_MAP_OFFSET:
+      if (ctx->VersionMajor < 3)
+         goto invalid_pname;
+      *params = bufObj->Offset;
+      return;
+   case GL_BUFFER_MAP_LENGTH:
+      if (ctx->VersionMajor < 3)
+         goto invalid_pname;
+      *params = bufObj->Length;
+      return;
+   default:
+      ; /* fall-through */
    }
+
+invalid_pname:
+   _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferParameteri64v(pname=%s)",
+               _mesa_lookup_enum_by_nr(pname));
 }
 
 
@@ -1509,27 +1553,27 @@ _mesa_CopyBufferSubData(GLenum readTarget, GLenum writeTarget,
 
    if (readOffset < 0) {
       _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glCopyBuffserSubData(readOffset = %d)", readOffset);
+                  "glCopyBuffserSubData(readOffset = %d)", (int) readOffset);
       return;
    }
 
    if (writeOffset < 0) {
       _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glCopyBuffserSubData(writeOffset = %d)", writeOffset);
+                  "glCopyBuffserSubData(writeOffset = %d)", (int) writeOffset);
       return;
    }
 
    if (readOffset + size > src->Size) {
       _mesa_error(ctx, GL_INVALID_VALUE,
                   "glCopyBuffserSubData(readOffset + size = %d)",
-                  readOffset, size);
+                  (int) (readOffset + size));
       return;
    }
 
    if (writeOffset + size > dst->Size) {
       _mesa_error(ctx, GL_INVALID_VALUE,
                   "glCopyBuffserSubData(writeOffset + size = %d)",
-                  writeOffset, size);
+                  (int) (writeOffset + size));
       return;
    }
 
@@ -1573,13 +1617,13 @@ _mesa_MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length,
 
    if (offset < 0) {
       _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glMapBufferRange(offset = %ld)", offset);
+                  "glMapBufferRange(offset = %ld)", (long)offset);
       return NULL;
    }
 
    if (length < 0) {
       _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glMapBufferRange(length = %ld)", length);
+                  "glMapBufferRange(length = %ld)", (long)length);
       return NULL;
    }
 
@@ -1664,13 +1708,13 @@ _mesa_FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
 
    if (offset < 0) {
       _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glMapBufferRange(offset = %ld)", offset);
+                  "glMapBufferRange(offset = %ld)", (long)offset);
       return;
    }
 
    if (length < 0) {
       _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glMapBufferRange(length = %ld)", length);
+                  "glMapBufferRange(length = %ld)", (long)length);
       return;
    }
 
@@ -1702,8 +1746,8 @@ _mesa_FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
 
    if (offset + length > bufObj->Length) {
       _mesa_error(ctx, GL_INVALID_VALUE,
-             "glMapBufferRange(offset %ld + length %ld > mapped length %ld)",
-             offset, length, bufObj->Length);
+		  "glMapBufferRange(offset %ld + length %ld > mapped length %ld)",
+		  (long)offset, (long)length, (long)bufObj->Length);
       return;
    }
 
@@ -1880,7 +1924,7 @@ _mesa_BufferObjectUnpurgeable(GLcontext *ctx, GLuint name, GLenum option)
 
    bufObj->Purgeable = GL_FALSE;
 
-   retval = GL_RETAINED_APPLE;
+   retval = option;
    if (ctx->Driver.BufferObjectUnpurgeable)
       retval = ctx->Driver.BufferObjectUnpurgeable(ctx, bufObj, option);
 
@@ -1910,11 +1954,11 @@ _mesa_RenderObjectUnpurgeable(GLcontext *ctx, GLuint name, GLenum option)
 
    bufObj->Purgeable = GL_FALSE;
 
-   retval = GL_RETAINED_APPLE;
+   retval = option;
    if (ctx->Driver.RenderObjectUnpurgeable)
       retval = ctx->Driver.RenderObjectUnpurgeable(ctx, bufObj, option);
 
-   return option;
+   return retval;
 }
 
 
@@ -1940,7 +1984,7 @@ _mesa_TextureObjectUnpurgeable(GLcontext *ctx, GLuint name, GLenum option)
 
    bufObj->Purgeable = GL_FALSE;
 
-   retval = GL_RETAINED_APPLE;
+   retval = option;
    if (ctx->Driver.TextureObjectUnpurgeable)
       retval = ctx->Driver.TextureObjectUnpurgeable(ctx, bufObj, option);
 
diff --git a/mesalib/src/mesa/main/bufferobj.h b/mesalib/src/mesa/main/bufferobj.h
index 912529cfd..f234d06c6 100644
--- a/mesalib/src/mesa/main/bufferobj.h
+++ b/mesalib/src/mesa/main/bufferobj.h
@@ -29,7 +29,7 @@
 #define BUFFEROBJ_H
 
 
-#include "context.h"
+#include "mtypes.h"
 
 
 /*
diff --git a/mesalib/src/mesa/main/clear.c b/mesalib/src/mesa/main/clear.c
index e76ab5527..49d86b3b1 100644
--- a/mesalib/src/mesa/main/clear.c
+++ b/mesalib/src/mesa/main/clear.c
@@ -35,6 +35,7 @@
 #include "context.h"
 #include "colormac.h"
 #include "enums.h"
+#include "macros.h"
 #include "state.h"
 
 
diff --git a/mesalib/src/mesa/main/clear.h b/mesalib/src/mesa/main/clear.h
index 4c78eeda4..6657370c4 100644
--- a/mesalib/src/mesa/main/clear.h
+++ b/mesalib/src/mesa/main/clear.h
@@ -27,7 +27,7 @@
 #define CLEAR_H
 
 
-#include "main/mtypes.h"
+#include "glheader.h"
 
 
 extern void GLAPIENTRY
diff --git a/mesalib/src/mesa/main/clip.h b/mesalib/src/mesa/main/clip.h
index d53afb45b..ac472d66e 100644
--- a/mesalib/src/mesa/main/clip.h
+++ b/mesalib/src/mesa/main/clip.h
@@ -31,7 +31,7 @@
 #ifndef CLIP_H
 #define CLIP_H
 
-#include "mtypes.h"
+#include "glheader.h"
 
 extern void GLAPIENTRY 
 _mesa_ClipPlane( GLenum plane, const GLdouble *equation );
diff --git a/mesalib/src/mesa/main/colormac.h b/mesalib/src/mesa/main/colormac.h
index 905f4e228..245fb658b 100644
--- a/mesalib/src/mesa/main/colormac.h
+++ b/mesalib/src/mesa/main/colormac.h
@@ -33,9 +33,9 @@
 #define COLORMAC_H
 
 
-#include "imports.h"
 #include "config.h"
 #include "macros.h"
+#include "mtypes.h"
 
 
 /** \def BYTE_TO_CHAN
diff --git a/mesalib/src/mesa/main/colortab.h b/mesalib/src/mesa/main/colortab.h
index 652fb5824..303c9fb30 100644
--- a/mesalib/src/mesa/main/colortab.h
+++ b/mesalib/src/mesa/main/colortab.h
@@ -31,13 +31,6 @@
 
 #if FEATURE_colortable
 
-#define _MESA_INIT_COLORTABLE_FUNCTIONS(driver, impl)                \
-   do {                                                              \
-      (driver)->CopyColorTable       = impl ## CopyColorTable;       \
-      (driver)->CopyColorSubTable    = impl ## CopyColorSubTable;    \
-      (driver)->UpdateTexturePalette = impl ## UpdateTexturePalette; \
-   } while (0)
-
 extern void GLAPIENTRY
 _mesa_ColorTable( GLenum target, GLenum internalformat,
                   GLsizei width, GLenum format, GLenum type,
@@ -53,7 +46,7 @@ _mesa_init_colortable_dispatch(struct _glapi_table *disp);
 
 #else /* FEATURE_colortable */
 
-#define _MESA_INIT_COLORTABLE_FUNCTIONS(driver, impl) do { } while (0)
+#include "main/compiler.h"
 
 static INLINE void GLAPIENTRY
 _mesa_ColorTable( GLenum target, GLenum internalformat,
diff --git a/mesalib/src/mesa/main/compiler.h b/mesalib/src/mesa/main/compiler.h
index 81704ae2c..800eb8390 100644
--- a/mesalib/src/mesa/main/compiler.h
+++ b/mesalib/src/mesa/main/compiler.h
@@ -65,9 +65,7 @@ extern "C" {
    typedef unsigned __int8    uint8_t;
    typedef __int16            int16_t;
    typedef unsigned __int16   uint16_t;
-#  ifndef __eglplatform_h_
-     typedef __int32            int32_t;
-#  endif
+   typedef __int32            int32_t;
    typedef unsigned __int32   uint32_t;
    typedef __int64            int64_t;
    typedef unsigned __int64   uint64_t;
@@ -200,6 +198,13 @@ extern "C" {
 #  define __builtin_expect(x, y) x
 #endif
 
+#ifdef __GNUC__
+#define likely(x) __builtin_expect(!!(x), 1)
+#define unlikely(x) __builtin_expect(!!(x), 0)
+#else
+#define likely(x) !!(x)
+#define unlikely(x) !!(x)
+#endif
 
 /**
  * The __FUNCTION__ gcc variable is generally only used for debugging.
@@ -219,6 +224,18 @@ extern "C" {
 #  endif
 # endif
 #endif
+#ifndef __func__
+#  if (__STDC_VERSION__ >= 199901L) || \
+      (defined(__SUNPRO_C) && defined(__C99FEATURES__))
+       /* __func__ is part of C99 */
+#  elif defined(_MSC_VER)
+#    if _MSC_VER >= 1300
+#      define __func__ __FUNCTION__
+#    else
+#      define __func__ "<unknown>"
+#    endif
+#  endif
+#endif
 
 
 /**
@@ -311,6 +328,11 @@ static INLINE GLuint CPU_TO_LE32(GLuint x)
 #endif
 #endif
 
+#if (__GNUC__ >= 3)
+#define PRINTFLIKE(f, a) __attribute__ ((format(__printf__, f, a)))
+#else
+#define PRINTFLIKE(f, a)
+#endif
 
 #ifndef NULL
 #define NULL 0
diff --git a/mesalib/src/mesa/main/config.h b/mesalib/src/mesa/main/config.h
index 2eac1cc2e..0f2d1a8f8 100644
--- a/mesalib/src/mesa/main/config.h
+++ b/mesalib/src/mesa/main/config.h
@@ -177,7 +177,7 @@
 /**
  * Per-program constants (power of two)
  *
- * \c MAX_PROGRAM_LOCAL_PARAMS and \c MAX_UNIFORMS are just the assmebly shader
+ * \c MAX_PROGRAM_LOCAL_PARAMS and \c MAX_UNIFORMS are just the assembly shader
  * and GLSL shader names for the same thing.  They should \b always have the
  * same value.  Each refers to the number of vec4 values supplied as
  * per-program parameters.
@@ -250,7 +250,7 @@
 
 /** For GL_ARB_draw_buffers */
 /*@{*/
-#define MAX_DRAW_BUFFERS 4
+#define MAX_DRAW_BUFFERS 8
 /*@}*/
 
 
@@ -262,6 +262,20 @@
 /** For GL_ATI_envmap_bump - support bump mapping on first 8 units */
 #define SUPPORTED_ATI_BUMP_UNITS 0xff
 
+/** For GL_EXT_transform_feedback */
+#define MAX_FEEDBACK_ATTRIBS 32
+
+/** For GL_ARB_geometry_shader4 */
+/*@{*/
+#define MAX_GEOMETRY_TEXTURE_IMAGE_UNITS             8
+#define MAX_GEOMETRY_VARYING_COMPONENTS              32
+#define MAX_VERTEX_VARYING_COMPONENTS                32
+#define MAX_GEOMETRY_UNIFORM_COMPONENTS              512
+#define MAX_GEOMETRY_OUTPUT_VERTICES                 256
+#define MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS         1024
+/*@}*/
+
+
 /**
  * \name Mesa-specific parameters
  */
diff --git a/mesalib/src/mesa/main/context.c b/mesalib/src/mesa/main/context.c
index 73126b957..3bddf2570 100644
--- a/mesalib/src/mesa/main/context.c
+++ b/mesalib/src/mesa/main/context.c
@@ -111,28 +111,25 @@
 #include "points.h"
 #include "polygon.h"
 #include "queryobj.h"
-#if FEATURE_ARB_sync
 #include "syncobj.h"
-#endif
 #include "rastpos.h"
 #include "remap.h"
 #include "scissor.h"
 #include "shared.h"
+#include "shaderobj.h"
 #include "simple_list.h"
 #include "state.h"
 #include "stencil.h"
 #include "texcompress_s3tc.h"
 #include "texstate.h"
+#include "transformfeedback.h"
 #include "mtypes.h"
 #include "varray.h"
 #include "version.h"
 #include "viewport.h"
 #include "vtxfmt.h"
-#include "glapi/glthread.h"
-#include "glapi/glapitable.h"
-#include "shader/program.h"
-#include "shader/prog_print.h"
-#include "shader/shader_api.h"
+#include "program/program.h"
+#include "program/prog_print.h"
 #if _HAVE_FULL_GL
 #include "math/m_matrix.h"
 #endif
@@ -141,6 +138,10 @@
 #include "sparc/sparc.h"
 #endif
 
+#include "glsl_parser_extras.h"
+
+
+
 #ifndef MESA_VERBOSE
 int MESA_VERBOSE = 0;
 #endif
@@ -340,14 +341,16 @@ _mesa_destroy_visual( GLvisual *vis )
 static void
 dummy_enum_func(void)
 {
-   gl_buffer_index bi;
-   gl_colortable_index ci;
-   gl_face_index fi;
-   gl_frag_attrib fa;
-   gl_frag_result fr;
-   gl_texture_index ti;
-   gl_vert_attrib va;
-   gl_vert_result vr;
+   gl_buffer_index bi = BUFFER_FRONT_LEFT;
+   gl_colortable_index ci = COLORTABLE_PRECONVOLUTION;
+   gl_face_index fi = FACE_POS_X;
+   gl_frag_attrib fa = FRAG_ATTRIB_WPOS;
+   gl_frag_result fr = FRAG_RESULT_DEPTH;
+   gl_texture_index ti = TEXTURE_2D_ARRAY_INDEX;
+   gl_vert_attrib va = VERT_ATTRIB_POS;
+   gl_vert_result vr = VERT_RESULT_HPOS;
+   gl_geom_attrib ga = GEOM_ATTRIB_POSITION;
+   gl_geom_result gr = GEOM_RESULT_POS;
 
    (void) bi;
    (void) ci;
@@ -357,6 +360,8 @@ dummy_enum_func(void)
    (void) ti;
    (void) va;
    (void) vr;
+   (void) ga;
+   (void) gr;
 }
 
 
@@ -395,9 +400,28 @@ one_time_init( GLcontext *ctx )
 
       _mesa_get_cpu_features();
 
-      _mesa_init_remap_table();
+      switch (ctx->API) {
+#if FEATURE_GL
+      case API_OPENGL:
+	 _mesa_init_remap_table();
+	 break;
+#endif
+#if FEATURE_ES1
+      case API_OPENGLES:
+	 _mesa_init_remap_table_es1();
+	 break;
+#endif
+#if FEATURE_ES2
+      case API_OPENGLES2:
+	 _mesa_init_remap_table_es2();
+	 break;
+#endif
+      default:
+	 break;
+      }
 
       _mesa_init_sqrt_table();
+      _mesa_init_get_hash(ctx);
 
       for (i = 0; i < 256; i++) {
          _mesa_ubyte_to_float_color_tab[i] = (float) i / 255.0F;
@@ -412,6 +436,11 @@ one_time_init( GLcontext *ctx )
    }
    _glthread_UNLOCK_MUTEX(OneTimeLock);
 
+   /* Hopefully atexit() is widely available.  If not, we may need some
+    * #ifdef tests here.
+    */
+   atexit(_mesa_destroy_shader_compiler);
+
    dummy_enum_func();
 }
 
@@ -440,7 +469,7 @@ _mesa_init_current(GLcontext *ctx)
 
 
 /**
- * Init vertex/fragment program limits.
+ * Init vertex/fragment/geometry program limits.
  * Important: drivers should override these with actual limits.
  */
 static void
@@ -455,15 +484,31 @@ init_program_limits(GLenum type, struct gl_program_constants *prog)
    prog->MaxLocalParams = MAX_PROGRAM_LOCAL_PARAMS;
    prog->MaxUniformComponents = 4 * MAX_UNIFORMS;
 
-   if (type == GL_VERTEX_PROGRAM_ARB) {
+   switch (type) {
+   case GL_VERTEX_PROGRAM_ARB:
       prog->MaxParameters = MAX_VERTEX_PROGRAM_PARAMS;
       prog->MaxAttribs = MAX_NV_VERTEX_PROGRAM_INPUTS;
       prog->MaxAddressRegs = MAX_VERTEX_PROGRAM_ADDRESS_REGS;
-   }
-   else {
+      break;
+   case GL_FRAGMENT_PROGRAM_ARB:
       prog->MaxParameters = MAX_NV_FRAGMENT_PROGRAM_PARAMS;
       prog->MaxAttribs = MAX_NV_FRAGMENT_PROGRAM_INPUTS;
       prog->MaxAddressRegs = MAX_FRAGMENT_PROGRAM_ADDRESS_REGS;
+      break;
+   case MESA_GEOMETRY_PROGRAM:
+      prog->MaxParameters = MAX_NV_VERTEX_PROGRAM_PARAMS;
+      prog->MaxAttribs = MAX_NV_VERTEX_PROGRAM_INPUTS;
+      prog->MaxAddressRegs = MAX_VERTEX_PROGRAM_ADDRESS_REGS;
+
+      prog->MaxGeometryTextureImageUnits = MAX_GEOMETRY_TEXTURE_IMAGE_UNITS;
+      prog->MaxGeometryVaryingComponents = MAX_GEOMETRY_VARYING_COMPONENTS;
+      prog->MaxVertexVaryingComponents = MAX_VERTEX_VARYING_COMPONENTS;
+      prog->MaxGeometryUniformComponents = MAX_GEOMETRY_UNIFORM_COMPONENTS;
+      prog->MaxGeometryOutputVertices = MAX_GEOMETRY_OUTPUT_VERTICES;
+      prog->MaxGeometryTotalOutputComponents = MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS;
+      break;
+   default:
+      assert(0 && "Bad program type in init_program_limits()");
    }
 
    /* Set the native limits to zero.  This implies that there is no native
@@ -529,6 +574,9 @@ _mesa_init_constants(GLcontext *ctx)
 #if FEATURE_ARB_fragment_program
    init_program_limits(GL_FRAGMENT_PROGRAM_ARB, &ctx->Const.FragmentProgram);
 #endif
+#if FEATURE_ARB_geometry_shader4
+   init_program_limits(MESA_GEOMETRY_PROGRAM, &ctx->Const.GeometryProgram);
+#endif
    ctx->Const.MaxProgramMatrices = MAX_PROGRAM_MATRICES;
    ctx->Const.MaxProgramMatrixStackDepth = MAX_PROGRAM_MATRIX_STACK_DEPTH;
 
@@ -549,6 +597,21 @@ _mesa_init_constants(GLcontext *ctx)
    ctx->Const.MaxVarying = MAX_VARYING;
 #endif
 
+   /* Shading language version */
+   if (ctx->API == API_OPENGL) {
+#if FEATURE_ARB_shading_language_120
+      ctx->Const.GLSLVersion = 120;
+#else
+      ctx->Const.GLSLVersion = 110;
+#endif
+   }
+   else if (ctx->API == API_OPENGLES2) {
+      ctx->Const.GLSLVersion = 100;
+   }
+   else if (ctx->API == API_OPENGLES) {
+      ctx->Const.GLSLVersion = 0; /* GLSL not supported */
+   }
+
    /* GL_ARB_framebuffer_object */
    ctx->Const.MaxSamples = 0;
 
@@ -560,6 +623,14 @@ _mesa_init_constants(GLcontext *ctx)
 
    /* GL_EXT_provoking_vertex */
    ctx->Const.QuadsFollowProvokingVertexConvention = GL_TRUE;
+
+   /* GL_EXT_transform_feedback */
+   ctx->Const.MaxTransformFeedbackSeparateAttribs = MAX_FEEDBACK_ATTRIBS;
+   ctx->Const.MaxTransformFeedbackSeparateComponents = 4 * MAX_FEEDBACK_ATTRIBS;
+   ctx->Const.MaxTransformFeedbackInterleavedComponents = 4 * MAX_FEEDBACK_ATTRIBS;
+
+   /* GL 3.2: hard-coded for now: */
+   ctx->Const.ProfileMask = GL_CONTEXT_COMPATIBILITY_PROFILE_BIT;
 }
 
 
@@ -627,6 +698,9 @@ check_context_limits(GLcontext *ctx)
 
    assert(ctx->Const.MaxDrawBuffers <= MAX_DRAW_BUFFERS);
 
+   /* if this fails, add more enum values to gl_buffer_index */
+   assert(BUFFER_COLOR0 + MAX_DRAW_BUFFERS <= BUFFER_COUNT);
+
    /* XXX probably add more tests */
 }
 
@@ -676,14 +750,13 @@ init_attrib_groups(GLcontext *ctx)
    _mesa_init_polygon( ctx );
    _mesa_init_program( ctx );
    _mesa_init_queryobj( ctx );
-#if FEATURE_ARB_sync
    _mesa_init_sync( ctx );
-#endif
    _mesa_init_rastpos( ctx );
    _mesa_init_scissor( ctx );
    _mesa_init_shader_state( ctx );
    _mesa_init_stencil( ctx );
    _mesa_init_transform( ctx );
+   _mesa_init_transform_feedback( ctx );
    _mesa_init_varray( ctx );
    _mesa_init_viewport( ctx );
 
@@ -739,8 +812,8 @@ generic_nop(void)
 /**
  * Allocate and initialize a new dispatch table.
  */
-static struct _glapi_table *
-alloc_dispatch_table(void)
+struct _glapi_table *
+_mesa_alloc_dispatch_table(int size)
 {
    /* Find the larger of Mesa's dispatch table and libGL's dispatch table.
     * In practice, this'll be the same for stand-alone Mesa.  But for DRI
@@ -748,7 +821,7 @@ alloc_dispatch_table(void)
     * DRI drivers.
     */
    GLint numEntries = MAX2(_glapi_get_dispatch_table_size(),
-                           sizeof(struct _glapi_table) / sizeof(_glapi_proc));
+                           size / sizeof(_glapi_proc));
    struct _glapi_table *table =
       (struct _glapi_table *) malloc(numEntries * sizeof(_glapi_proc));
    if (table) {
@@ -781,6 +854,7 @@ alloc_dispatch_table(void)
  * for debug flags.
  *
  * \param ctx the context to initialize
+ * \param api the GL API type to create the context for
  * \param visual describes the visual attributes for this context
  * \param share_list points to context to share textures, display lists,
  *        etc with, or NULL
@@ -789,27 +863,30 @@ alloc_dispatch_table(void)
  * \param driverContext pointer to driver-specific context data
  */
 GLboolean
-_mesa_initialize_context(GLcontext *ctx,
-                         const GLvisual *visual,
-                         GLcontext *share_list,
-                         const struct dd_function_table *driverFunctions,
-                         void *driverContext)
+_mesa_initialize_context_for_api(GLcontext *ctx,
+				 gl_api api,
+				 const GLvisual *visual,
+				 GLcontext *share_list,
+				 const struct dd_function_table *driverFunctions,
+				 void *driverContext)
 {
    struct gl_shared_state *shared;
+   int i;
 
    /*ASSERT(driverContext);*/
    assert(driverFunctions->NewTextureObject);
    assert(driverFunctions->FreeTexImageData);
 
-   /* misc one-time initializations */
-   one_time_init(ctx);
-
+   ctx->API = api;
    ctx->Visual = *visual;
    ctx->DrawBuffer = NULL;
    ctx->ReadBuffer = NULL;
    ctx->WinSysDrawBuffer = NULL;
    ctx->WinSysReadBuffer = NULL;
 
+   /* misc one-time initializations */
+   one_time_init(ctx);
+
    /* Plug in driver functions and context pointer here.
     * This is important because when we call alloc_shared_state() below
     * we'll call ctx->Driver.NewTextureObject() to create the default
@@ -839,30 +916,36 @@ _mesa_initialize_context(GLcontext *ctx,
       return GL_FALSE;
    }
 
+#if FEATURE_dispatch
    /* setup the API dispatch tables */
-   ctx->Exec = alloc_dispatch_table();
-   ctx->Save = alloc_dispatch_table();
-   if (!ctx->Exec || !ctx->Save) {
+   switch (ctx->API) {
+#if FEATURE_GL
+   case API_OPENGL:
+      ctx->Exec = _mesa_create_exec_table();
+      break;
+#endif
+#if FEATURE_ES1
+   case API_OPENGLES:
+      ctx->Exec = _mesa_create_exec_table_es1();
+      break;
+#endif
+#if FEATURE_ES2
+   case API_OPENGLES2:
+      ctx->Exec = _mesa_create_exec_table_es2();
+      break;
+#endif
+   default:
+      _mesa_problem(ctx, "unknown or unsupported API");
+      break;
+   }
+
+   if (!ctx->Exec) {
       _mesa_release_shared_state(ctx, ctx->Shared);
-      if (ctx->Exec)
-         free(ctx->Exec);
       return GL_FALSE;
    }
-#if FEATURE_dispatch
-   _mesa_init_exec_table(ctx->Exec);
 #endif
    ctx->CurrentDispatch = ctx->Exec;
 
-#if FEATURE_dlist
-   _mesa_init_save_table(ctx->Save);
-   _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );
-#endif
-
-   /* Neutral tnl module stuff */
-   _mesa_init_exec_vtxfmt( ctx ); 
-   ctx->TnlModule.Current = NULL;
-   ctx->TnlModule.SwapCount = 0;
-
    ctx->FragmentProgram._MaintainTexEnvProgram
       = (_mesa_getenv("MESA_TEX_PROG") != NULL);
 
@@ -873,15 +956,65 @@ _mesa_initialize_context(GLcontext *ctx,
       ctx->FragmentProgram._MaintainTexEnvProgram = GL_TRUE;
    }
 
-#ifdef FEATURE_extra_context_init
-   _mesa_initialize_context_extra(ctx);
+   switch (ctx->API) {
+   case API_OPENGL:
+      /* Neutral tnl module stuff */
+      _mesa_init_exec_vtxfmt( ctx ); 
+      ctx->TnlModule.Current = NULL;
+      ctx->TnlModule.SwapCount = 0;
+
+#if FEATURE_dlist
+      ctx->Save = _mesa_create_save_table();
+      if (!ctx->Save) {
+	 _mesa_release_shared_state(ctx, ctx->Shared);
+	 free(ctx->Exec);
+	 return GL_FALSE;
+      }
+
+      _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );
 #endif
+      break;
+   case API_OPENGLES:
+      /**
+       * GL_OES_texture_cube_map says
+       * "Initially all texture generation modes are set to REFLECTION_MAP_OES"
+       */
+      for (i = 0; i < MAX_TEXTURE_UNITS; i++) {
+	 struct gl_texture_unit *texUnit = &ctx->Texture.Unit[i];
+	 texUnit->GenS.Mode = GL_REFLECTION_MAP_NV;
+	 texUnit->GenT.Mode = GL_REFLECTION_MAP_NV;
+	 texUnit->GenR.Mode = GL_REFLECTION_MAP_NV;
+	 texUnit->GenS._ModeBit = TEXGEN_REFLECTION_MAP_NV;
+	 texUnit->GenT._ModeBit = TEXGEN_REFLECTION_MAP_NV;
+	 texUnit->GenR._ModeBit = TEXGEN_REFLECTION_MAP_NV;
+      }
+      break;
+   case API_OPENGLES2:
+      ctx->FragmentProgram._MaintainTexEnvProgram = GL_TRUE;
+      ctx->VertexProgram._MaintainTnlProgram = GL_TRUE;
+      ctx->Point.PointSprite = GL_TRUE;  /* always on for ES 2.x */
+      break;
+   }
 
    ctx->FirstTimeCurrent = GL_TRUE;
 
    return GL_TRUE;
 }
 
+GLboolean
+_mesa_initialize_context(GLcontext *ctx,
+                         const GLvisual *visual,
+                         GLcontext *share_list,
+                         const struct dd_function_table *driverFunctions,
+                         void *driverContext)
+{
+   return _mesa_initialize_context_for_api(ctx,
+					   API_OPENGL,
+					   visual,
+					   share_list,
+					   driverFunctions,
+					   driverContext);
+}
 
 /**
  * Allocate and initialize a GLcontext structure.
@@ -889,6 +1022,7 @@ _mesa_initialize_context(GLcontext *ctx,
  * we need to at least call driverFunctions->NewTextureObject to initialize
  * the rendering context.
  *
+ * \param api the GL API type to create the context for
  * \param visual a GLvisual pointer (we copy the struct contents)
  * \param share_list another context to share display lists with or NULL
  * \param driverFunctions points to the dd_function_table into which the
@@ -898,10 +1032,11 @@ _mesa_initialize_context(GLcontext *ctx,
  * \return pointer to a new __GLcontextRec or NULL if error.
  */
 GLcontext *
-_mesa_create_context(const GLvisual *visual,
-                     GLcontext *share_list,
-                     const struct dd_function_table *driverFunctions,
-                     void *driverContext)
+_mesa_create_context_for_api(gl_api api,
+			     const GLvisual *visual,
+			     GLcontext *share_list,
+			     const struct dd_function_table *driverFunctions,
+			     void *driverContext)
 {
    GLcontext *ctx;
 
@@ -912,8 +1047,8 @@ _mesa_create_context(const GLvisual *visual,
    if (!ctx)
       return NULL;
 
-   if (_mesa_initialize_context(ctx, visual, share_list,
-                                driverFunctions, driverContext)) {
+   if (_mesa_initialize_context_for_api(ctx, api, visual, share_list,
+					driverFunctions, driverContext)) {
       return ctx;
    }
    else {
@@ -922,6 +1057,17 @@ _mesa_create_context(const GLvisual *visual,
    }
 }
 
+GLcontext *
+_mesa_create_context(const GLvisual *visual,
+		     GLcontext *share_list,
+		     const struct dd_function_table *driverFunctions,
+		     void *driverContext)
+{
+   return _mesa_create_context_for_api(API_OPENGL, visual,
+				       share_list,
+				       driverFunctions,
+				       driverContext);
+}
 
 /**
  * Free the data associated with the given context.
@@ -965,10 +1111,9 @@ _mesa_free_context_data( GLcontext *ctx )
    _mesa_free_program_data(ctx);
    _mesa_free_shader_state(ctx);
    _mesa_free_queryobj_data(ctx);
-#if FEATURE_ARB_sync
    _mesa_free_sync_data(ctx);
-#endif
    _mesa_free_varray_data(ctx);
+   _mesa_free_transform_feedback(ctx);
 
    _mesa_delete_array_object(ctx, ctx->Array.DefaultArrayObj);
 
@@ -1164,6 +1309,9 @@ check_compatible(const GLcontext *ctx, const GLframebuffer *buffer)
    if (ctxvis == bufvis)
       return GL_TRUE;
 
+   if (buffer == _mesa_get_incomplete_framebuffer())
+      return GL_TRUE;
+
 #if 0
    /* disabling this fixes the fgl_glxgears pbuffer demo */
    if (ctxvis->doubleBufferMode && !bufvis->doubleBufferMode)
@@ -1358,6 +1506,8 @@ _mesa_make_current( GLcontext *newCtx, GLframebuffer *drawBuffer,
       if (newCtx->FirstTimeCurrent) {
          _mesa_compute_version(newCtx);
 
+         newCtx->Extensions.String = _mesa_make_extension_string(newCtx);
+
          check_context_limits(newCtx);
 
          /* We can use this to help debug user's problems.  Tell them to set
@@ -1566,7 +1716,7 @@ _mesa_valid_to_render(GLcontext *ctx, const char *where)
       /* using shaders */
       if (!ctx->Shader.CurrentProgram->LinkStatus) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "%s(shader not linked), where");
+                     "%s(shader not linked)", where);
          return GL_FALSE;
       }
 #if 0 /* not normally enabled */
diff --git a/mesalib/src/mesa/main/context.h b/mesalib/src/mesa/main/context.h
index 09bf1777d..c61da6282 100644
--- a/mesalib/src/mesa/main/context.h
+++ b/mesalib/src/mesa/main/context.h
@@ -112,8 +112,20 @@ _mesa_initialize_context( GLcontext *ctx,
                           const struct dd_function_table *driverFunctions,
                           void *driverContext );
 
-extern void
-_mesa_initialize_context_extra(GLcontext *ctx);
+extern GLcontext *
+_mesa_create_context_for_api(gl_api api,
+			     const GLvisual *visual,
+			     GLcontext *share_list,
+			     const struct dd_function_table *driverFunctions,
+			     void *driverContext);
+
+extern GLboolean
+_mesa_initialize_context_for_api(GLcontext *ctx,
+				 gl_api api,
+				 const GLvisual *visual,
+				 GLcontext *share_list,
+				 const struct dd_function_table *driverFunctions,
+				 void *driverContext);
 
 extern void
 _mesa_free_context_data( GLcontext *ctx );
@@ -141,6 +153,8 @@ _mesa_get_current_context(void);
 
 /*@}*/
 
+extern void
+_mesa_init_get_hash(GLcontext *ctx);
 
 extern void
 _mesa_notifySwapBuffers(__GLcontext *gc);
diff --git a/mesalib/src/mesa/main/convolve.c b/mesalib/src/mesa/main/convolve.c
index 15e8dffc2..f63bddc44 100644
--- a/mesalib/src/mesa/main/convolve.c
+++ b/mesalib/src/mesa/main/convolve.c
@@ -37,6 +37,7 @@
 #include "convolve.h"
 #include "context.h"
 #include "image.h"
+#include "macros.h"
 #include "mtypes.h"
 #include "state.h"
 #include "main/dispatch.h"
diff --git a/mesalib/src/mesa/main/convolve.h b/mesalib/src/mesa/main/convolve.h
index 59492bc7c..80caf942f 100644
--- a/mesalib/src/mesa/main/convolve.h
+++ b/mesalib/src/mesa/main/convolve.h
@@ -33,12 +33,6 @@
 
 #if FEATURE_convolve
 
-#define _MESA_INIT_CONVOLVE_FUNCTIONS(driver, impl)                        \
-   do {                                                                    \
-      (driver)->CopyConvolutionFilter1D = impl ## CopyConvolutionFilter1D; \
-      (driver)->CopyConvolutionFilter2D = impl ## CopyConvolutionFilter2D; \
-   } while (0)
-
 extern void GLAPIENTRY
 _mesa_ConvolutionFilter1D(GLenum target, GLenum internalformat, GLsizei width,
                           GLenum format, GLenum type, const GLvoid *image);
@@ -70,7 +64,7 @@ _mesa_init_convolve_dispatch(struct _glapi_table *disp);
 
 #else /* FEATURE_convolve */
 
-#define _MESA_INIT_CONVOLVE_FUNCTIONS(driver, impl) do { } while (0)
+#include "main/compiler.h"
 
 static INLINE void GLAPIENTRY
 _mesa_ConvolutionFilter1D(GLenum target, GLenum internalformat, GLsizei width,
diff --git a/mesalib/src/mesa/main/core.h b/mesalib/src/mesa/main/core.h
new file mode 100644
index 000000000..ea6e6bf11
--- /dev/null
+++ b/mesalib/src/mesa/main/core.h
@@ -0,0 +1,66 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.9
+ *
+ * Copyright (C) 2010 LunarG Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE 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.
+ *
+ * Authors:
+ *    Chia-I Wu <olv@lunarg.com>
+ */
+
+
+/**
+ * \file core.h
+ * The public header of core mesa.
+ *
+ * This file is the (only) public header of core mesa.  It is supposed to be
+ * used by GLX, WGL, and GLSL.  It is important that headers directly or
+ * indirectly included here do not perform feature tests (#if FEATURE_xxx).
+ */
+
+
+#ifndef CORE_H
+#define CORE_H
+
+
+#include "main/glheader.h"
+#include "main/compiler.h"
+#include "main/imports.h"
+#include "main/macros.h"
+
+#include "main/version.h" /* for MESA_VERSION_STRING */
+#include "main/context.h" /* for _mesa_share_state */
+#include "main/mtypes.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* for GLSL */
+#include "program/prog_parameter.h"
+#include "program/prog_uniform.h"
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* CORE_H */
diff --git a/mesalib/src/mesa/main/dd.h b/mesalib/src/mesa/main/dd.h
index 7c02faaa5..8a20a6636 100644
--- a/mesalib/src/mesa/main/dd.h
+++ b/mesalib/src/mesa/main/dd.h
@@ -36,7 +36,7 @@
 struct gl_pixelstore_attrib;
 struct gl_display_list;
 
-#if FEATURE_ARB_vertex_buffer_object
+/* GL_ARB_vertex_buffer_object */
 /* Modifies GL_MAP_UNSYNCHRONIZED_BIT to allow driver to fail (return
  * NULL) if buffer is unavailable for immediate mapping.
  *
@@ -49,7 +49,6 @@ struct gl_display_list;
  * respect the contents of already referenced data.
  */
 #define MESA_MAP_NOWAIT_BIT       0x0040
-#endif
 
 
 /**
@@ -595,6 +594,27 @@ struct dd_function_table {
    
    /*@}*/
 
+   /**
+    * \name GLSL shader/program functions.
+    */
+   /*@{*/
+   /**
+    * Called when a shader is compiled.
+    *
+    * Note that not all shader objects get ShaderCompile called on
+    * them.  Notably, the shaders containing builtin functions do not
+    * have CompileShader() called, so if lowering passes are done they
+    * need to also be performed in LinkShader().
+    */
+   GLboolean (*CompileShader)(GLcontext *ctx, struct gl_shader *shader);
+   /**
+    * Called when a shader program is linked.
+    *
+    * This gives drivers an opportunity to clone the IR and make their
+    * own transformations on it for the purposes of code generation.
+    */
+   GLboolean (*LinkShader)(GLcontext *ctx, struct gl_shader_program *shader);
+   /*@}*/
 
    /**
     * \name State-changing functions.
@@ -706,31 +726,9 @@ struct dd_function_table {
    /*@}*/
 
 
-   /** 
-    * \name State-query functions
-    *
-    * Return GL_TRUE if query was completed, GL_FALSE otherwise.
-    */
-   /*@{*/
-   /** Return the value or values of a selected parameter */
-   GLboolean (*GetBooleanv)(GLcontext *ctx, GLenum pname, GLboolean *result);
-   /** Return the value or values of a selected parameter */
-   GLboolean (*GetDoublev)(GLcontext *ctx, GLenum pname, GLdouble *result);
-   /** Return the value or values of a selected parameter */
-   GLboolean (*GetFloatv)(GLcontext *ctx, GLenum pname, GLfloat *result);
-   /** Return the value or values of a selected parameter */
-   GLboolean (*GetIntegerv)(GLcontext *ctx, GLenum pname, GLint *result);
-   /** Return the value or values of a selected parameter */
-   GLboolean (*GetInteger64v)(GLcontext *ctx, GLenum pname, GLint64 *result);
-   /** Return the value or values of a selected parameter */
-   GLboolean (*GetPointerv)(GLcontext *ctx, GLenum pname, GLvoid **result);
-   /*@}*/
-   
-
    /**
     * \name Vertex/pixel buffer object functions
     */
-#if FEATURE_ARB_vertex_buffer_object
    /*@{*/
    void (*BindBuffer)( GLcontext *ctx, GLenum target,
 		       struct gl_buffer_object *obj );
@@ -774,12 +772,10 @@ struct dd_function_table {
    GLboolean (*UnmapBuffer)( GLcontext *ctx, GLenum target,
 			     struct gl_buffer_object *obj );
    /*@}*/
-#endif
 
    /**
     * \name Functions for GL_APPLE_object_purgeable
     */
-#if FEATURE_APPLE_object_purgeable
    /*@{*/
    /* variations on ObjectPurgeable */
    GLenum (*BufferObjectPurgeable)( GLcontext *ctx, struct gl_buffer_object *obj, GLenum option );
@@ -791,12 +787,10 @@ struct dd_function_table {
    GLenum (*RenderObjectUnpurgeable)( GLcontext *ctx, struct gl_renderbuffer *obj, GLenum option );
    GLenum (*TextureObjectUnpurgeable)( GLcontext *ctx, struct gl_texture_object *obj, GLenum option );
    /*@}*/
-#endif
 
    /**
-    * \name Functions for GL_EXT_framebuffer_object
+    * \name Functions for GL_EXT_framebuffer_{object,blit}.
     */
-#if FEATURE_EXT_framebuffer_object
    /*@{*/
    struct gl_framebuffer * (*NewFramebuffer)(GLcontext *ctx, GLuint name);
    struct gl_renderbuffer * (*NewRenderbuffer)(GLcontext *ctx, GLuint name);
@@ -815,13 +809,10 @@ struct dd_function_table {
    void (*ValidateFramebuffer)(GLcontext *ctx,
                                struct gl_framebuffer *fb);
    /*@}*/
-#endif
-#if FEATURE_EXT_framebuffer_blit
    void (*BlitFramebuffer)(GLcontext *ctx,
                            GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
                            GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
                            GLbitfield mask, GLenum filter);
-#endif
 
    /**
     * \name Query objects
@@ -849,54 +840,12 @@ struct dd_function_table {
     * \name GLSL-related functions (ARB extensions and OpenGL 2.x)
     */
    /*@{*/
-   void (*AttachShader)(GLcontext *ctx, GLuint program, GLuint shader);
-   void (*BindAttribLocation)(GLcontext *ctx, GLuint program, GLuint index,
-                              const GLcharARB *name);
-   void (*CompileShader)(GLcontext *ctx, GLuint shader);
-   GLuint (*CreateShader)(GLcontext *ctx, GLenum type);
-   GLuint (*CreateProgram)(GLcontext *ctx);
-   void (*DeleteProgram2)(GLcontext *ctx, GLuint program);
-   void (*DeleteShader)(GLcontext *ctx, GLuint shader);
-   void (*DetachShader)(GLcontext *ctx, GLuint program, GLuint shader);
-   void (*GetActiveAttrib)(GLcontext *ctx, GLuint program, GLuint index,
-                           GLsizei maxLength, GLsizei * length, GLint * size,
-                           GLenum * type, GLcharARB * name);
-   void (*GetActiveUniform)(GLcontext *ctx, GLuint program, GLuint index,
-                            GLsizei maxLength, GLsizei *length, GLint *size,
-                            GLenum *type, GLcharARB *name);
-   void (*GetAttachedShaders)(GLcontext *ctx, GLuint program, GLsizei maxCount,
-                              GLsizei *count, GLuint *obj);
-   GLint (*GetAttribLocation)(GLcontext *ctx, GLuint program,
-                              const GLcharARB *name);
-   GLuint (*GetHandle)(GLcontext *ctx, GLenum pname);
-   void (*GetProgramiv)(GLcontext *ctx, GLuint program,
-                        GLenum pname, GLint *params);
-   void (*GetProgramInfoLog)(GLcontext *ctx, GLuint program, GLsizei bufSize,
-                             GLsizei *length, GLchar *infoLog);
-   void (*GetShaderiv)(GLcontext *ctx, GLuint shader,
-                       GLenum pname, GLint *params);
-   void (*GetShaderInfoLog)(GLcontext *ctx, GLuint shader, GLsizei bufSize,
-                            GLsizei *length, GLchar *infoLog);
-   void (*GetShaderSource)(GLcontext *ctx, GLuint shader, GLsizei maxLength,
-                           GLsizei *length, GLcharARB *sourceOut);
-   void (*GetUniformfv)(GLcontext *ctx, GLuint program, GLint location,
-                        GLfloat *params);
-   void (*GetUniformiv)(GLcontext *ctx, GLuint program, GLint location,
-                        GLint *params);
-   GLint (*GetUniformLocation)(GLcontext *ctx, GLuint program,
-                               const GLcharARB *name);
-   GLboolean (*IsProgram)(GLcontext *ctx, GLuint name);
-   GLboolean (*IsShader)(GLcontext *ctx, GLuint name);
-   void (*LinkProgram)(GLcontext *ctx, GLuint program);
-   void (*ShaderSource)(GLcontext *ctx, GLuint shader, const GLchar *source);
-   void (*Uniform)(GLcontext *ctx, GLint location, GLsizei count,
-                   const GLvoid *values, GLenum type);
-   void (*UniformMatrix)(GLcontext *ctx, GLint cols, GLint rows,
-                         GLint location, GLsizei count,
-                         GLboolean transpose, const GLfloat *values);
-   void (*UseProgram)(GLcontext *ctx, GLuint program);
-   void (*ValidateProgram)(GLcontext *ctx, GLuint program);
-   /* XXX many more to come */
+   struct gl_shader *(*NewShader)(GLcontext *ctx, GLuint name, GLenum type);
+   void (*DeleteShader)(GLcontext *ctx, struct gl_shader *shader);
+   struct gl_shader_program *(*NewShaderProgram)(GLcontext *ctx, GLuint name);
+   void (*DeleteShaderProgram)(GLcontext *ctx,
+                               struct gl_shader_program *shProg);
+   void (*UseProgram)(GLcontext *ctx, struct gl_shader_program *shProg);
    /*@}*/
 
 
@@ -1018,7 +967,6 @@ struct dd_function_table {
    void (*EndCallList)( GLcontext *ctx );
 
 
-#if FEATURE_ARB_sync
    /**
     * \name GL_ARB_sync interfaces
     */
@@ -1032,14 +980,12 @@ struct dd_function_table {
    void (*ServerWaitSync)(GLcontext *, struct gl_sync_object *,
 			  GLbitfield, GLuint64);
    /*@}*/
-#endif
 
    /** GL_NV_conditional_render */
    void (*BeginConditionalRender)(GLcontext *ctx, struct gl_query_object *q,
                                   GLenum mode);
    void (*EndConditionalRender)(GLcontext *ctx, struct gl_query_object *q);
 
-#if FEATURE_OES_draw_texture
    /**
     * \name GL_OES_draw_texture interface
     */
@@ -1047,9 +993,10 @@ struct dd_function_table {
    void (*DrawTex)(GLcontext *ctx, GLfloat x, GLfloat y, GLfloat z,
                    GLfloat width, GLfloat height);
    /*@}*/
-#endif
 
-#if FEATURE_OES_EGL_image
+   /**
+    * \name GL_OES_EGL_image interface
+    */
    void (*EGLImageTargetTexture2D)(GLcontext *ctx, GLenum target,
 				   struct gl_texture_object *texObj,
 				   struct gl_texture_image *texImage,
@@ -1057,8 +1004,24 @@ struct dd_function_table {
    void (*EGLImageTargetRenderbufferStorage)(GLcontext *ctx,
 					     struct gl_renderbuffer *rb,
 					     void *image_handle);
-#endif
 
+   /**
+    * \name GL_EXT_transform_feedback interface
+    */
+   struct gl_transform_feedback_object *
+        (*NewTransformFeedback)(GLcontext *ctx, GLuint name);
+   void (*DeleteTransformFeedback)(GLcontext *ctx,
+                                   struct gl_transform_feedback_object *obj);
+   void (*BeginTransformFeedback)(GLcontext *ctx, GLenum mode,
+                                  struct gl_transform_feedback_object *obj);
+   void (*EndTransformFeedback)(GLcontext *ctx,
+                                struct gl_transform_feedback_object *obj);
+   void (*PauseTransformFeedback)(GLcontext *ctx,
+                                  struct gl_transform_feedback_object *obj);
+   void (*ResumeTransformFeedback)(GLcontext *ctx,
+                                   struct gl_transform_feedback_object *obj);
+   void (*DrawTransformFeedback)(GLcontext *ctx, GLenum mode,
+                                 struct gl_transform_feedback_object *obj);
 };
 
 
@@ -1085,23 +1048,23 @@ typedef struct {
     * \name Vertex
     */
    /*@{*/
-   void (GLAPIENTRYP ArrayElement)( GLint ); /* NOTE */
+   void (GLAPIENTRYP ArrayElement)( GLint );
    void (GLAPIENTRYP Color3f)( GLfloat, GLfloat, GLfloat );
    void (GLAPIENTRYP Color3fv)( const GLfloat * );
    void (GLAPIENTRYP Color4f)( GLfloat, GLfloat, GLfloat, GLfloat );
    void (GLAPIENTRYP Color4fv)( const GLfloat * );
    void (GLAPIENTRYP EdgeFlag)( GLboolean );
-   void (GLAPIENTRYP EvalCoord1f)( GLfloat );          /* NOTE */
-   void (GLAPIENTRYP EvalCoord1fv)( const GLfloat * ); /* NOTE */
-   void (GLAPIENTRYP EvalCoord2f)( GLfloat, GLfloat ); /* NOTE */
-   void (GLAPIENTRYP EvalCoord2fv)( const GLfloat * ); /* NOTE */
-   void (GLAPIENTRYP EvalPoint1)( GLint );             /* NOTE */
-   void (GLAPIENTRYP EvalPoint2)( GLint, GLint );      /* NOTE */
+   void (GLAPIENTRYP EvalCoord1f)( GLfloat );
+   void (GLAPIENTRYP EvalCoord1fv)( const GLfloat * );
+   void (GLAPIENTRYP EvalCoord2f)( GLfloat, GLfloat );
+   void (GLAPIENTRYP EvalCoord2fv)( const GLfloat * );
+   void (GLAPIENTRYP EvalPoint1)( GLint );
+   void (GLAPIENTRYP EvalPoint2)( GLint, GLint );
    void (GLAPIENTRYP FogCoordfEXT)( GLfloat );
    void (GLAPIENTRYP FogCoordfvEXT)( const GLfloat * );
    void (GLAPIENTRYP Indexf)( GLfloat );
    void (GLAPIENTRYP Indexfv)( const GLfloat * );
-   void (GLAPIENTRYP Materialfv)( GLenum face, GLenum pname, const GLfloat * ); /* NOTE */
+   void (GLAPIENTRYP Materialfv)( GLenum face, GLenum pname, const GLfloat * );
    void (GLAPIENTRYP MultiTexCoord1fARB)( GLenum, GLfloat );
    void (GLAPIENTRYP MultiTexCoord1fvARB)( GLenum, const GLfloat * );
    void (GLAPIENTRYP MultiTexCoord2fARB)( GLenum, GLfloat, GLfloat );
@@ -1128,8 +1091,8 @@ typedef struct {
    void (GLAPIENTRYP Vertex3fv)( const GLfloat * );
    void (GLAPIENTRYP Vertex4f)( GLfloat, GLfloat, GLfloat, GLfloat );
    void (GLAPIENTRYP Vertex4fv)( const GLfloat * );
-   void (GLAPIENTRYP CallList)( GLuint );	/* NOTE */
-   void (GLAPIENTRYP CallLists)( GLsizei, GLenum, const GLvoid * );	/* NOTE */
+   void (GLAPIENTRYP CallList)( GLuint );
+   void (GLAPIENTRYP CallLists)( GLsizei, GLenum, const GLvoid * );
    void (GLAPIENTRYP Begin)( GLenum );
    void (GLAPIENTRYP End)( void );
    /* GL_NV_vertex_program */
@@ -1141,7 +1104,7 @@ typedef struct {
    void (GLAPIENTRYP VertexAttrib3fvNV)( GLuint index, const GLfloat *v );
    void (GLAPIENTRYP VertexAttrib4fNV)( GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w );
    void (GLAPIENTRYP VertexAttrib4fvNV)( GLuint index, const GLfloat *v );
-#if FEATURE_ARB_vertex_program
+   /* GL_ARB_vertex_program */
    void (GLAPIENTRYP VertexAttrib1fARB)( GLuint index, GLfloat x );
    void (GLAPIENTRYP VertexAttrib1fvARB)( GLuint index, const GLfloat *v );
    void (GLAPIENTRYP VertexAttrib2fARB)( GLuint index, GLfloat x, GLfloat y );
@@ -1150,11 +1113,8 @@ typedef struct {
    void (GLAPIENTRYP VertexAttrib3fvARB)( GLuint index, const GLfloat *v );
    void (GLAPIENTRYP VertexAttrib4fARB)( GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w );
    void (GLAPIENTRYP VertexAttrib4fvARB)( GLuint index, const GLfloat *v );
-#endif
    /*@}*/
 
-   /*
-    */
    void (GLAPIENTRYP Rectf)( GLfloat, GLfloat, GLfloat, GLfloat );
 
    /**
@@ -1186,6 +1146,11 @@ typedef struct {
 						   const GLvoid **indices,
 						   GLsizei primcount,
 						   const GLint *basevertex);
+   void (GLAPIENTRYP DrawArraysInstanced)(GLenum mode, GLint first,
+                                          GLsizei count, GLsizei primcount);
+   void (GLAPIENTRYP DrawElementsInstanced)(GLenum mode, GLsizei count,
+                                            GLenum type, const GLvoid *indices,
+                                            GLsizei primcount);
    /*@}*/
 
    /**
diff --git a/mesalib/src/mesa/main/debug.c b/mesalib/src/mesa/main/debug.c
index 33b35e03c..526145aec 100644
--- a/mesalib/src/mesa/main/debug.c
+++ b/mesalib/src/mesa/main/debug.c
@@ -85,7 +85,7 @@ void
 _mesa_print_state( const char *msg, GLuint state )
 {
    _mesa_debug(NULL,
-	   "%s: (0x%x) %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
+	   "%s: (0x%x) %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
 	   msg,
 	   state,
 	   (state & _NEW_MODELVIEW)       ? "ctx->ModelView, " : "",
@@ -105,6 +105,7 @@ _mesa_print_state( const char *msg, GLuint state )
 	   (state & _NEW_POLYGON)         ? "ctx->Polygon, " : "",
 	   (state & _NEW_POLYGONSTIPPLE)  ? "ctx->PolygonStipple, " : "",
 	   (state & _NEW_SCISSOR)         ? "ctx->Scissor, " : "",
+	   (state & _NEW_STENCIL)         ? "ctx->Stencil, " : "",
 	   (state & _NEW_TEXTURE)         ? "ctx->Texture, " : "",
 	   (state & _NEW_TRANSFORM)       ? "ctx->Transform, " : "",
 	   (state & _NEW_VIEWPORT)        ? "ctx->Viewport, " : "",
@@ -314,7 +315,7 @@ write_texture_image(struct gl_texture_object *texObj,
                               buffer, texObj, img);
 
       /* make filename */
-      sprintf(s, "/tmp/tex%u.l%u.f%u.ppm", texObj->Name, level, face);
+      _mesa_snprintf(s, sizeof(s), "/tmp/tex%u.l%u.f%u.ppm", texObj->Name, level, face);
 
       printf("  Writing image level %u to %s\n", level, s);
       write_ppm(s, buffer, img->Width, img->Height, 4, 0, 1, 2, GL_FALSE);
@@ -356,7 +357,7 @@ write_renderbuffer_image(const struct gl_renderbuffer *rb)
                           format, type, &ctx->DefaultPacking, buffer);
 
    /* make filename */
-   sprintf(s, "/tmp/renderbuffer%u.ppm", rb->Name);
+   _mesa_snprintf(s, sizeof(s), "/tmp/renderbuffer%u.ppm", rb->Name);
 
    printf("  Writing renderbuffer image to %s\n", s);
    write_ppm(s, buffer, rb->Width, rb->Height, 4, 0, 1, 2, GL_TRUE);
diff --git a/mesalib/src/mesa/main/debug.h b/mesalib/src/mesa/main/debug.h
index 0449cb179..b517cc825 100644
--- a/mesalib/src/mesa/main/debug.h
+++ b/mesalib/src/mesa/main/debug.h
@@ -36,6 +36,9 @@
 #ifndef _DEBUG_H
 #define _DEBUG_H
 
+#include "glheader.h"
+#include "mtypes.h"
+
 #if _HAVE_FULL_GL
 
 extern void _mesa_print_tri_caps( const char *name, GLuint flags );
diff --git a/mesalib/src/mesa/main/depthstencil.c b/mesalib/src/mesa/main/depthstencil.c
index 892520b69..dbaa84164 100644
--- a/mesalib/src/mesa/main/depthstencil.c
+++ b/mesalib/src/mesa/main/depthstencil.c
@@ -62,8 +62,8 @@ nop_get_pointer(GLcontext *ctx, struct gl_renderbuffer *rb, GLint x, GLint y)
 static void
 delete_wrapper(struct gl_renderbuffer *rb)
 {
-   ASSERT(rb->Format == MESA_FORMAT_Z24_S8 ||
-          rb->Format == MESA_FORMAT_S8_Z24);
+   ASSERT(rb->Format == MESA_FORMAT_S8 ||
+          rb->Format == MESA_FORMAT_X8_Z24);
    _mesa_reference_renderbuffer(&rb->Wrapped, NULL);
    free(rb);
 }
@@ -83,7 +83,9 @@ alloc_wrapper_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
    (void) internalFormat;
 
    ASSERT(dsrb->Format == MESA_FORMAT_Z24_S8 ||
-          dsrb->Format == MESA_FORMAT_S8_Z24);
+          dsrb->Format == MESA_FORMAT_Z24_X8 ||
+          dsrb->Format == MESA_FORMAT_S8_Z24 ||
+          dsrb->Format == MESA_FORMAT_X8_Z24);
 
    retVal = dsrb->AllocStorage(ctx, dsrb, dsrb->InternalFormat, width, height);
    if (retVal) {
@@ -352,16 +354,21 @@ _mesa_new_z24_renderbuffer_wrapper(GLcontext *ctx,
    struct gl_renderbuffer *z24rb;
 
    ASSERT(dsrb->Format == MESA_FORMAT_Z24_S8 ||
-          dsrb->Format == MESA_FORMAT_S8_Z24);
+          dsrb->Format == MESA_FORMAT_Z24_X8 ||
+          dsrb->Format == MESA_FORMAT_S8_Z24 ||
+          dsrb->Format == MESA_FORMAT_X8_Z24);
    ASSERT(dsrb->DataType == GL_UNSIGNED_INT_24_8_EXT);
 
-   z24rb = _mesa_new_renderbuffer(ctx, 0);
+   z24rb = ctx->Driver.NewRenderbuffer(ctx, 0);
    if (!z24rb)
       return NULL;
 
+   /* NOTE: need to do manual refcounting here */
    z24rb->Wrapped = dsrb;
+   dsrb->RefCount++;
+
    z24rb->Name = dsrb->Name;
-   z24rb->RefCount = 1;
+   z24rb->RefCount = 0;
    z24rb->Width = dsrb->Width;
    z24rb->Height = dsrb->Height;
    z24rb->InternalFormat = GL_DEPTH_COMPONENT24;
@@ -638,13 +645,16 @@ _mesa_new_s8_renderbuffer_wrapper(GLcontext *ctx, struct gl_renderbuffer *dsrb)
           dsrb->Format == MESA_FORMAT_S8_Z24);
    ASSERT(dsrb->DataType == GL_UNSIGNED_INT_24_8_EXT);
 
-   s8rb = _mesa_new_renderbuffer(ctx, 0);
+   s8rb = ctx->Driver.NewRenderbuffer(ctx, 0);
    if (!s8rb)
       return NULL;
 
+   /* NOTE: need to do manual refcounting here */
    s8rb->Wrapped = dsrb;
+   dsrb->RefCount++;
+
    s8rb->Name = dsrb->Name;
-   s8rb->RefCount = 1;
+   s8rb->RefCount = 0;
    s8rb->Width = dsrb->Width;
    s8rb->Height = dsrb->Height;
    s8rb->InternalFormat = GL_STENCIL_INDEX8_EXT;
diff --git a/mesalib/src/mesa/main/depthstencil.h b/mesalib/src/mesa/main/depthstencil.h
index 3dde081f5..afbac77f0 100644
--- a/mesalib/src/mesa/main/depthstencil.h
+++ b/mesalib/src/mesa/main/depthstencil.h
@@ -26,6 +26,7 @@
 #ifndef DEPTHSTENCIL_H
 #define DEPTHSTENCIL_H
 
+#include "mtypes.h"
 
 extern struct gl_renderbuffer *
 _mesa_new_z24_renderbuffer_wrapper(GLcontext *ctx,
diff --git a/mesalib/src/mesa/main/dlist.c b/mesalib/src/mesa/main/dlist.c
index 43aadb1de..d847d4d5d 100644
--- a/mesalib/src/mesa/main/dlist.c
+++ b/mesalib/src/mesa/main/dlist.c
@@ -32,7 +32,11 @@
 #include "glheader.h"
 #include "imports.h"
 #include "api_arrayelt.h"
+#include "api_exec.h"
 #include "api_loopback.h"
+#if FEATURE_ATI_fragment_shader
+#include "atifragshader.h"
+#endif
 #include "config.h"
 #include "mfeatures.h"
 #if FEATURE_ARB_vertex_buffer_object
@@ -55,13 +59,10 @@
 #include "mtypes.h"
 #include "varray.h"
 #if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
-#include "shader/arbprogram.h"
+#include "arbprogram.h"
 #endif
 #if FEATURE_NV_vertex_program || FEATURE_NV_fragment_program
-#include "shader/nvprogram.h"
-#endif
-#if FEATURE_ATI_fragment_shader
-#include "shader/atifragshader.h"
+#include "nvprogram.h"
 #endif
 
 #include "math/m_matrix.h"
@@ -370,6 +371,16 @@ typedef enum
    OPCODE_UNIFORM_MATRIX34,
    OPCODE_UNIFORM_MATRIX43,
 
+   /* OpenGL 3.0 */
+   OPCODE_UNIFORM_1UI,
+   OPCODE_UNIFORM_2UI,
+   OPCODE_UNIFORM_3UI,
+   OPCODE_UNIFORM_4UI,
+   OPCODE_UNIFORM_1UIV,
+   OPCODE_UNIFORM_2UIV,
+   OPCODE_UNIFORM_3UIV,
+   OPCODE_UNIFORM_4UIV,
+
    /* GL_EXT_framebuffer_blit */
    OPCODE_BLIT_FRAMEBUFFER,
 
@@ -396,6 +407,10 @@ typedef enum
    /* GL_EXT_provoking_vertex */
    OPCODE_PROVOKING_VERTEX,
 
+   /* GL_EXT_transform_feedback */
+   OPCODE_BEGIN_TRANSFORM_FEEDBACK,
+   OPCODE_END_TRANSFORM_FEEDBACK,
+
    /* The following three are meta instructions */
    OPCODE_ERROR,                /* raise compiled-in error */
    OPCODE_CONTINUE,
@@ -670,6 +685,10 @@ _mesa_delete_list(GLcontext *ctx, struct gl_display_list *dlist)
          case OPCODE_UNIFORM_2IV:
          case OPCODE_UNIFORM_3IV:
          case OPCODE_UNIFORM_4IV:
+         case OPCODE_UNIFORM_1UIV:
+         case OPCODE_UNIFORM_2UIV:
+         case OPCODE_UNIFORM_3UIV:
+         case OPCODE_UNIFORM_4UIV:
             free(n[3].data);
             n += InstSize[n[0].opcode];
             break;
@@ -6051,8 +6070,15 @@ exec_GetAttribLocationARB(GLuint program, const GLchar *name)
    FLUSH_VERTICES(ctx, 0);
    return CALL_GetAttribLocationARB(ctx->Exec, (program, name));
 }
-/* XXX more shader functions needed here */
 
+static GLint GLAPIENTRY
+exec_GetUniformLocationARB(GLuint program, const GLchar *name)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   return CALL_GetUniformLocationARB(ctx->Exec, (program, name));
+}
+/* XXX more shader functions needed here */
 
 
 #if FEATURE_EXT_framebuffer_blit
@@ -6104,6 +6130,36 @@ save_ProvokingVertexEXT(GLenum mode)
 }
 
 
+/** GL_EXT_transform_feedback */
+static void GLAPIENTRY
+save_BeginTransformFeedback(GLenum mode)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = alloc_instruction(ctx, OPCODE_BEGIN_TRANSFORM_FEEDBACK, 1);
+   if (n) {
+      n[1].e = mode;
+   }
+   if (ctx->ExecuteFlag) {
+      CALL_BeginTransformFeedbackEXT(ctx->Exec, (mode));
+   }
+}
+
+
+/** GL_EXT_transform_feedback */
+static void GLAPIENTRY
+save_EndTransformFeedback(void)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   (void) alloc_instruction(ctx, OPCODE_END_TRANSFORM_FEEDBACK, 0);
+   if (ctx->ExecuteFlag) {
+      CALL_EndTransformFeedbackEXT(ctx->Exec, ());
+   }
+}
+
+
 /* aka UseProgram() */
 static void GLAPIENTRY
 save_UseProgramObjectARB(GLhandleARB program)
@@ -6416,6 +6472,149 @@ save_Uniform4ivARB(GLint location, GLsizei count, const GLint *v)
 }
 
 
+
+static void GLAPIENTRY
+save_Uniform1ui(GLint location, GLuint x)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = alloc_instruction(ctx, OPCODE_UNIFORM_1UI, 2);
+   if (n) {
+      n[1].i = location;
+      n[2].i = x;
+   }
+   if (ctx->ExecuteFlag) {
+      /*CALL_Uniform1ui(ctx->Exec, (location, x));*/
+   }
+}
+
+static void GLAPIENTRY
+save_Uniform2ui(GLint location, GLuint x, GLuint y)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = alloc_instruction(ctx, OPCODE_UNIFORM_2UI, 3);
+   if (n) {
+      n[1].i = location;
+      n[2].i = x;
+      n[3].i = y;
+   }
+   if (ctx->ExecuteFlag) {
+      /*CALL_Uniform2ui(ctx->Exec, (location, x, y));*/
+   }
+}
+
+static void GLAPIENTRY
+save_Uniform3ui(GLint location, GLuint x, GLuint y, GLuint z)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = alloc_instruction(ctx, OPCODE_UNIFORM_3UI, 4);
+   if (n) {
+      n[1].i = location;
+      n[2].i = x;
+      n[3].i = y;
+      n[4].i = z;
+   }
+   if (ctx->ExecuteFlag) {
+      /*CALL_Uniform3ui(ctx->Exec, (location, x, y, z));*/
+   }
+}
+
+static void GLAPIENTRY
+save_Uniform4ui(GLint location, GLuint x, GLuint y, GLuint z, GLuint w)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = alloc_instruction(ctx, OPCODE_UNIFORM_4UI, 5);
+   if (n) {
+      n[1].i = location;
+      n[2].i = x;
+      n[3].i = y;
+      n[4].i = z;
+      n[5].i = w;
+   }
+   if (ctx->ExecuteFlag) {
+      /*CALL_Uniform4ui(ctx->Exec, (location, x, y, z, w));*/
+   }
+}
+
+
+
+static void GLAPIENTRY
+save_Uniform1uiv(GLint location, GLsizei count, const GLuint *v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = alloc_instruction(ctx, OPCODE_UNIFORM_1UIV, 3);
+   if (n) {
+      n[1].i = location;
+      n[2].i = count;
+      n[3].data = memdup(v, count * 1 * sizeof(*v));
+   }
+   if (ctx->ExecuteFlag) {
+      /*CALL_Uniform1uiv(ctx->Exec, (location, count, v));*/
+   }
+}
+
+static void GLAPIENTRY
+save_Uniform2uiv(GLint location, GLsizei count, const GLuint *v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = alloc_instruction(ctx, OPCODE_UNIFORM_2UIV, 3);
+   if (n) {
+      n[1].i = location;
+      n[2].i = count;
+      n[3].data = memdup(v, count * 2 * sizeof(*v));
+   }
+   if (ctx->ExecuteFlag) {
+      /*CALL_Uniform2uiv(ctx->Exec, (location, count, v));*/
+   }
+}
+
+static void GLAPIENTRY
+save_Uniform3uiv(GLint location, GLsizei count, const GLuint *v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = alloc_instruction(ctx, OPCODE_UNIFORM_3UIV, 3);
+   if (n) {
+      n[1].i = location;
+      n[2].i = count;
+      n[3].data = memdup(v, count * 3 * sizeof(*v));
+   }
+   if (ctx->ExecuteFlag) {
+      /*CALL_Uniform3uiv(ctx->Exec, (location, count, v));*/
+   }
+}
+
+static void GLAPIENTRY
+save_Uniform4uiv(GLint location, GLsizei count, const GLuint *v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = alloc_instruction(ctx, OPCODE_UNIFORM_4UIV, 3);
+   if (n) {
+      n[1].i = location;
+      n[2].i = count;
+      n[3].data = memdup(v, count * 4 * sizeof(*v));
+   }
+   if (ctx->ExecuteFlag) {
+      /*CALL_Uniform4uiv(ctx->Exec, (location, count, v));*/
+   }
+}
+
+
+
 static void GLAPIENTRY
 save_UniformMatrix2fvARB(GLint location, GLsizei count, GLboolean transpose,
                          const GLfloat *m)
@@ -6619,7 +6818,7 @@ _mesa_compile_error(GLcontext *ctx, GLenum error, const char *s)
    if (ctx->CompileFlag)
       save_error(ctx, error, s);
    if (ctx->ExecuteFlag)
-      _mesa_error(ctx, error, s);
+      _mesa_error(ctx, error, "%s", s);
 }
 
 
@@ -6686,7 +6885,7 @@ execute_list(GLcontext *ctx, GLuint list)
       else {
          switch (opcode) {
          case OPCODE_ERROR:
-            _mesa_error(ctx, n[1].e, (const char *) n[2].data);
+            _mesa_error(ctx, n[1].e, "%s", (const char *) n[2].data);
             break;
          case OPCODE_ACCUM:
             CALL_Accum(ctx->Exec, (n[1].e, n[2].f));
@@ -7199,6 +7398,12 @@ execute_list(GLcontext *ctx, GLuint list)
          case OPCODE_PROVOKING_VERTEX:
             CALL_ProvokingVertexEXT(ctx->Exec, (n[1].e));
             break;
+         case OPCODE_BEGIN_TRANSFORM_FEEDBACK:
+            CALL_BeginTransformFeedbackEXT(ctx->Exec, (n[1].e));
+            break;
+         case OPCODE_END_TRANSFORM_FEEDBACK:
+            CALL_EndTransformFeedbackEXT(ctx->Exec, ());
+            break;
          case OPCODE_STENCIL_FUNC:
             CALL_StencilFunc(ctx->Exec, (n[1].e, n[2].i, n[3].ui));
             break;
@@ -7521,7 +7726,32 @@ execute_list(GLcontext *ctx, GLuint list)
 	 case OPCODE_UNIFORM_4IV:
 	    CALL_Uniform4ivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));
 	    break;
-
+	 case OPCODE_UNIFORM_1UI:
+	    /*CALL_Uniform1uiARB(ctx->Exec, (n[1].i, n[2].i));*/
+	    break;
+	 case OPCODE_UNIFORM_2UI:
+	    /*CALL_Uniform2uiARB(ctx->Exec, (n[1].i, n[2].i, n[3].i));*/
+	    break;
+	 case OPCODE_UNIFORM_3UI:
+	    /*CALL_Uniform3uiARB(ctx->Exec, (n[1].i, n[2].i, n[3].i, n[4].i));*/
+	    break;
+	 case OPCODE_UNIFORM_4UI:
+	    /*CALL_Uniform4uiARB(ctx->Exec,
+                              (n[1].i, n[2].i, n[3].i, n[4].i, n[5].i));
+            */
+	    break;
+	 case OPCODE_UNIFORM_1UIV:
+	    /*CALL_Uniform1uivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));*/
+	    break;
+	 case OPCODE_UNIFORM_2UIV:
+	    /*CALL_Uniform2uivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));*/
+	    break;
+	 case OPCODE_UNIFORM_3UIV:
+	    /*CALL_Uniform3uivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));*/
+	    break;
+	 case OPCODE_UNIFORM_4UIV:
+	    /*CALL_Uniform4uivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));*/
+	    break;
 	 case OPCODE_UNIFORM_MATRIX22:
 	    CALL_UniformMatrix2fvARB(ctx->Exec,
                                      (n[1].i, n[2].i, n[3].b, n[4].data));
@@ -7685,9 +7915,9 @@ execute_list(GLcontext *ctx, GLuint list)
          default:
             {
                char msg[1000];
-               sprintf(msg, "Error in execute_list: opcode=%d",
+               _mesa_snprintf(msg, sizeof(msg), "Error in execute_list: opcode=%d",
                              (int) opcode);
-               _mesa_problem(ctx, msg);
+               _mesa_problem(ctx, "%s", msg);
             }
             done = GL_TRUE;
          }
@@ -8662,8 +8892,8 @@ exec_FogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid *ptr)
 
 /* GL_EXT_multi_draw_arrays */
 static void GLAPIENTRY
-exec_MultiDrawArraysEXT(GLenum mode, GLint * first,
-                        GLsizei * count, GLsizei primcount)
+exec_MultiDrawArraysEXT(GLenum mode, const GLint *first,
+                        const GLsizei *count, GLsizei primcount)
 {
    GET_CURRENT_CONTEXT(ctx);
    FLUSH_VERTICES(ctx, 0);
@@ -8707,9 +8937,15 @@ exec_MultiModeDrawElementsIBM(const GLenum * mode,
  * initialized from _mesa_init_api_defaults and from the active vtxfmt
  * struct.
  */
-void
-_mesa_init_save_table(struct _glapi_table *table)
+struct _glapi_table *
+_mesa_create_save_table(void)
 {
+   struct _glapi_table *table;
+
+   table = _mesa_alloc_dispatch_table(sizeof *table);
+   if (table == NULL)
+      return NULL;
+
    _mesa_loopback_init_api_table(table);
 
    /* GL 1.0 */
@@ -9262,12 +9498,13 @@ _mesa_init_save_table(struct _glapi_table *table)
    /* ARB 30/31/32. GL_ARB_shader_objects, GL_ARB_vertex/fragment_shader */
    SET_BindAttribLocationARB(table, exec_BindAttribLocationARB);
    SET_GetAttribLocationARB(table, exec_GetAttribLocationARB);
+   SET_GetUniformLocationARB(table, exec_GetUniformLocationARB);
    /* XXX additional functions need to be implemented here! */
 
    /* 299. GL_EXT_blend_equation_separate */
    SET_BlendEquationSeparateEXT(table, save_BlendEquationSeparateEXT);
 
-   /* GL_EXT_gpu_program_parmaeters */
+   /* GL_EXT_gpu_program_parameters */
 #if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
    SET_ProgramEnvParameters4fvEXT(table, save_ProgramEnvParameters4fvEXT);
    SET_ProgramLocalParameters4fvEXT(table, save_ProgramLocalParameters4fvEXT);
@@ -9282,6 +9519,12 @@ _mesa_init_save_table(struct _glapi_table *table)
    /* ARB 59. GL_ARB_copy_buffer */
    SET_CopyBufferSubData(table, _mesa_CopyBufferSubData); /* no dlist save */
 
+   /* 352. GL_EXT_transform_feedback */
+#if FEATURE_EXT_transform_feedback
+   SET_BeginTransformFeedbackEXT(table, save_BeginTransformFeedback);
+   SET_EndTransformFeedbackEXT(table, save_EndTransformFeedback);
+#endif
+
    /* 364. GL_EXT_provoking_vertex */
    SET_ProvokingVertexEXT(table, save_ProvokingVertexEXT);
 
@@ -9297,12 +9540,30 @@ _mesa_init_save_table(struct _glapi_table *table)
    SET_ClearBufferuiv(table, save_ClearBufferuiv);
    SET_ClearBufferfv(table, save_ClearBufferfv);
    SET_ClearBufferfi(table, save_ClearBufferfi);
+   SET_Uniform1ui(table, save_Uniform1ui);
+   SET_Uniform2ui(table, save_Uniform2ui);
+   SET_Uniform3ui(table, save_Uniform3ui);
+   SET_Uniform4ui(table, save_Uniform4ui);
+   SET_Uniform1uiv(table, save_Uniform1uiv);
+   SET_Uniform2uiv(table, save_Uniform2uiv);
+   SET_Uniform3uiv(table, save_Uniform3uiv);
+   SET_Uniform4uiv(table, save_Uniform4uiv);
 #else
    (void) save_ClearBufferiv;
    (void) save_ClearBufferuiv;
    (void) save_ClearBufferfv;
    (void) save_ClearBufferfi;
+   (void) save_Uniform1ui;
+   (void) save_Uniform2ui;
+   (void) save_Uniform3ui;
+   (void) save_Uniform4ui;
+   (void) save_Uniform1uiv;
+   (void) save_Uniform2uiv;
+   (void) save_Uniform3uiv;
+   (void) save_Uniform4uiv;
 #endif
+
+   return table;
 }
 
 
diff --git a/mesalib/src/mesa/main/dlist.h b/mesalib/src/mesa/main/dlist.h
index f37a93a7f..86bb132e5 100644
--- a/mesalib/src/mesa/main/dlist.h
+++ b/mesalib/src/mesa/main/dlist.h
@@ -38,16 +38,6 @@
 
 #if FEATURE_dlist
 
-#define _MESA_INIT_DLIST_FUNCTIONS(driver, impl)               \
-   do {                                                        \
-      (driver)->NewList           = impl ## NewList;           \
-      (driver)->EndList           = impl ## EndList;           \
-      (driver)->BeginCallList     = impl ## BeginCallList;     \
-      (driver)->EndCallList       = impl ## EndCallList;       \
-      (driver)->SaveFlushVertices = impl ## SaveFlushVertices; \
-      (driver)->NotifySaveBegin   = impl ## NotifyBegin;       \
-   } while (0)
-
 #define _MESA_INIT_DLIST_VTXFMT(vfmt, impl)  \
    do {                                      \
       (vfmt)->CallList  = impl ## CallList;  \
@@ -72,7 +62,7 @@ extern void _mesa_delete_list(GLcontext *ctx, struct gl_display_list *dlist);
 
 extern void _mesa_save_vtxfmt_init( GLvertexformat *vfmt );
 
-extern void _mesa_init_save_table( struct _glapi_table *table );
+extern struct _glapi_table *_mesa_create_save_table(void);
 
 extern void _mesa_install_dlist_vtxfmt(struct _glapi_table *disp,
                                        const GLvertexformat *vfmt);
@@ -81,7 +71,8 @@ extern void _mesa_init_dlist_dispatch(struct _glapi_table *disp);
 
 #else /* FEATURE_dlist */
 
-#define _MESA_INIT_DLIST_FUNCTIONS(driver, impl) do { } while (0)
+#include "main/compiler.h"
+
 #define _MESA_INIT_DLIST_VTXFMT(vfmt, impl) do { } while (0)
 
 static INLINE void
diff --git a/mesalib/src/mesa/main/dlopen.c b/mesalib/src/mesa/main/dlopen.c
index 658ac9e40..57a33292e 100644
--- a/mesalib/src/mesa/main/dlopen.c
+++ b/mesalib/src/mesa/main/dlopen.c
@@ -67,22 +67,27 @@ _mesa_dlopen(const char *libname, int flags)
 GenericFunc
 _mesa_dlsym(void *handle, const char *fname)
 {
+   union {
+      void *v;
+      GenericFunc f;
+   } u;
 #if defined(__blrts)
-   return (GenericFunc) NULL;
+   u.v = NULL;
 #elif defined(__DJGPP__)
    /* need '_' prefix on symbol names */
    char fname2[1000];
    fname2[0] = '_';
    strncpy(fname2 + 1, fname, 998);
    fname2[999] = 0;
-   return (GenericFunc) dlsym(handle, fname2);
+   u.v = dlsym(handle, fname2);
 #elif defined(_GNU_SOURCE)
-   return (GenericFunc) dlsym(handle, fname);
+   u.v = dlsym(handle, fname);
 #elif defined(__MINGW32__)
-   return (GenericFunc) GetProcAddress(handle, fname);
+   u.v = (void *) GetProcAddress(handle, fname);
 #else
-   return (GenericFunc) NULL;
+   u.v = NULL;
 #endif
+   return u.f;
 }
 
 
diff --git a/mesalib/src/mesa/main/drawpix.h b/mesalib/src/mesa/main/drawpix.h
index 8ffb1a6d8..1f95ff529 100644
--- a/mesalib/src/mesa/main/drawpix.h
+++ b/mesalib/src/mesa/main/drawpix.h
@@ -31,20 +31,11 @@
 
 #if FEATURE_drawpix
 
-#define _MESA_INIT_DRAWPIX_FUNCTIONS(driver, impl) \
-   do {                                            \
-      (driver)->DrawPixels = impl ## DrawPixels;   \
-      (driver)->CopyPixels = impl ## CopyPixels;   \
-      (driver)->Bitmap     = impl ## Bitmap;       \
-   } while (0)
-
 extern void
 _mesa_init_drawpix_dispatch(struct _glapi_table *disp);
 
 #else /* FEATURE_drawpix */
 
-#define _MESA_INIT_DRAWPIX_FUNCTIONS(driver, impl) do { } while (0)
-
 static INLINE void
 _mesa_init_drawpix_dispatch(struct _glapi_table *disp)
 {
diff --git a/mesalib/src/mesa/main/drawtex.c b/mesalib/src/mesa/main/drawtex.c
new file mode 100644
index 000000000..c2ad5f238
--- /dev/null
+++ b/mesalib/src/mesa/main/drawtex.c
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2009 Chia-I Wu <olv@0xlab.org>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (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/drawtex.h"
+#include "main/state.h"
+#include "main/imports.h"
+
+
+#if FEATURE_OES_draw_texture
+
+
+static void
+draw_texture(GLcontext *ctx, GLfloat x, GLfloat y, GLfloat z,
+             GLfloat width, GLfloat height)
+{
+   if (!ctx->Extensions.OES_draw_texture) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glDrawTex(unsupported)");
+      return;
+   }
+   if (width <= 0.0f || height <= 0.0f) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glDrawTex(width or height <= 0)");
+      return;
+   }
+
+   if (ctx->NewState)
+      _mesa_update_state(ctx);
+
+   ASSERT(ctx->Driver.DrawTex);
+   ctx->Driver.DrawTex(ctx, x, y, z, width, height);
+}
+
+
+void GLAPIENTRY
+_mesa_DrawTexf(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   draw_texture(ctx, x, y, z, width, height);
+}
+
+
+void GLAPIENTRY
+_mesa_DrawTexfv(const GLfloat *coords)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   draw_texture(ctx, coords[0], coords[1], coords[2], coords[3], coords[4]);
+}
+
+
+void GLAPIENTRY
+_mesa_DrawTexi(GLint x, GLint y, GLint z, GLint width, GLint height)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   draw_texture(ctx, (GLfloat) x, (GLfloat) y, (GLfloat) z,
+                (GLfloat) width, (GLfloat) height);
+}
+
+
+void GLAPIENTRY
+_mesa_DrawTexiv(const GLint *coords)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   draw_texture(ctx, (GLfloat) coords[0], (GLfloat) coords[1],
+                (GLfloat) coords[2], (GLfloat) coords[3], (GLfloat) coords[4]);
+}
+
+
+void GLAPIENTRY
+_mesa_DrawTexs(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   draw_texture(ctx, (GLfloat) x, (GLfloat) y, (GLfloat) z,
+                (GLfloat) width, (GLfloat) height);
+}
+
+
+void GLAPIENTRY
+_mesa_DrawTexsv(const GLshort *coords)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   draw_texture(ctx, (GLfloat) coords[0], (GLfloat) coords[1],
+                (GLfloat) coords[2], (GLfloat) coords[3], (GLfloat) coords[4]);
+}
+
+
+void GLAPIENTRY
+_mesa_DrawTexx(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   draw_texture(ctx,
+                (GLfloat) x / 65536.0f,
+                (GLfloat) y / 65536.0f,
+                (GLfloat) z / 65536.0f,
+                (GLfloat) width / 65536.0f,
+                (GLfloat) height / 65536.0f);
+}
+
+
+void GLAPIENTRY
+_mesa_DrawTexxv(const GLfixed *coords)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   draw_texture(ctx,
+                (GLfloat) coords[0] / 65536.0f,
+                (GLfloat) coords[1] / 65536.0f,
+                (GLfloat) coords[2] / 65536.0f,
+                (GLfloat) coords[3] / 65536.0f,
+                (GLfloat) coords[4] / 65536.0f);
+}
+
+#endif /* FEATURE_OES_draw_texture */
diff --git a/mesalib/src/mesa/shader/prog_parameter_layout.h b/mesalib/src/mesa/main/drawtex.h
index 99a7b6c72..d7d507566 100644
--- a/mesalib/src/mesa/shader/prog_parameter_layout.h
+++ b/mesalib/src/mesa/main/drawtex.h
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2009 Intel Corporation
+ * Copyright (C) 2009 Chia-I Wu <olv@0xlab.org>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -21,22 +21,40 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-/**
- * \file prog_parameter_layout.h
- * \brief Helper functions to layout storage for program parameters
- *
- * \author Ian Romanick <ian.d.romanick@intel.com>
- */
+#ifndef DRAWTEX_H
+#define DRAWTEX_H
+
+
+#include "main/mtypes.h"
+
+
+#if FEATURE_OES_draw_texture
+
+extern void GLAPIENTRY
+_mesa_DrawTexf(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
+
+extern void GLAPIENTRY
+_mesa_DrawTexfv(const GLfloat *coords);
+
+extern void GLAPIENTRY
+_mesa_DrawTexi(GLint x, GLint y, GLint z, GLint width, GLint height);
+
+extern void GLAPIENTRY
+_mesa_DrawTexiv(const GLint *coords);
+
+extern void GLAPIENTRY
+_mesa_DrawTexs(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);
 
-#pragma once
+extern void GLAPIENTRY
+_mesa_DrawTexsv(const GLshort *coords);
 
-#ifndef PROG_PARAMETER_LAYOUT_H
-#define PROG_PARAMETER_LAYOUT_H
+extern void GLAPIENTRY
+_mesa_DrawTexx(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height);
 
-extern unsigned _mesa_combine_swizzles(unsigned base, unsigned applied);
+extern void GLAPIENTRY
+_mesa_DrawTexxv(const GLfixed *coords);
 
-struct asm_parser_state;
+#endif /* FEATURE_OES_draw_texture */
 
-extern GLboolean _mesa_layout_parameters(struct asm_parser_state *state);
 
-#endif /* PROG_PARAMETER_LAYOUT_H */
+#endif /* DRAWTEX_H */
diff --git a/mesalib/src/mesa/main/enable.c b/mesalib/src/mesa/main/enable.c
index f5c88a63e..db30123c0 100644
--- a/mesalib/src/mesa/main/enable.c
+++ b/mesalib/src/mesa/main/enable.c
@@ -42,9 +42,7 @@
 
 #define CHECK_EXTENSION(EXTNAME, CAP)					\
    if (!ctx->Extensions.EXTNAME) {					\
-      _mesa_error(ctx, GL_INVALID_ENUM, "gl%sClientState(0x%x)",	\
-                  state ? "Enable" : "Disable", CAP);			\
-      return;								\
+      goto invalid_enum_error;						\
    }
 
 
@@ -127,9 +125,7 @@ client_state(GLcontext *ctx, GLenum cap, GLboolean state)
 #endif /* FEATURE_NV_vertex_program */
 
       default:
-         _mesa_error( ctx, GL_INVALID_ENUM,
-                      "glEnable/DisableClientState(0x%x)", cap);
-         return;
+         goto invalid_enum_error;
    }
 
    if (*var == state)
@@ -150,6 +146,12 @@ client_state(GLcontext *ctx, GLenum cap, GLboolean state)
    if (ctx->Driver.Enable) {
       ctx->Driver.Enable( ctx, cap, state );
    }
+
+   return;
+
+invalid_enum_error:
+   _mesa_error(ctx, GL_INVALID_ENUM, "gl%sClientState(0x%x)",
+               state ? "Enable" : "Disable", cap);
 }
 
 
@@ -188,16 +190,12 @@ _mesa_DisableClientState( GLenum cap )
 #undef CHECK_EXTENSION
 #define CHECK_EXTENSION(EXTNAME, CAP)					\
    if (!ctx->Extensions.EXTNAME) {					\
-      _mesa_error(ctx, GL_INVALID_ENUM, "gl%s(0x%x)",			\
-                  state ? "Enable" : "Disable", CAP);			\
-      return;								\
+      goto invalid_enum_error;						\
    }
 
 #define CHECK_EXTENSION2(EXT1, EXT2, CAP)				\
    if (!ctx->Extensions.EXT1 && !ctx->Extensions.EXT2) {		\
-      _mesa_error(ctx, GL_INVALID_ENUM, "gl%s(0x%x)",			\
-                  state ? "Enable" : "Disable", CAP);			\
-      return;								\
+      goto invalid_enum_error;						\
    }
 
 
@@ -684,6 +682,25 @@ _mesa_set_enable(GLcontext *ctx, GLenum cap, GLboolean state)
          }
          break;
 
+#if FEATURE_ES1
+      case GL_TEXTURE_GEN_STR_OES:
+	 /* disable S, T, and R at the same time */
+	 {
+            struct gl_texture_unit *texUnit = get_texcoord_unit(ctx);
+            if (texUnit) {
+               GLuint newenabled =
+		  texUnit->TexGenEnabled & ~STR_BITS;
+               if (state)
+                  newenabled |= STR_BITS;
+               if (texUnit->TexGenEnabled == newenabled)
+                  return;
+               FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+               texUnit->TexGenEnabled = newenabled;
+            }
+         }
+         break;
+#endif
+
       /*
        * CLIENT STATE!!!
        */
@@ -982,15 +999,40 @@ _mesa_set_enable(GLcontext *ctx, GLenum cap, GLboolean state)
 	 ctx->Texture.CubeMapSeamless = state;
 	 break;
 
+#if FEATURE_EXT_transform_feedback
+      case GL_RASTERIZER_DISCARD:
+	 CHECK_EXTENSION(EXT_transform_feedback, cap);
+         if (ctx->TransformFeedback.RasterDiscard != state) {
+            ctx->TransformFeedback.RasterDiscard = state;
+            FLUSH_VERTICES(ctx, _NEW_TRANSFORM);
+         }
+         break;
+#endif
+
+      /* GL 3.1 primitive restart */
+      case GL_PRIMITIVE_RESTART:
+	 if (ctx->VersionMajor * 10 + ctx->VersionMinor < 31) {
+            goto invalid_enum_error;
+         }
+         if (ctx->Array.PrimitiveRestart != state) {
+            FLUSH_VERTICES(ctx, _NEW_TRANSFORM);
+            ctx->Array.PrimitiveRestart = state;
+         }
+         break;
+
       default:
-         _mesa_error(ctx, GL_INVALID_ENUM,
-                     "%s(0x%x)", state ? "glEnable" : "glDisable", cap);
-         return;
+         goto invalid_enum_error;
    }
 
    if (ctx->Driver.Enable) {
       ctx->Driver.Enable( ctx, cap, state );
    }
+
+   return;
+
+invalid_enum_error:
+   _mesa_error(ctx, GL_INVALID_ENUM, "gl%s(0x%x)",
+               state ? "Enable" : "Disable", cap);
 }
 
 
@@ -1033,7 +1075,7 @@ _mesa_set_enablei(GLcontext *ctx, GLenum cap, GLuint index, GLboolean state)
    switch (cap) {
    case GL_BLEND:
       if (!ctx->Extensions.EXT_draw_buffers2) {
-         goto bad_cap_error;
+         goto invalid_enum_error;
       }
       if (index >= ctx->Const.MaxDrawBuffers) {
          _mesa_error(ctx, GL_INVALID_VALUE, "%s(index=%u)",
@@ -1049,11 +1091,11 @@ _mesa_set_enablei(GLcontext *ctx, GLenum cap, GLuint index, GLboolean state)
       }
       break;
    default:
-      goto bad_cap_error;
+      goto invalid_enum_error;
    }
    return;
 
-bad_cap_error:
+invalid_enum_error:
     _mesa_error(ctx, GL_INVALID_ENUM, "%s(cap=%s)",
                 state ? "glEnablei" : "glDisablei",
                 _mesa_lookup_enum_by_nr(cap));
@@ -1103,15 +1145,13 @@ _mesa_IsEnabledIndexed( GLenum cap, GLuint index )
 #undef CHECK_EXTENSION
 #define CHECK_EXTENSION(EXTNAME)			\
    if (!ctx->Extensions.EXTNAME) {			\
-      _mesa_error(ctx, GL_INVALID_ENUM, "glIsEnabled");	\
-      return GL_FALSE;					\
+      goto invalid_enum_error;				\
    }
 
 #undef CHECK_EXTENSION2
 #define CHECK_EXTENSION2(EXT1, EXT2)				\
    if (!ctx->Extensions.EXT1 && !ctx->Extensions.EXT2) {	\
-      _mesa_error(ctx, GL_INVALID_ENUM, "glIsEnabled");		\
-      return GL_FALSE;						\
+      goto invalid_enum_error;					\
    }
 
 
@@ -1280,6 +1320,15 @@ _mesa_IsEnabled( GLenum cap )
             }
          }
          return GL_FALSE;
+#if FEATURE_ES1
+      case GL_TEXTURE_GEN_STR_OES:
+	 {
+            const struct gl_texture_unit *texUnit = get_texcoord_unit(ctx);
+            if (texUnit) {
+		    return (texUnit->TexGenEnabled & STR_BITS) == STR_BITS ? GL_TRUE : GL_FALSE;
+            }
+         }
+#endif
 
       /*
        * CLIENT STATE!!!
@@ -1493,8 +1542,26 @@ _mesa_IsEnabled( GLenum cap )
 	 CHECK_EXTENSION(ARB_seamless_cube_map);
 	 return ctx->Texture.CubeMapSeamless;
 
+#if FEATURE_EXT_transform_feedback
+      case GL_RASTERIZER_DISCARD:
+	 CHECK_EXTENSION(EXT_transform_feedback);
+         return ctx->TransformFeedback.RasterDiscard;
+#endif
+
+      /* GL 3.1 primitive restart */
+      case GL_PRIMITIVE_RESTART:
+	 if (ctx->VersionMajor * 10 + ctx->VersionMinor < 31) {
+            goto invalid_enum_error;
+         }
+         return ctx->Array.PrimitiveRestart;
+
       default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glIsEnabled(0x%x)", (int) cap);
-	 return GL_FALSE;
+         goto invalid_enum_error;
    }
+
+   return GL_FALSE;
+
+invalid_enum_error:
+   _mesa_error(ctx, GL_INVALID_ENUM, "glIsEnabled(0x%x)", (int) cap);
+   return GL_FALSE;
 }
diff --git a/mesalib/src/mesa/main/enums.c b/mesalib/src/mesa/main/enums.c
index 06d51d4e5..bc18e1b11 100644
--- a/mesalib/src/mesa/main/enums.c
+++ b/mesalib/src/mesa/main/enums.c
@@ -109,6 +109,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_BACK_RIGHT\0"
    "GL_BGR\0"
    "GL_BGRA\0"
+   "GL_BGRA_EXT\0"
    "GL_BITMAP\0"
    "GL_BITMAP_TOKEN\0"
    "GL_BLEND\0"
@@ -116,16 +117,23 @@ LONGSTRING static const char enum_string_table[] =
    "GL_BLEND_COLOR_EXT\0"
    "GL_BLEND_DST\0"
    "GL_BLEND_DST_ALPHA\0"
+   "GL_BLEND_DST_ALPHA_OES\0"
    "GL_BLEND_DST_RGB\0"
+   "GL_BLEND_DST_RGB_OES\0"
    "GL_BLEND_EQUATION\0"
    "GL_BLEND_EQUATION_ALPHA\0"
    "GL_BLEND_EQUATION_ALPHA_EXT\0"
+   "GL_BLEND_EQUATION_ALPHA_OES\0"
    "GL_BLEND_EQUATION_EXT\0"
+   "GL_BLEND_EQUATION_OES\0"
    "GL_BLEND_EQUATION_RGB\0"
    "GL_BLEND_EQUATION_RGB_EXT\0"
+   "GL_BLEND_EQUATION_RGB_OES\0"
    "GL_BLEND_SRC\0"
    "GL_BLEND_SRC_ALPHA\0"
+   "GL_BLEND_SRC_ALPHA_OES\0"
    "GL_BLEND_SRC_RGB\0"
+   "GL_BLEND_SRC_RGB_OES\0"
    "GL_BLUE\0"
    "GL_BLUE_BIAS\0"
    "GL_BLUE_BITS\0"
@@ -140,11 +148,14 @@ LONGSTRING static const char enum_string_table[] =
    "GL_BOOL_VEC4_ARB\0"
    "GL_BUFFER_ACCESS\0"
    "GL_BUFFER_ACCESS_ARB\0"
+   "GL_BUFFER_ACCESS_OES\0"
    "GL_BUFFER_FLUSHING_UNMAP_APPLE\0"
    "GL_BUFFER_MAPPED\0"
    "GL_BUFFER_MAPPED_ARB\0"
+   "GL_BUFFER_MAPPED_OES\0"
    "GL_BUFFER_MAP_POINTER\0"
    "GL_BUFFER_MAP_POINTER_ARB\0"
+   "GL_BUFFER_MAP_POINTER_OES\0"
    "GL_BUFFER_OBJECT_APPLE\0"
    "GL_BUFFER_SERIALIZED_MODIFY_APPLE\0"
    "GL_BUFFER_SIZE\0"
@@ -194,6 +205,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_COLOR_ARRAY_TYPE\0"
    "GL_COLOR_ATTACHMENT0\0"
    "GL_COLOR_ATTACHMENT0_EXT\0"
+   "GL_COLOR_ATTACHMENT0_OES\0"
    "GL_COLOR_ATTACHMENT1\0"
    "GL_COLOR_ATTACHMENT10\0"
    "GL_COLOR_ATTACHMENT10_EXT\0"
@@ -336,6 +348,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_COORD_REPLACE\0"
    "GL_COORD_REPLACE_ARB\0"
    "GL_COORD_REPLACE_NV\0"
+   "GL_COORD_REPLACE_OES\0"
    "GL_COPY\0"
    "GL_COPY_INVERTED\0"
    "GL_COPY_PIXEL_TOKEN\0"
@@ -359,6 +372,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_CURRENT_MATRIX_STACK_DEPTH_NV\0"
    "GL_CURRENT_NORMAL\0"
    "GL_CURRENT_PALETTE_MATRIX_ARB\0"
+   "GL_CURRENT_PALETTE_MATRIX_OES\0"
    "GL_CURRENT_PROGRAM\0"
    "GL_CURRENT_QUERY\0"
    "GL_CURRENT_QUERY_ARB\0"
@@ -386,8 +400,10 @@ LONGSTRING static const char enum_string_table[] =
    "GL_DEPTH\0"
    "GL_DEPTH24_STENCIL8\0"
    "GL_DEPTH24_STENCIL8_EXT\0"
+   "GL_DEPTH24_STENCIL8_OES\0"
    "GL_DEPTH_ATTACHMENT\0"
    "GL_DEPTH_ATTACHMENT_EXT\0"
+   "GL_DEPTH_ATTACHMENT_OES\0"
    "GL_DEPTH_BIAS\0"
    "GL_DEPTH_BITS\0"
    "GL_DEPTH_BOUNDS_EXT\0"
@@ -399,12 +415,15 @@ LONGSTRING static const char enum_string_table[] =
    "GL_DEPTH_COMPONENT\0"
    "GL_DEPTH_COMPONENT16\0"
    "GL_DEPTH_COMPONENT16_ARB\0"
+   "GL_DEPTH_COMPONENT16_OES\0"
    "GL_DEPTH_COMPONENT16_SGIX\0"
    "GL_DEPTH_COMPONENT24\0"
    "GL_DEPTH_COMPONENT24_ARB\0"
+   "GL_DEPTH_COMPONENT24_OES\0"
    "GL_DEPTH_COMPONENT24_SGIX\0"
    "GL_DEPTH_COMPONENT32\0"
    "GL_DEPTH_COMPONENT32_ARB\0"
+   "GL_DEPTH_COMPONENT32_OES\0"
    "GL_DEPTH_COMPONENT32_SGIX\0"
    "GL_DEPTH_FUNC\0"
    "GL_DEPTH_RANGE\0"
@@ -413,6 +432,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_DEPTH_STENCIL_ATTACHMENT\0"
    "GL_DEPTH_STENCIL_EXT\0"
    "GL_DEPTH_STENCIL_NV\0"
+   "GL_DEPTH_STENCIL_OES\0"
    "GL_DEPTH_STENCIL_TO_BGRA_NV\0"
    "GL_DEPTH_STENCIL_TO_RGBA_NV\0"
    "GL_DEPTH_TEST\0"
@@ -525,6 +545,8 @@ LONGSTRING static const char enum_string_table[] =
    "GL_FILL\0"
    "GL_FIRST_VERTEX_CONVENTION\0"
    "GL_FIRST_VERTEX_CONVENTION_EXT\0"
+   "GL_FIXED\0"
+   "GL_FIXED_OES\0"
    "GL_FLAT\0"
    "GL_FLOAT\0"
    "GL_FLOAT_MAT2\0"
@@ -577,6 +599,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_FRAGMENT_SHADER\0"
    "GL_FRAGMENT_SHADER_ARB\0"
    "GL_FRAGMENT_SHADER_DERIVATIVE_HINT\0"
+   "GL_FRAGMENT_SHADER_DERIVATIVE_HINT_OES\0"
    "GL_FRAMEBUFFER\0"
    "GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE\0"
    "GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE\0"
@@ -584,42 +607,61 @@ LONGSTRING static const char enum_string_table[] =
    "GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE\0"
    "GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE\0"
    "GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE\0"
+   "GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB\0"
    "GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME\0"
    "GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT\0"
+   "GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_OES\0"
    "GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE\0"
    "GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT\0"
+   "GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_OES\0"
    "GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE\0"
    "GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE\0"
    "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT\0"
+   "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES\0"
    "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE\0"
    "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT\0"
+   "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_OES\0"
    "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER\0"
    "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT\0"
    "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL\0"
    "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT\0"
+   "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_OES\0"
    "GL_FRAMEBUFFER_BINDING\0"
    "GL_FRAMEBUFFER_BINDING_EXT\0"
+   "GL_FRAMEBUFFER_BINDING_OES\0"
    "GL_FRAMEBUFFER_COMPLETE\0"
    "GL_FRAMEBUFFER_COMPLETE_EXT\0"
+   "GL_FRAMEBUFFER_COMPLETE_OES\0"
    "GL_FRAMEBUFFER_DEFAULT\0"
    "GL_FRAMEBUFFER_EXT\0"
    "GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT\0"
    "GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT\0"
+   "GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_OES\0"
+   "GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS\0"
    "GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT\0"
+   "GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_OES\0"
    "GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER\0"
    "GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT\0"
+   "GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_OES\0"
    "GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT\0"
    "GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT\0"
+   "GL_FRAMEBUFFER_INCOMPLETE_FORMATS_OES\0"
+   "GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB\0"
+   "GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB\0"
    "GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT\0"
    "GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT\0"
+   "GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_OES\0"
    "GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE\0"
    "GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT\0"
    "GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER\0"
    "GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT\0"
+   "GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_OES\0"
+   "GL_FRAMEBUFFER_OES\0"
    "GL_FRAMEBUFFER_STATUS_ERROR_EXT\0"
    "GL_FRAMEBUFFER_UNDEFINED\0"
    "GL_FRAMEBUFFER_UNSUPPORTED\0"
    "GL_FRAMEBUFFER_UNSUPPORTED_EXT\0"
+   "GL_FRAMEBUFFER_UNSUPPORTED_OES\0"
    "GL_FRONT\0"
    "GL_FRONT_AND_BACK\0"
    "GL_FRONT_FACE\0"
@@ -627,14 +669,21 @@ LONGSTRING static const char enum_string_table[] =
    "GL_FRONT_RIGHT\0"
    "GL_FUNC_ADD\0"
    "GL_FUNC_ADD_EXT\0"
+   "GL_FUNC_ADD_OES\0"
    "GL_FUNC_REVERSE_SUBTRACT\0"
    "GL_FUNC_REVERSE_SUBTRACT_EXT\0"
+   "GL_FUNC_REVERSE_SUBTRACT_OES\0"
    "GL_FUNC_SUBTRACT\0"
    "GL_FUNC_SUBTRACT_EXT\0"
+   "GL_FUNC_SUBTRACT_OES\0"
    "GL_GENERATE_MIPMAP\0"
    "GL_GENERATE_MIPMAP_HINT\0"
    "GL_GENERATE_MIPMAP_HINT_SGIS\0"
    "GL_GENERATE_MIPMAP_SGIS\0"
+   "GL_GEOMETRY_INPUT_TYPE_ARB\0"
+   "GL_GEOMETRY_OUTPUT_TYPE_ARB\0"
+   "GL_GEOMETRY_SHADER_ARB\0"
+   "GL_GEOMETRY_VERTICES_OUT_ARB\0"
    "GL_GEQUAL\0"
    "GL_GREATER\0"
    "GL_GREEN\0"
@@ -642,6 +691,9 @@ LONGSTRING static const char enum_string_table[] =
    "GL_GREEN_BITS\0"
    "GL_GREEN_SCALE\0"
    "GL_HALF_FLOAT\0"
+   "GL_HALF_FLOAT_OES\0"
+   "GL_HIGH_FLOAT\0"
+   "GL_HIGH_INT\0"
    "GL_HINT_BIT\0"
    "GL_HISTOGRAM\0"
    "GL_HISTOGRAM_ALPHA_SIZE\0"
@@ -663,7 +715,9 @@ LONGSTRING static const char enum_string_table[] =
    "GL_HISTOGRAM_WIDTH_EXT\0"
    "GL_IDENTITY_NV\0"
    "GL_IGNORE_BORDER_HP\0"
+   "GL_IMPLEMENTATION_COLOR_READ_FORMAT\0"
    "GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES\0"
+   "GL_IMPLEMENTATION_COLOR_READ_TYPE\0"
    "GL_IMPLEMENTATION_COLOR_READ_TYPE_OES\0"
    "GL_INCR\0"
    "GL_INCR_WRAP\0"
@@ -694,9 +748,11 @@ LONGSTRING static const char enum_string_table[] =
    "GL_INTENSITY8\0"
    "GL_INTENSITY8_EXT\0"
    "GL_INTENSITY_EXT\0"
+   "GL_INTERLEAVED_ATTRIBS_EXT\0"
    "GL_INTERPOLATE\0"
    "GL_INTERPOLATE_ARB\0"
    "GL_INTERPOLATE_EXT\0"
+   "GL_INT_10_10_10_2_OES\0"
    "GL_INT_VEC2\0"
    "GL_INT_VEC2_ARB\0"
    "GL_INT_VEC3\0"
@@ -706,6 +762,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_INVALID_ENUM\0"
    "GL_INVALID_FRAMEBUFFER_OPERATION\0"
    "GL_INVALID_FRAMEBUFFER_OPERATION_EXT\0"
+   "GL_INVALID_FRAMEBUFFER_OPERATION_OES\0"
    "GL_INVALID_OPERATION\0"
    "GL_INVALID_VALUE\0"
    "GL_INVERSE_NV\0"
@@ -740,6 +797,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_LINEAR_MIPMAP_LINEAR\0"
    "GL_LINEAR_MIPMAP_NEAREST\0"
    "GL_LINES\0"
+   "GL_LINES_ADJACENCY_ARB\0"
    "GL_LINE_BIT\0"
    "GL_LINE_LOOP\0"
    "GL_LINE_RESET_TOKEN\0"
@@ -749,6 +807,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_LINE_STIPPLE_PATTERN\0"
    "GL_LINE_STIPPLE_REPEAT\0"
    "GL_LINE_STRIP\0"
+   "GL_LINE_STRIP_ADJACENCY_ARB\0"
    "GL_LINE_TOKEN\0"
    "GL_LINE_WIDTH\0"
    "GL_LINE_WIDTH_GRANULARITY\0"
@@ -762,6 +821,8 @@ LONGSTRING static const char enum_string_table[] =
    "GL_LOGIC_OP\0"
    "GL_LOGIC_OP_MODE\0"
    "GL_LOWER_LEFT\0"
+   "GL_LOW_FLOAT\0"
+   "GL_LOW_INT\0"
    "GL_LUMINANCE\0"
    "GL_LUMINANCE12\0"
    "GL_LUMINANCE12_ALPHA12\0"
@@ -887,14 +948,22 @@ LONGSTRING static const char enum_string_table[] =
    "GL_MATRIX8_ARB\0"
    "GL_MATRIX9_ARB\0"
    "GL_MATRIX_INDEX_ARRAY_ARB\0"
+   "GL_MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES\0"
+   "GL_MATRIX_INDEX_ARRAY_OES\0"
    "GL_MATRIX_INDEX_ARRAY_POINTER_ARB\0"
+   "GL_MATRIX_INDEX_ARRAY_POINTER_OES\0"
    "GL_MATRIX_INDEX_ARRAY_SIZE_ARB\0"
+   "GL_MATRIX_INDEX_ARRAY_SIZE_OES\0"
    "GL_MATRIX_INDEX_ARRAY_STRIDE_ARB\0"
+   "GL_MATRIX_INDEX_ARRAY_STRIDE_OES\0"
    "GL_MATRIX_INDEX_ARRAY_TYPE_ARB\0"
+   "GL_MATRIX_INDEX_ARRAY_TYPE_OES\0"
    "GL_MATRIX_MODE\0"
    "GL_MATRIX_PALETTE_ARB\0"
+   "GL_MATRIX_PALETTE_OES\0"
    "GL_MAX\0"
    "GL_MAX_3D_TEXTURE_SIZE\0"
+   "GL_MAX_3D_TEXTURE_SIZE_OES\0"
    "GL_MAX_ARRAY_TEXTURE_LAYERS_EXT\0"
    "GL_MAX_ATTRIB_STACK_DEPTH\0"
    "GL_MAX_CLIENT_ATTRIB_STACK_DEPTH\0"
@@ -913,6 +982,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_MAX_CONVOLUTION_WIDTH_EXT\0"
    "GL_MAX_CUBE_MAP_TEXTURE_SIZE\0"
    "GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB\0"
+   "GL_MAX_CUBE_MAP_TEXTURE_SIZE_OES\0"
    "GL_MAX_DRAW_BUFFERS\0"
    "GL_MAX_DRAW_BUFFERS_ARB\0"
    "GL_MAX_DRAW_BUFFERS_ATI\0"
@@ -922,12 +992,19 @@ LONGSTRING static const char enum_string_table[] =
    "GL_MAX_EXT\0"
    "GL_MAX_FRAGMENT_UNIFORM_COMPONENTS\0"
    "GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB\0"
+   "GL_MAX_FRAGMENT_UNIFORM_VECTORS\0"
+   "GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB\0"
+   "GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB\0"
+   "GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB\0"
+   "GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB\0"
+   "GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB\0"
    "GL_MAX_LIGHTS\0"
    "GL_MAX_LIST_NESTING\0"
    "GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB\0"
    "GL_MAX_MODELVIEW_STACK_DEPTH\0"
    "GL_MAX_NAME_STACK_DEPTH\0"
    "GL_MAX_PALETTE_MATRICES_ARB\0"
+   "GL_MAX_PALETTE_MATRICES_OES\0"
    "GL_MAX_PIXEL_MAP_TABLE\0"
    "GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB\0"
    "GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB\0"
@@ -959,6 +1036,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_MAX_RECTANGLE_TEXTURE_SIZE_NV\0"
    "GL_MAX_RENDERBUFFER_SIZE\0"
    "GL_MAX_RENDERBUFFER_SIZE_EXT\0"
+   "GL_MAX_RENDERBUFFER_SIZE_OES\0"
    "GL_MAX_SAMPLES\0"
    "GL_MAX_SAMPLES_EXT\0"
    "GL_MAX_SERVER_WAIT_TIMEOUT\0"
@@ -969,6 +1047,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_MAX_TEXTURE_IMAGE_UNITS\0"
    "GL_MAX_TEXTURE_IMAGE_UNITS_ARB\0"
    "GL_MAX_TEXTURE_LOD_BIAS\0"
+   "GL_MAX_TEXTURE_LOD_BIAS_EXT\0"
    "GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT\0"
    "GL_MAX_TEXTURE_SIZE\0"
    "GL_MAX_TEXTURE_STACK_DEPTH\0"
@@ -976,16 +1055,26 @@ LONGSTRING static const char enum_string_table[] =
    "GL_MAX_TEXTURE_UNITS_ARB\0"
    "GL_MAX_TRACK_MATRICES_NV\0"
    "GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV\0"
+   "GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT\0"
+   "GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT\0"
+   "GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT\0"
+   "GL_MAX_VARYING_COMPONENTS\0"
    "GL_MAX_VARYING_FLOATS\0"
    "GL_MAX_VARYING_FLOATS_ARB\0"
+   "GL_MAX_VARYING_VECTORS\0"
    "GL_MAX_VERTEX_ATTRIBS\0"
    "GL_MAX_VERTEX_ATTRIBS_ARB\0"
    "GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS\0"
    "GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB\0"
    "GL_MAX_VERTEX_UNIFORM_COMPONENTS\0"
    "GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB\0"
+   "GL_MAX_VERTEX_UNIFORM_VECTORS\0"
    "GL_MAX_VERTEX_UNITS_ARB\0"
+   "GL_MAX_VERTEX_UNITS_OES\0"
+   "GL_MAX_VERTEX_VARYING_COMPONENTS_ARB\0"
    "GL_MAX_VIEWPORT_DIMS\0"
+   "GL_MEDIUM_FLOAT\0"
+   "GL_MEDIUM_INT\0"
    "GL_MIN\0"
    "GL_MINMAX\0"
    "GL_MINMAX_EXT\0"
@@ -1036,6 +1125,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_MODELVIEW8_ARB\0"
    "GL_MODELVIEW9_ARB\0"
    "GL_MODELVIEW_MATRIX\0"
+   "GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES\0"
    "GL_MODELVIEW_PROJECTION_NV\0"
    "GL_MODELVIEW_STACK_DEPTH\0"
    "GL_MODULATE\0"
@@ -1061,6 +1151,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_NEVER\0"
    "GL_NICEST\0"
    "GL_NONE\0"
+   "GL_NONE_OES\0"
    "GL_NOOP\0"
    "GL_NOR\0"
    "GL_NORMALIZE\0"
@@ -1073,10 +1164,13 @@ LONGSTRING static const char enum_string_table[] =
    "GL_NORMAL_MAP\0"
    "GL_NORMAL_MAP_ARB\0"
    "GL_NORMAL_MAP_NV\0"
+   "GL_NORMAL_MAP_OES\0"
    "GL_NOTEQUAL\0"
    "GL_NO_ERROR\0"
    "GL_NUM_COMPRESSED_TEXTURE_FORMATS\0"
    "GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB\0"
+   "GL_NUM_PROGRAM_BINARY_FORMATS_OES\0"
+   "GL_NUM_SHADER_BINARY_FORMATS\0"
    "GL_OBJECT_ACTIVE_ATTRIBUTES_ARB\0"
    "GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB\0"
    "GL_OBJECT_ACTIVE_UNIFORMS_ARB\0"
@@ -1191,6 +1285,11 @@ LONGSTRING static const char enum_string_table[] =
    "GL_POINT_FADE_THRESHOLD_SIZE_EXT\0"
    "GL_POINT_FADE_THRESHOLD_SIZE_SGIS\0"
    "GL_POINT_SIZE\0"
+   "GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES\0"
+   "GL_POINT_SIZE_ARRAY_OES\0"
+   "GL_POINT_SIZE_ARRAY_POINTER_OES\0"
+   "GL_POINT_SIZE_ARRAY_STRIDE_OES\0"
+   "GL_POINT_SIZE_ARRAY_TYPE_OES\0"
    "GL_POINT_SIZE_GRANULARITY\0"
    "GL_POINT_SIZE_MAX\0"
    "GL_POINT_SIZE_MAX_ARB\0"
@@ -1207,6 +1306,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_POINT_SPRITE_ARB\0"
    "GL_POINT_SPRITE_COORD_ORIGIN\0"
    "GL_POINT_SPRITE_NV\0"
+   "GL_POINT_SPRITE_OES\0"
    "GL_POINT_SPRITE_R_MODE_NV\0"
    "GL_POINT_TOKEN\0"
    "GL_POLYGON\0"
@@ -1268,9 +1368,12 @@ LONGSTRING static const char enum_string_table[] =
    "GL_PRIMARY_COLOR\0"
    "GL_PRIMARY_COLOR_ARB\0"
    "GL_PRIMARY_COLOR_EXT\0"
+   "GL_PRIMITIVES_GENERATED_EXT\0"
    "GL_PROGRAM_ADDRESS_REGISTERS_ARB\0"
    "GL_PROGRAM_ALU_INSTRUCTIONS_ARB\0"
    "GL_PROGRAM_ATTRIBS_ARB\0"
+   "GL_PROGRAM_BINARY_FORMATS_OES\0"
+   "GL_PROGRAM_BINARY_LENGTH_OES\0"
    "GL_PROGRAM_BINDING_ARB\0"
    "GL_PROGRAM_ERROR_POSITION_ARB\0"
    "GL_PROGRAM_ERROR_POSITION_NV\0"
@@ -1291,6 +1394,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_PROGRAM_OBJECT_ARB\0"
    "GL_PROGRAM_PARAMETERS_ARB\0"
    "GL_PROGRAM_PARAMETER_NV\0"
+   "GL_PROGRAM_POINT_SIZE_ARB\0"
    "GL_PROGRAM_RESIDENT_NV\0"
    "GL_PROGRAM_STRING_ARB\0"
    "GL_PROGRAM_STRING_NV\0"
@@ -1301,6 +1405,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB\0"
    "GL_PROJECTION\0"
    "GL_PROJECTION_MATRIX\0"
+   "GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES\0"
    "GL_PROJECTION_STACK_DEPTH\0"
    "GL_PROVOKING_VERTEX\0"
    "GL_PROVOKING_VERTEX_EXT\0"
@@ -1341,6 +1446,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_QUERY_WAIT_NV\0"
    "GL_R\0"
    "GL_R3_G3_B2\0"
+   "GL_RASTERIZER_DISCARD_EXT\0"
    "GL_RASTER_POSITION_UNCLIPPED_IBM\0"
    "GL_READ_BUFFER\0"
    "GL_READ_FRAMEBUFFER\0"
@@ -1360,26 +1466,38 @@ LONGSTRING static const char enum_string_table[] =
    "GL_REFLECTION_MAP\0"
    "GL_REFLECTION_MAP_ARB\0"
    "GL_REFLECTION_MAP_NV\0"
+   "GL_REFLECTION_MAP_OES\0"
    "GL_RELEASED_APPLE\0"
    "GL_RENDER\0"
    "GL_RENDERBUFFER\0"
    "GL_RENDERBUFFER_ALPHA_SIZE\0"
+   "GL_RENDERBUFFER_ALPHA_SIZE_OES\0"
    "GL_RENDERBUFFER_BINDING\0"
    "GL_RENDERBUFFER_BINDING_EXT\0"
+   "GL_RENDERBUFFER_BINDING_OES\0"
    "GL_RENDERBUFFER_BLUE_SIZE\0"
+   "GL_RENDERBUFFER_BLUE_SIZE_OES\0"
    "GL_RENDERBUFFER_DEPTH_SIZE\0"
+   "GL_RENDERBUFFER_DEPTH_SIZE_OES\0"
    "GL_RENDERBUFFER_EXT\0"
    "GL_RENDERBUFFER_GREEN_SIZE\0"
+   "GL_RENDERBUFFER_GREEN_SIZE_OES\0"
    "GL_RENDERBUFFER_HEIGHT\0"
    "GL_RENDERBUFFER_HEIGHT_EXT\0"
+   "GL_RENDERBUFFER_HEIGHT_OES\0"
    "GL_RENDERBUFFER_INTERNAL_FORMAT\0"
    "GL_RENDERBUFFER_INTERNAL_FORMAT_EXT\0"
+   "GL_RENDERBUFFER_INTERNAL_FORMAT_OES\0"
+   "GL_RENDERBUFFER_OES\0"
    "GL_RENDERBUFFER_RED_SIZE\0"
+   "GL_RENDERBUFFER_RED_SIZE_OES\0"
    "GL_RENDERBUFFER_SAMPLES\0"
    "GL_RENDERBUFFER_SAMPLES_EXT\0"
    "GL_RENDERBUFFER_STENCIL_SIZE\0"
+   "GL_RENDERBUFFER_STENCIL_SIZE_OES\0"
    "GL_RENDERBUFFER_WIDTH\0"
    "GL_RENDERBUFFER_WIDTH_EXT\0"
+   "GL_RENDERBUFFER_WIDTH_OES\0"
    "GL_RENDERER\0"
    "GL_RENDER_MODE\0"
    "GL_REPEAT\0"
@@ -1404,11 +1522,15 @@ LONGSTRING static const char enum_string_table[] =
    "GL_RGB4_EXT\0"
    "GL_RGB4_S3TC\0"
    "GL_RGB5\0"
+   "GL_RGB565\0"
+   "GL_RGB565_OES\0"
    "GL_RGB5_A1\0"
    "GL_RGB5_A1_EXT\0"
+   "GL_RGB5_A1_OES\0"
    "GL_RGB5_EXT\0"
    "GL_RGB8\0"
    "GL_RGB8_EXT\0"
+   "GL_RGB8_OES\0"
    "GL_RGBA\0"
    "GL_RGBA12\0"
    "GL_RGBA12_EXT\0"
@@ -1419,9 +1541,11 @@ LONGSTRING static const char enum_string_table[] =
    "GL_RGBA4\0"
    "GL_RGBA4_DXT5_S3TC\0"
    "GL_RGBA4_EXT\0"
+   "GL_RGBA4_OES\0"
    "GL_RGBA4_S3TC\0"
    "GL_RGBA8\0"
    "GL_RGBA8_EXT\0"
+   "GL_RGBA8_OES\0"
    "GL_RGBA8_SNORM\0"
    "GL_RGBA_DXT5_S3TC\0"
    "GL_RGBA_MODE\0"
@@ -1438,6 +1562,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_SAMPLER_2D\0"
    "GL_SAMPLER_2D_SHADOW\0"
    "GL_SAMPLER_3D\0"
+   "GL_SAMPLER_3D_OES\0"
    "GL_SAMPLER_CUBE\0"
    "GL_SAMPLES\0"
    "GL_SAMPLES_3DFX\0"
@@ -1471,9 +1596,12 @@ LONGSTRING static const char enum_string_table[] =
    "GL_SELECTION_BUFFER_POINTER\0"
    "GL_SELECTION_BUFFER_SIZE\0"
    "GL_SEPARABLE_2D\0"
+   "GL_SEPARATE_ATTRIBS_EXT\0"
    "GL_SEPARATE_SPECULAR_COLOR\0"
    "GL_SEPARATE_SPECULAR_COLOR_EXT\0"
    "GL_SET\0"
+   "GL_SHADER_BINARY_FORMATS\0"
+   "GL_SHADER_COMPILER\0"
    "GL_SHADER_OBJECT_ARB\0"
    "GL_SHADER_SOURCE_LENGTH\0"
    "GL_SHADER_TYPE\0"
@@ -1546,6 +1674,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_STENCIL\0"
    "GL_STENCIL_ATTACHMENT\0"
    "GL_STENCIL_ATTACHMENT_EXT\0"
+   "GL_STENCIL_ATTACHMENT_OES\0"
    "GL_STENCIL_BACK_FAIL\0"
    "GL_STENCIL_BACK_FAIL_ATI\0"
    "GL_STENCIL_BACK_FUNC\0"
@@ -1567,10 +1696,13 @@ LONGSTRING static const char enum_string_table[] =
    "GL_STENCIL_INDEX16\0"
    "GL_STENCIL_INDEX16_EXT\0"
    "GL_STENCIL_INDEX1_EXT\0"
+   "GL_STENCIL_INDEX1_OES\0"
    "GL_STENCIL_INDEX4\0"
    "GL_STENCIL_INDEX4_EXT\0"
+   "GL_STENCIL_INDEX4_OES\0"
    "GL_STENCIL_INDEX8\0"
    "GL_STENCIL_INDEX8_EXT\0"
+   "GL_STENCIL_INDEX8_OES\0"
    "GL_STENCIL_INDEX_EXT\0"
    "GL_STENCIL_PASS_DEPTH_FAIL\0"
    "GL_STENCIL_PASS_DEPTH_PASS\0"
@@ -1677,6 +1809,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_TEXTURE_2D\0"
    "GL_TEXTURE_2D_ARRAY_EXT\0"
    "GL_TEXTURE_3D\0"
+   "GL_TEXTURE_3D_OES\0"
    "GL_TEXTURE_ALPHA_SIZE\0"
    "GL_TEXTURE_ALPHA_SIZE_EXT\0"
    "GL_TEXTURE_BASE_LEVEL\0"
@@ -1685,8 +1818,10 @@ LONGSTRING static const char enum_string_table[] =
    "GL_TEXTURE_BINDING_2D\0"
    "GL_TEXTURE_BINDING_2D_ARRAY_EXT\0"
    "GL_TEXTURE_BINDING_3D\0"
+   "GL_TEXTURE_BINDING_3D_OES\0"
    "GL_TEXTURE_BINDING_CUBE_MAP\0"
    "GL_TEXTURE_BINDING_CUBE_MAP_ARB\0"
+   "GL_TEXTURE_BINDING_CUBE_MAP_OES\0"
    "GL_TEXTURE_BINDING_RECTANGLE_ARB\0"
    "GL_TEXTURE_BINDING_RECTANGLE_NV\0"
    "GL_TEXTURE_BIT\0"
@@ -1724,20 +1859,28 @@ LONGSTRING static const char enum_string_table[] =
    "GL_TEXTURE_COORD_ARRAY_SIZE\0"
    "GL_TEXTURE_COORD_ARRAY_STRIDE\0"
    "GL_TEXTURE_COORD_ARRAY_TYPE\0"
+   "GL_TEXTURE_CROP_RECT_OES\0"
    "GL_TEXTURE_CUBE_MAP\0"
    "GL_TEXTURE_CUBE_MAP_ARB\0"
    "GL_TEXTURE_CUBE_MAP_NEGATIVE_X\0"
    "GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB\0"
+   "GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES\0"
    "GL_TEXTURE_CUBE_MAP_NEGATIVE_Y\0"
    "GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB\0"
+   "GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES\0"
    "GL_TEXTURE_CUBE_MAP_NEGATIVE_Z\0"
    "GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB\0"
+   "GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES\0"
+   "GL_TEXTURE_CUBE_MAP_OES\0"
    "GL_TEXTURE_CUBE_MAP_POSITIVE_X\0"
    "GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB\0"
+   "GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES\0"
    "GL_TEXTURE_CUBE_MAP_POSITIVE_Y\0"
    "GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB\0"
+   "GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES\0"
    "GL_TEXTURE_CUBE_MAP_POSITIVE_Z\0"
    "GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB\0"
+   "GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES\0"
    "GL_TEXTURE_CUBE_MAP_SEAMLESS\0"
    "GL_TEXTURE_DEPTH\0"
    "GL_TEXTURE_DEPTH_SIZE\0"
@@ -1746,10 +1889,13 @@ LONGSTRING static const char enum_string_table[] =
    "GL_TEXTURE_ENV_COLOR\0"
    "GL_TEXTURE_ENV_MODE\0"
    "GL_TEXTURE_FILTER_CONTROL\0"
+   "GL_TEXTURE_FILTER_CONTROL_EXT\0"
    "GL_TEXTURE_GEN_MODE\0"
+   "GL_TEXTURE_GEN_MODE_OES\0"
    "GL_TEXTURE_GEN_Q\0"
    "GL_TEXTURE_GEN_R\0"
    "GL_TEXTURE_GEN_S\0"
+   "GL_TEXTURE_GEN_STR_OES\0"
    "GL_TEXTURE_GEN_T\0"
    "GL_TEXTURE_GEQUAL_R_SGIX\0"
    "GL_TEXTURE_GREEN_SIZE\0"
@@ -1769,6 +1915,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_TEXTURE_LUMINANCE_SIZE_EXT\0"
    "GL_TEXTURE_MAG_FILTER\0"
    "GL_TEXTURE_MATRIX\0"
+   "GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES\0"
    "GL_TEXTURE_MAX_ANISOTROPY_EXT\0"
    "GL_TEXTURE_MAX_CLAMP_R_SGIX\0"
    "GL_TEXTURE_MAX_CLAMP_S_SGIX\0"
@@ -1793,6 +1940,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_TEXTURE_UNSIGNED_REMAP_MODE_NV\0"
    "GL_TEXTURE_WIDTH\0"
    "GL_TEXTURE_WRAP_R\0"
+   "GL_TEXTURE_WRAP_R_OES\0"
    "GL_TEXTURE_WRAP_S\0"
    "GL_TEXTURE_WRAP_T\0"
    "GL_TIMEOUT_EXPIRED\0"
@@ -1800,6 +1948,18 @@ LONGSTRING static const char enum_string_table[] =
    "GL_TRACK_MATRIX_NV\0"
    "GL_TRACK_MATRIX_TRANSFORM_NV\0"
    "GL_TRANSFORM_BIT\0"
+   "GL_TRANSFORM_FEEDBACK\0"
+   "GL_TRANSFORM_FEEDBACK_BINDING\0"
+   "GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE\0"
+   "GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT\0"
+   "GL_TRANSFORM_FEEDBACK_BUFFER_EXT\0"
+   "GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT\0"
+   "GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED\0"
+   "GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT\0"
+   "GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT\0"
+   "GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT\0"
+   "GL_TRANSFORM_FEEDBACK_VARYINGS_EXT\0"
+   "GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT\0"
    "GL_TRANSPOSE_COLOR_MATRIX\0"
    "GL_TRANSPOSE_COLOR_MATRIX_ARB\0"
    "GL_TRANSPOSE_CURRENT_MATRIX_ARB\0"
@@ -1811,9 +1971,11 @@ LONGSTRING static const char enum_string_table[] =
    "GL_TRANSPOSE_TEXTURE_MATRIX\0"
    "GL_TRANSPOSE_TEXTURE_MATRIX_ARB\0"
    "GL_TRIANGLES\0"
+   "GL_TRIANGLES_ADJACENCY_ARB\0"
    "GL_TRIANGLE_FAN\0"
    "GL_TRIANGLE_MESH_SUN\0"
    "GL_TRIANGLE_STRIP\0"
+   "GL_TRIANGLE_STRIP_ADJACENCY_ARB\0"
    "GL_TRUE\0"
    "GL_UNDEFINED_APPLE\0"
    "GL_UNPACK_ALIGNMENT\0"
@@ -1830,17 +1992,22 @@ LONGSTRING static const char enum_string_table[] =
    "GL_UNSIGNED_BYTE_3_3_2\0"
    "GL_UNSIGNED_INT\0"
    "GL_UNSIGNED_INT_10_10_10_2\0"
+   "GL_UNSIGNED_INT_10_10_10_2_OES\0"
    "GL_UNSIGNED_INT_24_8\0"
    "GL_UNSIGNED_INT_24_8_EXT\0"
    "GL_UNSIGNED_INT_24_8_NV\0"
+   "GL_UNSIGNED_INT_24_8_OES\0"
    "GL_UNSIGNED_INT_2_10_10_10_REV\0"
+   "GL_UNSIGNED_INT_2_10_10_10_REV_EXT\0"
    "GL_UNSIGNED_INT_8_8_8_8\0"
    "GL_UNSIGNED_INT_8_8_8_8_REV\0"
    "GL_UNSIGNED_NORMALIZED\0"
    "GL_UNSIGNED_SHORT\0"
    "GL_UNSIGNED_SHORT_1_5_5_5_REV\0"
+   "GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT\0"
    "GL_UNSIGNED_SHORT_4_4_4_4\0"
    "GL_UNSIGNED_SHORT_4_4_4_4_REV\0"
+   "GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT\0"
    "GL_UNSIGNED_SHORT_5_5_5_1\0"
    "GL_UNSIGNED_SHORT_5_6_5\0"
    "GL_UNSIGNED_SHORT_5_6_5_REV\0"
@@ -1913,14 +2080,21 @@ LONGSTRING static const char enum_string_table[] =
    "GL_WEIGHT_ARRAY_ARB\0"
    "GL_WEIGHT_ARRAY_BUFFER_BINDING\0"
    "GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB\0"
+   "GL_WEIGHT_ARRAY_BUFFER_BINDING_OES\0"
+   "GL_WEIGHT_ARRAY_OES\0"
    "GL_WEIGHT_ARRAY_POINTER_ARB\0"
+   "GL_WEIGHT_ARRAY_POINTER_OES\0"
    "GL_WEIGHT_ARRAY_SIZE_ARB\0"
+   "GL_WEIGHT_ARRAY_SIZE_OES\0"
    "GL_WEIGHT_ARRAY_STRIDE_ARB\0"
+   "GL_WEIGHT_ARRAY_STRIDE_OES\0"
    "GL_WEIGHT_ARRAY_TYPE_ARB\0"
+   "GL_WEIGHT_ARRAY_TYPE_OES\0"
    "GL_WEIGHT_SUM_UNITY_ARB\0"
    "GL_WRAP_BORDER_SUN\0"
    "GL_WRITE_ONLY\0"
    "GL_WRITE_ONLY_ARB\0"
+   "GL_WRITE_ONLY_OES\0"
    "GL_XOR\0"
    "GL_YCBCR_422_APPLE\0"
    "GL_YCBCR_MESA\0"
@@ -1929,7 +2103,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_ZOOM_Y\0"
    ;
 
-static const enum_elt all_enums[1891] =
+static const enum_elt all_enums[2065] =
 {
    {     0, 0x00000600 }, /* GL_2D */
    {     6, 0x00001407 }, /* GL_2_BYTES */
@@ -2004,3184 +2178,3424 @@ static const enum_elt all_enums[1891] =
    {  1175, 0x00000403 }, /* GL_BACK_RIGHT */
    {  1189, 0x000080E0 }, /* GL_BGR */
    {  1196, 0x000080E1 }, /* GL_BGRA */
-   {  1204, 0x00001A00 }, /* GL_BITMAP */
-   {  1214, 0x00000704 }, /* GL_BITMAP_TOKEN */
-   {  1230, 0x00000BE2 }, /* GL_BLEND */
-   {  1239, 0x00008005 }, /* GL_BLEND_COLOR */
-   {  1254, 0x00008005 }, /* GL_BLEND_COLOR_EXT */
-   {  1273, 0x00000BE0 }, /* GL_BLEND_DST */
-   {  1286, 0x000080CA }, /* GL_BLEND_DST_ALPHA */
-   {  1305, 0x000080C8 }, /* GL_BLEND_DST_RGB */
-   {  1322, 0x00008009 }, /* GL_BLEND_EQUATION */
-   {  1340, 0x0000883D }, /* GL_BLEND_EQUATION_ALPHA */
-   {  1364, 0x0000883D }, /* GL_BLEND_EQUATION_ALPHA_EXT */
-   {  1392, 0x00008009 }, /* GL_BLEND_EQUATION_EXT */
-   {  1414, 0x00008009 }, /* GL_BLEND_EQUATION_RGB */
-   {  1436, 0x00008009 }, /* GL_BLEND_EQUATION_RGB_EXT */
-   {  1462, 0x00000BE1 }, /* GL_BLEND_SRC */
-   {  1475, 0x000080CB }, /* GL_BLEND_SRC_ALPHA */
-   {  1494, 0x000080C9 }, /* GL_BLEND_SRC_RGB */
-   {  1511, 0x00001905 }, /* GL_BLUE */
-   {  1519, 0x00000D1B }, /* GL_BLUE_BIAS */
-   {  1532, 0x00000D54 }, /* GL_BLUE_BITS */
-   {  1545, 0x00000D1A }, /* GL_BLUE_SCALE */
-   {  1559, 0x00008B56 }, /* GL_BOOL */
-   {  1567, 0x00008B56 }, /* GL_BOOL_ARB */
-   {  1579, 0x00008B57 }, /* GL_BOOL_VEC2 */
-   {  1592, 0x00008B57 }, /* GL_BOOL_VEC2_ARB */
-   {  1609, 0x00008B58 }, /* GL_BOOL_VEC3 */
-   {  1622, 0x00008B58 }, /* GL_BOOL_VEC3_ARB */
-   {  1639, 0x00008B59 }, /* GL_BOOL_VEC4 */
-   {  1652, 0x00008B59 }, /* GL_BOOL_VEC4_ARB */
-   {  1669, 0x000088BB }, /* GL_BUFFER_ACCESS */
-   {  1686, 0x000088BB }, /* GL_BUFFER_ACCESS_ARB */
-   {  1707, 0x00008A13 }, /* GL_BUFFER_FLUSHING_UNMAP_APPLE */
-   {  1738, 0x000088BC }, /* GL_BUFFER_MAPPED */
-   {  1755, 0x000088BC }, /* GL_BUFFER_MAPPED_ARB */
-   {  1776, 0x000088BD }, /* GL_BUFFER_MAP_POINTER */
-   {  1798, 0x000088BD }, /* GL_BUFFER_MAP_POINTER_ARB */
-   {  1824, 0x000085B3 }, /* GL_BUFFER_OBJECT_APPLE */
-   {  1847, 0x00008A12 }, /* GL_BUFFER_SERIALIZED_MODIFY_APPLE */
-   {  1881, 0x00008764 }, /* GL_BUFFER_SIZE */
-   {  1896, 0x00008764 }, /* GL_BUFFER_SIZE_ARB */
-   {  1915, 0x00008765 }, /* GL_BUFFER_USAGE */
-   {  1931, 0x00008765 }, /* GL_BUFFER_USAGE_ARB */
-   {  1951, 0x0000877B }, /* GL_BUMP_ENVMAP_ATI */
-   {  1970, 0x00008777 }, /* GL_BUMP_NUM_TEX_UNITS_ATI */
-   {  1996, 0x00008775 }, /* GL_BUMP_ROT_MATRIX_ATI */
-   {  2019, 0x00008776 }, /* GL_BUMP_ROT_MATRIX_SIZE_ATI */
-   {  2047, 0x0000877C }, /* GL_BUMP_TARGET_ATI */
-   {  2066, 0x00008778 }, /* GL_BUMP_TEX_UNITS_ATI */
-   {  2088, 0x00001400 }, /* GL_BYTE */
-   {  2096, 0x00002A24 }, /* GL_C3F_V3F */
-   {  2107, 0x00002A26 }, /* GL_C4F_N3F_V3F */
-   {  2122, 0x00002A22 }, /* GL_C4UB_V2F */
-   {  2134, 0x00002A23 }, /* GL_C4UB_V3F */
-   {  2146, 0x00000901 }, /* GL_CCW */
-   {  2153, 0x00002900 }, /* GL_CLAMP */
-   {  2162, 0x0000812D }, /* GL_CLAMP_TO_BORDER */
-   {  2181, 0x0000812D }, /* GL_CLAMP_TO_BORDER_ARB */
-   {  2204, 0x0000812D }, /* GL_CLAMP_TO_BORDER_SGIS */
-   {  2228, 0x0000812F }, /* GL_CLAMP_TO_EDGE */
-   {  2245, 0x0000812F }, /* GL_CLAMP_TO_EDGE_SGIS */
-   {  2267, 0x00001500 }, /* GL_CLEAR */
-   {  2276, 0x000084E1 }, /* GL_CLIENT_ACTIVE_TEXTURE */
-   {  2301, 0x000084E1 }, /* GL_CLIENT_ACTIVE_TEXTURE_ARB */
-   {  2330, 0xFFFFFFFF }, /* GL_CLIENT_ALL_ATTRIB_BITS */
-   {  2356, 0x00000BB1 }, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
-   {  2385, 0x00000001 }, /* GL_CLIENT_PIXEL_STORE_BIT */
-   {  2411, 0x00000002 }, /* GL_CLIENT_VERTEX_ARRAY_BIT */
-   {  2438, 0x00003000 }, /* GL_CLIP_PLANE0 */
-   {  2453, 0x00003001 }, /* GL_CLIP_PLANE1 */
-   {  2468, 0x00003002 }, /* GL_CLIP_PLANE2 */
-   {  2483, 0x00003003 }, /* GL_CLIP_PLANE3 */
-   {  2498, 0x00003004 }, /* GL_CLIP_PLANE4 */
-   {  2513, 0x00003005 }, /* GL_CLIP_PLANE5 */
-   {  2528, 0x000080F0 }, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
-   {  2561, 0x00000A00 }, /* GL_COEFF */
-   {  2570, 0x00001800 }, /* GL_COLOR */
-   {  2579, 0x00008076 }, /* GL_COLOR_ARRAY */
-   {  2594, 0x00008898 }, /* GL_COLOR_ARRAY_BUFFER_BINDING */
-   {  2624, 0x00008898 }, /* GL_COLOR_ARRAY_BUFFER_BINDING_ARB */
-   {  2658, 0x00008090 }, /* GL_COLOR_ARRAY_POINTER */
-   {  2681, 0x00008081 }, /* GL_COLOR_ARRAY_SIZE */
-   {  2701, 0x00008083 }, /* GL_COLOR_ARRAY_STRIDE */
-   {  2723, 0x00008082 }, /* GL_COLOR_ARRAY_TYPE */
-   {  2743, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0 */
-   {  2764, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0_EXT */
-   {  2789, 0x00008CE1 }, /* GL_COLOR_ATTACHMENT1 */
-   {  2810, 0x00008CEA }, /* GL_COLOR_ATTACHMENT10 */
-   {  2832, 0x00008CEA }, /* GL_COLOR_ATTACHMENT10_EXT */
-   {  2858, 0x00008CEB }, /* GL_COLOR_ATTACHMENT11 */
-   {  2880, 0x00008CEB }, /* GL_COLOR_ATTACHMENT11_EXT */
-   {  2906, 0x00008CEC }, /* GL_COLOR_ATTACHMENT12 */
-   {  2928, 0x00008CEC }, /* GL_COLOR_ATTACHMENT12_EXT */
-   {  2954, 0x00008CED }, /* GL_COLOR_ATTACHMENT13 */
-   {  2976, 0x00008CED }, /* GL_COLOR_ATTACHMENT13_EXT */
-   {  3002, 0x00008CEE }, /* GL_COLOR_ATTACHMENT14 */
-   {  3024, 0x00008CEE }, /* GL_COLOR_ATTACHMENT14_EXT */
-   {  3050, 0x00008CEF }, /* GL_COLOR_ATTACHMENT15 */
-   {  3072, 0x00008CEF }, /* GL_COLOR_ATTACHMENT15_EXT */
-   {  3098, 0x00008CE1 }, /* GL_COLOR_ATTACHMENT1_EXT */
-   {  3123, 0x00008CE2 }, /* GL_COLOR_ATTACHMENT2 */
-   {  3144, 0x00008CE2 }, /* GL_COLOR_ATTACHMENT2_EXT */
-   {  3169, 0x00008CE3 }, /* GL_COLOR_ATTACHMENT3 */
-   {  3190, 0x00008CE3 }, /* GL_COLOR_ATTACHMENT3_EXT */
-   {  3215, 0x00008CE4 }, /* GL_COLOR_ATTACHMENT4 */
-   {  3236, 0x00008CE4 }, /* GL_COLOR_ATTACHMENT4_EXT */
-   {  3261, 0x00008CE5 }, /* GL_COLOR_ATTACHMENT5 */
-   {  3282, 0x00008CE5 }, /* GL_COLOR_ATTACHMENT5_EXT */
-   {  3307, 0x00008CE6 }, /* GL_COLOR_ATTACHMENT6 */
-   {  3328, 0x00008CE6 }, /* GL_COLOR_ATTACHMENT6_EXT */
-   {  3353, 0x00008CE7 }, /* GL_COLOR_ATTACHMENT7 */
-   {  3374, 0x00008CE7 }, /* GL_COLOR_ATTACHMENT7_EXT */
-   {  3399, 0x00008CE8 }, /* GL_COLOR_ATTACHMENT8 */
-   {  3420, 0x00008CE8 }, /* GL_COLOR_ATTACHMENT8_EXT */
-   {  3445, 0x00008CE9 }, /* GL_COLOR_ATTACHMENT9 */
-   {  3466, 0x00008CE9 }, /* GL_COLOR_ATTACHMENT9_EXT */
-   {  3491, 0x00004000 }, /* GL_COLOR_BUFFER_BIT */
-   {  3511, 0x00000C22 }, /* GL_COLOR_CLEAR_VALUE */
-   {  3532, 0x00001900 }, /* GL_COLOR_INDEX */
-   {  3547, 0x00001603 }, /* GL_COLOR_INDEXES */
-   {  3564, 0x00000BF2 }, /* GL_COLOR_LOGIC_OP */
-   {  3582, 0x00000B57 }, /* GL_COLOR_MATERIAL */
-   {  3600, 0x00000B55 }, /* GL_COLOR_MATERIAL_FACE */
-   {  3623, 0x00000B56 }, /* GL_COLOR_MATERIAL_PARAMETER */
-   {  3651, 0x000080B1 }, /* GL_COLOR_MATRIX */
-   {  3667, 0x000080B1 }, /* GL_COLOR_MATRIX_SGI */
-   {  3687, 0x000080B2 }, /* GL_COLOR_MATRIX_STACK_DEPTH */
-   {  3715, 0x000080B2 }, /* GL_COLOR_MATRIX_STACK_DEPTH_SGI */
-   {  3747, 0x00008458 }, /* GL_COLOR_SUM */
-   {  3760, 0x00008458 }, /* GL_COLOR_SUM_ARB */
-   {  3777, 0x000080D0 }, /* GL_COLOR_TABLE */
-   {  3792, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE */
-   {  3818, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE_EXT */
-   {  3848, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE_SGI */
-   {  3878, 0x000080D7 }, /* GL_COLOR_TABLE_BIAS */
-   {  3898, 0x000080D7 }, /* GL_COLOR_TABLE_BIAS_SGI */
-   {  3922, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE */
-   {  3947, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE_EXT */
-   {  3976, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE_SGI */
-   {  4005, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT */
-   {  4027, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT_EXT */
-   {  4053, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT_SGI */
-   {  4079, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE */
-   {  4105, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE_EXT */
-   {  4135, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE_SGI */
-   {  4165, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE */
-   {  4195, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE_EXT */
-   {  4229, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE_SGI */
-   {  4263, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE */
-   {  4293, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE_EXT */
-   {  4327, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE_SGI */
-   {  4361, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE */
-   {  4385, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE_EXT */
-   {  4413, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE_SGI */
-   {  4441, 0x000080D6 }, /* GL_COLOR_TABLE_SCALE */
-   {  4462, 0x000080D6 }, /* GL_COLOR_TABLE_SCALE_SGI */
-   {  4487, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH */
-   {  4508, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH_EXT */
-   {  4533, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH_SGI */
-   {  4558, 0x00000C23 }, /* GL_COLOR_WRITEMASK */
-   {  4577, 0x00008570 }, /* GL_COMBINE */
-   {  4588, 0x00008503 }, /* GL_COMBINE4 */
-   {  4600, 0x00008572 }, /* GL_COMBINE_ALPHA */
-   {  4617, 0x00008572 }, /* GL_COMBINE_ALPHA_ARB */
-   {  4638, 0x00008572 }, /* GL_COMBINE_ALPHA_EXT */
-   {  4659, 0x00008570 }, /* GL_COMBINE_ARB */
-   {  4674, 0x00008570 }, /* GL_COMBINE_EXT */
-   {  4689, 0x00008571 }, /* GL_COMBINE_RGB */
-   {  4704, 0x00008571 }, /* GL_COMBINE_RGB_ARB */
-   {  4723, 0x00008571 }, /* GL_COMBINE_RGB_EXT */
-   {  4742, 0x0000884E }, /* GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT */
-   {  4778, 0x0000884E }, /* GL_COMPARE_R_TO_TEXTURE */
-   {  4802, 0x0000884E }, /* GL_COMPARE_R_TO_TEXTURE_ARB */
-   {  4830, 0x00001300 }, /* GL_COMPILE */
-   {  4841, 0x00001301 }, /* GL_COMPILE_AND_EXECUTE */
-   {  4864, 0x00008B81 }, /* GL_COMPILE_STATUS */
-   {  4882, 0x000084E9 }, /* GL_COMPRESSED_ALPHA */
-   {  4902, 0x000084E9 }, /* GL_COMPRESSED_ALPHA_ARB */
-   {  4926, 0x000084EC }, /* GL_COMPRESSED_INTENSITY */
-   {  4950, 0x000084EC }, /* GL_COMPRESSED_INTENSITY_ARB */
-   {  4978, 0x000084EA }, /* GL_COMPRESSED_LUMINANCE */
-   {  5002, 0x000084EB }, /* GL_COMPRESSED_LUMINANCE_ALPHA */
-   {  5032, 0x000084EB }, /* GL_COMPRESSED_LUMINANCE_ALPHA_ARB */
-   {  5066, 0x000084EA }, /* GL_COMPRESSED_LUMINANCE_ARB */
-   {  5094, 0x000084ED }, /* GL_COMPRESSED_RGB */
-   {  5112, 0x000084EE }, /* GL_COMPRESSED_RGBA */
-   {  5131, 0x000084EE }, /* GL_COMPRESSED_RGBA_ARB */
-   {  5154, 0x000086B1 }, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
-   {  5183, 0x000083F1 }, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
-   {  5216, 0x000083F2 }, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
-   {  5249, 0x000083F3 }, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
-   {  5282, 0x000084ED }, /* GL_COMPRESSED_RGB_ARB */
-   {  5304, 0x000086B0 }, /* GL_COMPRESSED_RGB_FXT1_3DFX */
-   {  5332, 0x000083F0 }, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
-   {  5364, 0x00008C4A }, /* GL_COMPRESSED_SLUMINANCE */
-   {  5389, 0x00008C4B }, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
-   {  5420, 0x00008C48 }, /* GL_COMPRESSED_SRGB */
-   {  5439, 0x00008C49 }, /* GL_COMPRESSED_SRGB_ALPHA */
-   {  5464, 0x000086A3 }, /* GL_COMPRESSED_TEXTURE_FORMATS */
-   {  5494, 0x0000911C }, /* GL_CONDITION_SATISFIED */
-   {  5517, 0x00008576 }, /* GL_CONSTANT */
-   {  5529, 0x00008003 }, /* GL_CONSTANT_ALPHA */
-   {  5547, 0x00008003 }, /* GL_CONSTANT_ALPHA_EXT */
-   {  5569, 0x00008576 }, /* GL_CONSTANT_ARB */
-   {  5585, 0x00001207 }, /* GL_CONSTANT_ATTENUATION */
-   {  5609, 0x00008151 }, /* GL_CONSTANT_BORDER_HP */
-   {  5631, 0x00008001 }, /* GL_CONSTANT_COLOR */
-   {  5649, 0x00008001 }, /* GL_CONSTANT_COLOR_EXT */
-   {  5671, 0x00008576 }, /* GL_CONSTANT_EXT */
-   {  5687, 0x00008010 }, /* GL_CONVOLUTION_1D */
-   {  5705, 0x00008011 }, /* GL_CONVOLUTION_2D */
-   {  5723, 0x00008154 }, /* GL_CONVOLUTION_BORDER_COLOR */
-   {  5751, 0x00008154 }, /* GL_CONVOLUTION_BORDER_COLOR_HP */
-   {  5782, 0x00008013 }, /* GL_CONVOLUTION_BORDER_MODE */
-   {  5809, 0x00008013 }, /* GL_CONVOLUTION_BORDER_MODE_EXT */
-   {  5840, 0x00008015 }, /* GL_CONVOLUTION_FILTER_BIAS */
-   {  5867, 0x00008015 }, /* GL_CONVOLUTION_FILTER_BIAS_EXT */
-   {  5898, 0x00008014 }, /* GL_CONVOLUTION_FILTER_SCALE */
-   {  5926, 0x00008014 }, /* GL_CONVOLUTION_FILTER_SCALE_EXT */
-   {  5958, 0x00008017 }, /* GL_CONVOLUTION_FORMAT */
-   {  5980, 0x00008017 }, /* GL_CONVOLUTION_FORMAT_EXT */
-   {  6006, 0x00008019 }, /* GL_CONVOLUTION_HEIGHT */
-   {  6028, 0x00008019 }, /* GL_CONVOLUTION_HEIGHT_EXT */
-   {  6054, 0x00008018 }, /* GL_CONVOLUTION_WIDTH */
-   {  6075, 0x00008018 }, /* GL_CONVOLUTION_WIDTH_EXT */
-   {  6100, 0x00008862 }, /* GL_COORD_REPLACE */
-   {  6117, 0x00008862 }, /* GL_COORD_REPLACE_ARB */
-   {  6138, 0x00008862 }, /* GL_COORD_REPLACE_NV */
-   {  6158, 0x00001503 }, /* GL_COPY */
-   {  6166, 0x0000150C }, /* GL_COPY_INVERTED */
-   {  6183, 0x00000706 }, /* GL_COPY_PIXEL_TOKEN */
-   {  6203, 0x00008F36 }, /* GL_COPY_READ_BUFFER */
-   {  6223, 0x00008F37 }, /* GL_COPY_WRITE_BUFFER */
-   {  6244, 0x00000B44 }, /* GL_CULL_FACE */
-   {  6257, 0x00000B45 }, /* GL_CULL_FACE_MODE */
-   {  6275, 0x000081AA }, /* GL_CULL_VERTEX_EXT */
-   {  6294, 0x000081AC }, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
-   {  6326, 0x000081AB }, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
-   {  6361, 0x00008626 }, /* GL_CURRENT_ATTRIB_NV */
-   {  6382, 0x00000001 }, /* GL_CURRENT_BIT */
-   {  6397, 0x00000B00 }, /* GL_CURRENT_COLOR */
-   {  6414, 0x00008453 }, /* GL_CURRENT_FOG_COORD */
-   {  6435, 0x00008453 }, /* GL_CURRENT_FOG_COORDINATE */
-   {  6461, 0x00000B01 }, /* GL_CURRENT_INDEX */
-   {  6478, 0x00008641 }, /* GL_CURRENT_MATRIX_ARB */
-   {  6500, 0x00008845 }, /* GL_CURRENT_MATRIX_INDEX_ARB */
-   {  6528, 0x00008641 }, /* GL_CURRENT_MATRIX_NV */
-   {  6549, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
-   {  6583, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_NV */
-   {  6616, 0x00000B02 }, /* GL_CURRENT_NORMAL */
-   {  6634, 0x00008843 }, /* GL_CURRENT_PALETTE_MATRIX_ARB */
-   {  6664, 0x00008B8D }, /* GL_CURRENT_PROGRAM */
-   {  6683, 0x00008865 }, /* GL_CURRENT_QUERY */
-   {  6700, 0x00008865 }, /* GL_CURRENT_QUERY_ARB */
-   {  6721, 0x00000B04 }, /* GL_CURRENT_RASTER_COLOR */
-   {  6745, 0x00000B09 }, /* GL_CURRENT_RASTER_DISTANCE */
-   {  6772, 0x00000B05 }, /* GL_CURRENT_RASTER_INDEX */
-   {  6796, 0x00000B07 }, /* GL_CURRENT_RASTER_POSITION */
-   {  6823, 0x00000B08 }, /* GL_CURRENT_RASTER_POSITION_VALID */
-   {  6856, 0x0000845F }, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
-   {  6890, 0x00000B06 }, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
-   {  6923, 0x00008459 }, /* GL_CURRENT_SECONDARY_COLOR */
-   {  6950, 0x00000B03 }, /* GL_CURRENT_TEXTURE_COORDS */
-   {  6976, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB */
-   {  7001, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB_ARB */
-   {  7030, 0x000086A8 }, /* GL_CURRENT_WEIGHT_ARB */
-   {  7052, 0x00000900 }, /* GL_CW */
-   {  7058, 0x0000875B }, /* GL_DEBUG_ASSERT_MESA */
-   {  7079, 0x00008759 }, /* GL_DEBUG_OBJECT_MESA */
-   {  7100, 0x0000875A }, /* GL_DEBUG_PRINT_MESA */
-   {  7120, 0x00002101 }, /* GL_DECAL */
-   {  7129, 0x00001E03 }, /* GL_DECR */
-   {  7137, 0x00008508 }, /* GL_DECR_WRAP */
-   {  7150, 0x00008508 }, /* GL_DECR_WRAP_EXT */
-   {  7167, 0x00008B80 }, /* GL_DELETE_STATUS */
-   {  7184, 0x00001801 }, /* GL_DEPTH */
-   {  7193, 0x000088F0 }, /* GL_DEPTH24_STENCIL8 */
-   {  7213, 0x000088F0 }, /* GL_DEPTH24_STENCIL8_EXT */
-   {  7237, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT */
-   {  7257, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT_EXT */
-   {  7281, 0x00000D1F }, /* GL_DEPTH_BIAS */
-   {  7295, 0x00000D56 }, /* GL_DEPTH_BITS */
-   {  7309, 0x00008891 }, /* GL_DEPTH_BOUNDS_EXT */
-   {  7329, 0x00008890 }, /* GL_DEPTH_BOUNDS_TEST_EXT */
-   {  7354, 0x00000100 }, /* GL_DEPTH_BUFFER_BIT */
-   {  7374, 0x0000864F }, /* GL_DEPTH_CLAMP */
-   {  7389, 0x0000864F }, /* GL_DEPTH_CLAMP_NV */
-   {  7407, 0x00000B73 }, /* GL_DEPTH_CLEAR_VALUE */
-   {  7428, 0x00001902 }, /* GL_DEPTH_COMPONENT */
-   {  7447, 0x000081A5 }, /* GL_DEPTH_COMPONENT16 */
-   {  7468, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_ARB */
-   {  7493, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_SGIX */
-   {  7519, 0x000081A6 }, /* GL_DEPTH_COMPONENT24 */
-   {  7540, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_ARB */
-   {  7565, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_SGIX */
-   {  7591, 0x000081A7 }, /* GL_DEPTH_COMPONENT32 */
-   {  7612, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_ARB */
-   {  7637, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_SGIX */
-   {  7663, 0x00000B74 }, /* GL_DEPTH_FUNC */
-   {  7677, 0x00000B70 }, /* GL_DEPTH_RANGE */
-   {  7692, 0x00000D1E }, /* GL_DEPTH_SCALE */
-   {  7707, 0x000084F9 }, /* GL_DEPTH_STENCIL */
-   {  7724, 0x0000821A }, /* GL_DEPTH_STENCIL_ATTACHMENT */
-   {  7752, 0x000084F9 }, /* GL_DEPTH_STENCIL_EXT */
-   {  7773, 0x000084F9 }, /* GL_DEPTH_STENCIL_NV */
-   {  7793, 0x0000886F }, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
-   {  7821, 0x0000886E }, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
-   {  7849, 0x00000B71 }, /* GL_DEPTH_TEST */
-   {  7863, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE */
-   {  7885, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE_ARB */
-   {  7911, 0x00000B72 }, /* GL_DEPTH_WRITEMASK */
-   {  7930, 0x00001201 }, /* GL_DIFFUSE */
-   {  7941, 0x00000BD0 }, /* GL_DITHER */
-   {  7951, 0x00000A02 }, /* GL_DOMAIN */
-   {  7961, 0x00001100 }, /* GL_DONT_CARE */
-   {  7974, 0x000086AE }, /* GL_DOT3_RGB */
-   {  7986, 0x000086AF }, /* GL_DOT3_RGBA */
-   {  7999, 0x000086AF }, /* GL_DOT3_RGBA_ARB */
-   {  8016, 0x00008741 }, /* GL_DOT3_RGBA_EXT */
-   {  8033, 0x000086AE }, /* GL_DOT3_RGB_ARB */
-   {  8049, 0x00008740 }, /* GL_DOT3_RGB_EXT */
-   {  8065, 0x0000140A }, /* GL_DOUBLE */
-   {  8075, 0x00000C32 }, /* GL_DOUBLEBUFFER */
-   {  8091, 0x00000C01 }, /* GL_DRAW_BUFFER */
-   {  8106, 0x00008825 }, /* GL_DRAW_BUFFER0 */
-   {  8122, 0x00008825 }, /* GL_DRAW_BUFFER0_ARB */
-   {  8142, 0x00008825 }, /* GL_DRAW_BUFFER0_ATI */
-   {  8162, 0x00008826 }, /* GL_DRAW_BUFFER1 */
-   {  8178, 0x0000882F }, /* GL_DRAW_BUFFER10 */
-   {  8195, 0x0000882F }, /* GL_DRAW_BUFFER10_ARB */
-   {  8216, 0x0000882F }, /* GL_DRAW_BUFFER10_ATI */
-   {  8237, 0x00008830 }, /* GL_DRAW_BUFFER11 */
-   {  8254, 0x00008830 }, /* GL_DRAW_BUFFER11_ARB */
-   {  8275, 0x00008830 }, /* GL_DRAW_BUFFER11_ATI */
-   {  8296, 0x00008831 }, /* GL_DRAW_BUFFER12 */
-   {  8313, 0x00008831 }, /* GL_DRAW_BUFFER12_ARB */
-   {  8334, 0x00008831 }, /* GL_DRAW_BUFFER12_ATI */
-   {  8355, 0x00008832 }, /* GL_DRAW_BUFFER13 */
-   {  8372, 0x00008832 }, /* GL_DRAW_BUFFER13_ARB */
-   {  8393, 0x00008832 }, /* GL_DRAW_BUFFER13_ATI */
-   {  8414, 0x00008833 }, /* GL_DRAW_BUFFER14 */
-   {  8431, 0x00008833 }, /* GL_DRAW_BUFFER14_ARB */
-   {  8452, 0x00008833 }, /* GL_DRAW_BUFFER14_ATI */
-   {  8473, 0x00008834 }, /* GL_DRAW_BUFFER15 */
-   {  8490, 0x00008834 }, /* GL_DRAW_BUFFER15_ARB */
-   {  8511, 0x00008834 }, /* GL_DRAW_BUFFER15_ATI */
-   {  8532, 0x00008826 }, /* GL_DRAW_BUFFER1_ARB */
-   {  8552, 0x00008826 }, /* GL_DRAW_BUFFER1_ATI */
-   {  8572, 0x00008827 }, /* GL_DRAW_BUFFER2 */
-   {  8588, 0x00008827 }, /* GL_DRAW_BUFFER2_ARB */
-   {  8608, 0x00008827 }, /* GL_DRAW_BUFFER2_ATI */
-   {  8628, 0x00008828 }, /* GL_DRAW_BUFFER3 */
-   {  8644, 0x00008828 }, /* GL_DRAW_BUFFER3_ARB */
-   {  8664, 0x00008828 }, /* GL_DRAW_BUFFER3_ATI */
-   {  8684, 0x00008829 }, /* GL_DRAW_BUFFER4 */
-   {  8700, 0x00008829 }, /* GL_DRAW_BUFFER4_ARB */
-   {  8720, 0x00008829 }, /* GL_DRAW_BUFFER4_ATI */
-   {  8740, 0x0000882A }, /* GL_DRAW_BUFFER5 */
-   {  8756, 0x0000882A }, /* GL_DRAW_BUFFER5_ARB */
-   {  8776, 0x0000882A }, /* GL_DRAW_BUFFER5_ATI */
-   {  8796, 0x0000882B }, /* GL_DRAW_BUFFER6 */
-   {  8812, 0x0000882B }, /* GL_DRAW_BUFFER6_ARB */
-   {  8832, 0x0000882B }, /* GL_DRAW_BUFFER6_ATI */
-   {  8852, 0x0000882C }, /* GL_DRAW_BUFFER7 */
-   {  8868, 0x0000882C }, /* GL_DRAW_BUFFER7_ARB */
-   {  8888, 0x0000882C }, /* GL_DRAW_BUFFER7_ATI */
-   {  8908, 0x0000882D }, /* GL_DRAW_BUFFER8 */
-   {  8924, 0x0000882D }, /* GL_DRAW_BUFFER8_ARB */
-   {  8944, 0x0000882D }, /* GL_DRAW_BUFFER8_ATI */
-   {  8964, 0x0000882E }, /* GL_DRAW_BUFFER9 */
-   {  8980, 0x0000882E }, /* GL_DRAW_BUFFER9_ARB */
-   {  9000, 0x0000882E }, /* GL_DRAW_BUFFER9_ATI */
-   {  9020, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER */
-   {  9040, 0x00008CA6 }, /* GL_DRAW_FRAMEBUFFER_BINDING */
-   {  9068, 0x00008CA6 }, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
-   {  9100, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER_EXT */
-   {  9124, 0x00000705 }, /* GL_DRAW_PIXEL_TOKEN */
-   {  9144, 0x00000304 }, /* GL_DST_ALPHA */
-   {  9157, 0x00000306 }, /* GL_DST_COLOR */
-   {  9170, 0x0000877A }, /* GL_DU8DV8_ATI */
-   {  9184, 0x00008779 }, /* GL_DUDV_ATI */
-   {  9196, 0x000088EA }, /* GL_DYNAMIC_COPY */
-   {  9212, 0x000088EA }, /* GL_DYNAMIC_COPY_ARB */
-   {  9232, 0x000088E8 }, /* GL_DYNAMIC_DRAW */
-   {  9248, 0x000088E8 }, /* GL_DYNAMIC_DRAW_ARB */
-   {  9268, 0x000088E9 }, /* GL_DYNAMIC_READ */
-   {  9284, 0x000088E9 }, /* GL_DYNAMIC_READ_ARB */
-   {  9304, 0x00000B43 }, /* GL_EDGE_FLAG */
-   {  9317, 0x00008079 }, /* GL_EDGE_FLAG_ARRAY */
-   {  9336, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
-   {  9370, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB */
-   {  9408, 0x00008093 }, /* GL_EDGE_FLAG_ARRAY_POINTER */
-   {  9435, 0x0000808C }, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-   {  9461, 0x00008893 }, /* GL_ELEMENT_ARRAY_BUFFER */
-   {  9485, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-   {  9517, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB */
-   {  9553, 0x00001600 }, /* GL_EMISSION */
-   {  9565, 0x00002000 }, /* GL_ENABLE_BIT */
-   {  9579, 0x00000202 }, /* GL_EQUAL */
-   {  9588, 0x00001509 }, /* GL_EQUIV */
-   {  9597, 0x00010000 }, /* GL_EVAL_BIT */
-   {  9609, 0x00000800 }, /* GL_EXP */
-   {  9616, 0x00000801 }, /* GL_EXP2 */
-   {  9624, 0x00001F03 }, /* GL_EXTENSIONS */
-   {  9638, 0x00002400 }, /* GL_EYE_LINEAR */
-   {  9652, 0x00002502 }, /* GL_EYE_PLANE */
-   {  9665, 0x0000855C }, /* GL_EYE_PLANE_ABSOLUTE_NV */
-   {  9690, 0x0000855B }, /* GL_EYE_RADIAL_NV */
-   {  9707, 0x00000000 }, /* GL_FALSE */
-   {  9716, 0x00001101 }, /* GL_FASTEST */
-   {  9727, 0x00001C01 }, /* GL_FEEDBACK */
-   {  9739, 0x00000DF0 }, /* GL_FEEDBACK_BUFFER_POINTER */
-   {  9766, 0x00000DF1 }, /* GL_FEEDBACK_BUFFER_SIZE */
-   {  9790, 0x00000DF2 }, /* GL_FEEDBACK_BUFFER_TYPE */
-   {  9814, 0x00001B02 }, /* GL_FILL */
-   {  9822, 0x00008E4D }, /* GL_FIRST_VERTEX_CONVENTION */
-   {  9849, 0x00008E4D }, /* GL_FIRST_VERTEX_CONVENTION_EXT */
-   {  9880, 0x00001D00 }, /* GL_FLAT */
-   {  9888, 0x00001406 }, /* GL_FLOAT */
-   {  9897, 0x00008B5A }, /* GL_FLOAT_MAT2 */
-   {  9911, 0x00008B5A }, /* GL_FLOAT_MAT2_ARB */
-   {  9929, 0x00008B65 }, /* GL_FLOAT_MAT2x3 */
-   {  9945, 0x00008B66 }, /* GL_FLOAT_MAT2x4 */
-   {  9961, 0x00008B5B }, /* GL_FLOAT_MAT3 */
-   {  9975, 0x00008B5B }, /* GL_FLOAT_MAT3_ARB */
-   {  9993, 0x00008B67 }, /* GL_FLOAT_MAT3x2 */
-   { 10009, 0x00008B68 }, /* GL_FLOAT_MAT3x4 */
-   { 10025, 0x00008B5C }, /* GL_FLOAT_MAT4 */
-   { 10039, 0x00008B5C }, /* GL_FLOAT_MAT4_ARB */
-   { 10057, 0x00008B69 }, /* GL_FLOAT_MAT4x2 */
-   { 10073, 0x00008B6A }, /* GL_FLOAT_MAT4x3 */
-   { 10089, 0x00008B50 }, /* GL_FLOAT_VEC2 */
-   { 10103, 0x00008B50 }, /* GL_FLOAT_VEC2_ARB */
-   { 10121, 0x00008B51 }, /* GL_FLOAT_VEC3 */
-   { 10135, 0x00008B51 }, /* GL_FLOAT_VEC3_ARB */
-   { 10153, 0x00008B52 }, /* GL_FLOAT_VEC4 */
-   { 10167, 0x00008B52 }, /* GL_FLOAT_VEC4_ARB */
-   { 10185, 0x00000B60 }, /* GL_FOG */
-   { 10192, 0x00000080 }, /* GL_FOG_BIT */
-   { 10203, 0x00000B66 }, /* GL_FOG_COLOR */
-   { 10216, 0x00008451 }, /* GL_FOG_COORD */
-   { 10229, 0x00008451 }, /* GL_FOG_COORDINATE */
-   { 10247, 0x00008457 }, /* GL_FOG_COORDINATE_ARRAY */
-   { 10271, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-   { 10310, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB */
-   { 10353, 0x00008456 }, /* GL_FOG_COORDINATE_ARRAY_POINTER */
-   { 10385, 0x00008455 }, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
-   { 10416, 0x00008454 }, /* GL_FOG_COORDINATE_ARRAY_TYPE */
-   { 10445, 0x00008450 }, /* GL_FOG_COORDINATE_SOURCE */
-   { 10470, 0x00008457 }, /* GL_FOG_COORD_ARRAY */
-   { 10489, 0x0000889D }, /* GL_FOG_COORD_ARRAY_BUFFER_BINDING */
-   { 10523, 0x00008456 }, /* GL_FOG_COORD_ARRAY_POINTER */
-   { 10550, 0x00008455 }, /* GL_FOG_COORD_ARRAY_STRIDE */
-   { 10576, 0x00008454 }, /* GL_FOG_COORD_ARRAY_TYPE */
-   { 10600, 0x00008450 }, /* GL_FOG_COORD_SRC */
-   { 10617, 0x00000B62 }, /* GL_FOG_DENSITY */
-   { 10632, 0x0000855A }, /* GL_FOG_DISTANCE_MODE_NV */
-   { 10656, 0x00000B64 }, /* GL_FOG_END */
-   { 10667, 0x00000C54 }, /* GL_FOG_HINT */
-   { 10679, 0x00000B61 }, /* GL_FOG_INDEX */
-   { 10692, 0x00000B65 }, /* GL_FOG_MODE */
-   { 10704, 0x00008198 }, /* GL_FOG_OFFSET_SGIX */
-   { 10723, 0x00008199 }, /* GL_FOG_OFFSET_VALUE_SGIX */
-   { 10748, 0x00000B63 }, /* GL_FOG_START */
-   { 10761, 0x00008452 }, /* GL_FRAGMENT_DEPTH */
-   { 10779, 0x00008804 }, /* GL_FRAGMENT_PROGRAM_ARB */
-   { 10803, 0x00008B30 }, /* GL_FRAGMENT_SHADER */
-   { 10822, 0x00008B30 }, /* GL_FRAGMENT_SHADER_ARB */
-   { 10845, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
-   { 10880, 0x00008D40 }, /* GL_FRAMEBUFFER */
-   { 10895, 0x00008215 }, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
-   { 10932, 0x00008214 }, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
-   { 10968, 0x00008210 }, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
-   { 11009, 0x00008211 }, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
-   { 11050, 0x00008216 }, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
-   { 11087, 0x00008213 }, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
-   { 11124, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
-   { 11162, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT */
-   { 11204, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
-   { 11242, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT */
-   { 11284, 0x00008212 }, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
-   { 11319, 0x00008217 }, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
-   { 11358, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT */
-   { 11407, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
-   { 11455, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT */
-   { 11507, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-   { 11547, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
-   { 11591, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
-   { 11631, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT */
-   { 11675, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING */
-   { 11698, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_EXT */
-   { 11725, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE */
-   { 11749, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_EXT */
-   { 11777, 0x00008218 }, /* GL_FRAMEBUFFER_DEFAULT */
-   { 11800, 0x00008D40 }, /* GL_FRAMEBUFFER_EXT */
-   { 11819, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
-   { 11856, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT */
-   { 11897, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
-   { 11938, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */
-   { 11976, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
-   { 12018, 0x00008CD8 }, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
-   { 12069, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
-   { 12107, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
-   { 12152, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT */
-   { 12201, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
-   { 12239, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT */
-   { 12281, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */
-   { 12319, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
-   { 12361, 0x00008CDE }, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
-   { 12393, 0x00008219 }, /* GL_FRAMEBUFFER_UNDEFINED */
-   { 12418, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED */
-   { 12445, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_EXT */
-   { 12476, 0x00000404 }, /* GL_FRONT */
-   { 12485, 0x00000408 }, /* GL_FRONT_AND_BACK */
-   { 12503, 0x00000B46 }, /* GL_FRONT_FACE */
-   { 12517, 0x00000400 }, /* GL_FRONT_LEFT */
-   { 12531, 0x00000401 }, /* GL_FRONT_RIGHT */
-   { 12546, 0x00008006 }, /* GL_FUNC_ADD */
-   { 12558, 0x00008006 }, /* GL_FUNC_ADD_EXT */
-   { 12574, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT */
-   { 12599, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_EXT */
-   { 12628, 0x0000800A }, /* GL_FUNC_SUBTRACT */
-   { 12645, 0x0000800A }, /* GL_FUNC_SUBTRACT_EXT */
-   { 12666, 0x00008191 }, /* GL_GENERATE_MIPMAP */
-   { 12685, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT */
-   { 12709, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT_SGIS */
-   { 12738, 0x00008191 }, /* GL_GENERATE_MIPMAP_SGIS */
-   { 12762, 0x00000206 }, /* GL_GEQUAL */
-   { 12772, 0x00000204 }, /* GL_GREATER */
-   { 12783, 0x00001904 }, /* GL_GREEN */
-   { 12792, 0x00000D19 }, /* GL_GREEN_BIAS */
-   { 12806, 0x00000D53 }, /* GL_GREEN_BITS */
-   { 12820, 0x00000D18 }, /* GL_GREEN_SCALE */
-   { 12835, 0x0000140B }, /* GL_HALF_FLOAT */
-   { 12849, 0x00008000 }, /* GL_HINT_BIT */
-   { 12861, 0x00008024 }, /* GL_HISTOGRAM */
-   { 12874, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE */
-   { 12898, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE_EXT */
-   { 12926, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE */
-   { 12949, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE_EXT */
-   { 12976, 0x00008024 }, /* GL_HISTOGRAM_EXT */
-   { 12993, 0x00008027 }, /* GL_HISTOGRAM_FORMAT */
-   { 13013, 0x00008027 }, /* GL_HISTOGRAM_FORMAT_EXT */
-   { 13037, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE */
-   { 13061, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE_EXT */
-   { 13089, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE */
-   { 13117, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE_EXT */
-   { 13149, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE */
-   { 13171, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE_EXT */
-   { 13197, 0x0000802D }, /* GL_HISTOGRAM_SINK */
-   { 13215, 0x0000802D }, /* GL_HISTOGRAM_SINK_EXT */
-   { 13237, 0x00008026 }, /* GL_HISTOGRAM_WIDTH */
-   { 13256, 0x00008026 }, /* GL_HISTOGRAM_WIDTH_EXT */
-   { 13279, 0x0000862A }, /* GL_IDENTITY_NV */
-   { 13294, 0x00008150 }, /* GL_IGNORE_BORDER_HP */
-   { 13314, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
-   { 13354, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
-   { 13392, 0x00001E02 }, /* GL_INCR */
-   { 13400, 0x00008507 }, /* GL_INCR_WRAP */
-   { 13413, 0x00008507 }, /* GL_INCR_WRAP_EXT */
-   { 13430, 0x00008222 }, /* GL_INDEX */
-   { 13439, 0x00008077 }, /* GL_INDEX_ARRAY */
-   { 13454, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING */
-   { 13484, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING_ARB */
-   { 13518, 0x00008091 }, /* GL_INDEX_ARRAY_POINTER */
-   { 13541, 0x00008086 }, /* GL_INDEX_ARRAY_STRIDE */
-   { 13563, 0x00008085 }, /* GL_INDEX_ARRAY_TYPE */
-   { 13583, 0x00000D51 }, /* GL_INDEX_BITS */
-   { 13597, 0x00000C20 }, /* GL_INDEX_CLEAR_VALUE */
-   { 13618, 0x00000BF1 }, /* GL_INDEX_LOGIC_OP */
-   { 13636, 0x00000C30 }, /* GL_INDEX_MODE */
-   { 13650, 0x00000D13 }, /* GL_INDEX_OFFSET */
-   { 13666, 0x00000D12 }, /* GL_INDEX_SHIFT */
-   { 13681, 0x00000C21 }, /* GL_INDEX_WRITEMASK */
-   { 13700, 0x00008B84 }, /* GL_INFO_LOG_LENGTH */
-   { 13719, 0x00001404 }, /* GL_INT */
-   { 13726, 0x00008049 }, /* GL_INTENSITY */
-   { 13739, 0x0000804C }, /* GL_INTENSITY12 */
-   { 13754, 0x0000804C }, /* GL_INTENSITY12_EXT */
-   { 13773, 0x0000804D }, /* GL_INTENSITY16 */
-   { 13788, 0x0000804D }, /* GL_INTENSITY16_EXT */
-   { 13807, 0x0000804A }, /* GL_INTENSITY4 */
-   { 13821, 0x0000804A }, /* GL_INTENSITY4_EXT */
-   { 13839, 0x0000804B }, /* GL_INTENSITY8 */
-   { 13853, 0x0000804B }, /* GL_INTENSITY8_EXT */
-   { 13871, 0x00008049 }, /* GL_INTENSITY_EXT */
-   { 13888, 0x00008575 }, /* GL_INTERPOLATE */
-   { 13903, 0x00008575 }, /* GL_INTERPOLATE_ARB */
-   { 13922, 0x00008575 }, /* GL_INTERPOLATE_EXT */
-   { 13941, 0x00008B53 }, /* GL_INT_VEC2 */
-   { 13953, 0x00008B53 }, /* GL_INT_VEC2_ARB */
-   { 13969, 0x00008B54 }, /* GL_INT_VEC3 */
-   { 13981, 0x00008B54 }, /* GL_INT_VEC3_ARB */
-   { 13997, 0x00008B55 }, /* GL_INT_VEC4 */
-   { 14009, 0x00008B55 }, /* GL_INT_VEC4_ARB */
-   { 14025, 0x00000500 }, /* GL_INVALID_ENUM */
-   { 14041, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION */
-   { 14074, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_EXT */
-   { 14111, 0x00000502 }, /* GL_INVALID_OPERATION */
-   { 14132, 0x00000501 }, /* GL_INVALID_VALUE */
-   { 14149, 0x0000862B }, /* GL_INVERSE_NV */
-   { 14163, 0x0000862D }, /* GL_INVERSE_TRANSPOSE_NV */
-   { 14187, 0x0000150A }, /* GL_INVERT */
-   { 14197, 0x00001E00 }, /* GL_KEEP */
-   { 14205, 0x00008E4E }, /* GL_LAST_VERTEX_CONVENTION */
-   { 14231, 0x00008E4E }, /* GL_LAST_VERTEX_CONVENTION_EXT */
-   { 14261, 0x00000406 }, /* GL_LEFT */
-   { 14269, 0x00000203 }, /* GL_LEQUAL */
-   { 14279, 0x00000201 }, /* GL_LESS */
-   { 14287, 0x00004000 }, /* GL_LIGHT0 */
-   { 14297, 0x00004001 }, /* GL_LIGHT1 */
-   { 14307, 0x00004002 }, /* GL_LIGHT2 */
-   { 14317, 0x00004003 }, /* GL_LIGHT3 */
-   { 14327, 0x00004004 }, /* GL_LIGHT4 */
-   { 14337, 0x00004005 }, /* GL_LIGHT5 */
-   { 14347, 0x00004006 }, /* GL_LIGHT6 */
-   { 14357, 0x00004007 }, /* GL_LIGHT7 */
-   { 14367, 0x00000B50 }, /* GL_LIGHTING */
-   { 14379, 0x00000040 }, /* GL_LIGHTING_BIT */
-   { 14395, 0x00000B53 }, /* GL_LIGHT_MODEL_AMBIENT */
-   { 14418, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL */
-   { 14447, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL_EXT */
-   { 14480, 0x00000B51 }, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
-   { 14508, 0x00000B52 }, /* GL_LIGHT_MODEL_TWO_SIDE */
-   { 14532, 0x00001B01 }, /* GL_LINE */
-   { 14540, 0x00002601 }, /* GL_LINEAR */
-   { 14550, 0x00001208 }, /* GL_LINEAR_ATTENUATION */
-   { 14572, 0x00008170 }, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
-   { 14602, 0x0000844F }, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
-   { 14633, 0x00002703 }, /* GL_LINEAR_MIPMAP_LINEAR */
-   { 14657, 0x00002701 }, /* GL_LINEAR_MIPMAP_NEAREST */
-   { 14682, 0x00000001 }, /* GL_LINES */
-   { 14691, 0x00000004 }, /* GL_LINE_BIT */
-   { 14703, 0x00000002 }, /* GL_LINE_LOOP */
-   { 14716, 0x00000707 }, /* GL_LINE_RESET_TOKEN */
-   { 14736, 0x00000B20 }, /* GL_LINE_SMOOTH */
-   { 14751, 0x00000C52 }, /* GL_LINE_SMOOTH_HINT */
-   { 14771, 0x00000B24 }, /* GL_LINE_STIPPLE */
-   { 14787, 0x00000B25 }, /* GL_LINE_STIPPLE_PATTERN */
-   { 14811, 0x00000B26 }, /* GL_LINE_STIPPLE_REPEAT */
-   { 14834, 0x00000003 }, /* GL_LINE_STRIP */
-   { 14848, 0x00000702 }, /* GL_LINE_TOKEN */
-   { 14862, 0x00000B21 }, /* GL_LINE_WIDTH */
-   { 14876, 0x00000B23 }, /* GL_LINE_WIDTH_GRANULARITY */
-   { 14902, 0x00000B22 }, /* GL_LINE_WIDTH_RANGE */
-   { 14922, 0x00008B82 }, /* GL_LINK_STATUS */
-   { 14937, 0x00000B32 }, /* GL_LIST_BASE */
-   { 14950, 0x00020000 }, /* GL_LIST_BIT */
-   { 14962, 0x00000B33 }, /* GL_LIST_INDEX */
-   { 14976, 0x00000B30 }, /* GL_LIST_MODE */
-   { 14989, 0x00000101 }, /* GL_LOAD */
-   { 14997, 0x00000BF1 }, /* GL_LOGIC_OP */
-   { 15009, 0x00000BF0 }, /* GL_LOGIC_OP_MODE */
-   { 15026, 0x00008CA1 }, /* GL_LOWER_LEFT */
-   { 15040, 0x00001909 }, /* GL_LUMINANCE */
-   { 15053, 0x00008041 }, /* GL_LUMINANCE12 */
-   { 15068, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12 */
-   { 15091, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12_EXT */
-   { 15118, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4 */
-   { 15140, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4_EXT */
-   { 15166, 0x00008041 }, /* GL_LUMINANCE12_EXT */
-   { 15185, 0x00008042 }, /* GL_LUMINANCE16 */
-   { 15200, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16 */
-   { 15223, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16_EXT */
-   { 15250, 0x00008042 }, /* GL_LUMINANCE16_EXT */
-   { 15269, 0x0000803F }, /* GL_LUMINANCE4 */
-   { 15283, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4 */
-   { 15304, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4_EXT */
-   { 15329, 0x0000803F }, /* GL_LUMINANCE4_EXT */
-   { 15347, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2 */
-   { 15368, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2_EXT */
-   { 15393, 0x00008040 }, /* GL_LUMINANCE8 */
-   { 15407, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8 */
-   { 15428, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8_EXT */
-   { 15453, 0x00008040 }, /* GL_LUMINANCE8_EXT */
-   { 15471, 0x0000190A }, /* GL_LUMINANCE_ALPHA */
-   { 15490, 0x00000D90 }, /* GL_MAP1_COLOR_4 */
-   { 15506, 0x00000DD0 }, /* GL_MAP1_GRID_DOMAIN */
-   { 15526, 0x00000DD1 }, /* GL_MAP1_GRID_SEGMENTS */
-   { 15548, 0x00000D91 }, /* GL_MAP1_INDEX */
-   { 15562, 0x00000D92 }, /* GL_MAP1_NORMAL */
-   { 15577, 0x00000D93 }, /* GL_MAP1_TEXTURE_COORD_1 */
-   { 15601, 0x00000D94 }, /* GL_MAP1_TEXTURE_COORD_2 */
-   { 15625, 0x00000D95 }, /* GL_MAP1_TEXTURE_COORD_3 */
-   { 15649, 0x00000D96 }, /* GL_MAP1_TEXTURE_COORD_4 */
-   { 15673, 0x00000D97 }, /* GL_MAP1_VERTEX_3 */
-   { 15690, 0x00000D98 }, /* GL_MAP1_VERTEX_4 */
-   { 15707, 0x00008660 }, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
-   { 15735, 0x0000866A }, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
-   { 15764, 0x0000866B }, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
-   { 15793, 0x0000866C }, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
-   { 15822, 0x0000866D }, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
-   { 15851, 0x0000866E }, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
-   { 15880, 0x0000866F }, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
-   { 15909, 0x00008661 }, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
-   { 15937, 0x00008662 }, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
-   { 15965, 0x00008663 }, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
-   { 15993, 0x00008664 }, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
-   { 16021, 0x00008665 }, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
-   { 16049, 0x00008666 }, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
-   { 16077, 0x00008667 }, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
-   { 16105, 0x00008668 }, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
-   { 16133, 0x00008669 }, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
-   { 16161, 0x00000DB0 }, /* GL_MAP2_COLOR_4 */
-   { 16177, 0x00000DD2 }, /* GL_MAP2_GRID_DOMAIN */
-   { 16197, 0x00000DD3 }, /* GL_MAP2_GRID_SEGMENTS */
-   { 16219, 0x00000DB1 }, /* GL_MAP2_INDEX */
-   { 16233, 0x00000DB2 }, /* GL_MAP2_NORMAL */
-   { 16248, 0x00000DB3 }, /* GL_MAP2_TEXTURE_COORD_1 */
-   { 16272, 0x00000DB4 }, /* GL_MAP2_TEXTURE_COORD_2 */
-   { 16296, 0x00000DB5 }, /* GL_MAP2_TEXTURE_COORD_3 */
-   { 16320, 0x00000DB6 }, /* GL_MAP2_TEXTURE_COORD_4 */
-   { 16344, 0x00000DB7 }, /* GL_MAP2_VERTEX_3 */
-   { 16361, 0x00000DB8 }, /* GL_MAP2_VERTEX_4 */
-   { 16378, 0x00008670 }, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
-   { 16406, 0x0000867A }, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
-   { 16435, 0x0000867B }, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
-   { 16464, 0x0000867C }, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
-   { 16493, 0x0000867D }, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
-   { 16522, 0x0000867E }, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
-   { 16551, 0x0000867F }, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
-   { 16580, 0x00008671 }, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
-   { 16608, 0x00008672 }, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
-   { 16636, 0x00008673 }, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
-   { 16664, 0x00008674 }, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
-   { 16692, 0x00008675 }, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
-   { 16720, 0x00008676 }, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
-   { 16748, 0x00008677 }, /* GL_MAP2_VERTEX_ATTRIB7_4_NV */
-   { 16776, 0x00008678 }, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
-   { 16804, 0x00008679 }, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
-   { 16832, 0x00000D10 }, /* GL_MAP_COLOR */
-   { 16845, 0x00000010 }, /* GL_MAP_FLUSH_EXPLICIT_BIT */
-   { 16871, 0x00000008 }, /* GL_MAP_INVALIDATE_BUFFER_BIT */
-   { 16900, 0x00000004 }, /* GL_MAP_INVALIDATE_RANGE_BIT */
-   { 16928, 0x00000001 }, /* GL_MAP_READ_BIT */
-   { 16944, 0x00000D11 }, /* GL_MAP_STENCIL */
-   { 16959, 0x00000020 }, /* GL_MAP_UNSYNCHRONIZED_BIT */
-   { 16985, 0x00000002 }, /* GL_MAP_WRITE_BIT */
-   { 17002, 0x000088C0 }, /* GL_MATRIX0_ARB */
-   { 17017, 0x00008630 }, /* GL_MATRIX0_NV */
-   { 17031, 0x000088CA }, /* GL_MATRIX10_ARB */
-   { 17047, 0x000088CB }, /* GL_MATRIX11_ARB */
-   { 17063, 0x000088CC }, /* GL_MATRIX12_ARB */
-   { 17079, 0x000088CD }, /* GL_MATRIX13_ARB */
-   { 17095, 0x000088CE }, /* GL_MATRIX14_ARB */
-   { 17111, 0x000088CF }, /* GL_MATRIX15_ARB */
-   { 17127, 0x000088D0 }, /* GL_MATRIX16_ARB */
-   { 17143, 0x000088D1 }, /* GL_MATRIX17_ARB */
-   { 17159, 0x000088D2 }, /* GL_MATRIX18_ARB */
-   { 17175, 0x000088D3 }, /* GL_MATRIX19_ARB */
-   { 17191, 0x000088C1 }, /* GL_MATRIX1_ARB */
-   { 17206, 0x00008631 }, /* GL_MATRIX1_NV */
-   { 17220, 0x000088D4 }, /* GL_MATRIX20_ARB */
-   { 17236, 0x000088D5 }, /* GL_MATRIX21_ARB */
-   { 17252, 0x000088D6 }, /* GL_MATRIX22_ARB */
-   { 17268, 0x000088D7 }, /* GL_MATRIX23_ARB */
-   { 17284, 0x000088D8 }, /* GL_MATRIX24_ARB */
-   { 17300, 0x000088D9 }, /* GL_MATRIX25_ARB */
-   { 17316, 0x000088DA }, /* GL_MATRIX26_ARB */
-   { 17332, 0x000088DB }, /* GL_MATRIX27_ARB */
-   { 17348, 0x000088DC }, /* GL_MATRIX28_ARB */
-   { 17364, 0x000088DD }, /* GL_MATRIX29_ARB */
-   { 17380, 0x000088C2 }, /* GL_MATRIX2_ARB */
-   { 17395, 0x00008632 }, /* GL_MATRIX2_NV */
-   { 17409, 0x000088DE }, /* GL_MATRIX30_ARB */
-   { 17425, 0x000088DF }, /* GL_MATRIX31_ARB */
-   { 17441, 0x000088C3 }, /* GL_MATRIX3_ARB */
-   { 17456, 0x00008633 }, /* GL_MATRIX3_NV */
-   { 17470, 0x000088C4 }, /* GL_MATRIX4_ARB */
-   { 17485, 0x00008634 }, /* GL_MATRIX4_NV */
-   { 17499, 0x000088C5 }, /* GL_MATRIX5_ARB */
-   { 17514, 0x00008635 }, /* GL_MATRIX5_NV */
-   { 17528, 0x000088C6 }, /* GL_MATRIX6_ARB */
-   { 17543, 0x00008636 }, /* GL_MATRIX6_NV */
-   { 17557, 0x000088C7 }, /* GL_MATRIX7_ARB */
-   { 17572, 0x00008637 }, /* GL_MATRIX7_NV */
-   { 17586, 0x000088C8 }, /* GL_MATRIX8_ARB */
-   { 17601, 0x000088C9 }, /* GL_MATRIX9_ARB */
-   { 17616, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_ARB */
-   { 17642, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-   { 17676, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
-   { 17707, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
-   { 17740, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
-   { 17771, 0x00000BA0 }, /* GL_MATRIX_MODE */
-   { 17786, 0x00008840 }, /* GL_MATRIX_PALETTE_ARB */
-   { 17808, 0x00008008 }, /* GL_MAX */
-   { 17815, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE */
-   { 17838, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
-   { 17870, 0x00000D35 }, /* GL_MAX_ATTRIB_STACK_DEPTH */
-   { 17896, 0x00000D3B }, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
-   { 17929, 0x00008177 }, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
-   { 17955, 0x00008178 }, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-   { 17989, 0x00000D32 }, /* GL_MAX_CLIP_PLANES */
-   { 18008, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS */
-   { 18033, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
-   { 18062, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
-   { 18094, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI */
-   { 18130, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
-   { 18166, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB */
-   { 18206, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT */
-   { 18232, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT_EXT */
-   { 18262, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH */
-   { 18287, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH_EXT */
-   { 18316, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
-   { 18345, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB */
-   { 18378, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS */
-   { 18398, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ARB */
-   { 18422, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ATI */
-   { 18446, 0x000080E9 }, /* GL_MAX_ELEMENTS_INDICES */
-   { 18470, 0x000080E8 }, /* GL_MAX_ELEMENTS_VERTICES */
-   { 18495, 0x00000D30 }, /* GL_MAX_EVAL_ORDER */
-   { 18513, 0x00008008 }, /* GL_MAX_EXT */
-   { 18524, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
-   { 18559, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB */
-   { 18598, 0x00000D31 }, /* GL_MAX_LIGHTS */
-   { 18612, 0x00000B31 }, /* GL_MAX_LIST_NESTING */
-   { 18632, 0x00008841 }, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
-   { 18670, 0x00000D36 }, /* GL_MAX_MODELVIEW_STACK_DEPTH */
-   { 18699, 0x00000D37 }, /* GL_MAX_NAME_STACK_DEPTH */
-   { 18723, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_ARB */
-   { 18751, 0x00000D34 }, /* GL_MAX_PIXEL_MAP_TABLE */
-   { 18774, 0x000088B1 }, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
-   { 18811, 0x0000880B }, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
-   { 18847, 0x000088AD }, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
-   { 18874, 0x000088F5 }, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
-   { 18903, 0x000088B5 }, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
-   { 18937, 0x000088F4 }, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
-   { 18973, 0x000088F6 }, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
-   { 19000, 0x000088A1 }, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
-   { 19032, 0x000088B4 }, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
-   { 19068, 0x000088F8 }, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
-   { 19097, 0x000088F7 }, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
-   { 19126, 0x0000862F }, /* GL_MAX_PROGRAM_MATRICES_ARB */
-   { 19154, 0x0000862E }, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
-   { 19192, 0x000088B3 }, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-   { 19236, 0x0000880E }, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-   { 19279, 0x000088AF }, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
-   { 19313, 0x000088A3 }, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-   { 19352, 0x000088AB }, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
-   { 19389, 0x000088A7 }, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
-   { 19427, 0x00008810 }, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-   { 19470, 0x0000880F }, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-   { 19513, 0x000088A9 }, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
-   { 19543, 0x000088A5 }, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
-   { 19574, 0x0000880D }, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
-   { 19610, 0x0000880C }, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
-   { 19646, 0x00000D38 }, /* GL_MAX_PROJECTION_STACK_DEPTH */
-   { 19676, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
-   { 19710, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_NV */
-   { 19743, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE */
-   { 19768, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
-   { 19797, 0x00008D57 }, /* GL_MAX_SAMPLES */
-   { 19812, 0x00008D57 }, /* GL_MAX_SAMPLES_EXT */
-   { 19831, 0x00009111 }, /* GL_MAX_SERVER_WAIT_TIMEOUT */
-   { 19858, 0x00008504 }, /* GL_MAX_SHININESS_NV */
-   { 19878, 0x00008505 }, /* GL_MAX_SPOT_EXPONENT_NV */
-   { 19902, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS */
-   { 19924, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS_ARB */
-   { 19950, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS */
-   { 19977, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */
-   { 20008, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS */
-   { 20032, 0x000084FF }, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 20066, 0x00000D33 }, /* GL_MAX_TEXTURE_SIZE */
-   { 20086, 0x00000D39 }, /* GL_MAX_TEXTURE_STACK_DEPTH */
-   { 20113, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS */
-   { 20134, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS_ARB */
-   { 20159, 0x0000862F }, /* GL_MAX_TRACK_MATRICES_NV */
-   { 20184, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
-   { 20219, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */
-   { 20241, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */
-   { 20267, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS */
-   { 20289, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */
-   { 20315, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
-   { 20349, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
-   { 20387, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
-   { 20420, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */
-   { 20457, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_ARB */
-   { 20481, 0x00000D3A }, /* GL_MAX_VIEWPORT_DIMS */
-   { 20502, 0x00008007 }, /* GL_MIN */
-   { 20509, 0x0000802E }, /* GL_MINMAX */
-   { 20519, 0x0000802E }, /* GL_MINMAX_EXT */
-   { 20533, 0x0000802F }, /* GL_MINMAX_FORMAT */
-   { 20550, 0x0000802F }, /* GL_MINMAX_FORMAT_EXT */
-   { 20571, 0x00008030 }, /* GL_MINMAX_SINK */
-   { 20586, 0x00008030 }, /* GL_MINMAX_SINK_EXT */
-   { 20605, 0x00008007 }, /* GL_MIN_EXT */
-   { 20616, 0x00008370 }, /* GL_MIRRORED_REPEAT */
-   { 20635, 0x00008370 }, /* GL_MIRRORED_REPEAT_ARB */
-   { 20658, 0x00008370 }, /* GL_MIRRORED_REPEAT_IBM */
-   { 20681, 0x00008742 }, /* GL_MIRROR_CLAMP_ATI */
-   { 20701, 0x00008742 }, /* GL_MIRROR_CLAMP_EXT */
-   { 20721, 0x00008912 }, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-   { 20751, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_ATI */
-   { 20779, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
-   { 20807, 0x00001700 }, /* GL_MODELVIEW */
-   { 20820, 0x00001700 }, /* GL_MODELVIEW0_ARB */
-   { 20838, 0x0000872A }, /* GL_MODELVIEW10_ARB */
-   { 20857, 0x0000872B }, /* GL_MODELVIEW11_ARB */
-   { 20876, 0x0000872C }, /* GL_MODELVIEW12_ARB */
-   { 20895, 0x0000872D }, /* GL_MODELVIEW13_ARB */
-   { 20914, 0x0000872E }, /* GL_MODELVIEW14_ARB */
-   { 20933, 0x0000872F }, /* GL_MODELVIEW15_ARB */
-   { 20952, 0x00008730 }, /* GL_MODELVIEW16_ARB */
-   { 20971, 0x00008731 }, /* GL_MODELVIEW17_ARB */
-   { 20990, 0x00008732 }, /* GL_MODELVIEW18_ARB */
-   { 21009, 0x00008733 }, /* GL_MODELVIEW19_ARB */
-   { 21028, 0x0000850A }, /* GL_MODELVIEW1_ARB */
-   { 21046, 0x00008734 }, /* GL_MODELVIEW20_ARB */
-   { 21065, 0x00008735 }, /* GL_MODELVIEW21_ARB */
-   { 21084, 0x00008736 }, /* GL_MODELVIEW22_ARB */
-   { 21103, 0x00008737 }, /* GL_MODELVIEW23_ARB */
-   { 21122, 0x00008738 }, /* GL_MODELVIEW24_ARB */
-   { 21141, 0x00008739 }, /* GL_MODELVIEW25_ARB */
-   { 21160, 0x0000873A }, /* GL_MODELVIEW26_ARB */
-   { 21179, 0x0000873B }, /* GL_MODELVIEW27_ARB */
-   { 21198, 0x0000873C }, /* GL_MODELVIEW28_ARB */
-   { 21217, 0x0000873D }, /* GL_MODELVIEW29_ARB */
-   { 21236, 0x00008722 }, /* GL_MODELVIEW2_ARB */
-   { 21254, 0x0000873E }, /* GL_MODELVIEW30_ARB */
-   { 21273, 0x0000873F }, /* GL_MODELVIEW31_ARB */
-   { 21292, 0x00008723 }, /* GL_MODELVIEW3_ARB */
-   { 21310, 0x00008724 }, /* GL_MODELVIEW4_ARB */
-   { 21328, 0x00008725 }, /* GL_MODELVIEW5_ARB */
-   { 21346, 0x00008726 }, /* GL_MODELVIEW6_ARB */
-   { 21364, 0x00008727 }, /* GL_MODELVIEW7_ARB */
-   { 21382, 0x00008728 }, /* GL_MODELVIEW8_ARB */
-   { 21400, 0x00008729 }, /* GL_MODELVIEW9_ARB */
-   { 21418, 0x00000BA6 }, /* GL_MODELVIEW_MATRIX */
-   { 21438, 0x00008629 }, /* GL_MODELVIEW_PROJECTION_NV */
-   { 21465, 0x00000BA3 }, /* GL_MODELVIEW_STACK_DEPTH */
-   { 21490, 0x00002100 }, /* GL_MODULATE */
-   { 21502, 0x00008744 }, /* GL_MODULATE_ADD_ATI */
-   { 21522, 0x00008745 }, /* GL_MODULATE_SIGNED_ADD_ATI */
-   { 21549, 0x00008746 }, /* GL_MODULATE_SUBTRACT_ATI */
-   { 21574, 0x00000103 }, /* GL_MULT */
-   { 21582, 0x0000809D }, /* GL_MULTISAMPLE */
-   { 21597, 0x000086B2 }, /* GL_MULTISAMPLE_3DFX */
-   { 21617, 0x0000809D }, /* GL_MULTISAMPLE_ARB */
-   { 21636, 0x20000000 }, /* GL_MULTISAMPLE_BIT */
-   { 21655, 0x20000000 }, /* GL_MULTISAMPLE_BIT_3DFX */
-   { 21679, 0x20000000 }, /* GL_MULTISAMPLE_BIT_ARB */
-   { 21702, 0x00008534 }, /* GL_MULTISAMPLE_FILTER_HINT_NV */
-   { 21732, 0x00002A25 }, /* GL_N3F_V3F */
-   { 21743, 0x00000D70 }, /* GL_NAME_STACK_DEPTH */
-   { 21763, 0x0000150E }, /* GL_NAND */
-   { 21771, 0x00002600 }, /* GL_NEAREST */
-   { 21782, 0x0000844E }, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
-   { 21813, 0x0000844D }, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
-   { 21845, 0x00002702 }, /* GL_NEAREST_MIPMAP_LINEAR */
-   { 21870, 0x00002700 }, /* GL_NEAREST_MIPMAP_NEAREST */
-   { 21896, 0x00000200 }, /* GL_NEVER */
-   { 21905, 0x00001102 }, /* GL_NICEST */
-   { 21915, 0x00000000 }, /* GL_NONE */
-   { 21923, 0x00001505 }, /* GL_NOOP */
-   { 21931, 0x00001508 }, /* GL_NOR */
-   { 21938, 0x00000BA1 }, /* GL_NORMALIZE */
-   { 21951, 0x00008075 }, /* GL_NORMAL_ARRAY */
-   { 21967, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
-   { 21998, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING_ARB */
-   { 22033, 0x0000808F }, /* GL_NORMAL_ARRAY_POINTER */
-   { 22057, 0x0000807F }, /* GL_NORMAL_ARRAY_STRIDE */
-   { 22080, 0x0000807E }, /* GL_NORMAL_ARRAY_TYPE */
-   { 22101, 0x00008511 }, /* GL_NORMAL_MAP */
-   { 22115, 0x00008511 }, /* GL_NORMAL_MAP_ARB */
-   { 22133, 0x00008511 }, /* GL_NORMAL_MAP_NV */
-   { 22150, 0x00000205 }, /* GL_NOTEQUAL */
-   { 22162, 0x00000000 }, /* GL_NO_ERROR */
-   { 22174, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
-   { 22208, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB */
-   { 22246, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */
-   { 22278, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */
-   { 22320, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */
-   { 22350, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */
-   { 22390, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */
-   { 22421, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */
-   { 22450, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */
-   { 22478, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */
-   { 22508, 0x00002401 }, /* GL_OBJECT_LINEAR */
-   { 22525, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */
-   { 22551, 0x00002501 }, /* GL_OBJECT_PLANE */
-   { 22567, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */
-   { 22602, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */
-   { 22624, 0x00009112 }, /* GL_OBJECT_TYPE */
-   { 22639, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */
-   { 22658, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */
-   { 22688, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */
-   { 22709, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */
-   { 22737, 0x00000001 }, /* GL_ONE */
-   { 22744, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */
-   { 22772, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */
-   { 22804, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */
-   { 22832, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */
-   { 22864, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */
-   { 22887, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */
-   { 22910, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */
-   { 22933, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */
-   { 22956, 0x00008598 }, /* GL_OPERAND0_ALPHA */
-   { 22974, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */
-   { 22996, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */
-   { 23018, 0x00008590 }, /* GL_OPERAND0_RGB */
-   { 23034, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */
-   { 23054, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */
-   { 23074, 0x00008599 }, /* GL_OPERAND1_ALPHA */
-   { 23092, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */
-   { 23114, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */
-   { 23136, 0x00008591 }, /* GL_OPERAND1_RGB */
-   { 23152, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */
-   { 23172, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */
-   { 23192, 0x0000859A }, /* GL_OPERAND2_ALPHA */
-   { 23210, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */
-   { 23232, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */
-   { 23254, 0x00008592 }, /* GL_OPERAND2_RGB */
-   { 23270, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */
-   { 23290, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */
-   { 23310, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */
-   { 23331, 0x00008593 }, /* GL_OPERAND3_RGB_NV */
-   { 23350, 0x00001507 }, /* GL_OR */
-   { 23356, 0x00000A01 }, /* GL_ORDER */
-   { 23365, 0x0000150D }, /* GL_OR_INVERTED */
-   { 23380, 0x0000150B }, /* GL_OR_REVERSE */
-   { 23394, 0x00000505 }, /* GL_OUT_OF_MEMORY */
-   { 23411, 0x00000D05 }, /* GL_PACK_ALIGNMENT */
-   { 23429, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */
-   { 23450, 0x00008758 }, /* GL_PACK_INVERT_MESA */
-   { 23470, 0x00000D01 }, /* GL_PACK_LSB_FIRST */
-   { 23488, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */
-   { 23507, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */
-   { 23527, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */
-   { 23547, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */
-   { 23565, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */
-   { 23584, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */
-   { 23609, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */
-   { 23633, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */
-   { 23654, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */
-   { 23676, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */
-   { 23698, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */
-   { 23723, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */
-   { 23747, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */
-   { 23768, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */
-   { 23790, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */
-   { 23812, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */
-   { 23834, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */
-   { 23865, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */
-   { 23885, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-   { 23910, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */
-   { 23930, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */
-   { 23955, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */
-   { 23975, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */
-   { 24000, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */
-   { 24020, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */
-   { 24045, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */
-   { 24065, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */
-   { 24090, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */
-   { 24110, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */
-   { 24135, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */
-   { 24155, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */
-   { 24180, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */
-   { 24200, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */
-   { 24225, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */
-   { 24245, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */
-   { 24270, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */
-   { 24290, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */
-   { 24315, 0x00000020 }, /* GL_PIXEL_MODE_BIT */
-   { 24333, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER */
-   { 24354, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING */
-   { 24383, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */
-   { 24416, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */
-   { 24441, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER */
-   { 24464, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
-   { 24495, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */
-   { 24530, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */
-   { 24557, 0x00001B00 }, /* GL_POINT */
-   { 24566, 0x00000000 }, /* GL_POINTS */
-   { 24576, 0x00000002 }, /* GL_POINT_BIT */
-   { 24589, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */
-   { 24619, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */
-   { 24653, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */
-   { 24687, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */
-   { 24722, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */
-   { 24751, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */
-   { 24784, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */
-   { 24817, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */
-   { 24851, 0x00000B11 }, /* GL_POINT_SIZE */
-   { 24865, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */
-   { 24891, 0x00008127 }, /* GL_POINT_SIZE_MAX */
-   { 24909, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */
-   { 24931, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */
-   { 24953, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */
-   { 24976, 0x00008126 }, /* GL_POINT_SIZE_MIN */
-   { 24994, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */
-   { 25016, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */
-   { 25038, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */
-   { 25061, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */
-   { 25081, 0x00000B10 }, /* GL_POINT_SMOOTH */
-   { 25097, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */
-   { 25118, 0x00008861 }, /* GL_POINT_SPRITE */
-   { 25134, 0x00008861 }, /* GL_POINT_SPRITE_ARB */
-   { 25154, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */
-   { 25183, 0x00008861 }, /* GL_POINT_SPRITE_NV */
-   { 25202, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */
-   { 25228, 0x00000701 }, /* GL_POINT_TOKEN */
-   { 25243, 0x00000009 }, /* GL_POLYGON */
-   { 25254, 0x00000008 }, /* GL_POLYGON_BIT */
-   { 25269, 0x00000B40 }, /* GL_POLYGON_MODE */
-   { 25285, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */
-   { 25308, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */
-   { 25333, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */
-   { 25356, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */
-   { 25379, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */
-   { 25403, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */
-   { 25427, 0x00000B41 }, /* GL_POLYGON_SMOOTH */
-   { 25445, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */
-   { 25468, 0x00000B42 }, /* GL_POLYGON_STIPPLE */
-   { 25487, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */
-   { 25510, 0x00000703 }, /* GL_POLYGON_TOKEN */
-   { 25527, 0x00001203 }, /* GL_POSITION */
-   { 25539, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-   { 25571, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */
-   { 25607, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
-   { 25640, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */
-   { 25677, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
-   { 25708, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */
-   { 25743, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
-   { 25775, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */
-   { 25811, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 25844, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
-   { 25876, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */
-   { 25912, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
-   { 25945, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */
-   { 25982, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */
-   { 26012, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */
-   { 26046, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */
-   { 26077, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */
-   { 26112, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
-   { 26143, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */
-   { 26178, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
-   { 26210, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */
-   { 26246, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */
-   { 26276, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */
-   { 26310, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */
-   { 26341, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */
-   { 26376, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */
-   { 26408, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */
-   { 26439, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */
-   { 26474, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */
-   { 26506, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */
-   { 26542, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */
-   { 26571, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */
-   { 26604, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */
-   { 26634, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */
-   { 26668, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
-   { 26707, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
-   { 26740, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-   { 26780, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
-   { 26814, 0x00008578 }, /* GL_PREVIOUS */
-   { 26826, 0x00008578 }, /* GL_PREVIOUS_ARB */
-   { 26842, 0x00008578 }, /* GL_PREVIOUS_EXT */
-   { 26858, 0x00008577 }, /* GL_PRIMARY_COLOR */
-   { 26875, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */
-   { 26896, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */
-   { 26917, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
-   { 26950, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-   { 26982, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
-   { 27005, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
-   { 27028, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
-   { 27058, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
-   { 27087, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
-   { 27115, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
-   { 27137, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-   { 27165, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
-   { 27193, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
-   { 27215, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
-   { 27236, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-   { 27276, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-   { 27315, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
-   { 27345, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-   { 27380, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
-   { 27413, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
-   { 27447, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-   { 27486, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-   { 27525, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
-   { 27547, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
-   { 27573, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
-   { 27597, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
-   { 27620, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
-   { 27642, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
-   { 27663, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
-   { 27684, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
-   { 27711, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-   { 27743, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-   { 27775, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-   { 27810, 0x00001701 }, /* GL_PROJECTION */
-   { 27824, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
-   { 27845, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
-   { 27871, 0x00008E4F }, /* GL_PROVOKING_VERTEX */
-   { 27891, 0x00008E4F }, /* GL_PROVOKING_VERTEX_EXT */
-   { 27915, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
-   { 27936, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
-   { 27955, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
-   { 27978, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 28017, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-   { 28055, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
-   { 28075, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
-   { 28105, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
-   { 28129, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
-   { 28149, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
-   { 28179, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
-   { 28203, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
-   { 28223, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-   { 28256, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
-   { 28282, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
-   { 28312, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
-   { 28343, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
-   { 28373, 0x00008A1D }, /* GL_PURGEABLE_APPLE */
-   { 28392, 0x00002003 }, /* GL_Q */
-   { 28397, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
-   { 28422, 0x00000007 }, /* GL_QUADS */
-   { 28431, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
-   { 28475, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT */
-   { 28523, 0x00008614 }, /* GL_QUAD_MESH_SUN */
-   { 28540, 0x00000008 }, /* GL_QUAD_STRIP */
-   { 28554, 0x00008E16 }, /* GL_QUERY_BY_REGION_NO_WAIT_NV */
-   { 28584, 0x00008E15 }, /* GL_QUERY_BY_REGION_WAIT_NV */
-   { 28611, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
-   { 28633, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
-   { 28659, 0x00008E14 }, /* GL_QUERY_NO_WAIT_NV */
-   { 28679, 0x00008866 }, /* GL_QUERY_RESULT */
-   { 28695, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
-   { 28715, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
-   { 28741, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
-   { 28771, 0x00008E13 }, /* GL_QUERY_WAIT_NV */
-   { 28788, 0x00002002 }, /* GL_R */
-   { 28793, 0x00002A10 }, /* GL_R3_G3_B2 */
-   { 28805, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
-   { 28838, 0x00000C02 }, /* GL_READ_BUFFER */
-   { 28853, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */
-   { 28873, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING */
-   { 28901, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
-   { 28933, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
-   { 28957, 0x000088B8 }, /* GL_READ_ONLY */
-   { 28970, 0x000088B8 }, /* GL_READ_ONLY_ARB */
-   { 28987, 0x000088BA }, /* GL_READ_WRITE */
-   { 29001, 0x000088BA }, /* GL_READ_WRITE_ARB */
-   { 29019, 0x00001903 }, /* GL_RED */
-   { 29026, 0x00008016 }, /* GL_REDUCE */
-   { 29036, 0x00008016 }, /* GL_REDUCE_EXT */
-   { 29050, 0x00000D15 }, /* GL_RED_BIAS */
-   { 29062, 0x00000D52 }, /* GL_RED_BITS */
-   { 29074, 0x00000D14 }, /* GL_RED_SCALE */
-   { 29087, 0x00008512 }, /* GL_REFLECTION_MAP */
-   { 29105, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
-   { 29127, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
-   { 29148, 0x00008A19 }, /* GL_RELEASED_APPLE */
-   { 29166, 0x00001C00 }, /* GL_RENDER */
-   { 29176, 0x00008D41 }, /* GL_RENDERBUFFER */
-   { 29192, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */
-   { 29219, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING */
-   { 29243, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
-   { 29271, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */
-   { 29297, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */
-   { 29324, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
-   { 29344, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */
-   { 29371, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */
-   { 29394, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
-   { 29421, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-   { 29453, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
-   { 29489, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */
-   { 29514, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */
-   { 29538, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES_EXT */
-   { 29566, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */
-   { 29595, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */
-   { 29617, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
-   { 29643, 0x00001F01 }, /* GL_RENDERER */
-   { 29655, 0x00000C40 }, /* GL_RENDER_MODE */
-   { 29670, 0x00002901 }, /* GL_REPEAT */
-   { 29680, 0x00001E01 }, /* GL_REPLACE */
-   { 29691, 0x00008062 }, /* GL_REPLACE_EXT */
-   { 29706, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
-   { 29729, 0x0000803A }, /* GL_RESCALE_NORMAL */
-   { 29747, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
-   { 29769, 0x00008A1B }, /* GL_RETAINED_APPLE */
-   { 29787, 0x00000102 }, /* GL_RETURN */
-   { 29797, 0x00001907 }, /* GL_RGB */
-   { 29804, 0x00008052 }, /* GL_RGB10 */
-   { 29813, 0x00008059 }, /* GL_RGB10_A2 */
-   { 29825, 0x00008059 }, /* GL_RGB10_A2_EXT */
-   { 29841, 0x00008052 }, /* GL_RGB10_EXT */
-   { 29854, 0x00008053 }, /* GL_RGB12 */
-   { 29863, 0x00008053 }, /* GL_RGB12_EXT */
-   { 29876, 0x00008054 }, /* GL_RGB16 */
-   { 29885, 0x00008054 }, /* GL_RGB16_EXT */
-   { 29898, 0x0000804E }, /* GL_RGB2_EXT */
-   { 29910, 0x0000804F }, /* GL_RGB4 */
-   { 29918, 0x0000804F }, /* GL_RGB4_EXT */
-   { 29930, 0x000083A1 }, /* GL_RGB4_S3TC */
-   { 29943, 0x00008050 }, /* GL_RGB5 */
-   { 29951, 0x00008057 }, /* GL_RGB5_A1 */
-   { 29962, 0x00008057 }, /* GL_RGB5_A1_EXT */
-   { 29977, 0x00008050 }, /* GL_RGB5_EXT */
-   { 29989, 0x00008051 }, /* GL_RGB8 */
-   { 29997, 0x00008051 }, /* GL_RGB8_EXT */
-   { 30009, 0x00001908 }, /* GL_RGBA */
-   { 30017, 0x0000805A }, /* GL_RGBA12 */
-   { 30027, 0x0000805A }, /* GL_RGBA12_EXT */
-   { 30041, 0x0000805B }, /* GL_RGBA16 */
-   { 30051, 0x0000805B }, /* GL_RGBA16_EXT */
-   { 30065, 0x00008055 }, /* GL_RGBA2 */
-   { 30074, 0x00008055 }, /* GL_RGBA2_EXT */
-   { 30087, 0x00008056 }, /* GL_RGBA4 */
-   { 30096, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
-   { 30115, 0x00008056 }, /* GL_RGBA4_EXT */
-   { 30128, 0x000083A3 }, /* GL_RGBA4_S3TC */
-   { 30142, 0x00008058 }, /* GL_RGBA8 */
-   { 30151, 0x00008058 }, /* GL_RGBA8_EXT */
-   { 30164, 0x00008F97 }, /* GL_RGBA8_SNORM */
-   { 30179, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
-   { 30197, 0x00000C31 }, /* GL_RGBA_MODE */
-   { 30210, 0x000083A2 }, /* GL_RGBA_S3TC */
-   { 30223, 0x00008F93 }, /* GL_RGBA_SNORM */
-   { 30237, 0x000083A0 }, /* GL_RGB_S3TC */
-   { 30249, 0x00008573 }, /* GL_RGB_SCALE */
-   { 30262, 0x00008573 }, /* GL_RGB_SCALE_ARB */
-   { 30279, 0x00008573 }, /* GL_RGB_SCALE_EXT */
-   { 30296, 0x00000407 }, /* GL_RIGHT */
-   { 30305, 0x00002000 }, /* GL_S */
-   { 30310, 0x00008B5D }, /* GL_SAMPLER_1D */
-   { 30324, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
-   { 30345, 0x00008B5E }, /* GL_SAMPLER_2D */
-   { 30359, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
-   { 30380, 0x00008B5F }, /* GL_SAMPLER_3D */
-   { 30394, 0x00008B60 }, /* GL_SAMPLER_CUBE */
-   { 30410, 0x000080A9 }, /* GL_SAMPLES */
-   { 30421, 0x000086B4 }, /* GL_SAMPLES_3DFX */
-   { 30437, 0x000080A9 }, /* GL_SAMPLES_ARB */
-   { 30452, 0x00008914 }, /* GL_SAMPLES_PASSED */
-   { 30470, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
-   { 30492, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-   { 30520, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
-   { 30552, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
-   { 30575, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
-   { 30602, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
-   { 30620, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
-   { 30643, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
-   { 30665, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
-   { 30684, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
-   { 30707, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
-   { 30733, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
-   { 30763, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
-   { 30788, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
-   { 30817, 0x00080000 }, /* GL_SCISSOR_BIT */
-   { 30832, 0x00000C10 }, /* GL_SCISSOR_BOX */
-   { 30847, 0x00000C11 }, /* GL_SCISSOR_TEST */
-   { 30863, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
-   { 30888, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
-   { 30928, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
-   { 30972, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-   { 31005, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-   { 31035, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-   { 31067, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-   { 31097, 0x00001C02 }, /* GL_SELECT */
-   { 31107, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
-   { 31135, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
-   { 31160, 0x00008012 }, /* GL_SEPARABLE_2D */
-   { 31176, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
-   { 31203, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
-   { 31234, 0x0000150F }, /* GL_SET */
-   { 31241, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
-   { 31262, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
-   { 31286, 0x00008B4F }, /* GL_SHADER_TYPE */
-   { 31301, 0x00000B54 }, /* GL_SHADE_MODEL */
-   { 31316, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
-   { 31344, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
-   { 31367, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
-   { 31397, 0x00001601 }, /* GL_SHININESS */
-   { 31410, 0x00001402 }, /* GL_SHORT */
-   { 31419, 0x00009119 }, /* GL_SIGNALED */
-   { 31431, 0x00008F9C }, /* GL_SIGNED_NORMALIZED */
-   { 31452, 0x000081F9 }, /* GL_SINGLE_COLOR */
-   { 31468, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
-   { 31488, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
-   { 31507, 0x00008C46 }, /* GL_SLUMINANCE */
-   { 31521, 0x00008C47 }, /* GL_SLUMINANCE8 */
-   { 31536, 0x00008C45 }, /* GL_SLUMINANCE8_ALPHA8 */
-   { 31558, 0x00008C44 }, /* GL_SLUMINANCE_ALPHA */
-   { 31578, 0x00001D01 }, /* GL_SMOOTH */
-   { 31588, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
-   { 31621, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
-   { 31648, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
-   { 31681, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
-   { 31708, 0x00008588 }, /* GL_SOURCE0_ALPHA */
-   { 31725, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
-   { 31746, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
-   { 31767, 0x00008580 }, /* GL_SOURCE0_RGB */
-   { 31782, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
-   { 31801, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
-   { 31820, 0x00008589 }, /* GL_SOURCE1_ALPHA */
-   { 31837, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
-   { 31858, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
-   { 31879, 0x00008581 }, /* GL_SOURCE1_RGB */
-   { 31894, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
-   { 31913, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
-   { 31932, 0x0000858A }, /* GL_SOURCE2_ALPHA */
-   { 31949, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
-   { 31970, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
-   { 31991, 0x00008582 }, /* GL_SOURCE2_RGB */
-   { 32006, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
-   { 32025, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
-   { 32044, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
-   { 32064, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
-   { 32082, 0x00001202 }, /* GL_SPECULAR */
-   { 32094, 0x00002402 }, /* GL_SPHERE_MAP */
-   { 32108, 0x00001206 }, /* GL_SPOT_CUTOFF */
-   { 32123, 0x00001204 }, /* GL_SPOT_DIRECTION */
-   { 32141, 0x00001205 }, /* GL_SPOT_EXPONENT */
-   { 32158, 0x00008588 }, /* GL_SRC0_ALPHA */
-   { 32172, 0x00008580 }, /* GL_SRC0_RGB */
-   { 32184, 0x00008589 }, /* GL_SRC1_ALPHA */
-   { 32198, 0x00008581 }, /* GL_SRC1_RGB */
-   { 32210, 0x0000858A }, /* GL_SRC2_ALPHA */
-   { 32224, 0x00008582 }, /* GL_SRC2_RGB */
-   { 32236, 0x00000302 }, /* GL_SRC_ALPHA */
-   { 32249, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
-   { 32271, 0x00000300 }, /* GL_SRC_COLOR */
-   { 32284, 0x00008C40 }, /* GL_SRGB */
-   { 32292, 0x00008C41 }, /* GL_SRGB8 */
-   { 32301, 0x00008C43 }, /* GL_SRGB8_ALPHA8 */
-   { 32317, 0x00008C42 }, /* GL_SRGB_ALPHA */
-   { 32331, 0x00000503 }, /* GL_STACK_OVERFLOW */
-   { 32349, 0x00000504 }, /* GL_STACK_UNDERFLOW */
-   { 32368, 0x000088E6 }, /* GL_STATIC_COPY */
-   { 32383, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
-   { 32402, 0x000088E4 }, /* GL_STATIC_DRAW */
-   { 32417, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
-   { 32436, 0x000088E5 }, /* GL_STATIC_READ */
-   { 32451, 0x000088E5 }, /* GL_STATIC_READ_ARB */
-   { 32470, 0x00001802 }, /* GL_STENCIL */
-   { 32481, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
-   { 32503, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
-   { 32529, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
-   { 32550, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
-   { 32575, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
-   { 32596, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
-   { 32621, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-   { 32653, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
-   { 32689, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
-   { 32721, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
-   { 32757, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
-   { 32777, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
-   { 32804, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
-   { 32830, 0x00000D57 }, /* GL_STENCIL_BITS */
-   { 32846, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
-   { 32868, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
-   { 32891, 0x00000B94 }, /* GL_STENCIL_FAIL */
-   { 32907, 0x00000B92 }, /* GL_STENCIL_FUNC */
-   { 32923, 0x00001901 }, /* GL_STENCIL_INDEX */
-   { 32940, 0x00008D46 }, /* GL_STENCIL_INDEX1 */
-   { 32958, 0x00008D49 }, /* GL_STENCIL_INDEX16 */
-   { 32977, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
-   { 33000, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
-   { 33022, 0x00008D47 }, /* GL_STENCIL_INDEX4 */
-   { 33040, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
-   { 33062, 0x00008D48 }, /* GL_STENCIL_INDEX8 */
-   { 33080, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
-   { 33102, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
-   { 33123, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
-   { 33150, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
-   { 33177, 0x00000B97 }, /* GL_STENCIL_REF */
-   { 33192, 0x00000B90 }, /* GL_STENCIL_TEST */
-   { 33208, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
-   { 33237, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
-   { 33259, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
-   { 33280, 0x00000C33 }, /* GL_STEREO */
-   { 33290, 0x000085BE }, /* GL_STORAGE_CACHED_APPLE */
-   { 33314, 0x000085BD }, /* GL_STORAGE_PRIVATE_APPLE */
-   { 33339, 0x000085BF }, /* GL_STORAGE_SHARED_APPLE */
-   { 33363, 0x000088E2 }, /* GL_STREAM_COPY */
-   { 33378, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
-   { 33397, 0x000088E0 }, /* GL_STREAM_DRAW */
-   { 33412, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
-   { 33431, 0x000088E1 }, /* GL_STREAM_READ */
-   { 33446, 0x000088E1 }, /* GL_STREAM_READ_ARB */
-   { 33465, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
-   { 33482, 0x000084E7 }, /* GL_SUBTRACT */
-   { 33494, 0x000084E7 }, /* GL_SUBTRACT_ARB */
-   { 33510, 0x00009113 }, /* GL_SYNC_CONDITION */
-   { 33528, 0x00009116 }, /* GL_SYNC_FENCE */
-   { 33542, 0x00009115 }, /* GL_SYNC_FLAGS */
-   { 33556, 0x00000001 }, /* GL_SYNC_FLUSH_COMMANDS_BIT */
-   { 33583, 0x00009117 }, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
-   { 33613, 0x00009114 }, /* GL_SYNC_STATUS */
-   { 33628, 0x00002001 }, /* GL_T */
-   { 33633, 0x00002A2A }, /* GL_T2F_C3F_V3F */
-   { 33648, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
-   { 33667, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
-   { 33683, 0x00002A2B }, /* GL_T2F_N3F_V3F */
-   { 33698, 0x00002A27 }, /* GL_T2F_V3F */
-   { 33709, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
-   { 33728, 0x00002A28 }, /* GL_T4F_V4F */
-   { 33739, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
-   { 33762, 0x00001702 }, /* GL_TEXTURE */
-   { 33773, 0x000084C0 }, /* GL_TEXTURE0 */
-   { 33785, 0x000084C0 }, /* GL_TEXTURE0_ARB */
-   { 33801, 0x000084C1 }, /* GL_TEXTURE1 */
-   { 33813, 0x000084CA }, /* GL_TEXTURE10 */
-   { 33826, 0x000084CA }, /* GL_TEXTURE10_ARB */
-   { 33843, 0x000084CB }, /* GL_TEXTURE11 */
-   { 33856, 0x000084CB }, /* GL_TEXTURE11_ARB */
-   { 33873, 0x000084CC }, /* GL_TEXTURE12 */
-   { 33886, 0x000084CC }, /* GL_TEXTURE12_ARB */
-   { 33903, 0x000084CD }, /* GL_TEXTURE13 */
-   { 33916, 0x000084CD }, /* GL_TEXTURE13_ARB */
-   { 33933, 0x000084CE }, /* GL_TEXTURE14 */
-   { 33946, 0x000084CE }, /* GL_TEXTURE14_ARB */
-   { 33963, 0x000084CF }, /* GL_TEXTURE15 */
-   { 33976, 0x000084CF }, /* GL_TEXTURE15_ARB */
-   { 33993, 0x000084D0 }, /* GL_TEXTURE16 */
-   { 34006, 0x000084D0 }, /* GL_TEXTURE16_ARB */
-   { 34023, 0x000084D1 }, /* GL_TEXTURE17 */
-   { 34036, 0x000084D1 }, /* GL_TEXTURE17_ARB */
-   { 34053, 0x000084D2 }, /* GL_TEXTURE18 */
-   { 34066, 0x000084D2 }, /* GL_TEXTURE18_ARB */
-   { 34083, 0x000084D3 }, /* GL_TEXTURE19 */
-   { 34096, 0x000084D3 }, /* GL_TEXTURE19_ARB */
-   { 34113, 0x000084C1 }, /* GL_TEXTURE1_ARB */
-   { 34129, 0x000084C2 }, /* GL_TEXTURE2 */
-   { 34141, 0x000084D4 }, /* GL_TEXTURE20 */
-   { 34154, 0x000084D4 }, /* GL_TEXTURE20_ARB */
-   { 34171, 0x000084D5 }, /* GL_TEXTURE21 */
-   { 34184, 0x000084D5 }, /* GL_TEXTURE21_ARB */
-   { 34201, 0x000084D6 }, /* GL_TEXTURE22 */
-   { 34214, 0x000084D6 }, /* GL_TEXTURE22_ARB */
-   { 34231, 0x000084D7 }, /* GL_TEXTURE23 */
-   { 34244, 0x000084D7 }, /* GL_TEXTURE23_ARB */
-   { 34261, 0x000084D8 }, /* GL_TEXTURE24 */
-   { 34274, 0x000084D8 }, /* GL_TEXTURE24_ARB */
-   { 34291, 0x000084D9 }, /* GL_TEXTURE25 */
-   { 34304, 0x000084D9 }, /* GL_TEXTURE25_ARB */
-   { 34321, 0x000084DA }, /* GL_TEXTURE26 */
-   { 34334, 0x000084DA }, /* GL_TEXTURE26_ARB */
-   { 34351, 0x000084DB }, /* GL_TEXTURE27 */
-   { 34364, 0x000084DB }, /* GL_TEXTURE27_ARB */
-   { 34381, 0x000084DC }, /* GL_TEXTURE28 */
-   { 34394, 0x000084DC }, /* GL_TEXTURE28_ARB */
-   { 34411, 0x000084DD }, /* GL_TEXTURE29 */
-   { 34424, 0x000084DD }, /* GL_TEXTURE29_ARB */
-   { 34441, 0x000084C2 }, /* GL_TEXTURE2_ARB */
-   { 34457, 0x000084C3 }, /* GL_TEXTURE3 */
-   { 34469, 0x000084DE }, /* GL_TEXTURE30 */
-   { 34482, 0x000084DE }, /* GL_TEXTURE30_ARB */
-   { 34499, 0x000084DF }, /* GL_TEXTURE31 */
-   { 34512, 0x000084DF }, /* GL_TEXTURE31_ARB */
-   { 34529, 0x000084C3 }, /* GL_TEXTURE3_ARB */
-   { 34545, 0x000084C4 }, /* GL_TEXTURE4 */
-   { 34557, 0x000084C4 }, /* GL_TEXTURE4_ARB */
-   { 34573, 0x000084C5 }, /* GL_TEXTURE5 */
-   { 34585, 0x000084C5 }, /* GL_TEXTURE5_ARB */
-   { 34601, 0x000084C6 }, /* GL_TEXTURE6 */
-   { 34613, 0x000084C6 }, /* GL_TEXTURE6_ARB */
-   { 34629, 0x000084C7 }, /* GL_TEXTURE7 */
-   { 34641, 0x000084C7 }, /* GL_TEXTURE7_ARB */
-   { 34657, 0x000084C8 }, /* GL_TEXTURE8 */
-   { 34669, 0x000084C8 }, /* GL_TEXTURE8_ARB */
-   { 34685, 0x000084C9 }, /* GL_TEXTURE9 */
-   { 34697, 0x000084C9 }, /* GL_TEXTURE9_ARB */
-   { 34713, 0x00000DE0 }, /* GL_TEXTURE_1D */
-   { 34727, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
-   { 34751, 0x00000DE1 }, /* GL_TEXTURE_2D */
-   { 34765, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
-   { 34789, 0x0000806F }, /* GL_TEXTURE_3D */
-   { 34803, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
-   { 34825, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
-   { 34851, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
-   { 34873, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
-   { 34895, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
-   { 34927, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
-   { 34949, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
-   { 34981, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
-   { 35003, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
-   { 35031, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
-   { 35063, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
-   { 35096, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
-   { 35128, 0x00040000 }, /* GL_TEXTURE_BIT */
-   { 35143, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
-   { 35164, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
-   { 35189, 0x00001005 }, /* GL_TEXTURE_BORDER */
-   { 35207, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
-   { 35231, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-   { 35262, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
-   { 35292, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-   { 35322, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-   { 35357, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-   { 35388, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-   { 35426, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
-   { 35453, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
-   { 35485, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
-   { 35519, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
-   { 35543, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
-   { 35571, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
-   { 35595, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
-   { 35623, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-   { 35656, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
-   { 35680, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
-   { 35702, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
-   { 35724, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
-   { 35750, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
-   { 35784, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-   { 35817, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
-   { 35854, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
-   { 35882, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
-   { 35914, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
-   { 35937, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
-   { 35975, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
-   { 36017, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
-   { 36048, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-   { 36076, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
-   { 36106, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-   { 36134, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
-   { 36154, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
-   { 36178, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-   { 36209, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
-   { 36244, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-   { 36275, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
-   { 36310, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-   { 36341, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
-   { 36376, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-   { 36407, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
-   { 36442, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-   { 36473, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
-   { 36508, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-   { 36539, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
-   { 36574, 0x000088F4 }, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
-   { 36603, 0x00008071 }, /* GL_TEXTURE_DEPTH */
-   { 36620, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
-   { 36642, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
-   { 36668, 0x00002300 }, /* GL_TEXTURE_ENV */
-   { 36683, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
-   { 36704, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
-   { 36724, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
-   { 36750, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
-   { 36770, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
-   { 36787, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
-   { 36804, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
-   { 36821, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
-   { 36838, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
-   { 36863, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
-   { 36885, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
-   { 36911, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
-   { 36929, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
-   { 36955, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
-   { 36981, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
-   { 37011, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
-   { 37038, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
-   { 37063, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
-   { 37083, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
-   { 37107, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
-   { 37134, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-   { 37161, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-   { 37188, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
-   { 37214, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
-   { 37244, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
-   { 37266, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
-   { 37284, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 37314, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-   { 37342, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-   { 37370, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-   { 37398, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
-   { 37419, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
-   { 37438, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
-   { 37460, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
-   { 37479, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
-   { 37499, 0x000085B7 }, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
-   { 37529, 0x000085B8 }, /* GL_TEXTURE_RANGE_POINTER_APPLE */
-   { 37560, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
-   { 37585, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
-   { 37609, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
-   { 37629, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
-   { 37653, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
-   { 37673, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
-   { 37696, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
-   { 37720, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE_EXT */
-   { 37748, 0x000085BC }, /* GL_TEXTURE_STORAGE_HINT_APPLE */
-   { 37778, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
-   { 37803, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
-   { 37837, 0x00001000 }, /* GL_TEXTURE_WIDTH */
-   { 37854, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
-   { 37872, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
-   { 37890, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
-   { 37908, 0x0000911B }, /* GL_TIMEOUT_EXPIRED */
-   { 37927, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
-   { 37947, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
-   { 37966, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-   { 37995, 0x00001000 }, /* GL_TRANSFORM_BIT */
-   { 38012, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
-   { 38038, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
-   { 38068, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-   { 38100, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-   { 38130, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
-   { 38164, 0x0000862C }, /* GL_TRANSPOSE_NV */
-   { 38180, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-   { 38211, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
-   { 38246, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-   { 38274, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
-   { 38306, 0x00000004 }, /* GL_TRIANGLES */
-   { 38319, 0x00000006 }, /* GL_TRIANGLE_FAN */
-   { 38335, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
-   { 38356, 0x00000005 }, /* GL_TRIANGLE_STRIP */
-   { 38374, 0x00000001 }, /* GL_TRUE */
-   { 38382, 0x00008A1C }, /* GL_UNDEFINED_APPLE */
-   { 38401, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
-   { 38421, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
-   { 38444, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
-   { 38464, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
-   { 38485, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
-   { 38507, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
-   { 38529, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
-   { 38549, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
-   { 38570, 0x00009118 }, /* GL_UNSIGNALED */
-   { 38584, 0x00001401 }, /* GL_UNSIGNED_BYTE */
-   { 38601, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-   { 38628, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
-   { 38651, 0x00001405 }, /* GL_UNSIGNED_INT */
-   { 38667, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
-   { 38694, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
-   { 38715, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_EXT */
-   { 38740, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
-   { 38764, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-   { 38795, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
-   { 38819, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-   { 38847, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
-   { 38870, 0x00001403 }, /* GL_UNSIGNED_SHORT */
-   { 38888, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-   { 38918, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-   { 38944, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-   { 38974, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-   { 39000, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
-   { 39024, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-   { 39052, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-   { 39080, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
-   { 39107, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-   { 39139, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
-   { 39170, 0x00008CA2 }, /* GL_UPPER_LEFT */
-   { 39184, 0x00002A20 }, /* GL_V2F */
-   { 39191, 0x00002A21 }, /* GL_V3F */
-   { 39198, 0x00008B83 }, /* GL_VALIDATE_STATUS */
-   { 39217, 0x00001F00 }, /* GL_VENDOR */
-   { 39227, 0x00001F02 }, /* GL_VERSION */
-   { 39238, 0x00008074 }, /* GL_VERTEX_ARRAY */
-   { 39254, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING */
-   { 39278, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
-   { 39308, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-   { 39339, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
-   { 39374, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
-   { 39398, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
-   { 39419, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
-   { 39442, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
-   { 39463, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-   { 39490, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-   { 39518, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-   { 39546, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-   { 39574, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-   { 39602, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-   { 39630, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-   { 39658, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-   { 39685, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-   { 39712, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-   { 39739, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-   { 39766, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-   { 39793, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-   { 39820, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-   { 39847, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-   { 39874, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-   { 39901, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-   { 39939, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
-   { 39981, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-   { 40012, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
-   { 40047, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
-   { 40081, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
-   { 40119, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-   { 40150, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
-   { 40185, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-   { 40213, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
-   { 40245, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-   { 40275, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
-   { 40309, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
-   { 40337, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
-   { 40369, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
-   { 40389, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
-   { 40411, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
-   { 40440, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
-   { 40461, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-   { 40490, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
-   { 40523, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
-   { 40555, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-   { 40582, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
-   { 40613, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
-   { 40643, 0x00008B31 }, /* GL_VERTEX_SHADER */
-   { 40660, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
-   { 40681, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
-   { 40708, 0x00000BA2 }, /* GL_VIEWPORT */
-   { 40720, 0x00000800 }, /* GL_VIEWPORT_BIT */
-   { 40736, 0x00008A1A }, /* GL_VOLATILE_APPLE */
-   { 40754, 0x0000911D }, /* GL_WAIT_FAILED */
-   { 40769, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
-   { 40789, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-   { 40820, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
-   { 40855, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-   { 40883, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-   { 40908, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-   { 40935, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-   { 40960, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
-   { 40984, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
-   { 41003, 0x000088B9 }, /* GL_WRITE_ONLY */
-   { 41017, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
-   { 41035, 0x00001506 }, /* GL_XOR */
-   { 41042, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
-   { 41061, 0x00008757 }, /* GL_YCBCR_MESA */
-   { 41075, 0x00000000 }, /* GL_ZERO */
-   { 41083, 0x00000D16 }, /* GL_ZOOM_X */
-   { 41093, 0x00000D17 }, /* GL_ZOOM_Y */
+   {  1204, 0x000080E1 }, /* GL_BGRA_EXT */
+   {  1216, 0x00001A00 }, /* GL_BITMAP */
+   {  1226, 0x00000704 }, /* GL_BITMAP_TOKEN */
+   {  1242, 0x00000BE2 }, /* GL_BLEND */
+   {  1251, 0x00008005 }, /* GL_BLEND_COLOR */
+   {  1266, 0x00008005 }, /* GL_BLEND_COLOR_EXT */
+   {  1285, 0x00000BE0 }, /* GL_BLEND_DST */
+   {  1298, 0x000080CA }, /* GL_BLEND_DST_ALPHA */
+   {  1317, 0x000080CA }, /* GL_BLEND_DST_ALPHA_OES */
+   {  1340, 0x000080C8 }, /* GL_BLEND_DST_RGB */
+   {  1357, 0x000080C8 }, /* GL_BLEND_DST_RGB_OES */
+   {  1378, 0x00008009 }, /* GL_BLEND_EQUATION */
+   {  1396, 0x0000883D }, /* GL_BLEND_EQUATION_ALPHA */
+   {  1420, 0x0000883D }, /* GL_BLEND_EQUATION_ALPHA_EXT */
+   {  1448, 0x0000883D }, /* GL_BLEND_EQUATION_ALPHA_OES */
+   {  1476, 0x00008009 }, /* GL_BLEND_EQUATION_EXT */
+   {  1498, 0x00008009 }, /* GL_BLEND_EQUATION_OES */
+   {  1520, 0x00008009 }, /* GL_BLEND_EQUATION_RGB */
+   {  1542, 0x00008009 }, /* GL_BLEND_EQUATION_RGB_EXT */
+   {  1568, 0x00008009 }, /* GL_BLEND_EQUATION_RGB_OES */
+   {  1594, 0x00000BE1 }, /* GL_BLEND_SRC */
+   {  1607, 0x000080CB }, /* GL_BLEND_SRC_ALPHA */
+   {  1626, 0x000080CB }, /* GL_BLEND_SRC_ALPHA_OES */
+   {  1649, 0x000080C9 }, /* GL_BLEND_SRC_RGB */
+   {  1666, 0x000080C9 }, /* GL_BLEND_SRC_RGB_OES */
+   {  1687, 0x00001905 }, /* GL_BLUE */
+   {  1695, 0x00000D1B }, /* GL_BLUE_BIAS */
+   {  1708, 0x00000D54 }, /* GL_BLUE_BITS */
+   {  1721, 0x00000D1A }, /* GL_BLUE_SCALE */
+   {  1735, 0x00008B56 }, /* GL_BOOL */
+   {  1743, 0x00008B56 }, /* GL_BOOL_ARB */
+   {  1755, 0x00008B57 }, /* GL_BOOL_VEC2 */
+   {  1768, 0x00008B57 }, /* GL_BOOL_VEC2_ARB */
+   {  1785, 0x00008B58 }, /* GL_BOOL_VEC3 */
+   {  1798, 0x00008B58 }, /* GL_BOOL_VEC3_ARB */
+   {  1815, 0x00008B59 }, /* GL_BOOL_VEC4 */
+   {  1828, 0x00008B59 }, /* GL_BOOL_VEC4_ARB */
+   {  1845, 0x000088BB }, /* GL_BUFFER_ACCESS */
+   {  1862, 0x000088BB }, /* GL_BUFFER_ACCESS_ARB */
+   {  1883, 0x000088BB }, /* GL_BUFFER_ACCESS_OES */
+   {  1904, 0x00008A13 }, /* GL_BUFFER_FLUSHING_UNMAP_APPLE */
+   {  1935, 0x000088BC }, /* GL_BUFFER_MAPPED */
+   {  1952, 0x000088BC }, /* GL_BUFFER_MAPPED_ARB */
+   {  1973, 0x000088BC }, /* GL_BUFFER_MAPPED_OES */
+   {  1994, 0x000088BD }, /* GL_BUFFER_MAP_POINTER */
+   {  2016, 0x000088BD }, /* GL_BUFFER_MAP_POINTER_ARB */
+   {  2042, 0x000088BD }, /* GL_BUFFER_MAP_POINTER_OES */
+   {  2068, 0x000085B3 }, /* GL_BUFFER_OBJECT_APPLE */
+   {  2091, 0x00008A12 }, /* GL_BUFFER_SERIALIZED_MODIFY_APPLE */
+   {  2125, 0x00008764 }, /* GL_BUFFER_SIZE */
+   {  2140, 0x00008764 }, /* GL_BUFFER_SIZE_ARB */
+   {  2159, 0x00008765 }, /* GL_BUFFER_USAGE */
+   {  2175, 0x00008765 }, /* GL_BUFFER_USAGE_ARB */
+   {  2195, 0x0000877B }, /* GL_BUMP_ENVMAP_ATI */
+   {  2214, 0x00008777 }, /* GL_BUMP_NUM_TEX_UNITS_ATI */
+   {  2240, 0x00008775 }, /* GL_BUMP_ROT_MATRIX_ATI */
+   {  2263, 0x00008776 }, /* GL_BUMP_ROT_MATRIX_SIZE_ATI */
+   {  2291, 0x0000877C }, /* GL_BUMP_TARGET_ATI */
+   {  2310, 0x00008778 }, /* GL_BUMP_TEX_UNITS_ATI */
+   {  2332, 0x00001400 }, /* GL_BYTE */
+   {  2340, 0x00002A24 }, /* GL_C3F_V3F */
+   {  2351, 0x00002A26 }, /* GL_C4F_N3F_V3F */
+   {  2366, 0x00002A22 }, /* GL_C4UB_V2F */
+   {  2378, 0x00002A23 }, /* GL_C4UB_V3F */
+   {  2390, 0x00000901 }, /* GL_CCW */
+   {  2397, 0x00002900 }, /* GL_CLAMP */
+   {  2406, 0x0000812D }, /* GL_CLAMP_TO_BORDER */
+   {  2425, 0x0000812D }, /* GL_CLAMP_TO_BORDER_ARB */
+   {  2448, 0x0000812D }, /* GL_CLAMP_TO_BORDER_SGIS */
+   {  2472, 0x0000812F }, /* GL_CLAMP_TO_EDGE */
+   {  2489, 0x0000812F }, /* GL_CLAMP_TO_EDGE_SGIS */
+   {  2511, 0x00001500 }, /* GL_CLEAR */
+   {  2520, 0x000084E1 }, /* GL_CLIENT_ACTIVE_TEXTURE */
+   {  2545, 0x000084E1 }, /* GL_CLIENT_ACTIVE_TEXTURE_ARB */
+   {  2574, 0xFFFFFFFF }, /* GL_CLIENT_ALL_ATTRIB_BITS */
+   {  2600, 0x00000BB1 }, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
+   {  2629, 0x00000001 }, /* GL_CLIENT_PIXEL_STORE_BIT */
+   {  2655, 0x00000002 }, /* GL_CLIENT_VERTEX_ARRAY_BIT */
+   {  2682, 0x00003000 }, /* GL_CLIP_PLANE0 */
+   {  2697, 0x00003001 }, /* GL_CLIP_PLANE1 */
+   {  2712, 0x00003002 }, /* GL_CLIP_PLANE2 */
+   {  2727, 0x00003003 }, /* GL_CLIP_PLANE3 */
+   {  2742, 0x00003004 }, /* GL_CLIP_PLANE4 */
+   {  2757, 0x00003005 }, /* GL_CLIP_PLANE5 */
+   {  2772, 0x000080F0 }, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
+   {  2805, 0x00000A00 }, /* GL_COEFF */
+   {  2814, 0x00001800 }, /* GL_COLOR */
+   {  2823, 0x00008076 }, /* GL_COLOR_ARRAY */
+   {  2838, 0x00008898 }, /* GL_COLOR_ARRAY_BUFFER_BINDING */
+   {  2868, 0x00008898 }, /* GL_COLOR_ARRAY_BUFFER_BINDING_ARB */
+   {  2902, 0x00008090 }, /* GL_COLOR_ARRAY_POINTER */
+   {  2925, 0x00008081 }, /* GL_COLOR_ARRAY_SIZE */
+   {  2945, 0x00008083 }, /* GL_COLOR_ARRAY_STRIDE */
+   {  2967, 0x00008082 }, /* GL_COLOR_ARRAY_TYPE */
+   {  2987, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0 */
+   {  3008, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0_EXT */
+   {  3033, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0_OES */
+   {  3058, 0x00008CE1 }, /* GL_COLOR_ATTACHMENT1 */
+   {  3079, 0x00008CEA }, /* GL_COLOR_ATTACHMENT10 */
+   {  3101, 0x00008CEA }, /* GL_COLOR_ATTACHMENT10_EXT */
+   {  3127, 0x00008CEB }, /* GL_COLOR_ATTACHMENT11 */
+   {  3149, 0x00008CEB }, /* GL_COLOR_ATTACHMENT11_EXT */
+   {  3175, 0x00008CEC }, /* GL_COLOR_ATTACHMENT12 */
+   {  3197, 0x00008CEC }, /* GL_COLOR_ATTACHMENT12_EXT */
+   {  3223, 0x00008CED }, /* GL_COLOR_ATTACHMENT13 */
+   {  3245, 0x00008CED }, /* GL_COLOR_ATTACHMENT13_EXT */
+   {  3271, 0x00008CEE }, /* GL_COLOR_ATTACHMENT14 */
+   {  3293, 0x00008CEE }, /* GL_COLOR_ATTACHMENT14_EXT */
+   {  3319, 0x00008CEF }, /* GL_COLOR_ATTACHMENT15 */
+   {  3341, 0x00008CEF }, /* GL_COLOR_ATTACHMENT15_EXT */
+   {  3367, 0x00008CE1 }, /* GL_COLOR_ATTACHMENT1_EXT */
+   {  3392, 0x00008CE2 }, /* GL_COLOR_ATTACHMENT2 */
+   {  3413, 0x00008CE2 }, /* GL_COLOR_ATTACHMENT2_EXT */
+   {  3438, 0x00008CE3 }, /* GL_COLOR_ATTACHMENT3 */
+   {  3459, 0x00008CE3 }, /* GL_COLOR_ATTACHMENT3_EXT */
+   {  3484, 0x00008CE4 }, /* GL_COLOR_ATTACHMENT4 */
+   {  3505, 0x00008CE4 }, /* GL_COLOR_ATTACHMENT4_EXT */
+   {  3530, 0x00008CE5 }, /* GL_COLOR_ATTACHMENT5 */
+   {  3551, 0x00008CE5 }, /* GL_COLOR_ATTACHMENT5_EXT */
+   {  3576, 0x00008CE6 }, /* GL_COLOR_ATTACHMENT6 */
+   {  3597, 0x00008CE6 }, /* GL_COLOR_ATTACHMENT6_EXT */
+   {  3622, 0x00008CE7 }, /* GL_COLOR_ATTACHMENT7 */
+   {  3643, 0x00008CE7 }, /* GL_COLOR_ATTACHMENT7_EXT */
+   {  3668, 0x00008CE8 }, /* GL_COLOR_ATTACHMENT8 */
+   {  3689, 0x00008CE8 }, /* GL_COLOR_ATTACHMENT8_EXT */
+   {  3714, 0x00008CE9 }, /* GL_COLOR_ATTACHMENT9 */
+   {  3735, 0x00008CE9 }, /* GL_COLOR_ATTACHMENT9_EXT */
+   {  3760, 0x00004000 }, /* GL_COLOR_BUFFER_BIT */
+   {  3780, 0x00000C22 }, /* GL_COLOR_CLEAR_VALUE */
+   {  3801, 0x00001900 }, /* GL_COLOR_INDEX */
+   {  3816, 0x00001603 }, /* GL_COLOR_INDEXES */
+   {  3833, 0x00000BF2 }, /* GL_COLOR_LOGIC_OP */
+   {  3851, 0x00000B57 }, /* GL_COLOR_MATERIAL */
+   {  3869, 0x00000B55 }, /* GL_COLOR_MATERIAL_FACE */
+   {  3892, 0x00000B56 }, /* GL_COLOR_MATERIAL_PARAMETER */
+   {  3920, 0x000080B1 }, /* GL_COLOR_MATRIX */
+   {  3936, 0x000080B1 }, /* GL_COLOR_MATRIX_SGI */
+   {  3956, 0x000080B2 }, /* GL_COLOR_MATRIX_STACK_DEPTH */
+   {  3984, 0x000080B2 }, /* GL_COLOR_MATRIX_STACK_DEPTH_SGI */
+   {  4016, 0x00008458 }, /* GL_COLOR_SUM */
+   {  4029, 0x00008458 }, /* GL_COLOR_SUM_ARB */
+   {  4046, 0x000080D0 }, /* GL_COLOR_TABLE */
+   {  4061, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE */
+   {  4087, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE_EXT */
+   {  4117, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE_SGI */
+   {  4147, 0x000080D7 }, /* GL_COLOR_TABLE_BIAS */
+   {  4167, 0x000080D7 }, /* GL_COLOR_TABLE_BIAS_SGI */
+   {  4191, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE */
+   {  4216, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE_EXT */
+   {  4245, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE_SGI */
+   {  4274, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT */
+   {  4296, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT_EXT */
+   {  4322, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT_SGI */
+   {  4348, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE */
+   {  4374, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE_EXT */
+   {  4404, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE_SGI */
+   {  4434, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE */
+   {  4464, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE_EXT */
+   {  4498, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE_SGI */
+   {  4532, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE */
+   {  4562, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE_EXT */
+   {  4596, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE_SGI */
+   {  4630, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE */
+   {  4654, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE_EXT */
+   {  4682, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE_SGI */
+   {  4710, 0x000080D6 }, /* GL_COLOR_TABLE_SCALE */
+   {  4731, 0x000080D6 }, /* GL_COLOR_TABLE_SCALE_SGI */
+   {  4756, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH */
+   {  4777, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH_EXT */
+   {  4802, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH_SGI */
+   {  4827, 0x00000C23 }, /* GL_COLOR_WRITEMASK */
+   {  4846, 0x00008570 }, /* GL_COMBINE */
+   {  4857, 0x00008503 }, /* GL_COMBINE4 */
+   {  4869, 0x00008572 }, /* GL_COMBINE_ALPHA */
+   {  4886, 0x00008572 }, /* GL_COMBINE_ALPHA_ARB */
+   {  4907, 0x00008572 }, /* GL_COMBINE_ALPHA_EXT */
+   {  4928, 0x00008570 }, /* GL_COMBINE_ARB */
+   {  4943, 0x00008570 }, /* GL_COMBINE_EXT */
+   {  4958, 0x00008571 }, /* GL_COMBINE_RGB */
+   {  4973, 0x00008571 }, /* GL_COMBINE_RGB_ARB */
+   {  4992, 0x00008571 }, /* GL_COMBINE_RGB_EXT */
+   {  5011, 0x0000884E }, /* GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT */
+   {  5047, 0x0000884E }, /* GL_COMPARE_R_TO_TEXTURE */
+   {  5071, 0x0000884E }, /* GL_COMPARE_R_TO_TEXTURE_ARB */
+   {  5099, 0x00001300 }, /* GL_COMPILE */
+   {  5110, 0x00001301 }, /* GL_COMPILE_AND_EXECUTE */
+   {  5133, 0x00008B81 }, /* GL_COMPILE_STATUS */
+   {  5151, 0x000084E9 }, /* GL_COMPRESSED_ALPHA */
+   {  5171, 0x000084E9 }, /* GL_COMPRESSED_ALPHA_ARB */
+   {  5195, 0x000084EC }, /* GL_COMPRESSED_INTENSITY */
+   {  5219, 0x000084EC }, /* GL_COMPRESSED_INTENSITY_ARB */
+   {  5247, 0x000084EA }, /* GL_COMPRESSED_LUMINANCE */
+   {  5271, 0x000084EB }, /* GL_COMPRESSED_LUMINANCE_ALPHA */
+   {  5301, 0x000084EB }, /* GL_COMPRESSED_LUMINANCE_ALPHA_ARB */
+   {  5335, 0x000084EA }, /* GL_COMPRESSED_LUMINANCE_ARB */
+   {  5363, 0x000084ED }, /* GL_COMPRESSED_RGB */
+   {  5381, 0x000084EE }, /* GL_COMPRESSED_RGBA */
+   {  5400, 0x000084EE }, /* GL_COMPRESSED_RGBA_ARB */
+   {  5423, 0x000086B1 }, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
+   {  5452, 0x000083F1 }, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
+   {  5485, 0x000083F2 }, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
+   {  5518, 0x000083F3 }, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
+   {  5551, 0x000084ED }, /* GL_COMPRESSED_RGB_ARB */
+   {  5573, 0x000086B0 }, /* GL_COMPRESSED_RGB_FXT1_3DFX */
+   {  5601, 0x000083F0 }, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
+   {  5633, 0x00008C4A }, /* GL_COMPRESSED_SLUMINANCE */
+   {  5658, 0x00008C4B }, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
+   {  5689, 0x00008C48 }, /* GL_COMPRESSED_SRGB */
+   {  5708, 0x00008C49 }, /* GL_COMPRESSED_SRGB_ALPHA */
+   {  5733, 0x000086A3 }, /* GL_COMPRESSED_TEXTURE_FORMATS */
+   {  5763, 0x0000911C }, /* GL_CONDITION_SATISFIED */
+   {  5786, 0x00008576 }, /* GL_CONSTANT */
+   {  5798, 0x00008003 }, /* GL_CONSTANT_ALPHA */
+   {  5816, 0x00008003 }, /* GL_CONSTANT_ALPHA_EXT */
+   {  5838, 0x00008576 }, /* GL_CONSTANT_ARB */
+   {  5854, 0x00001207 }, /* GL_CONSTANT_ATTENUATION */
+   {  5878, 0x00008151 }, /* GL_CONSTANT_BORDER_HP */
+   {  5900, 0x00008001 }, /* GL_CONSTANT_COLOR */
+   {  5918, 0x00008001 }, /* GL_CONSTANT_COLOR_EXT */
+   {  5940, 0x00008576 }, /* GL_CONSTANT_EXT */
+   {  5956, 0x00008010 }, /* GL_CONVOLUTION_1D */
+   {  5974, 0x00008011 }, /* GL_CONVOLUTION_2D */
+   {  5992, 0x00008154 }, /* GL_CONVOLUTION_BORDER_COLOR */
+   {  6020, 0x00008154 }, /* GL_CONVOLUTION_BORDER_COLOR_HP */
+   {  6051, 0x00008013 }, /* GL_CONVOLUTION_BORDER_MODE */
+   {  6078, 0x00008013 }, /* GL_CONVOLUTION_BORDER_MODE_EXT */
+   {  6109, 0x00008015 }, /* GL_CONVOLUTION_FILTER_BIAS */
+   {  6136, 0x00008015 }, /* GL_CONVOLUTION_FILTER_BIAS_EXT */
+   {  6167, 0x00008014 }, /* GL_CONVOLUTION_FILTER_SCALE */
+   {  6195, 0x00008014 }, /* GL_CONVOLUTION_FILTER_SCALE_EXT */
+   {  6227, 0x00008017 }, /* GL_CONVOLUTION_FORMAT */
+   {  6249, 0x00008017 }, /* GL_CONVOLUTION_FORMAT_EXT */
+   {  6275, 0x00008019 }, /* GL_CONVOLUTION_HEIGHT */
+   {  6297, 0x00008019 }, /* GL_CONVOLUTION_HEIGHT_EXT */
+   {  6323, 0x00008018 }, /* GL_CONVOLUTION_WIDTH */
+   {  6344, 0x00008018 }, /* GL_CONVOLUTION_WIDTH_EXT */
+   {  6369, 0x00008862 }, /* GL_COORD_REPLACE */
+   {  6386, 0x00008862 }, /* GL_COORD_REPLACE_ARB */
+   {  6407, 0x00008862 }, /* GL_COORD_REPLACE_NV */
+   {  6427, 0x00008862 }, /* GL_COORD_REPLACE_OES */
+   {  6448, 0x00001503 }, /* GL_COPY */
+   {  6456, 0x0000150C }, /* GL_COPY_INVERTED */
+   {  6473, 0x00000706 }, /* GL_COPY_PIXEL_TOKEN */
+   {  6493, 0x00008F36 }, /* GL_COPY_READ_BUFFER */
+   {  6513, 0x00008F37 }, /* GL_COPY_WRITE_BUFFER */
+   {  6534, 0x00000B44 }, /* GL_CULL_FACE */
+   {  6547, 0x00000B45 }, /* GL_CULL_FACE_MODE */
+   {  6565, 0x000081AA }, /* GL_CULL_VERTEX_EXT */
+   {  6584, 0x000081AC }, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
+   {  6616, 0x000081AB }, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
+   {  6651, 0x00008626 }, /* GL_CURRENT_ATTRIB_NV */
+   {  6672, 0x00000001 }, /* GL_CURRENT_BIT */
+   {  6687, 0x00000B00 }, /* GL_CURRENT_COLOR */
+   {  6704, 0x00008453 }, /* GL_CURRENT_FOG_COORD */
+   {  6725, 0x00008453 }, /* GL_CURRENT_FOG_COORDINATE */
+   {  6751, 0x00000B01 }, /* GL_CURRENT_INDEX */
+   {  6768, 0x00008641 }, /* GL_CURRENT_MATRIX_ARB */
+   {  6790, 0x00008845 }, /* GL_CURRENT_MATRIX_INDEX_ARB */
+   {  6818, 0x00008641 }, /* GL_CURRENT_MATRIX_NV */
+   {  6839, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
+   {  6873, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_NV */
+   {  6906, 0x00000B02 }, /* GL_CURRENT_NORMAL */
+   {  6924, 0x00008843 }, /* GL_CURRENT_PALETTE_MATRIX_ARB */
+   {  6954, 0x00008843 }, /* GL_CURRENT_PALETTE_MATRIX_OES */
+   {  6984, 0x00008B8D }, /* GL_CURRENT_PROGRAM */
+   {  7003, 0x00008865 }, /* GL_CURRENT_QUERY */
+   {  7020, 0x00008865 }, /* GL_CURRENT_QUERY_ARB */
+   {  7041, 0x00000B04 }, /* GL_CURRENT_RASTER_COLOR */
+   {  7065, 0x00000B09 }, /* GL_CURRENT_RASTER_DISTANCE */
+   {  7092, 0x00000B05 }, /* GL_CURRENT_RASTER_INDEX */
+   {  7116, 0x00000B07 }, /* GL_CURRENT_RASTER_POSITION */
+   {  7143, 0x00000B08 }, /* GL_CURRENT_RASTER_POSITION_VALID */
+   {  7176, 0x0000845F }, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
+   {  7210, 0x00000B06 }, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
+   {  7243, 0x00008459 }, /* GL_CURRENT_SECONDARY_COLOR */
+   {  7270, 0x00000B03 }, /* GL_CURRENT_TEXTURE_COORDS */
+   {  7296, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB */
+   {  7321, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB_ARB */
+   {  7350, 0x000086A8 }, /* GL_CURRENT_WEIGHT_ARB */
+   {  7372, 0x00000900 }, /* GL_CW */
+   {  7378, 0x0000875B }, /* GL_DEBUG_ASSERT_MESA */
+   {  7399, 0x00008759 }, /* GL_DEBUG_OBJECT_MESA */
+   {  7420, 0x0000875A }, /* GL_DEBUG_PRINT_MESA */
+   {  7440, 0x00002101 }, /* GL_DECAL */
+   {  7449, 0x00001E03 }, /* GL_DECR */
+   {  7457, 0x00008508 }, /* GL_DECR_WRAP */
+   {  7470, 0x00008508 }, /* GL_DECR_WRAP_EXT */
+   {  7487, 0x00008B80 }, /* GL_DELETE_STATUS */
+   {  7504, 0x00001801 }, /* GL_DEPTH */
+   {  7513, 0x000088F0 }, /* GL_DEPTH24_STENCIL8 */
+   {  7533, 0x000088F0 }, /* GL_DEPTH24_STENCIL8_EXT */
+   {  7557, 0x000088F0 }, /* GL_DEPTH24_STENCIL8_OES */
+   {  7581, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT */
+   {  7601, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT_EXT */
+   {  7625, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT_OES */
+   {  7649, 0x00000D1F }, /* GL_DEPTH_BIAS */
+   {  7663, 0x00000D56 }, /* GL_DEPTH_BITS */
+   {  7677, 0x00008891 }, /* GL_DEPTH_BOUNDS_EXT */
+   {  7697, 0x00008890 }, /* GL_DEPTH_BOUNDS_TEST_EXT */
+   {  7722, 0x00000100 }, /* GL_DEPTH_BUFFER_BIT */
+   {  7742, 0x0000864F }, /* GL_DEPTH_CLAMP */
+   {  7757, 0x0000864F }, /* GL_DEPTH_CLAMP_NV */
+   {  7775, 0x00000B73 }, /* GL_DEPTH_CLEAR_VALUE */
+   {  7796, 0x00001902 }, /* GL_DEPTH_COMPONENT */
+   {  7815, 0x000081A5 }, /* GL_DEPTH_COMPONENT16 */
+   {  7836, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_ARB */
+   {  7861, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_OES */
+   {  7886, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_SGIX */
+   {  7912, 0x000081A6 }, /* GL_DEPTH_COMPONENT24 */
+   {  7933, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_ARB */
+   {  7958, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_OES */
+   {  7983, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_SGIX */
+   {  8009, 0x000081A7 }, /* GL_DEPTH_COMPONENT32 */
+   {  8030, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_ARB */
+   {  8055, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_OES */
+   {  8080, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_SGIX */
+   {  8106, 0x00000B74 }, /* GL_DEPTH_FUNC */
+   {  8120, 0x00000B70 }, /* GL_DEPTH_RANGE */
+   {  8135, 0x00000D1E }, /* GL_DEPTH_SCALE */
+   {  8150, 0x000084F9 }, /* GL_DEPTH_STENCIL */
+   {  8167, 0x0000821A }, /* GL_DEPTH_STENCIL_ATTACHMENT */
+   {  8195, 0x000084F9 }, /* GL_DEPTH_STENCIL_EXT */
+   {  8216, 0x000084F9 }, /* GL_DEPTH_STENCIL_NV */
+   {  8236, 0x000084F9 }, /* GL_DEPTH_STENCIL_OES */
+   {  8257, 0x0000886F }, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
+   {  8285, 0x0000886E }, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
+   {  8313, 0x00000B71 }, /* GL_DEPTH_TEST */
+   {  8327, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE */
+   {  8349, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE_ARB */
+   {  8375, 0x00000B72 }, /* GL_DEPTH_WRITEMASK */
+   {  8394, 0x00001201 }, /* GL_DIFFUSE */
+   {  8405, 0x00000BD0 }, /* GL_DITHER */
+   {  8415, 0x00000A02 }, /* GL_DOMAIN */
+   {  8425, 0x00001100 }, /* GL_DONT_CARE */
+   {  8438, 0x000086AE }, /* GL_DOT3_RGB */
+   {  8450, 0x000086AF }, /* GL_DOT3_RGBA */
+   {  8463, 0x000086AF }, /* GL_DOT3_RGBA_ARB */
+   {  8480, 0x00008741 }, /* GL_DOT3_RGBA_EXT */
+   {  8497, 0x000086AE }, /* GL_DOT3_RGB_ARB */
+   {  8513, 0x00008740 }, /* GL_DOT3_RGB_EXT */
+   {  8529, 0x0000140A }, /* GL_DOUBLE */
+   {  8539, 0x00000C32 }, /* GL_DOUBLEBUFFER */
+   {  8555, 0x00000C01 }, /* GL_DRAW_BUFFER */
+   {  8570, 0x00008825 }, /* GL_DRAW_BUFFER0 */
+   {  8586, 0x00008825 }, /* GL_DRAW_BUFFER0_ARB */
+   {  8606, 0x00008825 }, /* GL_DRAW_BUFFER0_ATI */
+   {  8626, 0x00008826 }, /* GL_DRAW_BUFFER1 */
+   {  8642, 0x0000882F }, /* GL_DRAW_BUFFER10 */
+   {  8659, 0x0000882F }, /* GL_DRAW_BUFFER10_ARB */
+   {  8680, 0x0000882F }, /* GL_DRAW_BUFFER10_ATI */
+   {  8701, 0x00008830 }, /* GL_DRAW_BUFFER11 */
+   {  8718, 0x00008830 }, /* GL_DRAW_BUFFER11_ARB */
+   {  8739, 0x00008830 }, /* GL_DRAW_BUFFER11_ATI */
+   {  8760, 0x00008831 }, /* GL_DRAW_BUFFER12 */
+   {  8777, 0x00008831 }, /* GL_DRAW_BUFFER12_ARB */
+   {  8798, 0x00008831 }, /* GL_DRAW_BUFFER12_ATI */
+   {  8819, 0x00008832 }, /* GL_DRAW_BUFFER13 */
+   {  8836, 0x00008832 }, /* GL_DRAW_BUFFER13_ARB */
+   {  8857, 0x00008832 }, /* GL_DRAW_BUFFER13_ATI */
+   {  8878, 0x00008833 }, /* GL_DRAW_BUFFER14 */
+   {  8895, 0x00008833 }, /* GL_DRAW_BUFFER14_ARB */
+   {  8916, 0x00008833 }, /* GL_DRAW_BUFFER14_ATI */
+   {  8937, 0x00008834 }, /* GL_DRAW_BUFFER15 */
+   {  8954, 0x00008834 }, /* GL_DRAW_BUFFER15_ARB */
+   {  8975, 0x00008834 }, /* GL_DRAW_BUFFER15_ATI */
+   {  8996, 0x00008826 }, /* GL_DRAW_BUFFER1_ARB */
+   {  9016, 0x00008826 }, /* GL_DRAW_BUFFER1_ATI */
+   {  9036, 0x00008827 }, /* GL_DRAW_BUFFER2 */
+   {  9052, 0x00008827 }, /* GL_DRAW_BUFFER2_ARB */
+   {  9072, 0x00008827 }, /* GL_DRAW_BUFFER2_ATI */
+   {  9092, 0x00008828 }, /* GL_DRAW_BUFFER3 */
+   {  9108, 0x00008828 }, /* GL_DRAW_BUFFER3_ARB */
+   {  9128, 0x00008828 }, /* GL_DRAW_BUFFER3_ATI */
+   {  9148, 0x00008829 }, /* GL_DRAW_BUFFER4 */
+   {  9164, 0x00008829 }, /* GL_DRAW_BUFFER4_ARB */
+   {  9184, 0x00008829 }, /* GL_DRAW_BUFFER4_ATI */
+   {  9204, 0x0000882A }, /* GL_DRAW_BUFFER5 */
+   {  9220, 0x0000882A }, /* GL_DRAW_BUFFER5_ARB */
+   {  9240, 0x0000882A }, /* GL_DRAW_BUFFER5_ATI */
+   {  9260, 0x0000882B }, /* GL_DRAW_BUFFER6 */
+   {  9276, 0x0000882B }, /* GL_DRAW_BUFFER6_ARB */
+   {  9296, 0x0000882B }, /* GL_DRAW_BUFFER6_ATI */
+   {  9316, 0x0000882C }, /* GL_DRAW_BUFFER7 */
+   {  9332, 0x0000882C }, /* GL_DRAW_BUFFER7_ARB */
+   {  9352, 0x0000882C }, /* GL_DRAW_BUFFER7_ATI */
+   {  9372, 0x0000882D }, /* GL_DRAW_BUFFER8 */
+   {  9388, 0x0000882D }, /* GL_DRAW_BUFFER8_ARB */
+   {  9408, 0x0000882D }, /* GL_DRAW_BUFFER8_ATI */
+   {  9428, 0x0000882E }, /* GL_DRAW_BUFFER9 */
+   {  9444, 0x0000882E }, /* GL_DRAW_BUFFER9_ARB */
+   {  9464, 0x0000882E }, /* GL_DRAW_BUFFER9_ATI */
+   {  9484, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER */
+   {  9504, 0x00008CA6 }, /* GL_DRAW_FRAMEBUFFER_BINDING */
+   {  9532, 0x00008CA6 }, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
+   {  9564, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER_EXT */
+   {  9588, 0x00000705 }, /* GL_DRAW_PIXEL_TOKEN */
+   {  9608, 0x00000304 }, /* GL_DST_ALPHA */
+   {  9621, 0x00000306 }, /* GL_DST_COLOR */
+   {  9634, 0x0000877A }, /* GL_DU8DV8_ATI */
+   {  9648, 0x00008779 }, /* GL_DUDV_ATI */
+   {  9660, 0x000088EA }, /* GL_DYNAMIC_COPY */
+   {  9676, 0x000088EA }, /* GL_DYNAMIC_COPY_ARB */
+   {  9696, 0x000088E8 }, /* GL_DYNAMIC_DRAW */
+   {  9712, 0x000088E8 }, /* GL_DYNAMIC_DRAW_ARB */
+   {  9732, 0x000088E9 }, /* GL_DYNAMIC_READ */
+   {  9748, 0x000088E9 }, /* GL_DYNAMIC_READ_ARB */
+   {  9768, 0x00000B43 }, /* GL_EDGE_FLAG */
+   {  9781, 0x00008079 }, /* GL_EDGE_FLAG_ARRAY */
+   {  9800, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
+   {  9834, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB */
+   {  9872, 0x00008093 }, /* GL_EDGE_FLAG_ARRAY_POINTER */
+   {  9899, 0x0000808C }, /* GL_EDGE_FLAG_ARRAY_STRIDE */
+   {  9925, 0x00008893 }, /* GL_ELEMENT_ARRAY_BUFFER */
+   {  9949, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
+   {  9981, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB */
+   { 10017, 0x00001600 }, /* GL_EMISSION */
+   { 10029, 0x00002000 }, /* GL_ENABLE_BIT */
+   { 10043, 0x00000202 }, /* GL_EQUAL */
+   { 10052, 0x00001509 }, /* GL_EQUIV */
+   { 10061, 0x00010000 }, /* GL_EVAL_BIT */
+   { 10073, 0x00000800 }, /* GL_EXP */
+   { 10080, 0x00000801 }, /* GL_EXP2 */
+   { 10088, 0x00001F03 }, /* GL_EXTENSIONS */
+   { 10102, 0x00002400 }, /* GL_EYE_LINEAR */
+   { 10116, 0x00002502 }, /* GL_EYE_PLANE */
+   { 10129, 0x0000855C }, /* GL_EYE_PLANE_ABSOLUTE_NV */
+   { 10154, 0x0000855B }, /* GL_EYE_RADIAL_NV */
+   { 10171, 0x00000000 }, /* GL_FALSE */
+   { 10180, 0x00001101 }, /* GL_FASTEST */
+   { 10191, 0x00001C01 }, /* GL_FEEDBACK */
+   { 10203, 0x00000DF0 }, /* GL_FEEDBACK_BUFFER_POINTER */
+   { 10230, 0x00000DF1 }, /* GL_FEEDBACK_BUFFER_SIZE */
+   { 10254, 0x00000DF2 }, /* GL_FEEDBACK_BUFFER_TYPE */
+   { 10278, 0x00001B02 }, /* GL_FILL */
+   { 10286, 0x00008E4D }, /* GL_FIRST_VERTEX_CONVENTION */
+   { 10313, 0x00008E4D }, /* GL_FIRST_VERTEX_CONVENTION_EXT */
+   { 10344, 0x0000140C }, /* GL_FIXED */
+   { 10353, 0x0000140C }, /* GL_FIXED_OES */
+   { 10366, 0x00001D00 }, /* GL_FLAT */
+   { 10374, 0x00001406 }, /* GL_FLOAT */
+   { 10383, 0x00008B5A }, /* GL_FLOAT_MAT2 */
+   { 10397, 0x00008B5A }, /* GL_FLOAT_MAT2_ARB */
+   { 10415, 0x00008B65 }, /* GL_FLOAT_MAT2x3 */
+   { 10431, 0x00008B66 }, /* GL_FLOAT_MAT2x4 */
+   { 10447, 0x00008B5B }, /* GL_FLOAT_MAT3 */
+   { 10461, 0x00008B5B }, /* GL_FLOAT_MAT3_ARB */
+   { 10479, 0x00008B67 }, /* GL_FLOAT_MAT3x2 */
+   { 10495, 0x00008B68 }, /* GL_FLOAT_MAT3x4 */
+   { 10511, 0x00008B5C }, /* GL_FLOAT_MAT4 */
+   { 10525, 0x00008B5C }, /* GL_FLOAT_MAT4_ARB */
+   { 10543, 0x00008B69 }, /* GL_FLOAT_MAT4x2 */
+   { 10559, 0x00008B6A }, /* GL_FLOAT_MAT4x3 */
+   { 10575, 0x00008B50 }, /* GL_FLOAT_VEC2 */
+   { 10589, 0x00008B50 }, /* GL_FLOAT_VEC2_ARB */
+   { 10607, 0x00008B51 }, /* GL_FLOAT_VEC3 */
+   { 10621, 0x00008B51 }, /* GL_FLOAT_VEC3_ARB */
+   { 10639, 0x00008B52 }, /* GL_FLOAT_VEC4 */
+   { 10653, 0x00008B52 }, /* GL_FLOAT_VEC4_ARB */
+   { 10671, 0x00000B60 }, /* GL_FOG */
+   { 10678, 0x00000080 }, /* GL_FOG_BIT */
+   { 10689, 0x00000B66 }, /* GL_FOG_COLOR */
+   { 10702, 0x00008451 }, /* GL_FOG_COORD */
+   { 10715, 0x00008451 }, /* GL_FOG_COORDINATE */
+   { 10733, 0x00008457 }, /* GL_FOG_COORDINATE_ARRAY */
+   { 10757, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
+   { 10796, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB */
+   { 10839, 0x00008456 }, /* GL_FOG_COORDINATE_ARRAY_POINTER */
+   { 10871, 0x00008455 }, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
+   { 10902, 0x00008454 }, /* GL_FOG_COORDINATE_ARRAY_TYPE */
+   { 10931, 0x00008450 }, /* GL_FOG_COORDINATE_SOURCE */
+   { 10956, 0x00008457 }, /* GL_FOG_COORD_ARRAY */
+   { 10975, 0x0000889D }, /* GL_FOG_COORD_ARRAY_BUFFER_BINDING */
+   { 11009, 0x00008456 }, /* GL_FOG_COORD_ARRAY_POINTER */
+   { 11036, 0x00008455 }, /* GL_FOG_COORD_ARRAY_STRIDE */
+   { 11062, 0x00008454 }, /* GL_FOG_COORD_ARRAY_TYPE */
+   { 11086, 0x00008450 }, /* GL_FOG_COORD_SRC */
+   { 11103, 0x00000B62 }, /* GL_FOG_DENSITY */
+   { 11118, 0x0000855A }, /* GL_FOG_DISTANCE_MODE_NV */
+   { 11142, 0x00000B64 }, /* GL_FOG_END */
+   { 11153, 0x00000C54 }, /* GL_FOG_HINT */
+   { 11165, 0x00000B61 }, /* GL_FOG_INDEX */
+   { 11178, 0x00000B65 }, /* GL_FOG_MODE */
+   { 11190, 0x00008198 }, /* GL_FOG_OFFSET_SGIX */
+   { 11209, 0x00008199 }, /* GL_FOG_OFFSET_VALUE_SGIX */
+   { 11234, 0x00000B63 }, /* GL_FOG_START */
+   { 11247, 0x00008452 }, /* GL_FRAGMENT_DEPTH */
+   { 11265, 0x00008804 }, /* GL_FRAGMENT_PROGRAM_ARB */
+   { 11289, 0x00008B30 }, /* GL_FRAGMENT_SHADER */
+   { 11308, 0x00008B30 }, /* GL_FRAGMENT_SHADER_ARB */
+   { 11331, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
+   { 11366, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT_OES */
+   { 11405, 0x00008D40 }, /* GL_FRAMEBUFFER */
+   { 11420, 0x00008215 }, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
+   { 11457, 0x00008214 }, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
+   { 11493, 0x00008210 }, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
+   { 11534, 0x00008211 }, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
+   { 11575, 0x00008216 }, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
+   { 11612, 0x00008213 }, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
+   { 11649, 0x00008DA7 }, /* GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB */
+   { 11687, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
+   { 11725, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT */
+   { 11767, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_OES */
+   { 11809, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
+   { 11847, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT */
+   { 11889, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_OES */
+   { 11931, 0x00008212 }, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
+   { 11966, 0x00008217 }, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
+   { 12005, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT */
+   { 12054, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES */
+   { 12103, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
+   { 12151, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT */
+   { 12203, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_OES */
+   { 12255, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+   { 12295, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
+   { 12339, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
+   { 12379, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT */
+   { 12423, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_OES */
+   { 12467, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING */
+   { 12490, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_EXT */
+   { 12517, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_OES */
+   { 12544, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE */
+   { 12568, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_EXT */
+   { 12596, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_OES */
+   { 12624, 0x00008218 }, /* GL_FRAMEBUFFER_DEFAULT */
+   { 12647, 0x00008D40 }, /* GL_FRAMEBUFFER_EXT */
+   { 12666, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
+   { 12703, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT */
+   { 12744, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_OES */
+   { 12785, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS */
+   { 12822, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
+   { 12863, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_OES */
+   { 12904, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */
+   { 12942, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
+   { 12984, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_OES */
+   { 13026, 0x00008CD8 }, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
+   { 13077, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
+   { 13115, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_OES */
+   { 13153, 0x00008DA9 }, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB */
+   { 13195, 0x00008DA8 }, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB */
+   { 13239, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
+   { 13284, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT */
+   { 13333, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_OES */
+   { 13382, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
+   { 13420, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT */
+   { 13462, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */
+   { 13500, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
+   { 13542, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_OES */
+   { 13584, 0x00008D40 }, /* GL_FRAMEBUFFER_OES */
+   { 13603, 0x00008CDE }, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
+   { 13635, 0x00008219 }, /* GL_FRAMEBUFFER_UNDEFINED */
+   { 13660, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED */
+   { 13687, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_EXT */
+   { 13718, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_OES */
+   { 13749, 0x00000404 }, /* GL_FRONT */
+   { 13758, 0x00000408 }, /* GL_FRONT_AND_BACK */
+   { 13776, 0x00000B46 }, /* GL_FRONT_FACE */
+   { 13790, 0x00000400 }, /* GL_FRONT_LEFT */
+   { 13804, 0x00000401 }, /* GL_FRONT_RIGHT */
+   { 13819, 0x00008006 }, /* GL_FUNC_ADD */
+   { 13831, 0x00008006 }, /* GL_FUNC_ADD_EXT */
+   { 13847, 0x00008006 }, /* GL_FUNC_ADD_OES */
+   { 13863, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT */
+   { 13888, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_EXT */
+   { 13917, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_OES */
+   { 13946, 0x0000800A }, /* GL_FUNC_SUBTRACT */
+   { 13963, 0x0000800A }, /* GL_FUNC_SUBTRACT_EXT */
+   { 13984, 0x0000800A }, /* GL_FUNC_SUBTRACT_OES */
+   { 14005, 0x00008191 }, /* GL_GENERATE_MIPMAP */
+   { 14024, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT */
+   { 14048, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT_SGIS */
+   { 14077, 0x00008191 }, /* GL_GENERATE_MIPMAP_SGIS */
+   { 14101, 0x00008DDB }, /* GL_GEOMETRY_INPUT_TYPE_ARB */
+   { 14128, 0x00008DDC }, /* GL_GEOMETRY_OUTPUT_TYPE_ARB */
+   { 14156, 0x00008DD9 }, /* GL_GEOMETRY_SHADER_ARB */
+   { 14179, 0x00008DDA }, /* GL_GEOMETRY_VERTICES_OUT_ARB */
+   { 14208, 0x00000206 }, /* GL_GEQUAL */
+   { 14218, 0x00000204 }, /* GL_GREATER */
+   { 14229, 0x00001904 }, /* GL_GREEN */
+   { 14238, 0x00000D19 }, /* GL_GREEN_BIAS */
+   { 14252, 0x00000D53 }, /* GL_GREEN_BITS */
+   { 14266, 0x00000D18 }, /* GL_GREEN_SCALE */
+   { 14281, 0x0000140B }, /* GL_HALF_FLOAT */
+   { 14295, 0x00008D61 }, /* GL_HALF_FLOAT_OES */
+   { 14313, 0x00008DF2 }, /* GL_HIGH_FLOAT */
+   { 14327, 0x00008DF5 }, /* GL_HIGH_INT */
+   { 14339, 0x00008000 }, /* GL_HINT_BIT */
+   { 14351, 0x00008024 }, /* GL_HISTOGRAM */
+   { 14364, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE */
+   { 14388, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE_EXT */
+   { 14416, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE */
+   { 14439, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE_EXT */
+   { 14466, 0x00008024 }, /* GL_HISTOGRAM_EXT */
+   { 14483, 0x00008027 }, /* GL_HISTOGRAM_FORMAT */
+   { 14503, 0x00008027 }, /* GL_HISTOGRAM_FORMAT_EXT */
+   { 14527, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE */
+   { 14551, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE_EXT */
+   { 14579, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE */
+   { 14607, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE_EXT */
+   { 14639, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE */
+   { 14661, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE_EXT */
+   { 14687, 0x0000802D }, /* GL_HISTOGRAM_SINK */
+   { 14705, 0x0000802D }, /* GL_HISTOGRAM_SINK_EXT */
+   { 14727, 0x00008026 }, /* GL_HISTOGRAM_WIDTH */
+   { 14746, 0x00008026 }, /* GL_HISTOGRAM_WIDTH_EXT */
+   { 14769, 0x0000862A }, /* GL_IDENTITY_NV */
+   { 14784, 0x00008150 }, /* GL_IGNORE_BORDER_HP */
+   { 14804, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT */
+   { 14840, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
+   { 14880, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE */
+   { 14914, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
+   { 14952, 0x00001E02 }, /* GL_INCR */
+   { 14960, 0x00008507 }, /* GL_INCR_WRAP */
+   { 14973, 0x00008507 }, /* GL_INCR_WRAP_EXT */
+   { 14990, 0x00008222 }, /* GL_INDEX */
+   { 14999, 0x00008077 }, /* GL_INDEX_ARRAY */
+   { 15014, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING */
+   { 15044, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING_ARB */
+   { 15078, 0x00008091 }, /* GL_INDEX_ARRAY_POINTER */
+   { 15101, 0x00008086 }, /* GL_INDEX_ARRAY_STRIDE */
+   { 15123, 0x00008085 }, /* GL_INDEX_ARRAY_TYPE */
+   { 15143, 0x00000D51 }, /* GL_INDEX_BITS */
+   { 15157, 0x00000C20 }, /* GL_INDEX_CLEAR_VALUE */
+   { 15178, 0x00000BF1 }, /* GL_INDEX_LOGIC_OP */
+   { 15196, 0x00000C30 }, /* GL_INDEX_MODE */
+   { 15210, 0x00000D13 }, /* GL_INDEX_OFFSET */
+   { 15226, 0x00000D12 }, /* GL_INDEX_SHIFT */
+   { 15241, 0x00000C21 }, /* GL_INDEX_WRITEMASK */
+   { 15260, 0x00008B84 }, /* GL_INFO_LOG_LENGTH */
+   { 15279, 0x00001404 }, /* GL_INT */
+   { 15286, 0x00008049 }, /* GL_INTENSITY */
+   { 15299, 0x0000804C }, /* GL_INTENSITY12 */
+   { 15314, 0x0000804C }, /* GL_INTENSITY12_EXT */
+   { 15333, 0x0000804D }, /* GL_INTENSITY16 */
+   { 15348, 0x0000804D }, /* GL_INTENSITY16_EXT */
+   { 15367, 0x0000804A }, /* GL_INTENSITY4 */
+   { 15381, 0x0000804A }, /* GL_INTENSITY4_EXT */
+   { 15399, 0x0000804B }, /* GL_INTENSITY8 */
+   { 15413, 0x0000804B }, /* GL_INTENSITY8_EXT */
+   { 15431, 0x00008049 }, /* GL_INTENSITY_EXT */
+   { 15448, 0x00008C8C }, /* GL_INTERLEAVED_ATTRIBS_EXT */
+   { 15475, 0x00008575 }, /* GL_INTERPOLATE */
+   { 15490, 0x00008575 }, /* GL_INTERPOLATE_ARB */
+   { 15509, 0x00008575 }, /* GL_INTERPOLATE_EXT */
+   { 15528, 0x00008DF7 }, /* GL_INT_10_10_10_2_OES */
+   { 15550, 0x00008B53 }, /* GL_INT_VEC2 */
+   { 15562, 0x00008B53 }, /* GL_INT_VEC2_ARB */
+   { 15578, 0x00008B54 }, /* GL_INT_VEC3 */
+   { 15590, 0x00008B54 }, /* GL_INT_VEC3_ARB */
+   { 15606, 0x00008B55 }, /* GL_INT_VEC4 */
+   { 15618, 0x00008B55 }, /* GL_INT_VEC4_ARB */
+   { 15634, 0x00000500 }, /* GL_INVALID_ENUM */
+   { 15650, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION */
+   { 15683, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_EXT */
+   { 15720, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_OES */
+   { 15757, 0x00000502 }, /* GL_INVALID_OPERATION */
+   { 15778, 0x00000501 }, /* GL_INVALID_VALUE */
+   { 15795, 0x0000862B }, /* GL_INVERSE_NV */
+   { 15809, 0x0000862D }, /* GL_INVERSE_TRANSPOSE_NV */
+   { 15833, 0x0000150A }, /* GL_INVERT */
+   { 15843, 0x00001E00 }, /* GL_KEEP */
+   { 15851, 0x00008E4E }, /* GL_LAST_VERTEX_CONVENTION */
+   { 15877, 0x00008E4E }, /* GL_LAST_VERTEX_CONVENTION_EXT */
+   { 15907, 0x00000406 }, /* GL_LEFT */
+   { 15915, 0x00000203 }, /* GL_LEQUAL */
+   { 15925, 0x00000201 }, /* GL_LESS */
+   { 15933, 0x00004000 }, /* GL_LIGHT0 */
+   { 15943, 0x00004001 }, /* GL_LIGHT1 */
+   { 15953, 0x00004002 }, /* GL_LIGHT2 */
+   { 15963, 0x00004003 }, /* GL_LIGHT3 */
+   { 15973, 0x00004004 }, /* GL_LIGHT4 */
+   { 15983, 0x00004005 }, /* GL_LIGHT5 */
+   { 15993, 0x00004006 }, /* GL_LIGHT6 */
+   { 16003, 0x00004007 }, /* GL_LIGHT7 */
+   { 16013, 0x00000B50 }, /* GL_LIGHTING */
+   { 16025, 0x00000040 }, /* GL_LIGHTING_BIT */
+   { 16041, 0x00000B53 }, /* GL_LIGHT_MODEL_AMBIENT */
+   { 16064, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL */
+   { 16093, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL_EXT */
+   { 16126, 0x00000B51 }, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
+   { 16154, 0x00000B52 }, /* GL_LIGHT_MODEL_TWO_SIDE */
+   { 16178, 0x00001B01 }, /* GL_LINE */
+   { 16186, 0x00002601 }, /* GL_LINEAR */
+   { 16196, 0x00001208 }, /* GL_LINEAR_ATTENUATION */
+   { 16218, 0x00008170 }, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
+   { 16248, 0x0000844F }, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
+   { 16279, 0x00002703 }, /* GL_LINEAR_MIPMAP_LINEAR */
+   { 16303, 0x00002701 }, /* GL_LINEAR_MIPMAP_NEAREST */
+   { 16328, 0x00000001 }, /* GL_LINES */
+   { 16337, 0x0000000A }, /* GL_LINES_ADJACENCY_ARB */
+   { 16360, 0x00000004 }, /* GL_LINE_BIT */
+   { 16372, 0x00000002 }, /* GL_LINE_LOOP */
+   { 16385, 0x00000707 }, /* GL_LINE_RESET_TOKEN */
+   { 16405, 0x00000B20 }, /* GL_LINE_SMOOTH */
+   { 16420, 0x00000C52 }, /* GL_LINE_SMOOTH_HINT */
+   { 16440, 0x00000B24 }, /* GL_LINE_STIPPLE */
+   { 16456, 0x00000B25 }, /* GL_LINE_STIPPLE_PATTERN */
+   { 16480, 0x00000B26 }, /* GL_LINE_STIPPLE_REPEAT */
+   { 16503, 0x00000003 }, /* GL_LINE_STRIP */
+   { 16517, 0x0000000B }, /* GL_LINE_STRIP_ADJACENCY_ARB */
+   { 16545, 0x00000702 }, /* GL_LINE_TOKEN */
+   { 16559, 0x00000B21 }, /* GL_LINE_WIDTH */
+   { 16573, 0x00000B23 }, /* GL_LINE_WIDTH_GRANULARITY */
+   { 16599, 0x00000B22 }, /* GL_LINE_WIDTH_RANGE */
+   { 16619, 0x00008B82 }, /* GL_LINK_STATUS */
+   { 16634, 0x00000B32 }, /* GL_LIST_BASE */
+   { 16647, 0x00020000 }, /* GL_LIST_BIT */
+   { 16659, 0x00000B33 }, /* GL_LIST_INDEX */
+   { 16673, 0x00000B30 }, /* GL_LIST_MODE */
+   { 16686, 0x00000101 }, /* GL_LOAD */
+   { 16694, 0x00000BF1 }, /* GL_LOGIC_OP */
+   { 16706, 0x00000BF0 }, /* GL_LOGIC_OP_MODE */
+   { 16723, 0x00008CA1 }, /* GL_LOWER_LEFT */
+   { 16737, 0x00008DF0 }, /* GL_LOW_FLOAT */
+   { 16750, 0x00008DF3 }, /* GL_LOW_INT */
+   { 16761, 0x00001909 }, /* GL_LUMINANCE */
+   { 16774, 0x00008041 }, /* GL_LUMINANCE12 */
+   { 16789, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12 */
+   { 16812, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12_EXT */
+   { 16839, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4 */
+   { 16861, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4_EXT */
+   { 16887, 0x00008041 }, /* GL_LUMINANCE12_EXT */
+   { 16906, 0x00008042 }, /* GL_LUMINANCE16 */
+   { 16921, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16 */
+   { 16944, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16_EXT */
+   { 16971, 0x00008042 }, /* GL_LUMINANCE16_EXT */
+   { 16990, 0x0000803F }, /* GL_LUMINANCE4 */
+   { 17004, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4 */
+   { 17025, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4_EXT */
+   { 17050, 0x0000803F }, /* GL_LUMINANCE4_EXT */
+   { 17068, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2 */
+   { 17089, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2_EXT */
+   { 17114, 0x00008040 }, /* GL_LUMINANCE8 */
+   { 17128, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8 */
+   { 17149, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8_EXT */
+   { 17174, 0x00008040 }, /* GL_LUMINANCE8_EXT */
+   { 17192, 0x0000190A }, /* GL_LUMINANCE_ALPHA */
+   { 17211, 0x00000D90 }, /* GL_MAP1_COLOR_4 */
+   { 17227, 0x00000DD0 }, /* GL_MAP1_GRID_DOMAIN */
+   { 17247, 0x00000DD1 }, /* GL_MAP1_GRID_SEGMENTS */
+   { 17269, 0x00000D91 }, /* GL_MAP1_INDEX */
+   { 17283, 0x00000D92 }, /* GL_MAP1_NORMAL */
+   { 17298, 0x00000D93 }, /* GL_MAP1_TEXTURE_COORD_1 */
+   { 17322, 0x00000D94 }, /* GL_MAP1_TEXTURE_COORD_2 */
+   { 17346, 0x00000D95 }, /* GL_MAP1_TEXTURE_COORD_3 */
+   { 17370, 0x00000D96 }, /* GL_MAP1_TEXTURE_COORD_4 */
+   { 17394, 0x00000D97 }, /* GL_MAP1_VERTEX_3 */
+   { 17411, 0x00000D98 }, /* GL_MAP1_VERTEX_4 */
+   { 17428, 0x00008660 }, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
+   { 17456, 0x0000866A }, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
+   { 17485, 0x0000866B }, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
+   { 17514, 0x0000866C }, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
+   { 17543, 0x0000866D }, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
+   { 17572, 0x0000866E }, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
+   { 17601, 0x0000866F }, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
+   { 17630, 0x00008661 }, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
+   { 17658, 0x00008662 }, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
+   { 17686, 0x00008663 }, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
+   { 17714, 0x00008664 }, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
+   { 17742, 0x00008665 }, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
+   { 17770, 0x00008666 }, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
+   { 17798, 0x00008667 }, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
+   { 17826, 0x00008668 }, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
+   { 17854, 0x00008669 }, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
+   { 17882, 0x00000DB0 }, /* GL_MAP2_COLOR_4 */
+   { 17898, 0x00000DD2 }, /* GL_MAP2_GRID_DOMAIN */
+   { 17918, 0x00000DD3 }, /* GL_MAP2_GRID_SEGMENTS */
+   { 17940, 0x00000DB1 }, /* GL_MAP2_INDEX */
+   { 17954, 0x00000DB2 }, /* GL_MAP2_NORMAL */
+   { 17969, 0x00000DB3 }, /* GL_MAP2_TEXTURE_COORD_1 */
+   { 17993, 0x00000DB4 }, /* GL_MAP2_TEXTURE_COORD_2 */
+   { 18017, 0x00000DB5 }, /* GL_MAP2_TEXTURE_COORD_3 */
+   { 18041, 0x00000DB6 }, /* GL_MAP2_TEXTURE_COORD_4 */
+   { 18065, 0x00000DB7 }, /* GL_MAP2_VERTEX_3 */
+   { 18082, 0x00000DB8 }, /* GL_MAP2_VERTEX_4 */
+   { 18099, 0x00008670 }, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
+   { 18127, 0x0000867A }, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
+   { 18156, 0x0000867B }, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
+   { 18185, 0x0000867C }, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
+   { 18214, 0x0000867D }, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
+   { 18243, 0x0000867E }, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
+   { 18272, 0x0000867F }, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
+   { 18301, 0x00008671 }, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
+   { 18329, 0x00008672 }, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
+   { 18357, 0x00008673 }, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
+   { 18385, 0x00008674 }, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
+   { 18413, 0x00008675 }, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
+   { 18441, 0x00008676 }, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
+   { 18469, 0x00008677 }, /* GL_MAP2_VERTEX_ATTRIB7_4_NV */
+   { 18497, 0x00008678 }, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
+   { 18525, 0x00008679 }, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
+   { 18553, 0x00000D10 }, /* GL_MAP_COLOR */
+   { 18566, 0x00000010 }, /* GL_MAP_FLUSH_EXPLICIT_BIT */
+   { 18592, 0x00000008 }, /* GL_MAP_INVALIDATE_BUFFER_BIT */
+   { 18621, 0x00000004 }, /* GL_MAP_INVALIDATE_RANGE_BIT */
+   { 18649, 0x00000001 }, /* GL_MAP_READ_BIT */
+   { 18665, 0x00000D11 }, /* GL_MAP_STENCIL */
+   { 18680, 0x00000020 }, /* GL_MAP_UNSYNCHRONIZED_BIT */
+   { 18706, 0x00000002 }, /* GL_MAP_WRITE_BIT */
+   { 18723, 0x000088C0 }, /* GL_MATRIX0_ARB */
+   { 18738, 0x00008630 }, /* GL_MATRIX0_NV */
+   { 18752, 0x000088CA }, /* GL_MATRIX10_ARB */
+   { 18768, 0x000088CB }, /* GL_MATRIX11_ARB */
+   { 18784, 0x000088CC }, /* GL_MATRIX12_ARB */
+   { 18800, 0x000088CD }, /* GL_MATRIX13_ARB */
+   { 18816, 0x000088CE }, /* GL_MATRIX14_ARB */
+   { 18832, 0x000088CF }, /* GL_MATRIX15_ARB */
+   { 18848, 0x000088D0 }, /* GL_MATRIX16_ARB */
+   { 18864, 0x000088D1 }, /* GL_MATRIX17_ARB */
+   { 18880, 0x000088D2 }, /* GL_MATRIX18_ARB */
+   { 18896, 0x000088D3 }, /* GL_MATRIX19_ARB */
+   { 18912, 0x000088C1 }, /* GL_MATRIX1_ARB */
+   { 18927, 0x00008631 }, /* GL_MATRIX1_NV */
+   { 18941, 0x000088D4 }, /* GL_MATRIX20_ARB */
+   { 18957, 0x000088D5 }, /* GL_MATRIX21_ARB */
+   { 18973, 0x000088D6 }, /* GL_MATRIX22_ARB */
+   { 18989, 0x000088D7 }, /* GL_MATRIX23_ARB */
+   { 19005, 0x000088D8 }, /* GL_MATRIX24_ARB */
+   { 19021, 0x000088D9 }, /* GL_MATRIX25_ARB */
+   { 19037, 0x000088DA }, /* GL_MATRIX26_ARB */
+   { 19053, 0x000088DB }, /* GL_MATRIX27_ARB */
+   { 19069, 0x000088DC }, /* GL_MATRIX28_ARB */
+   { 19085, 0x000088DD }, /* GL_MATRIX29_ARB */
+   { 19101, 0x000088C2 }, /* GL_MATRIX2_ARB */
+   { 19116, 0x00008632 }, /* GL_MATRIX2_NV */
+   { 19130, 0x000088DE }, /* GL_MATRIX30_ARB */
+   { 19146, 0x000088DF }, /* GL_MATRIX31_ARB */
+   { 19162, 0x000088C3 }, /* GL_MATRIX3_ARB */
+   { 19177, 0x00008633 }, /* GL_MATRIX3_NV */
+   { 19191, 0x000088C4 }, /* GL_MATRIX4_ARB */
+   { 19206, 0x00008634 }, /* GL_MATRIX4_NV */
+   { 19220, 0x000088C5 }, /* GL_MATRIX5_ARB */
+   { 19235, 0x00008635 }, /* GL_MATRIX5_NV */
+   { 19249, 0x000088C6 }, /* GL_MATRIX6_ARB */
+   { 19264, 0x00008636 }, /* GL_MATRIX6_NV */
+   { 19278, 0x000088C7 }, /* GL_MATRIX7_ARB */
+   { 19293, 0x00008637 }, /* GL_MATRIX7_NV */
+   { 19307, 0x000088C8 }, /* GL_MATRIX8_ARB */
+   { 19322, 0x000088C9 }, /* GL_MATRIX9_ARB */
+   { 19337, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_ARB */
+   { 19363, 0x00008B9E }, /* GL_MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES */
+   { 19404, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_OES */
+   { 19430, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
+   { 19464, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_OES */
+   { 19498, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
+   { 19529, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_OES */
+   { 19560, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
+   { 19593, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_OES */
+   { 19626, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
+   { 19657, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_OES */
+   { 19688, 0x00000BA0 }, /* GL_MATRIX_MODE */
+   { 19703, 0x00008840 }, /* GL_MATRIX_PALETTE_ARB */
+   { 19725, 0x00008840 }, /* GL_MATRIX_PALETTE_OES */
+   { 19747, 0x00008008 }, /* GL_MAX */
+   { 19754, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE */
+   { 19777, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE_OES */
+   { 19804, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
+   { 19836, 0x00000D35 }, /* GL_MAX_ATTRIB_STACK_DEPTH */
+   { 19862, 0x00000D3B }, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
+   { 19895, 0x00008177 }, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
+   { 19921, 0x00008178 }, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+   { 19955, 0x00000D32 }, /* GL_MAX_CLIP_PLANES */
+   { 19974, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS */
+   { 19999, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
+   { 20028, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
+   { 20060, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI */
+   { 20096, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
+   { 20132, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB */
+   { 20172, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT */
+   { 20198, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT_EXT */
+   { 20228, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH */
+   { 20253, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH_EXT */
+   { 20282, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
+   { 20311, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB */
+   { 20344, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_OES */
+   { 20377, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS */
+   { 20397, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ARB */
+   { 20421, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ATI */
+   { 20445, 0x000080E9 }, /* GL_MAX_ELEMENTS_INDICES */
+   { 20469, 0x000080E8 }, /* GL_MAX_ELEMENTS_VERTICES */
+   { 20494, 0x00000D30 }, /* GL_MAX_EVAL_ORDER */
+   { 20512, 0x00008008 }, /* GL_MAX_EXT */
+   { 20523, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
+   { 20558, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB */
+   { 20597, 0x00008DFD }, /* GL_MAX_FRAGMENT_UNIFORM_VECTORS */
+   { 20629, 0x00008DE0 }, /* GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB */
+   { 20665, 0x00008C29 }, /* GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB */
+   { 20705, 0x00008DE1 }, /* GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB */
+   { 20749, 0x00008DDF }, /* GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB */
+   { 20788, 0x00008DDD }, /* GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB */
+   { 20827, 0x00000D31 }, /* GL_MAX_LIGHTS */
+   { 20841, 0x00000B31 }, /* GL_MAX_LIST_NESTING */
+   { 20861, 0x00008841 }, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
+   { 20899, 0x00000D36 }, /* GL_MAX_MODELVIEW_STACK_DEPTH */
+   { 20928, 0x00000D37 }, /* GL_MAX_NAME_STACK_DEPTH */
+   { 20952, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_ARB */
+   { 20980, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_OES */
+   { 21008, 0x00000D34 }, /* GL_MAX_PIXEL_MAP_TABLE */
+   { 21031, 0x000088B1 }, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
+   { 21068, 0x0000880B }, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
+   { 21104, 0x000088AD }, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
+   { 21131, 0x000088F5 }, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
+   { 21160, 0x000088B5 }, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
+   { 21194, 0x000088F4 }, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
+   { 21230, 0x000088F6 }, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
+   { 21257, 0x000088A1 }, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
+   { 21289, 0x000088B4 }, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
+   { 21325, 0x000088F8 }, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
+   { 21354, 0x000088F7 }, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
+   { 21383, 0x0000862F }, /* GL_MAX_PROGRAM_MATRICES_ARB */
+   { 21411, 0x0000862E }, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
+   { 21449, 0x000088B3 }, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+   { 21493, 0x0000880E }, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+   { 21536, 0x000088AF }, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
+   { 21570, 0x000088A3 }, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+   { 21609, 0x000088AB }, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
+   { 21646, 0x000088A7 }, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
+   { 21684, 0x00008810 }, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+   { 21727, 0x0000880F }, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+   { 21770, 0x000088A9 }, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
+   { 21800, 0x000088A5 }, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
+   { 21831, 0x0000880D }, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
+   { 21867, 0x0000880C }, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
+   { 21903, 0x00000D38 }, /* GL_MAX_PROJECTION_STACK_DEPTH */
+   { 21933, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
+   { 21967, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_NV */
+   { 22000, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE */
+   { 22025, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
+   { 22054, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_OES */
+   { 22083, 0x00008D57 }, /* GL_MAX_SAMPLES */
+   { 22098, 0x00008D57 }, /* GL_MAX_SAMPLES_EXT */
+   { 22117, 0x00009111 }, /* GL_MAX_SERVER_WAIT_TIMEOUT */
+   { 22144, 0x00008504 }, /* GL_MAX_SHININESS_NV */
+   { 22164, 0x00008505 }, /* GL_MAX_SPOT_EXPONENT_NV */
+   { 22188, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS */
+   { 22210, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS_ARB */
+   { 22236, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS */
+   { 22263, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */
+   { 22294, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS */
+   { 22318, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS_EXT */
+   { 22346, 0x000084FF }, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 22380, 0x00000D33 }, /* GL_MAX_TEXTURE_SIZE */
+   { 22400, 0x00000D39 }, /* GL_MAX_TEXTURE_STACK_DEPTH */
+   { 22427, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS */
+   { 22448, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS_ARB */
+   { 22473, 0x0000862F }, /* GL_MAX_TRACK_MATRICES_NV */
+   { 22498, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
+   { 22533, 0x00008C8A }, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT */
+   { 22586, 0x00008C8B }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT */
+   { 22633, 0x00008C80 }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT */
+   { 22683, 0x00008B4B }, /* GL_MAX_VARYING_COMPONENTS */
+   { 22709, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */
+   { 22731, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */
+   { 22757, 0x00008DFC }, /* GL_MAX_VARYING_VECTORS */
+   { 22780, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS */
+   { 22802, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */
+   { 22828, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
+   { 22862, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
+   { 22900, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
+   { 22933, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */
+   { 22970, 0x00008DFB }, /* GL_MAX_VERTEX_UNIFORM_VECTORS */
+   { 23000, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_ARB */
+   { 23024, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_OES */
+   { 23048, 0x00008DDE }, /* GL_MAX_VERTEX_VARYING_COMPONENTS_ARB */
+   { 23085, 0x00000D3A }, /* GL_MAX_VIEWPORT_DIMS */
+   { 23106, 0x00008DF1 }, /* GL_MEDIUM_FLOAT */
+   { 23122, 0x00008DF4 }, /* GL_MEDIUM_INT */
+   { 23136, 0x00008007 }, /* GL_MIN */
+   { 23143, 0x0000802E }, /* GL_MINMAX */
+   { 23153, 0x0000802E }, /* GL_MINMAX_EXT */
+   { 23167, 0x0000802F }, /* GL_MINMAX_FORMAT */
+   { 23184, 0x0000802F }, /* GL_MINMAX_FORMAT_EXT */
+   { 23205, 0x00008030 }, /* GL_MINMAX_SINK */
+   { 23220, 0x00008030 }, /* GL_MINMAX_SINK_EXT */
+   { 23239, 0x00008007 }, /* GL_MIN_EXT */
+   { 23250, 0x00008370 }, /* GL_MIRRORED_REPEAT */
+   { 23269, 0x00008370 }, /* GL_MIRRORED_REPEAT_ARB */
+   { 23292, 0x00008370 }, /* GL_MIRRORED_REPEAT_IBM */
+   { 23315, 0x00008742 }, /* GL_MIRROR_CLAMP_ATI */
+   { 23335, 0x00008742 }, /* GL_MIRROR_CLAMP_EXT */
+   { 23355, 0x00008912 }, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
+   { 23385, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_ATI */
+   { 23413, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
+   { 23441, 0x00001700 }, /* GL_MODELVIEW */
+   { 23454, 0x00001700 }, /* GL_MODELVIEW0_ARB */
+   { 23472, 0x0000872A }, /* GL_MODELVIEW10_ARB */
+   { 23491, 0x0000872B }, /* GL_MODELVIEW11_ARB */
+   { 23510, 0x0000872C }, /* GL_MODELVIEW12_ARB */
+   { 23529, 0x0000872D }, /* GL_MODELVIEW13_ARB */
+   { 23548, 0x0000872E }, /* GL_MODELVIEW14_ARB */
+   { 23567, 0x0000872F }, /* GL_MODELVIEW15_ARB */
+   { 23586, 0x00008730 }, /* GL_MODELVIEW16_ARB */
+   { 23605, 0x00008731 }, /* GL_MODELVIEW17_ARB */
+   { 23624, 0x00008732 }, /* GL_MODELVIEW18_ARB */
+   { 23643, 0x00008733 }, /* GL_MODELVIEW19_ARB */
+   { 23662, 0x0000850A }, /* GL_MODELVIEW1_ARB */
+   { 23680, 0x00008734 }, /* GL_MODELVIEW20_ARB */
+   { 23699, 0x00008735 }, /* GL_MODELVIEW21_ARB */
+   { 23718, 0x00008736 }, /* GL_MODELVIEW22_ARB */
+   { 23737, 0x00008737 }, /* GL_MODELVIEW23_ARB */
+   { 23756, 0x00008738 }, /* GL_MODELVIEW24_ARB */
+   { 23775, 0x00008739 }, /* GL_MODELVIEW25_ARB */
+   { 23794, 0x0000873A }, /* GL_MODELVIEW26_ARB */
+   { 23813, 0x0000873B }, /* GL_MODELVIEW27_ARB */
+   { 23832, 0x0000873C }, /* GL_MODELVIEW28_ARB */
+   { 23851, 0x0000873D }, /* GL_MODELVIEW29_ARB */
+   { 23870, 0x00008722 }, /* GL_MODELVIEW2_ARB */
+   { 23888, 0x0000873E }, /* GL_MODELVIEW30_ARB */
+   { 23907, 0x0000873F }, /* GL_MODELVIEW31_ARB */
+   { 23926, 0x00008723 }, /* GL_MODELVIEW3_ARB */
+   { 23944, 0x00008724 }, /* GL_MODELVIEW4_ARB */
+   { 23962, 0x00008725 }, /* GL_MODELVIEW5_ARB */
+   { 23980, 0x00008726 }, /* GL_MODELVIEW6_ARB */
+   { 23998, 0x00008727 }, /* GL_MODELVIEW7_ARB */
+   { 24016, 0x00008728 }, /* GL_MODELVIEW8_ARB */
+   { 24034, 0x00008729 }, /* GL_MODELVIEW9_ARB */
+   { 24052, 0x00000BA6 }, /* GL_MODELVIEW_MATRIX */
+   { 24072, 0x0000898D }, /* GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES */
+   { 24114, 0x00008629 }, /* GL_MODELVIEW_PROJECTION_NV */
+   { 24141, 0x00000BA3 }, /* GL_MODELVIEW_STACK_DEPTH */
+   { 24166, 0x00002100 }, /* GL_MODULATE */
+   { 24178, 0x00008744 }, /* GL_MODULATE_ADD_ATI */
+   { 24198, 0x00008745 }, /* GL_MODULATE_SIGNED_ADD_ATI */
+   { 24225, 0x00008746 }, /* GL_MODULATE_SUBTRACT_ATI */
+   { 24250, 0x00000103 }, /* GL_MULT */
+   { 24258, 0x0000809D }, /* GL_MULTISAMPLE */
+   { 24273, 0x000086B2 }, /* GL_MULTISAMPLE_3DFX */
+   { 24293, 0x0000809D }, /* GL_MULTISAMPLE_ARB */
+   { 24312, 0x20000000 }, /* GL_MULTISAMPLE_BIT */
+   { 24331, 0x20000000 }, /* GL_MULTISAMPLE_BIT_3DFX */
+   { 24355, 0x20000000 }, /* GL_MULTISAMPLE_BIT_ARB */
+   { 24378, 0x00008534 }, /* GL_MULTISAMPLE_FILTER_HINT_NV */
+   { 24408, 0x00002A25 }, /* GL_N3F_V3F */
+   { 24419, 0x00000D70 }, /* GL_NAME_STACK_DEPTH */
+   { 24439, 0x0000150E }, /* GL_NAND */
+   { 24447, 0x00002600 }, /* GL_NEAREST */
+   { 24458, 0x0000844E }, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
+   { 24489, 0x0000844D }, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
+   { 24521, 0x00002702 }, /* GL_NEAREST_MIPMAP_LINEAR */
+   { 24546, 0x00002700 }, /* GL_NEAREST_MIPMAP_NEAREST */
+   { 24572, 0x00000200 }, /* GL_NEVER */
+   { 24581, 0x00001102 }, /* GL_NICEST */
+   { 24591, 0x00000000 }, /* GL_NONE */
+   { 24599, 0x00000000 }, /* GL_NONE_OES */
+   { 24611, 0x00001505 }, /* GL_NOOP */
+   { 24619, 0x00001508 }, /* GL_NOR */
+   { 24626, 0x00000BA1 }, /* GL_NORMALIZE */
+   { 24639, 0x00008075 }, /* GL_NORMAL_ARRAY */
+   { 24655, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
+   { 24686, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING_ARB */
+   { 24721, 0x0000808F }, /* GL_NORMAL_ARRAY_POINTER */
+   { 24745, 0x0000807F }, /* GL_NORMAL_ARRAY_STRIDE */
+   { 24768, 0x0000807E }, /* GL_NORMAL_ARRAY_TYPE */
+   { 24789, 0x00008511 }, /* GL_NORMAL_MAP */
+   { 24803, 0x00008511 }, /* GL_NORMAL_MAP_ARB */
+   { 24821, 0x00008511 }, /* GL_NORMAL_MAP_NV */
+   { 24838, 0x00008511 }, /* GL_NORMAL_MAP_OES */
+   { 24856, 0x00000205 }, /* GL_NOTEQUAL */
+   { 24868, 0x00000000 }, /* GL_NO_ERROR */
+   { 24880, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
+   { 24914, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB */
+   { 24952, 0x000087FE }, /* GL_NUM_PROGRAM_BINARY_FORMATS_OES */
+   { 24986, 0x00008DF9 }, /* GL_NUM_SHADER_BINARY_FORMATS */
+   { 25015, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */
+   { 25047, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */
+   { 25089, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */
+   { 25119, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */
+   { 25159, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */
+   { 25190, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */
+   { 25219, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */
+   { 25247, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */
+   { 25277, 0x00002401 }, /* GL_OBJECT_LINEAR */
+   { 25294, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */
+   { 25320, 0x00002501 }, /* GL_OBJECT_PLANE */
+   { 25336, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */
+   { 25371, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */
+   { 25393, 0x00009112 }, /* GL_OBJECT_TYPE */
+   { 25408, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */
+   { 25427, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */
+   { 25457, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */
+   { 25478, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */
+   { 25506, 0x00000001 }, /* GL_ONE */
+   { 25513, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */
+   { 25541, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */
+   { 25573, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */
+   { 25601, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */
+   { 25633, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */
+   { 25656, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */
+   { 25679, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */
+   { 25702, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */
+   { 25725, 0x00008598 }, /* GL_OPERAND0_ALPHA */
+   { 25743, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */
+   { 25765, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */
+   { 25787, 0x00008590 }, /* GL_OPERAND0_RGB */
+   { 25803, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */
+   { 25823, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */
+   { 25843, 0x00008599 }, /* GL_OPERAND1_ALPHA */
+   { 25861, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */
+   { 25883, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */
+   { 25905, 0x00008591 }, /* GL_OPERAND1_RGB */
+   { 25921, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */
+   { 25941, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */
+   { 25961, 0x0000859A }, /* GL_OPERAND2_ALPHA */
+   { 25979, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */
+   { 26001, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */
+   { 26023, 0x00008592 }, /* GL_OPERAND2_RGB */
+   { 26039, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */
+   { 26059, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */
+   { 26079, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */
+   { 26100, 0x00008593 }, /* GL_OPERAND3_RGB_NV */
+   { 26119, 0x00001507 }, /* GL_OR */
+   { 26125, 0x00000A01 }, /* GL_ORDER */
+   { 26134, 0x0000150D }, /* GL_OR_INVERTED */
+   { 26149, 0x0000150B }, /* GL_OR_REVERSE */
+   { 26163, 0x00000505 }, /* GL_OUT_OF_MEMORY */
+   { 26180, 0x00000D05 }, /* GL_PACK_ALIGNMENT */
+   { 26198, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */
+   { 26219, 0x00008758 }, /* GL_PACK_INVERT_MESA */
+   { 26239, 0x00000D01 }, /* GL_PACK_LSB_FIRST */
+   { 26257, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */
+   { 26276, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */
+   { 26296, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */
+   { 26316, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */
+   { 26334, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */
+   { 26353, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */
+   { 26378, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */
+   { 26402, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */
+   { 26423, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */
+   { 26445, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */
+   { 26467, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */
+   { 26492, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */
+   { 26516, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */
+   { 26537, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */
+   { 26559, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */
+   { 26581, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */
+   { 26603, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */
+   { 26634, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */
+   { 26654, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */
+   { 26679, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */
+   { 26699, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */
+   { 26724, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */
+   { 26744, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */
+   { 26769, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */
+   { 26789, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */
+   { 26814, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */
+   { 26834, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */
+   { 26859, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */
+   { 26879, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */
+   { 26904, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */
+   { 26924, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */
+   { 26949, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */
+   { 26969, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */
+   { 26994, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */
+   { 27014, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */
+   { 27039, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */
+   { 27059, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */
+   { 27084, 0x00000020 }, /* GL_PIXEL_MODE_BIT */
+   { 27102, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER */
+   { 27123, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING */
+   { 27152, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */
+   { 27185, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */
+   { 27210, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER */
+   { 27233, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
+   { 27264, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */
+   { 27299, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */
+   { 27326, 0x00001B00 }, /* GL_POINT */
+   { 27335, 0x00000000 }, /* GL_POINTS */
+   { 27345, 0x00000002 }, /* GL_POINT_BIT */
+   { 27358, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */
+   { 27388, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */
+   { 27422, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */
+   { 27456, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */
+   { 27491, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */
+   { 27520, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */
+   { 27553, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */
+   { 27586, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */
+   { 27620, 0x00000B11 }, /* GL_POINT_SIZE */
+   { 27634, 0x00008B9F }, /* GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES */
+   { 27673, 0x00008B9C }, /* GL_POINT_SIZE_ARRAY_OES */
+   { 27697, 0x0000898C }, /* GL_POINT_SIZE_ARRAY_POINTER_OES */
+   { 27729, 0x0000898B }, /* GL_POINT_SIZE_ARRAY_STRIDE_OES */
+   { 27760, 0x0000898A }, /* GL_POINT_SIZE_ARRAY_TYPE_OES */
+   { 27789, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */
+   { 27815, 0x00008127 }, /* GL_POINT_SIZE_MAX */
+   { 27833, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */
+   { 27855, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */
+   { 27877, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */
+   { 27900, 0x00008126 }, /* GL_POINT_SIZE_MIN */
+   { 27918, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */
+   { 27940, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */
+   { 27962, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */
+   { 27985, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */
+   { 28005, 0x00000B10 }, /* GL_POINT_SMOOTH */
+   { 28021, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */
+   { 28042, 0x00008861 }, /* GL_POINT_SPRITE */
+   { 28058, 0x00008861 }, /* GL_POINT_SPRITE_ARB */
+   { 28078, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */
+   { 28107, 0x00008861 }, /* GL_POINT_SPRITE_NV */
+   { 28126, 0x00008861 }, /* GL_POINT_SPRITE_OES */
+   { 28146, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */
+   { 28172, 0x00000701 }, /* GL_POINT_TOKEN */
+   { 28187, 0x00000009 }, /* GL_POLYGON */
+   { 28198, 0x00000008 }, /* GL_POLYGON_BIT */
+   { 28213, 0x00000B40 }, /* GL_POLYGON_MODE */
+   { 28229, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */
+   { 28252, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */
+   { 28277, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */
+   { 28300, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */
+   { 28323, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */
+   { 28347, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */
+   { 28371, 0x00000B41 }, /* GL_POLYGON_SMOOTH */
+   { 28389, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */
+   { 28412, 0x00000B42 }, /* GL_POLYGON_STIPPLE */
+   { 28431, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */
+   { 28454, 0x00000703 }, /* GL_POLYGON_TOKEN */
+   { 28471, 0x00001203 }, /* GL_POSITION */
+   { 28483, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
+   { 28515, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */
+   { 28551, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
+   { 28584, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */
+   { 28621, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
+   { 28652, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */
+   { 28687, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
+   { 28719, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */
+   { 28755, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
+   { 28788, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
+   { 28820, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */
+   { 28856, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
+   { 28889, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */
+   { 28926, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */
+   { 28956, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */
+   { 28990, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */
+   { 29021, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */
+   { 29056, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
+   { 29087, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */
+   { 29122, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
+   { 29154, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */
+   { 29190, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */
+   { 29220, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */
+   { 29254, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */
+   { 29285, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */
+   { 29320, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */
+   { 29352, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */
+   { 29383, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */
+   { 29418, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */
+   { 29450, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */
+   { 29486, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */
+   { 29515, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */
+   { 29548, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */
+   { 29578, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */
+   { 29612, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
+   { 29651, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
+   { 29684, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
+   { 29724, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
+   { 29758, 0x00008578 }, /* GL_PREVIOUS */
+   { 29770, 0x00008578 }, /* GL_PREVIOUS_ARB */
+   { 29786, 0x00008578 }, /* GL_PREVIOUS_EXT */
+   { 29802, 0x00008577 }, /* GL_PRIMARY_COLOR */
+   { 29819, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */
+   { 29840, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */
+   { 29861, 0x00008C87 }, /* GL_PRIMITIVES_GENERATED_EXT */
+   { 29889, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
+   { 29922, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
+   { 29954, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
+   { 29977, 0x000087FF }, /* GL_PROGRAM_BINARY_FORMATS_OES */
+   { 30007, 0x00008741 }, /* GL_PROGRAM_BINARY_LENGTH_OES */
+   { 30036, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
+   { 30059, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
+   { 30089, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
+   { 30118, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
+   { 30146, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
+   { 30168, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
+   { 30196, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
+   { 30224, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
+   { 30246, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
+   { 30267, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+   { 30307, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+   { 30346, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
+   { 30376, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+   { 30411, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
+   { 30444, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
+   { 30478, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+   { 30517, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+   { 30556, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
+   { 30578, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
+   { 30604, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
+   { 30628, 0x00008642 }, /* GL_PROGRAM_POINT_SIZE_ARB */
+   { 30654, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
+   { 30677, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
+   { 30699, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
+   { 30720, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
+   { 30741, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
+   { 30768, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
+   { 30800, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
+   { 30832, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
+   { 30867, 0x00001701 }, /* GL_PROJECTION */
+   { 30881, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
+   { 30902, 0x0000898E }, /* GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES */
+   { 30945, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
+   { 30971, 0x00008E4F }, /* GL_PROVOKING_VERTEX */
+   { 30991, 0x00008E4F }, /* GL_PROVOKING_VERTEX_EXT */
+   { 31015, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
+   { 31036, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
+   { 31055, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
+   { 31078, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
+   { 31117, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
+   { 31155, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
+   { 31175, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
+   { 31205, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
+   { 31229, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
+   { 31249, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
+   { 31279, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
+   { 31303, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
+   { 31323, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
+   { 31356, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
+   { 31382, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
+   { 31412, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
+   { 31443, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
+   { 31473, 0x00008A1D }, /* GL_PURGEABLE_APPLE */
+   { 31492, 0x00002003 }, /* GL_Q */
+   { 31497, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
+   { 31522, 0x00000007 }, /* GL_QUADS */
+   { 31531, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
+   { 31575, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT */
+   { 31623, 0x00008614 }, /* GL_QUAD_MESH_SUN */
+   { 31640, 0x00000008 }, /* GL_QUAD_STRIP */
+   { 31654, 0x00008E16 }, /* GL_QUERY_BY_REGION_NO_WAIT_NV */
+   { 31684, 0x00008E15 }, /* GL_QUERY_BY_REGION_WAIT_NV */
+   { 31711, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
+   { 31733, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
+   { 31759, 0x00008E14 }, /* GL_QUERY_NO_WAIT_NV */
+   { 31779, 0x00008866 }, /* GL_QUERY_RESULT */
+   { 31795, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
+   { 31815, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
+   { 31841, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
+   { 31871, 0x00008E13 }, /* GL_QUERY_WAIT_NV */
+   { 31888, 0x00002002 }, /* GL_R */
+   { 31893, 0x00002A10 }, /* GL_R3_G3_B2 */
+   { 31905, 0x00008C89 }, /* GL_RASTERIZER_DISCARD_EXT */
+   { 31931, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
+   { 31964, 0x00000C02 }, /* GL_READ_BUFFER */
+   { 31979, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */
+   { 31999, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING */
+   { 32027, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
+   { 32059, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
+   { 32083, 0x000088B8 }, /* GL_READ_ONLY */
+   { 32096, 0x000088B8 }, /* GL_READ_ONLY_ARB */
+   { 32113, 0x000088BA }, /* GL_READ_WRITE */
+   { 32127, 0x000088BA }, /* GL_READ_WRITE_ARB */
+   { 32145, 0x00001903 }, /* GL_RED */
+   { 32152, 0x00008016 }, /* GL_REDUCE */
+   { 32162, 0x00008016 }, /* GL_REDUCE_EXT */
+   { 32176, 0x00000D15 }, /* GL_RED_BIAS */
+   { 32188, 0x00000D52 }, /* GL_RED_BITS */
+   { 32200, 0x00000D14 }, /* GL_RED_SCALE */
+   { 32213, 0x00008512 }, /* GL_REFLECTION_MAP */
+   { 32231, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
+   { 32253, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
+   { 32274, 0x00008512 }, /* GL_REFLECTION_MAP_OES */
+   { 32296, 0x00008A19 }, /* GL_RELEASED_APPLE */
+   { 32314, 0x00001C00 }, /* GL_RENDER */
+   { 32324, 0x00008D41 }, /* GL_RENDERBUFFER */
+   { 32340, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */
+   { 32367, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE_OES */
+   { 32398, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING */
+   { 32422, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
+   { 32450, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_OES */
+   { 32478, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */
+   { 32504, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE_OES */
+   { 32534, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */
+   { 32561, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE_OES */
+   { 32592, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
+   { 32612, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */
+   { 32639, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE_OES */
+   { 32670, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */
+   { 32693, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
+   { 32720, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_OES */
+   { 32747, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
+   { 32779, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
+   { 32815, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_OES */
+   { 32851, 0x00008D41 }, /* GL_RENDERBUFFER_OES */
+   { 32871, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */
+   { 32896, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE_OES */
+   { 32925, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */
+   { 32949, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES_EXT */
+   { 32977, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */
+   { 33006, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE_OES */
+   { 33039, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */
+   { 33061, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
+   { 33087, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_OES */
+   { 33113, 0x00001F01 }, /* GL_RENDERER */
+   { 33125, 0x00000C40 }, /* GL_RENDER_MODE */
+   { 33140, 0x00002901 }, /* GL_REPEAT */
+   { 33150, 0x00001E01 }, /* GL_REPLACE */
+   { 33161, 0x00008062 }, /* GL_REPLACE_EXT */
+   { 33176, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
+   { 33199, 0x0000803A }, /* GL_RESCALE_NORMAL */
+   { 33217, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
+   { 33239, 0x00008A1B }, /* GL_RETAINED_APPLE */
+   { 33257, 0x00000102 }, /* GL_RETURN */
+   { 33267, 0x00001907 }, /* GL_RGB */
+   { 33274, 0x00008052 }, /* GL_RGB10 */
+   { 33283, 0x00008059 }, /* GL_RGB10_A2 */
+   { 33295, 0x00008059 }, /* GL_RGB10_A2_EXT */
+   { 33311, 0x00008052 }, /* GL_RGB10_EXT */
+   { 33324, 0x00008053 }, /* GL_RGB12 */
+   { 33333, 0x00008053 }, /* GL_RGB12_EXT */
+   { 33346, 0x00008054 }, /* GL_RGB16 */
+   { 33355, 0x00008054 }, /* GL_RGB16_EXT */
+   { 33368, 0x0000804E }, /* GL_RGB2_EXT */
+   { 33380, 0x0000804F }, /* GL_RGB4 */
+   { 33388, 0x0000804F }, /* GL_RGB4_EXT */
+   { 33400, 0x000083A1 }, /* GL_RGB4_S3TC */
+   { 33413, 0x00008050 }, /* GL_RGB5 */
+   { 33421, 0x00008D62 }, /* GL_RGB565 */
+   { 33431, 0x00008D62 }, /* GL_RGB565_OES */
+   { 33445, 0x00008057 }, /* GL_RGB5_A1 */
+   { 33456, 0x00008057 }, /* GL_RGB5_A1_EXT */
+   { 33471, 0x00008057 }, /* GL_RGB5_A1_OES */
+   { 33486, 0x00008050 }, /* GL_RGB5_EXT */
+   { 33498, 0x00008051 }, /* GL_RGB8 */
+   { 33506, 0x00008051 }, /* GL_RGB8_EXT */
+   { 33518, 0x00008051 }, /* GL_RGB8_OES */
+   { 33530, 0x00001908 }, /* GL_RGBA */
+   { 33538, 0x0000805A }, /* GL_RGBA12 */
+   { 33548, 0x0000805A }, /* GL_RGBA12_EXT */
+   { 33562, 0x0000805B }, /* GL_RGBA16 */
+   { 33572, 0x0000805B }, /* GL_RGBA16_EXT */
+   { 33586, 0x00008055 }, /* GL_RGBA2 */
+   { 33595, 0x00008055 }, /* GL_RGBA2_EXT */
+   { 33608, 0x00008056 }, /* GL_RGBA4 */
+   { 33617, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
+   { 33636, 0x00008056 }, /* GL_RGBA4_EXT */
+   { 33649, 0x00008056 }, /* GL_RGBA4_OES */
+   { 33662, 0x000083A3 }, /* GL_RGBA4_S3TC */
+   { 33676, 0x00008058 }, /* GL_RGBA8 */
+   { 33685, 0x00008058 }, /* GL_RGBA8_EXT */
+   { 33698, 0x00008058 }, /* GL_RGBA8_OES */
+   { 33711, 0x00008F97 }, /* GL_RGBA8_SNORM */
+   { 33726, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
+   { 33744, 0x00000C31 }, /* GL_RGBA_MODE */
+   { 33757, 0x000083A2 }, /* GL_RGBA_S3TC */
+   { 33770, 0x00008F93 }, /* GL_RGBA_SNORM */
+   { 33784, 0x000083A0 }, /* GL_RGB_S3TC */
+   { 33796, 0x00008573 }, /* GL_RGB_SCALE */
+   { 33809, 0x00008573 }, /* GL_RGB_SCALE_ARB */
+   { 33826, 0x00008573 }, /* GL_RGB_SCALE_EXT */
+   { 33843, 0x00000407 }, /* GL_RIGHT */
+   { 33852, 0x00002000 }, /* GL_S */
+   { 33857, 0x00008B5D }, /* GL_SAMPLER_1D */
+   { 33871, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
+   { 33892, 0x00008B5E }, /* GL_SAMPLER_2D */
+   { 33906, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
+   { 33927, 0x00008B5F }, /* GL_SAMPLER_3D */
+   { 33941, 0x00008B5F }, /* GL_SAMPLER_3D_OES */
+   { 33959, 0x00008B60 }, /* GL_SAMPLER_CUBE */
+   { 33975, 0x000080A9 }, /* GL_SAMPLES */
+   { 33986, 0x000086B4 }, /* GL_SAMPLES_3DFX */
+   { 34002, 0x000080A9 }, /* GL_SAMPLES_ARB */
+   { 34017, 0x00008914 }, /* GL_SAMPLES_PASSED */
+   { 34035, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
+   { 34057, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+   { 34085, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
+   { 34117, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
+   { 34140, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
+   { 34167, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
+   { 34185, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
+   { 34208, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
+   { 34230, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
+   { 34249, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
+   { 34272, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
+   { 34298, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
+   { 34328, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
+   { 34353, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
+   { 34382, 0x00080000 }, /* GL_SCISSOR_BIT */
+   { 34397, 0x00000C10 }, /* GL_SCISSOR_BOX */
+   { 34412, 0x00000C11 }, /* GL_SCISSOR_TEST */
+   { 34428, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
+   { 34453, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+   { 34493, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
+   { 34537, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+   { 34570, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+   { 34600, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+   { 34632, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+   { 34662, 0x00001C02 }, /* GL_SELECT */
+   { 34672, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
+   { 34700, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
+   { 34725, 0x00008012 }, /* GL_SEPARABLE_2D */
+   { 34741, 0x00008C8D }, /* GL_SEPARATE_ATTRIBS_EXT */
+   { 34765, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
+   { 34792, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
+   { 34823, 0x0000150F }, /* GL_SET */
+   { 34830, 0x00008DF8 }, /* GL_SHADER_BINARY_FORMATS */
+   { 34855, 0x00008DFA }, /* GL_SHADER_COMPILER */
+   { 34874, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
+   { 34895, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
+   { 34919, 0x00008B4F }, /* GL_SHADER_TYPE */
+   { 34934, 0x00000B54 }, /* GL_SHADE_MODEL */
+   { 34949, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
+   { 34977, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
+   { 35000, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+   { 35030, 0x00001601 }, /* GL_SHININESS */
+   { 35043, 0x00001402 }, /* GL_SHORT */
+   { 35052, 0x00009119 }, /* GL_SIGNALED */
+   { 35064, 0x00008F9C }, /* GL_SIGNED_NORMALIZED */
+   { 35085, 0x000081F9 }, /* GL_SINGLE_COLOR */
+   { 35101, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
+   { 35121, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
+   { 35140, 0x00008C46 }, /* GL_SLUMINANCE */
+   { 35154, 0x00008C47 }, /* GL_SLUMINANCE8 */
+   { 35169, 0x00008C45 }, /* GL_SLUMINANCE8_ALPHA8 */
+   { 35191, 0x00008C44 }, /* GL_SLUMINANCE_ALPHA */
+   { 35211, 0x00001D01 }, /* GL_SMOOTH */
+   { 35221, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
+   { 35254, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
+   { 35281, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
+   { 35314, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
+   { 35341, 0x00008588 }, /* GL_SOURCE0_ALPHA */
+   { 35358, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
+   { 35379, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
+   { 35400, 0x00008580 }, /* GL_SOURCE0_RGB */
+   { 35415, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
+   { 35434, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
+   { 35453, 0x00008589 }, /* GL_SOURCE1_ALPHA */
+   { 35470, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
+   { 35491, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
+   { 35512, 0x00008581 }, /* GL_SOURCE1_RGB */
+   { 35527, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
+   { 35546, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
+   { 35565, 0x0000858A }, /* GL_SOURCE2_ALPHA */
+   { 35582, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
+   { 35603, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
+   { 35624, 0x00008582 }, /* GL_SOURCE2_RGB */
+   { 35639, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
+   { 35658, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
+   { 35677, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
+   { 35697, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
+   { 35715, 0x00001202 }, /* GL_SPECULAR */
+   { 35727, 0x00002402 }, /* GL_SPHERE_MAP */
+   { 35741, 0x00001206 }, /* GL_SPOT_CUTOFF */
+   { 35756, 0x00001204 }, /* GL_SPOT_DIRECTION */
+   { 35774, 0x00001205 }, /* GL_SPOT_EXPONENT */
+   { 35791, 0x00008588 }, /* GL_SRC0_ALPHA */
+   { 35805, 0x00008580 }, /* GL_SRC0_RGB */
+   { 35817, 0x00008589 }, /* GL_SRC1_ALPHA */
+   { 35831, 0x00008581 }, /* GL_SRC1_RGB */
+   { 35843, 0x0000858A }, /* GL_SRC2_ALPHA */
+   { 35857, 0x00008582 }, /* GL_SRC2_RGB */
+   { 35869, 0x00000302 }, /* GL_SRC_ALPHA */
+   { 35882, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
+   { 35904, 0x00000300 }, /* GL_SRC_COLOR */
+   { 35917, 0x00008C40 }, /* GL_SRGB */
+   { 35925, 0x00008C41 }, /* GL_SRGB8 */
+   { 35934, 0x00008C43 }, /* GL_SRGB8_ALPHA8 */
+   { 35950, 0x00008C42 }, /* GL_SRGB_ALPHA */
+   { 35964, 0x00000503 }, /* GL_STACK_OVERFLOW */
+   { 35982, 0x00000504 }, /* GL_STACK_UNDERFLOW */
+   { 36001, 0x000088E6 }, /* GL_STATIC_COPY */
+   { 36016, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
+   { 36035, 0x000088E4 }, /* GL_STATIC_DRAW */
+   { 36050, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
+   { 36069, 0x000088E5 }, /* GL_STATIC_READ */
+   { 36084, 0x000088E5 }, /* GL_STATIC_READ_ARB */
+   { 36103, 0x00001802 }, /* GL_STENCIL */
+   { 36114, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
+   { 36136, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
+   { 36162, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_OES */
+   { 36188, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
+   { 36209, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
+   { 36234, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
+   { 36255, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
+   { 36280, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+   { 36312, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
+   { 36348, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+   { 36380, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
+   { 36416, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
+   { 36436, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
+   { 36463, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
+   { 36489, 0x00000D57 }, /* GL_STENCIL_BITS */
+   { 36505, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
+   { 36527, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
+   { 36550, 0x00000B94 }, /* GL_STENCIL_FAIL */
+   { 36566, 0x00000B92 }, /* GL_STENCIL_FUNC */
+   { 36582, 0x00001901 }, /* GL_STENCIL_INDEX */
+   { 36599, 0x00008D46 }, /* GL_STENCIL_INDEX1 */
+   { 36617, 0x00008D49 }, /* GL_STENCIL_INDEX16 */
+   { 36636, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
+   { 36659, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
+   { 36681, 0x00008D46 }, /* GL_STENCIL_INDEX1_OES */
+   { 36703, 0x00008D47 }, /* GL_STENCIL_INDEX4 */
+   { 36721, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
+   { 36743, 0x00008D47 }, /* GL_STENCIL_INDEX4_OES */
+   { 36765, 0x00008D48 }, /* GL_STENCIL_INDEX8 */
+   { 36783, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
+   { 36805, 0x00008D48 }, /* GL_STENCIL_INDEX8_OES */
+   { 36827, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
+   { 36848, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
+   { 36875, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
+   { 36902, 0x00000B97 }, /* GL_STENCIL_REF */
+   { 36917, 0x00000B90 }, /* GL_STENCIL_TEST */
+   { 36933, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+   { 36962, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
+   { 36984, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
+   { 37005, 0x00000C33 }, /* GL_STEREO */
+   { 37015, 0x000085BE }, /* GL_STORAGE_CACHED_APPLE */
+   { 37039, 0x000085BD }, /* GL_STORAGE_PRIVATE_APPLE */
+   { 37064, 0x000085BF }, /* GL_STORAGE_SHARED_APPLE */
+   { 37088, 0x000088E2 }, /* GL_STREAM_COPY */
+   { 37103, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
+   { 37122, 0x000088E0 }, /* GL_STREAM_DRAW */
+   { 37137, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
+   { 37156, 0x000088E1 }, /* GL_STREAM_READ */
+   { 37171, 0x000088E1 }, /* GL_STREAM_READ_ARB */
+   { 37190, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
+   { 37207, 0x000084E7 }, /* GL_SUBTRACT */
+   { 37219, 0x000084E7 }, /* GL_SUBTRACT_ARB */
+   { 37235, 0x00009113 }, /* GL_SYNC_CONDITION */
+   { 37253, 0x00009116 }, /* GL_SYNC_FENCE */
+   { 37267, 0x00009115 }, /* GL_SYNC_FLAGS */
+   { 37281, 0x00000001 }, /* GL_SYNC_FLUSH_COMMANDS_BIT */
+   { 37308, 0x00009117 }, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
+   { 37338, 0x00009114 }, /* GL_SYNC_STATUS */
+   { 37353, 0x00002001 }, /* GL_T */
+   { 37358, 0x00002A2A }, /* GL_T2F_C3F_V3F */
+   { 37373, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
+   { 37392, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
+   { 37408, 0x00002A2B }, /* GL_T2F_N3F_V3F */
+   { 37423, 0x00002A27 }, /* GL_T2F_V3F */
+   { 37434, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
+   { 37453, 0x00002A28 }, /* GL_T4F_V4F */
+   { 37464, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
+   { 37487, 0x00001702 }, /* GL_TEXTURE */
+   { 37498, 0x000084C0 }, /* GL_TEXTURE0 */
+   { 37510, 0x000084C0 }, /* GL_TEXTURE0_ARB */
+   { 37526, 0x000084C1 }, /* GL_TEXTURE1 */
+   { 37538, 0x000084CA }, /* GL_TEXTURE10 */
+   { 37551, 0x000084CA }, /* GL_TEXTURE10_ARB */
+   { 37568, 0x000084CB }, /* GL_TEXTURE11 */
+   { 37581, 0x000084CB }, /* GL_TEXTURE11_ARB */
+   { 37598, 0x000084CC }, /* GL_TEXTURE12 */
+   { 37611, 0x000084CC }, /* GL_TEXTURE12_ARB */
+   { 37628, 0x000084CD }, /* GL_TEXTURE13 */
+   { 37641, 0x000084CD }, /* GL_TEXTURE13_ARB */
+   { 37658, 0x000084CE }, /* GL_TEXTURE14 */
+   { 37671, 0x000084CE }, /* GL_TEXTURE14_ARB */
+   { 37688, 0x000084CF }, /* GL_TEXTURE15 */
+   { 37701, 0x000084CF }, /* GL_TEXTURE15_ARB */
+   { 37718, 0x000084D0 }, /* GL_TEXTURE16 */
+   { 37731, 0x000084D0 }, /* GL_TEXTURE16_ARB */
+   { 37748, 0x000084D1 }, /* GL_TEXTURE17 */
+   { 37761, 0x000084D1 }, /* GL_TEXTURE17_ARB */
+   { 37778, 0x000084D2 }, /* GL_TEXTURE18 */
+   { 37791, 0x000084D2 }, /* GL_TEXTURE18_ARB */
+   { 37808, 0x000084D3 }, /* GL_TEXTURE19 */
+   { 37821, 0x000084D3 }, /* GL_TEXTURE19_ARB */
+   { 37838, 0x000084C1 }, /* GL_TEXTURE1_ARB */
+   { 37854, 0x000084C2 }, /* GL_TEXTURE2 */
+   { 37866, 0x000084D4 }, /* GL_TEXTURE20 */
+   { 37879, 0x000084D4 }, /* GL_TEXTURE20_ARB */
+   { 37896, 0x000084D5 }, /* GL_TEXTURE21 */
+   { 37909, 0x000084D5 }, /* GL_TEXTURE21_ARB */
+   { 37926, 0x000084D6 }, /* GL_TEXTURE22 */
+   { 37939, 0x000084D6 }, /* GL_TEXTURE22_ARB */
+   { 37956, 0x000084D7 }, /* GL_TEXTURE23 */
+   { 37969, 0x000084D7 }, /* GL_TEXTURE23_ARB */
+   { 37986, 0x000084D8 }, /* GL_TEXTURE24 */
+   { 37999, 0x000084D8 }, /* GL_TEXTURE24_ARB */
+   { 38016, 0x000084D9 }, /* GL_TEXTURE25 */
+   { 38029, 0x000084D9 }, /* GL_TEXTURE25_ARB */
+   { 38046, 0x000084DA }, /* GL_TEXTURE26 */
+   { 38059, 0x000084DA }, /* GL_TEXTURE26_ARB */
+   { 38076, 0x000084DB }, /* GL_TEXTURE27 */
+   { 38089, 0x000084DB }, /* GL_TEXTURE27_ARB */
+   { 38106, 0x000084DC }, /* GL_TEXTURE28 */
+   { 38119, 0x000084DC }, /* GL_TEXTURE28_ARB */
+   { 38136, 0x000084DD }, /* GL_TEXTURE29 */
+   { 38149, 0x000084DD }, /* GL_TEXTURE29_ARB */
+   { 38166, 0x000084C2 }, /* GL_TEXTURE2_ARB */
+   { 38182, 0x000084C3 }, /* GL_TEXTURE3 */
+   { 38194, 0x000084DE }, /* GL_TEXTURE30 */
+   { 38207, 0x000084DE }, /* GL_TEXTURE30_ARB */
+   { 38224, 0x000084DF }, /* GL_TEXTURE31 */
+   { 38237, 0x000084DF }, /* GL_TEXTURE31_ARB */
+   { 38254, 0x000084C3 }, /* GL_TEXTURE3_ARB */
+   { 38270, 0x000084C4 }, /* GL_TEXTURE4 */
+   { 38282, 0x000084C4 }, /* GL_TEXTURE4_ARB */
+   { 38298, 0x000084C5 }, /* GL_TEXTURE5 */
+   { 38310, 0x000084C5 }, /* GL_TEXTURE5_ARB */
+   { 38326, 0x000084C6 }, /* GL_TEXTURE6 */
+   { 38338, 0x000084C6 }, /* GL_TEXTURE6_ARB */
+   { 38354, 0x000084C7 }, /* GL_TEXTURE7 */
+   { 38366, 0x000084C7 }, /* GL_TEXTURE7_ARB */
+   { 38382, 0x000084C8 }, /* GL_TEXTURE8 */
+   { 38394, 0x000084C8 }, /* GL_TEXTURE8_ARB */
+   { 38410, 0x000084C9 }, /* GL_TEXTURE9 */
+   { 38422, 0x000084C9 }, /* GL_TEXTURE9_ARB */
+   { 38438, 0x00000DE0 }, /* GL_TEXTURE_1D */
+   { 38452, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
+   { 38476, 0x00000DE1 }, /* GL_TEXTURE_2D */
+   { 38490, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
+   { 38514, 0x0000806F }, /* GL_TEXTURE_3D */
+   { 38528, 0x0000806F }, /* GL_TEXTURE_3D_OES */
+   { 38546, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
+   { 38568, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
+   { 38594, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
+   { 38616, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
+   { 38638, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
+   { 38670, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
+   { 38692, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
+   { 38724, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
+   { 38746, 0x0000806A }, /* GL_TEXTURE_BINDING_3D_OES */
+   { 38772, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
+   { 38800, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
+   { 38832, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_OES */
+   { 38864, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
+   { 38897, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
+   { 38929, 0x00040000 }, /* GL_TEXTURE_BIT */
+   { 38944, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
+   { 38965, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
+   { 38990, 0x00001005 }, /* GL_TEXTURE_BORDER */
+   { 39008, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
+   { 39032, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+   { 39063, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+   { 39093, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+   { 39123, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+   { 39158, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+   { 39189, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+   { 39227, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
+   { 39254, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+   { 39286, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+   { 39320, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
+   { 39344, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
+   { 39372, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
+   { 39396, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
+   { 39424, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+   { 39457, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
+   { 39481, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
+   { 39503, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
+   { 39525, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
+   { 39551, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
+   { 39585, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+   { 39618, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
+   { 39655, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
+   { 39683, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
+   { 39715, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
+   { 39738, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+   { 39776, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
+   { 39818, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+   { 39849, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+   { 39877, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+   { 39907, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+   { 39935, 0x00008B9D }, /* GL_TEXTURE_CROP_RECT_OES */
+   { 39960, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
+   { 39980, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
+   { 40004, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+   { 40035, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
+   { 40070, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES */
+   { 40105, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+   { 40136, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
+   { 40171, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES */
+   { 40206, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+   { 40237, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
+   { 40272, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES */
+   { 40307, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_OES */
+   { 40331, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+   { 40362, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
+   { 40397, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES */
+   { 40432, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+   { 40463, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
+   { 40498, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES */
+   { 40533, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+   { 40564, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
+   { 40599, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES */
+   { 40634, 0x000088F4 }, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
+   { 40663, 0x00008071 }, /* GL_TEXTURE_DEPTH */
+   { 40680, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
+   { 40702, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
+   { 40728, 0x00002300 }, /* GL_TEXTURE_ENV */
+   { 40743, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
+   { 40764, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
+   { 40784, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
+   { 40810, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL_EXT */
+   { 40840, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
+   { 40860, 0x00002500 }, /* GL_TEXTURE_GEN_MODE_OES */
+   { 40884, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
+   { 40901, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
+   { 40918, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
+   { 40935, 0x00008D60 }, /* GL_TEXTURE_GEN_STR_OES */
+   { 40958, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
+   { 40975, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
+   { 41000, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
+   { 41022, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
+   { 41048, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
+   { 41066, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
+   { 41092, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
+   { 41118, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
+   { 41148, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
+   { 41175, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
+   { 41200, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
+   { 41220, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
+   { 41244, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+   { 41271, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+   { 41298, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+   { 41325, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
+   { 41351, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
+   { 41381, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
+   { 41403, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
+   { 41421, 0x0000898F }, /* GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES */
+   { 41461, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 41491, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+   { 41519, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+   { 41547, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+   { 41575, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
+   { 41596, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
+   { 41615, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
+   { 41637, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
+   { 41656, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
+   { 41676, 0x000085B7 }, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
+   { 41706, 0x000085B8 }, /* GL_TEXTURE_RANGE_POINTER_APPLE */
+   { 41737, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
+   { 41762, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
+   { 41786, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
+   { 41806, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
+   { 41830, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
+   { 41850, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
+   { 41873, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
+   { 41897, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE_EXT */
+   { 41925, 0x000085BC }, /* GL_TEXTURE_STORAGE_HINT_APPLE */
+   { 41955, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
+   { 41980, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+   { 42014, 0x00001000 }, /* GL_TEXTURE_WIDTH */
+   { 42031, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
+   { 42049, 0x00008072 }, /* GL_TEXTURE_WRAP_R_OES */
+   { 42071, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
+   { 42089, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
+   { 42107, 0x0000911B }, /* GL_TIMEOUT_EXPIRED */
+   { 42126, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
+   { 42146, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
+   { 42165, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+   { 42194, 0x00001000 }, /* GL_TRANSFORM_BIT */
+   { 42211, 0x00008E22 }, /* GL_TRANSFORM_FEEDBACK */
+   { 42233, 0x00008E25 }, /* GL_TRANSFORM_FEEDBACK_BINDING */
+   { 42263, 0x00008E24 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
+   { 42299, 0x00008C8F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT */
+   { 42340, 0x00008C8E }, /* GL_TRANSFORM_FEEDBACK_BUFFER_EXT */
+   { 42373, 0x00008C7F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT */
+   { 42411, 0x00008E23 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
+   { 42447, 0x00008C85 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT */
+   { 42485, 0x00008C84 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT */
+   { 42524, 0x00008C88 }, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT */
+   { 42569, 0x00008C83 }, /* GL_TRANSFORM_FEEDBACK_VARYINGS_EXT */
+   { 42604, 0x00008C76 }, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT */
+   { 42649, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
+   { 42675, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
+   { 42705, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+   { 42737, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+   { 42767, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
+   { 42801, 0x0000862C }, /* GL_TRANSPOSE_NV */
+   { 42817, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+   { 42848, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
+   { 42883, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+   { 42911, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
+   { 42943, 0x00000004 }, /* GL_TRIANGLES */
+   { 42956, 0x0000000C }, /* GL_TRIANGLES_ADJACENCY_ARB */
+   { 42983, 0x00000006 }, /* GL_TRIANGLE_FAN */
+   { 42999, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
+   { 43020, 0x00000005 }, /* GL_TRIANGLE_STRIP */
+   { 43038, 0x0000000D }, /* GL_TRIANGLE_STRIP_ADJACENCY_ARB */
+   { 43070, 0x00000001 }, /* GL_TRUE */
+   { 43078, 0x00008A1C }, /* GL_UNDEFINED_APPLE */
+   { 43097, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
+   { 43117, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
+   { 43140, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
+   { 43160, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
+   { 43181, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
+   { 43203, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
+   { 43225, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
+   { 43245, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
+   { 43266, 0x00009118 }, /* GL_UNSIGNALED */
+   { 43280, 0x00001401 }, /* GL_UNSIGNED_BYTE */
+   { 43297, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+   { 43324, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
+   { 43347, 0x00001405 }, /* GL_UNSIGNED_INT */
+   { 43363, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
+   { 43390, 0x00008DF6 }, /* GL_UNSIGNED_INT_10_10_10_2_OES */
+   { 43421, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
+   { 43442, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_EXT */
+   { 43467, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
+   { 43491, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_OES */
+   { 43516, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+   { 43547, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV_EXT */
+   { 43582, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
+   { 43606, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+   { 43634, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
+   { 43657, 0x00001403 }, /* GL_UNSIGNED_SHORT */
+   { 43675, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+   { 43705, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT */
+   { 43739, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+   { 43765, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+   { 43795, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT */
+   { 43829, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+   { 43855, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
+   { 43879, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+   { 43907, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+   { 43935, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
+   { 43962, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+   { 43994, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
+   { 44025, 0x00008CA2 }, /* GL_UPPER_LEFT */
+   { 44039, 0x00002A20 }, /* GL_V2F */
+   { 44046, 0x00002A21 }, /* GL_V3F */
+   { 44053, 0x00008B83 }, /* GL_VALIDATE_STATUS */
+   { 44072, 0x00001F00 }, /* GL_VENDOR */
+   { 44082, 0x00001F02 }, /* GL_VERSION */
+   { 44093, 0x00008074 }, /* GL_VERTEX_ARRAY */
+   { 44109, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING */
+   { 44133, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
+   { 44163, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+   { 44194, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
+   { 44229, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
+   { 44253, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
+   { 44274, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
+   { 44297, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
+   { 44318, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+   { 44345, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+   { 44373, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+   { 44401, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+   { 44429, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+   { 44457, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+   { 44485, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+   { 44513, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+   { 44540, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+   { 44567, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+   { 44594, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+   { 44621, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+   { 44648, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+   { 44675, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+   { 44702, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+   { 44729, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+   { 44756, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+   { 44794, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
+   { 44836, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+   { 44867, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
+   { 44902, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+   { 44936, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
+   { 44974, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+   { 45005, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
+   { 45040, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+   { 45068, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
+   { 45100, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+   { 45130, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
+   { 45164, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+   { 45192, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
+   { 45224, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
+   { 45244, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
+   { 45266, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
+   { 45295, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
+   { 45316, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+   { 45345, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
+   { 45378, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
+   { 45410, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+   { 45437, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
+   { 45468, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
+   { 45498, 0x00008B31 }, /* GL_VERTEX_SHADER */
+   { 45515, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
+   { 45536, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
+   { 45563, 0x00000BA2 }, /* GL_VIEWPORT */
+   { 45575, 0x00000800 }, /* GL_VIEWPORT_BIT */
+   { 45591, 0x00008A1A }, /* GL_VOLATILE_APPLE */
+   { 45609, 0x0000911D }, /* GL_WAIT_FAILED */
+   { 45624, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
+   { 45644, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+   { 45675, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
+   { 45710, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_OES */
+   { 45745, 0x000086AD }, /* GL_WEIGHT_ARRAY_OES */
+   { 45765, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+   { 45793, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_OES */
+   { 45821, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+   { 45846, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_OES */
+   { 45871, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+   { 45898, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_OES */
+   { 45925, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+   { 45950, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_OES */
+   { 45975, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
+   { 45999, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
+   { 46018, 0x000088B9 }, /* GL_WRITE_ONLY */
+   { 46032, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
+   { 46050, 0x000088B9 }, /* GL_WRITE_ONLY_OES */
+   { 46068, 0x00001506 }, /* GL_XOR */
+   { 46075, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
+   { 46094, 0x00008757 }, /* GL_YCBCR_MESA */
+   { 46108, 0x00000000 }, /* GL_ZERO */
+   { 46116, 0x00000D16 }, /* GL_ZOOM_X */
+   { 46126, 0x00000D17 }, /* GL_ZOOM_Y */
 };
 
-static const unsigned reduced_enums[1357] =
+static const unsigned reduced_enums[1423] =
 {
-       480, /* GL_FALSE */
-       703, /* GL_LINES */
-       705, /* GL_LINE_LOOP */
-       712, /* GL_LINE_STRIP */
-      1774, /* GL_TRIANGLES */
-      1777, /* GL_TRIANGLE_STRIP */
-      1775, /* GL_TRIANGLE_FAN */
-      1288, /* GL_QUADS */
-      1292, /* GL_QUAD_STRIP */
-      1173, /* GL_POLYGON */
-      1185, /* GL_POLYGON_STIPPLE_BIT */
-      1134, /* GL_PIXEL_MODE_BIT */
-       690, /* GL_LIGHTING_BIT */
-       510, /* GL_FOG_BIT */
+       500, /* GL_FALSE */
+       760, /* GL_LINES */
+       763, /* GL_LINE_LOOP */
+       770, /* GL_LINE_STRIP */
+      1934, /* GL_TRIANGLES */
+      1938, /* GL_TRIANGLE_STRIP */
+      1936, /* GL_TRIANGLE_FAN */
+      1393, /* GL_QUADS */
+      1397, /* GL_QUAD_STRIP */
+      1273, /* GL_POLYGON */
+       761, /* GL_LINES_ADJACENCY_ARB */
+       771, /* GL_LINE_STRIP_ADJACENCY_ARB */
+      1935, /* GL_TRIANGLES_ADJACENCY_ARB */
+      1939, /* GL_TRIANGLE_STRIP_ADJACENCY_ARB */
+      1285, /* GL_POLYGON_STIPPLE_BIT */
+      1228, /* GL_PIXEL_MODE_BIT */
+       747, /* GL_LIGHTING_BIT */
+       532, /* GL_FOG_BIT */
          8, /* GL_ACCUM */
-       722, /* GL_LOAD */
-      1353, /* GL_RETURN */
-      1006, /* GL_MULT */
+       781, /* GL_LOAD */
+      1471, /* GL_RETURN */
+      1096, /* GL_MULT */
         23, /* GL_ADD */
-      1022, /* GL_NEVER */
-       680, /* GL_LESS */
-       470, /* GL_EQUAL */
-       679, /* GL_LEQUAL */
-       600, /* GL_GREATER */
-      1037, /* GL_NOTEQUAL */
-       599, /* GL_GEQUAL */
+      1112, /* GL_NEVER */
+       737, /* GL_LESS */
+       490, /* GL_EQUAL */
+       736, /* GL_LEQUAL */
+       649, /* GL_GREATER */
+      1129, /* GL_NOTEQUAL */
+       648, /* GL_GEQUAL */
         47, /* GL_ALWAYS */
-      1494, /* GL_SRC_COLOR */
-      1067, /* GL_ONE_MINUS_SRC_COLOR */
-      1492, /* GL_SRC_ALPHA */
-      1066, /* GL_ONE_MINUS_SRC_ALPHA */
-       449, /* GL_DST_ALPHA */
-      1064, /* GL_ONE_MINUS_DST_ALPHA */
-       450, /* GL_DST_COLOR */
-      1065, /* GL_ONE_MINUS_DST_COLOR */
-      1493, /* GL_SRC_ALPHA_SATURATE */
-       587, /* GL_FRONT_LEFT */
-       588, /* GL_FRONT_RIGHT */
+      1622, /* GL_SRC_COLOR */
+      1161, /* GL_ONE_MINUS_SRC_COLOR */
+      1620, /* GL_SRC_ALPHA */
+      1160, /* GL_ONE_MINUS_SRC_ALPHA */
+       469, /* GL_DST_ALPHA */
+      1158, /* GL_ONE_MINUS_DST_ALPHA */
+       470, /* GL_DST_COLOR */
+      1159, /* GL_ONE_MINUS_DST_COLOR */
+      1621, /* GL_SRC_ALPHA_SATURATE */
+       629, /* GL_FRONT_LEFT */
+       630, /* GL_FRONT_RIGHT */
         69, /* GL_BACK_LEFT */
         70, /* GL_BACK_RIGHT */
-       584, /* GL_FRONT */
+       626, /* GL_FRONT */
         68, /* GL_BACK */
-       678, /* GL_LEFT */
-      1395, /* GL_RIGHT */
-       585, /* GL_FRONT_AND_BACK */
+       735, /* GL_LEFT */
+      1519, /* GL_RIGHT */
+       627, /* GL_FRONT_AND_BACK */
         63, /* GL_AUX0 */
         64, /* GL_AUX1 */
         65, /* GL_AUX2 */
         66, /* GL_AUX3 */
-       667, /* GL_INVALID_ENUM */
-       671, /* GL_INVALID_VALUE */
-       670, /* GL_INVALID_OPERATION */
-      1499, /* GL_STACK_OVERFLOW */
-      1500, /* GL_STACK_UNDERFLOW */
-      1092, /* GL_OUT_OF_MEMORY */
-       668, /* GL_INVALID_FRAMEBUFFER_OPERATION */
+       723, /* GL_INVALID_ENUM */
+       728, /* GL_INVALID_VALUE */
+       727, /* GL_INVALID_OPERATION */
+      1627, /* GL_STACK_OVERFLOW */
+      1628, /* GL_STACK_UNDERFLOW */
+      1186, /* GL_OUT_OF_MEMORY */
+       724, /* GL_INVALID_FRAMEBUFFER_OPERATION */
          0, /* GL_2D */
          2, /* GL_3D */
          3, /* GL_3D_COLOR */
          4, /* GL_3D_COLOR_TEXTURE */
          6, /* GL_4D_COLOR_TEXTURE */
-      1112, /* GL_PASS_THROUGH_TOKEN */
-      1172, /* GL_POINT_TOKEN */
-       713, /* GL_LINE_TOKEN */
-      1186, /* GL_POLYGON_TOKEN */
-        74, /* GL_BITMAP_TOKEN */
-       448, /* GL_DRAW_PIXEL_TOKEN */
-       302, /* GL_COPY_PIXEL_TOKEN */
-       706, /* GL_LINE_RESET_TOKEN */
-       473, /* GL_EXP */
-       474, /* GL_EXP2 */
-       338, /* GL_CW */
-       126, /* GL_CCW */
-       147, /* GL_COEFF */
-      1089, /* GL_ORDER */
-       385, /* GL_DOMAIN */
-       312, /* GL_CURRENT_COLOR */
-       315, /* GL_CURRENT_INDEX */
-       321, /* GL_CURRENT_NORMAL */
-       334, /* GL_CURRENT_TEXTURE_COORDS */
-       326, /* GL_CURRENT_RASTER_COLOR */
-       328, /* GL_CURRENT_RASTER_INDEX */
-       332, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
-       329, /* GL_CURRENT_RASTER_POSITION */
-       330, /* GL_CURRENT_RASTER_POSITION_VALID */
-       327, /* GL_CURRENT_RASTER_DISTANCE */
-      1165, /* GL_POINT_SMOOTH */
-      1154, /* GL_POINT_SIZE */
-      1164, /* GL_POINT_SIZE_RANGE */
-      1155, /* GL_POINT_SIZE_GRANULARITY */
-       707, /* GL_LINE_SMOOTH */
-       714, /* GL_LINE_WIDTH */
-       716, /* GL_LINE_WIDTH_RANGE */
-       715, /* GL_LINE_WIDTH_GRANULARITY */
-       709, /* GL_LINE_STIPPLE */
-       710, /* GL_LINE_STIPPLE_PATTERN */
-       711, /* GL_LINE_STIPPLE_REPEAT */
-       721, /* GL_LIST_MODE */
-       887, /* GL_MAX_LIST_NESTING */
-       718, /* GL_LIST_BASE */
-       720, /* GL_LIST_INDEX */
-      1175, /* GL_POLYGON_MODE */
-      1182, /* GL_POLYGON_SMOOTH */
-      1184, /* GL_POLYGON_STIPPLE */
-       459, /* GL_EDGE_FLAG */
-       305, /* GL_CULL_FACE */
-       306, /* GL_CULL_FACE_MODE */
-       586, /* GL_FRONT_FACE */
-       689, /* GL_LIGHTING */
-       694, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
-       695, /* GL_LIGHT_MODEL_TWO_SIDE */
-       691, /* GL_LIGHT_MODEL_AMBIENT */
-      1441, /* GL_SHADE_MODEL */
-       194, /* GL_COLOR_MATERIAL_FACE */
-       195, /* GL_COLOR_MATERIAL_PARAMETER */
-       193, /* GL_COLOR_MATERIAL */
-       509, /* GL_FOG */
-       531, /* GL_FOG_INDEX */
-       527, /* GL_FOG_DENSITY */
-       535, /* GL_FOG_START */
-       529, /* GL_FOG_END */
-       532, /* GL_FOG_MODE */
-       511, /* GL_FOG_COLOR */
-       371, /* GL_DEPTH_RANGE */
-       379, /* GL_DEPTH_TEST */
-       382, /* GL_DEPTH_WRITEMASK */
-       359, /* GL_DEPTH_CLEAR_VALUE */
-       370, /* GL_DEPTH_FUNC */
+      1206, /* GL_PASS_THROUGH_TOKEN */
+      1272, /* GL_POINT_TOKEN */
+       772, /* GL_LINE_TOKEN */
+      1286, /* GL_POLYGON_TOKEN */
+        75, /* GL_BITMAP_TOKEN */
+       468, /* GL_DRAW_PIXEL_TOKEN */
+       315, /* GL_COPY_PIXEL_TOKEN */
+       764, /* GL_LINE_RESET_TOKEN */
+       493, /* GL_EXP */
+       494, /* GL_EXP2 */
+       352, /* GL_CW */
+       137, /* GL_CCW */
+       158, /* GL_COEFF */
+      1183, /* GL_ORDER */
+       405, /* GL_DOMAIN */
+       325, /* GL_CURRENT_COLOR */
+       328, /* GL_CURRENT_INDEX */
+       334, /* GL_CURRENT_NORMAL */
+       348, /* GL_CURRENT_TEXTURE_COORDS */
+       340, /* GL_CURRENT_RASTER_COLOR */
+       342, /* GL_CURRENT_RASTER_INDEX */
+       346, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
+       343, /* GL_CURRENT_RASTER_POSITION */
+       344, /* GL_CURRENT_RASTER_POSITION_VALID */
+       341, /* GL_CURRENT_RASTER_DISTANCE */
+      1264, /* GL_POINT_SMOOTH */
+      1248, /* GL_POINT_SIZE */
+      1263, /* GL_POINT_SIZE_RANGE */
+      1254, /* GL_POINT_SIZE_GRANULARITY */
+       765, /* GL_LINE_SMOOTH */
+       773, /* GL_LINE_WIDTH */
+       775, /* GL_LINE_WIDTH_RANGE */
+       774, /* GL_LINE_WIDTH_GRANULARITY */
+       767, /* GL_LINE_STIPPLE */
+       768, /* GL_LINE_STIPPLE_PATTERN */
+       769, /* GL_LINE_STIPPLE_REPEAT */
+       780, /* GL_LIST_MODE */
+       963, /* GL_MAX_LIST_NESTING */
+       777, /* GL_LIST_BASE */
+       779, /* GL_LIST_INDEX */
+      1275, /* GL_POLYGON_MODE */
+      1282, /* GL_POLYGON_SMOOTH */
+      1284, /* GL_POLYGON_STIPPLE */
+       479, /* GL_EDGE_FLAG */
+       318, /* GL_CULL_FACE */
+       319, /* GL_CULL_FACE_MODE */
+       628, /* GL_FRONT_FACE */
+       746, /* GL_LIGHTING */
+       751, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
+       752, /* GL_LIGHT_MODEL_TWO_SIDE */
+       748, /* GL_LIGHT_MODEL_AMBIENT */
+      1569, /* GL_SHADE_MODEL */
+       206, /* GL_COLOR_MATERIAL_FACE */
+       207, /* GL_COLOR_MATERIAL_PARAMETER */
+       205, /* GL_COLOR_MATERIAL */
+       531, /* GL_FOG */
+       553, /* GL_FOG_INDEX */
+       549, /* GL_FOG_DENSITY */
+       557, /* GL_FOG_START */
+       551, /* GL_FOG_END */
+       554, /* GL_FOG_MODE */
+       533, /* GL_FOG_COLOR */
+       390, /* GL_DEPTH_RANGE */
+       399, /* GL_DEPTH_TEST */
+       402, /* GL_DEPTH_WRITEMASK */
+       375, /* GL_DEPTH_CLEAR_VALUE */
+       389, /* GL_DEPTH_FUNC */
         12, /* GL_ACCUM_CLEAR_VALUE */
-      1539, /* GL_STENCIL_TEST */
-      1523, /* GL_STENCIL_CLEAR_VALUE */
-      1525, /* GL_STENCIL_FUNC */
-      1541, /* GL_STENCIL_VALUE_MASK */
-      1524, /* GL_STENCIL_FAIL */
-      1536, /* GL_STENCIL_PASS_DEPTH_FAIL */
-      1537, /* GL_STENCIL_PASS_DEPTH_PASS */
-      1538, /* GL_STENCIL_REF */
-      1542, /* GL_STENCIL_WRITEMASK */
-       855, /* GL_MATRIX_MODE */
-      1027, /* GL_NORMALIZE */
-      1870, /* GL_VIEWPORT */
-      1001, /* GL_MODELVIEW_STACK_DEPTH */
-      1265, /* GL_PROJECTION_STACK_DEPTH */
-      1749, /* GL_TEXTURE_STACK_DEPTH */
-       999, /* GL_MODELVIEW_MATRIX */
-      1264, /* GL_PROJECTION_MATRIX */
-      1732, /* GL_TEXTURE_MATRIX */
+      1671, /* GL_STENCIL_TEST */
+      1652, /* GL_STENCIL_CLEAR_VALUE */
+      1654, /* GL_STENCIL_FUNC */
+      1673, /* GL_STENCIL_VALUE_MASK */
+      1653, /* GL_STENCIL_FAIL */
+      1668, /* GL_STENCIL_PASS_DEPTH_FAIL */
+      1669, /* GL_STENCIL_PASS_DEPTH_PASS */
+      1670, /* GL_STENCIL_REF */
+      1674, /* GL_STENCIL_WRITEMASK */
+       922, /* GL_MATRIX_MODE */
+      1118, /* GL_NORMALIZE */
+      2037, /* GL_VIEWPORT */
+      1091, /* GL_MODELVIEW_STACK_DEPTH */
+      1370, /* GL_PROJECTION_STACK_DEPTH */
+      1896, /* GL_TEXTURE_STACK_DEPTH */
+      1088, /* GL_MODELVIEW_MATRIX */
+      1368, /* GL_PROJECTION_MATRIX */
+      1878, /* GL_TEXTURE_MATRIX */
         61, /* GL_ATTRIB_STACK_DEPTH */
-       137, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
+       148, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
         43, /* GL_ALPHA_TEST */
         44, /* GL_ALPHA_TEST_FUNC */
         45, /* GL_ALPHA_TEST_REF */
-       384, /* GL_DITHER */
-        78, /* GL_BLEND_DST */
-        87, /* GL_BLEND_SRC */
-        75, /* GL_BLEND */
-       724, /* GL_LOGIC_OP_MODE */
-       641, /* GL_INDEX_LOGIC_OP */
-       192, /* GL_COLOR_LOGIC_OP */
+       404, /* GL_DITHER */
+        79, /* GL_BLEND_DST */
+        93, /* GL_BLEND_SRC */
+        76, /* GL_BLEND */
+       783, /* GL_LOGIC_OP_MODE */
+       695, /* GL_INDEX_LOGIC_OP */
+       204, /* GL_COLOR_LOGIC_OP */
         67, /* GL_AUX_BUFFERS */
-       395, /* GL_DRAW_BUFFER */
-      1306, /* GL_READ_BUFFER */
-      1422, /* GL_SCISSOR_BOX */
-      1423, /* GL_SCISSOR_TEST */
-       640, /* GL_INDEX_CLEAR_VALUE */
-       645, /* GL_INDEX_WRITEMASK */
-       189, /* GL_COLOR_CLEAR_VALUE */
-       231, /* GL_COLOR_WRITEMASK */
-       642, /* GL_INDEX_MODE */
-      1388, /* GL_RGBA_MODE */
-       394, /* GL_DOUBLEBUFFER */
-      1543, /* GL_STEREO */
-      1345, /* GL_RENDER_MODE */
-      1113, /* GL_PERSPECTIVE_CORRECTION_HINT */
-      1166, /* GL_POINT_SMOOTH_HINT */
-       708, /* GL_LINE_SMOOTH_HINT */
-      1183, /* GL_POLYGON_SMOOTH_HINT */
-       530, /* GL_FOG_HINT */
-      1713, /* GL_TEXTURE_GEN_S */
-      1714, /* GL_TEXTURE_GEN_T */
-      1712, /* GL_TEXTURE_GEN_R */
-      1711, /* GL_TEXTURE_GEN_Q */
-      1126, /* GL_PIXEL_MAP_I_TO_I */
-      1132, /* GL_PIXEL_MAP_S_TO_S */
-      1128, /* GL_PIXEL_MAP_I_TO_R */
-      1124, /* GL_PIXEL_MAP_I_TO_G */
-      1122, /* GL_PIXEL_MAP_I_TO_B */
-      1120, /* GL_PIXEL_MAP_I_TO_A */
-      1130, /* GL_PIXEL_MAP_R_TO_R */
-      1118, /* GL_PIXEL_MAP_G_TO_G */
-      1116, /* GL_PIXEL_MAP_B_TO_B */
-      1114, /* GL_PIXEL_MAP_A_TO_A */
-      1127, /* GL_PIXEL_MAP_I_TO_I_SIZE */
-      1133, /* GL_PIXEL_MAP_S_TO_S_SIZE */
-      1129, /* GL_PIXEL_MAP_I_TO_R_SIZE */
-      1125, /* GL_PIXEL_MAP_I_TO_G_SIZE */
-      1123, /* GL_PIXEL_MAP_I_TO_B_SIZE */
-      1121, /* GL_PIXEL_MAP_I_TO_A_SIZE */
-      1131, /* GL_PIXEL_MAP_R_TO_R_SIZE */
-      1119, /* GL_PIXEL_MAP_G_TO_G_SIZE */
-      1117, /* GL_PIXEL_MAP_B_TO_B_SIZE */
-      1115, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-      1787, /* GL_UNPACK_SWAP_BYTES */
-      1782, /* GL_UNPACK_LSB_FIRST */
-      1783, /* GL_UNPACK_ROW_LENGTH */
-      1786, /* GL_UNPACK_SKIP_ROWS */
-      1785, /* GL_UNPACK_SKIP_PIXELS */
-      1780, /* GL_UNPACK_ALIGNMENT */
-      1101, /* GL_PACK_SWAP_BYTES */
-      1096, /* GL_PACK_LSB_FIRST */
-      1097, /* GL_PACK_ROW_LENGTH */
-      1100, /* GL_PACK_SKIP_ROWS */
-      1099, /* GL_PACK_SKIP_PIXELS */
-      1093, /* GL_PACK_ALIGNMENT */
-       802, /* GL_MAP_COLOR */
-       807, /* GL_MAP_STENCIL */
-       644, /* GL_INDEX_SHIFT */
-       643, /* GL_INDEX_OFFSET */
-      1320, /* GL_RED_SCALE */
-      1318, /* GL_RED_BIAS */
-      1889, /* GL_ZOOM_X */
-      1890, /* GL_ZOOM_Y */
-       604, /* GL_GREEN_SCALE */
-       602, /* GL_GREEN_BIAS */
-        93, /* GL_BLUE_SCALE */
-        91, /* GL_BLUE_BIAS */
+       415, /* GL_DRAW_BUFFER */
+      1412, /* GL_READ_BUFFER */
+      1547, /* GL_SCISSOR_BOX */
+      1548, /* GL_SCISSOR_TEST */
+       694, /* GL_INDEX_CLEAR_VALUE */
+       699, /* GL_INDEX_WRITEMASK */
+       201, /* GL_COLOR_CLEAR_VALUE */
+       243, /* GL_COLOR_WRITEMASK */
+       696, /* GL_INDEX_MODE */
+      1512, /* GL_RGBA_MODE */
+       414, /* GL_DOUBLEBUFFER */
+      1675, /* GL_STEREO */
+      1463, /* GL_RENDER_MODE */
+      1207, /* GL_PERSPECTIVE_CORRECTION_HINT */
+      1265, /* GL_POINT_SMOOTH_HINT */
+       766, /* GL_LINE_SMOOTH_HINT */
+      1283, /* GL_POLYGON_SMOOTH_HINT */
+       552, /* GL_FOG_HINT */
+      1858, /* GL_TEXTURE_GEN_S */
+      1860, /* GL_TEXTURE_GEN_T */
+      1857, /* GL_TEXTURE_GEN_R */
+      1856, /* GL_TEXTURE_GEN_Q */
+      1220, /* GL_PIXEL_MAP_I_TO_I */
+      1226, /* GL_PIXEL_MAP_S_TO_S */
+      1222, /* GL_PIXEL_MAP_I_TO_R */
+      1218, /* GL_PIXEL_MAP_I_TO_G */
+      1216, /* GL_PIXEL_MAP_I_TO_B */
+      1214, /* GL_PIXEL_MAP_I_TO_A */
+      1224, /* GL_PIXEL_MAP_R_TO_R */
+      1212, /* GL_PIXEL_MAP_G_TO_G */
+      1210, /* GL_PIXEL_MAP_B_TO_B */
+      1208, /* GL_PIXEL_MAP_A_TO_A */
+      1221, /* GL_PIXEL_MAP_I_TO_I_SIZE */
+      1227, /* GL_PIXEL_MAP_S_TO_S_SIZE */
+      1223, /* GL_PIXEL_MAP_I_TO_R_SIZE */
+      1219, /* GL_PIXEL_MAP_I_TO_G_SIZE */
+      1217, /* GL_PIXEL_MAP_I_TO_B_SIZE */
+      1215, /* GL_PIXEL_MAP_I_TO_A_SIZE */
+      1225, /* GL_PIXEL_MAP_R_TO_R_SIZE */
+      1213, /* GL_PIXEL_MAP_G_TO_G_SIZE */
+      1211, /* GL_PIXEL_MAP_B_TO_B_SIZE */
+      1209, /* GL_PIXEL_MAP_A_TO_A_SIZE */
+      1949, /* GL_UNPACK_SWAP_BYTES */
+      1944, /* GL_UNPACK_LSB_FIRST */
+      1945, /* GL_UNPACK_ROW_LENGTH */
+      1948, /* GL_UNPACK_SKIP_ROWS */
+      1947, /* GL_UNPACK_SKIP_PIXELS */
+      1942, /* GL_UNPACK_ALIGNMENT */
+      1195, /* GL_PACK_SWAP_BYTES */
+      1190, /* GL_PACK_LSB_FIRST */
+      1191, /* GL_PACK_ROW_LENGTH */
+      1194, /* GL_PACK_SKIP_ROWS */
+      1193, /* GL_PACK_SKIP_PIXELS */
+      1187, /* GL_PACK_ALIGNMENT */
+       863, /* GL_MAP_COLOR */
+       868, /* GL_MAP_STENCIL */
+       698, /* GL_INDEX_SHIFT */
+       697, /* GL_INDEX_OFFSET */
+      1426, /* GL_RED_SCALE */
+      1424, /* GL_RED_BIAS */
+      2063, /* GL_ZOOM_X */
+      2064, /* GL_ZOOM_Y */
+       653, /* GL_GREEN_SCALE */
+       651, /* GL_GREEN_BIAS */
+       101, /* GL_BLUE_SCALE */
+        99, /* GL_BLUE_BIAS */
         42, /* GL_ALPHA_SCALE */
         40, /* GL_ALPHA_BIAS */
-       372, /* GL_DEPTH_SCALE */
-       352, /* GL_DEPTH_BIAS */
-       882, /* GL_MAX_EVAL_ORDER */
-       886, /* GL_MAX_LIGHTS */
-       864, /* GL_MAX_CLIP_PLANES */
-       934, /* GL_MAX_TEXTURE_SIZE */
-       892, /* GL_MAX_PIXEL_MAP_TABLE */
-       860, /* GL_MAX_ATTRIB_STACK_DEPTH */
-       889, /* GL_MAX_MODELVIEW_STACK_DEPTH */
-       890, /* GL_MAX_NAME_STACK_DEPTH */
-       918, /* GL_MAX_PROJECTION_STACK_DEPTH */
-       935, /* GL_MAX_TEXTURE_STACK_DEPTH */
-       949, /* GL_MAX_VIEWPORT_DIMS */
-       861, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
-      1553, /* GL_SUBPIXEL_BITS */
-       639, /* GL_INDEX_BITS */
-      1319, /* GL_RED_BITS */
-       603, /* GL_GREEN_BITS */
-        92, /* GL_BLUE_BITS */
+       391, /* GL_DEPTH_SCALE */
+       368, /* GL_DEPTH_BIAS */
+       952, /* GL_MAX_EVAL_ORDER */
+       962, /* GL_MAX_LIGHTS */
+       933, /* GL_MAX_CLIP_PLANES */
+      1013, /* GL_MAX_TEXTURE_SIZE */
+       969, /* GL_MAX_PIXEL_MAP_TABLE */
+       929, /* GL_MAX_ATTRIB_STACK_DEPTH */
+       965, /* GL_MAX_MODELVIEW_STACK_DEPTH */
+       966, /* GL_MAX_NAME_STACK_DEPTH */
+       995, /* GL_MAX_PROJECTION_STACK_DEPTH */
+      1014, /* GL_MAX_TEXTURE_STACK_DEPTH */
+      1036, /* GL_MAX_VIEWPORT_DIMS */
+       930, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
+      1685, /* GL_SUBPIXEL_BITS */
+       693, /* GL_INDEX_BITS */
+      1425, /* GL_RED_BITS */
+       652, /* GL_GREEN_BITS */
+       100, /* GL_BLUE_BITS */
         41, /* GL_ALPHA_BITS */
-       353, /* GL_DEPTH_BITS */
-      1521, /* GL_STENCIL_BITS */
+       369, /* GL_DEPTH_BITS */
+      1650, /* GL_STENCIL_BITS */
         14, /* GL_ACCUM_RED_BITS */
         13, /* GL_ACCUM_GREEN_BITS */
         10, /* GL_ACCUM_BLUE_BITS */
          9, /* GL_ACCUM_ALPHA_BITS */
-      1015, /* GL_NAME_STACK_DEPTH */
+      1105, /* GL_NAME_STACK_DEPTH */
         62, /* GL_AUTO_NORMAL */
-       748, /* GL_MAP1_COLOR_4 */
-       751, /* GL_MAP1_INDEX */
-       752, /* GL_MAP1_NORMAL */
-       753, /* GL_MAP1_TEXTURE_COORD_1 */
-       754, /* GL_MAP1_TEXTURE_COORD_2 */
-       755, /* GL_MAP1_TEXTURE_COORD_3 */
-       756, /* GL_MAP1_TEXTURE_COORD_4 */
-       757, /* GL_MAP1_VERTEX_3 */
-       758, /* GL_MAP1_VERTEX_4 */
-       775, /* GL_MAP2_COLOR_4 */
-       778, /* GL_MAP2_INDEX */
-       779, /* GL_MAP2_NORMAL */
-       780, /* GL_MAP2_TEXTURE_COORD_1 */
-       781, /* GL_MAP2_TEXTURE_COORD_2 */
-       782, /* GL_MAP2_TEXTURE_COORD_3 */
-       783, /* GL_MAP2_TEXTURE_COORD_4 */
-       784, /* GL_MAP2_VERTEX_3 */
-       785, /* GL_MAP2_VERTEX_4 */
-       749, /* GL_MAP1_GRID_DOMAIN */
-       750, /* GL_MAP1_GRID_SEGMENTS */
-       776, /* GL_MAP2_GRID_DOMAIN */
-       777, /* GL_MAP2_GRID_SEGMENTS */
-      1636, /* GL_TEXTURE_1D */
-      1638, /* GL_TEXTURE_2D */
-       483, /* GL_FEEDBACK_BUFFER_POINTER */
-       484, /* GL_FEEDBACK_BUFFER_SIZE */
-       485, /* GL_FEEDBACK_BUFFER_TYPE */
-      1432, /* GL_SELECTION_BUFFER_POINTER */
-      1433, /* GL_SELECTION_BUFFER_SIZE */
-      1755, /* GL_TEXTURE_WIDTH */
-      1718, /* GL_TEXTURE_HEIGHT */
-      1673, /* GL_TEXTURE_COMPONENTS */
-      1657, /* GL_TEXTURE_BORDER_COLOR */
-      1656, /* GL_TEXTURE_BORDER */
-       386, /* GL_DONT_CARE */
-       481, /* GL_FASTEST */
-      1023, /* GL_NICEST */
+       809, /* GL_MAP1_COLOR_4 */
+       812, /* GL_MAP1_INDEX */
+       813, /* GL_MAP1_NORMAL */
+       814, /* GL_MAP1_TEXTURE_COORD_1 */
+       815, /* GL_MAP1_TEXTURE_COORD_2 */
+       816, /* GL_MAP1_TEXTURE_COORD_3 */
+       817, /* GL_MAP1_TEXTURE_COORD_4 */
+       818, /* GL_MAP1_VERTEX_3 */
+       819, /* GL_MAP1_VERTEX_4 */
+       836, /* GL_MAP2_COLOR_4 */
+       839, /* GL_MAP2_INDEX */
+       840, /* GL_MAP2_NORMAL */
+       841, /* GL_MAP2_TEXTURE_COORD_1 */
+       842, /* GL_MAP2_TEXTURE_COORD_2 */
+       843, /* GL_MAP2_TEXTURE_COORD_3 */
+       844, /* GL_MAP2_TEXTURE_COORD_4 */
+       845, /* GL_MAP2_VERTEX_3 */
+       846, /* GL_MAP2_VERTEX_4 */
+       810, /* GL_MAP1_GRID_DOMAIN */
+       811, /* GL_MAP1_GRID_SEGMENTS */
+       837, /* GL_MAP2_GRID_DOMAIN */
+       838, /* GL_MAP2_GRID_SEGMENTS */
+      1768, /* GL_TEXTURE_1D */
+      1770, /* GL_TEXTURE_2D */
+       503, /* GL_FEEDBACK_BUFFER_POINTER */
+       504, /* GL_FEEDBACK_BUFFER_SIZE */
+       505, /* GL_FEEDBACK_BUFFER_TYPE */
+      1557, /* GL_SELECTION_BUFFER_POINTER */
+      1558, /* GL_SELECTION_BUFFER_SIZE */
+      1902, /* GL_TEXTURE_WIDTH */
+      1864, /* GL_TEXTURE_HEIGHT */
+      1808, /* GL_TEXTURE_COMPONENTS */
+      1792, /* GL_TEXTURE_BORDER_COLOR */
+      1791, /* GL_TEXTURE_BORDER */
+       406, /* GL_DONT_CARE */
+       501, /* GL_FASTEST */
+      1113, /* GL_NICEST */
         48, /* GL_AMBIENT */
-       383, /* GL_DIFFUSE */
-      1481, /* GL_SPECULAR */
-      1187, /* GL_POSITION */
-      1484, /* GL_SPOT_DIRECTION */
-      1485, /* GL_SPOT_EXPONENT */
-      1483, /* GL_SPOT_CUTOFF */
-       276, /* GL_CONSTANT_ATTENUATION */
-       698, /* GL_LINEAR_ATTENUATION */
-      1287, /* GL_QUADRATIC_ATTENUATION */
-       245, /* GL_COMPILE */
-       246, /* GL_COMPILE_AND_EXECUTE */
-       121, /* GL_BYTE */
-      1789, /* GL_UNSIGNED_BYTE */
-      1446, /* GL_SHORT */
-      1801, /* GL_UNSIGNED_SHORT */
-       647, /* GL_INT */
-      1792, /* GL_UNSIGNED_INT */
-       490, /* GL_FLOAT */
+       403, /* GL_DIFFUSE */
+      1609, /* GL_SPECULAR */
+      1287, /* GL_POSITION */
+      1612, /* GL_SPOT_DIRECTION */
+      1613, /* GL_SPOT_EXPONENT */
+      1611, /* GL_SPOT_CUTOFF */
+       288, /* GL_CONSTANT_ATTENUATION */
+       755, /* GL_LINEAR_ATTENUATION */
+      1392, /* GL_QUADRATIC_ATTENUATION */
+       257, /* GL_COMPILE */
+       258, /* GL_COMPILE_AND_EXECUTE */
+       132, /* GL_BYTE */
+      1951, /* GL_UNSIGNED_BYTE */
+      1574, /* GL_SHORT */
+      1966, /* GL_UNSIGNED_SHORT */
+       701, /* GL_INT */
+      1954, /* GL_UNSIGNED_INT */
+       512, /* GL_FLOAT */
          1, /* GL_2_BYTES */
          5, /* GL_3_BYTES */
          7, /* GL_4_BYTES */
-       393, /* GL_DOUBLE */
-       605, /* GL_HALF_FLOAT */
-       133, /* GL_CLEAR */
+       413, /* GL_DOUBLE */
+       654, /* GL_HALF_FLOAT */
+       509, /* GL_FIXED */
+       144, /* GL_CLEAR */
         50, /* GL_AND */
         52, /* GL_AND_REVERSE */
-       300, /* GL_COPY */
+       313, /* GL_COPY */
         51, /* GL_AND_INVERTED */
-      1025, /* GL_NOOP */
-      1885, /* GL_XOR */
-      1088, /* GL_OR */
-      1026, /* GL_NOR */
-       471, /* GL_EQUIV */
-       674, /* GL_INVERT */
-      1091, /* GL_OR_REVERSE */
-       301, /* GL_COPY_INVERTED */
-      1090, /* GL_OR_INVERTED */
-      1016, /* GL_NAND */
-      1437, /* GL_SET */
-       468, /* GL_EMISSION */
-      1445, /* GL_SHININESS */
+      1116, /* GL_NOOP */
+      2059, /* GL_XOR */
+      1182, /* GL_OR */
+      1117, /* GL_NOR */
+       491, /* GL_EQUIV */
+       731, /* GL_INVERT */
+      1185, /* GL_OR_REVERSE */
+       314, /* GL_COPY_INVERTED */
+      1184, /* GL_OR_INVERTED */
+      1106, /* GL_NAND */
+      1563, /* GL_SET */
+       488, /* GL_EMISSION */
+      1573, /* GL_SHININESS */
         49, /* GL_AMBIENT_AND_DIFFUSE */
-       191, /* GL_COLOR_INDEXES */
-       966, /* GL_MODELVIEW */
-      1263, /* GL_PROJECTION */
-      1571, /* GL_TEXTURE */
-       148, /* GL_COLOR */
-       347, /* GL_DEPTH */
-      1507, /* GL_STENCIL */
-       190, /* GL_COLOR_INDEX */
-      1526, /* GL_STENCIL_INDEX */
-       360, /* GL_DEPTH_COMPONENT */
-      1315, /* GL_RED */
-       601, /* GL_GREEN */
-        90, /* GL_BLUE */
+       203, /* GL_COLOR_INDEXES */
+      1055, /* GL_MODELVIEW */
+      1367, /* GL_PROJECTION */
+      1703, /* GL_TEXTURE */
+       159, /* GL_COLOR */
+       361, /* GL_DEPTH */
+      1635, /* GL_STENCIL */
+       202, /* GL_COLOR_INDEX */
+      1655, /* GL_STENCIL_INDEX */
+       376, /* GL_DEPTH_COMPONENT */
+      1421, /* GL_RED */
+       650, /* GL_GREEN */
+        98, /* GL_BLUE */
         31, /* GL_ALPHA */
-      1354, /* GL_RGB */
-      1373, /* GL_RGBA */
-       726, /* GL_LUMINANCE */
-       747, /* GL_LUMINANCE_ALPHA */
-        73, /* GL_BITMAP */
-      1143, /* GL_POINT */
-       696, /* GL_LINE */
-       486, /* GL_FILL */
-      1325, /* GL_RENDER */
-       482, /* GL_FEEDBACK */
-      1431, /* GL_SELECT */
-       489, /* GL_FLAT */
-      1456, /* GL_SMOOTH */
-       675, /* GL_KEEP */
-      1347, /* GL_REPLACE */
-       629, /* GL_INCR */
-       343, /* GL_DECR */
-      1816, /* GL_VENDOR */
-      1344, /* GL_RENDERER */
-      1817, /* GL_VERSION */
-       475, /* GL_EXTENSIONS */
-      1396, /* GL_S */
-      1562, /* GL_T */
-      1303, /* GL_R */
-      1286, /* GL_Q */
-      1002, /* GL_MODULATE */
-       342, /* GL_DECAL */
-      1708, /* GL_TEXTURE_ENV_MODE */
-      1707, /* GL_TEXTURE_ENV_COLOR */
-      1706, /* GL_TEXTURE_ENV */
-       476, /* GL_EYE_LINEAR */
-      1049, /* GL_OBJECT_LINEAR */
-      1482, /* GL_SPHERE_MAP */
-      1710, /* GL_TEXTURE_GEN_MODE */
-      1051, /* GL_OBJECT_PLANE */
-       477, /* GL_EYE_PLANE */
-      1017, /* GL_NEAREST */
-       697, /* GL_LINEAR */
-      1021, /* GL_NEAREST_MIPMAP_NEAREST */
-       702, /* GL_LINEAR_MIPMAP_NEAREST */
-      1020, /* GL_NEAREST_MIPMAP_LINEAR */
-       701, /* GL_LINEAR_MIPMAP_LINEAR */
-      1731, /* GL_TEXTURE_MAG_FILTER */
-      1739, /* GL_TEXTURE_MIN_FILTER */
-      1757, /* GL_TEXTURE_WRAP_S */
-      1758, /* GL_TEXTURE_WRAP_T */
-       127, /* GL_CLAMP */
-      1346, /* GL_REPEAT */
-      1181, /* GL_POLYGON_OFFSET_UNITS */
-      1180, /* GL_POLYGON_OFFSET_POINT */
-      1179, /* GL_POLYGON_OFFSET_LINE */
-      1304, /* GL_R3_G3_B2 */
-      1813, /* GL_V2F */
-      1814, /* GL_V3F */
-       124, /* GL_C4UB_V2F */
-       125, /* GL_C4UB_V3F */
-       122, /* GL_C3F_V3F */
-      1014, /* GL_N3F_V3F */
-       123, /* GL_C4F_N3F_V3F */
-      1567, /* GL_T2F_V3F */
-      1569, /* GL_T4F_V4F */
-      1565, /* GL_T2F_C4UB_V3F */
-      1563, /* GL_T2F_C3F_V3F */
-      1566, /* GL_T2F_N3F_V3F */
-      1564, /* GL_T2F_C4F_N3F_V3F */
-      1568, /* GL_T4F_C4F_N3F_V4F */
-       140, /* GL_CLIP_PLANE0 */
-       141, /* GL_CLIP_PLANE1 */
-       142, /* GL_CLIP_PLANE2 */
-       143, /* GL_CLIP_PLANE3 */
-       144, /* GL_CLIP_PLANE4 */
-       145, /* GL_CLIP_PLANE5 */
-       681, /* GL_LIGHT0 */
-       682, /* GL_LIGHT1 */
-       683, /* GL_LIGHT2 */
-       684, /* GL_LIGHT3 */
-       685, /* GL_LIGHT4 */
-       686, /* GL_LIGHT5 */
-       687, /* GL_LIGHT6 */
-       688, /* GL_LIGHT7 */
-       606, /* GL_HINT_BIT */
-       278, /* GL_CONSTANT_COLOR */
-      1062, /* GL_ONE_MINUS_CONSTANT_COLOR */
-       273, /* GL_CONSTANT_ALPHA */
-      1060, /* GL_ONE_MINUS_CONSTANT_ALPHA */
-        76, /* GL_BLEND_COLOR */
-       589, /* GL_FUNC_ADD */
-       950, /* GL_MIN */
-       857, /* GL_MAX */
-        81, /* GL_BLEND_EQUATION */
-       593, /* GL_FUNC_SUBTRACT */
-       591, /* GL_FUNC_REVERSE_SUBTRACT */
-       281, /* GL_CONVOLUTION_1D */
-       282, /* GL_CONVOLUTION_2D */
-      1434, /* GL_SEPARABLE_2D */
-       285, /* GL_CONVOLUTION_BORDER_MODE */
-       289, /* GL_CONVOLUTION_FILTER_SCALE */
-       287, /* GL_CONVOLUTION_FILTER_BIAS */
-      1316, /* GL_REDUCE */
-       291, /* GL_CONVOLUTION_FORMAT */
-       295, /* GL_CONVOLUTION_WIDTH */
-       293, /* GL_CONVOLUTION_HEIGHT */
-       873, /* GL_MAX_CONVOLUTION_WIDTH */
-       871, /* GL_MAX_CONVOLUTION_HEIGHT */
-      1220, /* GL_POST_CONVOLUTION_RED_SCALE */
-      1216, /* GL_POST_CONVOLUTION_GREEN_SCALE */
-      1211, /* GL_POST_CONVOLUTION_BLUE_SCALE */
-      1207, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
-      1218, /* GL_POST_CONVOLUTION_RED_BIAS */
-      1214, /* GL_POST_CONVOLUTION_GREEN_BIAS */
-      1209, /* GL_POST_CONVOLUTION_BLUE_BIAS */
-      1205, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
-       607, /* GL_HISTOGRAM */
-      1269, /* GL_PROXY_HISTOGRAM */
-       623, /* GL_HISTOGRAM_WIDTH */
-       613, /* GL_HISTOGRAM_FORMAT */
-       619, /* GL_HISTOGRAM_RED_SIZE */
-       615, /* GL_HISTOGRAM_GREEN_SIZE */
-       610, /* GL_HISTOGRAM_BLUE_SIZE */
-       608, /* GL_HISTOGRAM_ALPHA_SIZE */
-       617, /* GL_HISTOGRAM_LUMINANCE_SIZE */
-       621, /* GL_HISTOGRAM_SINK */
-       951, /* GL_MINMAX */
-       953, /* GL_MINMAX_FORMAT */
-       955, /* GL_MINMAX_SINK */
-      1570, /* GL_TABLE_TOO_LARGE_EXT */
-      1791, /* GL_UNSIGNED_BYTE_3_3_2 */
-      1803, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-      1805, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-      1798, /* GL_UNSIGNED_INT_8_8_8_8 */
-      1793, /* GL_UNSIGNED_INT_10_10_10_2 */
-      1178, /* GL_POLYGON_OFFSET_FILL */
-      1177, /* GL_POLYGON_OFFSET_FACTOR */
-      1176, /* GL_POLYGON_OFFSET_BIAS */
-      1350, /* GL_RESCALE_NORMAL */
+      1472, /* GL_RGB */
+      1495, /* GL_RGBA */
+       787, /* GL_LUMINANCE */
+       808, /* GL_LUMINANCE_ALPHA */
+        74, /* GL_BITMAP */
+      1237, /* GL_POINT */
+       753, /* GL_LINE */
+       506, /* GL_FILL */
+      1432, /* GL_RENDER */
+       502, /* GL_FEEDBACK */
+      1556, /* GL_SELECT */
+       511, /* GL_FLAT */
+      1584, /* GL_SMOOTH */
+       732, /* GL_KEEP */
+      1465, /* GL_REPLACE */
+       683, /* GL_INCR */
+       357, /* GL_DECR */
+      1983, /* GL_VENDOR */
+      1462, /* GL_RENDERER */
+      1984, /* GL_VERSION */
+       495, /* GL_EXTENSIONS */
+      1520, /* GL_S */
+      1694, /* GL_T */
+      1408, /* GL_R */
+      1391, /* GL_Q */
+      1092, /* GL_MODULATE */
+       356, /* GL_DECAL */
+      1851, /* GL_TEXTURE_ENV_MODE */
+      1850, /* GL_TEXTURE_ENV_COLOR */
+      1849, /* GL_TEXTURE_ENV */
+       496, /* GL_EYE_LINEAR */
+      1143, /* GL_OBJECT_LINEAR */
+      1610, /* GL_SPHERE_MAP */
+      1854, /* GL_TEXTURE_GEN_MODE */
+      1145, /* GL_OBJECT_PLANE */
+       497, /* GL_EYE_PLANE */
+      1107, /* GL_NEAREST */
+       754, /* GL_LINEAR */
+      1111, /* GL_NEAREST_MIPMAP_NEAREST */
+       759, /* GL_LINEAR_MIPMAP_NEAREST */
+      1110, /* GL_NEAREST_MIPMAP_LINEAR */
+       758, /* GL_LINEAR_MIPMAP_LINEAR */
+      1877, /* GL_TEXTURE_MAG_FILTER */
+      1886, /* GL_TEXTURE_MIN_FILTER */
+      1905, /* GL_TEXTURE_WRAP_S */
+      1906, /* GL_TEXTURE_WRAP_T */
+       138, /* GL_CLAMP */
+      1464, /* GL_REPEAT */
+      1281, /* GL_POLYGON_OFFSET_UNITS */
+      1280, /* GL_POLYGON_OFFSET_POINT */
+      1279, /* GL_POLYGON_OFFSET_LINE */
+      1409, /* GL_R3_G3_B2 */
+      1980, /* GL_V2F */
+      1981, /* GL_V3F */
+       135, /* GL_C4UB_V2F */
+       136, /* GL_C4UB_V3F */
+       133, /* GL_C3F_V3F */
+      1104, /* GL_N3F_V3F */
+       134, /* GL_C4F_N3F_V3F */
+      1699, /* GL_T2F_V3F */
+      1701, /* GL_T4F_V4F */
+      1697, /* GL_T2F_C4UB_V3F */
+      1695, /* GL_T2F_C3F_V3F */
+      1698, /* GL_T2F_N3F_V3F */
+      1696, /* GL_T2F_C4F_N3F_V3F */
+      1700, /* GL_T4F_C4F_N3F_V4F */
+       151, /* GL_CLIP_PLANE0 */
+       152, /* GL_CLIP_PLANE1 */
+       153, /* GL_CLIP_PLANE2 */
+       154, /* GL_CLIP_PLANE3 */
+       155, /* GL_CLIP_PLANE4 */
+       156, /* GL_CLIP_PLANE5 */
+       738, /* GL_LIGHT0 */
+       739, /* GL_LIGHT1 */
+       740, /* GL_LIGHT2 */
+       741, /* GL_LIGHT3 */
+       742, /* GL_LIGHT4 */
+       743, /* GL_LIGHT5 */
+       744, /* GL_LIGHT6 */
+       745, /* GL_LIGHT7 */
+       658, /* GL_HINT_BIT */
+       290, /* GL_CONSTANT_COLOR */
+      1156, /* GL_ONE_MINUS_CONSTANT_COLOR */
+       285, /* GL_CONSTANT_ALPHA */
+      1154, /* GL_ONE_MINUS_CONSTANT_ALPHA */
+        77, /* GL_BLEND_COLOR */
+       631, /* GL_FUNC_ADD */
+      1039, /* GL_MIN */
+       925, /* GL_MAX */
+        84, /* GL_BLEND_EQUATION */
+       637, /* GL_FUNC_SUBTRACT */
+       634, /* GL_FUNC_REVERSE_SUBTRACT */
+       293, /* GL_CONVOLUTION_1D */
+       294, /* GL_CONVOLUTION_2D */
+      1559, /* GL_SEPARABLE_2D */
+       297, /* GL_CONVOLUTION_BORDER_MODE */
+       301, /* GL_CONVOLUTION_FILTER_SCALE */
+       299, /* GL_CONVOLUTION_FILTER_BIAS */
+      1422, /* GL_REDUCE */
+       303, /* GL_CONVOLUTION_FORMAT */
+       307, /* GL_CONVOLUTION_WIDTH */
+       305, /* GL_CONVOLUTION_HEIGHT */
+       942, /* GL_MAX_CONVOLUTION_WIDTH */
+       940, /* GL_MAX_CONVOLUTION_HEIGHT */
+      1320, /* GL_POST_CONVOLUTION_RED_SCALE */
+      1316, /* GL_POST_CONVOLUTION_GREEN_SCALE */
+      1311, /* GL_POST_CONVOLUTION_BLUE_SCALE */
+      1307, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
+      1318, /* GL_POST_CONVOLUTION_RED_BIAS */
+      1314, /* GL_POST_CONVOLUTION_GREEN_BIAS */
+      1309, /* GL_POST_CONVOLUTION_BLUE_BIAS */
+      1305, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
+       659, /* GL_HISTOGRAM */
+      1374, /* GL_PROXY_HISTOGRAM */
+       675, /* GL_HISTOGRAM_WIDTH */
+       665, /* GL_HISTOGRAM_FORMAT */
+       671, /* GL_HISTOGRAM_RED_SIZE */
+       667, /* GL_HISTOGRAM_GREEN_SIZE */
+       662, /* GL_HISTOGRAM_BLUE_SIZE */
+       660, /* GL_HISTOGRAM_ALPHA_SIZE */
+       669, /* GL_HISTOGRAM_LUMINANCE_SIZE */
+       673, /* GL_HISTOGRAM_SINK */
+      1040, /* GL_MINMAX */
+      1042, /* GL_MINMAX_FORMAT */
+      1044, /* GL_MINMAX_SINK */
+      1702, /* GL_TABLE_TOO_LARGE_EXT */
+      1953, /* GL_UNSIGNED_BYTE_3_3_2 */
+      1969, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+      1972, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+      1963, /* GL_UNSIGNED_INT_8_8_8_8 */
+      1955, /* GL_UNSIGNED_INT_10_10_10_2 */
+      1278, /* GL_POLYGON_OFFSET_FILL */
+      1277, /* GL_POLYGON_OFFSET_FACTOR */
+      1276, /* GL_POLYGON_OFFSET_BIAS */
+      1468, /* GL_RESCALE_NORMAL */
         36, /* GL_ALPHA4 */
         38, /* GL_ALPHA8 */
         32, /* GL_ALPHA12 */
         34, /* GL_ALPHA16 */
-       737, /* GL_LUMINANCE4 */
-       743, /* GL_LUMINANCE8 */
-       727, /* GL_LUMINANCE12 */
-       733, /* GL_LUMINANCE16 */
-       738, /* GL_LUMINANCE4_ALPHA4 */
-       741, /* GL_LUMINANCE6_ALPHA2 */
-       744, /* GL_LUMINANCE8_ALPHA8 */
-       730, /* GL_LUMINANCE12_ALPHA4 */
-       728, /* GL_LUMINANCE12_ALPHA12 */
-       734, /* GL_LUMINANCE16_ALPHA16 */
-       648, /* GL_INTENSITY */
-       653, /* GL_INTENSITY4 */
-       655, /* GL_INTENSITY8 */
-       649, /* GL_INTENSITY12 */
-       651, /* GL_INTENSITY16 */
-      1363, /* GL_RGB2_EXT */
-      1364, /* GL_RGB4 */
-      1367, /* GL_RGB5 */
-      1371, /* GL_RGB8 */
-      1355, /* GL_RGB10 */
-      1359, /* GL_RGB12 */
-      1361, /* GL_RGB16 */
-      1378, /* GL_RGBA2 */
-      1380, /* GL_RGBA4 */
-      1368, /* GL_RGB5_A1 */
-      1384, /* GL_RGBA8 */
-      1356, /* GL_RGB10_A2 */
-      1374, /* GL_RGBA12 */
-      1376, /* GL_RGBA16 */
-      1746, /* GL_TEXTURE_RED_SIZE */
-      1716, /* GL_TEXTURE_GREEN_SIZE */
-      1654, /* GL_TEXTURE_BLUE_SIZE */
-      1641, /* GL_TEXTURE_ALPHA_SIZE */
-      1729, /* GL_TEXTURE_LUMINANCE_SIZE */
-      1720, /* GL_TEXTURE_INTENSITY_SIZE */
-      1348, /* GL_REPLACE_EXT */
-      1273, /* GL_PROXY_TEXTURE_1D */
-      1276, /* GL_PROXY_TEXTURE_2D */
-      1753, /* GL_TEXTURE_TOO_LARGE_EXT */
-      1741, /* GL_TEXTURE_PRIORITY */
-      1748, /* GL_TEXTURE_RESIDENT */
-      1644, /* GL_TEXTURE_BINDING_1D */
-      1646, /* GL_TEXTURE_BINDING_2D */
-      1648, /* GL_TEXTURE_BINDING_3D */
-      1098, /* GL_PACK_SKIP_IMAGES */
-      1094, /* GL_PACK_IMAGE_HEIGHT */
-      1784, /* GL_UNPACK_SKIP_IMAGES */
-      1781, /* GL_UNPACK_IMAGE_HEIGHT */
-      1640, /* GL_TEXTURE_3D */
-      1279, /* GL_PROXY_TEXTURE_3D */
-      1703, /* GL_TEXTURE_DEPTH */
-      1756, /* GL_TEXTURE_WRAP_R */
-       858, /* GL_MAX_3D_TEXTURE_SIZE */
-      1818, /* GL_VERTEX_ARRAY */
-      1028, /* GL_NORMAL_ARRAY */
-       149, /* GL_COLOR_ARRAY */
-       633, /* GL_INDEX_ARRAY */
-      1681, /* GL_TEXTURE_COORD_ARRAY */
-       460, /* GL_EDGE_FLAG_ARRAY */
-      1824, /* GL_VERTEX_ARRAY_SIZE */
-      1826, /* GL_VERTEX_ARRAY_TYPE */
-      1825, /* GL_VERTEX_ARRAY_STRIDE */
-      1033, /* GL_NORMAL_ARRAY_TYPE */
-      1032, /* GL_NORMAL_ARRAY_STRIDE */
-       153, /* GL_COLOR_ARRAY_SIZE */
-       155, /* GL_COLOR_ARRAY_TYPE */
-       154, /* GL_COLOR_ARRAY_STRIDE */
-       638, /* GL_INDEX_ARRAY_TYPE */
-       637, /* GL_INDEX_ARRAY_STRIDE */
-      1685, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-      1687, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-      1686, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
-       464, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-      1823, /* GL_VERTEX_ARRAY_POINTER */
-      1031, /* GL_NORMAL_ARRAY_POINTER */
-       152, /* GL_COLOR_ARRAY_POINTER */
-       636, /* GL_INDEX_ARRAY_POINTER */
-      1684, /* GL_TEXTURE_COORD_ARRAY_POINTER */
-       463, /* GL_EDGE_FLAG_ARRAY_POINTER */
-      1007, /* GL_MULTISAMPLE */
-      1408, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-      1410, /* GL_SAMPLE_ALPHA_TO_ONE */
-      1415, /* GL_SAMPLE_COVERAGE */
-      1412, /* GL_SAMPLE_BUFFERS */
-      1403, /* GL_SAMPLES */
-      1419, /* GL_SAMPLE_COVERAGE_VALUE */
-      1417, /* GL_SAMPLE_COVERAGE_INVERT */
-       196, /* GL_COLOR_MATRIX */
-       198, /* GL_COLOR_MATRIX_STACK_DEPTH */
-       867, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
-      1203, /* GL_POST_COLOR_MATRIX_RED_SCALE */
-      1199, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
-      1194, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
-      1190, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
-      1201, /* GL_POST_COLOR_MATRIX_RED_BIAS */
-      1197, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
-      1192, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
-      1188, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-      1664, /* GL_TEXTURE_COLOR_TABLE_SGI */
-      1280, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-      1666, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
-        80, /* GL_BLEND_DST_RGB */
-        89, /* GL_BLEND_SRC_RGB */
-        79, /* GL_BLEND_DST_ALPHA */
-        88, /* GL_BLEND_SRC_ALPHA */
-       202, /* GL_COLOR_TABLE */
-      1213, /* GL_POST_CONVOLUTION_COLOR_TABLE */
-      1196, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-      1268, /* GL_PROXY_COLOR_TABLE */
-      1272, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-      1271, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
-       226, /* GL_COLOR_TABLE_SCALE */
-       206, /* GL_COLOR_TABLE_BIAS */
-       211, /* GL_COLOR_TABLE_FORMAT */
-       228, /* GL_COLOR_TABLE_WIDTH */
-       223, /* GL_COLOR_TABLE_RED_SIZE */
-       214, /* GL_COLOR_TABLE_GREEN_SIZE */
-       208, /* GL_COLOR_TABLE_BLUE_SIZE */
-       203, /* GL_COLOR_TABLE_ALPHA_SIZE */
-       220, /* GL_COLOR_TABLE_LUMINANCE_SIZE */
-       217, /* GL_COLOR_TABLE_INTENSITY_SIZE */
+       798, /* GL_LUMINANCE4 */
+       804, /* GL_LUMINANCE8 */
+       788, /* GL_LUMINANCE12 */
+       794, /* GL_LUMINANCE16 */
+       799, /* GL_LUMINANCE4_ALPHA4 */
+       802, /* GL_LUMINANCE6_ALPHA2 */
+       805, /* GL_LUMINANCE8_ALPHA8 */
+       791, /* GL_LUMINANCE12_ALPHA4 */
+       789, /* GL_LUMINANCE12_ALPHA12 */
+       795, /* GL_LUMINANCE16_ALPHA16 */
+       702, /* GL_INTENSITY */
+       707, /* GL_INTENSITY4 */
+       709, /* GL_INTENSITY8 */
+       703, /* GL_INTENSITY12 */
+       705, /* GL_INTENSITY16 */
+      1481, /* GL_RGB2_EXT */
+      1482, /* GL_RGB4 */
+      1485, /* GL_RGB5 */
+      1492, /* GL_RGB8 */
+      1473, /* GL_RGB10 */
+      1477, /* GL_RGB12 */
+      1479, /* GL_RGB16 */
+      1500, /* GL_RGBA2 */
+      1502, /* GL_RGBA4 */
+      1488, /* GL_RGB5_A1 */
+      1507, /* GL_RGBA8 */
+      1474, /* GL_RGB10_A2 */
+      1496, /* GL_RGBA12 */
+      1498, /* GL_RGBA16 */
+      1893, /* GL_TEXTURE_RED_SIZE */
+      1862, /* GL_TEXTURE_GREEN_SIZE */
+      1789, /* GL_TEXTURE_BLUE_SIZE */
+      1774, /* GL_TEXTURE_ALPHA_SIZE */
+      1875, /* GL_TEXTURE_LUMINANCE_SIZE */
+      1866, /* GL_TEXTURE_INTENSITY_SIZE */
+      1466, /* GL_REPLACE_EXT */
+      1378, /* GL_PROXY_TEXTURE_1D */
+      1381, /* GL_PROXY_TEXTURE_2D */
+      1900, /* GL_TEXTURE_TOO_LARGE_EXT */
+      1888, /* GL_TEXTURE_PRIORITY */
+      1895, /* GL_TEXTURE_RESIDENT */
+      1777, /* GL_TEXTURE_BINDING_1D */
+      1779, /* GL_TEXTURE_BINDING_2D */
+      1781, /* GL_TEXTURE_BINDING_3D */
+      1192, /* GL_PACK_SKIP_IMAGES */
+      1188, /* GL_PACK_IMAGE_HEIGHT */
+      1946, /* GL_UNPACK_SKIP_IMAGES */
+      1943, /* GL_UNPACK_IMAGE_HEIGHT */
+      1772, /* GL_TEXTURE_3D */
+      1384, /* GL_PROXY_TEXTURE_3D */
+      1846, /* GL_TEXTURE_DEPTH */
+      1903, /* GL_TEXTURE_WRAP_R */
+       926, /* GL_MAX_3D_TEXTURE_SIZE */
+      1985, /* GL_VERTEX_ARRAY */
+      1119, /* GL_NORMAL_ARRAY */
+       160, /* GL_COLOR_ARRAY */
+       687, /* GL_INDEX_ARRAY */
+      1816, /* GL_TEXTURE_COORD_ARRAY */
+       480, /* GL_EDGE_FLAG_ARRAY */
+      1991, /* GL_VERTEX_ARRAY_SIZE */
+      1993, /* GL_VERTEX_ARRAY_TYPE */
+      1992, /* GL_VERTEX_ARRAY_STRIDE */
+      1124, /* GL_NORMAL_ARRAY_TYPE */
+      1123, /* GL_NORMAL_ARRAY_STRIDE */
+       164, /* GL_COLOR_ARRAY_SIZE */
+       166, /* GL_COLOR_ARRAY_TYPE */
+       165, /* GL_COLOR_ARRAY_STRIDE */
+       692, /* GL_INDEX_ARRAY_TYPE */
+       691, /* GL_INDEX_ARRAY_STRIDE */
+      1820, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+      1822, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+      1821, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+       484, /* GL_EDGE_FLAG_ARRAY_STRIDE */
+      1990, /* GL_VERTEX_ARRAY_POINTER */
+      1122, /* GL_NORMAL_ARRAY_POINTER */
+       163, /* GL_COLOR_ARRAY_POINTER */
+       690, /* GL_INDEX_ARRAY_POINTER */
+      1819, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+       483, /* GL_EDGE_FLAG_ARRAY_POINTER */
+      1097, /* GL_MULTISAMPLE */
+      1533, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+      1535, /* GL_SAMPLE_ALPHA_TO_ONE */
+      1540, /* GL_SAMPLE_COVERAGE */
+      1537, /* GL_SAMPLE_BUFFERS */
+      1528, /* GL_SAMPLES */
+      1544, /* GL_SAMPLE_COVERAGE_VALUE */
+      1542, /* GL_SAMPLE_COVERAGE_INVERT */
+       208, /* GL_COLOR_MATRIX */
+       210, /* GL_COLOR_MATRIX_STACK_DEPTH */
+       936, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
+      1303, /* GL_POST_COLOR_MATRIX_RED_SCALE */
+      1299, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
+      1294, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
+      1290, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
+      1301, /* GL_POST_COLOR_MATRIX_RED_BIAS */
+      1297, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
+      1292, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
+      1288, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
+      1799, /* GL_TEXTURE_COLOR_TABLE_SGI */
+      1385, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
+      1801, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+        82, /* GL_BLEND_DST_RGB */
+        96, /* GL_BLEND_SRC_RGB */
+        80, /* GL_BLEND_DST_ALPHA */
+        94, /* GL_BLEND_SRC_ALPHA */
+       214, /* GL_COLOR_TABLE */
+      1313, /* GL_POST_CONVOLUTION_COLOR_TABLE */
+      1296, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
+      1373, /* GL_PROXY_COLOR_TABLE */
+      1377, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
+      1376, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
+       238, /* GL_COLOR_TABLE_SCALE */
+       218, /* GL_COLOR_TABLE_BIAS */
+       223, /* GL_COLOR_TABLE_FORMAT */
+       240, /* GL_COLOR_TABLE_WIDTH */
+       235, /* GL_COLOR_TABLE_RED_SIZE */
+       226, /* GL_COLOR_TABLE_GREEN_SIZE */
+       220, /* GL_COLOR_TABLE_BLUE_SIZE */
+       215, /* GL_COLOR_TABLE_ALPHA_SIZE */
+       232, /* GL_COLOR_TABLE_LUMINANCE_SIZE */
+       229, /* GL_COLOR_TABLE_INTENSITY_SIZE */
         71, /* GL_BGR */
         72, /* GL_BGRA */
-       881, /* GL_MAX_ELEMENTS_VERTICES */
-       880, /* GL_MAX_ELEMENTS_INDICES */
-      1719, /* GL_TEXTURE_INDEX_SIZE_EXT */
-       146, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
-      1160, /* GL_POINT_SIZE_MIN */
-      1156, /* GL_POINT_SIZE_MAX */
-      1150, /* GL_POINT_FADE_THRESHOLD_SIZE */
-      1146, /* GL_POINT_DISTANCE_ATTENUATION */
-       128, /* GL_CLAMP_TO_BORDER */
-       131, /* GL_CLAMP_TO_EDGE */
-      1740, /* GL_TEXTURE_MIN_LOD */
-      1738, /* GL_TEXTURE_MAX_LOD */
-      1643, /* GL_TEXTURE_BASE_LEVEL */
-      1737, /* GL_TEXTURE_MAX_LEVEL */
-       626, /* GL_IGNORE_BORDER_HP */
-       277, /* GL_CONSTANT_BORDER_HP */
-      1349, /* GL_REPLICATE_BORDER_HP */
-       283, /* GL_CONVOLUTION_BORDER_COLOR */
-      1057, /* GL_OCCLUSION_TEST_HP */
-      1058, /* GL_OCCLUSION_TEST_RESULT_HP */
-       699, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
-      1658, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-      1660, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-      1662, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-      1663, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      1661, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-      1659, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
-       862, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
-       863, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      1223, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
-      1225, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
-      1222, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
-      1224, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-      1727, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-      1728, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-      1726, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
-       595, /* GL_GENERATE_MIPMAP */
-       596, /* GL_GENERATE_MIPMAP_HINT */
-       533, /* GL_FOG_OFFSET_SGIX */
-       534, /* GL_FOG_OFFSET_VALUE_SGIX */
-      1672, /* GL_TEXTURE_COMPARE_SGIX */
-      1671, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-      1723, /* GL_TEXTURE_LEQUAL_R_SGIX */
-      1715, /* GL_TEXTURE_GEQUAL_R_SGIX */
-       361, /* GL_DEPTH_COMPONENT16 */
-       364, /* GL_DEPTH_COMPONENT24 */
-       367, /* GL_DEPTH_COMPONENT32 */
-       307, /* GL_CULL_VERTEX_EXT */
-       309, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
-       308, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
-      1882, /* GL_WRAP_BORDER_SUN */
-      1665, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
-       692, /* GL_LIGHT_MODEL_COLOR_CONTROL */
-      1449, /* GL_SINGLE_COLOR */
-      1435, /* GL_SEPARATE_SPECULAR_COLOR */
-      1444, /* GL_SHARED_TEXTURE_PALETTE_EXT */
-       544, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
-       545, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
-       552, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
-       547, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
-       543, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
-       542, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
-       546, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
-       553, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
-       565, /* GL_FRAMEBUFFER_DEFAULT */
-       581, /* GL_FRAMEBUFFER_UNDEFINED */
-       374, /* GL_DEPTH_STENCIL_ATTACHMENT */
-       632, /* GL_INDEX */
-      1790, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-      1806, /* GL_UNSIGNED_SHORT_5_6_5 */
-      1807, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-      1804, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-      1802, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-      1799, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-      1797, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-      1735, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-      1736, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-      1734, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-       958, /* GL_MIRRORED_REPEAT */
-      1391, /* GL_RGB_S3TC */
-      1366, /* GL_RGB4_S3TC */
-      1389, /* GL_RGBA_S3TC */
-      1383, /* GL_RGBA4_S3TC */
-      1387, /* GL_RGBA_DXT5_S3TC */
-      1381, /* GL_RGBA4_DXT5_S3TC */
-       265, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
-       260, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
-       261, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
-       262, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
-      1019, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
-      1018, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
-       700, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
-       520, /* GL_FOG_COORDINATE_SOURCE */
-       512, /* GL_FOG_COORD */
-       536, /* GL_FRAGMENT_DEPTH */
-       313, /* GL_CURRENT_FOG_COORD */
-       519, /* GL_FOG_COORDINATE_ARRAY_TYPE */
-       518, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
-       517, /* GL_FOG_COORDINATE_ARRAY_POINTER */
-       514, /* GL_FOG_COORDINATE_ARRAY */
-       200, /* GL_COLOR_SUM */
-       333, /* GL_CURRENT_SECONDARY_COLOR */
-      1428, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-      1430, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-      1429, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-      1427, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-      1424, /* GL_SECONDARY_COLOR_ARRAY */
-       331, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
+       951, /* GL_MAX_ELEMENTS_VERTICES */
+       950, /* GL_MAX_ELEMENTS_INDICES */
+      1865, /* GL_TEXTURE_INDEX_SIZE_EXT */
+       157, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
+      1259, /* GL_POINT_SIZE_MIN */
+      1255, /* GL_POINT_SIZE_MAX */
+      1244, /* GL_POINT_FADE_THRESHOLD_SIZE */
+      1240, /* GL_POINT_DISTANCE_ATTENUATION */
+       139, /* GL_CLAMP_TO_BORDER */
+       142, /* GL_CLAMP_TO_EDGE */
+      1887, /* GL_TEXTURE_MIN_LOD */
+      1885, /* GL_TEXTURE_MAX_LOD */
+      1776, /* GL_TEXTURE_BASE_LEVEL */
+      1884, /* GL_TEXTURE_MAX_LEVEL */
+       678, /* GL_IGNORE_BORDER_HP */
+       289, /* GL_CONSTANT_BORDER_HP */
+      1467, /* GL_REPLICATE_BORDER_HP */
+       295, /* GL_CONVOLUTION_BORDER_COLOR */
+      1151, /* GL_OCCLUSION_TEST_HP */
+      1152, /* GL_OCCLUSION_TEST_RESULT_HP */
+       756, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
+      1793, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+      1795, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+      1797, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+      1798, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+      1796, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+      1794, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+       931, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
+       932, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+      1323, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
+      1325, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
+      1322, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
+      1324, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
+      1873, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+      1874, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+      1872, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+       640, /* GL_GENERATE_MIPMAP */
+       641, /* GL_GENERATE_MIPMAP_HINT */
+       555, /* GL_FOG_OFFSET_SGIX */
+       556, /* GL_FOG_OFFSET_VALUE_SGIX */
+      1807, /* GL_TEXTURE_COMPARE_SGIX */
+      1806, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+      1869, /* GL_TEXTURE_LEQUAL_R_SGIX */
+      1861, /* GL_TEXTURE_GEQUAL_R_SGIX */
+       377, /* GL_DEPTH_COMPONENT16 */
+       381, /* GL_DEPTH_COMPONENT24 */
+       385, /* GL_DEPTH_COMPONENT32 */
+       320, /* GL_CULL_VERTEX_EXT */
+       322, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
+       321, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
+      2055, /* GL_WRAP_BORDER_SUN */
+      1800, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+       749, /* GL_LIGHT_MODEL_COLOR_CONTROL */
+      1577, /* GL_SINGLE_COLOR */
+      1561, /* GL_SEPARATE_SPECULAR_COLOR */
+      1572, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+       567, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
+       568, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
+       578, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
+       570, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
+       566, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
+       565, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
+       569, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
+       579, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
+       596, /* GL_FRAMEBUFFER_DEFAULT */
+       622, /* GL_FRAMEBUFFER_UNDEFINED */
+       393, /* GL_DEPTH_STENCIL_ATTACHMENT */
+       686, /* GL_INDEX */
+      1952, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+      1973, /* GL_UNSIGNED_SHORT_5_6_5 */
+      1974, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+      1970, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+      1967, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+      1964, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+      1961, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+      1882, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+      1883, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+      1881, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+      1047, /* GL_MIRRORED_REPEAT */
+      1515, /* GL_RGB_S3TC */
+      1484, /* GL_RGB4_S3TC */
+      1513, /* GL_RGBA_S3TC */
+      1506, /* GL_RGBA4_S3TC */
+      1511, /* GL_RGBA_DXT5_S3TC */
+      1503, /* GL_RGBA4_DXT5_S3TC */
+       277, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
+       272, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
+       273, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
+       274, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
+      1109, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
+      1108, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
+       757, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
+       542, /* GL_FOG_COORDINATE_SOURCE */
+       534, /* GL_FOG_COORD */
+       558, /* GL_FRAGMENT_DEPTH */
+       326, /* GL_CURRENT_FOG_COORD */
+       541, /* GL_FOG_COORDINATE_ARRAY_TYPE */
+       540, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
+       539, /* GL_FOG_COORDINATE_ARRAY_POINTER */
+       536, /* GL_FOG_COORDINATE_ARRAY */
+       212, /* GL_COLOR_SUM */
+       347, /* GL_CURRENT_SECONDARY_COLOR */
+      1553, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+      1555, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+      1554, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+      1552, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+      1549, /* GL_SECONDARY_COLOR_ARRAY */
+       345, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
         28, /* GL_ALIASED_POINT_SIZE_RANGE */
         27, /* GL_ALIASED_LINE_WIDTH_RANGE */
-      1572, /* GL_TEXTURE0 */
-      1574, /* GL_TEXTURE1 */
-      1596, /* GL_TEXTURE2 */
-      1618, /* GL_TEXTURE3 */
-      1624, /* GL_TEXTURE4 */
-      1626, /* GL_TEXTURE5 */
-      1628, /* GL_TEXTURE6 */
-      1630, /* GL_TEXTURE7 */
-      1632, /* GL_TEXTURE8 */
-      1634, /* GL_TEXTURE9 */
-      1575, /* GL_TEXTURE10 */
-      1577, /* GL_TEXTURE11 */
-      1579, /* GL_TEXTURE12 */
-      1581, /* GL_TEXTURE13 */
-      1583, /* GL_TEXTURE14 */
-      1585, /* GL_TEXTURE15 */
-      1587, /* GL_TEXTURE16 */
-      1589, /* GL_TEXTURE17 */
-      1591, /* GL_TEXTURE18 */
-      1593, /* GL_TEXTURE19 */
-      1597, /* GL_TEXTURE20 */
-      1599, /* GL_TEXTURE21 */
-      1601, /* GL_TEXTURE22 */
-      1603, /* GL_TEXTURE23 */
-      1605, /* GL_TEXTURE24 */
-      1607, /* GL_TEXTURE25 */
-      1609, /* GL_TEXTURE26 */
-      1611, /* GL_TEXTURE27 */
-      1613, /* GL_TEXTURE28 */
-      1615, /* GL_TEXTURE29 */
-      1619, /* GL_TEXTURE30 */
-      1621, /* GL_TEXTURE31 */
+      1704, /* GL_TEXTURE0 */
+      1706, /* GL_TEXTURE1 */
+      1728, /* GL_TEXTURE2 */
+      1750, /* GL_TEXTURE3 */
+      1756, /* GL_TEXTURE4 */
+      1758, /* GL_TEXTURE5 */
+      1760, /* GL_TEXTURE6 */
+      1762, /* GL_TEXTURE7 */
+      1764, /* GL_TEXTURE8 */
+      1766, /* GL_TEXTURE9 */
+      1707, /* GL_TEXTURE10 */
+      1709, /* GL_TEXTURE11 */
+      1711, /* GL_TEXTURE12 */
+      1713, /* GL_TEXTURE13 */
+      1715, /* GL_TEXTURE14 */
+      1717, /* GL_TEXTURE15 */
+      1719, /* GL_TEXTURE16 */
+      1721, /* GL_TEXTURE17 */
+      1723, /* GL_TEXTURE18 */
+      1725, /* GL_TEXTURE19 */
+      1729, /* GL_TEXTURE20 */
+      1731, /* GL_TEXTURE21 */
+      1733, /* GL_TEXTURE22 */
+      1735, /* GL_TEXTURE23 */
+      1737, /* GL_TEXTURE24 */
+      1739, /* GL_TEXTURE25 */
+      1741, /* GL_TEXTURE26 */
+      1743, /* GL_TEXTURE27 */
+      1745, /* GL_TEXTURE28 */
+      1747, /* GL_TEXTURE29 */
+      1751, /* GL_TEXTURE30 */
+      1753, /* GL_TEXTURE31 */
         18, /* GL_ACTIVE_TEXTURE */
-       134, /* GL_CLIENT_ACTIVE_TEXTURE */
-       936, /* GL_MAX_TEXTURE_UNITS */
-      1767, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-      1770, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-      1772, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-      1764, /* GL_TRANSPOSE_COLOR_MATRIX */
-      1554, /* GL_SUBTRACT */
-       921, /* GL_MAX_RENDERBUFFER_SIZE */
-       248, /* GL_COMPRESSED_ALPHA */
-       252, /* GL_COMPRESSED_LUMINANCE */
-       253, /* GL_COMPRESSED_LUMINANCE_ALPHA */
-       250, /* GL_COMPRESSED_INTENSITY */
-       256, /* GL_COMPRESSED_RGB */
-       257, /* GL_COMPRESSED_RGBA */
-      1679, /* GL_TEXTURE_COMPRESSION_HINT */
-      1744, /* GL_TEXTURE_RECTANGLE_ARB */
-      1651, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
-      1283, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
-       919, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
-       373, /* GL_DEPTH_STENCIL */
-      1794, /* GL_UNSIGNED_INT_24_8 */
-       932, /* GL_MAX_TEXTURE_LOD_BIAS */
-      1733, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-       933, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-      1709, /* GL_TEXTURE_FILTER_CONTROL */
-      1724, /* GL_TEXTURE_LOD_BIAS */
-       233, /* GL_COMBINE4 */
-       926, /* GL_MAX_SHININESS_NV */
-       927, /* GL_MAX_SPOT_EXPONENT_NV */
-       630, /* GL_INCR_WRAP */
-       344, /* GL_DECR_WRAP */
-       978, /* GL_MODELVIEW1_ARB */
-      1034, /* GL_NORMAL_MAP */
-      1321, /* GL_REFLECTION_MAP */
-      1688, /* GL_TEXTURE_CUBE_MAP */
-      1649, /* GL_TEXTURE_BINDING_CUBE_MAP */
-      1696, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-      1690, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-      1698, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-      1692, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-      1700, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-      1694, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-      1281, /* GL_PROXY_TEXTURE_CUBE_MAP */
-       875, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
-      1013, /* GL_MULTISAMPLE_FILTER_HINT_NV */
-       528, /* GL_FOG_DISTANCE_MODE_NV */
-       479, /* GL_EYE_RADIAL_NV */
-       478, /* GL_EYE_PLANE_ABSOLUTE_NV */
-       232, /* GL_COMBINE */
-       239, /* GL_COMBINE_RGB */
-       234, /* GL_COMBINE_ALPHA */
-      1392, /* GL_RGB_SCALE */
+       145, /* GL_CLIENT_ACTIVE_TEXTURE */
+      1015, /* GL_MAX_TEXTURE_UNITS */
+      1927, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+      1930, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+      1932, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+      1924, /* GL_TRANSPOSE_COLOR_MATRIX */
+      1686, /* GL_SUBTRACT */
+       998, /* GL_MAX_RENDERBUFFER_SIZE */
+       260, /* GL_COMPRESSED_ALPHA */
+       264, /* GL_COMPRESSED_LUMINANCE */
+       265, /* GL_COMPRESSED_LUMINANCE_ALPHA */
+       262, /* GL_COMPRESSED_INTENSITY */
+       268, /* GL_COMPRESSED_RGB */
+       269, /* GL_COMPRESSED_RGBA */
+      1814, /* GL_TEXTURE_COMPRESSION_HINT */
+      1891, /* GL_TEXTURE_RECTANGLE_ARB */
+      1786, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
+      1388, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
+       996, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
+       392, /* GL_DEPTH_STENCIL */
+      1957, /* GL_UNSIGNED_INT_24_8 */
+      1010, /* GL_MAX_TEXTURE_LOD_BIAS */
+      1880, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+      1012, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
+      1852, /* GL_TEXTURE_FILTER_CONTROL */
+      1870, /* GL_TEXTURE_LOD_BIAS */
+       245, /* GL_COMBINE4 */
+      1004, /* GL_MAX_SHININESS_NV */
+      1005, /* GL_MAX_SPOT_EXPONENT_NV */
+       684, /* GL_INCR_WRAP */
+       358, /* GL_DECR_WRAP */
+      1067, /* GL_MODELVIEW1_ARB */
+      1125, /* GL_NORMAL_MAP */
+      1427, /* GL_REFLECTION_MAP */
+      1824, /* GL_TEXTURE_CUBE_MAP */
+      1783, /* GL_TEXTURE_BINDING_CUBE_MAP */
+      1836, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+      1826, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+      1839, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+      1829, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+      1842, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+      1832, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+      1386, /* GL_PROXY_TEXTURE_CUBE_MAP */
+       944, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
+      1103, /* GL_MULTISAMPLE_FILTER_HINT_NV */
+       550, /* GL_FOG_DISTANCE_MODE_NV */
+       499, /* GL_EYE_RADIAL_NV */
+       498, /* GL_EYE_PLANE_ABSOLUTE_NV */
+       244, /* GL_COMBINE */
+       251, /* GL_COMBINE_RGB */
+       246, /* GL_COMBINE_ALPHA */
+      1516, /* GL_RGB_SCALE */
         24, /* GL_ADD_SIGNED */
-       658, /* GL_INTERPOLATE */
-       272, /* GL_CONSTANT */
-      1229, /* GL_PRIMARY_COLOR */
-      1226, /* GL_PREVIOUS */
-      1464, /* GL_SOURCE0_RGB */
-      1470, /* GL_SOURCE1_RGB */
-      1476, /* GL_SOURCE2_RGB */
-      1480, /* GL_SOURCE3_RGB_NV */
-      1461, /* GL_SOURCE0_ALPHA */
-      1467, /* GL_SOURCE1_ALPHA */
-      1473, /* GL_SOURCE2_ALPHA */
-      1479, /* GL_SOURCE3_ALPHA_NV */
-      1071, /* GL_OPERAND0_RGB */
-      1077, /* GL_OPERAND1_RGB */
-      1083, /* GL_OPERAND2_RGB */
-      1087, /* GL_OPERAND3_RGB_NV */
-      1068, /* GL_OPERAND0_ALPHA */
-      1074, /* GL_OPERAND1_ALPHA */
-      1080, /* GL_OPERAND2_ALPHA */
-      1086, /* GL_OPERAND3_ALPHA_NV */
-       109, /* GL_BUFFER_OBJECT_APPLE */
-      1819, /* GL_VERTEX_ARRAY_BINDING */
-      1742, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
-      1743, /* GL_TEXTURE_RANGE_POINTER_APPLE */
-      1886, /* GL_YCBCR_422_APPLE */
-      1808, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-      1810, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-      1752, /* GL_TEXTURE_STORAGE_HINT_APPLE */
-      1545, /* GL_STORAGE_PRIVATE_APPLE */
-      1544, /* GL_STORAGE_CACHED_APPLE */
-      1546, /* GL_STORAGE_SHARED_APPLE */
-      1451, /* GL_SLICE_ACCUM_SUN */
-      1291, /* GL_QUAD_MESH_SUN */
-      1776, /* GL_TRIANGLE_MESH_SUN */
-      1858, /* GL_VERTEX_PROGRAM_ARB */
-      1869, /* GL_VERTEX_STATE_PROGRAM_NV */
-      1845, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-      1851, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-      1853, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-      1855, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
-       335, /* GL_CURRENT_VERTEX_ATTRIB */
-      1242, /* GL_PROGRAM_LENGTH_ARB */
-      1256, /* GL_PROGRAM_STRING_ARB */
-      1000, /* GL_MODELVIEW_PROJECTION_NV */
-       625, /* GL_IDENTITY_NV */
-       672, /* GL_INVERSE_NV */
-      1769, /* GL_TRANSPOSE_NV */
-       673, /* GL_INVERSE_TRANSPOSE_NV */
-       905, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
-       904, /* GL_MAX_PROGRAM_MATRICES_ARB */
-       811, /* GL_MATRIX0_NV */
-       823, /* GL_MATRIX1_NV */
-       835, /* GL_MATRIX2_NV */
-       839, /* GL_MATRIX3_NV */
-       841, /* GL_MATRIX4_NV */
-       843, /* GL_MATRIX5_NV */
-       845, /* GL_MATRIX6_NV */
-       847, /* GL_MATRIX7_NV */
-       319, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
-       316, /* GL_CURRENT_MATRIX_ARB */
-      1861, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-      1864, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-      1254, /* GL_PROGRAM_PARAMETER_NV */
-      1849, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-      1258, /* GL_PROGRAM_TARGET_NV */
-      1255, /* GL_PROGRAM_RESIDENT_NV */
-      1761, /* GL_TRACK_MATRIX_NV */
-      1762, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-      1859, /* GL_VERTEX_PROGRAM_BINDING_NV */
-      1236, /* GL_PROGRAM_ERROR_POSITION_ARB */
-       357, /* GL_DEPTH_CLAMP */
-      1827, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-      1834, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-      1835, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-      1836, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-      1837, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-      1838, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-      1839, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-      1840, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-      1841, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-      1842, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-      1828, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-      1829, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-      1830, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-      1831, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-      1832, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-      1833, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-       759, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
-       766, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
-       767, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
-       768, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
-       769, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
-       770, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
-       771, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
-       772, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
-       773, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
-       774, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
-       760, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
-       761, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
-       762, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
-       763, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
-       764, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
-       765, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
-       786, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
-       793, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
-       794, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
-       795, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
-       796, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
-       797, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
-       798, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
-      1235, /* GL_PROGRAM_BINDING_ARB */
-       800, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
-       801, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
-       787, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
-       788, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
-       789, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
-       790, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
-       791, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
-       792, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
-      1677, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-      1674, /* GL_TEXTURE_COMPRESSED */
-      1039, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
-       270, /* GL_COMPRESSED_TEXTURE_FORMATS */
-       948, /* GL_MAX_VERTEX_UNITS_ARB */
+       713, /* GL_INTERPOLATE */
+       284, /* GL_CONSTANT */
+      1329, /* GL_PRIMARY_COLOR */
+      1326, /* GL_PREVIOUS */
+      1592, /* GL_SOURCE0_RGB */
+      1598, /* GL_SOURCE1_RGB */
+      1604, /* GL_SOURCE2_RGB */
+      1608, /* GL_SOURCE3_RGB_NV */
+      1589, /* GL_SOURCE0_ALPHA */
+      1595, /* GL_SOURCE1_ALPHA */
+      1601, /* GL_SOURCE2_ALPHA */
+      1607, /* GL_SOURCE3_ALPHA_NV */
+      1165, /* GL_OPERAND0_RGB */
+      1171, /* GL_OPERAND1_RGB */
+      1177, /* GL_OPERAND2_RGB */
+      1181, /* GL_OPERAND3_RGB_NV */
+      1162, /* GL_OPERAND0_ALPHA */
+      1168, /* GL_OPERAND1_ALPHA */
+      1174, /* GL_OPERAND2_ALPHA */
+      1180, /* GL_OPERAND3_ALPHA_NV */
+       120, /* GL_BUFFER_OBJECT_APPLE */
+      1986, /* GL_VERTEX_ARRAY_BINDING */
+      1889, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
+      1890, /* GL_TEXTURE_RANGE_POINTER_APPLE */
+      2060, /* GL_YCBCR_422_APPLE */
+      1975, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+      1977, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+      1899, /* GL_TEXTURE_STORAGE_HINT_APPLE */
+      1677, /* GL_STORAGE_PRIVATE_APPLE */
+      1676, /* GL_STORAGE_CACHED_APPLE */
+      1678, /* GL_STORAGE_SHARED_APPLE */
+      1579, /* GL_SLICE_ACCUM_SUN */
+      1396, /* GL_QUAD_MESH_SUN */
+      1937, /* GL_TRIANGLE_MESH_SUN */
+      2025, /* GL_VERTEX_PROGRAM_ARB */
+      2036, /* GL_VERTEX_STATE_PROGRAM_NV */
+      2012, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+      2018, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+      2020, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+      2022, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+       349, /* GL_CURRENT_VERTEX_ATTRIB */
+      1345, /* GL_PROGRAM_LENGTH_ARB */
+      1360, /* GL_PROGRAM_STRING_ARB */
+      1090, /* GL_MODELVIEW_PROJECTION_NV */
+       677, /* GL_IDENTITY_NV */
+       729, /* GL_INVERSE_NV */
+      1929, /* GL_TRANSPOSE_NV */
+       730, /* GL_INVERSE_TRANSPOSE_NV */
+       982, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
+       981, /* GL_MAX_PROGRAM_MATRICES_ARB */
+       872, /* GL_MATRIX0_NV */
+       884, /* GL_MATRIX1_NV */
+       896, /* GL_MATRIX2_NV */
+       900, /* GL_MATRIX3_NV */
+       902, /* GL_MATRIX4_NV */
+       904, /* GL_MATRIX5_NV */
+       906, /* GL_MATRIX6_NV */
+       908, /* GL_MATRIX7_NV */
+       332, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
+       329, /* GL_CURRENT_MATRIX_ARB */
+      2028, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+      2031, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+      1357, /* GL_PROGRAM_PARAMETER_NV */
+      2016, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+      1362, /* GL_PROGRAM_TARGET_NV */
+      1359, /* GL_PROGRAM_RESIDENT_NV */
+      1909, /* GL_TRACK_MATRIX_NV */
+      1910, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+      2026, /* GL_VERTEX_PROGRAM_BINDING_NV */
+      1339, /* GL_PROGRAM_ERROR_POSITION_ARB */
+       373, /* GL_DEPTH_CLAMP */
+      1994, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+      2001, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+      2002, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+      2003, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+      2004, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+      2005, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+      2006, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+      2007, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+      2008, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+      2009, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+      1995, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+      1996, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+      1997, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+      1998, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+      1999, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+      2000, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+       820, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
+       827, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
+       828, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
+       829, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
+       830, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
+       831, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
+       832, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
+       833, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
+       834, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
+       835, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
+       821, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
+       822, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
+       823, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
+       824, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
+       825, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
+       826, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
+       847, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
+       854, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
+       855, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
+       856, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
+       857, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
+       858, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
+       859, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
+      1338, /* GL_PROGRAM_BINDING_ARB */
+       861, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
+       862, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
+       848, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
+       849, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
+       850, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
+       851, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
+       852, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
+       853, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
+      1812, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+      1809, /* GL_TEXTURE_COMPRESSED */
+      1131, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
+       282, /* GL_COMPRESSED_TEXTURE_FORMATS */
+      1033, /* GL_MAX_VERTEX_UNITS_ARB */
         22, /* GL_ACTIVE_VERTEX_UNITS_ARB */
-      1881, /* GL_WEIGHT_SUM_UNITY_ARB */
-      1857, /* GL_VERTEX_BLEND_ARB */
-       337, /* GL_CURRENT_WEIGHT_ARB */
-      1880, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-      1879, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-      1878, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-      1877, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-      1874, /* GL_WEIGHT_ARRAY_ARB */
-       387, /* GL_DOT3_RGB */
-       388, /* GL_DOT3_RGBA */
-       264, /* GL_COMPRESSED_RGB_FXT1_3DFX */
-       259, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
-      1008, /* GL_MULTISAMPLE_3DFX */
-      1413, /* GL_SAMPLE_BUFFERS_3DFX */
-      1404, /* GL_SAMPLES_3DFX */
-       989, /* GL_MODELVIEW2_ARB */
-       992, /* GL_MODELVIEW3_ARB */
-       993, /* GL_MODELVIEW4_ARB */
-       994, /* GL_MODELVIEW5_ARB */
-       995, /* GL_MODELVIEW6_ARB */
-       996, /* GL_MODELVIEW7_ARB */
-       997, /* GL_MODELVIEW8_ARB */
-       998, /* GL_MODELVIEW9_ARB */
-       968, /* GL_MODELVIEW10_ARB */
-       969, /* GL_MODELVIEW11_ARB */
-       970, /* GL_MODELVIEW12_ARB */
-       971, /* GL_MODELVIEW13_ARB */
-       972, /* GL_MODELVIEW14_ARB */
-       973, /* GL_MODELVIEW15_ARB */
-       974, /* GL_MODELVIEW16_ARB */
-       975, /* GL_MODELVIEW17_ARB */
-       976, /* GL_MODELVIEW18_ARB */
-       977, /* GL_MODELVIEW19_ARB */
-       979, /* GL_MODELVIEW20_ARB */
-       980, /* GL_MODELVIEW21_ARB */
-       981, /* GL_MODELVIEW22_ARB */
-       982, /* GL_MODELVIEW23_ARB */
-       983, /* GL_MODELVIEW24_ARB */
-       984, /* GL_MODELVIEW25_ARB */
-       985, /* GL_MODELVIEW26_ARB */
-       986, /* GL_MODELVIEW27_ARB */
-       987, /* GL_MODELVIEW28_ARB */
-       988, /* GL_MODELVIEW29_ARB */
-       990, /* GL_MODELVIEW30_ARB */
-       991, /* GL_MODELVIEW31_ARB */
-       392, /* GL_DOT3_RGB_EXT */
-       390, /* GL_DOT3_RGBA_EXT */
-       962, /* GL_MIRROR_CLAMP_EXT */
-       965, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
-      1003, /* GL_MODULATE_ADD_ATI */
-      1004, /* GL_MODULATE_SIGNED_ADD_ATI */
-      1005, /* GL_MODULATE_SUBTRACT_ATI */
-      1887, /* GL_YCBCR_MESA */
-      1095, /* GL_PACK_INVERT_MESA */
-       340, /* GL_DEBUG_OBJECT_MESA */
-       341, /* GL_DEBUG_PRINT_MESA */
-       339, /* GL_DEBUG_ASSERT_MESA */
-       111, /* GL_BUFFER_SIZE */
-       113, /* GL_BUFFER_USAGE */
-       117, /* GL_BUMP_ROT_MATRIX_ATI */
-       118, /* GL_BUMP_ROT_MATRIX_SIZE_ATI */
-       116, /* GL_BUMP_NUM_TEX_UNITS_ATI */
-       120, /* GL_BUMP_TEX_UNITS_ATI */
-       452, /* GL_DUDV_ATI */
-       451, /* GL_DU8DV8_ATI */
-       115, /* GL_BUMP_ENVMAP_ATI */
-       119, /* GL_BUMP_TARGET_ATI */
-      1512, /* GL_STENCIL_BACK_FUNC */
-      1510, /* GL_STENCIL_BACK_FAIL */
-      1514, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-      1516, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
-       537, /* GL_FRAGMENT_PROGRAM_ARB */
-      1233, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-      1261, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-      1260, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-      1245, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-      1251, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-      1250, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-       894, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
-       917, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
-       916, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
-       907, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-       913, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-       912, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-       877, /* GL_MAX_DRAW_BUFFERS */
-       396, /* GL_DRAW_BUFFER0 */
-       399, /* GL_DRAW_BUFFER1 */
-       420, /* GL_DRAW_BUFFER2 */
-       423, /* GL_DRAW_BUFFER3 */
-       426, /* GL_DRAW_BUFFER4 */
-       429, /* GL_DRAW_BUFFER5 */
-       432, /* GL_DRAW_BUFFER6 */
-       435, /* GL_DRAW_BUFFER7 */
-       438, /* GL_DRAW_BUFFER8 */
-       441, /* GL_DRAW_BUFFER9 */
-       400, /* GL_DRAW_BUFFER10 */
-       403, /* GL_DRAW_BUFFER11 */
-       406, /* GL_DRAW_BUFFER12 */
-       409, /* GL_DRAW_BUFFER13 */
-       412, /* GL_DRAW_BUFFER14 */
-       415, /* GL_DRAW_BUFFER15 */
-        82, /* GL_BLEND_EQUATION_ALPHA */
-       856, /* GL_MATRIX_PALETTE_ARB */
-       888, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
-       891, /* GL_MAX_PALETTE_MATRICES_ARB */
-       322, /* GL_CURRENT_PALETTE_MATRIX_ARB */
-       850, /* GL_MATRIX_INDEX_ARRAY_ARB */
-       317, /* GL_CURRENT_MATRIX_INDEX_ARB */
-       852, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
-       854, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
-       853, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
-       851, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-      1704, /* GL_TEXTURE_DEPTH_SIZE */
-       380, /* GL_DEPTH_TEXTURE_MODE */
-      1669, /* GL_TEXTURE_COMPARE_MODE */
-      1667, /* GL_TEXTURE_COMPARE_FUNC */
-       243, /* GL_COMPARE_R_TO_TEXTURE */
-      1167, /* GL_POINT_SPRITE */
-       297, /* GL_COORD_REPLACE */
-      1171, /* GL_POINT_SPRITE_R_MODE_NV */
-      1295, /* GL_QUERY_COUNTER_BITS */
-       324, /* GL_CURRENT_QUERY */
-      1298, /* GL_QUERY_RESULT */
-      1300, /* GL_QUERY_RESULT_AVAILABLE */
-       942, /* GL_MAX_VERTEX_ATTRIBS */
-      1847, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
-       378, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
-       377, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
-       928, /* GL_MAX_TEXTURE_COORDS */
-       930, /* GL_MAX_TEXTURE_IMAGE_UNITS */
-      1238, /* GL_PROGRAM_ERROR_STRING_ARB */
-      1240, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-      1239, /* GL_PROGRAM_FORMAT_ARB */
-      1754, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
-       355, /* GL_DEPTH_BOUNDS_TEST_EXT */
-       354, /* GL_DEPTH_BOUNDS_EXT */
+      2054, /* GL_WEIGHT_SUM_UNITY_ARB */
+      2024, /* GL_VERTEX_BLEND_ARB */
+       351, /* GL_CURRENT_WEIGHT_ARB */
+      2052, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+      2050, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+      2048, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+      2046, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+      2041, /* GL_WEIGHT_ARRAY_ARB */
+       407, /* GL_DOT3_RGB */
+       408, /* GL_DOT3_RGBA */
+       276, /* GL_COMPRESSED_RGB_FXT1_3DFX */
+       271, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
+      1098, /* GL_MULTISAMPLE_3DFX */
+      1538, /* GL_SAMPLE_BUFFERS_3DFX */
+      1529, /* GL_SAMPLES_3DFX */
+      1078, /* GL_MODELVIEW2_ARB */
+      1081, /* GL_MODELVIEW3_ARB */
+      1082, /* GL_MODELVIEW4_ARB */
+      1083, /* GL_MODELVIEW5_ARB */
+      1084, /* GL_MODELVIEW6_ARB */
+      1085, /* GL_MODELVIEW7_ARB */
+      1086, /* GL_MODELVIEW8_ARB */
+      1087, /* GL_MODELVIEW9_ARB */
+      1057, /* GL_MODELVIEW10_ARB */
+      1058, /* GL_MODELVIEW11_ARB */
+      1059, /* GL_MODELVIEW12_ARB */
+      1060, /* GL_MODELVIEW13_ARB */
+      1061, /* GL_MODELVIEW14_ARB */
+      1062, /* GL_MODELVIEW15_ARB */
+      1063, /* GL_MODELVIEW16_ARB */
+      1064, /* GL_MODELVIEW17_ARB */
+      1065, /* GL_MODELVIEW18_ARB */
+      1066, /* GL_MODELVIEW19_ARB */
+      1068, /* GL_MODELVIEW20_ARB */
+      1069, /* GL_MODELVIEW21_ARB */
+      1070, /* GL_MODELVIEW22_ARB */
+      1071, /* GL_MODELVIEW23_ARB */
+      1072, /* GL_MODELVIEW24_ARB */
+      1073, /* GL_MODELVIEW25_ARB */
+      1074, /* GL_MODELVIEW26_ARB */
+      1075, /* GL_MODELVIEW27_ARB */
+      1076, /* GL_MODELVIEW28_ARB */
+      1077, /* GL_MODELVIEW29_ARB */
+      1079, /* GL_MODELVIEW30_ARB */
+      1080, /* GL_MODELVIEW31_ARB */
+       412, /* GL_DOT3_RGB_EXT */
+       410, /* GL_DOT3_RGBA_EXT */
+      1051, /* GL_MIRROR_CLAMP_EXT */
+      1054, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
+      1093, /* GL_MODULATE_ADD_ATI */
+      1094, /* GL_MODULATE_SIGNED_ADD_ATI */
+      1095, /* GL_MODULATE_SUBTRACT_ATI */
+      2061, /* GL_YCBCR_MESA */
+      1189, /* GL_PACK_INVERT_MESA */
+       354, /* GL_DEBUG_OBJECT_MESA */
+       355, /* GL_DEBUG_PRINT_MESA */
+       353, /* GL_DEBUG_ASSERT_MESA */
+       122, /* GL_BUFFER_SIZE */
+       124, /* GL_BUFFER_USAGE */
+       128, /* GL_BUMP_ROT_MATRIX_ATI */
+       129, /* GL_BUMP_ROT_MATRIX_SIZE_ATI */
+       127, /* GL_BUMP_NUM_TEX_UNITS_ATI */
+       131, /* GL_BUMP_TEX_UNITS_ATI */
+       472, /* GL_DUDV_ATI */
+       471, /* GL_DU8DV8_ATI */
+       126, /* GL_BUMP_ENVMAP_ATI */
+       130, /* GL_BUMP_TARGET_ATI */
+      1133, /* GL_NUM_PROGRAM_BINARY_FORMATS_OES */
+      1336, /* GL_PROGRAM_BINARY_FORMATS_OES */
+      1641, /* GL_STENCIL_BACK_FUNC */
+      1639, /* GL_STENCIL_BACK_FAIL */
+      1643, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+      1645, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+       559, /* GL_FRAGMENT_PROGRAM_ARB */
+      1334, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
+      1365, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
+      1364, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
+      1348, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+      1354, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+      1353, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+       971, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
+       994, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
+       993, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
+       984, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+       990, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+       989, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+       947, /* GL_MAX_DRAW_BUFFERS */
+       416, /* GL_DRAW_BUFFER0 */
+       419, /* GL_DRAW_BUFFER1 */
+       440, /* GL_DRAW_BUFFER2 */
+       443, /* GL_DRAW_BUFFER3 */
+       446, /* GL_DRAW_BUFFER4 */
+       449, /* GL_DRAW_BUFFER5 */
+       452, /* GL_DRAW_BUFFER6 */
+       455, /* GL_DRAW_BUFFER7 */
+       458, /* GL_DRAW_BUFFER8 */
+       461, /* GL_DRAW_BUFFER9 */
+       420, /* GL_DRAW_BUFFER10 */
+       423, /* GL_DRAW_BUFFER11 */
+       426, /* GL_DRAW_BUFFER12 */
+       429, /* GL_DRAW_BUFFER13 */
+       432, /* GL_DRAW_BUFFER14 */
+       435, /* GL_DRAW_BUFFER15 */
+        85, /* GL_BLEND_EQUATION_ALPHA */
+       923, /* GL_MATRIX_PALETTE_ARB */
+       964, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
+       967, /* GL_MAX_PALETTE_MATRICES_ARB */
+       335, /* GL_CURRENT_PALETTE_MATRIX_ARB */
+       911, /* GL_MATRIX_INDEX_ARRAY_ARB */
+       330, /* GL_CURRENT_MATRIX_INDEX_ARB */
+       916, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
+       920, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
+       918, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
+       914, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
+      1847, /* GL_TEXTURE_DEPTH_SIZE */
+       400, /* GL_DEPTH_TEXTURE_MODE */
+      1804, /* GL_TEXTURE_COMPARE_MODE */
+      1802, /* GL_TEXTURE_COMPARE_FUNC */
+       255, /* GL_COMPARE_R_TO_TEXTURE */
+      1266, /* GL_POINT_SPRITE */
+       309, /* GL_COORD_REPLACE */
+      1271, /* GL_POINT_SPRITE_R_MODE_NV */
+      1400, /* GL_QUERY_COUNTER_BITS */
+       338, /* GL_CURRENT_QUERY */
+      1403, /* GL_QUERY_RESULT */
+      1405, /* GL_QUERY_RESULT_AVAILABLE */
+      1026, /* GL_MAX_VERTEX_ATTRIBS */
+      2014, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+       398, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
+       397, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
+      1006, /* GL_MAX_TEXTURE_COORDS */
+      1008, /* GL_MAX_TEXTURE_IMAGE_UNITS */
+      1341, /* GL_PROGRAM_ERROR_STRING_ARB */
+      1343, /* GL_PROGRAM_FORMAT_ASCII_ARB */
+      1342, /* GL_PROGRAM_FORMAT_ARB */
+      1901, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+       371, /* GL_DEPTH_BOUNDS_TEST_EXT */
+       370, /* GL_DEPTH_BOUNDS_EXT */
         53, /* GL_ARRAY_BUFFER */
-       465, /* GL_ELEMENT_ARRAY_BUFFER */
+       485, /* GL_ELEMENT_ARRAY_BUFFER */
         54, /* GL_ARRAY_BUFFER_BINDING */
-       466, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-      1821, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-      1029, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
-       150, /* GL_COLOR_ARRAY_BUFFER_BINDING */
-       634, /* GL_INDEX_ARRAY_BUFFER_BINDING */
-      1682, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
-       461, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
-      1425, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
-       515, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-      1875, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-      1843, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-      1241, /* GL_PROGRAM_INSTRUCTIONS_ARB */
-       900, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
-      1247, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-       909, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-      1259, /* GL_PROGRAM_TEMPORARIES_ARB */
-       915, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
-      1249, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
-       911, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
-      1253, /* GL_PROGRAM_PARAMETERS_ARB */
-       914, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
-      1248, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
-       910, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
-      1234, /* GL_PROGRAM_ATTRIBS_ARB */
-       895, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
-      1246, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
-       908, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
-      1232, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
-       893, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
-      1244, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-       906, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-       901, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
-       897, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
-      1262, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-      1766, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-      1311, /* GL_READ_ONLY */
-      1883, /* GL_WRITE_ONLY */
-      1313, /* GL_READ_WRITE */
-       102, /* GL_BUFFER_ACCESS */
-       105, /* GL_BUFFER_MAPPED */
-       107, /* GL_BUFFER_MAP_POINTER */
-      1760, /* GL_TIME_ELAPSED_EXT */
-       810, /* GL_MATRIX0_ARB */
-       822, /* GL_MATRIX1_ARB */
-       834, /* GL_MATRIX2_ARB */
-       838, /* GL_MATRIX3_ARB */
-       840, /* GL_MATRIX4_ARB */
-       842, /* GL_MATRIX5_ARB */
-       844, /* GL_MATRIX6_ARB */
-       846, /* GL_MATRIX7_ARB */
-       848, /* GL_MATRIX8_ARB */
-       849, /* GL_MATRIX9_ARB */
-       812, /* GL_MATRIX10_ARB */
-       813, /* GL_MATRIX11_ARB */
-       814, /* GL_MATRIX12_ARB */
-       815, /* GL_MATRIX13_ARB */
-       816, /* GL_MATRIX14_ARB */
-       817, /* GL_MATRIX15_ARB */
-       818, /* GL_MATRIX16_ARB */
-       819, /* GL_MATRIX17_ARB */
-       820, /* GL_MATRIX18_ARB */
-       821, /* GL_MATRIX19_ARB */
-       824, /* GL_MATRIX20_ARB */
-       825, /* GL_MATRIX21_ARB */
-       826, /* GL_MATRIX22_ARB */
-       827, /* GL_MATRIX23_ARB */
-       828, /* GL_MATRIX24_ARB */
-       829, /* GL_MATRIX25_ARB */
-       830, /* GL_MATRIX26_ARB */
-       831, /* GL_MATRIX27_ARB */
-       832, /* GL_MATRIX28_ARB */
-       833, /* GL_MATRIX29_ARB */
-       836, /* GL_MATRIX30_ARB */
-       837, /* GL_MATRIX31_ARB */
-      1549, /* GL_STREAM_DRAW */
-      1551, /* GL_STREAM_READ */
-      1547, /* GL_STREAM_COPY */
-      1503, /* GL_STATIC_DRAW */
-      1505, /* GL_STATIC_READ */
-      1501, /* GL_STATIC_COPY */
-       455, /* GL_DYNAMIC_DRAW */
-       457, /* GL_DYNAMIC_READ */
-       453, /* GL_DYNAMIC_COPY */
-      1135, /* GL_PIXEL_PACK_BUFFER */
-      1139, /* GL_PIXEL_UNPACK_BUFFER */
-      1136, /* GL_PIXEL_PACK_BUFFER_BINDING */
-      1140, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
-       348, /* GL_DEPTH24_STENCIL8 */
-      1750, /* GL_TEXTURE_STENCIL_SIZE */
-      1702, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
-       896, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
-       899, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
-       903, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
-       902, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
-       859, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
-      1540, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+       486, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
+      1988, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+      1120, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
+       161, /* GL_COLOR_ARRAY_BUFFER_BINDING */
+       688, /* GL_INDEX_ARRAY_BUFFER_BINDING */
+      1817, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+       481, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
+      1550, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+       537, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
+      2042, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+      2010, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+      1344, /* GL_PROGRAM_INSTRUCTIONS_ARB */
+       977, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
+      1350, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+       986, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+      1363, /* GL_PROGRAM_TEMPORARIES_ARB */
+       992, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
+      1352, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
+       988, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
+      1356, /* GL_PROGRAM_PARAMETERS_ARB */
+       991, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
+      1351, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
+       987, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
+      1335, /* GL_PROGRAM_ATTRIBS_ARB */
+       972, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
+      1349, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
+       985, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
+      1333, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
+       970, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
+      1347, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+       983, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+       978, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
+       974, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
+      1366, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
+      1926, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+      1417, /* GL_READ_ONLY */
+      2056, /* GL_WRITE_ONLY */
+      1419, /* GL_READ_WRITE */
+       110, /* GL_BUFFER_ACCESS */
+       114, /* GL_BUFFER_MAPPED */
+       117, /* GL_BUFFER_MAP_POINTER */
+      1908, /* GL_TIME_ELAPSED_EXT */
+       871, /* GL_MATRIX0_ARB */
+       883, /* GL_MATRIX1_ARB */
+       895, /* GL_MATRIX2_ARB */
+       899, /* GL_MATRIX3_ARB */
+       901, /* GL_MATRIX4_ARB */
+       903, /* GL_MATRIX5_ARB */
+       905, /* GL_MATRIX6_ARB */
+       907, /* GL_MATRIX7_ARB */
+       909, /* GL_MATRIX8_ARB */
+       910, /* GL_MATRIX9_ARB */
+       873, /* GL_MATRIX10_ARB */
+       874, /* GL_MATRIX11_ARB */
+       875, /* GL_MATRIX12_ARB */
+       876, /* GL_MATRIX13_ARB */
+       877, /* GL_MATRIX14_ARB */
+       878, /* GL_MATRIX15_ARB */
+       879, /* GL_MATRIX16_ARB */
+       880, /* GL_MATRIX17_ARB */
+       881, /* GL_MATRIX18_ARB */
+       882, /* GL_MATRIX19_ARB */
+       885, /* GL_MATRIX20_ARB */
+       886, /* GL_MATRIX21_ARB */
+       887, /* GL_MATRIX22_ARB */
+       888, /* GL_MATRIX23_ARB */
+       889, /* GL_MATRIX24_ARB */
+       890, /* GL_MATRIX25_ARB */
+       891, /* GL_MATRIX26_ARB */
+       892, /* GL_MATRIX27_ARB */
+       893, /* GL_MATRIX28_ARB */
+       894, /* GL_MATRIX29_ARB */
+       897, /* GL_MATRIX30_ARB */
+       898, /* GL_MATRIX31_ARB */
+      1681, /* GL_STREAM_DRAW */
+      1683, /* GL_STREAM_READ */
+      1679, /* GL_STREAM_COPY */
+      1631, /* GL_STATIC_DRAW */
+      1633, /* GL_STATIC_READ */
+      1629, /* GL_STATIC_COPY */
+       475, /* GL_DYNAMIC_DRAW */
+       477, /* GL_DYNAMIC_READ */
+       473, /* GL_DYNAMIC_COPY */
+      1229, /* GL_PIXEL_PACK_BUFFER */
+      1233, /* GL_PIXEL_UNPACK_BUFFER */
+      1230, /* GL_PIXEL_PACK_BUFFER_BINDING */
+      1234, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
+       362, /* GL_DEPTH24_STENCIL8 */
+      1897, /* GL_TEXTURE_STENCIL_SIZE */
+      1845, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
+       973, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
+       976, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
+       980, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
+       979, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
+       928, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
+      1672, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
         17, /* GL_ACTIVE_STENCIL_FACE_EXT */
-       963, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-      1406, /* GL_SAMPLES_PASSED */
-       110, /* GL_BUFFER_SERIALIZED_MODIFY_APPLE */
-       104, /* GL_BUFFER_FLUSHING_UNMAP_APPLE */
-      1324, /* GL_RELEASED_APPLE */
-      1872, /* GL_VOLATILE_APPLE */
-      1352, /* GL_RETAINED_APPLE */
-      1779, /* GL_UNDEFINED_APPLE */
-      1285, /* GL_PURGEABLE_APPLE */
-       538, /* GL_FRAGMENT_SHADER */
-      1867, /* GL_VERTEX_SHADER */
-      1252, /* GL_PROGRAM_OBJECT_ARB */
-      1438, /* GL_SHADER_OBJECT_ARB */
-       884, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
-       946, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
-       940, /* GL_MAX_VARYING_FLOATS */
-       944, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
-       869, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
-      1055, /* GL_OBJECT_TYPE_ARB */
-      1440, /* GL_SHADER_TYPE */
-       503, /* GL_FLOAT_VEC2 */
-       505, /* GL_FLOAT_VEC3 */
-       507, /* GL_FLOAT_VEC4 */
-       661, /* GL_INT_VEC2 */
-       663, /* GL_INT_VEC3 */
-       665, /* GL_INT_VEC4 */
-        94, /* GL_BOOL */
-        96, /* GL_BOOL_VEC2 */
-        98, /* GL_BOOL_VEC3 */
-       100, /* GL_BOOL_VEC4 */
-       491, /* GL_FLOAT_MAT2 */
-       495, /* GL_FLOAT_MAT3 */
-       499, /* GL_FLOAT_MAT4 */
-      1397, /* GL_SAMPLER_1D */
-      1399, /* GL_SAMPLER_2D */
-      1401, /* GL_SAMPLER_3D */
-      1402, /* GL_SAMPLER_CUBE */
-      1398, /* GL_SAMPLER_1D_SHADOW */
-      1400, /* GL_SAMPLER_2D_SHADOW */
-       493, /* GL_FLOAT_MAT2x3 */
-       494, /* GL_FLOAT_MAT2x4 */
-       497, /* GL_FLOAT_MAT3x2 */
-       498, /* GL_FLOAT_MAT3x4 */
-       501, /* GL_FLOAT_MAT4x2 */
-       502, /* GL_FLOAT_MAT4x3 */
-       346, /* GL_DELETE_STATUS */
-       247, /* GL_COMPILE_STATUS */
-       717, /* GL_LINK_STATUS */
-      1815, /* GL_VALIDATE_STATUS */
-       646, /* GL_INFO_LOG_LENGTH */
+      1052, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
+      1531, /* GL_SAMPLES_PASSED */
+      1253, /* GL_POINT_SIZE_ARRAY_TYPE_OES */
+      1252, /* GL_POINT_SIZE_ARRAY_STRIDE_OES */
+      1251, /* GL_POINT_SIZE_ARRAY_POINTER_OES */
+      1089, /* GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES */
+      1369, /* GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES */
+      1879, /* GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES */
+       121, /* GL_BUFFER_SERIALIZED_MODIFY_APPLE */
+       113, /* GL_BUFFER_FLUSHING_UNMAP_APPLE */
+      1431, /* GL_RELEASED_APPLE */
+      2039, /* GL_VOLATILE_APPLE */
+      1470, /* GL_RETAINED_APPLE */
+      1941, /* GL_UNDEFINED_APPLE */
+      1390, /* GL_PURGEABLE_APPLE */
+       560, /* GL_FRAGMENT_SHADER */
+      2034, /* GL_VERTEX_SHADER */
+      1355, /* GL_PROGRAM_OBJECT_ARB */
+      1566, /* GL_SHADER_OBJECT_ARB */
+       954, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
+      1030, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
+      1023, /* GL_MAX_VARYING_FLOATS */
+      1028, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
+       938, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
+      1149, /* GL_OBJECT_TYPE_ARB */
+      1568, /* GL_SHADER_TYPE */
+       525, /* GL_FLOAT_VEC2 */
+       527, /* GL_FLOAT_VEC3 */
+       529, /* GL_FLOAT_VEC4 */
+       717, /* GL_INT_VEC2 */
+       719, /* GL_INT_VEC3 */
+       721, /* GL_INT_VEC4 */
+       102, /* GL_BOOL */
+       104, /* GL_BOOL_VEC2 */
+       106, /* GL_BOOL_VEC3 */
+       108, /* GL_BOOL_VEC4 */
+       513, /* GL_FLOAT_MAT2 */
+       517, /* GL_FLOAT_MAT3 */
+       521, /* GL_FLOAT_MAT4 */
+      1521, /* GL_SAMPLER_1D */
+      1523, /* GL_SAMPLER_2D */
+      1525, /* GL_SAMPLER_3D */
+      1527, /* GL_SAMPLER_CUBE */
+      1522, /* GL_SAMPLER_1D_SHADOW */
+      1524, /* GL_SAMPLER_2D_SHADOW */
+       515, /* GL_FLOAT_MAT2x3 */
+       516, /* GL_FLOAT_MAT2x4 */
+       519, /* GL_FLOAT_MAT3x2 */
+       520, /* GL_FLOAT_MAT3x4 */
+       523, /* GL_FLOAT_MAT4x2 */
+       524, /* GL_FLOAT_MAT4x3 */
+       360, /* GL_DELETE_STATUS */
+       259, /* GL_COMPILE_STATUS */
+       776, /* GL_LINK_STATUS */
+      1982, /* GL_VALIDATE_STATUS */
+       700, /* GL_INFO_LOG_LENGTH */
         56, /* GL_ATTACHED_SHADERS */
         20, /* GL_ACTIVE_UNIFORMS */
         21, /* GL_ACTIVE_UNIFORM_MAX_LENGTH */
-      1439, /* GL_SHADER_SOURCE_LENGTH */
+      1567, /* GL_SHADER_SOURCE_LENGTH */
         15, /* GL_ACTIVE_ATTRIBUTES */
         16, /* GL_ACTIVE_ATTRIBUTE_MAX_LENGTH */
-       540, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
-      1442, /* GL_SHADING_LANGUAGE_VERSION */
-       323, /* GL_CURRENT_PROGRAM */
-      1104, /* GL_PALETTE4_RGB8_OES */
-      1106, /* GL_PALETTE4_RGBA8_OES */
-      1102, /* GL_PALETTE4_R5_G6_B5_OES */
-      1105, /* GL_PALETTE4_RGBA4_OES */
-      1103, /* GL_PALETTE4_RGB5_A1_OES */
-      1109, /* GL_PALETTE8_RGB8_OES */
-      1111, /* GL_PALETTE8_RGBA8_OES */
-      1107, /* GL_PALETTE8_R5_G6_B5_OES */
-      1110, /* GL_PALETTE8_RGBA4_OES */
-      1108, /* GL_PALETTE8_RGB5_A1_OES */
-       628, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
-       627, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
-      1800, /* GL_UNSIGNED_NORMALIZED */
-      1637, /* GL_TEXTURE_1D_ARRAY_EXT */
-      1274, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
-      1639, /* GL_TEXTURE_2D_ARRAY_EXT */
-      1277, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
-      1645, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
-      1647, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
-      1495, /* GL_SRGB */
-      1496, /* GL_SRGB8 */
-      1498, /* GL_SRGB_ALPHA */
-      1497, /* GL_SRGB8_ALPHA8 */
-      1455, /* GL_SLUMINANCE_ALPHA */
-      1454, /* GL_SLUMINANCE8_ALPHA8 */
-      1452, /* GL_SLUMINANCE */
-      1453, /* GL_SLUMINANCE8 */
-       268, /* GL_COMPRESSED_SRGB */
-       269, /* GL_COMPRESSED_SRGB_ALPHA */
-       266, /* GL_COMPRESSED_SLUMINANCE */
-       267, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
-      1169, /* GL_POINT_SPRITE_COORD_ORIGIN */
-       725, /* GL_LOWER_LEFT */
-      1812, /* GL_UPPER_LEFT */
-      1518, /* GL_STENCIL_BACK_REF */
-      1519, /* GL_STENCIL_BACK_VALUE_MASK */
-      1520, /* GL_STENCIL_BACK_WRITEMASK */
-       445, /* GL_DRAW_FRAMEBUFFER_BINDING */
-      1328, /* GL_RENDERBUFFER_BINDING */
-      1307, /* GL_READ_FRAMEBUFFER */
-       444, /* GL_DRAW_FRAMEBUFFER */
-      1308, /* GL_READ_FRAMEBUFFER_BINDING */
-      1339, /* GL_RENDERBUFFER_SAMPLES */
-       550, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
-       548, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
-       559, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
-       555, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
-       557, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-       563, /* GL_FRAMEBUFFER_COMPLETE */
-       567, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
-       574, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
-       572, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
-       569, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
-       573, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
-       570, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */
-       578, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */
-       582, /* GL_FRAMEBUFFER_UNSUPPORTED */
-       580, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
-       865, /* GL_MAX_COLOR_ATTACHMENTS */
-       156, /* GL_COLOR_ATTACHMENT0 */
-       158, /* GL_COLOR_ATTACHMENT1 */
-       172, /* GL_COLOR_ATTACHMENT2 */
-       174, /* GL_COLOR_ATTACHMENT3 */
-       176, /* GL_COLOR_ATTACHMENT4 */
-       178, /* GL_COLOR_ATTACHMENT5 */
-       180, /* GL_COLOR_ATTACHMENT6 */
-       182, /* GL_COLOR_ATTACHMENT7 */
-       184, /* GL_COLOR_ATTACHMENT8 */
-       186, /* GL_COLOR_ATTACHMENT9 */
-       159, /* GL_COLOR_ATTACHMENT10 */
-       161, /* GL_COLOR_ATTACHMENT11 */
-       163, /* GL_COLOR_ATTACHMENT12 */
-       165, /* GL_COLOR_ATTACHMENT13 */
-       167, /* GL_COLOR_ATTACHMENT14 */
-       169, /* GL_COLOR_ATTACHMENT15 */
-       350, /* GL_DEPTH_ATTACHMENT */
-      1508, /* GL_STENCIL_ATTACHMENT */
-       541, /* GL_FRAMEBUFFER */
-      1326, /* GL_RENDERBUFFER */
-      1342, /* GL_RENDERBUFFER_WIDTH */
-      1334, /* GL_RENDERBUFFER_HEIGHT */
-      1336, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-      1535, /* GL_STENCIL_INDEX_EXT */
-      1527, /* GL_STENCIL_INDEX1 */
-      1531, /* GL_STENCIL_INDEX4 */
-      1533, /* GL_STENCIL_INDEX8 */
-      1528, /* GL_STENCIL_INDEX16 */
-      1338, /* GL_RENDERBUFFER_RED_SIZE */
-      1333, /* GL_RENDERBUFFER_GREEN_SIZE */
-      1330, /* GL_RENDERBUFFER_BLUE_SIZE */
-      1327, /* GL_RENDERBUFFER_ALPHA_SIZE */
-      1331, /* GL_RENDERBUFFER_DEPTH_SIZE */
-      1341, /* GL_RENDERBUFFER_STENCIL_SIZE */
-       576, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
-       923, /* GL_MAX_SAMPLES */
-      1302, /* GL_QUERY_WAIT_NV */
-      1297, /* GL_QUERY_NO_WAIT_NV */
-      1294, /* GL_QUERY_BY_REGION_WAIT_NV */
-      1293, /* GL_QUERY_BY_REGION_NO_WAIT_NV */
-      1289, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
-       487, /* GL_FIRST_VERTEX_CONVENTION */
-       676, /* GL_LAST_VERTEX_CONVENTION */
-      1266, /* GL_PROVOKING_VERTEX */
-       303, /* GL_COPY_READ_BUFFER */
-       304, /* GL_COPY_WRITE_BUFFER */
-      1390, /* GL_RGBA_SNORM */
-      1386, /* GL_RGBA8_SNORM */
-      1448, /* GL_SIGNED_NORMALIZED */
-       925, /* GL_MAX_SERVER_WAIT_TIMEOUT */
-      1054, /* GL_OBJECT_TYPE */
-      1556, /* GL_SYNC_CONDITION */
-      1561, /* GL_SYNC_STATUS */
-      1558, /* GL_SYNC_FLAGS */
-      1557, /* GL_SYNC_FENCE */
-      1560, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
-      1788, /* GL_UNSIGNALED */
-      1447, /* GL_SIGNALED */
+       562, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
+      1570, /* GL_SHADING_LANGUAGE_VERSION */
+       337, /* GL_CURRENT_PROGRAM */
+      1198, /* GL_PALETTE4_RGB8_OES */
+      1200, /* GL_PALETTE4_RGBA8_OES */
+      1196, /* GL_PALETTE4_R5_G6_B5_OES */
+      1199, /* GL_PALETTE4_RGBA4_OES */
+      1197, /* GL_PALETTE4_RGB5_A1_OES */
+      1203, /* GL_PALETTE8_RGB8_OES */
+      1205, /* GL_PALETTE8_RGBA8_OES */
+      1201, /* GL_PALETTE8_R5_G6_B5_OES */
+      1204, /* GL_PALETTE8_RGBA4_OES */
+      1202, /* GL_PALETTE8_RGB5_A1_OES */
+       682, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
+       680, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
+      1250, /* GL_POINT_SIZE_ARRAY_OES */
+      1823, /* GL_TEXTURE_CROP_RECT_OES */
+       912, /* GL_MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES */
+      1249, /* GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES */
+      1965, /* GL_UNSIGNED_NORMALIZED */
+      1769, /* GL_TEXTURE_1D_ARRAY_EXT */
+      1379, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
+      1771, /* GL_TEXTURE_2D_ARRAY_EXT */
+      1382, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
+      1778, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
+      1780, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
+       958, /* GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB */
+      1623, /* GL_SRGB */
+      1624, /* GL_SRGB8 */
+      1626, /* GL_SRGB_ALPHA */
+      1625, /* GL_SRGB8_ALPHA8 */
+      1583, /* GL_SLUMINANCE_ALPHA */
+      1582, /* GL_SLUMINANCE8_ALPHA8 */
+      1580, /* GL_SLUMINANCE */
+      1581, /* GL_SLUMINANCE8 */
+       280, /* GL_COMPRESSED_SRGB */
+       281, /* GL_COMPRESSED_SRGB_ALPHA */
+       278, /* GL_COMPRESSED_SLUMINANCE */
+       279, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
+      1923, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT */
+      1917, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT */
+      1021, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT */
+      1922, /* GL_TRANSFORM_FEEDBACK_VARYINGS_EXT */
+      1920, /* GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT */
+      1919, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT */
+      1332, /* GL_PRIMITIVES_GENERATED_EXT */
+      1921, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT */
+      1410, /* GL_RASTERIZER_DISCARD_EXT */
+      1019, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT */
+      1020, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT */
+       712, /* GL_INTERLEAVED_ATTRIBS_EXT */
+      1560, /* GL_SEPARATE_ATTRIBS_EXT */
+      1916, /* GL_TRANSFORM_FEEDBACK_BUFFER_EXT */
+      1915, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT */
+      1268, /* GL_POINT_SPRITE_COORD_ORIGIN */
+       784, /* GL_LOWER_LEFT */
+      1979, /* GL_UPPER_LEFT */
+      1647, /* GL_STENCIL_BACK_REF */
+      1648, /* GL_STENCIL_BACK_VALUE_MASK */
+      1649, /* GL_STENCIL_BACK_WRITEMASK */
+       465, /* GL_DRAW_FRAMEBUFFER_BINDING */
+      1436, /* GL_RENDERBUFFER_BINDING */
+      1413, /* GL_READ_FRAMEBUFFER */
+       464, /* GL_DRAW_FRAMEBUFFER */
+      1414, /* GL_READ_FRAMEBUFFER_BINDING */
+      1455, /* GL_RENDERBUFFER_SAMPLES */
+       575, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
+       572, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
+       587, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
+       582, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
+       585, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+       593, /* GL_FRAMEBUFFER_COMPLETE */
+       598, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
+       612, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
+       607, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
+       602, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
+       608, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
+       604, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */
+       617, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */
+       623, /* GL_FRAMEBUFFER_UNSUPPORTED */
+       621, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
+       934, /* GL_MAX_COLOR_ATTACHMENTS */
+       167, /* GL_COLOR_ATTACHMENT0 */
+       170, /* GL_COLOR_ATTACHMENT1 */
+       184, /* GL_COLOR_ATTACHMENT2 */
+       186, /* GL_COLOR_ATTACHMENT3 */
+       188, /* GL_COLOR_ATTACHMENT4 */
+       190, /* GL_COLOR_ATTACHMENT5 */
+       192, /* GL_COLOR_ATTACHMENT6 */
+       194, /* GL_COLOR_ATTACHMENT7 */
+       196, /* GL_COLOR_ATTACHMENT8 */
+       198, /* GL_COLOR_ATTACHMENT9 */
+       171, /* GL_COLOR_ATTACHMENT10 */
+       173, /* GL_COLOR_ATTACHMENT11 */
+       175, /* GL_COLOR_ATTACHMENT12 */
+       177, /* GL_COLOR_ATTACHMENT13 */
+       179, /* GL_COLOR_ATTACHMENT14 */
+       181, /* GL_COLOR_ATTACHMENT15 */
+       365, /* GL_DEPTH_ATTACHMENT */
+      1636, /* GL_STENCIL_ATTACHMENT */
+       564, /* GL_FRAMEBUFFER */
+      1433, /* GL_RENDERBUFFER */
+      1459, /* GL_RENDERBUFFER_WIDTH */
+      1446, /* GL_RENDERBUFFER_HEIGHT */
+      1449, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
+      1667, /* GL_STENCIL_INDEX_EXT */
+      1656, /* GL_STENCIL_INDEX1 */
+      1661, /* GL_STENCIL_INDEX4 */
+      1664, /* GL_STENCIL_INDEX8 */
+      1657, /* GL_STENCIL_INDEX16 */
+      1453, /* GL_RENDERBUFFER_RED_SIZE */
+      1444, /* GL_RENDERBUFFER_GREEN_SIZE */
+      1439, /* GL_RENDERBUFFER_BLUE_SIZE */
+      1434, /* GL_RENDERBUFFER_ALPHA_SIZE */
+      1441, /* GL_RENDERBUFFER_DEPTH_SIZE */
+      1457, /* GL_RENDERBUFFER_STENCIL_SIZE */
+       615, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
+      1001, /* GL_MAX_SAMPLES */
+      1859, /* GL_TEXTURE_GEN_STR_OES */
+       655, /* GL_HALF_FLOAT_OES */
+      1487, /* GL_RGB565_OES */
+       571, /* GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB */
+       611, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB */
+       610, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB */
+       646, /* GL_GEOMETRY_SHADER_ARB */
+       647, /* GL_GEOMETRY_VERTICES_OUT_ARB */
+       644, /* GL_GEOMETRY_INPUT_TYPE_ARB */
+       645, /* GL_GEOMETRY_OUTPUT_TYPE_ARB */
+       961, /* GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB */
+      1035, /* GL_MAX_VERTEX_VARYING_COMPONENTS_ARB */
+       960, /* GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB */
+       957, /* GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB */
+       959, /* GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB */
+       785, /* GL_LOW_FLOAT */
+      1037, /* GL_MEDIUM_FLOAT */
+       656, /* GL_HIGH_FLOAT */
+       786, /* GL_LOW_INT */
+      1038, /* GL_MEDIUM_INT */
+       657, /* GL_HIGH_INT */
+      1956, /* GL_UNSIGNED_INT_10_10_10_2_OES */
+       716, /* GL_INT_10_10_10_2_OES */
+      1564, /* GL_SHADER_BINARY_FORMATS */
+      1134, /* GL_NUM_SHADER_BINARY_FORMATS */
+      1565, /* GL_SHADER_COMPILER */
+      1032, /* GL_MAX_VERTEX_UNIFORM_VECTORS */
+      1025, /* GL_MAX_VARYING_VECTORS */
+       956, /* GL_MAX_FRAGMENT_UNIFORM_VECTORS */
+      1407, /* GL_QUERY_WAIT_NV */
+      1402, /* GL_QUERY_NO_WAIT_NV */
+      1399, /* GL_QUERY_BY_REGION_WAIT_NV */
+      1398, /* GL_QUERY_BY_REGION_NO_WAIT_NV */
+      1912, /* GL_TRANSFORM_FEEDBACK */
+      1918, /* GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
+      1914, /* GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
+      1913, /* GL_TRANSFORM_FEEDBACK_BINDING */
+      1394, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
+       507, /* GL_FIRST_VERTEX_CONVENTION */
+       733, /* GL_LAST_VERTEX_CONVENTION */
+      1371, /* GL_PROVOKING_VERTEX */
+       316, /* GL_COPY_READ_BUFFER */
+       317, /* GL_COPY_WRITE_BUFFER */
+      1514, /* GL_RGBA_SNORM */
+      1510, /* GL_RGBA8_SNORM */
+      1576, /* GL_SIGNED_NORMALIZED */
+      1003, /* GL_MAX_SERVER_WAIT_TIMEOUT */
+      1148, /* GL_OBJECT_TYPE */
+      1688, /* GL_SYNC_CONDITION */
+      1693, /* GL_SYNC_STATUS */
+      1690, /* GL_SYNC_FLAGS */
+      1689, /* GL_SYNC_FENCE */
+      1692, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
+      1950, /* GL_UNSIGNALED */
+      1575, /* GL_SIGNALED */
         46, /* GL_ALREADY_SIGNALED */
-      1759, /* GL_TIMEOUT_EXPIRED */
-       271, /* GL_CONDITION_SATISFIED */
-      1873, /* GL_WAIT_FAILED */
-       472, /* GL_EVAL_BIT */
-      1305, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
-       719, /* GL_LIST_BIT */
-      1653, /* GL_TEXTURE_BIT */
-      1421, /* GL_SCISSOR_BIT */
+      1907, /* GL_TIMEOUT_EXPIRED */
+       283, /* GL_CONDITION_SATISFIED */
+      2040, /* GL_WAIT_FAILED */
+       492, /* GL_EVAL_BIT */
+      1411, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
+       778, /* GL_LIST_BIT */
+      1788, /* GL_TEXTURE_BIT */
+      1546, /* GL_SCISSOR_BIT */
         29, /* GL_ALL_ATTRIB_BITS */
-      1010, /* GL_MULTISAMPLE_BIT */
+      1100, /* GL_MULTISAMPLE_BIT */
         30, /* GL_ALL_CLIENT_ATTRIB_BITS */
 };
 
@@ -5234,7 +5648,8 @@ const char *_mesa_lookup_enum_by_nr( int nr )
    }
    else {
       /* this is not re-entrant safe, no big deal here */
-      sprintf(token_tmp, "0x%x", nr);
+      _mesa_snprintf(token_tmp, sizeof(token_tmp) - 1, "0x%x", nr);
+      token_tmp[sizeof(token_tmp) - 1] = '\0';
       return token_tmp;
    }
 }
diff --git a/mesalib/src/mesa/main/es_generator.py b/mesalib/src/mesa/main/es_generator.py
new file mode 100644
index 000000000..ecb34bb5c
--- /dev/null
+++ b/mesalib/src/mesa/main/es_generator.py
@@ -0,0 +1,743 @@
+#*************************************************************************
+# Copyright 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
+# 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
+# TUNGSTEN GRAPHICS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+# OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#*************************************************************************
+
+
+import sys, os
+import APIspecutil as apiutil
+
+# These dictionary entries are used for automatic conversion.
+# The string will be used as a format string with the conversion
+# variable.
+Converters = {
+    'GLfloat': {
+        'GLdouble': "(GLdouble) (%s)",
+        'GLfixed' : "(GLint) (%s * 65536)",
+    },
+    'GLfixed': {
+        'GLfloat': "(GLfloat) (%s / 65536.0f)",
+        'GLdouble': "(GLdouble) (%s / 65536.0)",
+    },
+    'GLdouble': {
+        'GLfloat': "(GLfloat) (%s)",
+        'GLfixed': "(GLfixed) (%s * 65536)",
+    },
+    'GLclampf': {
+        'GLclampd': "(GLclampd) (%s)",
+        'GLclampx': "(GLclampx) (%s * 65536)",
+    },
+    'GLclampx': {
+        'GLclampf': "(GLclampf) (%s / 65536.0f)",
+        'GLclampd': "(GLclampd) (%s / 65536.0)",
+    },
+    'GLubyte': {
+        'GLfloat': "(GLfloat) (%s / 255.0f)",
+    },
+}
+
+def GetBaseType(type):
+    typeTokens = type.split(' ')
+    baseType = None
+    typeModifiers = []
+    for t in typeTokens:
+        if t in ['const', '*']:
+            typeModifiers.append(t)
+        else:
+            baseType = t
+    return (baseType, typeModifiers)
+
+def ConvertValue(value, fromType, toType):
+    """Returns a string that represents the given parameter string, 
+    type-converted if necessary."""
+
+    if not Converters.has_key(fromType):
+        print >> sys.stderr, "No base converter for type '%s' found.  Ignoring." % fromType
+        return value
+
+    if not Converters[fromType].has_key(toType):
+        print >> sys.stderr, "No converter found for type '%s' to type '%s'.  Ignoring." % (fromType, toType)
+        return value
+
+    # This part is simple.  Return the proper conversion.
+    conversionString = Converters[fromType][toType]
+    return conversionString % value
+
+FormatStrings = {
+    'GLenum' : '0x%x',
+    'GLfloat' : '%f',
+    'GLint' : '%d',
+    'GLbitfield' : '0x%x',
+}
+def GetFormatString(type):
+    if FormatStrings.has_key(type):
+        return FormatStrings[type]
+    else:
+        return None
+
+
+######################################################################
+# Version-specific values to be used in the main script
+# header: which header file to include
+# api: what text specifies an API-level function
+VersionSpecificValues = {
+    'GLES1.1' : {
+        'description' : 'GLES1.1 functions',
+        'header' : 'GLES/gl.h',
+        'extheader' : 'GLES/glext.h',
+        'shortname' : 'es1'
+    },
+    'GLES2.0': {
+        'description' : 'GLES2.0 functions',
+        'header' : 'GLES2/gl2.h',
+        'extheader' : 'GLES2/gl2ext.h',
+        'shortname' : 'es2'
+    }
+}
+
+
+######################################################################
+# Main code for the script begins here.
+
+# Get the name of the program (without the directory part) for use in
+# error messages.
+program = os.path.basename(sys.argv[0])
+
+# Set default values
+verbose = 0
+functionList = "APIspec.xml"
+version = "GLES1.1"
+
+# Allow for command-line switches
+import getopt, time
+options = "hvV:S:"
+try:
+    optlist, args = getopt.getopt(sys.argv[1:], options)
+except getopt.GetoptError, message:
+    sys.stderr.write("%s: %s.  Use -h for help.\n" % (program, message))
+    sys.exit(1)
+
+for option, optarg in optlist:
+    if option == "-h":
+        sys.stderr.write("Usage: %s [-%s]\n" % (program, options))
+        sys.stderr.write("Parse an API specification file and generate wrapper functions for a given GLES version\n")
+        sys.stderr.write("-h gives help\n")
+        sys.stderr.write("-v is verbose\n")
+        sys.stderr.write("-V specifies GLES version to generate [%s]:\n" % version)
+        for key in VersionSpecificValues.keys():
+            sys.stderr.write("    %s - %s\n" % (key, VersionSpecificValues[key]['description']))
+        sys.stderr.write("-S specifies API specification file to use [%s]\n" % functionList)
+        sys.exit(1)
+    elif option == "-v":
+        verbose += 1
+    elif option == "-V":
+        version = optarg
+    elif option == "-S":
+        functionList = optarg
+
+# Beyond switches, we support no further command-line arguments
+if len(args) >  0:
+    sys.stderr.write("%s: only switch arguments are supported - use -h for help\n" % program)
+    sys.exit(1)
+
+# If we don't have a valid version, abort.
+if not VersionSpecificValues.has_key(version):
+    sys.stderr.write("%s: version '%s' is not valid - use -h for help\n" % (program, version))
+    sys.exit(1)
+
+# Grab the version-specific items we need to use
+versionHeader = VersionSpecificValues[version]['header']
+versionExtHeader = VersionSpecificValues[version]['extheader']
+shortname = VersionSpecificValues[version]['shortname']
+
+# If we get to here, we're good to go.  The "version" parameter
+# directs GetDispatchedFunctions to only allow functions from
+# that "category" (version in our parlance).  This allows 
+# functions with different declarations in different categories
+# to exist (glTexImage2D, for example, is different between
+# GLES1 and GLES2).
+keys = apiutil.GetAllFunctions(functionList, version)
+
+allSpecials = apiutil.AllSpecials()
+
+print """/* DO NOT EDIT *************************************************
+ * THIS FILE AUTOMATICALLY GENERATED BY THE %s SCRIPT
+ * API specification file:   %s
+ * GLES version:             %s
+ * date:                     %s
+ */
+""" % (program, functionList, version, time.strftime("%Y-%m-%d %H:%M:%S"))
+
+# The headers we choose are version-specific.
+print """
+#include "%s"
+#include "%s"
+#include "main/mfeatures.h"
+
+#if FEATURE_%s
+""" % (versionHeader, versionExtHeader, shortname.upper())
+
+# Everyone needs these types.
+print """
+/* These types are needed for the Mesa veneer, but are not defined in
+ * the standard GLES headers.
+ */
+typedef double GLdouble;
+typedef double GLclampd;
+
+/* Mesa error handling requires these */
+extern void *_mesa_get_current_context(void);
+extern void _mesa_error(void *ctx, GLenum error, const char *fmtString, ... );
+
+#include "main/compiler.h"
+#include "main/api_exec.h"
+#include "main/remap.h"
+
+/* cannot include main/dispatch.h here */
+#ifdef IN_DRI_DRIVER
+#define _GLAPI_USE_REMAP_TABLE
+#endif
+/* glapi uses GLAPIENTRY while GLES headers define GL_APIENTRY */
+#ifndef GLAPIENTRY
+#define GLAPIENTRY GL_APIENTRY
+#endif
+#include "%sapi/glapi/glapitable.h"
+#include "%sapi/glapi/glapioffsets.h"
+#include "%sapi/glapi/glapidispatch.h"
+
+#if FEATURE_remap_table
+
+#if !FEATURE_GL
+int driDispatchRemapTable[driDispatchRemapTable_size];
+#endif
+
+#define need_MESA_remap_table
+
+#include "%sapi/main/remap_helper.h"
+
+void
+_mesa_init_remap_table_%s(void)
+{
+   _mesa_do_init_remap_table(_mesa_function_pool,
+                             driDispatchRemapTable_size,
+                             MESA_remap_table_functions);
+}
+
+void
+_mesa_map_static_functions_%s(void)
+{
+}
+
+#endif
+
+typedef void (*_glapi_proc)(void); /* generic function pointer */
+""" % (shortname, shortname, shortname, shortname, shortname, shortname);
+
+# Finally we get to the all-important functions
+print """/*************************************************************
+ * Generated functions begin here
+ */
+"""
+for funcName in keys:
+    if verbose > 0: sys.stderr.write("%s: processing function %s\n" % (program, funcName))
+
+    # start figuring out what this function will look like.
+    returnType = apiutil.ReturnType(funcName)
+    props = apiutil.Properties(funcName)
+    params = apiutil.Parameters(funcName)
+    declarationString = apiutil.MakeDeclarationString(params)
+
+    # In case of error, a function may have to return.  Make
+    # sure we have valid return values in this case.
+    if returnType == "void":
+        errorReturn = "return"
+    elif returnType == "GLboolean":
+        errorReturn = "return GL_FALSE"
+    else:
+        errorReturn = "return (%s) 0" % returnType
+
+    # These are the output of this large calculation block.
+    # passthroughDeclarationString: a typed set of parameters that
+    # will be used to create the "extern" reference for the
+    # underlying Mesa or support function.  Note that as generated
+    # these have an extra ", " at the beginning, which will be
+    # removed before use.
+    # 
+    # passthroughDeclarationString: an untyped list of parameters
+    # that will be used to call the underlying Mesa or support
+    # function (including references to converted parameters).
+    # This will also be generated with an extra ", " at the
+    # beginning, which will be removed before use.
+    #
+    # variables: C code to create any local variables determined to
+    # be necessary.
+    # conversionCodeOutgoing: C code to convert application parameters
+    # to a necessary type before calling the underlying support code.
+    # May be empty if no conversion is required.  
+    # conversionCodeIncoming: C code to do the converse: convert 
+    # values returned by underlying Mesa code to the types needed
+    # by the application.
+    # Note that *either* the conversionCodeIncoming will be used (for
+    # generated query functions), *or* the conversionCodeOutgoing will
+    # be used (for generated non-query functions), never both.
+    passthroughFuncName = ""
+    passthroughDeclarationString = ""
+    passthroughCallString = ""
+    prefixOverride = None
+    variables = []
+    conversionCodeOutgoing = []
+    conversionCodeIncoming = []
+    switchCode = []
+
+    # Calculate the name of the underlying support function to call.
+    # By default, the passthrough function is named _mesa_<funcName>.
+    # We're allowed to override the prefix and/or the function name
+    # for each function record, though.  The "ConversionFunction"
+    # utility is poorly named, BTW...
+    if funcName in allSpecials:
+        # perform checks and pass through
+        funcPrefix = "_check_"
+        aliasprefix = "_es_"
+    else:
+        funcPrefix = "_es_"
+        aliasprefix = apiutil.AliasPrefix(funcName)
+    alias = apiutil.ConversionFunction(funcName)
+    prefixOverride = apiutil.FunctionPrefix(funcName)
+    if prefixOverride != "_mesa_":
+        aliasprefix = apiutil.FunctionPrefix(funcName)
+    if not alias:
+        # There may still be a Mesa alias for the function
+        if apiutil.Alias(funcName):
+            passthroughFuncName = "%s%s" % (aliasprefix, apiutil.Alias(funcName))
+        else:
+            passthroughFuncName = "%s%s" % (aliasprefix, funcName)
+    else: # a specific alias is provided
+        passthroughFuncName = "%s%s" % (aliasprefix, alias)
+
+    # Look at every parameter: each one may have only specific
+    # allowed values, or dependent parameters to check, or 
+    # variant-sized vector arrays to calculate
+    for (paramName, paramType, paramMaxVecSize, paramConvertToType, paramValidValues, paramValueConversion) in params:
+        # We'll need this below if we're doing conversions
+        (paramBaseType, paramTypeModifiers) = GetBaseType(paramType)
+
+        # Conversion management.
+        # We'll handle three cases, easiest to hardest: a parameter
+        # that doesn't require conversion, a scalar parameter that
+        # requires conversion, and a vector parameter that requires
+        # conversion.
+        if paramConvertToType == None:
+            # Unconverted parameters are easy, whether they're vector
+            # or scalar - just add them to the call list.  No conversions
+            # or anything to worry about.
+            passthroughDeclarationString += ", %s %s" % (paramType, paramName)
+            passthroughCallString += ", %s" % paramName
+
+        elif paramMaxVecSize == 0: # a scalar parameter that needs conversion
+            # A scalar to hold a converted parameter
+            variables.append("    %s converted_%s;" % (paramConvertToType, paramName))
+
+            # Outgoing conversion depends on whether we have to conditionally
+            # perform value conversion.
+            if paramValueConversion == "none":
+                conversionCodeOutgoing.append("    converted_%s = (%s) %s;" % (paramName, paramConvertToType, paramName))
+            elif paramValueConversion == "some":
+                # We'll need a conditional variable to keep track of
+                # whether we're converting values or not.
+                if ("    int convert_%s_value = 1;" % paramName) not in variables:
+                    variables.append("    int convert_%s_value = 1;" % paramName)
+
+                # Write code based on that conditional.
+                conversionCodeOutgoing.append("    if (convert_%s_value) {" % paramName)
+                conversionCodeOutgoing.append("        converted_%s = %s;" % (paramName, ConvertValue(paramName, paramBaseType, paramConvertToType))) 
+                conversionCodeOutgoing.append("    } else {")
+                conversionCodeOutgoing.append("        converted_%s = (%s) %s;" % (paramName, paramConvertToType, paramName))
+                conversionCodeOutgoing.append("    }")
+            else: # paramValueConversion == "all"
+                conversionCodeOutgoing.append("    converted_%s = %s;" % (paramName, ConvertValue(paramName, paramBaseType, paramConvertToType)))
+
+            # Note that there can be no incoming conversion for a
+            # scalar parameter; changing the scalar will only change
+            # the local value, and won't ultimately change anything
+            # that passes back to the application.
+
+            # Call strings.  The unusual " ".join() call will join the
+            # array of parameter modifiers with spaces as separators.
+            passthroughDeclarationString += ", %s %s %s" % (paramConvertToType, " ".join(paramTypeModifiers), paramName)
+            passthroughCallString += ", converted_%s" % paramName
+
+        else: # a vector parameter that needs conversion
+            # We'll need an index variable for conversions
+            if "    register unsigned int i;" not in variables:
+                variables.append("    register unsigned int i;")
+
+            # This variable will hold the (possibly variant) size of
+            # this array needing conversion.  By default, we'll set
+            # it to the maximal size (which is correct for functions
+            # with a constant-sized vector parameter); for true
+            # variant arrays, we'll modify it with other code.
+            variables.append("    unsigned int n_%s = %d;" % (paramName, paramMaxVecSize))
+
+            # This array will hold the actual converted values.
+            variables.append("    %s converted_%s[%d];" % (paramConvertToType, paramName, paramMaxVecSize))
+
+            # Again, we choose the conversion code based on whether we
+            # have to always convert values, never convert values, or 
+            # conditionally convert values.
+            if paramValueConversion == "none":
+                conversionCodeOutgoing.append("    for (i = 0; i < n_%s; i++) {" % paramName)
+                conversionCodeOutgoing.append("        converted_%s[i] = (%s) %s[i];" % (paramName, paramConvertToType, paramName))
+                conversionCodeOutgoing.append("    }")
+            elif paramValueConversion == "some":
+                # We'll need a conditional variable to keep track of
+                # whether we're converting values or not.
+                if ("    int convert_%s_value = 1;" % paramName) not in variables:
+                    variables.append("    int convert_%s_value = 1;" % paramName)
+                # Write code based on that conditional.
+                conversionCodeOutgoing.append("    if (convert_%s_value) {" % paramName)
+                conversionCodeOutgoing.append("        for (i = 0; i < n_%s; i++) {" % paramName)
+                conversionCodeOutgoing.append("            converted_%s[i] = %s;" % (paramName, ConvertValue("%s[i]" % paramName, paramBaseType, paramConvertToType))) 
+                conversionCodeOutgoing.append("        }")
+                conversionCodeOutgoing.append("    } else {")
+                conversionCodeOutgoing.append("        for (i = 0; i < n_%s; i++) {" % paramName)
+                conversionCodeOutgoing.append("            converted_%s[i] = (%s) %s[i];" % (paramName, paramConvertToType, paramName))
+                conversionCodeOutgoing.append("        }")
+                conversionCodeOutgoing.append("    }")
+            else: # paramValueConversion == "all"
+                conversionCodeOutgoing.append("    for (i = 0; i < n_%s; i++) {" % paramName)
+                conversionCodeOutgoing.append("        converted_%s[i] = %s;" % (paramName, ConvertValue("%s[i]" % paramName, paramBaseType, paramConvertToType)))
+
+                conversionCodeOutgoing.append("    }")
+
+            # If instead we need an incoming conversion (i.e. results
+            # from Mesa have to be converted before handing back
+            # to the application), this is it.  Fortunately, we don't
+            # have to worry about conditional value conversion - the
+            # functions that do (e.g. glGetFixedv()) are handled
+            # specially, outside this code generation.
+            #
+            # Whether we use incoming conversion or outgoing conversion
+            # is determined later - we only ever use one or the other.
+
+            if paramValueConversion == "none":
+                conversionCodeIncoming.append("    for (i = 0; i < n_%s; i++) {" % paramName)
+                conversionCodeIncoming.append("        %s[i] = (%s) converted_%s[i];" % (paramName, paramConvertToType, paramName))
+                conversionCodeIncoming.append("    }")
+            elif paramValueConversion == "some":
+                # We'll need a conditional variable to keep track of
+                # whether we're converting values or not.
+                if ("    int convert_%s_value = 1;" % paramName) not in variables:
+                    variables.append("    int convert_%s_value = 1;" % paramName)
+
+                # Write code based on that conditional.
+                conversionCodeIncoming.append("    if (convert_%s_value) {" % paramName)
+                conversionCodeIncoming.append("        for (i = 0; i < n_%s; i++) {" % paramName)
+                conversionCodeIncoming.append("            %s[i] = %s;" % (paramName, ConvertValue("converted_%s[i]" % paramName, paramConvertToType, paramBaseType))) 
+                conversionCodeIncoming.append("        }")
+                conversionCodeIncoming.append("    } else {")
+                conversionCodeIncoming.append("        for (i = 0; i < n_%s; i++) {" % paramName)
+                conversionCodeIncoming.append("            %s[i] = (%s) converted_%s[i];" % (paramName, paramBaseType, paramName))
+                conversionCodeIncoming.append("        }")
+                conversionCodeIncoming.append("    }")
+            else: # paramValueConversion == "all"
+                conversionCodeIncoming.append("    for (i = 0; i < n_%s; i++) {" % paramName)
+                conversionCodeIncoming.append("        %s[i] = %s;" % (paramName, ConvertValue("converted_%s[i]" % paramName, paramConvertToType, paramBaseType)))
+                conversionCodeIncoming.append("    }")
+
+            # Call strings.  The unusual " ".join() call will join the
+            # array of parameter modifiers with spaces as separators.
+            passthroughDeclarationString += ", %s %s %s" % (paramConvertToType, " ".join(paramTypeModifiers), paramName)
+            passthroughCallString += ", converted_%s" % paramName
+
+        # endif conversion management
+
+        # Parameter checking.  If the parameter has a specific list of
+        # valid values, we have to make sure that the passed-in values
+        # match these, or we make an error.
+        if len(paramValidValues) > 0:
+            # We're about to make a big switch statement with an
+            # error at the end.  By default, the error is GL_INVALID_ENUM,
+            # unless we find a "case" statement in the middle with a
+            # non-GLenum value.
+            errorDefaultCase = "GL_INVALID_ENUM"
+
+            # This parameter has specific valid values.  Make a big
+            # switch statement to handle it.  Note that the original
+            # parameters are always what is checked, not the
+            # converted parameters.
+            switchCode.append("    switch(%s) {" % paramName)
+
+            for valueIndex in range(len(paramValidValues)):
+                (paramValue, dependentVecSize, dependentParamName, dependentValidValues, errorCode, valueConvert) = paramValidValues[valueIndex]
+
+                # We're going to need information on the dependent param
+                # as well.
+                if dependentParamName:
+                    depParamIndex = apiutil.FindParamIndex(params, dependentParamName)
+                    if depParamIndex == None:
+                        sys.stderr.write("%s: can't find dependent param '%s' for function '%s'\n" % (program, dependentParamName, funcName))
+
+                    (depParamName, depParamType, depParamMaxVecSize, depParamConvertToType, depParamValidValues, depParamValueConversion) = params[depParamIndex]
+                else:
+                    (depParamName, depParamType, depParamMaxVecSize, depParamConvertToType, depParamValidValues, depParamValueConversion) = (None, None, None, None, [], None)
+
+                # This is a sneaky trick.  It's valid syntax for a parameter
+                # that is *not* going to be converted to be declared
+                # with a dependent vector size; but in this case, the
+                # dependent vector size is unused and unnecessary.
+                # So check for this and ignore the dependent vector size
+                # if the parameter is not going to be converted.
+                if depParamConvertToType:
+                    usedDependentVecSize = dependentVecSize
+                else:
+                    usedDependentVecSize = None
+
+                # We'll peek ahead at the next parameter, to see whether
+                # we can combine cases
+                if valueIndex + 1 < len(paramValidValues) :
+                    (nextParamValue, nextDependentVecSize, nextDependentParamName, nextDependentValidValues, nextErrorCode, nextValueConvert) = paramValidValues[valueIndex + 1]
+                    if depParamConvertToType:
+                        usedNextDependentVecSize = nextDependentVecSize
+                    else:
+                        usedNextDependentVecSize = None
+
+                # Create a case for this value.  As a mnemonic,
+                # if we have a dependent vector size that we're ignoring,
+                # add it as a comment.
+                if usedDependentVecSize == None and dependentVecSize != None:
+                    switchCode.append("        case %s: /* size %s */" % (paramValue, dependentVecSize))
+                else:
+                    switchCode.append("        case %s:" % paramValue)
+
+                # If this is not a GLenum case, then switch our error
+                # if no value is matched to be GL_INVALID_VALUE instead
+                # of GL_INVALID_ENUM.  (Yes, this does get confused
+                # if there are both values and GLenums in the same
+                # switch statement, which shouldn't happen.)
+                if paramValue[0:3] != "GL_":
+                    errorDefaultCase = "GL_INVALID_VALUE"
+
+                # If all the remaining parameters are identical to the
+                # next set, then we're done - we'll just create the
+                # official code on the next pass through, and the two
+                # cases will share the code.
+                if valueIndex + 1 < len(paramValidValues) and usedDependentVecSize == usedNextDependentVecSize and dependentParamName == nextDependentParamName and dependentValidValues == nextDependentValidValues and errorCode == nextErrorCode and valueConvert == nextValueConvert:
+                    continue
+
+                # Otherwise, we'll have to generate code for this case.
+                # Start off with a check: if there is a dependent parameter,
+                # and a list of valid values for that parameter, we need
+                # to generate an error if something other than one
+                # of those values is passed.
+                if len(dependentValidValues) > 0:
+                    conditional=""
+
+                    # If the parameter being checked is actually an array,
+                    # check only its first element.
+                    if depParamMaxVecSize == 0:
+                        valueToCheck = dependentParamName
+                    else:
+                        valueToCheck = "%s[0]" % dependentParamName
+
+                    for v in dependentValidValues:
+                        conditional += " && %s != %s" % (valueToCheck, v)
+                    switchCode.append("            if (%s) {" % conditional[4:])
+                    if errorCode == None:
+                        errorCode = "GL_INVALID_ENUM"
+                    switchCode.append('                _mesa_error(_mesa_get_current_context(), %s, "gl%s(%s=0x%s)", %s);' % (errorCode, funcName, paramName, "%x", paramName))
+                    switchCode.append("                %s;" % errorReturn)
+                    switchCode.append("            }")
+                # endif there are dependent valid values
+
+                # The dependent parameter may require conditional
+                # value conversion.  If it does, and we don't want
+                # to convert values, we'll have to generate code for that
+                if depParamValueConversion == "some" and valueConvert == "noconvert":
+                    switchCode.append("            convert_%s_value = 0;" % dependentParamName)
+
+                # If there's a dependent vector size for this parameter
+                # that we're actually going to use (i.e. we need conversion),
+                # mark it.
+                if usedDependentVecSize:
+                    switchCode.append("            n_%s = %s;" % (dependentParamName, dependentVecSize))
+
+                # In all cases, break out of the switch if any valid
+                # value is found.
+                switchCode.append("            break;")
+
+
+            # Need a default case to catch all the other, invalid
+            # parameter values.  These will all generate errors.
+            switchCode.append("        default:")
+            if errorCode == None:
+                errorCode = "GL_INVALID_ENUM"
+            formatString = GetFormatString(paramType)
+            if formatString == None:
+                switchCode.append('            _mesa_error(_mesa_get_current_context(), %s, "gl%s(%s)");' % (errorCode, funcName, paramName))
+            else:
+                switchCode.append('            _mesa_error(_mesa_get_current_context(), %s, "gl%s(%s=%s)", %s);' % (errorCode, funcName, paramName, formatString, paramName))
+            switchCode.append("            %s;" % errorReturn)
+
+            # End of our switch code.
+            switchCode.append("    }")
+
+        # endfor every recognized parameter value
+
+    # endfor every param
+
+    # Here, the passthroughDeclarationString and passthroughCallString
+    # are complete; remove the extra ", " at the front of each.
+    passthroughDeclarationString = passthroughDeclarationString[2:]
+    passthroughCallString = passthroughCallString[2:]
+    if not passthroughDeclarationString:
+        passthroughDeclarationString = "void"
+
+    # The Mesa functions are scattered across all the Mesa
+    # header files.  The easiest way to manage declarations
+    # is to create them ourselves.
+    if funcName in allSpecials:
+        print "/* this function is special and is defined elsewhere */"
+    print "extern %s GL_APIENTRY %s(%s);" % (returnType, passthroughFuncName, passthroughDeclarationString)
+
+    # A function may be a core function (i.e. it exists in
+    # the core specification), a core addition (extension
+    # functions added officially to the core), a required
+    # extension (usually an extension for an earlier version
+    # that has been officially adopted), or an optional extension.
+    #
+    # Core functions have a simple category (e.g. "GLES1.1");
+    # we generate only a simple callback for them.
+    #
+    # Core additions have two category listings, one simple
+    # and one compound (e.g.  ["GLES1.1", "GLES1.1:OES_fixed_point"]).  
+    # We generate the core function, and also an extension function.
+    #
+    # Required extensions and implemented optional extensions
+    # have a single compound category "GLES1.1:OES_point_size_array".
+    # For these we generate just the extension function.
+    for categorySpec in apiutil.Categories(funcName):
+        compoundCategory = categorySpec.split(":")
+
+        # This category isn't for us, if the base category doesn't match
+        # our version
+        if compoundCategory[0] != version:
+            continue
+
+        # Otherwise, determine if we're writing code for a core
+        # function (no suffix) or an extension function.
+        if len(compoundCategory) == 1:
+            # This is a core function
+            extensionName = None
+            extensionSuffix = ""
+        else:
+            # This is an extension function.  We'll need to append
+            # the extension suffix.
+            extensionName = compoundCategory[1]
+            extensionSuffix = extensionName.split("_")[0]
+        fullFuncName = funcPrefix + funcName + extensionSuffix
+
+        # Now the generated function.  The text used to mark an API-level
+        # function, oddly, is version-specific.
+        if extensionName:
+            print "/* Extension %s */" % extensionName
+
+        if (not variables and
+            not switchCode and
+            not conversionCodeOutgoing and
+            not conversionCodeIncoming):
+            # pass through directly
+            print "#define %s %s" % (fullFuncName, passthroughFuncName)
+            print
+            continue
+
+        print "static %s GL_APIENTRY %s(%s)" % (returnType, fullFuncName, declarationString)
+        print "{"
+
+        # Start printing our code pieces.  Start with any local
+        # variables we need.  This unusual syntax joins the 
+        # lines in the variables[] array with the "\n" separator.
+        if len(variables) > 0:
+            print "\n".join(variables) + "\n"
+
+        # If there's any sort of parameter checking or variable
+        # array sizing, the switch code will contain it.
+        if len(switchCode) > 0:
+            print "\n".join(switchCode) + "\n"
+
+        # In the case of an outgoing conversion (i.e. parameters must
+        # be converted before calling the underlying Mesa function),
+        # use the appropriate code.
+        if "get" not in props and len(conversionCodeOutgoing) > 0:
+            print "\n".join(conversionCodeOutgoing) + "\n"
+
+        # Call the Mesa function.  Note that there are very few functions
+        # that return a value (i.e. returnType is not "void"), and that
+        # none of them require incoming translation; so we're safe
+        # to generate code that directly returns in those cases,
+        # even though it's not completely independent.
+
+        if returnType == "void":
+            print "    %s(%s);" % (passthroughFuncName, passthroughCallString)
+        else:
+            print "    return %s(%s);" % (passthroughFuncName, passthroughCallString)
+
+        # If the function is one that returns values (i.e. "get" in props),
+        # it might return values of a different type than we need, that
+        # require conversion before passing back to the application.
+        if "get" in props and len(conversionCodeIncoming) > 0:
+            print "\n".join(conversionCodeIncoming)
+
+        # All done.
+        print "}"
+        print
+    # end for each category provided for a function
+
+# end for each function
+
+print """
+struct _glapi_table *
+_mesa_create_exec_table_%s(void)
+{
+   struct _glapi_table *exec;
+   exec = _mesa_alloc_dispatch_table(sizeof *exec);
+   if (exec == NULL)
+      return NULL;
+
+""" % shortname
+
+for func in keys:
+    prefix = "_es_" if func not in allSpecials else "_check_"
+    for spec in apiutil.Categories(func):
+        ext = spec.split(":")
+        # version does not match
+        if ext.pop(0) != version:
+            continue
+        entry = func
+        if ext:
+            suffix = ext[0].split("_")[0]
+            entry += suffix
+        print "    SET_%s(exec, %s%s);" % (entry, prefix, entry)
+print ""
+print "   return exec;"
+print "}"
+
+print """
+#endif /* FEATURE_%s */""" % (shortname.upper())
diff --git a/mesalib/src/mesa/main/extensions.c b/mesalib/src/mesa/main/extensions.c
index 30245d6aa..080fa98df 100644
--- a/mesalib/src/mesa/main/extensions.c
+++ b/mesalib/src/mesa/main/extensions.c
@@ -28,7 +28,6 @@
 #include "imports.h"
 #include "context.h"
 #include "extensions.h"
-#include "simple_list.h"
 #include "mtypes.h"
 
 
@@ -45,35 +44,44 @@ static const struct {
    const char *name;
    int flag_offset;
 } default_extensions[] = {
+   { OFF, "GL_ARB_blend_func_extended",        F(ARB_blend_func_extended) },
    { OFF, "GL_ARB_copy_buffer",                F(ARB_copy_buffer) },
-   { OFF, "GL_ARB_depth_texture",              F(ARB_depth_texture) },
+   { OFF, "GL_ARB_depth_buffer_float",         F(ARB_depth_buffer_float) },
    { OFF, "GL_ARB_depth_clamp",                F(ARB_depth_clamp) },
+   { OFF, "GL_ARB_depth_texture",              F(ARB_depth_texture) },
    { ON,  "GL_ARB_draw_buffers",               F(ARB_draw_buffers) },
    { OFF, "GL_ARB_draw_elements_base_vertex",  F(ARB_draw_elements_base_vertex) },
+   { OFF, "GL_ARB_draw_instanced",             F(ARB_draw_instanced) },
    { OFF, "GL_ARB_fragment_coord_conventions", F(ARB_fragment_coord_conventions) },
    { OFF, "GL_ARB_fragment_program",           F(ARB_fragment_program) },
    { OFF, "GL_ARB_fragment_program_shadow",    F(ARB_fragment_program_shadow) },
    { OFF, "GL_ARB_fragment_shader",            F(ARB_fragment_shader) },
    { OFF, "GL_ARB_framebuffer_object",         F(ARB_framebuffer_object) },
+   { OFF, "GL_ARB_explicit_attrib_location",   F(ARB_explicit_attrib_location) },
+   /* TODO: reenable this when the new GLSL compiler actually supports them */
+   /* { OFF, "GL_ARB_geometry_shader4",           F(ARB_geometry_shader4) }, */
    { OFF, "GL_ARB_half_float_pixel",           F(ARB_half_float_pixel) },
    { OFF, "GL_ARB_half_float_vertex",          F(ARB_half_float_vertex) },
    { OFF, "GL_ARB_imaging",                    F(ARB_imaging) },
+   { OFF, "GL_ARB_instanced_arrays",           F(ARB_instanced_arrays) },
    { OFF, "GL_ARB_map_buffer_range",           F(ARB_map_buffer_range) },
    { ON,  "GL_ARB_multisample",                F(ARB_multisample) },
    { OFF, "GL_ARB_multitexture",               F(ARB_multitexture) },
    { OFF, "GL_ARB_occlusion_query",            F(ARB_occlusion_query) },
+   { OFF, "GL_ARB_occlusion_query2",           F(ARB_occlusion_query2) },
    { OFF, "GL_ARB_pixel_buffer_object",        F(EXT_pixel_buffer_object) },
    { OFF, "GL_ARB_point_parameters",           F(EXT_point_parameters) },
    { OFF, "GL_ARB_point_sprite",               F(ARB_point_sprite) },
    { OFF, "GL_ARB_provoking_vertex",           F(EXT_provoking_vertex) },
+   { OFF, "GL_ARB_sampler_objects",            F(ARB_sampler_objects) },
    { OFF, "GL_ARB_seamless_cube_map",          F(ARB_seamless_cube_map) },
    { OFF, "GL_ARB_shader_objects",             F(ARB_shader_objects) },
    { OFF, "GL_ARB_shading_language_100",       F(ARB_shading_language_100) },
-   { OFF, "GL_ARB_shading_language_120",       F(ARB_shading_language_120) },
    { OFF, "GL_ARB_shadow",                     F(ARB_shadow) },
    { OFF, "GL_ARB_shadow_ambient",             F(ARB_shadow_ambient) },
    { OFF, "GL_ARB_sync",                       F(ARB_sync) },
    { OFF, "GL_ARB_texture_border_clamp",       F(ARB_texture_border_clamp) },
+   { OFF, "GL_ARB_texture_buffer_object",      F(ARB_texture_buffer_object) },
    { ON,  "GL_ARB_texture_compression",        F(ARB_texture_compression) },
    { OFF, "GL_ARB_texture_cube_map",           F(ARB_texture_cube_map) },
    { OFF, "GL_ARB_texture_env_add",            F(EXT_texture_env_add) },
@@ -82,14 +90,21 @@ static const struct {
    { OFF, "GL_ARB_texture_env_dot3",           F(ARB_texture_env_dot3) },
    { OFF, "GL_MESAX_texture_float",            F(ARB_texture_float) },
    { OFF, "GL_ARB_texture_mirrored_repeat",    F(ARB_texture_mirrored_repeat)},
+   { OFF, "GL_ARB_texture_multisample",        F(ARB_texture_multisample) },
    { OFF, "GL_ARB_texture_non_power_of_two",   F(ARB_texture_non_power_of_two)},
    { OFF, "GL_ARB_texture_rectangle",          F(NV_texture_rectangle) },
+   { OFF, "GL_ARB_texture_rg",                 F(ARB_texture_rg) },
+   { OFF, "GL_ARB_texture_rgb10_a2ui",         F(ARB_texture_rgb10_a2ui) },
+   { OFF, "GL_ARB_texture_swizzle",            F(EXT_texture_swizzle) },
    { ON,  "GL_ARB_transpose_matrix",           F(ARB_transpose_matrix) },
+   { OFF, "GL_ARB_transform_feedback2",        F(ARB_transform_feedback2) },
+   { OFF, "GL_ARB_uniform_buffer_object",      F(ARB_uniform_buffer_object) },
    { OFF, "GL_ARB_vertex_array_bgra",          F(EXT_vertex_array_bgra) },
    { OFF, "GL_ARB_vertex_array_object",        F(ARB_vertex_array_object) },
    { ON,  "GL_ARB_vertex_buffer_object",       F(ARB_vertex_buffer_object) },
    { OFF, "GL_ARB_vertex_program",             F(ARB_vertex_program) },
    { OFF, "GL_ARB_vertex_shader",              F(ARB_vertex_shader) },
+   { OFF, "GL_ARB_vertex_type_2_10_10_10_rev", F(ARB_vertex_type_2_10_10_10_rev) },
    { ON,  "GL_ARB_window_pos",                 F(ARB_window_pos) },
    { ON,  "GL_EXT_abgr",                       F(EXT_abgr) },
    { ON,  "GL_EXT_bgra",                       F(EXT_bgra) },
@@ -106,15 +121,18 @@ static const struct {
    { ON,  "GL_EXT_copy_texture",               F(EXT_copy_texture) },
    { OFF, "GL_EXT_depth_bounds_test",          F(EXT_depth_bounds_test) },
    { OFF, "GL_EXT_draw_buffers2",              F(EXT_draw_buffers2) },
+   { OFF, "GL_EXT_draw_instanced",             F(ARB_draw_instanced) },
    { ON,  "GL_EXT_draw_range_elements",        F(EXT_draw_range_elements) },
    { OFF, "GL_EXT_framebuffer_blit",           F(EXT_framebuffer_blit) },
    { OFF, "GL_EXT_framebuffer_multisample",    F(EXT_framebuffer_multisample) },
    { OFF, "GL_EXT_framebuffer_object",         F(EXT_framebuffer_object) },
+   { OFF, "GL_EXT_framebuffer_sRGB",           F(EXT_framebuffer_sRGB) },
    { OFF, "GL_EXT_fog_coord",                  F(EXT_fog_coord) },
    { OFF, "GL_EXT_gpu_program_parameters",     F(EXT_gpu_program_parameters) },
    { OFF, "GL_EXT_histogram",                  F(EXT_histogram) },
    { ON,  "GL_EXT_multi_draw_arrays",          F(EXT_multi_draw_arrays) },
    { OFF, "GL_EXT_packed_depth_stencil",       F(EXT_packed_depth_stencil) },
+   { OFF, "GL_EXT_packed_float",               F(EXT_packed_float) },
    { ON,  "GL_EXT_packed_pixels",              F(EXT_packed_pixels) },
    { OFF, "GL_EXT_paletted_texture",           F(EXT_paletted_texture) },
    { OFF, "GL_EXT_pixel_buffer_object",        F(EXT_pixel_buffer_object) },
@@ -133,19 +151,23 @@ static const struct {
    { ON,  "GL_EXT_texture3D",                  F(EXT_texture3D) },
    { OFF, "GL_EXT_texture_array",              F(EXT_texture_array) },
    { OFF, "GL_EXT_texture_compression_s3tc",   F(EXT_texture_compression_s3tc) },
+   { OFF, "GL_EXT_texture_compression_rgtc",   F(EXT_texture_compression_rgtc) },
    { OFF, "GL_EXT_texture_cube_map",           F(ARB_texture_cube_map) },
    { ON,  "GL_EXT_texture_edge_clamp",         F(SGIS_texture_edge_clamp) },
    { OFF, "GL_EXT_texture_env_add",            F(EXT_texture_env_add) },
    { OFF, "GL_EXT_texture_env_combine",        F(EXT_texture_env_combine) },
    { OFF, "GL_EXT_texture_env_dot3",           F(EXT_texture_env_dot3) },
    { OFF, "GL_EXT_texture_filter_anisotropic", F(EXT_texture_filter_anisotropic) },
+   { OFF, "GL_EXT_texture_integer",            F(EXT_texture_integer) },
    { OFF, "GL_EXT_texture_lod_bias",           F(EXT_texture_lod_bias) },
    { OFF, "GL_EXT_texture_mirror_clamp",       F(EXT_texture_mirror_clamp) },
    { ON,  "GL_EXT_texture_object",             F(EXT_texture_object) },
    { OFF, "GL_EXT_texture_rectangle",          F(NV_texture_rectangle) },
+   { OFF, "GL_EXT_texture_shared_exponent",    F(EXT_texture_shared_exponent) },
    { OFF, "GL_EXT_texture_sRGB",               F(EXT_texture_sRGB) },
    { OFF, "GL_EXT_texture_swizzle",            F(EXT_texture_swizzle) },
    { OFF, "GL_EXT_timer_query",                F(EXT_timer_query) },
+   { OFF, "GL_EXT_transform_feedback",         F(EXT_transform_feedback) },
    { ON,  "GL_EXT_vertex_array",               F(EXT_vertex_array) },
    { OFF, "GL_EXT_vertex_array_bgra",          F(EXT_vertex_array_bgra) },
    { OFF, "GL_EXT_vertex_array_set",           F(EXT_vertex_array_set) },
@@ -179,9 +201,10 @@ static const struct {
    { ON,  "GL_NV_light_max_exponent",          F(NV_light_max_exponent) },
    { OFF, "GL_NV_packed_depth_stencil",        F(EXT_packed_depth_stencil) },
    { OFF, "GL_NV_point_sprite",                F(NV_point_sprite) },
+   { OFF, "GL_NV_primitive_restart",           F(NV_primitive_restart) },
+   { ON,  "GL_NV_texgen_reflection",           F(NV_texgen_reflection) },
    { OFF, "GL_NV_texture_env_combine4",        F(NV_texture_env_combine4) },
    { OFF, "GL_NV_texture_rectangle",           F(NV_texture_rectangle) },
-   { ON,  "GL_NV_texgen_reflection",           F(NV_texgen_reflection) },
    { OFF, "GL_NV_vertex_program",              F(NV_vertex_program) },
    { OFF, "GL_NV_vertex_program1_1",           F(NV_vertex_program1_1) },
    { ON,  "GL_OES_read_format",                F(OES_read_format) },
@@ -194,6 +217,9 @@ static const struct {
    { ON,  "GL_SGIS_texture_lod",               F(SGIS_texture_lod) },
    { ON,  "GL_SUN_multi_draw_arrays",          F(EXT_multi_draw_arrays) },
    { OFF, "GL_S3_s3tc",                        F(S3_s3tc) },
+#if FEATURE_OES_EGL_image
+   { OFF, "GL_OES_EGL_image",                  F(OES_EGL_image) },
+#endif
 #if FEATURE_OES_draw_texture
    { OFF, "GL_OES_draw_texture",               F(OES_draw_texture) },
 #endif /* FEATURE_OES_draw_texture */
@@ -224,6 +250,9 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
 #if FEATURE_ARB_framebuffer_object
    ctx->Extensions.ARB_framebuffer_object = GL_TRUE;
 #endif
+#if FEATURE_ARB_geometry_shader4
+   ctx->Extensions.ARB_geometry_shader4 = GL_TRUE;
+#endif
    ctx->Extensions.ARB_half_float_pixel = GL_TRUE;
    ctx->Extensions.ARB_half_float_vertex = GL_TRUE;
    ctx->Extensions.ARB_imaging = GL_TRUE;
@@ -239,9 +268,6 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
 #if FEATURE_ARB_shading_language_100
    ctx->Extensions.ARB_shading_language_100 = GL_TRUE;
 #endif
-#if FEATURE_ARB_shading_language_120
-   ctx->Extensions.ARB_shading_language_120 = GL_TRUE;
-#endif
    ctx->Extensions.ARB_shadow = GL_TRUE;
    ctx->Extensions.ARB_shadow_ambient = GL_TRUE;
    ctx->Extensions.ARB_texture_border_clamp = GL_TRUE;
@@ -319,6 +345,9 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
    ctx->Extensions.EXT_texture_sRGB = GL_TRUE;
 #endif
    ctx->Extensions.EXT_texture_swizzle = GL_TRUE;
+#if FEATURE_EXT_transform_feedback
+   /*ctx->Extensions.EXT_transform_feedback = GL_TRUE;*/
+#endif
    ctx->Extensions.EXT_vertex_array_bgra = GL_TRUE;
    /*ctx->Extensions.IBM_multimode_draw_arrays = GL_TRUE;*/
    ctx->Extensions.MESA_pack_invert = GL_TRUE;
@@ -480,13 +509,9 @@ _mesa_enable_2_1_extensions(GLcontext *ctx)
 #if FEATURE_EXT_texture_sRGB
    ctx->Extensions.EXT_texture_sRGB = GL_TRUE;
 #endif
-#ifdef FEATURE_ARB_shading_language_120
-   ctx->Extensions.ARB_shading_language_120 = GL_TRUE;
-#endif
 }
 
 
-
 /**
  * Either enable or disable the named extension.
  * \return GL_TRUE for success, GL_FALSE if invalid extension name
@@ -672,8 +697,8 @@ _mesa_init_extensions( GLcontext *ctx )
  * Construct the GL_EXTENSIONS string.  Called the first time that
  * glGetString(GL_EXTENSIONS) is called.
  */
-GLubyte *
-_mesa_make_extension_string( GLcontext *ctx )
+static GLubyte *
+compute_extensions( GLcontext *ctx )
 {
    const char *extraExt = get_extension_override(ctx);
    GLuint extStrLen = 0;
@@ -718,6 +743,206 @@ _mesa_make_extension_string( GLcontext *ctx )
    return (GLubyte *) s;
 }
 
+static size_t
+append_extension(GLubyte **str, const char *ext)
+{
+   GLubyte *s = *str;
+   size_t len = strlen(ext);
+
+   if (s) {
+      memcpy(s, ext, len);
+      s[len++] = ' ';
+      s[len] = '\0';
+
+      *str += len;
+   }
+   else {
+      len++;
+   }
+
+   return len;
+}
+
+
+static size_t
+make_extension_string_es1(const GLcontext *ctx, GLubyte *str)
+{
+   size_t len = 0;
+
+   /* Core additions */
+   len += append_extension(&str, "GL_OES_byte_coordinates");
+   len += append_extension(&str, "GL_OES_fixed_point");
+   len += append_extension(&str, "GL_OES_single_precision");
+   len += append_extension(&str, "GL_OES_matrix_get");
+
+   /* 1.1 required extensions */
+   len += append_extension(&str, "GL_OES_read_format");
+   len += append_extension(&str, "GL_OES_compressed_paletted_texture");
+   len += append_extension(&str, "GL_OES_point_size_array");
+   len += append_extension(&str, "GL_OES_point_sprite");
+
+   /* 1.1 deprecated extensions */
+   len += append_extension(&str, "GL_OES_query_matrix");
+
+#if FEATURE_OES_draw_texture
+   if (ctx->Extensions.OES_draw_texture)
+      len += append_extension(&str, "GL_OES_draw_texture");
+#endif
+
+   if (ctx->Extensions.EXT_blend_equation_separate)
+      len += append_extension(&str, "GL_OES_blend_equation_separate");
+   if (ctx->Extensions.EXT_blend_func_separate)
+      len += append_extension(&str, "GL_OES_blend_func_separate");
+   if (ctx->Extensions.EXT_blend_subtract)
+      len += append_extension(&str, "GL_OES_blend_subtract");
+
+   if (ctx->Extensions.EXT_stencil_wrap)
+      len += append_extension(&str, "GL_OES_stencil_wrap");
+
+   if (ctx->Extensions.ARB_texture_cube_map)
+      len += append_extension(&str, "GL_OES_texture_cube_map");
+   if (ctx->Extensions.ARB_texture_env_crossbar)
+      len += append_extension(&str, "GL_OES_texture_env_crossbar");
+   if (ctx->Extensions.ARB_texture_mirrored_repeat)
+      len += append_extension(&str, "GL_OES_texture_mirrored_repeat");
+
+   if (ctx->Extensions.ARB_framebuffer_object) {
+      len += append_extension(&str, "GL_OES_framebuffer_object");
+      len += append_extension(&str, "GL_OES_depth24");
+      len += append_extension(&str, "GL_OES_depth32");
+      len += append_extension(&str, "GL_OES_fbo_render_mipmap");
+      len += append_extension(&str, "GL_OES_rgb8_rgba8");
+      len += append_extension(&str, "GL_OES_stencil1");
+      len += append_extension(&str, "GL_OES_stencil4");
+      len += append_extension(&str, "GL_OES_stencil8");
+   }
+
+   if (ctx->Extensions.EXT_vertex_array)
+      len += append_extension(&str, "GL_OES_element_index_uint");
+   if (ctx->Extensions.ARB_vertex_buffer_object)
+      len += append_extension(&str, "GL_OES_mapbuffer");
+   if (ctx->Extensions.EXT_texture_filter_anisotropic)
+      len += append_extension(&str, "GL_EXT_texture_filter_anisotropic");
+
+   /* some applications check this for NPOT support */
+   if (ctx->Extensions.ARB_texture_non_power_of_two)
+      len += append_extension(&str, "GL_ARB_texture_non_power_of_two");
+
+   if (ctx->Extensions.EXT_texture_compression_s3tc)
+      len += append_extension(&str, "GL_EXT_texture_compression_dxt1");
+   if (ctx->Extensions.EXT_texture_lod_bias)
+      len += append_extension(&str, "GL_EXT_texture_lod_bias");
+   if (ctx->Extensions.EXT_blend_minmax)
+      len += append_extension(&str, "GL_EXT_blend_minmax");
+   if (ctx->Extensions.EXT_multi_draw_arrays)
+      len += append_extension(&str, "GL_EXT_multi_draw_arrays");
+
+#if FEATURE_OES_EGL_image
+   if (ctx->Extensions.OES_EGL_image)
+      len += append_extension(&str, "GL_OES_EGL_image");
+#endif
+
+   return len;
+}
+
+
+static GLubyte *
+compute_extensions_es1(const GLcontext *ctx)
+{
+   GLubyte *s;
+   unsigned int len;
+   
+   len = make_extension_string_es1(ctx, NULL);
+   s = malloc(len + 1);
+   if (!s)
+      return NULL;
+   make_extension_string_es1(ctx, s);
+   
+   return s;
+}
+
+static size_t
+make_extension_string_es2(const GLcontext *ctx, GLubyte *str)
+{
+   size_t len = 0;
+
+   len += append_extension(&str, "GL_OES_compressed_paletted_texture");
+
+   if (ctx->Extensions.ARB_framebuffer_object) {
+      len += append_extension(&str, "GL_OES_depth24");
+      len += append_extension(&str, "GL_OES_depth32");
+      len += append_extension(&str, "GL_OES_fbo_render_mipmap");
+      len += append_extension(&str, "GL_OES_rgb8_rgba8");
+      len += append_extension(&str, "GL_OES_stencil1");
+      len += append_extension(&str, "GL_OES_stencil4");
+   }
+
+   if (ctx->Extensions.EXT_vertex_array)
+      len += append_extension(&str, "GL_OES_element_index_uint");
+   if (ctx->Extensions.ARB_vertex_buffer_object)
+      len += append_extension(&str, "GL_OES_mapbuffer");
+
+   if (ctx->Extensions.EXT_texture3D)
+      len += append_extension(&str, "GL_OES_texture_3D");
+   if (ctx->Extensions.ARB_texture_non_power_of_two)
+      len += append_extension(&str, "GL_OES_texture_npot");
+   if (ctx->Extensions.EXT_texture_filter_anisotropic)
+      len += append_extension(&str, "GL_EXT_texture_filter_anisotropic");
+
+   len += append_extension(&str, "GL_EXT_texture_type_2_10_10_10_REV");
+   if (ctx->Extensions.ARB_depth_texture)
+      len += append_extension(&str, "GL_OES_depth_texture");
+   if (ctx->Extensions.EXT_packed_depth_stencil)
+      len += append_extension(&str, "GL_OES_packed_depth_stencil");
+   if (ctx->Extensions.ARB_fragment_shader)
+      len += append_extension(&str, "GL_OES_standard_derivatives");
+
+   if (ctx->Extensions.EXT_texture_compression_s3tc)
+      len += append_extension(&str, "GL_EXT_texture_compression_dxt1");
+   if (ctx->Extensions.EXT_blend_minmax)
+      len += append_extension(&str, "GL_EXT_blend_minmax");
+   if (ctx->Extensions.EXT_multi_draw_arrays)
+      len += append_extension(&str, "GL_EXT_multi_draw_arrays");
+
+#if FEATURE_OES_EGL_image
+   if (ctx->Extensions.OES_EGL_image)
+      len += append_extension(&str, "GL_OES_EGL_image");
+#endif
+
+   return len;
+}
+
+static GLubyte *
+compute_extensions_es2(GLcontext *ctx)
+{
+   GLubyte *s;
+   unsigned int len;
+
+   len = make_extension_string_es2(ctx, NULL);
+   s = malloc(len + 1);
+   if (!s)
+      return NULL;
+   make_extension_string_es2(ctx, s);
+   
+   return s;
+}
+
+
+GLubyte *
+_mesa_make_extension_string(GLcontext *ctx)
+{
+   switch (ctx->API) {
+   case API_OPENGL:
+      return compute_extensions(ctx);
+   case API_OPENGLES2:
+      return compute_extensions_es2(ctx);
+   case API_OPENGLES:
+      return compute_extensions_es1(ctx);
+   default:
+      assert(0);
+      return NULL;
+   }
+}
 
 /**
  * Return number of enabled extensions.
@@ -738,7 +963,7 @@ _mesa_get_extension_count(GLcontext *ctx)
 
    if (0)
       _mesa_debug(ctx, "%u of %d extensions enabled\n", ctx->Extensions.Count,
-                  Elements(default_extensions));
+                  (int) Elements(default_extensions));
 
    return ctx->Extensions.Count;
 }
diff --git a/mesalib/src/mesa/main/fbobject.c b/mesalib/src/mesa/main/fbobject.c
index cc20f7479..5201f5025 100644
--- a/mesalib/src/mesa/main/fbobject.c
+++ b/mesalib/src/mesa/main/fbobject.c
@@ -71,6 +71,10 @@
 static struct gl_framebuffer DummyFramebuffer;
 static struct gl_renderbuffer DummyRenderbuffer;
 
+/* We bind this framebuffer when applications pass a NULL
+ * drawable/surface in make current. */
+static struct gl_framebuffer IncompleteFramebuffer;
+
 
 #define IS_CUBE_FACE(TARGET) \
    ((TARGET) >= GL_TEXTURE_CUBE_MAP_POSITIVE_X && \
@@ -93,10 +97,19 @@ delete_dummy_framebuffer(struct gl_framebuffer *fb)
 void
 _mesa_init_fbobjects(GLcontext *ctx)
 {
+   _glthread_INIT_MUTEX(DummyFramebuffer.Mutex);
+   _glthread_INIT_MUTEX(DummyRenderbuffer.Mutex);
+   _glthread_INIT_MUTEX(IncompleteFramebuffer.Mutex);
    DummyFramebuffer.Delete = delete_dummy_framebuffer;
    DummyRenderbuffer.Delete = delete_dummy_renderbuffer;
+   IncompleteFramebuffer.Delete = delete_dummy_framebuffer;
 }
 
+struct gl_framebuffer *
+_mesa_get_incomplete_framebuffer(void)
+{
+   return &IncompleteFramebuffer;
+}
 
 /**
  * Helper routine for getting a gl_renderbuffer.
@@ -147,6 +160,8 @@ invalidate_framebuffer(struct gl_framebuffer *fb)
 /**
  * Given a GL_*_ATTACHMENTn token, return a pointer to the corresponding
  * gl_renderbuffer_attachment object.
+ * This function is only used for user-created FB objects, not the
+ * default / window-system FB object.
  * If \p attachment is GL_DEPTH_STENCIL_ATTACHMENT, return a pointer to
  * the depth buffer attachment point.
  */
@@ -156,6 +171,8 @@ _mesa_get_attachment(GLcontext *ctx, struct gl_framebuffer *fb,
 {
    GLuint i;
 
+   assert(fb->Name > 0);
+
    switch (attachment) {
    case GL_COLOR_ATTACHMENT0_EXT:
    case GL_COLOR_ATTACHMENT1_EXT:
@@ -180,8 +197,50 @@ _mesa_get_attachment(GLcontext *ctx, struct gl_framebuffer *fb,
       return &fb->Attachment[BUFFER_COLOR0 + i];
    case GL_DEPTH_STENCIL_ATTACHMENT:
       /* fall-through */
+   case GL_DEPTH_BUFFER:
+      /* fall-through / new in GL 3.0 */
+   case GL_DEPTH_ATTACHMENT_EXT:
+      return &fb->Attachment[BUFFER_DEPTH];
+   case GL_STENCIL_BUFFER:
+      /* fall-through / new in GL 3.0 */
+   case GL_STENCIL_ATTACHMENT_EXT:
+      return &fb->Attachment[BUFFER_STENCIL];
+   default:
+      return NULL;
+   }
+}
+
+
+/**
+ * As above, but only used for getting attachments of the default /
+ * window-system framebuffer (not user-created framebuffer objects).
+ */
+static struct gl_renderbuffer_attachment *
+_mesa_get_fb0_attachment(GLcontext *ctx, struct gl_framebuffer *fb,
+                         GLenum attachment)
+{
+   assert(fb->Name == 0);
+
+   switch (attachment) {
+   case GL_FRONT_LEFT:
+      return &fb->Attachment[BUFFER_FRONT_LEFT];
+   case GL_FRONT_RIGHT:
+      return &fb->Attachment[BUFFER_FRONT_RIGHT];
+   case GL_BACK_LEFT:
+      return &fb->Attachment[BUFFER_BACK_LEFT];
+   case GL_BACK_RIGHT:
+      return &fb->Attachment[BUFFER_BACK_RIGHT];
+   case GL_AUX0:
+      if (fb->Visual.numAuxBuffers == 1) {
+         return &fb->Attachment[BUFFER_AUX0];
+      }
+      return NULL;
+   case GL_DEPTH_BUFFER:
+      /* fall-through / new in GL 3.0 */
    case GL_DEPTH_ATTACHMENT_EXT:
       return &fb->Attachment[BUFFER_DEPTH];
+   case GL_STENCIL_BUFFER:
+      /* fall-through / new in GL 3.0 */
    case GL_STENCIL_ATTACHMENT_EXT:
       return &fb->Attachment[BUFFER_STENCIL];
    default:
@@ -190,6 +249,7 @@ _mesa_get_attachment(GLcontext *ctx, struct gl_framebuffer *fb,
 }
 
 
+
 /**
  * Remove any texture or renderbuffer attached to the given attachment
  * point.  Update reference counts, etc.
@@ -389,7 +449,9 @@ test_attachment_completeness(const GLcontext *ctx, GLenum format,
 
       if (format == GL_COLOR) {
          if (baseFormat != GL_RGB &&
-             baseFormat != GL_RGBA) {
+             baseFormat != GL_RGBA &&
+	     (!ctx->Extensions.ARB_framebuffer_object ||
+	      baseFormat != GL_ALPHA)) {
             att_incomplete("bad format");
             att->Complete = GL_FALSE;
             return;
@@ -568,7 +630,8 @@ _mesa_test_framebuffer_completeness(GLcontext *ctx, struct gl_framebuffer *fb)
          f = texImg->_BaseFormat;
          numImages++;
          if (f != GL_RGB && f != GL_RGBA && f != GL_DEPTH_COMPONENT
-             && f != GL_DEPTH_STENCIL_EXT) {
+             && f != GL_DEPTH_STENCIL_EXT
+	     && (!ctx->Extensions.ARB_framebuffer_object || f != GL_ALPHA)) {
             fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT;
             fbo_incomplete("texture attachment incomplete", -1);
             return;
@@ -625,30 +688,32 @@ _mesa_test_framebuffer_completeness(GLcontext *ctx, struct gl_framebuffer *fb)
       }
    }
 
-#ifndef FEATURE_OES_framebuffer_object
-   /* Check that all DrawBuffers are present */
-   for (j = 0; j < ctx->Const.MaxDrawBuffers; j++) {
-      if (fb->ColorDrawBuffer[j] != GL_NONE) {
-         const struct gl_renderbuffer_attachment *att
-            = _mesa_get_attachment(ctx, fb, fb->ColorDrawBuffer[j]);
-         assert(att);
-         if (att->Type == GL_NONE) {
-            fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT;
-            fbo_incomplete("missing drawbuffer", j);
-            return;
-         }
+#if FEATURE_GL
+   if (ctx->API == API_OPENGL) {
+      /* Check that all DrawBuffers are present */
+      for (j = 0; j < ctx->Const.MaxDrawBuffers; j++) {
+	 if (fb->ColorDrawBuffer[j] != GL_NONE) {
+	    const struct gl_renderbuffer_attachment *att
+	       = _mesa_get_attachment(ctx, fb, fb->ColorDrawBuffer[j]);
+	    assert(att);
+	    if (att->Type == GL_NONE) {
+	       fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT;
+	       fbo_incomplete("missing drawbuffer", j);
+	       return;
+	    }
+	 }
       }
-   }
 
-   /* Check that the ReadBuffer is present */
-   if (fb->ColorReadBuffer != GL_NONE) {
-      const struct gl_renderbuffer_attachment *att
-         = _mesa_get_attachment(ctx, fb, fb->ColorReadBuffer);
-      assert(att);
-      if (att->Type == GL_NONE) {
-         fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT;
+      /* Check that the ReadBuffer is present */
+      if (fb->ColorReadBuffer != GL_NONE) {
+	 const struct gl_renderbuffer_attachment *att
+	    = _mesa_get_attachment(ctx, fb, fb->ColorReadBuffer);
+	 assert(att);
+	 if (att->Type == GL_NONE) {
+	    fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT;
             fbo_incomplete("missing readbuffer", -1);
-         return;
+	    return;
+	 }
       }
    }
 #else
@@ -866,6 +931,12 @@ GLenum
 _mesa_base_fbo_format(GLcontext *ctx, GLenum internalFormat)
 {
    switch (internalFormat) {
+   case GL_ALPHA:
+   case GL_ALPHA4:
+   case GL_ALPHA8:
+   case GL_ALPHA12:
+   case GL_ALPHA16:
+      return GL_ALPHA;
    case GL_RGB:
    case GL_R3_G3_B2:
    case GL_RGB4:
@@ -883,6 +954,7 @@ _mesa_base_fbo_format(GLcontext *ctx, GLenum internalFormat)
    case GL_RGB10_A2:
    case GL_RGBA12:
    case GL_RGBA16:
+   case GL_RGBA16_SNORM:
       return GL_RGBA;
    case GL_STENCIL_INDEX:
    case GL_STENCIL_INDEX1_EXT:
@@ -962,7 +1034,7 @@ renderbuffer_storage(GLenum target, GLenum internalFormat,
 
    rb = ctx->CurrentRenderbuffer;
    if (!rb) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, func);
+      _mesa_error(ctx, GL_INVALID_OPERATION, "%s", func);
       return;
    }
 
@@ -1008,22 +1080,31 @@ renderbuffer_storage(GLenum target, GLenum internalFormat,
     */
 }
 
+
 #if FEATURE_OES_EGL_image
 void GLAPIENTRY
-_mesa_EGLImageTargetRenderbufferStorageOES (GLenum target, GLeglImageOES image)
+_mesa_EGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image)
 {
    struct gl_renderbuffer *rb;
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
+   if (!ctx->Extensions.OES_EGL_image) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glEGLImageTargetRenderbufferStorageOES(unsupported)");
+      return;
+   }
+
    if (target != GL_RENDERBUFFER) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "EGLImageTargetRenderbufferStorageOES");
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "EGLImageTargetRenderbufferStorageOES");
       return;
    }
 
    rb = ctx->CurrentRenderbuffer;
    if (!rb) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "EGLImageTargetRenderbufferStorageOES");
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "EGLImageTargetRenderbufferStorageOES");
       return;
    }
 
@@ -1033,6 +1114,7 @@ _mesa_EGLImageTargetRenderbufferStorageOES (GLenum target, GLeglImageOES image)
 }
 #endif
 
+
 /**
  * Helper function for _mesa_GetRenderbufferParameterivEXT() and
  * _mesa_GetFramebufferAttachmentParameterivEXT()
@@ -1101,6 +1183,26 @@ _mesa_RenderbufferStorageMultisample(GLenum target, GLsizei samples,
 }
 
 
+/**
+ * OpenGL ES version of glRenderBufferStorage.
+ */
+void GLAPIENTRY
+_es_RenderbufferStorageEXT(GLenum target, GLenum internalFormat,
+			   GLsizei width, GLsizei height)
+{
+   switch (internalFormat) {
+   case GL_RGB565:
+      /* XXX this confuses GL_RENDERBUFFER_INTERNAL_FORMAT_OES */
+      /* choose a closest format */
+      internalFormat = GL_RGB5;
+      break;
+   default:
+      break;
+   }
+
+   renderbuffer_storage(target, internalFormat, width, height, 0);
+}
+
 
 void GLAPIENTRY
 _mesa_GetRenderbufferParameterivEXT(GLenum target, GLenum pname, GLint *params)
@@ -1549,6 +1651,7 @@ framebuffer_texture(GLcontext *ctx, const char *caller, GLenum target,
       texObj = _mesa_lookup_texture(ctx, texture);
       if (texObj != NULL) {
          if (textarget == 0) {
+            /* XXX what's the purpose of this? */
             err = (texObj->Target != GL_TEXTURE_3D) &&
                 (texObj->Target != GL_TEXTURE_1D_ARRAY_EXT) &&
                 (texObj->Target != GL_TEXTURE_2D_ARRAY_EXT);
@@ -1559,6 +1662,13 @@ framebuffer_texture(GLcontext *ctx, const char *caller, GLenum target,
                 : (texObj->Target != textarget);
          }
       }
+      else {
+         /* can't render to a non-existant texture */
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glFramebufferTexture%sEXT(non existant texture)",
+                     caller);
+         return;
+      }
 
       if (err) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
@@ -1830,12 +1940,14 @@ _mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment,
    }
 
    if (buffer->Name == 0) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glGetFramebufferAttachmentParameterivEXT");
-      return;
+      /* the default / window-system FBO */
+      att = _mesa_get_fb0_attachment(ctx, buffer, attachment);
+   }
+   else {
+      /* user-created framebuffer FBO */
+      att = _mesa_get_attachment(ctx, buffer, attachment);
    }
 
-   att = _mesa_get_attachment(ctx, buffer, attachment);
    if (att == NULL) {
       _mesa_error(ctx, GL_INVALID_ENUM,
                   "glGetFramebufferAttachmentParameterivEXT(attachment)");
@@ -2206,3 +2318,25 @@ _mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
                                mask, filter);
 }
 #endif /* FEATURE_EXT_framebuffer_blit */
+
+#if FEATURE_ARB_geometry_shader4
+void GLAPIENTRY
+_mesa_FramebufferTextureARB(GLenum target, GLenum attachment,
+                            GLuint texture, GLint level)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_error(ctx, GL_INVALID_OPERATION,
+               "glFramebufferTextureARB "
+               "not implemented!");
+}
+
+void GLAPIENTRY
+_mesa_FramebufferTextureFaceARB(GLenum target, GLenum attachment,
+                                GLuint texture, GLint level, GLenum face)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_error(ctx, GL_INVALID_OPERATION,
+               "glFramebufferTextureFaceARB "
+               "not implemented!");
+}
+#endif /* FEATURE_ARB_geometry_shader4 */
diff --git a/mesalib/src/mesa/main/fbobject.h b/mesalib/src/mesa/main/fbobject.h
index 28f75dfca..9850ee9aa 100644
--- a/mesalib/src/mesa/main/fbobject.h
+++ b/mesalib/src/mesa/main/fbobject.h
@@ -26,10 +26,14 @@
 #ifndef FBOBJECT_H
 #define FBOBJECT_H
 
+#include "mtypes.h"
 
 extern void
 _mesa_init_fbobjects(GLcontext *ctx);
 
+extern struct gl_framebuffer *
+_mesa_get_incomplete_framebuffer(void);
+
 extern struct gl_renderbuffer *
 _mesa_lookup_renderbuffer(GLcontext *ctx, GLuint id);
 
@@ -89,6 +93,10 @@ _mesa_RenderbufferStorageMultisample(GLenum target, GLsizei samples,
                                      GLsizei width, GLsizei height);
 
 extern void GLAPIENTRY
+_es_RenderbufferStorageEXT(GLenum target, GLenum internalFormat,
+			   GLsizei width, GLsizei height);
+
+extern void GLAPIENTRY
 _mesa_EGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image);
 
 extern void GLAPIENTRY
@@ -145,5 +153,13 @@ _mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
                          GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
                          GLbitfield mask, GLenum filter);
 
+extern void GLAPIENTRY
+_mesa_FramebufferTextureARB(GLenum target, GLenum attachment,
+                            GLuint texture, GLint level);
+
+extern void GLAPIENTRY
+_mesa_FramebufferTextureFaceARB(GLenum target, GLenum attachment,
+                                GLuint texture, GLint level, GLenum face);
+
 
 #endif /* FBOBJECT_H */
diff --git a/mesalib/src/mesa/main/feedback.h b/mesalib/src/mesa/main/feedback.h
index 3e8283ed2..c6354b97b 100644
--- a/mesalib/src/mesa/main/feedback.h
+++ b/mesalib/src/mesa/main/feedback.h
@@ -32,11 +32,6 @@
 
 #if FEATURE_feedback
 
-#define _MESA_INIT_FEEDBACK_FUNCTIONS(driver, impl) \
-   do {                                             \
-      (driver)->RenderMode = impl ## RenderMode;    \
-   } while (0)
-
 extern void
 _mesa_feedback_vertex( GLcontext *ctx,
                        const GLfloat win[4],
@@ -63,7 +58,7 @@ _mesa_init_feedback_dispatch(struct _glapi_table *disp);
 
 #else /* FEATURE_feedback */
 
-#define _MESA_INIT_FEEDBACK_FUNCTIONS(driver, impl) do { } while (0)
+#include "main/compiler.h"
 
 static INLINE void
 _mesa_feedback_vertex( GLcontext *ctx,
diff --git a/mesalib/src/mesa/main/ffvertex_prog.c b/mesalib/src/mesa/main/ffvertex_prog.c
index ba94a3877..92fec09ba 100644
--- a/mesalib/src/mesa/main/ffvertex_prog.c
+++ b/mesalib/src/mesa/main/ffvertex_prog.c
@@ -38,12 +38,12 @@
 #include "main/macros.h"
 #include "main/enums.h"
 #include "main/ffvertex_prog.h"
-#include "shader/program.h"
-#include "shader/prog_cache.h"
-#include "shader/prog_instruction.h"
-#include "shader/prog_parameter.h"
-#include "shader/prog_print.h"
-#include "shader/prog_statevars.h"
+#include "program/program.h"
+#include "program/prog_cache.h"
+#include "program/prog_instruction.h"
+#include "program/prog_parameter.h"
+#include "program/prog_print.h"
+#include "program/prog_statevars.h"
 
 
 /** Max of number of lights and texture coord units */
@@ -75,6 +75,7 @@ struct state_key {
       unsigned light_attenuated:1;
       unsigned texunit_really_enabled:1;
       unsigned texmat_enabled:1;
+      unsigned coord_replace:1;
       unsigned texgen_enabled:4;
       unsigned texgen_mode0:4;
       unsigned texgen_mode1:4;
@@ -225,6 +226,10 @@ static void make_state_key( GLcontext *ctx, struct state_key *key )
       if (texUnit->_ReallyEnabled)
 	 key->unit[i].texunit_really_enabled = 1;
 
+      if (ctx->Point.PointSprite)
+	 if (ctx->Point.CoordReplace[i])
+	    key->unit[i].coord_replace = 1;
+
       if (ctx->Texture._TexMatEnabled & ENABLE_TEXMAT(i))
 	 key->unit[i].texmat_enabled = 1;
 
@@ -1385,6 +1390,9 @@ static void build_texture_transform( struct tnl_program *p )
       if (!(p->state->fragprog_inputs_read & FRAG_BIT_TEX(i)))
 	 continue;
 
+      if (p->state->unit[i].coord_replace)
+  	 continue;
+
       if (p->state->unit[i].texgen_enabled ||
 	  p->state->unit[i].texmat_enabled) {
 
diff --git a/mesalib/src/mesa/main/fog.c b/mesalib/src/mesa/main/fog.c
index 269ff3f8b..9f26c012d 100644
--- a/mesalib/src/mesa/main/fog.c
+++ b/mesalib/src/mesa/main/fog.c
@@ -27,6 +27,7 @@
 #include "colormac.h"
 #include "context.h"
 #include "fog.h"
+#include "macros.h"
 #include "mtypes.h"
 
 
diff --git a/mesalib/src/mesa/main/formats.c b/mesalib/src/mesa/main/formats.c
index d0c9c0028..9db9f1c56 100644
--- a/mesalib/src/mesa/main/formats.c
+++ b/mesalib/src/mesa/main/formats.c
@@ -26,7 +26,7 @@
 
 #include "imports.h"
 #include "formats.h"
-#include "config.h"
+#include "mfeatures.h"
 
 
 /**
@@ -48,7 +48,7 @@ struct gl_format_info
 
    /**
     * Logical data type: one of  GL_UNSIGNED_NORMALIZED, GL_SIGNED_NORMALED,
-    * GL_UNSIGNED_INT, GL_SIGNED_INT, GL_FLOAT.
+    * GL_UNSIGNED_INT, GL_INT, GL_FLOAT.
     */
    GLenum DataType;
 
@@ -628,6 +628,66 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       0, 16, 0, 0, 0,
       1, 1, 2
    },
+
+   /* unnormalized signed int formats */
+   {
+      MESA_FORMAT_RGBA_INT8,
+      "MESA_FORMAT_RGBA_INT8",
+      GL_RGBA,
+      GL_INT,
+      8, 8, 8, 8,
+      0, 0, 0, 0, 0,
+      1, 1, 4
+   },
+   {
+      MESA_FORMAT_RGBA_INT16,
+      "MESA_FORMAT_RGBA_INT16",
+      GL_RGBA,
+      GL_INT,
+      16, 16, 16, 16,
+      0, 0, 0, 0, 0,
+      1, 1, 8
+   },
+   {
+      MESA_FORMAT_RGBA_INT32,
+      "MESA_FORMAT_RGBA_INT32",
+      GL_RGBA,
+      GL_INT,
+      32, 32, 32, 32,
+      0, 0, 0, 0, 0,
+      1, 1, 16
+   },
+
+   /* unnormalized unsigned int formats */
+   {
+      MESA_FORMAT_RGBA_UINT8,
+      "MESA_FORMAT_RGBA_UINT8",
+      GL_RGBA,
+      GL_UNSIGNED_INT,
+      8, 8, 8, 8,
+      0, 0, 0, 0, 0,
+      1, 1, 4
+   },
+   {
+      MESA_FORMAT_RGBA_UINT16,
+      "MESA_FORMAT_RGBA_UINT16",
+      GL_RGBA,
+      GL_UNSIGNED_INT,
+      16, 16, 16, 16,
+      0, 0, 0, 0, 0,
+      1, 1, 8
+   },
+   {
+      MESA_FORMAT_RGBA_UINT32,
+      "MESA_FORMAT_RGBA_UINT32",
+      GL_RGBA,
+      GL_UNSIGNED_INT,
+      32, 32, 32, 32,
+      0, 0, 0, 0, 0,
+      1, 1, 16
+   },
+
+
    {
       MESA_FORMAT_DUDV8,
       "MESA_FORMAT_DUDV8",
@@ -637,6 +697,35 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       0, 0, 0, 0, 0,
       1, 1, 2
    },
+
+   /* Signed 8 bits / channel */
+   {
+      MESA_FORMAT_SIGNED_R8,        /* Name */
+      "MESA_FORMAT_SIGNED_R8",      /* StrName */
+      GL_RGBA,                      /* BaseFormat */
+      GL_SIGNED_NORMALIZED,         /* DataType */
+      8, 0, 0, 0,                   /* Red/Green/Blue/AlphaBits */
+      0, 0, 0, 0, 0,                /* Lum/Int/Index/Depth/StencilBits */
+      1, 1, 1                       /* BlockWidth/Height,Bytes */
+   },
+   {
+      MESA_FORMAT_SIGNED_RG88,
+      "MESA_FORMAT_SIGNED_RG88",
+      GL_RGBA,
+      GL_SIGNED_NORMALIZED,
+      8, 8, 0, 0,
+      0, 0, 0, 0, 0,
+      1, 1, 2
+   },
+   {
+      MESA_FORMAT_SIGNED_RGBX8888,
+      "MESA_FORMAT_SIGNED_RGBX8888",
+      GL_RGBA,
+      GL_SIGNED_NORMALIZED,
+      8, 8, 8, 0,
+      0, 0, 0, 0, 0,
+      1, 1, 4                       /* 4 bpp, but no alpha */
+   },
    {
       MESA_FORMAT_SIGNED_RGBA8888,
       "MESA_FORMAT_SIGNED_RGBA8888",
@@ -655,6 +744,35 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       0, 0, 0, 0, 0,
       1, 1, 4
    },
+
+   /* Signed 16 bits / channel */
+   {
+      MESA_FORMAT_SIGNED_R_16,
+      "MESA_FORMAT_SIGNED_R_16",
+      GL_RGBA,
+      GL_SIGNED_NORMALIZED,
+      16, 0, 0, 0,
+      0, 0, 0, 0, 0,
+      1, 1, 2
+   },
+   {
+      MESA_FORMAT_SIGNED_RG_16,
+      "MESA_FORMAT_SIGNED_RG_16",
+      GL_RGBA,
+      GL_SIGNED_NORMALIZED,
+      16, 16, 0, 0,
+      0, 0, 0, 0, 0,
+      1, 1, 4
+   },
+   {
+      MESA_FORMAT_SIGNED_RGB_16,
+      "MESA_FORMAT_SIGNED_RGB_16",
+      GL_RGBA,
+      GL_SIGNED_NORMALIZED,
+      16, 16, 16, 0,
+      0, 0, 0, 0, 0,
+      1, 1, 6
+   },
    {
       MESA_FORMAT_SIGNED_RGBA_16,
       "MESA_FORMAT_SIGNED_RGBA_16",
@@ -663,6 +781,15 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       16, 16, 16, 16,
       0, 0, 0, 0, 0,
       1, 1, 8
+   },
+   {
+      MESA_FORMAT_RGBA_16,
+      "MESA_FORMAT_RGBA_16",
+      GL_RGBA,
+      GL_UNSIGNED_NORMALIZED,
+      16, 16, 16, 16,
+      0, 0, 0, 0, 0,
+      1, 1, 8
    }
 };
 
@@ -814,6 +941,18 @@ _mesa_is_format_compressed(gl_format format)
 
 
 /**
+ * Determine if the given format represents a packed depth/stencil buffer.
+ */
+GLboolean
+_mesa_is_format_packed_depth_stencil(gl_format format)
+{
+   const struct gl_format_info *info = _mesa_get_format_info(format);
+
+   return info->BaseFormat == GL_DEPTH_STENCIL;
+}
+
+
+/**
  * Return color encoding for given format.
  * \return GL_LINEAR or GL_SRGB
  */
@@ -1067,6 +1206,19 @@ _mesa_format_to_type_and_comps(gl_format format,
       *datatype = GL_BYTE;
       *comps = 4;
       return;
+
+   case MESA_FORMAT_SIGNED_R_16:
+      *datatype = GL_SHORT;
+      *comps = 1;
+      return;
+   case MESA_FORMAT_SIGNED_RG_16:
+      *datatype = GL_SHORT;
+      *comps = 2;
+      return;
+   case MESA_FORMAT_SIGNED_RGB_16:
+      *datatype = GL_SHORT;
+      *comps = 3;
+      return;
    case MESA_FORMAT_SIGNED_RGBA_16:
       *datatype = GL_SHORT;
       *comps = 4;
@@ -1150,6 +1302,36 @@ _mesa_format_to_type_and_comps(gl_format format,
       *comps = 1;
       return;
 
+   case MESA_FORMAT_RGBA_INT8:
+      *datatype = GL_BYTE;
+      *comps = 4;
+      return;
+   case MESA_FORMAT_RGBA_INT16:
+      *datatype = GL_SHORT;
+      *comps = 4;
+      return;
+   case MESA_FORMAT_RGBA_INT32:
+      *datatype = GL_INT;
+      *comps = 4;
+      return;
+
+   /**
+    * \name Non-normalized unsigned integer formats.
+    */
+   case MESA_FORMAT_RGBA_UINT8:
+      *datatype = GL_UNSIGNED_BYTE;
+      *comps = 4;
+      return;
+   case MESA_FORMAT_RGBA_UINT16:
+      *datatype = GL_UNSIGNED_SHORT;
+      *comps = 4;
+      return;
+   case MESA_FORMAT_RGBA_UINT32:
+      *datatype = GL_UNSIGNED_INT;
+      *comps = 4;
+      return;
+
+
    default:
       _mesa_problem(NULL, "bad format in _mesa_format_to_type_and_comps");
       *datatype = 0;
diff --git a/mesalib/src/mesa/main/formats.h b/mesalib/src/mesa/main/formats.h
index 0eeeb8b2b..e9467f486 100644
--- a/mesalib/src/mesa/main/formats.h
+++ b/mesalib/src/mesa/main/formats.h
@@ -33,7 +33,7 @@
 #define FORMATS_H
 
 
-#include "main/mtypes.h"
+#include <GL/gl.h>
 
 
 
@@ -131,13 +131,38 @@ typedef enum
    /*@}*/
 
    /**
+    * \name Non-normalized signed integer formats.
+    * XXX Note: these are just stand-ins for some better hardware
+    * formats TBD such as BGRA or ARGB.
+    */
+   MESA_FORMAT_RGBA_INT8,
+   MESA_FORMAT_RGBA_INT16,
+   MESA_FORMAT_RGBA_INT32,
+
+   /**
+    * \name Non-normalized unsigned integer formats.
+    */
+   MESA_FORMAT_RGBA_UINT8,
+   MESA_FORMAT_RGBA_UINT16,
+   MESA_FORMAT_RGBA_UINT32,
+
+                                  /* msb <------ TEXEL BITS -----------> lsb */
+                                  /* ---- ---- ---- ---- ---- ---- ---- ---- */
+   /**
     * \name Signed fixed point texture formats.
     */
    /*@{*/
-   MESA_FORMAT_DUDV8,
-   MESA_FORMAT_SIGNED_RGBA8888,
-   MESA_FORMAT_SIGNED_RGBA8888_REV,
-   MESA_FORMAT_SIGNED_RGBA_16,
+   MESA_FORMAT_DUDV8,             /*                     DUDU DUDU DVDV DVDV */
+   MESA_FORMAT_SIGNED_R8,         /*                               RRRR RRRR */
+   MESA_FORMAT_SIGNED_RG88,       /*                     RRRR RRRR GGGG GGGG */
+   MESA_FORMAT_SIGNED_RGBX8888,   /* RRRR RRRR GGGG GGGG BBBB BBBB xxxx xxxx */
+   MESA_FORMAT_SIGNED_RGBA8888,   /* RRRR RRRR GGGG GGGG BBBB BBBB AAAA AAAA */
+   MESA_FORMAT_SIGNED_RGBA8888_REV,/*AAAA AAAA BBBB BBBB GGGG GGGG RRRR RRRR */
+   MESA_FORMAT_SIGNED_R_16,       /* ushort[0]=R */
+   MESA_FORMAT_SIGNED_RG_16,      /* ushort[0]=R, ushort[1]=G */
+   MESA_FORMAT_SIGNED_RGB_16,     /* ushort[0]=R, ushort[1]=G, ushort[2]=B */
+   MESA_FORMAT_SIGNED_RGBA_16,    /* ... */
+   MESA_FORMAT_RGBA_16,           /* ... */
    /*@}*/
 
    MESA_FORMAT_COUNT
@@ -165,6 +190,9 @@ _mesa_get_format_block_size(gl_format format, GLuint *bw, GLuint *bh);
 extern GLboolean
 _mesa_is_format_compressed(gl_format format);
 
+extern GLboolean
+_mesa_is_format_packed_depth_stencil(gl_format format);
+
 extern GLenum
 _mesa_get_format_color_encoding(gl_format format);
 
diff --git a/mesalib/src/mesa/main/framebuffer.c b/mesalib/src/mesa/main/framebuffer.c
index 6a85162d5..a98c09cfb 100644
--- a/mesalib/src/mesa/main/framebuffer.c
+++ b/mesalib/src/mesa/main/framebuffer.c
@@ -35,6 +35,7 @@
 #include "buffers.h"
 #include "context.h"
 #include "depthstencil.h"
+#include "enums.h"
 #include "formats.h"
 #include "macros.h"
 #include "mtypes.h"
@@ -74,7 +75,6 @@ compute_depth_max(struct gl_framebuffer *fb)
    fb->_MRD = (GLfloat)1.0 / fb->_DepthMaxF;
 }
 
-
 /**
  * Create and initialize a gl_framebuffer object.
  * This is intended for creating _window_system_ framebuffers, not generic
@@ -543,7 +543,8 @@ _mesa_update_framebuffer_visual(struct gl_framebuffer *fb)
          const GLenum baseFormat = _mesa_get_format_base_format(rb->Format);
          const gl_format fmt = rb->Format;
          
-         if (baseFormat == GL_RGBA || baseFormat == GL_RGB) {
+         if (baseFormat == GL_RGBA || baseFormat == GL_RGB ||
+	     baseFormat == GL_ALPHA) {
             fb->Visual.redBits = _mesa_get_format_bits(fmt, GL_RED_BITS);
             fb->Visual.greenBits = _mesa_get_format_bits(fmt, GL_GREEN_BITS);
             fb->Visual.blueBits = _mesa_get_format_bits(fmt, GL_BLUE_BITS);
@@ -610,7 +611,7 @@ _mesa_update_depth_buffer(GLcontext *ctx,
 
    depthRb = fb->Attachment[attIndex].Renderbuffer;
 
-   if (depthRb && depthRb->_BaseFormat == GL_DEPTH_STENCIL) {
+   if (depthRb && _mesa_is_format_packed_depth_stencil(depthRb->Format)) {
       /* The attached depth buffer is a GL_DEPTH_STENCIL renderbuffer */
       if (!fb->_DepthBuffer
           || fb->_DepthBuffer->Wrapped != depthRb
@@ -651,7 +652,7 @@ _mesa_update_stencil_buffer(GLcontext *ctx,
 
    stencilRb = fb->Attachment[attIndex].Renderbuffer;
 
-   if (stencilRb && stencilRb->_BaseFormat == GL_DEPTH_STENCIL) {
+   if (stencilRb && _mesa_is_format_packed_depth_stencil(stencilRb->Format)) {
       /* The attached stencil buffer is a GL_DEPTH_STENCIL renderbuffer */
       if (!fb->_StencilBuffer
           || fb->_StencilBuffer->Wrapped != stencilRb
@@ -877,6 +878,7 @@ _mesa_source_buffer_exists(GLcontext *ctx, GLenum format)
          return GL_FALSE;
       }
       ASSERT(_mesa_get_format_bits(ctx->ReadBuffer->_ColorReadBuffer->Format, GL_RED_BITS) > 0 ||
+             _mesa_get_format_bits(ctx->ReadBuffer->_ColorReadBuffer->Format, GL_ALPHA_BITS) > 0 ||
              _mesa_get_format_bits(ctx->ReadBuffer->_ColorReadBuffer->Format, GL_INDEX_BITS) > 0);
       break;
    case GL_DEPTH:
@@ -986,6 +988,10 @@ _mesa_dest_buffer_exists(GLcontext *ctx, GLenum format)
    return GL_TRUE;
 }
 
+
+/**
+ * Used to answer the GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES query.
+ */
 GLenum
 _mesa_get_color_read_format(GLcontext *ctx)
 {
@@ -999,6 +1005,10 @@ _mesa_get_color_read_format(GLcontext *ctx)
    }
 }
 
+
+/**
+ * Used to answer the GL_IMPLEMENTATION_COLOR_READ_TYPE_OES query.
+ */
 GLenum
 _mesa_get_color_read_type(GLcontext *ctx)
 {
@@ -1011,3 +1021,43 @@ _mesa_get_color_read_type(GLcontext *ctx)
       return GL_UNSIGNED_BYTE;
    }
 }
+
+
+/**
+ * Print framebuffer info to stderr, for debugging.
+ */
+void
+_mesa_print_framebuffer(const struct gl_framebuffer *fb)
+{
+   GLuint i;
+
+   fprintf(stderr, "Mesa Framebuffer %u at %p\n", fb->Name, (void *) fb);
+   fprintf(stderr, "  Size: %u x %u  Status: %s\n", fb->Width, fb->Height,
+           _mesa_lookup_enum_by_nr(fb->_Status));
+   fprintf(stderr, "  Attachments:\n");
+
+   for (i = 0; i < BUFFER_COUNT; i++) {
+      const struct gl_renderbuffer_attachment *att = &fb->Attachment[i];
+      if (att->Type == GL_TEXTURE) {
+         const struct gl_texture_image *texImage;
+         fprintf(stderr,
+                 "  %2d: Texture %u, level %u, face %u, slice %u, complete %d\n",
+                 i, att->Texture->Name, att->TextureLevel, att->CubeMapFace,
+                 att->Zoffset, att->Complete);
+         texImage = att->Texture->Image[att->CubeMapFace][att->TextureLevel];
+         fprintf(stderr, "       Size: %u x %u x %u  Format %s\n",
+                 texImage->Width, texImage->Height, texImage->Depth,
+                 _mesa_get_format_name(texImage->TexFormat));
+      }
+      else if (att->Type == GL_RENDERBUFFER) {
+         fprintf(stderr, "  %2d: Renderbuffer %u, complete %d\n",
+                 i, att->Renderbuffer->Name, att->Complete);
+         fprintf(stderr, "       Size: %u x %u  Format %s\n",
+                 att->Renderbuffer->Width, att->Renderbuffer->Height,
+                 _mesa_get_format_name(att->Renderbuffer->Format));
+      }
+      else {
+         fprintf(stderr, "  %2d: none\n", i);
+      }
+   }
+}
diff --git a/mesalib/src/mesa/main/framebuffer.h b/mesalib/src/mesa/main/framebuffer.h
index 960513812..2e9844282 100644
--- a/mesalib/src/mesa/main/framebuffer.h
+++ b/mesalib/src/mesa/main/framebuffer.h
@@ -26,6 +26,7 @@
 #ifndef FRAMEBUFFER_H
 #define FRAMEBUFFER_H
 
+#include "mtypes.h"
 
 extern struct gl_framebuffer *
 _mesa_create_framebuffer(const GLvisual *visual);
@@ -91,4 +92,7 @@ _mesa_get_color_read_type(GLcontext *ctx);
 extern GLenum
 _mesa_get_color_read_format(GLcontext *ctx);
 
+extern void
+_mesa_print_framebuffer(const struct gl_framebuffer *fb);
+
 #endif /* FRAMEBUFFER_H */
diff --git a/mesalib/src/mesa/main/get.c b/mesalib/src/mesa/main/get.c
index edc440091..2062134a3 100644
--- a/mesalib/src/mesa/main/get.c
+++ b/mesalib/src/mesa/main/get.c
@@ -1,11 +1,31 @@
-
-/***
- ***  NOTE!!!  DO NOT EDIT THIS FILE!!!  IT IS GENERATED BY get_gen.py
- ***/
+/*
+ * Copyright (C) 2010  Brian Paul   All Rights Reserved.
+ * Copyright (C) 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 shall be included
+ * in all copies or substantial portions of the 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.
+ *
+ * Author: Kristian Høgsberg <krh@bitplanet.net>
+ */
 
 #include "glheader.h"
 #include "context.h"
 #include "enable.h"
+#include "enums.h"
 #include "extensions.h"
 #include "get.h"
 #include "macros.h"
@@ -14,10 +34,43 @@
 #include "texcompress.h"
 #include "framebuffer.h"
 
+/* This is a table driven implemetation of the glGet*v() functions.
+ * The basic idea is that most getters just look up an int somewhere
+ * in GLcontext and then convert it to a bool or float according to
+ * which of glGetIntegerv() glGetBooleanv() etc is being called.
+ * Instead of generating code to do this, we can just record the enum
+ * value and the offset into GLcontext in an array of structs.  Then
+ * in glGet*(), we lookup the struct for the enum in question, and use
+ * the offset to get the int we need.
+ *
+ * Sometimes we need to look up a float, a boolean, a bit in a
+ * bitfield, a matrix or other types instead, so we need to track the
+ * type of the value in GLcontext.  And sometimes the value isn't in
+ * GLcontext but in the drawbuffer, the array object, current texture
+ * unit, or maybe it's a computed value.  So we need to also track
+ * where or how to find the value.  Finally, we sometimes need to
+ * check that one of a number of extensions are enabled, the GL
+ * version or flush or call _mesa_update_state().  This is done by
+ * attaching optional extra information to the value description
+ * struct, it's sort of like an array of opcodes that describe extra
+ * checks or actions.
+ *
+ * Putting all this together we end up with struct value_desc below,
+ * and with a couple of macros to help, the table of struct value_desc
+ * is about as concise as the specification in the old python script.
+ */
+
+#undef CONST
 
 #define FLOAT_TO_BOOLEAN(X)   ( (X) ? GL_TRUE : GL_FALSE )
+#define FLOAT_TO_FIXED(F)     ( ((F) * 65536.0f > INT_MAX) ? INT_MAX : \
+                                ((F) * 65536.0f < INT_MIN) ? INT_MIN : \
+                                (GLint) ((F) * 65536.0f) )
 
 #define INT_TO_BOOLEAN(I)     ( (I) ? GL_TRUE : GL_FALSE )
+#define INT_TO_FIXED(I)       ( ((I) > SHRT_MAX) ? INT_MAX : \
+                                ((I) < SHRT_MIN) ? INT_MIN : \
+                                (GLint) ((I) * 65536) )
 
 #define INT64_TO_BOOLEAN(I)   ( (I) ? GL_TRUE : GL_FALSE )
 #define INT64_TO_INT(I)       ( (GLint)((I > INT_MAX) ? INT_MAX : ((I < INT_MIN) ? INT_MIN : (I))) )
@@ -25,7617 +78,2285 @@
 #define BOOLEAN_TO_INT(B)     ( (GLint) (B) )
 #define BOOLEAN_TO_INT64(B)   ( (GLint64) (B) )
 #define BOOLEAN_TO_FLOAT(B)   ( (B) ? 1.0F : 0.0F )
+#define BOOLEAN_TO_FIXED(B)   ( (GLint) ((B) ? 1 : 0) << 16 )
 
 #define ENUM_TO_INT64(E)      ( (GLint64) (E) )
+#define ENUM_TO_FIXED(E)      (E)
 
+enum value_type {
+   TYPE_INVALID,
+   TYPE_API_MASK,
+   TYPE_INT,
+   TYPE_INT_2,
+   TYPE_INT_3,
+   TYPE_INT_4,
+   TYPE_INT_N,
+   TYPE_INT64,
+   TYPE_ENUM,
+   TYPE_ENUM_2,
+   TYPE_BOOLEAN,
+   TYPE_BIT_0,
+   TYPE_BIT_1,
+   TYPE_BIT_2,
+   TYPE_BIT_3,
+   TYPE_BIT_4,
+   TYPE_BIT_5,
+   TYPE_FLOAT,
+   TYPE_FLOAT_2,
+   TYPE_FLOAT_3,
+   TYPE_FLOAT_4,
+   TYPE_FLOATN,
+   TYPE_FLOATN_2,
+   TYPE_FLOATN_3,
+   TYPE_FLOATN_4,
+   TYPE_DOUBLEN,
+   TYPE_MATRIX,
+   TYPE_MATRIX_T,
+   TYPE_CONST
+};
 
-/*
- * Check if named extension is enabled, if not generate error and return.
- */
-#define CHECK_EXT1(EXT1, FUNC)                                         \
-   if (!ctx->Extensions.EXT1) {                                        \
-      _mesa_error(ctx, GL_INVALID_ENUM, FUNC "(0x%x)", (int) pname);  \
-      return;                                                          \
+enum value_location {
+   LOC_BUFFER,
+   LOC_CONTEXT,
+   LOC_ARRAY,
+   LOC_TEXUNIT,
+   LOC_CUSTOM
+};
+
+enum value_extra {
+   EXTRA_END = 0x8000,
+   EXTRA_VERSION_30,
+   EXTRA_VERSION_31,
+   EXTRA_VERSION_32,
+   EXTRA_VERSION_ES2,
+   EXTRA_NEW_BUFFERS, 
+   EXTRA_VALID_DRAW_BUFFER,
+   EXTRA_VALID_TEXTURE_UNIT,
+   EXTRA_FLUSH_CURRENT,
+};
+
+#define NO_EXTRA NULL
+#define NO_OFFSET 0
+
+struct value_desc {
+   GLenum pname;
+   GLubyte location;  /**< enum value_location */
+   GLubyte type;      /**< enum value_type */
+   int offset;
+   const int *extra;
+};
+
+union value {
+   GLfloat value_float;
+   GLfloat value_float_4[4];
+   GLmatrix *value_matrix;
+   GLint value_int;
+   GLint value_int_4[4];
+   GLint64 value_int64;
+   GLenum value_enum;
+
+   /* Sigh, see GL_COMPRESSED_TEXTURE_FORMATS_ARB handling */
+   struct {
+      GLint n, ints[100];
+   } value_int_n;
+   GLboolean value_bool;
+};
+
+#define BUFFER_FIELD(field, type) \
+   LOC_BUFFER, type, offsetof(struct gl_framebuffer, field)
+#define CONTEXT_FIELD(field, type) \
+   LOC_CONTEXT, type, offsetof(GLcontext, field)
+#define ARRAY_FIELD(field, type) \
+   LOC_ARRAY, type, offsetof(struct gl_array_object, field)
+#define CONST(value) \
+   LOC_CONTEXT, TYPE_CONST, value
+
+#define BUFFER_INT(field) BUFFER_FIELD(field, TYPE_INT)
+#define BUFFER_ENUM(field) BUFFER_FIELD(field, TYPE_ENUM)
+
+#define CONTEXT_INT(field) CONTEXT_FIELD(field, TYPE_INT)
+#define CONTEXT_INT2(field) CONTEXT_FIELD(field, TYPE_INT_2)
+#define CONTEXT_INT64(field) CONTEXT_FIELD(field, TYPE_INT64)
+#define CONTEXT_ENUM(field) CONTEXT_FIELD(field, TYPE_ENUM)
+#define CONTEXT_ENUM2(field) CONTEXT_FIELD(field, TYPE_ENUM_2)
+#define CONTEXT_BOOL(field) CONTEXT_FIELD(field, TYPE_BOOLEAN)
+#define CONTEXT_BIT0(field) CONTEXT_FIELD(field, TYPE_BIT_0)
+#define CONTEXT_BIT1(field) CONTEXT_FIELD(field, TYPE_BIT_1)
+#define CONTEXT_BIT2(field) CONTEXT_FIELD(field, TYPE_BIT_2)
+#define CONTEXT_BIT3(field) CONTEXT_FIELD(field, TYPE_BIT_3)
+#define CONTEXT_BIT4(field) CONTEXT_FIELD(field, TYPE_BIT_4)
+#define CONTEXT_BIT5(field) CONTEXT_FIELD(field, TYPE_BIT_5)
+#define CONTEXT_FLOAT(field) CONTEXT_FIELD(field, TYPE_FLOAT)
+#define CONTEXT_FLOAT2(field) CONTEXT_FIELD(field, TYPE_FLOAT_2)
+#define CONTEXT_FLOAT3(field) CONTEXT_FIELD(field, TYPE_FLOAT_3)
+#define CONTEXT_FLOAT4(field) CONTEXT_FIELD(field, TYPE_FLOAT_4)
+#define CONTEXT_MATRIX(field) CONTEXT_FIELD(field, TYPE_MATRIX)
+#define CONTEXT_MATRIX_T(field) CONTEXT_FIELD(field, TYPE_MATRIX_T)
+
+#define ARRAY_INT(field) ARRAY_FIELD(field, TYPE_INT)
+#define ARRAY_ENUM(field) ARRAY_FIELD(field, TYPE_ENUM)
+#define ARRAY_BOOL(field) ARRAY_FIELD(field, TYPE_BOOLEAN)
+
+#define EXT(f)					\
+   offsetof(struct gl_extensions, f)
+
+#define EXTRA_EXT(e)				\
+   static const int extra_##e[] = {		\
+      EXT(e), EXTRA_END				\
    }
 
-/*
- * Check if either of two extensions is enabled.
+#define EXTRA_EXT2(e1, e2)			\
+   static const int extra_##e1##_##e2[] = {	\
+      EXT(e1), EXT(e2), EXTRA_END		\
+   }
+
+/* The 'extra' mechanism is a way to specify extra checks (such as
+ * extensions or specific gl versions) or actions (flush current, new
+ * buffers) that we need to do before looking up an enum.  We need to
+ * declare them all up front so we can refer to them in the value_desc
+ * structs below. */
+
+static const int extra_new_buffers[] = {
+   EXTRA_NEW_BUFFERS,
+   EXTRA_END
+};
+
+static const int extra_valid_draw_buffer[] = {
+   EXTRA_VALID_DRAW_BUFFER,
+   EXTRA_END
+};
+
+static const int extra_valid_texture_unit[] = {
+   EXTRA_VALID_TEXTURE_UNIT,
+   EXTRA_END
+};
+
+static const int extra_flush_current_valid_texture_unit[] = {
+   EXTRA_FLUSH_CURRENT,
+   EXTRA_VALID_TEXTURE_UNIT,
+   EXTRA_END
+};
+
+static const int extra_flush_current[] = {
+   EXTRA_FLUSH_CURRENT,
+   EXTRA_END
+};
+
+static const int extra_new_buffers_OES_read_format[] = {
+   EXTRA_NEW_BUFFERS,
+   EXT(OES_read_format),
+   EXTRA_END
+};
+
+static const int extra_EXT_secondary_color_flush_current[] = {
+   EXT(EXT_secondary_color),
+   EXTRA_FLUSH_CURRENT,
+   EXTRA_END
+};
+
+static const int extra_EXT_fog_coord_flush_current[] = {
+   EXT(EXT_fog_coord),
+   EXTRA_FLUSH_CURRENT,
+   EXTRA_END
+};
+
+EXTRA_EXT(ARB_multitexture);
+EXTRA_EXT(ARB_texture_cube_map);
+EXTRA_EXT(MESA_texture_array);
+EXTRA_EXT2(EXT_secondary_color, ARB_vertex_program);
+EXTRA_EXT(EXT_secondary_color);
+EXTRA_EXT(EXT_fog_coord);
+EXTRA_EXT(EXT_texture_lod_bias);
+EXTRA_EXT(EXT_texture_filter_anisotropic);
+EXTRA_EXT(IBM_rasterpos_clip);
+EXTRA_EXT(NV_point_sprite);
+EXTRA_EXT(SGIS_generate_mipmap);
+EXTRA_EXT(NV_vertex_program);
+EXTRA_EXT(NV_fragment_program);
+EXTRA_EXT(NV_texture_rectangle);
+EXTRA_EXT(EXT_stencil_two_side);
+EXTRA_EXT(NV_light_max_exponent);
+EXTRA_EXT(EXT_convolution);
+EXTRA_EXT(EXT_histogram);
+EXTRA_EXT(SGI_color_table);
+EXTRA_EXT(SGI_texture_color_table);
+EXTRA_EXT(EXT_depth_bounds_test);
+EXTRA_EXT(ARB_depth_clamp);
+EXTRA_EXT(ATI_fragment_shader);
+EXTRA_EXT(EXT_framebuffer_blit);
+EXTRA_EXT(ARB_shader_objects);
+EXTRA_EXT(EXT_provoking_vertex);
+EXTRA_EXT(ARB_fragment_shader);
+EXTRA_EXT(ARB_fragment_program);
+EXTRA_EXT(ARB_framebuffer_object);
+EXTRA_EXT(EXT_framebuffer_object);
+EXTRA_EXT(APPLE_vertex_array_object);
+EXTRA_EXT(ARB_seamless_cube_map);
+EXTRA_EXT(EXT_compiled_vertex_array);
+EXTRA_EXT(ARB_sync);
+EXTRA_EXT(ARB_vertex_shader);
+EXTRA_EXT(EXT_transform_feedback);
+EXTRA_EXT(ARB_transform_feedback2);
+EXTRA_EXT(EXT_pixel_buffer_object);
+EXTRA_EXT(ARB_vertex_program);
+EXTRA_EXT2(NV_point_sprite, ARB_point_sprite);
+EXTRA_EXT2(ARB_fragment_program, NV_fragment_program);
+EXTRA_EXT2(ARB_vertex_program, NV_vertex_program);
+EXTRA_EXT2(ARB_vertex_program, ARB_fragment_program);
+EXTRA_EXT(ARB_vertex_buffer_object);
+EXTRA_EXT(ARB_geometry_shader4);
+
+static const int
+extra_ARB_vertex_program_ARB_fragment_program_NV_vertex_program[] = {
+   EXT(ARB_vertex_program),
+   EXT(ARB_fragment_program),
+   EXT(NV_vertex_program),
+   EXTRA_END
+};
+
+static const int
+extra_NV_vertex_program_ARB_vertex_program_ARB_fragment_program_NV_vertex_program[] = {
+   EXT(NV_vertex_program),
+   EXT(ARB_vertex_program),
+   EXT(ARB_fragment_program),
+   EXT(NV_vertex_program),
+   EXTRA_END
+};
+
+static const int extra_version_30[] = { EXTRA_VERSION_30, EXTRA_END };
+static const int extra_version_31[] = { EXTRA_VERSION_31, EXTRA_END };
+static const int extra_version_32[] = { EXTRA_VERSION_32, EXTRA_END };
+
+static const int
+extra_ARB_vertex_program_version_es2[] = {
+   EXT(ARB_vertex_program),
+   EXTRA_VERSION_ES2,
+   EXTRA_END
+};
+
+#define API_OPENGL_BIT (1 << API_OPENGL)
+#define API_OPENGLES_BIT (1 << API_OPENGLES)
+#define API_OPENGLES2_BIT (1 << API_OPENGLES2)
+
+/* This is the big table describing all the enums we accept in
+ * glGet*v().  The table is partitioned into six parts: enums
+ * understood by all GL APIs (OpenGL, GLES and GLES2), enums shared
+ * between OpenGL and GLES, enums exclusive to GLES, etc for the
+ * remaining combinations.  When we add the enums to the hash table in
+ * _mesa_init_get_hash(), we only add the enums for the API we're
+ * instantiating and the different sections are guarded by #if
+ * FEATURE_GL etc to make sure we only compile in the enums we may
+ * need. */
+
+static const struct value_desc values[] = {
+   /* Enums shared between OpenGL, GLES1 and GLES2 */
+   { 0, 0, TYPE_API_MASK,
+     API_OPENGL_BIT | API_OPENGLES_BIT | API_OPENGLES2_BIT, NO_EXTRA},
+   { GL_ALPHA_BITS, BUFFER_INT(Visual.alphaBits), extra_new_buffers },
+   { GL_BLEND, CONTEXT_BIT0(Color.BlendEnabled), NO_EXTRA },
+   { GL_BLEND_SRC, CONTEXT_ENUM(Color.BlendSrcRGB), NO_EXTRA },
+   { GL_BLUE_BITS, BUFFER_INT(Visual.blueBits), extra_new_buffers },
+   { GL_COLOR_CLEAR_VALUE, CONTEXT_FIELD(Color.ClearColor[0], TYPE_FLOATN_4), NO_EXTRA },
+   { GL_COLOR_WRITEMASK, LOC_CUSTOM, TYPE_INT_4, 0, NO_EXTRA },
+   { GL_CULL_FACE, CONTEXT_BOOL(Polygon.CullFlag), NO_EXTRA },
+   { GL_CULL_FACE_MODE, CONTEXT_ENUM(Polygon.CullFaceMode), NO_EXTRA },
+   { GL_DEPTH_BITS, BUFFER_INT(Visual.depthBits), NO_EXTRA },
+   { GL_DEPTH_CLEAR_VALUE, CONTEXT_FIELD(Depth.Clear, TYPE_DOUBLEN), NO_EXTRA },
+   { GL_DEPTH_FUNC, CONTEXT_ENUM(Depth.Func), NO_EXTRA },
+   { GL_DEPTH_RANGE, CONTEXT_FIELD(Viewport.Near, TYPE_FLOATN_2), NO_EXTRA },
+   { GL_DEPTH_TEST, CONTEXT_BOOL(Depth.Test), NO_EXTRA },
+   { GL_DEPTH_WRITEMASK, CONTEXT_BOOL(Depth.Mask), NO_EXTRA },
+   { GL_DITHER, CONTEXT_BOOL(Color.DitherFlag), NO_EXTRA },
+   { GL_FRONT_FACE, CONTEXT_ENUM(Polygon.FrontFace), NO_EXTRA },
+   { GL_GREEN_BITS, BUFFER_INT(Visual.greenBits), extra_new_buffers },
+   { GL_LINE_WIDTH, CONTEXT_FLOAT(Line.Width), NO_EXTRA },
+   { GL_ALIASED_LINE_WIDTH_RANGE, CONTEXT_FLOAT2(Const.MinLineWidth), NO_EXTRA },
+   { GL_MAX_ELEMENTS_VERTICES, CONTEXT_INT(Const.MaxArrayLockSize), NO_EXTRA },
+   { GL_MAX_ELEMENTS_INDICES, CONTEXT_INT(Const.MaxArrayLockSize), NO_EXTRA },
+   { GL_MAX_TEXTURE_SIZE, LOC_CUSTOM, TYPE_INT,
+     offsetof(GLcontext, Const.MaxTextureLevels), NO_EXTRA },
+   { GL_MAX_VIEWPORT_DIMS, CONTEXT_INT2(Const.MaxViewportWidth), NO_EXTRA },
+   { GL_PACK_ALIGNMENT, CONTEXT_INT(Pack.Alignment), NO_EXTRA },
+   { GL_ALIASED_POINT_SIZE_RANGE, CONTEXT_FLOAT2(Const.MinPointSize), NO_EXTRA },
+   { GL_POLYGON_OFFSET_FACTOR, CONTEXT_FLOAT(Polygon.OffsetFactor ), NO_EXTRA },
+   { GL_POLYGON_OFFSET_UNITS, CONTEXT_FLOAT(Polygon.OffsetUnits ), NO_EXTRA },
+   { GL_POLYGON_OFFSET_FILL, CONTEXT_BOOL(Polygon.OffsetFill), NO_EXTRA },
+   { GL_RED_BITS, BUFFER_INT(Visual.redBits), extra_new_buffers },
+   { GL_SCISSOR_BOX, LOC_CUSTOM, TYPE_INT_4, 0, NO_EXTRA },
+   { GL_SCISSOR_TEST, CONTEXT_BOOL(Scissor.Enabled), NO_EXTRA },
+   { GL_STENCIL_BITS, BUFFER_INT(Visual.stencilBits), NO_EXTRA },
+   { GL_STENCIL_CLEAR_VALUE, CONTEXT_INT(Stencil.Clear), NO_EXTRA },
+   { GL_STENCIL_FAIL, LOC_CUSTOM, TYPE_ENUM, NO_OFFSET, NO_EXTRA },
+   { GL_STENCIL_FUNC, LOC_CUSTOM, TYPE_ENUM, NO_OFFSET, NO_EXTRA },
+   { GL_STENCIL_PASS_DEPTH_FAIL, LOC_CUSTOM, TYPE_ENUM, NO_OFFSET, NO_EXTRA },
+   { GL_STENCIL_PASS_DEPTH_PASS, LOC_CUSTOM, TYPE_ENUM, NO_OFFSET, NO_EXTRA },
+   { GL_STENCIL_REF, LOC_CUSTOM, TYPE_INT, NO_OFFSET, NO_EXTRA },
+   { GL_STENCIL_TEST, CONTEXT_BOOL(Stencil.Enabled), NO_EXTRA },
+   { GL_STENCIL_VALUE_MASK, LOC_CUSTOM, TYPE_INT, NO_OFFSET, NO_EXTRA },
+   { GL_STENCIL_WRITEMASK, LOC_CUSTOM, TYPE_INT, NO_OFFSET, NO_EXTRA },
+   { GL_SUBPIXEL_BITS, CONTEXT_INT(Const.SubPixelBits), NO_EXTRA },
+   { GL_TEXTURE_BINDING_2D, LOC_CUSTOM, TYPE_INT, TEXTURE_2D_INDEX, NO_EXTRA },
+   { GL_UNPACK_ALIGNMENT, CONTEXT_INT(Unpack.Alignment), NO_EXTRA },
+   { GL_VIEWPORT, LOC_CUSTOM, TYPE_INT_4, 0, NO_EXTRA },
+
+   /* GL_ARB_multitexture */
+   { GL_ACTIVE_TEXTURE_ARB,
+     LOC_CUSTOM, TYPE_INT, 0, extra_ARB_multitexture },
+
+   /* Note that all the OES_* extensions require that the Mesa "struct
+    * gl_extensions" include a member with the name of the extension.
+    * That structure does not yet include OES extensions (and we're
+    * not sure whether it will).  If it does, all the OES_*
+    * extensions below should mark the dependency. */
+
+   /* GL_ARB_texture_cube_map */
+   { GL_TEXTURE_BINDING_CUBE_MAP_ARB, LOC_CUSTOM, TYPE_INT,
+     TEXTURE_CUBE_INDEX, extra_ARB_texture_cube_map },
+   { GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB, LOC_CUSTOM, TYPE_INT,
+     offsetof(GLcontext, Const.MaxCubeTextureLevels),
+     extra_ARB_texture_cube_map }, /* XXX: OES_texture_cube_map */
+
+   /* XXX: OES_blend_subtract */
+   { GL_BLEND_SRC_RGB_EXT, CONTEXT_ENUM(Color.BlendSrcRGB), NO_EXTRA },
+   { GL_BLEND_DST_RGB_EXT, CONTEXT_ENUM(Color.BlendDstRGB), NO_EXTRA },
+   { GL_BLEND_SRC_ALPHA_EXT, CONTEXT_ENUM(Color.BlendSrcA), NO_EXTRA },
+   { GL_BLEND_DST_ALPHA_EXT, CONTEXT_ENUM(Color.BlendDstA), NO_EXTRA },
+
+   /* GL_BLEND_EQUATION_RGB, which is what we're really after, is
+    * defined identically to GL_BLEND_EQUATION. */
+   { GL_BLEND_EQUATION, CONTEXT_ENUM(Color.BlendEquationRGB), NO_EXTRA },
+   { GL_BLEND_EQUATION_ALPHA_EXT, CONTEXT_ENUM(Color.BlendEquationA), NO_EXTRA },
+
+   /* GL_ARB_texture_compression */
+   { GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB, LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA },
+   { GL_COMPRESSED_TEXTURE_FORMATS_ARB, LOC_CUSTOM, TYPE_INT_N, 0, NO_EXTRA },
+
+   /* GL_ARB_multisample */
+   { GL_SAMPLE_ALPHA_TO_COVERAGE_ARB,
+     CONTEXT_BOOL(Multisample.SampleAlphaToCoverage), NO_EXTRA },
+   { GL_SAMPLE_COVERAGE_ARB, CONTEXT_BOOL(Multisample.SampleCoverage), NO_EXTRA },
+   { GL_SAMPLE_COVERAGE_VALUE_ARB,
+     CONTEXT_FLOAT(Multisample.SampleCoverageValue), NO_EXTRA },
+   { GL_SAMPLE_COVERAGE_INVERT_ARB,
+     CONTEXT_BOOL(Multisample.SampleCoverageInvert), NO_EXTRA },
+   { GL_SAMPLE_BUFFERS_ARB, BUFFER_INT(Visual.sampleBuffers), NO_EXTRA },
+   { GL_SAMPLES_ARB, BUFFER_INT(Visual.samples), NO_EXTRA },
+
+   /* GL_SGIS_generate_mipmap */
+   { GL_GENERATE_MIPMAP_HINT_SGIS, CONTEXT_ENUM(Hint.GenerateMipmap),
+     extra_SGIS_generate_mipmap },
+
+   /* GL_ARB_vertex_buffer_object */
+   { GL_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA },
+
+   /* GL_ARB_vertex_buffer_object */
+   /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB - not supported */
+   { GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT, 0,
+     extra_ARB_vertex_buffer_object },
+
+   /* GL_OES_read_format */
+   { GL_IMPLEMENTATION_COLOR_READ_TYPE_OES, LOC_CUSTOM, TYPE_INT, 0,
+     extra_new_buffers_OES_read_format },
+   { GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES, LOC_CUSTOM, TYPE_INT, 0,
+     extra_new_buffers_OES_read_format },
+
+   /* GL_EXT_framebuffer_object */
+   { GL_FRAMEBUFFER_BINDING_EXT, BUFFER_INT(Name),
+     extra_EXT_framebuffer_object },
+   { GL_RENDERBUFFER_BINDING_EXT, LOC_CUSTOM, TYPE_INT, 0,
+     extra_EXT_framebuffer_object },
+   { GL_MAX_RENDERBUFFER_SIZE_EXT, CONTEXT_INT(Const.MaxRenderbufferSize),
+     extra_EXT_framebuffer_object },
+
+   /* This entry isn't spec'ed for GLES 2, but is needed for Mesa's
+    * GLSL: */
+   { GL_MAX_CLIP_PLANES, CONTEXT_INT(Const.MaxClipPlanes), NO_EXTRA },
+
+#if FEATURE_GL || FEATURE_ES1
+   /* Enums in OpenGL and GLES1 */
+   { 0, 0, TYPE_API_MASK, API_OPENGL_BIT | API_OPENGLES_BIT, NO_EXTRA },
+   { GL_LIGHT0, CONTEXT_BOOL(Light.Light[0].Enabled), NO_EXTRA },
+   { GL_LIGHT1, CONTEXT_BOOL(Light.Light[1].Enabled), NO_EXTRA },
+   { GL_LIGHT2, CONTEXT_BOOL(Light.Light[2].Enabled), NO_EXTRA },
+   { GL_LIGHT3, CONTEXT_BOOL(Light.Light[3].Enabled), NO_EXTRA },
+   { GL_LIGHT4, CONTEXT_BOOL(Light.Light[4].Enabled), NO_EXTRA },
+   { GL_LIGHT5, CONTEXT_BOOL(Light.Light[5].Enabled), NO_EXTRA },
+   { GL_LIGHT6, CONTEXT_BOOL(Light.Light[6].Enabled), NO_EXTRA },
+   { GL_LIGHT7, CONTEXT_BOOL(Light.Light[7].Enabled), NO_EXTRA },
+   { GL_LIGHTING, CONTEXT_BOOL(Light.Enabled), NO_EXTRA },
+   { GL_LIGHT_MODEL_AMBIENT,
+     CONTEXT_FIELD(Light.Model.Ambient[0], TYPE_FLOATN_4), NO_EXTRA },
+   { GL_LIGHT_MODEL_TWO_SIDE, CONTEXT_BOOL(Light.Model.TwoSide), NO_EXTRA },
+   { GL_ALPHA_TEST, CONTEXT_BOOL(Color.AlphaEnabled), NO_EXTRA },
+   { GL_ALPHA_TEST_FUNC, CONTEXT_ENUM(Color.AlphaFunc), NO_EXTRA },
+   { GL_ALPHA_TEST_REF, CONTEXT_FIELD(Color.AlphaRef, TYPE_FLOATN), NO_EXTRA },
+   { GL_BLEND_DST, CONTEXT_ENUM(Color.BlendDstRGB), NO_EXTRA },
+   { GL_CLIP_PLANE0, CONTEXT_BIT0(Transform.ClipPlanesEnabled), NO_EXTRA },
+   { GL_CLIP_PLANE1, CONTEXT_BIT1(Transform.ClipPlanesEnabled), NO_EXTRA },
+   { GL_CLIP_PLANE2, CONTEXT_BIT2(Transform.ClipPlanesEnabled), NO_EXTRA },
+   { GL_CLIP_PLANE3, CONTEXT_BIT3(Transform.ClipPlanesEnabled), NO_EXTRA },
+   { GL_CLIP_PLANE4, CONTEXT_BIT4(Transform.ClipPlanesEnabled), NO_EXTRA },
+   { GL_CLIP_PLANE5, CONTEXT_BIT5(Transform.ClipPlanesEnabled), NO_EXTRA },
+   { GL_COLOR_MATERIAL, CONTEXT_BOOL(Light.ColorMaterialEnabled), NO_EXTRA },
+   { GL_CURRENT_COLOR,
+     CONTEXT_FIELD(Current.Attrib[VERT_ATTRIB_COLOR0][0], TYPE_FLOATN_4),
+     extra_flush_current },
+   { GL_CURRENT_NORMAL,
+     CONTEXT_FIELD(Current.Attrib[VERT_ATTRIB_NORMAL][0], TYPE_FLOATN_3),
+     extra_flush_current },
+   { GL_CURRENT_TEXTURE_COORDS, LOC_CUSTOM, TYPE_FLOAT_4, 0,
+     extra_flush_current_valid_texture_unit },
+   { GL_DISTANCE_ATTENUATION_EXT, CONTEXT_FLOAT3(Point.Params[0]), NO_EXTRA },
+   { GL_FOG, CONTEXT_BOOL(Fog.Enabled), NO_EXTRA },
+   { GL_FOG_COLOR, CONTEXT_FIELD(Fog.Color[0], TYPE_FLOATN_4), NO_EXTRA },
+   { GL_FOG_DENSITY, CONTEXT_FLOAT(Fog.Density), NO_EXTRA },
+   { GL_FOG_END, CONTEXT_FLOAT(Fog.End), NO_EXTRA },
+   { GL_FOG_HINT, CONTEXT_ENUM(Hint.Fog), NO_EXTRA },
+   { GL_FOG_MODE, CONTEXT_ENUM(Fog.Mode), NO_EXTRA },
+   { GL_FOG_START, CONTEXT_FLOAT(Fog.Start), NO_EXTRA },
+   { GL_LINE_SMOOTH, CONTEXT_BOOL(Line.SmoothFlag), NO_EXTRA },
+   { GL_LINE_SMOOTH_HINT, CONTEXT_ENUM(Hint.LineSmooth), NO_EXTRA },
+   { GL_LINE_WIDTH_RANGE, CONTEXT_FLOAT2(Const.MinLineWidthAA), NO_EXTRA },
+   { GL_COLOR_LOGIC_OP, CONTEXT_BOOL(Color.ColorLogicOpEnabled), NO_EXTRA },
+   { GL_LOGIC_OP_MODE, CONTEXT_ENUM(Color.LogicOp), NO_EXTRA },
+   { GL_MATRIX_MODE, CONTEXT_ENUM(Transform.MatrixMode), NO_EXTRA },
+   { GL_MAX_MODELVIEW_STACK_DEPTH, CONST(MAX_MODELVIEW_STACK_DEPTH), NO_EXTRA },
+   { GL_MAX_PROJECTION_STACK_DEPTH, CONST(MAX_PROJECTION_STACK_DEPTH), NO_EXTRA },
+   { GL_MAX_TEXTURE_STACK_DEPTH, CONST(MAX_TEXTURE_STACK_DEPTH), NO_EXTRA },
+   { GL_MODELVIEW_MATRIX, CONTEXT_MATRIX(ModelviewMatrixStack.Top), NO_EXTRA },
+   { GL_MODELVIEW_STACK_DEPTH, LOC_CUSTOM, TYPE_INT,
+     offsetof(GLcontext, ModelviewMatrixStack.Depth), NO_EXTRA },
+   { GL_NORMALIZE, CONTEXT_BOOL(Transform.Normalize), NO_EXTRA },
+   { GL_PACK_SKIP_IMAGES_EXT, CONTEXT_INT(Pack.SkipImages), NO_EXTRA },
+   { GL_PERSPECTIVE_CORRECTION_HINT, CONTEXT_ENUM(Hint.PerspectiveCorrection), NO_EXTRA },
+   { GL_POINT_SIZE, CONTEXT_FLOAT(Point.Size), NO_EXTRA },
+   { GL_POINT_SIZE_RANGE, CONTEXT_FLOAT2(Const.MinPointSizeAA), NO_EXTRA },
+   { GL_POINT_SMOOTH, CONTEXT_BOOL(Point.SmoothFlag), NO_EXTRA },
+   { GL_POINT_SMOOTH_HINT, CONTEXT_ENUM(Hint.PointSmooth), NO_EXTRA },
+   { GL_POINT_SIZE_MIN_EXT, CONTEXT_FLOAT(Point.MinSize), NO_EXTRA },
+   { GL_POINT_SIZE_MAX_EXT, CONTEXT_FLOAT(Point.MaxSize), NO_EXTRA },
+   { GL_POINT_FADE_THRESHOLD_SIZE_EXT, CONTEXT_FLOAT(Point.Threshold), NO_EXTRA },
+   { GL_PROJECTION_MATRIX, CONTEXT_MATRIX(ProjectionMatrixStack.Top), NO_EXTRA },
+   { GL_PROJECTION_STACK_DEPTH, LOC_CUSTOM, TYPE_INT,
+     offsetof(GLcontext, ProjectionMatrixStack.Depth), NO_EXTRA },
+   { GL_RESCALE_NORMAL, CONTEXT_BOOL(Transform.RescaleNormals), NO_EXTRA },
+   { GL_SHADE_MODEL, CONTEXT_ENUM(Light.ShadeModel), NO_EXTRA },
+   { GL_TEXTURE_2D, LOC_CUSTOM, TYPE_BOOLEAN, 0, NO_EXTRA },
+   { GL_TEXTURE_MATRIX, LOC_CUSTOM, TYPE_MATRIX, 0, extra_valid_texture_unit },
+   { GL_TEXTURE_STACK_DEPTH, LOC_CUSTOM, TYPE_INT, 0,
+     extra_valid_texture_unit  },
+
+   { GL_VERTEX_ARRAY, ARRAY_BOOL(Vertex.Enabled), NO_EXTRA },
+   { GL_VERTEX_ARRAY_SIZE, ARRAY_INT(Vertex.Size), NO_EXTRA },
+   { GL_VERTEX_ARRAY_TYPE, ARRAY_ENUM(Vertex.Type), NO_EXTRA },
+   { GL_VERTEX_ARRAY_STRIDE, ARRAY_INT(Vertex.Stride), NO_EXTRA },
+   { GL_NORMAL_ARRAY, ARRAY_ENUM(Normal.Enabled), NO_EXTRA },
+   { GL_NORMAL_ARRAY_TYPE, ARRAY_ENUM(Normal.Type), NO_EXTRA },
+   { GL_NORMAL_ARRAY_STRIDE, ARRAY_INT(Normal.Stride), NO_EXTRA },
+   { GL_COLOR_ARRAY, ARRAY_BOOL(Color.Enabled), NO_EXTRA },
+   { GL_COLOR_ARRAY_SIZE, ARRAY_INT(Color.Size), NO_EXTRA },
+   { GL_COLOR_ARRAY_TYPE, ARRAY_ENUM(Color.Type), NO_EXTRA },
+   { GL_COLOR_ARRAY_STRIDE, ARRAY_INT(Color.Stride), NO_EXTRA },
+   { GL_TEXTURE_COORD_ARRAY,
+     LOC_CUSTOM, TYPE_BOOLEAN, offsetof(struct gl_client_array, Enabled), NO_EXTRA },
+   { GL_TEXTURE_COORD_ARRAY_SIZE,
+     LOC_CUSTOM, TYPE_BOOLEAN, offsetof(struct gl_client_array, Size), NO_EXTRA },
+   { GL_TEXTURE_COORD_ARRAY_TYPE,
+     LOC_CUSTOM, TYPE_BOOLEAN, offsetof(struct gl_client_array, Type), NO_EXTRA },
+   { GL_TEXTURE_COORD_ARRAY_STRIDE,
+     LOC_CUSTOM, TYPE_BOOLEAN, offsetof(struct gl_client_array, Stride), NO_EXTRA },
+
+   /* GL_ARB_multitexture */
+   { GL_MAX_TEXTURE_UNITS_ARB,
+     CONTEXT_INT(Const.MaxTextureUnits), extra_ARB_multitexture },
+   { GL_CLIENT_ACTIVE_TEXTURE_ARB,
+     LOC_CUSTOM, TYPE_INT, 0, extra_ARB_multitexture },
+
+   /* GL_ARB_texture_cube_map */
+   { GL_TEXTURE_CUBE_MAP_ARB, LOC_CUSTOM, TYPE_BOOLEAN, 0, NO_EXTRA },
+   /* S, T, and R are always set at the same time */
+   { GL_TEXTURE_GEN_STR_OES, LOC_TEXUNIT, TYPE_BIT_0,
+     offsetof(struct gl_texture_unit, TexGenEnabled), NO_EXTRA },
+
+   /* GL_ARB_multisample */
+   { GL_MULTISAMPLE_ARB, CONTEXT_BOOL(Multisample.Enabled), NO_EXTRA },
+   { GL_SAMPLE_ALPHA_TO_ONE_ARB, CONTEXT_BOOL(Multisample.SampleAlphaToOne), NO_EXTRA },
+
+   /* GL_ARB_vertex_buffer_object */
+   { GL_VERTEX_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT,
+     offsetof(struct gl_array_object, Vertex.BufferObj), NO_EXTRA },
+   { GL_NORMAL_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT,
+     offsetof(struct gl_array_object, Normal.BufferObj), NO_EXTRA },
+   { GL_COLOR_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT,
+     offsetof(struct gl_array_object, Color.BufferObj), NO_EXTRA },
+   { GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT, NO_OFFSET, NO_EXTRA },
+
+   /* GL_OES_point_sprite */
+   { GL_POINT_SPRITE_NV,
+     CONTEXT_BOOL(Point.PointSprite),
+     extra_NV_point_sprite_ARB_point_sprite },
+
+   /* GL_ARB_fragment_shader */
+   { GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB,
+     CONTEXT_INT(Const.FragmentProgram.MaxUniformComponents),
+     extra_ARB_fragment_shader },
+
+   /* GL_ARB_vertex_shader */
+   { GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB,
+     CONTEXT_INT(Const.VertexProgram.MaxUniformComponents),
+     extra_ARB_vertex_shader },
+   { GL_MAX_VARYING_FLOATS_ARB, LOC_CUSTOM, TYPE_INT, 0,
+     extra_ARB_vertex_shader },
+
+   /* GL_EXT_texture_lod_bias */
+   { GL_MAX_TEXTURE_LOD_BIAS_EXT, CONTEXT_FLOAT(Const.MaxTextureLodBias),
+	 extra_EXT_texture_lod_bias },
+
+   /* GL_EXT_texture_filter_anisotropic */
+   { GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT,
+     CONTEXT_FLOAT(Const.MaxTextureMaxAnisotropy),
+     extra_EXT_texture_filter_anisotropic },
+#endif /* FEATURE_GL || FEATURE_ES1 */
+
+#if FEATURE_ES1
+   { 0, 0, TYPE_API_MASK, API_OPENGLES_BIT },
+   /* XXX: OES_matrix_get */
+   { GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES },
+   { GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES },
+   { GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES },
+
+   /* OES_point_size_array */
+   { GL_POINT_SIZE_ARRAY_OES, ARRAY_FIELD(PointSize.Enabled, TYPE_BOOLEAN) },
+   { GL_POINT_SIZE_ARRAY_TYPE_OES, ARRAY_FIELD(PointSize.Type, TYPE_ENUM) },
+   { GL_POINT_SIZE_ARRAY_STRIDE_OES, ARRAY_FIELD(PointSize.Stride, TYPE_INT) },
+   { GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES, LOC_CUSTOM, TYPE_INT, 0 },
+#endif /* FEATURE_ES1 */
+
+#if FEATURE_GL || FEATURE_ES2
+   { 0, 0, TYPE_API_MASK, API_OPENGL_BIT | API_OPENGLES2_BIT, NO_EXTRA },
+   /* This entry isn't spec'ed for GLES 2, but is needed for Mesa's GLSL: */
+   { GL_MAX_LIGHTS, CONTEXT_INT(Const.MaxLights), NO_EXTRA },
+   { GL_MAX_TEXTURE_COORDS_ARB, /* == GL_MAX_TEXTURE_COORDS_NV */
+     CONTEXT_INT(Const.MaxTextureCoordUnits),
+     extra_ARB_fragment_program_NV_fragment_program },
+
+   /* GL_ARB_draw_buffers */
+   { GL_MAX_DRAW_BUFFERS_ARB, CONTEXT_INT(Const.MaxDrawBuffers), NO_EXTRA },
+
+   { GL_BLEND_COLOR_EXT, CONTEXT_FIELD(Color.BlendColor[0], TYPE_FLOATN_4), NO_EXTRA },
+   /* GL_ARB_fragment_program */
+   { GL_MAX_TEXTURE_IMAGE_UNITS_ARB, /* == GL_MAX_TEXTURE_IMAGE_UNITS_NV */
+     CONTEXT_INT(Const.MaxTextureImageUnits),
+     extra_ARB_fragment_program_NV_fragment_program },
+   { GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB,
+     CONTEXT_INT(Const.MaxVertexTextureImageUnits), extra_ARB_vertex_shader },
+   { GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB,
+     CONTEXT_INT(Const.MaxCombinedTextureImageUnits),
+     extra_ARB_vertex_shader },
+
+   /* GL_ARB_shader_objects
+    * Actually, this token isn't part of GL_ARB_shader_objects, but is
+    * close enough for now. */
+   { GL_CURRENT_PROGRAM, LOC_CUSTOM, TYPE_INT, 0, extra_ARB_shader_objects },
+
+   /* OpenGL 2.0 */
+   { GL_STENCIL_BACK_FUNC, CONTEXT_ENUM(Stencil.Function[1]), NO_EXTRA },
+   { GL_STENCIL_BACK_VALUE_MASK, CONTEXT_INT(Stencil.ValueMask[1]), NO_EXTRA },
+   { GL_STENCIL_BACK_WRITEMASK, CONTEXT_INT(Stencil.WriteMask[1]), NO_EXTRA },
+   { GL_STENCIL_BACK_REF, CONTEXT_INT(Stencil.Ref[1]), NO_EXTRA },
+   { GL_STENCIL_BACK_FAIL, CONTEXT_ENUM(Stencil.FailFunc[1]), NO_EXTRA },
+   { GL_STENCIL_BACK_PASS_DEPTH_FAIL, CONTEXT_ENUM(Stencil.ZFailFunc[1]), NO_EXTRA },
+   { GL_STENCIL_BACK_PASS_DEPTH_PASS, CONTEXT_ENUM(Stencil.ZPassFunc[1]), NO_EXTRA },
+
+   { GL_MAX_VERTEX_ATTRIBS_ARB,
+     CONTEXT_INT(Const.VertexProgram.MaxAttribs),
+     extra_ARB_vertex_program_version_es2 },
+
+   /* OES_texture_3D */
+   { GL_TEXTURE_BINDING_3D, LOC_CUSTOM, TYPE_INT, TEXTURE_3D_INDEX, NO_EXTRA },
+   { GL_MAX_3D_TEXTURE_SIZE, LOC_CUSTOM, TYPE_INT,
+     offsetof(GLcontext, Const.Max3DTextureLevels), NO_EXTRA },
+
+   /* GL_ARB_fragment_program/OES_standard_derivatives */
+   { GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB,
+     CONTEXT_ENUM(Hint.FragmentShaderDerivative), extra_ARB_fragment_shader },
+#endif /* FEATURE_GL || FEATURE_ES2 */
+
+#if FEATURE_ES2
+   /* Enums unique to OpenGL ES 2.0 */
+   { 0, 0, TYPE_API_MASK, API_OPENGLES2_BIT, NO_EXTRA },
+   { GL_MAX_FRAGMENT_UNIFORM_VECTORS, LOC_CUSTOM, TYPE_INT,
+     offsetof(GLcontext, Const.FragmentProgram.MaxUniformComponents), NO_EXTRA },
+   { GL_MAX_VARYING_VECTORS, LOC_CUSTOM, TYPE_INT,
+     offsetof(GLcontext, Const.MaxVarying), NO_EXTRA },
+   { GL_MAX_VERTEX_UNIFORM_VECTORS, LOC_CUSTOM, TYPE_INT,
+     offsetof(GLcontext, Const.VertexProgram.MaxUniformComponents), NO_EXTRA },
+   { GL_SHADER_COMPILER, CONST(1), NO_EXTRA },
+   /* OES_get_program_binary */
+   { GL_NUM_SHADER_BINARY_FORMATS, CONST(0), NO_EXTRA },
+   { GL_SHADER_BINARY_FORMATS, CONST(0), NO_EXTRA },
+#endif /* FEATURE_ES2 */
+
+#if FEATURE_GL
+   /* Remaining enums are only in OpenGL */
+   { 0, 0, TYPE_API_MASK, API_OPENGL_BIT, NO_EXTRA },
+   { GL_ACCUM_RED_BITS, BUFFER_INT(Visual.accumRedBits), NO_EXTRA },
+   { GL_ACCUM_GREEN_BITS, BUFFER_INT(Visual.accumGreenBits), NO_EXTRA },
+   { GL_ACCUM_BLUE_BITS, BUFFER_INT(Visual.accumBlueBits), NO_EXTRA },
+   { GL_ACCUM_ALPHA_BITS, BUFFER_INT(Visual.accumAlphaBits), NO_EXTRA },
+   { GL_ACCUM_CLEAR_VALUE, CONTEXT_FIELD(Accum.ClearColor[0], TYPE_FLOATN_4), NO_EXTRA },
+   { GL_ALPHA_BIAS, CONTEXT_FLOAT(Pixel.AlphaBias), NO_EXTRA },
+   { GL_ALPHA_SCALE, CONTEXT_FLOAT(Pixel.AlphaScale), NO_EXTRA },
+   { GL_ATTRIB_STACK_DEPTH, CONTEXT_INT(AttribStackDepth), NO_EXTRA },
+   { GL_AUTO_NORMAL, CONTEXT_BOOL(Eval.AutoNormal), NO_EXTRA },
+   { GL_AUX_BUFFERS, BUFFER_INT(Visual.numAuxBuffers), NO_EXTRA },
+   { GL_BLUE_BIAS, CONTEXT_FLOAT(Pixel.BlueBias), NO_EXTRA },
+   { GL_BLUE_SCALE, CONTEXT_FLOAT(Pixel.BlueScale), NO_EXTRA },
+   { GL_CLIENT_ATTRIB_STACK_DEPTH, CONTEXT_INT(ClientAttribStackDepth), NO_EXTRA },
+   { GL_COLOR_MATERIAL_FACE, CONTEXT_ENUM(Light.ColorMaterialFace), NO_EXTRA },
+   { GL_COLOR_MATERIAL_PARAMETER, CONTEXT_ENUM(Light.ColorMaterialMode), NO_EXTRA },
+   { GL_CURRENT_INDEX,
+     CONTEXT_FLOAT(Current.Attrib[VERT_ATTRIB_COLOR_INDEX][0]),
+     extra_flush_current },
+   { GL_CURRENT_RASTER_COLOR,
+     CONTEXT_FIELD(Current.RasterColor[0], TYPE_FLOATN_4), NO_EXTRA },
+   { GL_CURRENT_RASTER_DISTANCE, CONTEXT_FLOAT(Current.RasterDistance), NO_EXTRA },
+   { GL_CURRENT_RASTER_INDEX, CONST(1), NO_EXTRA },
+   { GL_CURRENT_RASTER_POSITION, CONTEXT_FLOAT4(Current.RasterPos[0]), NO_EXTRA },
+   { GL_CURRENT_RASTER_SECONDARY_COLOR,
+     CONTEXT_FIELD(Current.RasterSecondaryColor[0], TYPE_FLOATN_4), NO_EXTRA },
+   { GL_CURRENT_RASTER_TEXTURE_COORDS, LOC_CUSTOM, TYPE_FLOAT_4, 0,
+     extra_valid_texture_unit },
+   { GL_CURRENT_RASTER_POSITION_VALID, CONTEXT_BOOL(Current.RasterPosValid), NO_EXTRA },
+   { GL_DEPTH_BIAS, CONTEXT_FLOAT(Pixel.DepthBias), NO_EXTRA },
+   { GL_DEPTH_SCALE, CONTEXT_FLOAT(Pixel.DepthScale), NO_EXTRA },
+   { GL_DOUBLEBUFFER, BUFFER_INT(Visual.doubleBufferMode), NO_EXTRA },
+   { GL_DRAW_BUFFER, BUFFER_ENUM(ColorDrawBuffer[0]), NO_EXTRA },
+   { GL_EDGE_FLAG, LOC_CUSTOM, TYPE_BOOLEAN, 0, NO_EXTRA },
+   { GL_FEEDBACK_BUFFER_SIZE, CONTEXT_INT(Feedback.BufferSize), NO_EXTRA },
+   { GL_FEEDBACK_BUFFER_TYPE, CONTEXT_ENUM(Feedback.Type), NO_EXTRA },
+   { GL_FOG_INDEX, CONTEXT_FLOAT(Fog.Index), NO_EXTRA },
+   { GL_GREEN_BIAS, CONTEXT_FLOAT(Pixel.GreenBias), NO_EXTRA },
+   { GL_GREEN_SCALE, CONTEXT_FLOAT(Pixel.GreenScale), NO_EXTRA },
+   { GL_INDEX_BITS, BUFFER_INT(Visual.indexBits), extra_new_buffers },
+   { GL_INDEX_CLEAR_VALUE, CONTEXT_INT(Color.ClearIndex), NO_EXTRA },
+   { GL_INDEX_MODE, CONST(0) , NO_EXTRA}, 
+   { GL_INDEX_OFFSET, CONTEXT_INT(Pixel.IndexOffset), NO_EXTRA },
+   { GL_INDEX_SHIFT, CONTEXT_INT(Pixel.IndexShift), NO_EXTRA },
+   { GL_INDEX_WRITEMASK, CONTEXT_INT(Color.IndexMask), NO_EXTRA },
+   { GL_LIGHT_MODEL_COLOR_CONTROL, CONTEXT_ENUM(Light.Model.ColorControl), NO_EXTRA },
+   { GL_LIGHT_MODEL_LOCAL_VIEWER, CONTEXT_BOOL(Light.Model.LocalViewer), NO_EXTRA },
+   { GL_LINE_STIPPLE, CONTEXT_BOOL(Line.StippleFlag), NO_EXTRA },
+   { GL_LINE_STIPPLE_PATTERN, LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA },
+   { GL_LINE_STIPPLE_REPEAT, CONTEXT_INT(Line.StippleFactor), NO_EXTRA },
+   { GL_LINE_WIDTH_GRANULARITY, CONTEXT_FLOAT(Const.LineWidthGranularity), NO_EXTRA },
+   { GL_LIST_BASE, CONTEXT_INT(List.ListBase), NO_EXTRA },
+   { GL_LIST_INDEX, LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA },
+   { GL_LIST_MODE, LOC_CUSTOM, TYPE_ENUM, 0, NO_EXTRA },
+   { GL_INDEX_LOGIC_OP, CONTEXT_BOOL(Color.IndexLogicOpEnabled), NO_EXTRA },
+   { GL_MAP1_COLOR_4, CONTEXT_BOOL(Eval.Map1Color4), NO_EXTRA },
+   { GL_MAP1_GRID_DOMAIN, CONTEXT_FLOAT2(Eval.MapGrid1u1), NO_EXTRA },
+   { GL_MAP1_GRID_SEGMENTS, CONTEXT_INT(Eval.MapGrid1un), NO_EXTRA },
+   { GL_MAP1_INDEX, CONTEXT_BOOL(Eval.Map1Index), NO_EXTRA },
+   { GL_MAP1_NORMAL, CONTEXT_BOOL(Eval.Map1Normal), NO_EXTRA },
+   { GL_MAP1_TEXTURE_COORD_1, CONTEXT_BOOL(Eval.Map1TextureCoord1), NO_EXTRA },
+   { GL_MAP1_TEXTURE_COORD_2, CONTEXT_BOOL(Eval.Map1TextureCoord2), NO_EXTRA },
+   { GL_MAP1_TEXTURE_COORD_3, CONTEXT_BOOL(Eval.Map1TextureCoord3), NO_EXTRA },
+   { GL_MAP1_TEXTURE_COORD_4, CONTEXT_BOOL(Eval.Map1TextureCoord4), NO_EXTRA },
+   { GL_MAP1_VERTEX_3, CONTEXT_BOOL(Eval.Map1Vertex3), NO_EXTRA },
+   { GL_MAP1_VERTEX_4, CONTEXT_BOOL(Eval.Map1Vertex4), NO_EXTRA },
+   { GL_MAP2_COLOR_4, CONTEXT_BOOL(Eval.Map2Color4), NO_EXTRA },
+   { GL_MAP2_GRID_DOMAIN, LOC_CUSTOM, TYPE_FLOAT_4, 0, NO_EXTRA },
+   { GL_MAP2_GRID_SEGMENTS, CONTEXT_INT2(Eval.MapGrid2un), NO_EXTRA },
+   { GL_MAP2_INDEX, CONTEXT_BOOL(Eval.Map2Index), NO_EXTRA },
+   { GL_MAP2_NORMAL, CONTEXT_BOOL(Eval.Map2Normal), NO_EXTRA },
+   { GL_MAP2_TEXTURE_COORD_1, CONTEXT_BOOL(Eval.Map2TextureCoord1), NO_EXTRA },
+   { GL_MAP2_TEXTURE_COORD_2, CONTEXT_BOOL(Eval.Map2TextureCoord2), NO_EXTRA },
+   { GL_MAP2_TEXTURE_COORD_3, CONTEXT_BOOL(Eval.Map2TextureCoord3), NO_EXTRA },
+   { GL_MAP2_TEXTURE_COORD_4, CONTEXT_BOOL(Eval.Map2TextureCoord4), NO_EXTRA },
+   { GL_MAP2_VERTEX_3, CONTEXT_BOOL(Eval.Map2Vertex3), NO_EXTRA },
+   { GL_MAP2_VERTEX_4, CONTEXT_BOOL(Eval.Map2Vertex4), NO_EXTRA },
+   { GL_MAP_COLOR, CONTEXT_BOOL(Pixel.MapColorFlag), NO_EXTRA },
+   { GL_MAP_STENCIL, CONTEXT_BOOL(Pixel.MapStencilFlag), NO_EXTRA },
+   { GL_MAX_ATTRIB_STACK_DEPTH, CONST(MAX_ATTRIB_STACK_DEPTH), NO_EXTRA },
+   { GL_MAX_CLIENT_ATTRIB_STACK_DEPTH, CONST(MAX_CLIENT_ATTRIB_STACK_DEPTH), NO_EXTRA },
+
+   { GL_MAX_EVAL_ORDER, CONST(MAX_EVAL_ORDER), NO_EXTRA },
+   { GL_MAX_LIST_NESTING, CONST(MAX_LIST_NESTING), NO_EXTRA },
+   { GL_MAX_NAME_STACK_DEPTH, CONST(MAX_NAME_STACK_DEPTH), NO_EXTRA },
+   { GL_MAX_PIXEL_MAP_TABLE, CONST(MAX_PIXEL_MAP_TABLE), NO_EXTRA },
+   { GL_NAME_STACK_DEPTH, CONTEXT_INT(Select.NameStackDepth), NO_EXTRA },
+   { GL_PACK_LSB_FIRST, CONTEXT_BOOL(Pack.LsbFirst), NO_EXTRA },
+   { GL_PACK_ROW_LENGTH, CONTEXT_INT(Pack.RowLength), NO_EXTRA },
+   { GL_PACK_SKIP_PIXELS, CONTEXT_INT(Pack.SkipPixels), NO_EXTRA },
+   { GL_PACK_SKIP_ROWS, CONTEXT_INT(Pack.SkipRows), NO_EXTRA },
+   { GL_PACK_SWAP_BYTES, CONTEXT_BOOL(Pack.SwapBytes), NO_EXTRA },
+   { GL_PACK_IMAGE_HEIGHT_EXT, CONTEXT_INT(Pack.ImageHeight), NO_EXTRA },
+   { GL_PACK_INVERT_MESA, CONTEXT_BOOL(Pack.Invert), NO_EXTRA },
+   { GL_PIXEL_MAP_A_TO_A_SIZE, CONTEXT_INT(PixelMaps.AtoA.Size), NO_EXTRA },
+   { GL_PIXEL_MAP_B_TO_B_SIZE, CONTEXT_INT(PixelMaps.BtoB.Size), NO_EXTRA },
+   { GL_PIXEL_MAP_G_TO_G_SIZE, CONTEXT_INT(PixelMaps.GtoG.Size), NO_EXTRA },
+   { GL_PIXEL_MAP_I_TO_A_SIZE, CONTEXT_INT(PixelMaps.ItoA.Size), NO_EXTRA },
+   { GL_PIXEL_MAP_I_TO_B_SIZE, CONTEXT_INT(PixelMaps.ItoB.Size), NO_EXTRA },
+   { GL_PIXEL_MAP_I_TO_G_SIZE, CONTEXT_INT(PixelMaps.ItoG.Size), NO_EXTRA },
+   { GL_PIXEL_MAP_I_TO_I_SIZE, CONTEXT_INT(PixelMaps.ItoI.Size), NO_EXTRA },
+   { GL_PIXEL_MAP_I_TO_R_SIZE, CONTEXT_INT(PixelMaps.ItoR.Size), NO_EXTRA },
+   { GL_PIXEL_MAP_R_TO_R_SIZE, CONTEXT_INT(PixelMaps.RtoR.Size), NO_EXTRA },
+   { GL_PIXEL_MAP_S_TO_S_SIZE, CONTEXT_INT(PixelMaps.StoS.Size), NO_EXTRA },
+   { GL_POINT_SIZE_GRANULARITY, CONTEXT_FLOAT(Const.PointSizeGranularity), NO_EXTRA },
+   { GL_POLYGON_MODE, CONTEXT_ENUM2(Polygon.FrontMode), NO_EXTRA },
+   { GL_POLYGON_OFFSET_BIAS_EXT, CONTEXT_FLOAT(Polygon.OffsetUnits), NO_EXTRA },
+   { GL_POLYGON_OFFSET_POINT, CONTEXT_BOOL(Polygon.OffsetPoint), NO_EXTRA },
+   { GL_POLYGON_OFFSET_LINE, CONTEXT_BOOL(Polygon.OffsetLine), NO_EXTRA },
+   { GL_POLYGON_SMOOTH, CONTEXT_BOOL(Polygon.SmoothFlag), NO_EXTRA },
+   { GL_POLYGON_SMOOTH_HINT, CONTEXT_ENUM(Hint.PolygonSmooth), NO_EXTRA },
+   { GL_POLYGON_STIPPLE, CONTEXT_BOOL(Polygon.StippleFlag), NO_EXTRA },
+   { GL_READ_BUFFER, LOC_CUSTOM, TYPE_ENUM, NO_OFFSET, NO_EXTRA },
+   { GL_RED_BIAS, CONTEXT_FLOAT(Pixel.RedBias), NO_EXTRA },
+   { GL_RED_SCALE, CONTEXT_FLOAT(Pixel.RedScale), NO_EXTRA },
+   { GL_RENDER_MODE, CONTEXT_ENUM(RenderMode), NO_EXTRA },
+   { GL_RGBA_MODE, CONST(1), NO_EXTRA },
+   { GL_SELECTION_BUFFER_SIZE, CONTEXT_INT(Select.BufferSize), NO_EXTRA },
+   { GL_SHARED_TEXTURE_PALETTE_EXT, CONTEXT_BOOL(Texture.SharedPalette), NO_EXTRA },
+
+   { GL_STEREO, BUFFER_INT(Visual.stereoMode), NO_EXTRA },
+
+   { GL_TEXTURE_1D, LOC_CUSTOM, TYPE_BOOLEAN, NO_OFFSET, NO_EXTRA },
+   { GL_TEXTURE_3D, LOC_CUSTOM, TYPE_BOOLEAN, NO_OFFSET, NO_EXTRA },
+   { GL_TEXTURE_1D_ARRAY_EXT, LOC_CUSTOM, TYPE_BOOLEAN, NO_OFFSET, NO_EXTRA },
+   { GL_TEXTURE_2D_ARRAY_EXT, LOC_CUSTOM, TYPE_BOOLEAN, NO_OFFSET, NO_EXTRA },
+
+   { GL_TEXTURE_BINDING_1D, LOC_CUSTOM, TYPE_INT, TEXTURE_1D_INDEX, NO_EXTRA },
+   { GL_TEXTURE_BINDING_1D_ARRAY, LOC_CUSTOM, TYPE_INT,
+     TEXTURE_1D_ARRAY_INDEX, extra_MESA_texture_array },
+   { GL_TEXTURE_BINDING_2D_ARRAY, LOC_CUSTOM, TYPE_INT,
+     TEXTURE_1D_ARRAY_INDEX, extra_MESA_texture_array },
+   { GL_MAX_ARRAY_TEXTURE_LAYERS_EXT,
+     CONTEXT_INT(Const.MaxArrayTextureLayers), extra_MESA_texture_array },
+
+   { GL_TEXTURE_GEN_S, LOC_TEXUNIT, TYPE_BIT_0,
+     offsetof(struct gl_texture_unit, TexGenEnabled), NO_EXTRA },
+   { GL_TEXTURE_GEN_T, LOC_TEXUNIT, TYPE_BIT_1,
+     offsetof(struct gl_texture_unit, TexGenEnabled), NO_EXTRA },
+   { GL_TEXTURE_GEN_R, LOC_TEXUNIT, TYPE_BIT_2,
+     offsetof(struct gl_texture_unit, TexGenEnabled), NO_EXTRA },
+   { GL_TEXTURE_GEN_Q, LOC_TEXUNIT, TYPE_BIT_3,
+     offsetof(struct gl_texture_unit, TexGenEnabled), NO_EXTRA },
+   { GL_UNPACK_LSB_FIRST, CONTEXT_BOOL(Unpack.LsbFirst), NO_EXTRA },
+   { GL_UNPACK_ROW_LENGTH, CONTEXT_INT(Unpack.RowLength), NO_EXTRA },
+   { GL_UNPACK_SKIP_PIXELS, CONTEXT_INT(Unpack.SkipPixels), NO_EXTRA },
+   { GL_UNPACK_SKIP_ROWS, CONTEXT_INT(Unpack.SkipRows), NO_EXTRA },
+   { GL_UNPACK_SWAP_BYTES, CONTEXT_BOOL(Unpack.SwapBytes), NO_EXTRA },
+   { GL_UNPACK_SKIP_IMAGES_EXT, CONTEXT_INT(Unpack.SkipImages), NO_EXTRA },
+   { GL_UNPACK_IMAGE_HEIGHT_EXT, CONTEXT_INT(Unpack.ImageHeight), NO_EXTRA },
+   { GL_UNPACK_CLIENT_STORAGE_APPLE, CONTEXT_BOOL(Unpack.ClientStorage), NO_EXTRA },
+   { GL_ZOOM_X, CONTEXT_FLOAT(Pixel.ZoomX), NO_EXTRA },
+   { GL_ZOOM_Y, CONTEXT_FLOAT(Pixel.ZoomY), NO_EXTRA },
+
+   /* Vertex arrays */
+   { GL_VERTEX_ARRAY_COUNT_EXT, CONST(0), NO_EXTRA },
+   { GL_NORMAL_ARRAY_COUNT_EXT, CONST(0), NO_EXTRA },
+   { GL_COLOR_ARRAY_COUNT_EXT, CONST(0), NO_EXTRA },
+   { GL_INDEX_ARRAY, ARRAY_BOOL(Index.Enabled), NO_EXTRA },
+   { GL_INDEX_ARRAY_TYPE, ARRAY_ENUM(Index.Type), NO_EXTRA },
+   { GL_INDEX_ARRAY_STRIDE, ARRAY_INT(Index.Stride), NO_EXTRA },
+   { GL_INDEX_ARRAY_COUNT_EXT, CONST(0), NO_EXTRA },
+   { GL_TEXTURE_COORD_ARRAY_COUNT_EXT, CONST(0), NO_EXTRA },
+   { GL_EDGE_FLAG_ARRAY, ARRAY_BOOL(EdgeFlag.Enabled), NO_EXTRA },
+   { GL_EDGE_FLAG_ARRAY_STRIDE, ARRAY_INT(EdgeFlag.Stride), NO_EXTRA },
+   { GL_EDGE_FLAG_ARRAY_COUNT_EXT, CONST(0), NO_EXTRA },
+
+   /* GL_ARB_texture_compression */
+   { GL_TEXTURE_COMPRESSION_HINT_ARB, CONTEXT_INT(Hint.TextureCompression), NO_EXTRA },
+
+   /* GL_EXT_compiled_vertex_array */
+   { GL_ARRAY_ELEMENT_LOCK_FIRST_EXT, CONTEXT_INT(Array.LockFirst),
+     extra_EXT_compiled_vertex_array },
+   { GL_ARRAY_ELEMENT_LOCK_COUNT_EXT, CONTEXT_INT(Array.LockCount),
+     extra_EXT_compiled_vertex_array },
+
+   /* GL_ARB_transpose_matrix */
+   { GL_TRANSPOSE_COLOR_MATRIX_ARB, CONTEXT_MATRIX_T(ColorMatrixStack.Top), NO_EXTRA },
+   { GL_TRANSPOSE_MODELVIEW_MATRIX_ARB,
+     CONTEXT_MATRIX_T(ModelviewMatrixStack), NO_EXTRA },
+   { GL_TRANSPOSE_PROJECTION_MATRIX_ARB,
+     CONTEXT_MATRIX_T(ProjectionMatrixStack.Top), NO_EXTRA },
+   { GL_TRANSPOSE_TEXTURE_MATRIX_ARB, CONTEXT_MATRIX_T(TextureMatrixStack), NO_EXTRA },
+
+   /* GL_SGI_color_matrix (also in 1.2 imaging) */
+   { GL_COLOR_MATRIX_SGI, CONTEXT_MATRIX(ColorMatrixStack.Top), NO_EXTRA },
+   { GL_COLOR_MATRIX_STACK_DEPTH_SGI, LOC_CUSTOM, TYPE_INT,
+     offsetof(GLcontext, ColorMatrixStack.Depth), NO_EXTRA },
+   { GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI,
+     CONST(MAX_COLOR_STACK_DEPTH), NO_EXTRA },
+   { GL_POST_COLOR_MATRIX_RED_SCALE_SGI,
+     CONTEXT_FLOAT(Pixel.PostColorMatrixScale[0]), NO_EXTRA },
+   { GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI,
+     CONTEXT_FLOAT(Pixel.PostColorMatrixScale[1]), NO_EXTRA },
+   { GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI,
+     CONTEXT_FLOAT(Pixel.PostColorMatrixScale[2]), NO_EXTRA },
+   { GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI,
+     CONTEXT_FLOAT(Pixel.PostColorMatrixScale[3]), NO_EXTRA },
+   { GL_POST_COLOR_MATRIX_RED_BIAS_SGI,
+     CONTEXT_FLOAT(Pixel.PostColorMatrixBias[0]), NO_EXTRA },
+   { GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI,
+     CONTEXT_FLOAT(Pixel.PostColorMatrixBias[1]), NO_EXTRA },
+   { GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI,
+     CONTEXT_FLOAT(Pixel.PostColorMatrixBias[2]), NO_EXTRA },
+   { GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI,
+     CONTEXT_FLOAT(Pixel.PostColorMatrixBias[3]), NO_EXTRA },
+
+   /* GL_EXT_convolution (also in 1.2 imaging) */
+   { GL_CONVOLUTION_1D_EXT, CONTEXT_BOOL(Pixel.Convolution1DEnabled),
+     extra_EXT_convolution },
+   { GL_CONVOLUTION_2D_EXT, CONTEXT_BOOL(Pixel.Convolution2DEnabled),
+     extra_EXT_convolution },
+   { GL_SEPARABLE_2D_EXT, CONTEXT_BOOL(Pixel.Separable2DEnabled),
+     extra_EXT_convolution },
+   { GL_POST_CONVOLUTION_RED_SCALE_EXT,
+     CONTEXT_FLOAT(Pixel.PostConvolutionScale[0]),
+     extra_EXT_convolution },
+   { GL_POST_CONVOLUTION_GREEN_SCALE_EXT,
+     CONTEXT_FLOAT(Pixel.PostConvolutionScale[1]),
+     extra_EXT_convolution },
+   { GL_POST_CONVOLUTION_BLUE_SCALE_EXT,
+     CONTEXT_FLOAT(Pixel.PostConvolutionScale[2]),
+     extra_EXT_convolution },
+   { GL_POST_CONVOLUTION_ALPHA_SCALE_EXT,
+     CONTEXT_FLOAT(Pixel.PostConvolutionScale[3]),
+     extra_EXT_convolution },
+   { GL_POST_CONVOLUTION_RED_BIAS_EXT,
+     CONTEXT_FLOAT(Pixel.PostConvolutionBias[0]),
+     extra_EXT_convolution },
+   { GL_POST_CONVOLUTION_GREEN_BIAS_EXT,
+     CONTEXT_FLOAT(Pixel.PostConvolutionBias[1]),
+     extra_EXT_convolution },
+   { GL_POST_CONVOLUTION_BLUE_BIAS_EXT,
+     CONTEXT_FLOAT(Pixel.PostConvolutionBias[2]),
+     extra_EXT_convolution },
+   { GL_POST_CONVOLUTION_ALPHA_BIAS_EXT,
+     CONTEXT_FLOAT(Pixel.PostConvolutionBias[3]),
+     extra_EXT_convolution },
+
+   /* GL_EXT_histogram / GL_ARB_imaging */
+   { GL_HISTOGRAM, CONTEXT_BOOL(Pixel.HistogramEnabled),
+     extra_EXT_histogram },
+   { GL_MINMAX, CONTEXT_BOOL(Pixel.MinMaxEnabled), extra_EXT_histogram },
+
+   /* GL_SGI_color_table / GL_ARB_imaging */
+   { GL_COLOR_TABLE_SGI,
+     CONTEXT_BOOL(Pixel.ColorTableEnabled[COLORTABLE_PRECONVOLUTION]),
+     extra_SGI_color_table },
+   { GL_POST_CONVOLUTION_COLOR_TABLE_SGI,
+     CONTEXT_BOOL(Pixel.ColorTableEnabled[COLORTABLE_POSTCONVOLUTION]),
+     extra_SGI_color_table },
+   { GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI,
+     CONTEXT_BOOL(Pixel.ColorTableEnabled[COLORTABLE_POSTCOLORMATRIX]),
+     extra_SGI_color_table },
+
+   /* GL_SGI_texture_color_table */
+   { GL_TEXTURE_COLOR_TABLE_SGI, LOC_TEXUNIT, TYPE_BOOLEAN,
+     offsetof(struct gl_texture_unit, ColorTableEnabled),
+     extra_SGI_texture_color_table },
+
+   /* GL_EXT_secondary_color */
+   { GL_COLOR_SUM_EXT, CONTEXT_BOOL(Fog.ColorSumEnabled),
+     extra_EXT_secondary_color_ARB_vertex_program },
+   { GL_CURRENT_SECONDARY_COLOR_EXT,
+     CONTEXT_FIELD(Current.Attrib[VERT_ATTRIB_COLOR1][0], TYPE_FLOATN_4),
+     extra_EXT_secondary_color_flush_current },
+   { GL_SECONDARY_COLOR_ARRAY_EXT, ARRAY_BOOL(SecondaryColor.Enabled),
+     extra_EXT_secondary_color },
+   { GL_SECONDARY_COLOR_ARRAY_TYPE_EXT, ARRAY_ENUM(SecondaryColor.Type),
+     extra_EXT_secondary_color },
+   { GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT, ARRAY_INT(SecondaryColor.Stride),
+     extra_EXT_secondary_color },
+   { GL_SECONDARY_COLOR_ARRAY_SIZE_EXT, ARRAY_INT(SecondaryColor.Size),
+     extra_EXT_secondary_color },
+
+   /* GL_EXT_fog_coord */
+   { GL_CURRENT_FOG_COORDINATE_EXT,
+     CONTEXT_FLOAT(Current.Attrib[VERT_ATTRIB_FOG][0]),
+     extra_EXT_fog_coord_flush_current },
+   { GL_FOG_COORDINATE_ARRAY_EXT, ARRAY_BOOL(FogCoord.Enabled),
+     extra_EXT_fog_coord },
+   { GL_FOG_COORDINATE_ARRAY_TYPE_EXT, ARRAY_ENUM(FogCoord.Type),
+     extra_EXT_fog_coord },
+   { GL_FOG_COORDINATE_ARRAY_STRIDE_EXT, ARRAY_INT(FogCoord.Stride),
+     extra_EXT_fog_coord },
+   { GL_FOG_COORDINATE_SOURCE_EXT, CONTEXT_ENUM(Fog.FogCoordinateSource),
+     extra_EXT_fog_coord },
+
+   /* GL_IBM_rasterpos_clip */
+   { GL_RASTER_POSITION_UNCLIPPED_IBM,
+     CONTEXT_BOOL(Transform.RasterPositionUnclipped),
+     extra_IBM_rasterpos_clip },
+
+   /* GL_NV_point_sprite */
+   { GL_POINT_SPRITE_R_MODE_NV,
+     CONTEXT_ENUM(Point.SpriteRMode), extra_NV_point_sprite },
+   { GL_POINT_SPRITE_COORD_ORIGIN, CONTEXT_ENUM(Point.SpriteOrigin),
+     extra_NV_point_sprite_ARB_point_sprite },
+
+   /* GL_NV_vertex_program */
+   { GL_VERTEX_PROGRAM_BINDING_NV, LOC_CUSTOM, TYPE_INT, 0,
+     extra_NV_vertex_program },
+   { GL_VERTEX_ATTRIB_ARRAY0_NV, ARRAY_BOOL(VertexAttrib[0].Enabled),
+     extra_NV_vertex_program },
+   { GL_VERTEX_ATTRIB_ARRAY1_NV, ARRAY_BOOL(VertexAttrib[1].Enabled),
+     extra_NV_vertex_program },
+   { GL_VERTEX_ATTRIB_ARRAY2_NV, ARRAY_BOOL(VertexAttrib[2].Enabled),
+     extra_NV_vertex_program },
+   { GL_VERTEX_ATTRIB_ARRAY3_NV, ARRAY_BOOL(VertexAttrib[3].Enabled),
+     extra_NV_vertex_program },
+   { GL_VERTEX_ATTRIB_ARRAY4_NV, ARRAY_BOOL(VertexAttrib[4].Enabled),
+     extra_NV_vertex_program },
+   { GL_VERTEX_ATTRIB_ARRAY5_NV, ARRAY_BOOL(VertexAttrib[5].Enabled),
+     extra_NV_vertex_program },
+   { GL_VERTEX_ATTRIB_ARRAY6_NV, ARRAY_BOOL(VertexAttrib[6].Enabled),
+     extra_NV_vertex_program },
+   { GL_VERTEX_ATTRIB_ARRAY7_NV, ARRAY_BOOL(VertexAttrib[7].Enabled),
+     extra_NV_vertex_program },
+   { GL_VERTEX_ATTRIB_ARRAY8_NV, ARRAY_BOOL(VertexAttrib[8].Enabled),
+     extra_NV_vertex_program },
+   { GL_VERTEX_ATTRIB_ARRAY9_NV, ARRAY_BOOL(VertexAttrib[9].Enabled),
+     extra_NV_vertex_program },
+   { GL_VERTEX_ATTRIB_ARRAY10_NV, ARRAY_BOOL(VertexAttrib[10].Enabled),
+     extra_NV_vertex_program },
+   { GL_VERTEX_ATTRIB_ARRAY11_NV, ARRAY_BOOL(VertexAttrib[11].Enabled),
+     extra_NV_vertex_program },
+   { GL_VERTEX_ATTRIB_ARRAY12_NV, ARRAY_BOOL(VertexAttrib[12].Enabled),
+     extra_NV_vertex_program },
+   { GL_VERTEX_ATTRIB_ARRAY13_NV, ARRAY_BOOL(VertexAttrib[13].Enabled),
+     extra_NV_vertex_program },
+   { GL_VERTEX_ATTRIB_ARRAY14_NV, ARRAY_BOOL(VertexAttrib[14].Enabled),
+     extra_NV_vertex_program },
+   { GL_VERTEX_ATTRIB_ARRAY15_NV, ARRAY_BOOL(VertexAttrib[15].Enabled),
+     extra_NV_vertex_program },
+   { GL_MAP1_VERTEX_ATTRIB0_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[0]),
+     extra_NV_vertex_program },
+   { GL_MAP1_VERTEX_ATTRIB1_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[1]),
+     extra_NV_vertex_program },
+   { GL_MAP1_VERTEX_ATTRIB2_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[2]),
+     extra_NV_vertex_program },
+   { GL_MAP1_VERTEX_ATTRIB3_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[3]),
+     extra_NV_vertex_program },
+   { GL_MAP1_VERTEX_ATTRIB4_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[4]),
+     extra_NV_vertex_program },
+   { GL_MAP1_VERTEX_ATTRIB5_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[5]),
+     extra_NV_vertex_program },
+   { GL_MAP1_VERTEX_ATTRIB6_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[6]),
+     extra_NV_vertex_program },
+   { GL_MAP1_VERTEX_ATTRIB7_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[7]),
+     extra_NV_vertex_program },
+   { GL_MAP1_VERTEX_ATTRIB8_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[8]),
+     extra_NV_vertex_program },
+   { GL_MAP1_VERTEX_ATTRIB9_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[9]),
+     extra_NV_vertex_program },
+   { GL_MAP1_VERTEX_ATTRIB10_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[10]),
+     extra_NV_vertex_program },
+   { GL_MAP1_VERTEX_ATTRIB11_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[11]),
+     extra_NV_vertex_program },
+   { GL_MAP1_VERTEX_ATTRIB12_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[12]),
+     extra_NV_vertex_program },
+   { GL_MAP1_VERTEX_ATTRIB13_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[13]),
+     extra_NV_vertex_program },
+   { GL_MAP1_VERTEX_ATTRIB14_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[14]),
+     extra_NV_vertex_program },
+   { GL_MAP1_VERTEX_ATTRIB15_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[15]),
+     extra_NV_vertex_program },
+
+   /* GL_NV_fragment_program */
+   { GL_FRAGMENT_PROGRAM_NV, CONTEXT_BOOL(FragmentProgram.Enabled),
+     extra_NV_fragment_program },
+   { GL_FRAGMENT_PROGRAM_BINDING_NV, LOC_CUSTOM, TYPE_INT, 0,
+     extra_NV_fragment_program },
+   { GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV,
+     CONST(MAX_NV_FRAGMENT_PROGRAM_PARAMS),
+     extra_NV_fragment_program },
+
+   /* GL_NV_texture_rectangle */
+   { GL_TEXTURE_RECTANGLE_NV,
+     LOC_CUSTOM, TYPE_BOOLEAN, 0, extra_NV_texture_rectangle },
+   { GL_TEXTURE_BINDING_RECTANGLE_NV,
+     LOC_CUSTOM, TYPE_INT, TEXTURE_RECT_INDEX, extra_NV_texture_rectangle },
+   { GL_MAX_RECTANGLE_TEXTURE_SIZE_NV,
+     CONTEXT_INT(Const.MaxTextureRectSize), extra_NV_texture_rectangle },
+
+   /* GL_EXT_stencil_two_side */
+   { GL_STENCIL_TEST_TWO_SIDE_EXT, CONTEXT_BOOL(Stencil.TestTwoSide),
+	 extra_EXT_stencil_two_side },
+   { GL_ACTIVE_STENCIL_FACE_EXT, LOC_CUSTOM, TYPE_ENUM, NO_OFFSET, NO_EXTRA },
+
+   /* GL_NV_light_max_exponent */
+   { GL_MAX_SHININESS_NV, CONTEXT_FLOAT(Const.MaxShininess),
+     extra_NV_light_max_exponent },
+   { GL_MAX_SPOT_EXPONENT_NV, CONTEXT_FLOAT(Const.MaxSpotExponent),
+     extra_NV_light_max_exponent },
+     
+   /* GL_ARB_vertex_buffer_object */
+   { GL_INDEX_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT,
+     offsetof(struct gl_array_object, Index.BufferObj), NO_EXTRA },
+   { GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT,
+     offsetof(struct gl_array_object, EdgeFlag.BufferObj), NO_EXTRA },
+   { GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT,
+     offsetof(struct gl_array_object, SecondaryColor.BufferObj), NO_EXTRA },
+   { GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT,
+     offsetof(struct gl_array_object, FogCoord.BufferObj), NO_EXTRA },
+
+   /* GL_EXT_pixel_buffer_object */
+   { GL_PIXEL_PACK_BUFFER_BINDING_EXT, LOC_CUSTOM, TYPE_INT, 0,
+     extra_EXT_pixel_buffer_object },
+   { GL_PIXEL_UNPACK_BUFFER_BINDING_EXT, LOC_CUSTOM, TYPE_INT, 0,
+     extra_EXT_pixel_buffer_object },
+
+   /* GL_ARB_vertex_program */
+   { GL_VERTEX_PROGRAM_ARB, /* == GL_VERTEX_PROGRAM_NV */
+     CONTEXT_BOOL(VertexProgram.Enabled),
+     extra_ARB_vertex_program_NV_vertex_program },
+   { GL_VERTEX_PROGRAM_POINT_SIZE_ARB, /* == GL_VERTEX_PROGRAM_POINT_SIZE_NV*/
+     CONTEXT_BOOL(VertexProgram.PointSizeEnabled),
+     extra_ARB_vertex_program_NV_vertex_program },
+   { GL_VERTEX_PROGRAM_TWO_SIDE_ARB, /* == GL_VERTEX_PROGRAM_TWO_SIDE_NV */
+     CONTEXT_BOOL(VertexProgram.TwoSideEnabled),
+     extra_ARB_vertex_program_NV_vertex_program },
+   { GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB, /* == GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
+     CONTEXT_INT(Const.MaxProgramMatrixStackDepth),
+     extra_ARB_vertex_program_ARB_fragment_program_NV_vertex_program },
+   { GL_MAX_PROGRAM_MATRICES_ARB, /* == GL_MAX_TRACK_MATRICES_NV */
+     CONTEXT_INT(Const.MaxProgramMatrices),
+     extra_ARB_vertex_program_ARB_fragment_program_NV_vertex_program },
+   { GL_CURRENT_MATRIX_STACK_DEPTH_ARB, /* == GL_CURRENT_MATRIX_STACK_DEPTH_NV */
+     LOC_CUSTOM, TYPE_INT, 0,
+     extra_ARB_vertex_program_ARB_fragment_program_NV_vertex_program },
+
+   { GL_CURRENT_MATRIX_ARB, /* == GL_CURRENT_MATRIX_NV */
+     LOC_CUSTOM, TYPE_MATRIX, 0,
+     extra_ARB_vertex_program_ARB_fragment_program_NV_vertex_program },
+   { GL_TRANSPOSE_CURRENT_MATRIX_ARB, /* == GL_CURRENT_MATRIX_NV */
+     LOC_CUSTOM, TYPE_MATRIX, 0,
+     extra_ARB_vertex_program_ARB_fragment_program },
+
+   { GL_PROGRAM_ERROR_POSITION_ARB, /* == GL_PROGRAM_ERROR_POSITION_NV */
+     CONTEXT_INT(Program.ErrorPos),
+     extra_NV_vertex_program_ARB_vertex_program_ARB_fragment_program_NV_vertex_program },
+
+   /* GL_ARB_fragment_program */
+   { GL_FRAGMENT_PROGRAM_ARB, CONTEXT_BOOL(FragmentProgram.Enabled),
+     extra_ARB_fragment_program },
+
+   /* GL_EXT_depth_bounds_test */
+   { GL_DEPTH_BOUNDS_TEST_EXT, CONTEXT_BOOL(Depth.BoundsTest),
+     extra_EXT_depth_bounds_test },
+   { GL_DEPTH_BOUNDS_EXT, CONTEXT_FLOAT2(Depth.BoundsMin),
+     extra_EXT_depth_bounds_test },
+
+   /* GL_ARB_depth_clamp*/
+   { GL_DEPTH_CLAMP, CONTEXT_BOOL(Transform.DepthClamp),
+     extra_ARB_depth_clamp },
+
+   /* GL_ARB_draw_buffers */
+   { GL_DRAW_BUFFER0_ARB, BUFFER_ENUM(ColorDrawBuffer[0]), NO_EXTRA },
+   { GL_DRAW_BUFFER1_ARB, BUFFER_ENUM(ColorDrawBuffer[1]),
+     extra_valid_draw_buffer },
+   { GL_DRAW_BUFFER2_ARB, BUFFER_ENUM(ColorDrawBuffer[2]),
+     extra_valid_draw_buffer },
+   { GL_DRAW_BUFFER3_ARB, BUFFER_ENUM(ColorDrawBuffer[3]),
+     extra_valid_draw_buffer },
+
+   /* GL_ATI_fragment_shader */
+   { GL_NUM_FRAGMENT_REGISTERS_ATI, CONST(6), extra_ATI_fragment_shader },
+   { GL_NUM_FRAGMENT_CONSTANTS_ATI, CONST(8), extra_ATI_fragment_shader },
+   { GL_NUM_PASSES_ATI, CONST(2), extra_ATI_fragment_shader },
+   { GL_NUM_INSTRUCTIONS_PER_PASS_ATI, CONST(8), extra_ATI_fragment_shader },
+   { GL_NUM_INSTRUCTIONS_TOTAL_ATI, CONST(16), extra_ATI_fragment_shader },
+   { GL_COLOR_ALPHA_PAIRING_ATI, CONST(GL_TRUE), extra_ATI_fragment_shader },
+   { GL_NUM_LOOPBACK_COMPONENTS_ATI, CONST(3), extra_ATI_fragment_shader },
+   { GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI,
+     CONST(3), extra_ATI_fragment_shader },
+
+   /* GL_EXT_framebuffer_object */
+   { GL_MAX_COLOR_ATTACHMENTS_EXT, CONTEXT_INT(Const.MaxColorAttachments),
+     extra_EXT_framebuffer_object },
+   
+   /* GL_EXT_framebuffer_blit
+    * NOTE: GL_DRAW_FRAMEBUFFER_BINDING_EXT == GL_FRAMEBUFFER_BINDING_EXT */
+   { GL_READ_FRAMEBUFFER_BINDING_EXT, LOC_CUSTOM, TYPE_INT, 0,
+     extra_EXT_framebuffer_blit },
+
+   /* GL_EXT_provoking_vertex */
+   { GL_PROVOKING_VERTEX_EXT,
+     CONTEXT_BOOL(Light.ProvokingVertex), extra_EXT_provoking_vertex },
+   { GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT,
+     CONTEXT_BOOL(Const.QuadsFollowProvokingVertexConvention),
+     extra_EXT_provoking_vertex },
+
+   /* GL_ARB_framebuffer_object */
+   { GL_MAX_SAMPLES, CONTEXT_INT(Const.MaxSamples),
+     extra_ARB_framebuffer_object },
+
+   /* GL_APPLE_vertex_array_object */
+   { GL_VERTEX_ARRAY_BINDING_APPLE, ARRAY_INT(Name),
+     extra_APPLE_vertex_array_object },
+
+   /* GL_ARB_seamless_cube_map */
+   { GL_TEXTURE_CUBE_MAP_SEAMLESS,
+     CONTEXT_BOOL(Texture.CubeMapSeamless), extra_ARB_seamless_cube_map },
+
+   /* GL_ARB_sync */
+   { GL_MAX_SERVER_WAIT_TIMEOUT,
+     CONTEXT_INT64(Const.MaxServerWaitTimeout), extra_ARB_sync },
+
+   /* GL_EXT_transform_feedback */
+   { GL_TRANSFORM_FEEDBACK_BUFFER_BINDING, LOC_CUSTOM, TYPE_INT, 0,
+     extra_EXT_transform_feedback },
+   { GL_RASTERIZER_DISCARD, CONTEXT_BOOL(TransformFeedback.RasterDiscard),
+     extra_EXT_transform_feedback },
+   { GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS,
+     CONTEXT_INT(Const.MaxTransformFeedbackInterleavedComponents),
+     extra_EXT_transform_feedback },
+   { GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS,
+     CONTEXT_INT(Const.MaxTransformFeedbackSeparateAttribs),
+     extra_EXT_transform_feedback },
+   { GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS,
+     CONTEXT_INT(Const.MaxTransformFeedbackSeparateComponents),
+     extra_EXT_transform_feedback },
+
+   /* GL_ARB_transform_feedback2 */
+   { GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED, LOC_CUSTOM, TYPE_BOOLEAN, 0,
+     extra_ARB_transform_feedback2 },
+   { GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE, LOC_CUSTOM, TYPE_BOOLEAN, 0,
+     extra_ARB_transform_feedback2 },
+   { GL_TRANSFORM_FEEDBACK_BINDING, LOC_CUSTOM, TYPE_INT, 0,
+     extra_ARB_transform_feedback2 },
+
+   /* GL_ARB_geometry_shader4 */
+   { GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB,
+     CONTEXT_INT(Const.GeometryProgram.MaxGeometryTextureImageUnits),
+     extra_ARB_geometry_shader4 },
+   { GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB,
+     CONTEXT_INT(Const.GeometryProgram.MaxGeometryOutputVertices),
+     extra_ARB_geometry_shader4 },
+   { GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB,
+     CONTEXT_INT(Const.GeometryProgram.MaxGeometryTotalOutputComponents),
+     extra_ARB_geometry_shader4 },
+   { GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB,
+     CONTEXT_INT(Const.GeometryProgram.MaxGeometryUniformComponents),
+     extra_ARB_geometry_shader4 },
+   { GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB,
+     CONTEXT_INT(Const.GeometryProgram.MaxGeometryVaryingComponents),
+     extra_ARB_geometry_shader4 },
+   { GL_MAX_VERTEX_VARYING_COMPONENTS_ARB,
+     CONTEXT_INT(Const.GeometryProgram.MaxVertexVaryingComponents),
+     extra_ARB_geometry_shader4 },
+
+   /* GL 3.0 */
+   { GL_NUM_EXTENSIONS, LOC_CUSTOM, TYPE_INT, 0, extra_version_30 },
+   { GL_MAJOR_VERSION, CONTEXT_INT(VersionMajor), extra_version_30 },
+   { GL_MINOR_VERSION, CONTEXT_INT(VersionMinor), extra_version_30  },
+   { GL_CONTEXT_FLAGS, CONTEXT_INT(Const.ContextFlags), extra_version_30  },
+
+   /* GL 3.1 */
+   { GL_PRIMITIVE_RESTART, CONTEXT_BOOL(Array.PrimitiveRestart),
+     extra_version_31 },
+   { GL_PRIMITIVE_RESTART_INDEX, CONTEXT_INT(Array.RestartIndex),
+     extra_version_31 },
+ 
+   /* GL 3.2 */
+   { GL_CONTEXT_PROFILE_MASK, CONTEXT_INT(Const.ProfileMask),
+     extra_version_32 },
+#endif /* FEATURE_GL */
+};
+
+/* All we need now is a way to look up the value struct from the enum.
+ * The code generated by gcc for the old generated big switch
+ * statement is a big, balanced, open coded if/else tree, essentially
+ * an unrolled binary search.  It would be natural to sort the new
+ * enum table and use bsearch(), but we will use a read-only hash
+ * table instead.  bsearch() has a nice guaranteed worst case
+ * performance, but we're also guaranteed to hit that worst case
+ * (log2(n) iterations) for about half the enums.  Instead, using an
+ * open addressing hash table, we can find the enum on the first try
+ * for 80% of the enums, 1 collision for 10% and never more than 5
+ * collisions for any enum (typical numbers).  And the code is very
+ * simple, even though it feels a little magic. */
+
+static unsigned short table[1024];
+static const int prime_factor = 89, prime_step = 281;
+
+#ifdef GET_DEBUG
+static void
+print_table_stats(void)
+{
+   int i, j, collisions[11], count, hash, mask;
+   const struct value_desc *d;
+
+   count = 0;
+   mask = Elements(table) - 1;
+   memset(collisions, 0, sizeof collisions);
+
+   for (i = 0; i < Elements(table); i++) {
+      if (!table[i])
+	 continue;
+      count++;
+      d = &values[table[i]];
+      hash = (d->pname * prime_factor);
+      j = 0;
+      while (1) {
+	 if (values[table[hash & mask]].pname == d->pname)
+	    break;
+	 hash += prime_step;
+	 j++;
+      }
+
+      if (j < 10)
+	 collisions[j]++;
+      else
+	 collisions[10]++;
+   }
+
+   printf("number of enums: %d (total %d)\n", count, Elements(values));
+   for (i = 0; i < Elements(collisions) - 1; i++)
+      if (collisions[i] > 0)
+	 printf("  %d enums with %d %scollisions\n",
+		collisions[i], i, i == 10 ? "or more " : "");
+}
+#endif
+
+/**
+ * Initialize the enum hash for a given API 
+ *
+ * This is called from one_time_init() to insert the enum values that
+ * are valid for the API in question into the enum hash table.
+ *
+ * \param the current context, for determining the API in question
  */
-#define CHECK_EXT2(EXT1, EXT2, FUNC)                                   \
-   if (!ctx->Extensions.EXT1 && !ctx->Extensions.EXT2) {               \
-      _mesa_error(ctx, GL_INVALID_ENUM, FUNC "(0x%x)", (int) pname);  \
-      return;                                                          \
+void _mesa_init_get_hash(GLcontext *ctx)
+{
+   int i, hash, index, mask;
+   int api_mask = 0, api_bit;
+
+   mask = Elements(table) - 1;
+   api_bit = 1 << ctx->API;
+
+   for (i = 0; i < Elements(values); i++) {
+      if (values[i].type == TYPE_API_MASK) {
+	 api_mask = values[i].offset;
+	 continue;
+      }
+      if (!(api_mask & api_bit))
+	 continue;
+
+      hash = (values[i].pname * prime_factor) & mask;
+      while (1) {
+	 index = hash & mask;
+	 if (!table[index]) {
+	    table[index] = i;
+	    break;
+	 }
+	 hash += prime_step;
+      }
    }
 
-/*
- * Check if either of three extensions is enabled.
+#ifdef GET_DEBUG
+   print_table_stats();
+#endif
+}
+
+/**
+ * Handle irregular enums
+ *
+ * Some values don't conform to the "well-known type at context
+ * pointer + offset" pattern, so we have this function to catch all
+ * the corner cases.  Typically, it's a computed value or a one-off
+ * pointer to a custom struct or something.
+ *
+ * In this case we can't return a pointer to the value, so we'll have
+ * to use the temporary variable 'v' declared back in the calling
+ * glGet*v() function to store the result.
+ *
+ * \param ctx the current context
+ * \param d the struct value_desc that describes the enum
+ * \param v pointer to the tmp declared in the calling glGet*v() function
  */
-#define CHECK_EXT3(EXT1, EXT2, EXT3, FUNC)                             \
-   if (!ctx->Extensions.EXT1 && !ctx->Extensions.EXT2 &&               \
-       !ctx->Extensions.EXT3) {                                        \
-      _mesa_error(ctx, GL_INVALID_ENUM, FUNC "(0x%x)", (int) pname);  \
-      return;                                                          \
+static void
+find_custom_value(GLcontext *ctx, const struct value_desc *d, union value *v)
+{
+   struct gl_buffer_object *buffer_obj;
+   struct gl_client_array *array;
+   GLuint unit, *p;
+
+   switch (d->pname) {
+   case GL_TEXTURE_1D:
+   case GL_TEXTURE_2D:
+   case GL_TEXTURE_3D:
+   case GL_TEXTURE_1D_ARRAY_EXT:
+   case GL_TEXTURE_2D_ARRAY_EXT:
+   case GL_TEXTURE_CUBE_MAP_ARB:
+   case GL_TEXTURE_RECTANGLE_NV:
+      v->value_bool = _mesa_IsEnabled(d->pname);
+      break;
+
+   case GL_LINE_STIPPLE_PATTERN:
+      /* This is the only GLushort, special case it here by promoting
+       * to an int rather than introducing a new type. */
+      v->value_int = ctx->Line.StipplePattern;
+      break;
+
+   case GL_CURRENT_RASTER_TEXTURE_COORDS:
+      unit = ctx->Texture.CurrentUnit;
+      v->value_float_4[0] = ctx->Current.RasterTexCoords[unit][0];
+      v->value_float_4[1] = ctx->Current.RasterTexCoords[unit][1];
+      v->value_float_4[2] = ctx->Current.RasterTexCoords[unit][2];
+      v->value_float_4[3] = ctx->Current.RasterTexCoords[unit][3];
+      break;
+
+   case GL_CURRENT_TEXTURE_COORDS:
+      unit = ctx->Texture.CurrentUnit;
+      v->value_float_4[0] = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit][0];
+      v->value_float_4[1] = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit][1];
+      v->value_float_4[2] = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit][2];
+      v->value_float_4[3] = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit][3];
+      break;
+
+   case GL_COLOR_WRITEMASK:
+      v->value_int_4[0] = ctx->Color.ColorMask[0][RCOMP] ? 1 : 0;
+      v->value_int_4[1] = ctx->Color.ColorMask[0][GCOMP] ? 1 : 0;
+      v->value_int_4[2] = ctx->Color.ColorMask[0][BCOMP] ? 1 : 0;
+      v->value_int_4[3] = ctx->Color.ColorMask[0][ACOMP] ? 1 : 0;
+      break;
+
+   case GL_EDGE_FLAG:
+      v->value_bool = ctx->Current.Attrib[VERT_ATTRIB_EDGEFLAG][0] == 1.0;
+      break;
+
+   case GL_READ_BUFFER:
+      v->value_enum = ctx->ReadBuffer->ColorReadBuffer;
+      break;
+
+   case GL_MAP2_GRID_DOMAIN:
+      v->value_float_4[0] = ctx->Eval.MapGrid2u1;
+      v->value_float_4[1] = ctx->Eval.MapGrid2u2;
+      v->value_float_4[2] = ctx->Eval.MapGrid2v1;
+      v->value_float_4[3] = ctx->Eval.MapGrid2v2;
+      break;
+
+   case GL_TEXTURE_STACK_DEPTH:
+      unit = ctx->Texture.CurrentUnit;
+      v->value_int = ctx->TextureMatrixStack[unit].Depth + 1;
+      break;
+   case GL_TEXTURE_MATRIX:
+      unit = ctx->Texture.CurrentUnit;
+      v->value_matrix = ctx->TextureMatrixStack[unit].Top;
+      break;
+
+   case GL_TEXTURE_COORD_ARRAY:
+   case GL_TEXTURE_COORD_ARRAY_SIZE:
+   case GL_TEXTURE_COORD_ARRAY_TYPE:
+   case GL_TEXTURE_COORD_ARRAY_STRIDE:
+      array = &ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture];
+      v->value_int = *(GLuint *) ((char *) array + d->offset);
+      break;
+
+   case GL_ACTIVE_TEXTURE_ARB:
+      v->value_int = GL_TEXTURE0_ARB + ctx->Texture.CurrentUnit;
+      break;
+   case GL_CLIENT_ACTIVE_TEXTURE_ARB:
+      v->value_int = GL_TEXTURE0_ARB + ctx->Array.ActiveTexture;
+      break;
+
+   case GL_MODELVIEW_STACK_DEPTH:
+   case GL_PROJECTION_STACK_DEPTH:
+   case GL_COLOR_MATRIX_STACK_DEPTH_SGI:
+      v->value_int = *(GLint *) ((char *) ctx + d->offset) + 1;
+      break;
+
+   case GL_MAX_TEXTURE_SIZE:
+   case GL_MAX_3D_TEXTURE_SIZE:
+   case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB:
+      p = (GLuint *) ((char *) ctx + d->offset);
+      v->value_int = 1 << (*p - 1);
+      break;
+
+   case GL_SCISSOR_BOX:
+      v->value_int_4[0] = ctx->Scissor.X;
+      v->value_int_4[1] = ctx->Scissor.Y;
+      v->value_int_4[2] = ctx->Scissor.Width;
+      v->value_int_4[3] = ctx->Scissor.Height;
+      break;
+
+   case GL_LIST_INDEX:
+      v->value_int =
+	 ctx->ListState.CurrentList ? ctx->ListState.CurrentList->Name : 0;
+      break;
+   case GL_LIST_MODE:
+      if (!ctx->CompileFlag)
+	 v->value_enum = 0;
+      else if (ctx->ExecuteFlag)
+	 v->value_enum = GL_COMPILE_AND_EXECUTE;
+      else
+	 v->value_enum = GL_COMPILE;
+      break;
+
+   case GL_VIEWPORT:
+      v->value_int_4[0] = ctx->Viewport.X;
+      v->value_int_4[1] = ctx->Viewport.Y;
+      v->value_int_4[2] = ctx->Viewport.Width;
+      v->value_int_4[3] = ctx->Viewport.Height;
+      break;
+
+   case GL_ACTIVE_STENCIL_FACE_EXT:
+      v->value_enum = ctx->Stencil.ActiveFace ? GL_BACK : GL_FRONT;
+      break;
+
+   case GL_STENCIL_FAIL:
+      v->value_enum = ctx->Stencil.FailFunc[ctx->Stencil.ActiveFace];
+      break;
+   case GL_STENCIL_FUNC:
+      v->value_enum = ctx->Stencil.Function[ctx->Stencil.ActiveFace];
+      break;
+   case GL_STENCIL_PASS_DEPTH_FAIL:
+      v->value_enum = ctx->Stencil.ZFailFunc[ctx->Stencil.ActiveFace];
+      break;
+   case GL_STENCIL_PASS_DEPTH_PASS:
+      v->value_enum = ctx->Stencil.ZPassFunc[ctx->Stencil.ActiveFace];
+      break;
+   case GL_STENCIL_REF:
+      v->value_int = ctx->Stencil.Ref[ctx->Stencil.ActiveFace];
+      break;
+   case GL_STENCIL_VALUE_MASK:
+      v->value_int = ctx->Stencil.ValueMask[ctx->Stencil.ActiveFace];
+      break;
+   case GL_STENCIL_WRITEMASK:
+      v->value_int = ctx->Stencil.WriteMask[ctx->Stencil.ActiveFace];
+      break;
+
+   case GL_NUM_EXTENSIONS:
+      v->value_int = _mesa_get_extension_count(ctx);
+      break;
+
+   case GL_IMPLEMENTATION_COLOR_READ_TYPE_OES:
+      v->value_int = _mesa_get_color_read_type(ctx);
+      break;
+   case GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES:
+      v->value_int = _mesa_get_color_read_format(ctx);
+      break;
+
+   case GL_CURRENT_MATRIX_STACK_DEPTH_ARB:
+      v->value_int = ctx->CurrentStack->Depth + 1;
+      break;
+   case GL_CURRENT_MATRIX_ARB:
+   case GL_TRANSPOSE_CURRENT_MATRIX_ARB:
+      v->value_matrix = ctx->CurrentStack->Top;
+      break;
+
+   case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB:
+      v->value_int = _mesa_get_compressed_formats(ctx, NULL, GL_FALSE);
+      break;
+   case GL_COMPRESSED_TEXTURE_FORMATS_ARB:
+      v->value_int_n.n = 
+	 _mesa_get_compressed_formats(ctx, v->value_int_n.ints, GL_FALSE);
+      ASSERT(v->value_int_n.n <= 100);
+      break;
+
+   case GL_MAX_VARYING_FLOATS_ARB:
+      v->value_int = ctx->Const.MaxVarying * 4;
+      break;
+
+   /* Various object names */
+
+   case GL_TEXTURE_BINDING_1D:
+   case GL_TEXTURE_BINDING_2D:
+   case GL_TEXTURE_BINDING_3D:
+   case GL_TEXTURE_BINDING_1D_ARRAY_EXT:
+   case GL_TEXTURE_BINDING_2D_ARRAY_EXT:
+   case GL_TEXTURE_BINDING_CUBE_MAP_ARB:
+   case GL_TEXTURE_BINDING_RECTANGLE_NV:
+      unit = ctx->Texture.CurrentUnit;
+      v->value_int =
+	 ctx->Texture.Unit[unit].CurrentTex[d->offset]->Name;
+      break;
+
+   /* GL_ARB_vertex_buffer_object */
+   case GL_VERTEX_ARRAY_BUFFER_BINDING_ARB:
+   case GL_NORMAL_ARRAY_BUFFER_BINDING_ARB:
+   case GL_COLOR_ARRAY_BUFFER_BINDING_ARB:
+   case GL_INDEX_ARRAY_BUFFER_BINDING_ARB:
+   case GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB:
+   case GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB:
+   case GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB:
+      buffer_obj = (struct gl_buffer_object *)
+	 ((char *) ctx->Array.ArrayObj + d->offset);
+      v->value_int = buffer_obj->Name;
+      break;
+   case GL_ARRAY_BUFFER_BINDING_ARB:
+      v->value_int = ctx->Array.ArrayBufferObj->Name;
+      break;
+   case GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB:
+      v->value_int =
+	 ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].BufferObj->Name;
+      break;
+   case GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB:
+      v->value_int = ctx->Array.ElementArrayBufferObj->Name;
+      break;
+
+   case GL_FRAGMENT_PROGRAM_BINDING_NV:
+      v->value_int = 
+	 ctx->FragmentProgram.Current ? ctx->FragmentProgram.Current->Base.Id : 0;
+      break;
+   case GL_VERTEX_PROGRAM_BINDING_NV:
+      v->value_int =
+	 ctx->VertexProgram.Current ? ctx->VertexProgram.Current->Base.Id : 0;
+      break;
+   case GL_PIXEL_PACK_BUFFER_BINDING_EXT:
+      v->value_int = ctx->Pack.BufferObj->Name;
+      break;
+   case GL_PIXEL_UNPACK_BUFFER_BINDING_EXT:
+      v->value_int = ctx->Unpack.BufferObj->Name;
+      break;
+   case GL_TRANSFORM_FEEDBACK_BUFFER_BINDING:
+      v->value_int = ctx->TransformFeedback.CurrentBuffer->Name;
+      break;
+   case GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED:
+      v->value_int = ctx->TransformFeedback.CurrentObject->Paused;
+      break;
+   case GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE:
+      v->value_int = ctx->TransformFeedback.CurrentObject->Active;
+      break;
+   case GL_TRANSFORM_FEEDBACK_BINDING:
+      v->value_int = ctx->TransformFeedback.CurrentObject->Name;
+      break;
+   case GL_CURRENT_PROGRAM:
+      v->value_int =
+	 ctx->Shader.CurrentProgram ? ctx->Shader.CurrentProgram->Name : 0;
+      break;
+   case GL_READ_FRAMEBUFFER_BINDING_EXT:
+      v->value_int = ctx->ReadBuffer->Name;
+      break;
+   case GL_RENDERBUFFER_BINDING_EXT:
+      v->value_int =
+	 ctx->CurrentRenderbuffer ? ctx->CurrentRenderbuffer->Name : 0;
+      break;
+   case GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES:
+      v->value_int = ctx->Array.ArrayObj->PointSize.BufferObj->Name;
+      break;
+   }   
+}
+
+/**
+ * Check extra constraints on a struct value_desc descriptor
+ *
+ * If a struct value_desc has a non-NULL extra pointer, it means that
+ * there are a number of extra constraints to check or actions to
+ * perform.  The extras is just an integer array where each integer
+ * encode different constraints or actions.
+ *
+ * \param ctx current context
+ * \param func name of calling glGet*v() function for error reporting
+ * \param d the struct value_desc that has the extra constraints
+ *
+ * \return GL_FALSE if one of the constraints was not satisfied,
+ *     otherwise GL_TRUE.
+ */
+static GLboolean
+check_extra(GLcontext *ctx, const char *func, const struct value_desc *d)
+{
+   const GLuint version = ctx->VersionMajor * 10 + ctx->VersionMinor;
+   int total, enabled;
+   const int *e;
+
+   total = 0;
+   enabled = 0;
+   for (e = d->extra; *e != EXTRA_END; e++)
+      switch (*e) {
+      case EXTRA_VERSION_30:
+	 if (version >= 30) {
+	    total++;
+	    enabled++;
+	 }
+	 break;
+      case EXTRA_VERSION_31:
+	 if (version >= 31) {
+	    total++;
+	    enabled++;
+	 }
+	 break;
+      case EXTRA_VERSION_32:
+	 if (version >= 32) {
+	    total++;
+	    enabled++;
+	 }
+	 break;
+      case EXTRA_VERSION_ES2:
+	 if (ctx->API == API_OPENGLES2) {
+	    total++;
+	    enabled++;
+	 }
+	 break;
+      case EXTRA_NEW_BUFFERS:
+	 if (ctx->NewState & _NEW_BUFFERS)
+	    _mesa_update_state(ctx);
+	 break;
+      case EXTRA_FLUSH_CURRENT:
+	 FLUSH_CURRENT(ctx, 0);
+	 break;
+      case EXTRA_VALID_DRAW_BUFFER:
+	 if (d->pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {
+	    _mesa_error(ctx, GL_INVALID_OPERATION, "%s(draw buffer %u)",
+			func, d->pname - GL_DRAW_BUFFER0_ARB);
+	    return GL_FALSE;
+	 }
+	 break;
+      case EXTRA_VALID_TEXTURE_UNIT:
+	 if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureCoordUnits) {
+	    _mesa_error(ctx, GL_INVALID_OPERATION, "%s(texture %u)",
+			func, ctx->Texture.CurrentUnit);
+	    return GL_FALSE;
+	 }
+	 break;
+      case EXTRA_END:
+	 break;
+      default: /* *e is a offset into the extension struct */
+	 total++;
+	 if (*(GLboolean *) ((char *) &ctx->Extensions + *e))
+	    enabled++;
+	 break;
+      }
+
+   if (total > 0 && enabled == 0) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "%s(pname=%s)", func,
+                  _mesa_lookup_enum_by_nr(d->pname));
+      return GL_FALSE;
    }
 
-/*
- * Check if either of four extensions is enabled.
+   return GL_TRUE;
+}
+
+static const struct value_desc error_value =
+   { 0, 0, TYPE_INVALID, NO_OFFSET, NO_EXTRA };
+
+/**
+ * Find the struct value_desc corresponding to the enum 'pname'.
+ * 
+ * We hash the enum value to get an index into the 'table' array,
+ * which holds the index in the 'values' array of struct value_desc.
+ * Once we've found the entry, we do the extra checks, if any, then
+ * look up the value and return a pointer to it.
+ *
+ * If the value has to be computed (for example, it's the result of a
+ * function call or we need to add 1 to it), we use the tmp 'v' to
+ * store the result.
+ * 
+ * \param func name of glGet*v() func for error reporting
+ * \param pname the enum value we're looking up
+ * \param p is were we return the pointer to the value
+ * \param v a tmp union value variable in the calling glGet*v() function
+ *
+ * \return the struct value_desc corresponding to the enum or a struct
+ *     value_desc of TYPE_INVALID if not found.  This lets the calling
+ *     glGet*v() function jump right into a switch statement and
+ *     handle errors there instead of having to check for NULL.
  */
-#define CHECK_EXT4(EXT1, EXT2, EXT3, EXT4, FUNC)                       \
-   if (!ctx->Extensions.EXT1 && !ctx->Extensions.EXT2 &&               \
-       !ctx->Extensions.EXT3 && !ctx->Extensions.EXT4) {               \
-      _mesa_error(ctx, GL_INVALID_ENUM, FUNC "(0x%x)", (int) pname);  \
-      return;                                                          \
+static const struct value_desc *
+find_value(const char *func, GLenum pname, void **p, union value *v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_texture_unit *unit;
+   int mask, hash;
+   const struct value_desc *d;
+
+   mask = Elements(table) - 1;
+   hash = (pname * prime_factor);
+   while (1) {
+      d = &values[table[hash & mask]];
+      if (likely(d->pname == pname))
+	 break;
+
+      /* If the enum isn't valid, the hash walk ends with index 0,
+       * which is the API mask entry at the beginning of values[]. */
+      if (d->type == TYPE_API_MASK) {
+	 _mesa_error(ctx, GL_INVALID_ENUM, "%s(pname=%s)", func,
+                     _mesa_lookup_enum_by_nr(pname));
+	 return &error_value;
+      }
+      hash += prime_step;
+   }
+
+   if (unlikely(d->extra && !check_extra(ctx, func, d)))
+      return &error_value;
+
+   switch (d->location) {
+   case LOC_BUFFER:
+      *p = ((char *) ctx->DrawBuffer + d->offset);
+      return d;
+   case LOC_CONTEXT:
+      *p = ((char *) ctx + d->offset);
+      return d;
+   case LOC_ARRAY:
+      *p = ((char *) ctx->Array.ArrayObj + d->offset);
+      return d;
+   case LOC_TEXUNIT:
+      unit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+      *p = ((char *) unit + d->offset);
+      return d;
+   case LOC_CUSTOM:
+      find_custom_value(ctx, d, v);
+      *p = v;
+      return d;
+   default:
+      assert(0);
+      break;
    }
 
+   /* silence warning */
+   return &error_value;
+}
+
+static const int transpose[] = {
+   0, 4,  8, 12,
+   1, 5,  9, 13,
+   2, 6, 10, 14,
+   3, 7, 11, 15
+};
 
 void GLAPIENTRY
-_mesa_GetBooleanv( GLenum pname, GLboolean *params )
+_mesa_GetBooleanv(GLenum pname, GLboolean *params)
 {
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
+   const struct value_desc *d;
+   union value v;
+   GLmatrix *m;
+   int shift, i;
+   void *p;
 
-   if (!params)
-      return;
+   d = find_value("glGetBooleanv", pname, &p, &v);
+   switch (d->type) {
+   case TYPE_INVALID:
+      break;
+   case TYPE_CONST:
+      params[0] = INT_TO_BOOLEAN(d->offset);
+      break;
 
-   if (ctx->NewState)
-      _mesa_update_state(ctx);
+   case TYPE_FLOAT_4:
+   case TYPE_FLOATN_4:
+      params[3] = FLOAT_TO_BOOLEAN(((GLfloat *) p)[3]);
+   case TYPE_FLOAT_3:
+   case TYPE_FLOATN_3:
+      params[2] = FLOAT_TO_BOOLEAN(((GLfloat *) p)[2]);
+   case TYPE_FLOAT_2:
+   case TYPE_FLOATN_2:
+      params[1] = FLOAT_TO_BOOLEAN(((GLfloat *) p)[1]);
+   case TYPE_FLOAT:
+   case TYPE_FLOATN:
+      params[0] = FLOAT_TO_BOOLEAN(((GLfloat *) p)[0]);
+      break;
 
-   if (ctx->Driver.GetBooleanv &&
-       ctx->Driver.GetBooleanv(ctx, pname, params))
-      return;
+   case TYPE_DOUBLEN:
+      params[0] = FLOAT_TO_BOOLEAN(((GLdouble *) p)[0]);
+      break;
 
-   switch (pname) {
-      case GL_ACCUM_RED_BITS:
-         params[0] = INT_TO_BOOLEAN(ctx->DrawBuffer->Visual.accumRedBits);
-         break;
-      case GL_ACCUM_GREEN_BITS:
-         params[0] = INT_TO_BOOLEAN(ctx->DrawBuffer->Visual.accumGreenBits);
-         break;
-      case GL_ACCUM_BLUE_BITS:
-         params[0] = INT_TO_BOOLEAN(ctx->DrawBuffer->Visual.accumBlueBits);
-         break;
-      case GL_ACCUM_ALPHA_BITS:
-         params[0] = INT_TO_BOOLEAN(ctx->DrawBuffer->Visual.accumAlphaBits);
-         break;
-      case GL_ACCUM_CLEAR_VALUE:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Accum.ClearColor[0]);
-         params[1] = FLOAT_TO_BOOLEAN(ctx->Accum.ClearColor[1]);
-         params[2] = FLOAT_TO_BOOLEAN(ctx->Accum.ClearColor[2]);
-         params[3] = FLOAT_TO_BOOLEAN(ctx->Accum.ClearColor[3]);
-         break;
-      case GL_ALPHA_BIAS:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Pixel.AlphaBias);
-         break;
-      case GL_ALPHA_BITS:
-         params[0] = INT_TO_BOOLEAN(ctx->DrawBuffer->Visual.alphaBits);
-         break;
-      case GL_ALPHA_SCALE:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Pixel.AlphaScale);
-         break;
-      case GL_ALPHA_TEST:
-         params[0] = ctx->Color.AlphaEnabled;
-         break;
-      case GL_ALPHA_TEST_FUNC:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Color.AlphaFunc);
-         break;
-      case GL_ALPHA_TEST_REF:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Color.AlphaRef);
-         break;
-      case GL_ATTRIB_STACK_DEPTH:
-         params[0] = INT_TO_BOOLEAN(ctx->AttribStackDepth);
-         break;
-      case GL_AUTO_NORMAL:
-         params[0] = ctx->Eval.AutoNormal;
-         break;
-      case GL_AUX_BUFFERS:
-         params[0] = INT_TO_BOOLEAN(ctx->DrawBuffer->Visual.numAuxBuffers);
-         break;
-      case GL_BLEND:
-         params[0] = (ctx->Color.BlendEnabled & 1);
-         break;
-      case GL_BLEND_DST:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Color.BlendDstRGB);
-         break;
-      case GL_BLEND_SRC:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Color.BlendSrcRGB);
-         break;
-      case GL_BLEND_SRC_RGB_EXT:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Color.BlendSrcRGB);
-         break;
-      case GL_BLEND_DST_RGB_EXT:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Color.BlendDstRGB);
-         break;
-      case GL_BLEND_SRC_ALPHA_EXT:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Color.BlendSrcA);
-         break;
-      case GL_BLEND_DST_ALPHA_EXT:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Color.BlendDstA);
-         break;
-      case GL_BLEND_EQUATION:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Color.BlendEquationRGB );
-         break;
-      case GL_BLEND_EQUATION_ALPHA_EXT:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Color.BlendEquationA );
-         break;
-      case GL_BLEND_COLOR_EXT:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Color.BlendColor[0]);
-         params[1] = FLOAT_TO_BOOLEAN(ctx->Color.BlendColor[1]);
-         params[2] = FLOAT_TO_BOOLEAN(ctx->Color.BlendColor[2]);
-         params[3] = FLOAT_TO_BOOLEAN(ctx->Color.BlendColor[3]);
-         break;
-      case GL_BLUE_BIAS:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Pixel.BlueBias);
-         break;
-      case GL_BLUE_BITS:
-         params[0] = INT_TO_BOOLEAN(ctx->DrawBuffer->Visual.blueBits);
-         break;
-      case GL_BLUE_SCALE:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Pixel.BlueScale);
-         break;
-      case GL_CLIENT_ATTRIB_STACK_DEPTH:
-         params[0] = INT_TO_BOOLEAN(ctx->ClientAttribStackDepth);
-         break;
-      case GL_CLIP_PLANE0:
-         params[0] = (ctx->Transform.ClipPlanesEnabled >> 0) & 1;
-         break;
-      case GL_CLIP_PLANE1:
-         params[0] = (ctx->Transform.ClipPlanesEnabled >> 1) & 1;
-         break;
-      case GL_CLIP_PLANE2:
-         params[0] = (ctx->Transform.ClipPlanesEnabled >> 2) & 1;
-         break;
-      case GL_CLIP_PLANE3:
-         params[0] = (ctx->Transform.ClipPlanesEnabled >> 3) & 1;
-         break;
-      case GL_CLIP_PLANE4:
-         params[0] = (ctx->Transform.ClipPlanesEnabled >> 4) & 1;
-         break;
-      case GL_CLIP_PLANE5:
-         params[0] = (ctx->Transform.ClipPlanesEnabled >> 5) & 1;
-         break;
-      case GL_COLOR_CLEAR_VALUE:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Color.ClearColor[0]);
-         params[1] = FLOAT_TO_BOOLEAN(ctx->Color.ClearColor[1]);
-         params[2] = FLOAT_TO_BOOLEAN(ctx->Color.ClearColor[2]);
-         params[3] = FLOAT_TO_BOOLEAN(ctx->Color.ClearColor[3]);
-         break;
-      case GL_COLOR_MATERIAL:
-         params[0] = ctx->Light.ColorMaterialEnabled;
-         break;
-      case GL_COLOR_MATERIAL_FACE:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Light.ColorMaterialFace);
-         break;
-      case GL_COLOR_MATERIAL_PARAMETER:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Light.ColorMaterialMode);
-         break;
-      case GL_COLOR_WRITEMASK:
-         params[0] = INT_TO_BOOLEAN(ctx->Color.ColorMask[0][RCOMP] ? 1 : 0);
-         params[1] = INT_TO_BOOLEAN(ctx->Color.ColorMask[0][GCOMP] ? 1 : 0);
-         params[2] = INT_TO_BOOLEAN(ctx->Color.ColorMask[0][BCOMP] ? 1 : 0);
-         params[3] = INT_TO_BOOLEAN(ctx->Color.ColorMask[0][ACOMP] ? 1 : 0);
-         break;
-      case GL_CULL_FACE:
-         params[0] = ctx->Polygon.CullFlag;
-         break;
-      case GL_CULL_FACE_MODE:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Polygon.CullFaceMode);
-         break;
-      case GL_CURRENT_COLOR:
-         {
-         FLUSH_CURRENT(ctx, 0);
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][0]);
-         params[1] = FLOAT_TO_BOOLEAN(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][1]);
-         params[2] = FLOAT_TO_BOOLEAN(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][2]);
-         params[3] = FLOAT_TO_BOOLEAN(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][3]);
-         }
-         break;
-      case GL_CURRENT_INDEX:
-         {
-         FLUSH_CURRENT(ctx, 0);
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Current.Attrib[VERT_ATTRIB_COLOR_INDEX][0]);
-         }
-         break;
-      case GL_CURRENT_NORMAL:
-         {
-         FLUSH_CURRENT(ctx, 0);
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Current.Attrib[VERT_ATTRIB_NORMAL][0]);
-         params[1] = FLOAT_TO_BOOLEAN(ctx->Current.Attrib[VERT_ATTRIB_NORMAL][1]);
-         params[2] = FLOAT_TO_BOOLEAN(ctx->Current.Attrib[VERT_ATTRIB_NORMAL][2]);
-         }
-         break;
-      case GL_CURRENT_RASTER_COLOR:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Current.RasterColor[0]);
-         params[1] = FLOAT_TO_BOOLEAN(ctx->Current.RasterColor[1]);
-         params[2] = FLOAT_TO_BOOLEAN(ctx->Current.RasterColor[2]);
-         params[3] = FLOAT_TO_BOOLEAN(ctx->Current.RasterColor[3]);
-         break;
-      case GL_CURRENT_RASTER_DISTANCE:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Current.RasterDistance);
-         break;
-      case GL_CURRENT_RASTER_INDEX:
-         params[0] = FLOAT_TO_BOOLEAN(1.0);
-         break;
-      case GL_CURRENT_RASTER_POSITION:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Current.RasterPos[0]);
-         params[1] = FLOAT_TO_BOOLEAN(ctx->Current.RasterPos[1]);
-         params[2] = FLOAT_TO_BOOLEAN(ctx->Current.RasterPos[2]);
-         params[3] = FLOAT_TO_BOOLEAN(ctx->Current.RasterPos[3]);
-         break;
-      case GL_CURRENT_RASTER_SECONDARY_COLOR:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Current.RasterSecondaryColor[0]);
-         params[1] = FLOAT_TO_BOOLEAN(ctx->Current.RasterSecondaryColor[1]);
-         params[2] = FLOAT_TO_BOOLEAN(ctx->Current.RasterSecondaryColor[2]);
-         params[3] = FLOAT_TO_BOOLEAN(ctx->Current.RasterSecondaryColor[3]);
-         break;
-      case GL_CURRENT_RASTER_TEXTURE_COORDS:
-         {
-         const GLuint unit = ctx->Texture.CurrentUnit;
-         if (unit >= ctx->Const.MaxTextureCoordUnits) {
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glGet(raster tex coords, unit %u)", unit);
-            return;
-         }
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Current.RasterTexCoords[unit][0]);
-         params[1] = FLOAT_TO_BOOLEAN(ctx->Current.RasterTexCoords[unit][1]);
-         params[2] = FLOAT_TO_BOOLEAN(ctx->Current.RasterTexCoords[unit][2]);
-         params[3] = FLOAT_TO_BOOLEAN(ctx->Current.RasterTexCoords[unit][3]);
-         }
-         break;
-      case GL_CURRENT_RASTER_POSITION_VALID:
-         params[0] = ctx->Current.RasterPosValid;
-         break;
-      case GL_CURRENT_TEXTURE_COORDS:
-         {
-         const GLuint unit = ctx->Texture.CurrentUnit;
-         if (unit >= ctx->Const.MaxTextureCoordUnits) {
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glGet(current tex coords, unit %u)", unit);
-            return;
-         }
-         FLUSH_CURRENT(ctx, 0);
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit][0]);
-         params[1] = FLOAT_TO_BOOLEAN(ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit][1]);
-         params[2] = FLOAT_TO_BOOLEAN(ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit][2]);
-         params[3] = FLOAT_TO_BOOLEAN(ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit][3]);
-         }
-         break;
-      case GL_DEPTH_BIAS:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Pixel.DepthBias);
-         break;
-      case GL_DEPTH_BITS:
-         params[0] = INT_TO_BOOLEAN(ctx->DrawBuffer->Visual.depthBits);
-         break;
-      case GL_DEPTH_CLEAR_VALUE:
-         params[0] = FLOAT_TO_BOOLEAN(((GLfloat) ctx->Depth.Clear));
-         break;
-      case GL_DEPTH_FUNC:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Depth.Func);
-         break;
-      case GL_DEPTH_RANGE:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Viewport.Near);
-         params[1] = FLOAT_TO_BOOLEAN(ctx->Viewport.Far);
-         break;
-      case GL_DEPTH_SCALE:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Pixel.DepthScale);
-         break;
-      case GL_DEPTH_TEST:
-         params[0] = ctx->Depth.Test;
-         break;
-      case GL_DEPTH_WRITEMASK:
-         params[0] = ctx->Depth.Mask;
-         break;
-      case GL_DITHER:
-         params[0] = ctx->Color.DitherFlag;
-         break;
-      case GL_DOUBLEBUFFER:
-         params[0] = ctx->DrawBuffer->Visual.doubleBufferMode;
-         break;
-      case GL_DRAW_BUFFER:
-         params[0] = ENUM_TO_BOOLEAN(ctx->DrawBuffer->ColorDrawBuffer[0]);
-         break;
-      case GL_EDGE_FLAG:
-         {
-         FLUSH_CURRENT(ctx, 0);
-         params[0] = (ctx->Current.Attrib[VERT_ATTRIB_EDGEFLAG][0] == 1.0);
-         }
-         break;
-      case GL_FEEDBACK_BUFFER_SIZE:
-         params[0] = INT_TO_BOOLEAN(ctx->Feedback.BufferSize);
-         break;
-      case GL_FEEDBACK_BUFFER_TYPE:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Feedback.Type);
-         break;
-      case GL_FOG:
-         params[0] = ctx->Fog.Enabled;
-         break;
-      case GL_FOG_COLOR:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Fog.Color[0]);
-         params[1] = FLOAT_TO_BOOLEAN(ctx->Fog.Color[1]);
-         params[2] = FLOAT_TO_BOOLEAN(ctx->Fog.Color[2]);
-         params[3] = FLOAT_TO_BOOLEAN(ctx->Fog.Color[3]);
-         break;
-      case GL_FOG_DENSITY:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Fog.Density);
-         break;
-      case GL_FOG_END:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Fog.End);
-         break;
-      case GL_FOG_HINT:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Hint.Fog);
-         break;
-      case GL_FOG_INDEX:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Fog.Index);
-         break;
-      case GL_FOG_MODE:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Fog.Mode);
-         break;
-      case GL_FOG_START:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Fog.Start);
-         break;
-      case GL_FRONT_FACE:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Polygon.FrontFace);
-         break;
-      case GL_GREEN_BIAS:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Pixel.GreenBias);
-         break;
-      case GL_GREEN_BITS:
-         params[0] = INT_TO_BOOLEAN(ctx->DrawBuffer->Visual.greenBits);
-         break;
-      case GL_GREEN_SCALE:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Pixel.GreenScale);
-         break;
-      case GL_INDEX_BITS:
-         params[0] = INT_TO_BOOLEAN(ctx->DrawBuffer->Visual.indexBits);
-         break;
-      case GL_INDEX_CLEAR_VALUE:
-         params[0] = INT_TO_BOOLEAN(ctx->Color.ClearIndex);
-         break;
-      case GL_INDEX_MODE:
-         params[0] = GL_FALSE;
-         break;
-      case GL_INDEX_OFFSET:
-         params[0] = INT_TO_BOOLEAN(ctx->Pixel.IndexOffset);
-         break;
-      case GL_INDEX_SHIFT:
-         params[0] = INT_TO_BOOLEAN(ctx->Pixel.IndexShift);
-         break;
-      case GL_INDEX_WRITEMASK:
-         params[0] = INT_TO_BOOLEAN(ctx->Color.IndexMask);
-         break;
-      case GL_LIGHT0:
-         params[0] = ctx->Light.Light[0].Enabled;
-         break;
-      case GL_LIGHT1:
-         params[0] = ctx->Light.Light[1].Enabled;
-         break;
-      case GL_LIGHT2:
-         params[0] = ctx->Light.Light[2].Enabled;
-         break;
-      case GL_LIGHT3:
-         params[0] = ctx->Light.Light[3].Enabled;
-         break;
-      case GL_LIGHT4:
-         params[0] = ctx->Light.Light[4].Enabled;
-         break;
-      case GL_LIGHT5:
-         params[0] = ctx->Light.Light[5].Enabled;
-         break;
-      case GL_LIGHT6:
-         params[0] = ctx->Light.Light[6].Enabled;
-         break;
-      case GL_LIGHT7:
-         params[0] = ctx->Light.Light[7].Enabled;
-         break;
-      case GL_LIGHTING:
-         params[0] = ctx->Light.Enabled;
-         break;
-      case GL_LIGHT_MODEL_AMBIENT:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Light.Model.Ambient[0]);
-         params[1] = FLOAT_TO_BOOLEAN(ctx->Light.Model.Ambient[1]);
-         params[2] = FLOAT_TO_BOOLEAN(ctx->Light.Model.Ambient[2]);
-         params[3] = FLOAT_TO_BOOLEAN(ctx->Light.Model.Ambient[3]);
-         break;
-      case GL_LIGHT_MODEL_COLOR_CONTROL:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Light.Model.ColorControl);
-         break;
-      case GL_LIGHT_MODEL_LOCAL_VIEWER:
-         params[0] = ctx->Light.Model.LocalViewer;
-         break;
-      case GL_LIGHT_MODEL_TWO_SIDE:
-         params[0] = ctx->Light.Model.TwoSide;
-         break;
-      case GL_LINE_SMOOTH:
-         params[0] = ctx->Line.SmoothFlag;
-         break;
-      case GL_LINE_SMOOTH_HINT:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Hint.LineSmooth);
-         break;
-      case GL_LINE_STIPPLE:
-         params[0] = ctx->Line.StippleFlag;
-         break;
-      case GL_LINE_STIPPLE_PATTERN:
-         params[0] = INT_TO_BOOLEAN(ctx->Line.StipplePattern);
-         break;
-      case GL_LINE_STIPPLE_REPEAT:
-         params[0] = INT_TO_BOOLEAN(ctx->Line.StippleFactor);
-         break;
-      case GL_LINE_WIDTH:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Line.Width);
-         break;
-      case GL_LINE_WIDTH_GRANULARITY:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Const.LineWidthGranularity);
-         break;
-      case GL_LINE_WIDTH_RANGE:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Const.MinLineWidthAA);
-         params[1] = FLOAT_TO_BOOLEAN(ctx->Const.MaxLineWidthAA);
-         break;
-      case GL_ALIASED_LINE_WIDTH_RANGE:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Const.MinLineWidth);
-         params[1] = FLOAT_TO_BOOLEAN(ctx->Const.MaxLineWidth);
-         break;
-      case GL_LIST_BASE:
-         params[0] = INT_TO_BOOLEAN(ctx->List.ListBase);
-         break;
-      case GL_LIST_INDEX:
-         params[0] = INT_TO_BOOLEAN((ctx->ListState.CurrentList ? ctx->ListState.CurrentList->Name : 0));
-         break;
-      case GL_LIST_MODE:
-         {
-         GLenum mode;
-         if (!ctx->CompileFlag)
-            mode = 0;
-         else if (ctx->ExecuteFlag)
-            mode = GL_COMPILE_AND_EXECUTE;
-         else
-            mode = GL_COMPILE;
-         params[0] = ENUM_TO_BOOLEAN(mode);
-         }
-         break;
-      case GL_INDEX_LOGIC_OP:
-         params[0] = ctx->Color.IndexLogicOpEnabled;
-         break;
-      case GL_COLOR_LOGIC_OP:
-         params[0] = ctx->Color.ColorLogicOpEnabled;
-         break;
-      case GL_LOGIC_OP_MODE:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Color.LogicOp);
-         break;
-      case GL_MAP1_COLOR_4:
-         params[0] = ctx->Eval.Map1Color4;
-         break;
-      case GL_MAP1_GRID_DOMAIN:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Eval.MapGrid1u1);
-         params[1] = FLOAT_TO_BOOLEAN(ctx->Eval.MapGrid1u2);
-         break;
-      case GL_MAP1_GRID_SEGMENTS:
-         params[0] = INT_TO_BOOLEAN(ctx->Eval.MapGrid1un);
-         break;
-      case GL_MAP1_INDEX:
-         params[0] = ctx->Eval.Map1Index;
-         break;
-      case GL_MAP1_NORMAL:
-         params[0] = ctx->Eval.Map1Normal;
-         break;
-      case GL_MAP1_TEXTURE_COORD_1:
-         params[0] = ctx->Eval.Map1TextureCoord1;
-         break;
-      case GL_MAP1_TEXTURE_COORD_2:
-         params[0] = ctx->Eval.Map1TextureCoord2;
-         break;
-      case GL_MAP1_TEXTURE_COORD_3:
-         params[0] = ctx->Eval.Map1TextureCoord3;
-         break;
-      case GL_MAP1_TEXTURE_COORD_4:
-         params[0] = ctx->Eval.Map1TextureCoord4;
-         break;
-      case GL_MAP1_VERTEX_3:
-         params[0] = ctx->Eval.Map1Vertex3;
-         break;
-      case GL_MAP1_VERTEX_4:
-         params[0] = ctx->Eval.Map1Vertex4;
-         break;
-      case GL_MAP2_COLOR_4:
-         params[0] = ctx->Eval.Map2Color4;
-         break;
-      case GL_MAP2_GRID_DOMAIN:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Eval.MapGrid2u1);
-         params[1] = FLOAT_TO_BOOLEAN(ctx->Eval.MapGrid2u2);
-         params[2] = FLOAT_TO_BOOLEAN(ctx->Eval.MapGrid2v1);
-         params[3] = FLOAT_TO_BOOLEAN(ctx->Eval.MapGrid2v2);
-         break;
-      case GL_MAP2_GRID_SEGMENTS:
-         params[0] = INT_TO_BOOLEAN(ctx->Eval.MapGrid2un);
-         params[1] = INT_TO_BOOLEAN(ctx->Eval.MapGrid2vn);
-         break;
-      case GL_MAP2_INDEX:
-         params[0] = ctx->Eval.Map2Index;
-         break;
-      case GL_MAP2_NORMAL:
-         params[0] = ctx->Eval.Map2Normal;
-         break;
-      case GL_MAP2_TEXTURE_COORD_1:
-         params[0] = ctx->Eval.Map2TextureCoord1;
-         break;
-      case GL_MAP2_TEXTURE_COORD_2:
-         params[0] = ctx->Eval.Map2TextureCoord2;
-         break;
-      case GL_MAP2_TEXTURE_COORD_3:
-         params[0] = ctx->Eval.Map2TextureCoord3;
-         break;
-      case GL_MAP2_TEXTURE_COORD_4:
-         params[0] = ctx->Eval.Map2TextureCoord4;
-         break;
-      case GL_MAP2_VERTEX_3:
-         params[0] = ctx->Eval.Map2Vertex3;
-         break;
-      case GL_MAP2_VERTEX_4:
-         params[0] = ctx->Eval.Map2Vertex4;
-         break;
-      case GL_MAP_COLOR:
-         params[0] = ctx->Pixel.MapColorFlag;
-         break;
-      case GL_MAP_STENCIL:
-         params[0] = ctx->Pixel.MapStencilFlag;
-         break;
-      case GL_MATRIX_MODE:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Transform.MatrixMode);
-         break;
-      case GL_MAX_ATTRIB_STACK_DEPTH:
-         params[0] = INT_TO_BOOLEAN(MAX_ATTRIB_STACK_DEPTH);
-         break;
-      case GL_MAX_CLIENT_ATTRIB_STACK_DEPTH:
-         params[0] = INT_TO_BOOLEAN(MAX_CLIENT_ATTRIB_STACK_DEPTH);
-         break;
-      case GL_MAX_CLIP_PLANES:
-         params[0] = INT_TO_BOOLEAN(ctx->Const.MaxClipPlanes);
-         break;
-      case GL_MAX_ELEMENTS_VERTICES:
-         params[0] = INT_TO_BOOLEAN(ctx->Const.MaxArrayLockSize);
-         break;
-      case GL_MAX_ELEMENTS_INDICES:
-         params[0] = INT_TO_BOOLEAN(ctx->Const.MaxArrayLockSize);
-         break;
-      case GL_MAX_EVAL_ORDER:
-         params[0] = INT_TO_BOOLEAN(MAX_EVAL_ORDER);
-         break;
-      case GL_MAX_LIGHTS:
-         params[0] = INT_TO_BOOLEAN(ctx->Const.MaxLights);
-         break;
-      case GL_MAX_LIST_NESTING:
-         params[0] = INT_TO_BOOLEAN(MAX_LIST_NESTING);
-         break;
-      case GL_MAX_MODELVIEW_STACK_DEPTH:
-         params[0] = INT_TO_BOOLEAN(MAX_MODELVIEW_STACK_DEPTH);
-         break;
-      case GL_MAX_NAME_STACK_DEPTH:
-         params[0] = INT_TO_BOOLEAN(MAX_NAME_STACK_DEPTH);
-         break;
-      case GL_MAX_PIXEL_MAP_TABLE:
-         params[0] = INT_TO_BOOLEAN(MAX_PIXEL_MAP_TABLE);
-         break;
-      case GL_MAX_PROJECTION_STACK_DEPTH:
-         params[0] = INT_TO_BOOLEAN(MAX_PROJECTION_STACK_DEPTH);
-         break;
-      case GL_MAX_TEXTURE_SIZE:
-         params[0] = INT_TO_BOOLEAN(1 << (ctx->Const.MaxTextureLevels - 1));
-         break;
-      case GL_MAX_3D_TEXTURE_SIZE:
-         params[0] = INT_TO_BOOLEAN(1 << (ctx->Const.Max3DTextureLevels - 1));
-         break;
-      case GL_MAX_TEXTURE_STACK_DEPTH:
-         params[0] = INT_TO_BOOLEAN(MAX_TEXTURE_STACK_DEPTH);
-         break;
-      case GL_MAX_VIEWPORT_DIMS:
-         params[0] = INT_TO_BOOLEAN(ctx->Const.MaxViewportWidth);
-         params[1] = INT_TO_BOOLEAN(ctx->Const.MaxViewportHeight);
-         break;
-      case GL_MODELVIEW_MATRIX:
-         {
-         const GLfloat *matrix = ctx->ModelviewMatrixStack.Top->m;
-         params[0] = FLOAT_TO_BOOLEAN(matrix[0]);
-         params[1] = FLOAT_TO_BOOLEAN(matrix[1]);
-         params[2] = FLOAT_TO_BOOLEAN(matrix[2]);
-         params[3] = FLOAT_TO_BOOLEAN(matrix[3]);
-         params[4] = FLOAT_TO_BOOLEAN(matrix[4]);
-         params[5] = FLOAT_TO_BOOLEAN(matrix[5]);
-         params[6] = FLOAT_TO_BOOLEAN(matrix[6]);
-         params[7] = FLOAT_TO_BOOLEAN(matrix[7]);
-         params[8] = FLOAT_TO_BOOLEAN(matrix[8]);
-         params[9] = FLOAT_TO_BOOLEAN(matrix[9]);
-         params[10] = FLOAT_TO_BOOLEAN(matrix[10]);
-         params[11] = FLOAT_TO_BOOLEAN(matrix[11]);
-         params[12] = FLOAT_TO_BOOLEAN(matrix[12]);
-         params[13] = FLOAT_TO_BOOLEAN(matrix[13]);
-         params[14] = FLOAT_TO_BOOLEAN(matrix[14]);
-         params[15] = FLOAT_TO_BOOLEAN(matrix[15]);
-         }
-         break;
-      case GL_MODELVIEW_STACK_DEPTH:
-         params[0] = INT_TO_BOOLEAN(ctx->ModelviewMatrixStack.Depth + 1);
-         break;
-      case GL_NAME_STACK_DEPTH:
-         params[0] = INT_TO_BOOLEAN(ctx->Select.NameStackDepth);
-         break;
-      case GL_NORMALIZE:
-         params[0] = ctx->Transform.Normalize;
-         break;
-      case GL_PACK_ALIGNMENT:
-         params[0] = INT_TO_BOOLEAN(ctx->Pack.Alignment);
-         break;
-      case GL_PACK_LSB_FIRST:
-         params[0] = ctx->Pack.LsbFirst;
-         break;
-      case GL_PACK_ROW_LENGTH:
-         params[0] = INT_TO_BOOLEAN(ctx->Pack.RowLength);
-         break;
-      case GL_PACK_SKIP_PIXELS:
-         params[0] = INT_TO_BOOLEAN(ctx->Pack.SkipPixels);
-         break;
-      case GL_PACK_SKIP_ROWS:
-         params[0] = INT_TO_BOOLEAN(ctx->Pack.SkipRows);
-         break;
-      case GL_PACK_SWAP_BYTES:
-         params[0] = ctx->Pack.SwapBytes;
-         break;
-      case GL_PACK_SKIP_IMAGES_EXT:
-         params[0] = INT_TO_BOOLEAN(ctx->Pack.SkipImages);
-         break;
-      case GL_PACK_IMAGE_HEIGHT_EXT:
-         params[0] = INT_TO_BOOLEAN(ctx->Pack.ImageHeight);
-         break;
-      case GL_PACK_INVERT_MESA:
-         params[0] = ctx->Pack.Invert;
-         break;
-      case GL_PERSPECTIVE_CORRECTION_HINT:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Hint.PerspectiveCorrection);
-         break;
-      case GL_PIXEL_MAP_A_TO_A_SIZE:
-         params[0] = INT_TO_BOOLEAN(ctx->PixelMaps.AtoA.Size);
-         break;
-      case GL_PIXEL_MAP_B_TO_B_SIZE:
-         params[0] = INT_TO_BOOLEAN(ctx->PixelMaps.BtoB.Size);
-         break;
-      case GL_PIXEL_MAP_G_TO_G_SIZE:
-         params[0] = INT_TO_BOOLEAN(ctx->PixelMaps.GtoG.Size);
-         break;
-      case GL_PIXEL_MAP_I_TO_A_SIZE:
-         params[0] = INT_TO_BOOLEAN(ctx->PixelMaps.ItoA.Size);
-         break;
-      case GL_PIXEL_MAP_I_TO_B_SIZE:
-         params[0] = INT_TO_BOOLEAN(ctx->PixelMaps.ItoB.Size);
-         break;
-      case GL_PIXEL_MAP_I_TO_G_SIZE:
-         params[0] = INT_TO_BOOLEAN(ctx->PixelMaps.ItoG.Size);
-         break;
-      case GL_PIXEL_MAP_I_TO_I_SIZE:
-         params[0] = INT_TO_BOOLEAN(ctx->PixelMaps.ItoI.Size);
-         break;
-      case GL_PIXEL_MAP_I_TO_R_SIZE:
-         params[0] = INT_TO_BOOLEAN(ctx->PixelMaps.ItoR.Size);
-         break;
-      case GL_PIXEL_MAP_R_TO_R_SIZE:
-         params[0] = INT_TO_BOOLEAN(ctx->PixelMaps.RtoR.Size);
-         break;
-      case GL_PIXEL_MAP_S_TO_S_SIZE:
-         params[0] = INT_TO_BOOLEAN(ctx->PixelMaps.StoS.Size);
-         break;
-      case GL_POINT_SIZE:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Point.Size);
-         break;
-      case GL_POINT_SIZE_GRANULARITY:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Const.PointSizeGranularity);
-         break;
-      case GL_POINT_SIZE_RANGE:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Const.MinPointSizeAA);
-         params[1] = FLOAT_TO_BOOLEAN(ctx->Const.MaxPointSizeAA);
-         break;
-      case GL_ALIASED_POINT_SIZE_RANGE:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Const.MinPointSize);
-         params[1] = FLOAT_TO_BOOLEAN(ctx->Const.MaxPointSize);
-         break;
-      case GL_POINT_SMOOTH:
-         params[0] = ctx->Point.SmoothFlag;
-         break;
-      case GL_POINT_SMOOTH_HINT:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Hint.PointSmooth);
-         break;
-      case GL_POINT_SIZE_MIN_EXT:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Point.MinSize);
-         break;
-      case GL_POINT_SIZE_MAX_EXT:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Point.MaxSize);
-         break;
-      case GL_POINT_FADE_THRESHOLD_SIZE_EXT:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Point.Threshold);
-         break;
-      case GL_DISTANCE_ATTENUATION_EXT:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Point.Params[0]);
-         params[1] = FLOAT_TO_BOOLEAN(ctx->Point.Params[1]);
-         params[2] = FLOAT_TO_BOOLEAN(ctx->Point.Params[2]);
-         break;
-      case GL_POLYGON_MODE:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Polygon.FrontMode);
-         params[1] = ENUM_TO_BOOLEAN(ctx->Polygon.BackMode);
-         break;
-      case GL_POLYGON_OFFSET_BIAS_EXT:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Polygon.OffsetUnits);
-         break;
-      case GL_POLYGON_OFFSET_FACTOR:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Polygon.OffsetFactor );
-         break;
-      case GL_POLYGON_OFFSET_UNITS:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Polygon.OffsetUnits );
-         break;
-      case GL_POLYGON_OFFSET_POINT:
-         params[0] = ctx->Polygon.OffsetPoint;
-         break;
-      case GL_POLYGON_OFFSET_LINE:
-         params[0] = ctx->Polygon.OffsetLine;
-         break;
-      case GL_POLYGON_OFFSET_FILL:
-         params[0] = ctx->Polygon.OffsetFill;
-         break;
-      case GL_POLYGON_SMOOTH:
-         params[0] = ctx->Polygon.SmoothFlag;
-         break;
-      case GL_POLYGON_SMOOTH_HINT:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Hint.PolygonSmooth);
-         break;
-      case GL_POLYGON_STIPPLE:
-         params[0] = ctx->Polygon.StippleFlag;
-         break;
-      case GL_PROJECTION_MATRIX:
-         {
-         const GLfloat *matrix = ctx->ProjectionMatrixStack.Top->m;
-         params[0] = FLOAT_TO_BOOLEAN(matrix[0]);
-         params[1] = FLOAT_TO_BOOLEAN(matrix[1]);
-         params[2] = FLOAT_TO_BOOLEAN(matrix[2]);
-         params[3] = FLOAT_TO_BOOLEAN(matrix[3]);
-         params[4] = FLOAT_TO_BOOLEAN(matrix[4]);
-         params[5] = FLOAT_TO_BOOLEAN(matrix[5]);
-         params[6] = FLOAT_TO_BOOLEAN(matrix[6]);
-         params[7] = FLOAT_TO_BOOLEAN(matrix[7]);
-         params[8] = FLOAT_TO_BOOLEAN(matrix[8]);
-         params[9] = FLOAT_TO_BOOLEAN(matrix[9]);
-         params[10] = FLOAT_TO_BOOLEAN(matrix[10]);
-         params[11] = FLOAT_TO_BOOLEAN(matrix[11]);
-         params[12] = FLOAT_TO_BOOLEAN(matrix[12]);
-         params[13] = FLOAT_TO_BOOLEAN(matrix[13]);
-         params[14] = FLOAT_TO_BOOLEAN(matrix[14]);
-         params[15] = FLOAT_TO_BOOLEAN(matrix[15]);
-         }
-         break;
-      case GL_PROJECTION_STACK_DEPTH:
-         params[0] = INT_TO_BOOLEAN(ctx->ProjectionMatrixStack.Depth + 1);
-         break;
-      case GL_READ_BUFFER:
-         params[0] = ENUM_TO_BOOLEAN(ctx->ReadBuffer->ColorReadBuffer);
-         break;
-      case GL_RED_BIAS:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Pixel.RedBias);
-         break;
-      case GL_RED_BITS:
-         params[0] = INT_TO_BOOLEAN(ctx->DrawBuffer->Visual.redBits);
-         break;
-      case GL_RED_SCALE:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Pixel.RedScale);
-         break;
-      case GL_RENDER_MODE:
-         params[0] = ENUM_TO_BOOLEAN(ctx->RenderMode);
-         break;
-      case GL_RESCALE_NORMAL:
-         params[0] = ctx->Transform.RescaleNormals;
-         break;
-      case GL_RGBA_MODE:
-         params[0] = GL_TRUE;
-         break;
-      case GL_SCISSOR_BOX:
-         params[0] = INT_TO_BOOLEAN(ctx->Scissor.X);
-         params[1] = INT_TO_BOOLEAN(ctx->Scissor.Y);
-         params[2] = INT_TO_BOOLEAN(ctx->Scissor.Width);
-         params[3] = INT_TO_BOOLEAN(ctx->Scissor.Height);
-         break;
-      case GL_SCISSOR_TEST:
-         params[0] = ctx->Scissor.Enabled;
-         break;
-      case GL_SELECTION_BUFFER_SIZE:
-         params[0] = INT_TO_BOOLEAN(ctx->Select.BufferSize);
-         break;
-      case GL_SHADE_MODEL:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Light.ShadeModel);
-         break;
-      case GL_SHARED_TEXTURE_PALETTE_EXT:
-         params[0] = ctx->Texture.SharedPalette;
-         break;
-      case GL_STENCIL_BITS:
-         params[0] = INT_TO_BOOLEAN(ctx->DrawBuffer->Visual.stencilBits);
-         break;
-      case GL_STENCIL_CLEAR_VALUE:
-         params[0] = INT_TO_BOOLEAN(ctx->Stencil.Clear);
-         break;
-      case GL_STENCIL_FAIL:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Stencil.FailFunc[ctx->Stencil.ActiveFace]);
-         break;
-      case GL_STENCIL_FUNC:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Stencil.Function[ctx->Stencil.ActiveFace]);
-         break;
-      case GL_STENCIL_PASS_DEPTH_FAIL:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Stencil.ZFailFunc[ctx->Stencil.ActiveFace]);
-         break;
-      case GL_STENCIL_PASS_DEPTH_PASS:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Stencil.ZPassFunc[ctx->Stencil.ActiveFace]);
-         break;
-      case GL_STENCIL_REF:
-         params[0] = INT_TO_BOOLEAN(ctx->Stencil.Ref[ctx->Stencil.ActiveFace]);
-         break;
-      case GL_STENCIL_TEST:
-         params[0] = ctx->Stencil.Enabled;
-         break;
-      case GL_STENCIL_VALUE_MASK:
-         params[0] = INT_TO_BOOLEAN(ctx->Stencil.ValueMask[ctx->Stencil.ActiveFace]);
-         break;
-      case GL_STENCIL_WRITEMASK:
-         params[0] = INT_TO_BOOLEAN(ctx->Stencil.WriteMask[ctx->Stencil.ActiveFace]);
-         break;
-      case GL_STEREO:
-         params[0] = ctx->DrawBuffer->Visual.stereoMode;
-         break;
-      case GL_SUBPIXEL_BITS:
-         params[0] = INT_TO_BOOLEAN(ctx->Const.SubPixelBits);
-         break;
-      case GL_TEXTURE_1D:
-         params[0] = _mesa_IsEnabled(GL_TEXTURE_1D);
-         break;
-      case GL_TEXTURE_2D:
-         params[0] = _mesa_IsEnabled(GL_TEXTURE_2D);
-         break;
-      case GL_TEXTURE_3D:
-         params[0] = _mesa_IsEnabled(GL_TEXTURE_3D);
-         break;
-      case GL_TEXTURE_1D_ARRAY_EXT:
-         CHECK_EXT1(MESA_texture_array, "GetBooleanv");
-         params[0] = _mesa_IsEnabled(GL_TEXTURE_1D_ARRAY_EXT);
-         break;
-      case GL_TEXTURE_2D_ARRAY_EXT:
-         CHECK_EXT1(MESA_texture_array, "GetBooleanv");
-         params[0] = _mesa_IsEnabled(GL_TEXTURE_2D_ARRAY_EXT);
-         break;
-      case GL_TEXTURE_BINDING_1D:
-         params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_1D_INDEX]->Name);
-         break;
-      case GL_TEXTURE_BINDING_2D:
-         params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_2D_INDEX]->Name);
-         break;
-      case GL_TEXTURE_BINDING_3D:
-         params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_3D_INDEX]->Name);
-         break;
-      case GL_TEXTURE_BINDING_1D_ARRAY_EXT:
-         CHECK_EXT1(MESA_texture_array, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_1D_ARRAY_INDEX]->Name);
-         break;
-      case GL_TEXTURE_BINDING_2D_ARRAY_EXT:
-         CHECK_EXT1(MESA_texture_array, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_2D_ARRAY_INDEX]->Name);
-         break;
-      case GL_TEXTURE_GEN_S:
-         params[0] = ((ctx->Texture.Unit[ctx->Texture.CurrentUnit].TexGenEnabled & S_BIT) ? 1 : 0);
-         break;
-      case GL_TEXTURE_GEN_T:
-         params[0] = ((ctx->Texture.Unit[ctx->Texture.CurrentUnit].TexGenEnabled & T_BIT) ? 1 : 0);
-         break;
-      case GL_TEXTURE_GEN_R:
-         params[0] = ((ctx->Texture.Unit[ctx->Texture.CurrentUnit].TexGenEnabled & R_BIT) ? 1 : 0);
-         break;
-      case GL_TEXTURE_GEN_Q:
-         params[0] = ((ctx->Texture.Unit[ctx->Texture.CurrentUnit].TexGenEnabled & Q_BIT) ? 1 : 0);
-         break;
-      case GL_TEXTURE_MATRIX:
-         {
-         const GLfloat *matrix;
-         const GLuint unit = ctx->Texture.CurrentUnit;
-         if (unit >= ctx->Const.MaxTextureCoordUnits) {
-            _mesa_error(ctx, GL_INVALID_OPERATION, "glGet(texture matrix %u)",
-                        unit);
-            return;
-         }
-         matrix = ctx->TextureMatrixStack[unit].Top->m;
-         params[0] = FLOAT_TO_BOOLEAN(matrix[0]);
-         params[1] = FLOAT_TO_BOOLEAN(matrix[1]);
-         params[2] = FLOAT_TO_BOOLEAN(matrix[2]);
-         params[3] = FLOAT_TO_BOOLEAN(matrix[3]);
-         params[4] = FLOAT_TO_BOOLEAN(matrix[4]);
-         params[5] = FLOAT_TO_BOOLEAN(matrix[5]);
-         params[6] = FLOAT_TO_BOOLEAN(matrix[6]);
-         params[7] = FLOAT_TO_BOOLEAN(matrix[7]);
-         params[8] = FLOAT_TO_BOOLEAN(matrix[8]);
-         params[9] = FLOAT_TO_BOOLEAN(matrix[9]);
-         params[10] = FLOAT_TO_BOOLEAN(matrix[10]);
-         params[11] = FLOAT_TO_BOOLEAN(matrix[11]);
-         params[12] = FLOAT_TO_BOOLEAN(matrix[12]);
-         params[13] = FLOAT_TO_BOOLEAN(matrix[13]);
-         params[14] = FLOAT_TO_BOOLEAN(matrix[14]);
-         params[15] = FLOAT_TO_BOOLEAN(matrix[15]);
-         }
-         break;
-      case GL_TEXTURE_STACK_DEPTH:
-         {
-         const GLuint unit = ctx->Texture.CurrentUnit;
-         if (unit >= ctx->Const.MaxTextureCoordUnits) {
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glGet(texture stack depth, unit %u)", unit);
-            return;
-         }
-         params[0] = INT_TO_BOOLEAN(ctx->TextureMatrixStack[unit].Depth + 1);
-         }
-         break;
-      case GL_UNPACK_ALIGNMENT:
-         params[0] = INT_TO_BOOLEAN(ctx->Unpack.Alignment);
-         break;
-      case GL_UNPACK_LSB_FIRST:
-         params[0] = ctx->Unpack.LsbFirst;
-         break;
-      case GL_UNPACK_ROW_LENGTH:
-         params[0] = INT_TO_BOOLEAN(ctx->Unpack.RowLength);
-         break;
-      case GL_UNPACK_SKIP_PIXELS:
-         params[0] = INT_TO_BOOLEAN(ctx->Unpack.SkipPixels);
-         break;
-      case GL_UNPACK_SKIP_ROWS:
-         params[0] = INT_TO_BOOLEAN(ctx->Unpack.SkipRows);
-         break;
-      case GL_UNPACK_SWAP_BYTES:
-         params[0] = ctx->Unpack.SwapBytes;
-         break;
-      case GL_UNPACK_SKIP_IMAGES_EXT:
-         params[0] = INT_TO_BOOLEAN(ctx->Unpack.SkipImages);
-         break;
-      case GL_UNPACK_IMAGE_HEIGHT_EXT:
-         params[0] = INT_TO_BOOLEAN(ctx->Unpack.ImageHeight);
-         break;
-      case GL_UNPACK_CLIENT_STORAGE_APPLE:
-         params[0] = ctx->Unpack.ClientStorage;
-         break;
-      case GL_VIEWPORT:
-         params[0] = INT_TO_BOOLEAN(ctx->Viewport.X);
-         params[1] = INT_TO_BOOLEAN(ctx->Viewport.Y);
-         params[2] = INT_TO_BOOLEAN(ctx->Viewport.Width);
-         params[3] = INT_TO_BOOLEAN(ctx->Viewport.Height);
-         break;
-      case GL_ZOOM_X:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Pixel.ZoomX);
-         break;
-      case GL_ZOOM_Y:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Pixel.ZoomY);
-         break;
-      case GL_VERTEX_ARRAY:
-         params[0] = ctx->Array.ArrayObj->Vertex.Enabled;
-         break;
-      case GL_VERTEX_ARRAY_SIZE:
-         params[0] = INT_TO_BOOLEAN(ctx->Array.ArrayObj->Vertex.Size);
-         break;
-      case GL_VERTEX_ARRAY_TYPE:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Array.ArrayObj->Vertex.Type);
-         break;
-      case GL_VERTEX_ARRAY_STRIDE:
-         params[0] = INT_TO_BOOLEAN(ctx->Array.ArrayObj->Vertex.Stride);
-         break;
-      case GL_VERTEX_ARRAY_COUNT_EXT:
-         params[0] = INT_TO_BOOLEAN(0);
-         break;
-      case GL_NORMAL_ARRAY:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Array.ArrayObj->Normal.Enabled);
-         break;
-      case GL_NORMAL_ARRAY_TYPE:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Array.ArrayObj->Normal.Type);
-         break;
-      case GL_NORMAL_ARRAY_STRIDE:
-         params[0] = INT_TO_BOOLEAN(ctx->Array.ArrayObj->Normal.Stride);
-         break;
-      case GL_NORMAL_ARRAY_COUNT_EXT:
-         params[0] = INT_TO_BOOLEAN(0);
-         break;
-      case GL_COLOR_ARRAY:
-         params[0] = ctx->Array.ArrayObj->Color.Enabled;
-         break;
-      case GL_COLOR_ARRAY_SIZE:
-         params[0] = INT_TO_BOOLEAN(ctx->Array.ArrayObj->Color.Size);
-         break;
-      case GL_COLOR_ARRAY_TYPE:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Array.ArrayObj->Color.Type);
-         break;
-      case GL_COLOR_ARRAY_STRIDE:
-         params[0] = INT_TO_BOOLEAN(ctx->Array.ArrayObj->Color.Stride);
-         break;
-      case GL_COLOR_ARRAY_COUNT_EXT:
-         params[0] = INT_TO_BOOLEAN(0);
-         break;
-      case GL_INDEX_ARRAY:
-         params[0] = ctx->Array.ArrayObj->Index.Enabled;
-         break;
-      case GL_INDEX_ARRAY_TYPE:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Array.ArrayObj->Index.Type);
-         break;
-      case GL_INDEX_ARRAY_STRIDE:
-         params[0] = INT_TO_BOOLEAN(ctx->Array.ArrayObj->Index.Stride);
-         break;
-      case GL_INDEX_ARRAY_COUNT_EXT:
-         params[0] = INT_TO_BOOLEAN(0);
-         break;
-      case GL_TEXTURE_COORD_ARRAY:
-         params[0] = ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].Enabled;
-         break;
-      case GL_TEXTURE_COORD_ARRAY_SIZE:
-         params[0] = INT_TO_BOOLEAN(ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].Size);
-         break;
-      case GL_TEXTURE_COORD_ARRAY_TYPE:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].Type);
-         break;
-      case GL_TEXTURE_COORD_ARRAY_STRIDE:
-         params[0] = INT_TO_BOOLEAN(ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].Stride);
-         break;
-      case GL_TEXTURE_COORD_ARRAY_COUNT_EXT:
-         params[0] = INT_TO_BOOLEAN(0);
-         break;
-      case GL_EDGE_FLAG_ARRAY:
-         params[0] = ctx->Array.ArrayObj->EdgeFlag.Enabled;
-         break;
-      case GL_EDGE_FLAG_ARRAY_STRIDE:
-         params[0] = INT_TO_BOOLEAN(ctx->Array.ArrayObj->EdgeFlag.Stride);
-         break;
-      case GL_EDGE_FLAG_ARRAY_COUNT_EXT:
-         params[0] = INT_TO_BOOLEAN(0);
-         break;
-      case GL_MAX_TEXTURE_UNITS_ARB:
-         CHECK_EXT1(ARB_multitexture, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->Const.MaxTextureUnits);
-         break;
-      case GL_ACTIVE_TEXTURE_ARB:
-         CHECK_EXT1(ARB_multitexture, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(GL_TEXTURE0_ARB + ctx->Texture.CurrentUnit);
-         break;
-      case GL_CLIENT_ACTIVE_TEXTURE_ARB:
-         CHECK_EXT1(ARB_multitexture, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(GL_TEXTURE0_ARB + ctx->Array.ActiveTexture);
-         break;
-      case GL_TEXTURE_CUBE_MAP_ARB:
-         CHECK_EXT1(ARB_texture_cube_map, "GetBooleanv");
-         params[0] = _mesa_IsEnabled(GL_TEXTURE_CUBE_MAP_ARB);
-         break;
-      case GL_TEXTURE_BINDING_CUBE_MAP_ARB:
-         CHECK_EXT1(ARB_texture_cube_map, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_CUBE_INDEX]->Name);
-         break;
-      case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB:
-         CHECK_EXT1(ARB_texture_cube_map, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN((1 << (ctx->Const.MaxCubeTextureLevels - 1)));
-         break;
-      case GL_TEXTURE_COMPRESSION_HINT_ARB:
-         params[0] = INT_TO_BOOLEAN(ctx->Hint.TextureCompression);
-         break;
-      case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB:
-         params[0] = INT_TO_BOOLEAN(_mesa_get_compressed_formats(ctx, NULL, GL_FALSE));
-         break;
-      case GL_COMPRESSED_TEXTURE_FORMATS_ARB:
-         {
-         GLint formats[100];
-         GLuint i, n = _mesa_get_compressed_formats(ctx, formats, GL_FALSE);
-         ASSERT(n <= 100);
-         for (i = 0; i < n; i++)
-            params[i] = ENUM_TO_BOOLEAN(formats[i]);
-         }
-         break;
-      case GL_ARRAY_ELEMENT_LOCK_FIRST_EXT:
-         CHECK_EXT1(EXT_compiled_vertex_array, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->Array.LockFirst);
-         break;
-      case GL_ARRAY_ELEMENT_LOCK_COUNT_EXT:
-         CHECK_EXT1(EXT_compiled_vertex_array, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->Array.LockCount);
-         break;
-      case GL_TRANSPOSE_COLOR_MATRIX_ARB:
-         {
-         const GLfloat *matrix = ctx->ColorMatrixStack.Top->m;
-         params[0] = FLOAT_TO_BOOLEAN(matrix[0]);
-         params[1] = FLOAT_TO_BOOLEAN(matrix[4]);
-         params[2] = FLOAT_TO_BOOLEAN(matrix[8]);
-         params[3] = FLOAT_TO_BOOLEAN(matrix[12]);
-         params[4] = FLOAT_TO_BOOLEAN(matrix[1]);
-         params[5] = FLOAT_TO_BOOLEAN(matrix[5]);
-         params[6] = FLOAT_TO_BOOLEAN(matrix[9]);
-         params[7] = FLOAT_TO_BOOLEAN(matrix[13]);
-         params[8] = FLOAT_TO_BOOLEAN(matrix[2]);
-         params[9] = FLOAT_TO_BOOLEAN(matrix[6]);
-         params[10] = FLOAT_TO_BOOLEAN(matrix[10]);
-         params[11] = FLOAT_TO_BOOLEAN(matrix[14]);
-         params[12] = FLOAT_TO_BOOLEAN(matrix[3]);
-         params[13] = FLOAT_TO_BOOLEAN(matrix[7]);
-         params[14] = FLOAT_TO_BOOLEAN(matrix[11]);
-         params[15] = FLOAT_TO_BOOLEAN(matrix[15]);
-         }
-         break;
-      case GL_TRANSPOSE_MODELVIEW_MATRIX_ARB:
-         {
-         const GLfloat *matrix = ctx->ModelviewMatrixStack.Top->m;
-         params[0] = FLOAT_TO_BOOLEAN(matrix[0]);
-         params[1] = FLOAT_TO_BOOLEAN(matrix[4]);
-         params[2] = FLOAT_TO_BOOLEAN(matrix[8]);
-         params[3] = FLOAT_TO_BOOLEAN(matrix[12]);
-         params[4] = FLOAT_TO_BOOLEAN(matrix[1]);
-         params[5] = FLOAT_TO_BOOLEAN(matrix[5]);
-         params[6] = FLOAT_TO_BOOLEAN(matrix[9]);
-         params[7] = FLOAT_TO_BOOLEAN(matrix[13]);
-         params[8] = FLOAT_TO_BOOLEAN(matrix[2]);
-         params[9] = FLOAT_TO_BOOLEAN(matrix[6]);
-         params[10] = FLOAT_TO_BOOLEAN(matrix[10]);
-         params[11] = FLOAT_TO_BOOLEAN(matrix[14]);
-         params[12] = FLOAT_TO_BOOLEAN(matrix[3]);
-         params[13] = FLOAT_TO_BOOLEAN(matrix[7]);
-         params[14] = FLOAT_TO_BOOLEAN(matrix[11]);
-         params[15] = FLOAT_TO_BOOLEAN(matrix[15]);
-         }
-         break;
-      case GL_TRANSPOSE_PROJECTION_MATRIX_ARB:
-         {
-         const GLfloat *matrix = ctx->ProjectionMatrixStack.Top->m;
-         params[0] = FLOAT_TO_BOOLEAN(matrix[0]);
-         params[1] = FLOAT_TO_BOOLEAN(matrix[4]);
-         params[2] = FLOAT_TO_BOOLEAN(matrix[8]);
-         params[3] = FLOAT_TO_BOOLEAN(matrix[12]);
-         params[4] = FLOAT_TO_BOOLEAN(matrix[1]);
-         params[5] = FLOAT_TO_BOOLEAN(matrix[5]);
-         params[6] = FLOAT_TO_BOOLEAN(matrix[9]);
-         params[7] = FLOAT_TO_BOOLEAN(matrix[13]);
-         params[8] = FLOAT_TO_BOOLEAN(matrix[2]);
-         params[9] = FLOAT_TO_BOOLEAN(matrix[6]);
-         params[10] = FLOAT_TO_BOOLEAN(matrix[10]);
-         params[11] = FLOAT_TO_BOOLEAN(matrix[14]);
-         params[12] = FLOAT_TO_BOOLEAN(matrix[3]);
-         params[13] = FLOAT_TO_BOOLEAN(matrix[7]);
-         params[14] = FLOAT_TO_BOOLEAN(matrix[11]);
-         params[15] = FLOAT_TO_BOOLEAN(matrix[15]);
-         }
-         break;
-      case GL_TRANSPOSE_TEXTURE_MATRIX_ARB:
-         {
-         const GLfloat *matrix = ctx->TextureMatrixStack[ctx->Texture.CurrentUnit].Top->m;
-         params[0] = FLOAT_TO_BOOLEAN(matrix[0]);
-         params[1] = FLOAT_TO_BOOLEAN(matrix[4]);
-         params[2] = FLOAT_TO_BOOLEAN(matrix[8]);
-         params[3] = FLOAT_TO_BOOLEAN(matrix[12]);
-         params[4] = FLOAT_TO_BOOLEAN(matrix[1]);
-         params[5] = FLOAT_TO_BOOLEAN(matrix[5]);
-         params[6] = FLOAT_TO_BOOLEAN(matrix[9]);
-         params[7] = FLOAT_TO_BOOLEAN(matrix[13]);
-         params[8] = FLOAT_TO_BOOLEAN(matrix[2]);
-         params[9] = FLOAT_TO_BOOLEAN(matrix[6]);
-         params[10] = FLOAT_TO_BOOLEAN(matrix[10]);
-         params[11] = FLOAT_TO_BOOLEAN(matrix[14]);
-         params[12] = FLOAT_TO_BOOLEAN(matrix[3]);
-         params[13] = FLOAT_TO_BOOLEAN(matrix[7]);
-         params[14] = FLOAT_TO_BOOLEAN(matrix[11]);
-         params[15] = FLOAT_TO_BOOLEAN(matrix[15]);
-         }
-         break;
-      case GL_COLOR_MATRIX_SGI:
-         {
-         const GLfloat *matrix = ctx->ColorMatrixStack.Top->m;
-         params[0] = FLOAT_TO_BOOLEAN(matrix[0]);
-         params[1] = FLOAT_TO_BOOLEAN(matrix[1]);
-         params[2] = FLOAT_TO_BOOLEAN(matrix[2]);
-         params[3] = FLOAT_TO_BOOLEAN(matrix[3]);
-         params[4] = FLOAT_TO_BOOLEAN(matrix[4]);
-         params[5] = FLOAT_TO_BOOLEAN(matrix[5]);
-         params[6] = FLOAT_TO_BOOLEAN(matrix[6]);
-         params[7] = FLOAT_TO_BOOLEAN(matrix[7]);
-         params[8] = FLOAT_TO_BOOLEAN(matrix[8]);
-         params[9] = FLOAT_TO_BOOLEAN(matrix[9]);
-         params[10] = FLOAT_TO_BOOLEAN(matrix[10]);
-         params[11] = FLOAT_TO_BOOLEAN(matrix[11]);
-         params[12] = FLOAT_TO_BOOLEAN(matrix[12]);
-         params[13] = FLOAT_TO_BOOLEAN(matrix[13]);
-         params[14] = FLOAT_TO_BOOLEAN(matrix[14]);
-         params[15] = FLOAT_TO_BOOLEAN(matrix[15]);
-         }
-         break;
-      case GL_COLOR_MATRIX_STACK_DEPTH_SGI:
-         params[0] = INT_TO_BOOLEAN(ctx->ColorMatrixStack.Depth + 1);
-         break;
-      case GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI:
-         params[0] = INT_TO_BOOLEAN(MAX_COLOR_STACK_DEPTH);
-         break;
-      case GL_POST_COLOR_MATRIX_RED_SCALE_SGI:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Pixel.PostColorMatrixScale[0]);
-         break;
-      case GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Pixel.PostColorMatrixScale[1]);
-         break;
-      case GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Pixel.PostColorMatrixScale[2]);
-         break;
-      case GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Pixel.PostColorMatrixScale[3]);
-         break;
-      case GL_POST_COLOR_MATRIX_RED_BIAS_SGI:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Pixel.PostColorMatrixBias[0]);
-         break;
-      case GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Pixel.PostColorMatrixBias[1]);
-         break;
-      case GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Pixel.PostColorMatrixBias[2]);
-         break;
-      case GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Pixel.PostColorMatrixBias[3]);
-         break;
-      case GL_CONVOLUTION_1D_EXT:
-         CHECK_EXT1(EXT_convolution, "GetBooleanv");
-         params[0] = ctx->Pixel.Convolution1DEnabled;
-         break;
-      case GL_CONVOLUTION_2D_EXT:
-         CHECK_EXT1(EXT_convolution, "GetBooleanv");
-         params[0] = ctx->Pixel.Convolution2DEnabled;
-         break;
-      case GL_SEPARABLE_2D_EXT:
-         CHECK_EXT1(EXT_convolution, "GetBooleanv");
-         params[0] = ctx->Pixel.Separable2DEnabled;
-         break;
-      case GL_POST_CONVOLUTION_RED_SCALE_EXT:
-         CHECK_EXT1(EXT_convolution, "GetBooleanv");
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Pixel.PostConvolutionScale[0]);
-         break;
-      case GL_POST_CONVOLUTION_GREEN_SCALE_EXT:
-         CHECK_EXT1(EXT_convolution, "GetBooleanv");
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Pixel.PostConvolutionScale[1]);
-         break;
-      case GL_POST_CONVOLUTION_BLUE_SCALE_EXT:
-         CHECK_EXT1(EXT_convolution, "GetBooleanv");
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Pixel.PostConvolutionScale[2]);
-         break;
-      case GL_POST_CONVOLUTION_ALPHA_SCALE_EXT:
-         CHECK_EXT1(EXT_convolution, "GetBooleanv");
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Pixel.PostConvolutionScale[3]);
-         break;
-      case GL_POST_CONVOLUTION_RED_BIAS_EXT:
-         CHECK_EXT1(EXT_convolution, "GetBooleanv");
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Pixel.PostConvolutionBias[0]);
-         break;
-      case GL_POST_CONVOLUTION_GREEN_BIAS_EXT:
-         CHECK_EXT1(EXT_convolution, "GetBooleanv");
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Pixel.PostConvolutionBias[1]);
-         break;
-      case GL_POST_CONVOLUTION_BLUE_BIAS_EXT:
-         CHECK_EXT1(EXT_convolution, "GetBooleanv");
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Pixel.PostConvolutionBias[2]);
-         break;
-      case GL_POST_CONVOLUTION_ALPHA_BIAS_EXT:
-         CHECK_EXT1(EXT_convolution, "GetBooleanv");
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Pixel.PostConvolutionBias[3]);
-         break;
-      case GL_HISTOGRAM:
-         CHECK_EXT1(EXT_histogram, "GetBooleanv");
-         params[0] = ctx->Pixel.HistogramEnabled;
-         break;
-      case GL_MINMAX:
-         CHECK_EXT1(EXT_histogram, "GetBooleanv");
-         params[0] = ctx->Pixel.MinMaxEnabled;
-         break;
-      case GL_COLOR_TABLE_SGI:
-         CHECK_EXT1(SGI_color_table, "GetBooleanv");
-         params[0] = ctx->Pixel.ColorTableEnabled[COLORTABLE_PRECONVOLUTION];
-         break;
-      case GL_POST_CONVOLUTION_COLOR_TABLE_SGI:
-         CHECK_EXT1(SGI_color_table, "GetBooleanv");
-         params[0] = ctx->Pixel.ColorTableEnabled[COLORTABLE_POSTCONVOLUTION];
-         break;
-      case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
-         CHECK_EXT1(SGI_color_table, "GetBooleanv");
-         params[0] = ctx->Pixel.ColorTableEnabled[COLORTABLE_POSTCOLORMATRIX];
-         break;
-      case GL_TEXTURE_COLOR_TABLE_SGI:
-         CHECK_EXT1(SGI_texture_color_table, "GetBooleanv");
-         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].ColorTableEnabled;
-         break;
-      case GL_COLOR_SUM_EXT:
-         CHECK_EXT2(EXT_secondary_color, ARB_vertex_program, "GetBooleanv");
-         params[0] = ctx->Fog.ColorSumEnabled;
-         break;
-      case GL_CURRENT_SECONDARY_COLOR_EXT:
-         CHECK_EXT1(EXT_secondary_color, "GetBooleanv");
-         {
-         FLUSH_CURRENT(ctx, 0);
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][0]);
-         params[1] = FLOAT_TO_BOOLEAN(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][1]);
-         params[2] = FLOAT_TO_BOOLEAN(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][2]);
-         params[3] = FLOAT_TO_BOOLEAN(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][3]);
-         }
-         break;
-      case GL_SECONDARY_COLOR_ARRAY_EXT:
-         CHECK_EXT1(EXT_secondary_color, "GetBooleanv");
-         params[0] = ctx->Array.ArrayObj->SecondaryColor.Enabled;
-         break;
-      case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT:
-         CHECK_EXT1(EXT_secondary_color, "GetBooleanv");
-         params[0] = ENUM_TO_BOOLEAN(ctx->Array.ArrayObj->SecondaryColor.Type);
-         break;
-      case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT:
-         CHECK_EXT1(EXT_secondary_color, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->Array.ArrayObj->SecondaryColor.Stride);
-         break;
-      case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT:
-         CHECK_EXT1(EXT_secondary_color, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->Array.ArrayObj->SecondaryColor.Size);
-         break;
-      case GL_CURRENT_FOG_COORDINATE_EXT:
-         CHECK_EXT1(EXT_fog_coord, "GetBooleanv");
-         {
-         FLUSH_CURRENT(ctx, 0);
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Current.Attrib[VERT_ATTRIB_FOG][0]);
-         }
-         break;
-      case GL_FOG_COORDINATE_ARRAY_EXT:
-         CHECK_EXT1(EXT_fog_coord, "GetBooleanv");
-         params[0] = ctx->Array.ArrayObj->FogCoord.Enabled;
-         break;
-      case GL_FOG_COORDINATE_ARRAY_TYPE_EXT:
-         CHECK_EXT1(EXT_fog_coord, "GetBooleanv");
-         params[0] = ENUM_TO_BOOLEAN(ctx->Array.ArrayObj->FogCoord.Type);
-         break;
-      case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT:
-         CHECK_EXT1(EXT_fog_coord, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->Array.ArrayObj->FogCoord.Stride);
-         break;
-      case GL_FOG_COORDINATE_SOURCE_EXT:
-         CHECK_EXT1(EXT_fog_coord, "GetBooleanv");
-         params[0] = ENUM_TO_BOOLEAN(ctx->Fog.FogCoordinateSource);
-         break;
-      case GL_MAX_TEXTURE_LOD_BIAS_EXT:
-         CHECK_EXT1(EXT_texture_lod_bias, "GetBooleanv");
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Const.MaxTextureLodBias);
-         break;
-      case GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT:
-         CHECK_EXT1(EXT_texture_filter_anisotropic, "GetBooleanv");
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Const.MaxTextureMaxAnisotropy);
-         break;
-      case GL_MULTISAMPLE_ARB:
-         params[0] = ctx->Multisample.Enabled;
-         break;
-      case GL_SAMPLE_ALPHA_TO_COVERAGE_ARB:
-         params[0] = ctx->Multisample.SampleAlphaToCoverage;
-         break;
-      case GL_SAMPLE_ALPHA_TO_ONE_ARB:
-         params[0] = ctx->Multisample.SampleAlphaToOne;
-         break;
-      case GL_SAMPLE_COVERAGE_ARB:
-         params[0] = ctx->Multisample.SampleCoverage;
-         break;
-      case GL_SAMPLE_COVERAGE_VALUE_ARB:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Multisample.SampleCoverageValue);
-         break;
-      case GL_SAMPLE_COVERAGE_INVERT_ARB:
-         params[0] = ctx->Multisample.SampleCoverageInvert;
-         break;
-      case GL_SAMPLE_BUFFERS_ARB:
-         params[0] = INT_TO_BOOLEAN(ctx->DrawBuffer->Visual.sampleBuffers);
-         break;
-      case GL_SAMPLES_ARB:
-         params[0] = INT_TO_BOOLEAN(ctx->DrawBuffer->Visual.samples);
-         break;
-      case GL_RASTER_POSITION_UNCLIPPED_IBM:
-         CHECK_EXT1(IBM_rasterpos_clip, "GetBooleanv");
-         params[0] = ctx->Transform.RasterPositionUnclipped;
-         break;
-      case GL_POINT_SPRITE_NV:
-         CHECK_EXT2(NV_point_sprite, ARB_point_sprite, "GetBooleanv");
-         params[0] = ctx->Point.PointSprite;
-         break;
-      case GL_POINT_SPRITE_R_MODE_NV:
-         CHECK_EXT1(NV_point_sprite, "GetBooleanv");
-         params[0] = ENUM_TO_BOOLEAN(ctx->Point.SpriteRMode);
-         break;
-      case GL_POINT_SPRITE_COORD_ORIGIN:
-         CHECK_EXT2(NV_point_sprite, ARB_point_sprite, "GetBooleanv");
-         params[0] = ENUM_TO_BOOLEAN(ctx->Point.SpriteOrigin);
-         break;
-      case GL_GENERATE_MIPMAP_HINT_SGIS:
-         CHECK_EXT1(SGIS_generate_mipmap, "GetBooleanv");
-         params[0] = ENUM_TO_BOOLEAN(ctx->Hint.GenerateMipmap);
-         break;
-      case GL_VERTEX_PROGRAM_BINDING_NV:
-         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN((ctx->VertexProgram.Current ? ctx->VertexProgram.Current->Base.Id : 0));
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY0_NV:
-         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
-         params[0] = ctx->Array.ArrayObj->VertexAttrib[0].Enabled;
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY1_NV:
-         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
-         params[0] = ctx->Array.ArrayObj->VertexAttrib[1].Enabled;
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY2_NV:
-         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
-         params[0] = ctx->Array.ArrayObj->VertexAttrib[2].Enabled;
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY3_NV:
-         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
-         params[0] = ctx->Array.ArrayObj->VertexAttrib[3].Enabled;
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
-         params[0] = ctx->Array.ArrayObj->VertexAttrib[4].Enabled;
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY5_NV:
-         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
-         params[0] = ctx->Array.ArrayObj->VertexAttrib[5].Enabled;
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY6_NV:
-         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
-         params[0] = ctx->Array.ArrayObj->VertexAttrib[6].Enabled;
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY7_NV:
-         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
-         params[0] = ctx->Array.ArrayObj->VertexAttrib[7].Enabled;
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY8_NV:
-         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
-         params[0] = ctx->Array.ArrayObj->VertexAttrib[8].Enabled;
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY9_NV:
-         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
-         params[0] = ctx->Array.ArrayObj->VertexAttrib[9].Enabled;
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY10_NV:
-         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
-         params[0] = ctx->Array.ArrayObj->VertexAttrib[10].Enabled;
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY11_NV:
-         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
-         params[0] = ctx->Array.ArrayObj->VertexAttrib[11].Enabled;
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY12_NV:
-         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
-         params[0] = ctx->Array.ArrayObj->VertexAttrib[12].Enabled;
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY13_NV:
-         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
-         params[0] = ctx->Array.ArrayObj->VertexAttrib[13].Enabled;
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY14_NV:
-         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
-         params[0] = ctx->Array.ArrayObj->VertexAttrib[14].Enabled;
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY15_NV:
-         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
-         params[0] = ctx->Array.ArrayObj->VertexAttrib[15].Enabled;
-         break;
-      case GL_MAP1_VERTEX_ATTRIB0_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
-         params[0] = ctx->Eval.Map1Attrib[0];
-         break;
-      case GL_MAP1_VERTEX_ATTRIB1_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
-         params[0] = ctx->Eval.Map1Attrib[1];
-         break;
-      case GL_MAP1_VERTEX_ATTRIB2_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
-         params[0] = ctx->Eval.Map1Attrib[2];
-         break;
-      case GL_MAP1_VERTEX_ATTRIB3_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
-         params[0] = ctx->Eval.Map1Attrib[3];
-         break;
-      case GL_MAP1_VERTEX_ATTRIB4_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
-         params[0] = ctx->Eval.Map1Attrib[4];
-         break;
-      case GL_MAP1_VERTEX_ATTRIB5_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
-         params[0] = ctx->Eval.Map1Attrib[5];
-         break;
-      case GL_MAP1_VERTEX_ATTRIB6_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
-         params[0] = ctx->Eval.Map1Attrib[6];
-         break;
-      case GL_MAP1_VERTEX_ATTRIB7_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
-         params[0] = ctx->Eval.Map1Attrib[7];
-         break;
-      case GL_MAP1_VERTEX_ATTRIB8_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
-         params[0] = ctx->Eval.Map1Attrib[8];
-         break;
-      case GL_MAP1_VERTEX_ATTRIB9_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
-         params[0] = ctx->Eval.Map1Attrib[9];
-         break;
-      case GL_MAP1_VERTEX_ATTRIB10_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
-         params[0] = ctx->Eval.Map1Attrib[10];
-         break;
-      case GL_MAP1_VERTEX_ATTRIB11_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
-         params[0] = ctx->Eval.Map1Attrib[11];
-         break;
-      case GL_MAP1_VERTEX_ATTRIB12_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
-         params[0] = ctx->Eval.Map1Attrib[12];
-         break;
-      case GL_MAP1_VERTEX_ATTRIB13_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
-         params[0] = ctx->Eval.Map1Attrib[13];
-         break;
-      case GL_MAP1_VERTEX_ATTRIB14_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
-         params[0] = ctx->Eval.Map1Attrib[14];
-         break;
-      case GL_MAP1_VERTEX_ATTRIB15_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
-         params[0] = ctx->Eval.Map1Attrib[15];
-         break;
-      case GL_FRAGMENT_PROGRAM_NV:
-         CHECK_EXT1(NV_fragment_program, "GetBooleanv");
-         params[0] = ctx->FragmentProgram.Enabled;
-         break;
-      case GL_FRAGMENT_PROGRAM_BINDING_NV:
-         CHECK_EXT1(NV_fragment_program, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->FragmentProgram.Current ? ctx->FragmentProgram.Current->Base.Id : 0);
-         break;
-      case GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV:
-         CHECK_EXT1(NV_fragment_program, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(MAX_NV_FRAGMENT_PROGRAM_PARAMS);
-         break;
-      case GL_TEXTURE_RECTANGLE_NV:
-         CHECK_EXT1(NV_texture_rectangle, "GetBooleanv");
-         params[0] = _mesa_IsEnabled(GL_TEXTURE_RECTANGLE_NV);
-         break;
-      case GL_TEXTURE_BINDING_RECTANGLE_NV:
-         CHECK_EXT1(NV_texture_rectangle, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_RECT_INDEX]->Name);
-         break;
-      case GL_MAX_RECTANGLE_TEXTURE_SIZE_NV:
-         CHECK_EXT1(NV_texture_rectangle, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->Const.MaxTextureRectSize);
-         break;
-      case GL_STENCIL_TEST_TWO_SIDE_EXT:
-         CHECK_EXT1(EXT_stencil_two_side, "GetBooleanv");
-         params[0] = ctx->Stencil.TestTwoSide;
-         break;
-      case GL_ACTIVE_STENCIL_FACE_EXT:
-         CHECK_EXT1(EXT_stencil_two_side, "GetBooleanv");
-         params[0] = ENUM_TO_BOOLEAN(ctx->Stencil.ActiveFace ? GL_BACK : GL_FRONT);
-         break;
-      case GL_MAX_SHININESS_NV:
-         CHECK_EXT1(NV_light_max_exponent, "GetBooleanv");
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Const.MaxShininess);
-         break;
-      case GL_MAX_SPOT_EXPONENT_NV:
-         CHECK_EXT1(NV_light_max_exponent, "GetBooleanv");
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Const.MaxSpotExponent);
-         break;
-      case GL_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = INT_TO_BOOLEAN(ctx->Array.ArrayBufferObj->Name);
-         break;
-      case GL_VERTEX_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = INT_TO_BOOLEAN(ctx->Array.ArrayObj->Vertex.BufferObj->Name);
-         break;
-      case GL_NORMAL_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = INT_TO_BOOLEAN(ctx->Array.ArrayObj->Normal.BufferObj->Name);
-         break;
-      case GL_COLOR_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = INT_TO_BOOLEAN(ctx->Array.ArrayObj->Color.BufferObj->Name);
-         break;
-      case GL_INDEX_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = INT_TO_BOOLEAN(ctx->Array.ArrayObj->Index.BufferObj->Name);
-         break;
-      case GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = INT_TO_BOOLEAN(ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].BufferObj->Name);
-         break;
-      case GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = INT_TO_BOOLEAN(ctx->Array.ArrayObj->EdgeFlag.BufferObj->Name);
-         break;
-      case GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = INT_TO_BOOLEAN(ctx->Array.ArrayObj->SecondaryColor.BufferObj->Name);
-         break;
-      case GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = INT_TO_BOOLEAN(ctx->Array.ArrayObj->FogCoord.BufferObj->Name);
-         break;
-      case GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = INT_TO_BOOLEAN(ctx->Array.ElementArrayBufferObj->Name);
-         break;
-      case GL_PIXEL_PACK_BUFFER_BINDING_EXT:
-         CHECK_EXT1(EXT_pixel_buffer_object, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->Pack.BufferObj->Name);
-         break;
-      case GL_PIXEL_UNPACK_BUFFER_BINDING_EXT:
-         CHECK_EXT1(EXT_pixel_buffer_object, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->Unpack.BufferObj->Name);
-         break;
-      case GL_VERTEX_PROGRAM_ARB:
-         CHECK_EXT2(ARB_vertex_program, NV_vertex_program, "GetBooleanv");
-         params[0] = ctx->VertexProgram.Enabled;
-         break;
-      case GL_VERTEX_PROGRAM_POINT_SIZE_ARB:
-         CHECK_EXT2(ARB_vertex_program, NV_vertex_program, "GetBooleanv");
-         params[0] = ctx->VertexProgram.PointSizeEnabled;
-         break;
-      case GL_VERTEX_PROGRAM_TWO_SIDE_ARB:
-         CHECK_EXT2(ARB_vertex_program, NV_vertex_program, "GetBooleanv");
-         params[0] = ctx->VertexProgram.TwoSideEnabled;
-         break;
-      case GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB:
-         CHECK_EXT3(ARB_vertex_program, ARB_fragment_program, NV_vertex_program, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->Const.MaxProgramMatrixStackDepth);
-         break;
-      case GL_MAX_PROGRAM_MATRICES_ARB:
-         CHECK_EXT3(ARB_vertex_program, ARB_fragment_program, NV_vertex_program, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->Const.MaxProgramMatrices);
-         break;
-      case GL_CURRENT_MATRIX_STACK_DEPTH_ARB:
-         CHECK_EXT3(ARB_vertex_program, ARB_fragment_program, NV_vertex_program, "GetBooleanv");
-         params[0] = ctx->CurrentStack->Depth + 1;
-         break;
-      case GL_CURRENT_MATRIX_ARB:
-         CHECK_EXT3(ARB_vertex_program, ARB_fragment_program, NV_fragment_program, "GetBooleanv");
-         {
-         const GLfloat *matrix = ctx->CurrentStack->Top->m;
-         params[0] = FLOAT_TO_BOOLEAN(matrix[0]);
-         params[1] = FLOAT_TO_BOOLEAN(matrix[1]);
-         params[2] = FLOAT_TO_BOOLEAN(matrix[2]);
-         params[3] = FLOAT_TO_BOOLEAN(matrix[3]);
-         params[4] = FLOAT_TO_BOOLEAN(matrix[4]);
-         params[5] = FLOAT_TO_BOOLEAN(matrix[5]);
-         params[6] = FLOAT_TO_BOOLEAN(matrix[6]);
-         params[7] = FLOAT_TO_BOOLEAN(matrix[7]);
-         params[8] = FLOAT_TO_BOOLEAN(matrix[8]);
-         params[9] = FLOAT_TO_BOOLEAN(matrix[9]);
-         params[10] = FLOAT_TO_BOOLEAN(matrix[10]);
-         params[11] = FLOAT_TO_BOOLEAN(matrix[11]);
-         params[12] = FLOAT_TO_BOOLEAN(matrix[12]);
-         params[13] = FLOAT_TO_BOOLEAN(matrix[13]);
-         params[14] = FLOAT_TO_BOOLEAN(matrix[14]);
-         params[15] = FLOAT_TO_BOOLEAN(matrix[15]);
-         }
-         break;
-      case GL_TRANSPOSE_CURRENT_MATRIX_ARB:
-         CHECK_EXT2(ARB_vertex_program, ARB_fragment_program, "GetBooleanv");
-         {
-         const GLfloat *matrix = ctx->CurrentStack->Top->m;
-         params[0] = FLOAT_TO_BOOLEAN(matrix[0]);
-         params[1] = FLOAT_TO_BOOLEAN(matrix[4]);
-         params[2] = FLOAT_TO_BOOLEAN(matrix[8]);
-         params[3] = FLOAT_TO_BOOLEAN(matrix[12]);
-         params[4] = FLOAT_TO_BOOLEAN(matrix[1]);
-         params[5] = FLOAT_TO_BOOLEAN(matrix[5]);
-         params[6] = FLOAT_TO_BOOLEAN(matrix[9]);
-         params[7] = FLOAT_TO_BOOLEAN(matrix[13]);
-         params[8] = FLOAT_TO_BOOLEAN(matrix[2]);
-         params[9] = FLOAT_TO_BOOLEAN(matrix[6]);
-         params[10] = FLOAT_TO_BOOLEAN(matrix[10]);
-         params[11] = FLOAT_TO_BOOLEAN(matrix[14]);
-         params[12] = FLOAT_TO_BOOLEAN(matrix[3]);
-         params[13] = FLOAT_TO_BOOLEAN(matrix[7]);
-         params[14] = FLOAT_TO_BOOLEAN(matrix[11]);
-         params[15] = FLOAT_TO_BOOLEAN(matrix[15]);
-         }
-         break;
-      case GL_MAX_VERTEX_ATTRIBS_ARB:
-         CHECK_EXT1(ARB_vertex_program, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->Const.VertexProgram.MaxAttribs);
-         break;
-      case GL_PROGRAM_ERROR_POSITION_ARB:
-         CHECK_EXT4(NV_vertex_program, ARB_vertex_program, NV_fragment_program, ARB_fragment_program, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->Program.ErrorPos);
-         break;
-      case GL_FRAGMENT_PROGRAM_ARB:
-         CHECK_EXT1(ARB_fragment_program, "GetBooleanv");
-         params[0] = ctx->FragmentProgram.Enabled;
-         break;
-      case GL_MAX_TEXTURE_COORDS_ARB:
-         CHECK_EXT2(ARB_fragment_program, NV_fragment_program, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->Const.MaxTextureCoordUnits);
-         break;
-      case GL_MAX_TEXTURE_IMAGE_UNITS_ARB:
-         CHECK_EXT2(ARB_fragment_program, NV_fragment_program, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->Const.MaxTextureImageUnits);
-         break;
-      case GL_DEPTH_BOUNDS_TEST_EXT:
-         CHECK_EXT1(EXT_depth_bounds_test, "GetBooleanv");
-         params[0] = ctx->Depth.BoundsTest;
-         break;
-      case GL_DEPTH_BOUNDS_EXT:
-         CHECK_EXT1(EXT_depth_bounds_test, "GetBooleanv");
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Depth.BoundsMin);
-         params[1] = FLOAT_TO_BOOLEAN(ctx->Depth.BoundsMax);
-         break;
-      case GL_DEPTH_CLAMP:
-         CHECK_EXT1(ARB_depth_clamp, "GetBooleanv");
-         params[0] = ctx->Transform.DepthClamp;
-         break;
-      case GL_MAX_DRAW_BUFFERS_ARB:
-         params[0] = INT_TO_BOOLEAN(ctx->Const.MaxDrawBuffers);
-         break;
-      case GL_DRAW_BUFFER0_ARB:
-         params[0] = ENUM_TO_BOOLEAN(ctx->DrawBuffer->ColorDrawBuffer[0]);
-         break;
-      case GL_DRAW_BUFFER1_ARB:
-         {
-         GLenum buffer;
-         if (pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glGet(GL_DRAW_BUFFERx_ARB)");
-            return;
-         }
-         buffer = ctx->DrawBuffer->ColorDrawBuffer[1];
-         params[0] = ENUM_TO_BOOLEAN(buffer);
-         }
-         break;
-      case GL_DRAW_BUFFER2_ARB:
-         {
-         GLenum buffer;
-         if (pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glGet(GL_DRAW_BUFFERx_ARB)");
-            return;
-         }
-         buffer = ctx->DrawBuffer->ColorDrawBuffer[2];
-         params[0] = ENUM_TO_BOOLEAN(buffer);
-         }
-         break;
-      case GL_DRAW_BUFFER3_ARB:
-         {
-         GLenum buffer;
-         if (pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glGet(GL_DRAW_BUFFERx_ARB)");
-            return;
-         }
-         buffer = ctx->DrawBuffer->ColorDrawBuffer[3];
-         params[0] = ENUM_TO_BOOLEAN(buffer);
-         }
-         break;
-      case GL_IMPLEMENTATION_COLOR_READ_TYPE_OES:
-         CHECK_EXT1(OES_read_format, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(_mesa_get_color_read_type(ctx));
-         break;
-      case GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES:
-         CHECK_EXT1(OES_read_format, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(_mesa_get_color_read_format(ctx));
-         break;
-      case GL_NUM_FRAGMENT_REGISTERS_ATI:
-         CHECK_EXT1(ATI_fragment_shader, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(6);
-         break;
-      case GL_NUM_FRAGMENT_CONSTANTS_ATI:
-         CHECK_EXT1(ATI_fragment_shader, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(8);
-         break;
-      case GL_NUM_PASSES_ATI:
-         CHECK_EXT1(ATI_fragment_shader, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(2);
-         break;
-      case GL_NUM_INSTRUCTIONS_PER_PASS_ATI:
-         CHECK_EXT1(ATI_fragment_shader, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(8);
-         break;
-      case GL_NUM_INSTRUCTIONS_TOTAL_ATI:
-         CHECK_EXT1(ATI_fragment_shader, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(16);
-         break;
-      case GL_COLOR_ALPHA_PAIRING_ATI:
-         CHECK_EXT1(ATI_fragment_shader, "GetBooleanv");
-         params[0] = GL_TRUE;
-         break;
-      case GL_NUM_LOOPBACK_COMPONENTS_ATI:
-         CHECK_EXT1(ATI_fragment_shader, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(3);
-         break;
-      case GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI:
-         CHECK_EXT1(ATI_fragment_shader, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(3);
-         break;
-      case GL_STENCIL_BACK_FUNC:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Stencil.Function[1]);
-         break;
-      case GL_STENCIL_BACK_VALUE_MASK:
-         params[0] = INT_TO_BOOLEAN(ctx->Stencil.ValueMask[1]);
-         break;
-      case GL_STENCIL_BACK_WRITEMASK:
-         params[0] = INT_TO_BOOLEAN(ctx->Stencil.WriteMask[1]);
-         break;
-      case GL_STENCIL_BACK_REF:
-         params[0] = INT_TO_BOOLEAN(ctx->Stencil.Ref[1]);
-         break;
-      case GL_STENCIL_BACK_FAIL:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Stencil.FailFunc[1]);
-         break;
-      case GL_STENCIL_BACK_PASS_DEPTH_FAIL:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Stencil.ZFailFunc[1]);
-         break;
-      case GL_STENCIL_BACK_PASS_DEPTH_PASS:
-         params[0] = ENUM_TO_BOOLEAN(ctx->Stencil.ZPassFunc[1]);
-         break;
-      case GL_FRAMEBUFFER_BINDING_EXT:
-         CHECK_EXT1(EXT_framebuffer_object, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->DrawBuffer->Name);
-         break;
-      case GL_RENDERBUFFER_BINDING_EXT:
-         CHECK_EXT1(EXT_framebuffer_object, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->CurrentRenderbuffer ? ctx->CurrentRenderbuffer->Name : 0);
-         break;
-      case GL_MAX_COLOR_ATTACHMENTS_EXT:
-         CHECK_EXT1(EXT_framebuffer_object, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->Const.MaxColorAttachments);
-         break;
-      case GL_MAX_RENDERBUFFER_SIZE_EXT:
-         CHECK_EXT1(EXT_framebuffer_object, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->Const.MaxRenderbufferSize);
-         break;
-      case GL_READ_FRAMEBUFFER_BINDING_EXT:
-         CHECK_EXT1(EXT_framebuffer_blit, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->ReadBuffer->Name);
-         break;
-      case GL_PROVOKING_VERTEX_EXT:
-         CHECK_EXT1(EXT_provoking_vertex, "GetBooleanv");
-         params[0] = ctx->Light.ProvokingVertex;
-         break;
-      case GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT:
-         CHECK_EXT1(EXT_provoking_vertex, "GetBooleanv");
-         params[0] = ctx->Const.QuadsFollowProvokingVertexConvention;
-         break;
-      case GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB:
-         CHECK_EXT1(ARB_fragment_shader, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->Const.FragmentProgram.MaxUniformComponents);
-         break;
-      case GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB:
-         CHECK_EXT1(ARB_fragment_shader, "GetBooleanv");
-         params[0] = ENUM_TO_BOOLEAN(ctx->Hint.FragmentShaderDerivative);
-         break;
-      case GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB:
-         CHECK_EXT1(ARB_vertex_shader, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->Const.VertexProgram.MaxUniformComponents);
-         break;
-      case GL_MAX_VARYING_FLOATS_ARB:
-         CHECK_EXT1(ARB_vertex_shader, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->Const.MaxVarying * 4);
-         break;
-      case GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB:
-         CHECK_EXT1(ARB_vertex_shader, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->Const.MaxVertexTextureImageUnits);
-         break;
-      case GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB:
-         CHECK_EXT1(ARB_vertex_shader, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->Const.MaxCombinedTextureImageUnits);
-         break;
-      case GL_CURRENT_PROGRAM:
-         CHECK_EXT1(ARB_shader_objects, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->Shader.CurrentProgram ? ctx->Shader.CurrentProgram->Name : 0);
-         break;
-      case GL_MAX_SAMPLES:
-         CHECK_EXT1(ARB_framebuffer_object, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->Const.MaxSamples);
-         break;
-      case GL_VERTEX_ARRAY_BINDING_APPLE:
-         CHECK_EXT1(APPLE_vertex_array_object, "GetBooleanv");
-         params[0] = INT_TO_BOOLEAN(ctx->Array.ArrayObj->Name);
-         break;
-      case GL_TEXTURE_CUBE_MAP_SEAMLESS:
-         CHECK_EXT1(ARB_seamless_cube_map, "GetBooleanv");
-         params[0] = ctx->Texture.CubeMapSeamless;
-         break;
-      case GL_MAX_SERVER_WAIT_TIMEOUT:
-         CHECK_EXT1(ARB_sync, "GetBooleanv");
-         params[0] = INT64_TO_BOOLEAN(ctx->Const.MaxServerWaitTimeout);
-         break;
-      case GL_NUM_EXTENSIONS:
-         params[0] = INT_TO_BOOLEAN(_mesa_get_extension_count(ctx));
-         break;
-      case GL_MAJOR_VERSION:
-         params[0] = INT_TO_BOOLEAN(ctx->VersionMajor);
-         break;
-      case GL_MINOR_VERSION:
-         params[0] = INT_TO_BOOLEAN(ctx->VersionMinor);
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetBooleanv(pname=0x%x)", pname);
+   case TYPE_INT_4:
+      params[3] = INT_TO_BOOLEAN(((GLint *) p)[3]);
+   case TYPE_INT_3:
+      params[2] = INT_TO_BOOLEAN(((GLint *) p)[2]);
+   case TYPE_INT_2:
+   case TYPE_ENUM_2:
+      params[1] = INT_TO_BOOLEAN(((GLint *) p)[1]);
+   case TYPE_INT:
+   case TYPE_ENUM:
+      params[0] = INT_TO_BOOLEAN(((GLint *) p)[0]);
+      break;
+
+   case TYPE_INT_N:
+      for (i = 0; i < v.value_int_n.n; i++)
+	 params[i] = INT_TO_BOOLEAN(v.value_int_n.ints[i]);
+      break;
+
+   case TYPE_INT64:
+      params[0] = INT64_TO_BOOLEAN(((GLint64 *) p)[0]);
+      break;
+
+   case TYPE_BOOLEAN:
+      params[0] = ((GLboolean*) p)[0];
+      break;		
+
+   case TYPE_MATRIX:
+      m = *(GLmatrix **) p;
+      for (i = 0; i < 16; i++)
+	 params[i] = FLOAT_TO_BOOLEAN(m->m[i]);
+      break;
+
+   case TYPE_MATRIX_T:
+      m = *(GLmatrix **) p;
+      for (i = 0; i < 16; i++)
+	 params[i] = FLOAT_TO_BOOLEAN(m->m[transpose[i]]);
+      break;
+
+   case TYPE_BIT_0:
+   case TYPE_BIT_1:
+   case TYPE_BIT_2:
+   case TYPE_BIT_3:
+   case TYPE_BIT_4:
+   case TYPE_BIT_5:
+      shift = d->type - TYPE_BIT_0;
+      params[0] = (*(GLbitfield *) p >> shift) & 1;
+      break;
    }
 }
 
 void GLAPIENTRY
-_mesa_GetFloatv( GLenum pname, GLfloat *params )
+_mesa_GetFloatv(GLenum pname, GLfloat *params)
 {
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
+   const struct value_desc *d;
+   union value v;
+   GLmatrix *m;
+   int shift, i;
+   void *p;
 
-   if (!params)
-      return;
+   d = find_value("glGetFloatv", pname, &p, &v);
+   switch (d->type) {
+   case TYPE_INVALID:
+      break;
+   case TYPE_CONST:
+      params[0] = (GLfloat) d->offset;
+      break;
 
-   if (ctx->NewState)
-      _mesa_update_state(ctx);
+   case TYPE_FLOAT_4:
+   case TYPE_FLOATN_4:
+      params[3] = ((GLfloat *) p)[3];
+   case TYPE_FLOAT_3:
+   case TYPE_FLOATN_3:
+      params[2] = ((GLfloat *) p)[2];
+   case TYPE_FLOAT_2:
+   case TYPE_FLOATN_2:
+      params[1] = ((GLfloat *) p)[1];
+   case TYPE_FLOAT:
+   case TYPE_FLOATN:
+      params[0] = ((GLfloat *) p)[0];
+      break;
 
-   if (ctx->Driver.GetFloatv &&
-       ctx->Driver.GetFloatv(ctx, pname, params))
-      return;
+   case TYPE_DOUBLEN:
+      params[0] = ((GLdouble *) p)[0];
+      break;
 
-   switch (pname) {
-      case GL_ACCUM_RED_BITS:
-         params[0] = (GLfloat)(ctx->DrawBuffer->Visual.accumRedBits);
-         break;
-      case GL_ACCUM_GREEN_BITS:
-         params[0] = (GLfloat)(ctx->DrawBuffer->Visual.accumGreenBits);
-         break;
-      case GL_ACCUM_BLUE_BITS:
-         params[0] = (GLfloat)(ctx->DrawBuffer->Visual.accumBlueBits);
-         break;
-      case GL_ACCUM_ALPHA_BITS:
-         params[0] = (GLfloat)(ctx->DrawBuffer->Visual.accumAlphaBits);
-         break;
-      case GL_ACCUM_CLEAR_VALUE:
-         params[0] = ctx->Accum.ClearColor[0];
-         params[1] = ctx->Accum.ClearColor[1];
-         params[2] = ctx->Accum.ClearColor[2];
-         params[3] = ctx->Accum.ClearColor[3];
-         break;
-      case GL_ALPHA_BIAS:
-         params[0] = ctx->Pixel.AlphaBias;
-         break;
-      case GL_ALPHA_BITS:
-         params[0] = (GLfloat)(ctx->DrawBuffer->Visual.alphaBits);
-         break;
-      case GL_ALPHA_SCALE:
-         params[0] = ctx->Pixel.AlphaScale;
-         break;
-      case GL_ALPHA_TEST:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Color.AlphaEnabled);
-         break;
-      case GL_ALPHA_TEST_FUNC:
-         params[0] = ENUM_TO_FLOAT(ctx->Color.AlphaFunc);
-         break;
-      case GL_ALPHA_TEST_REF:
-         params[0] = ctx->Color.AlphaRef;
-         break;
-      case GL_ATTRIB_STACK_DEPTH:
-         params[0] = (GLfloat)(ctx->AttribStackDepth);
-         break;
-      case GL_AUTO_NORMAL:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.AutoNormal);
-         break;
-      case GL_AUX_BUFFERS:
-         params[0] = (GLfloat)(ctx->DrawBuffer->Visual.numAuxBuffers);
-         break;
-      case GL_BLEND:
-         params[0] = BOOLEAN_TO_FLOAT((ctx->Color.BlendEnabled & 1));
-         break;
-      case GL_BLEND_DST:
-         params[0] = ENUM_TO_FLOAT(ctx->Color.BlendDstRGB);
-         break;
-      case GL_BLEND_SRC:
-         params[0] = ENUM_TO_FLOAT(ctx->Color.BlendSrcRGB);
-         break;
-      case GL_BLEND_SRC_RGB_EXT:
-         params[0] = ENUM_TO_FLOAT(ctx->Color.BlendSrcRGB);
-         break;
-      case GL_BLEND_DST_RGB_EXT:
-         params[0] = ENUM_TO_FLOAT(ctx->Color.BlendDstRGB);
-         break;
-      case GL_BLEND_SRC_ALPHA_EXT:
-         params[0] = ENUM_TO_FLOAT(ctx->Color.BlendSrcA);
-         break;
-      case GL_BLEND_DST_ALPHA_EXT:
-         params[0] = ENUM_TO_FLOAT(ctx->Color.BlendDstA);
-         break;
-      case GL_BLEND_EQUATION:
-         params[0] = ENUM_TO_FLOAT(ctx->Color.BlendEquationRGB );
-         break;
-      case GL_BLEND_EQUATION_ALPHA_EXT:
-         params[0] = ENUM_TO_FLOAT(ctx->Color.BlendEquationA );
-         break;
-      case GL_BLEND_COLOR_EXT:
-         params[0] = ctx->Color.BlendColor[0];
-         params[1] = ctx->Color.BlendColor[1];
-         params[2] = ctx->Color.BlendColor[2];
-         params[3] = ctx->Color.BlendColor[3];
-         break;
-      case GL_BLUE_BIAS:
-         params[0] = ctx->Pixel.BlueBias;
-         break;
-      case GL_BLUE_BITS:
-         params[0] = (GLfloat)(ctx->DrawBuffer->Visual.blueBits);
-         break;
-      case GL_BLUE_SCALE:
-         params[0] = ctx->Pixel.BlueScale;
-         break;
-      case GL_CLIENT_ATTRIB_STACK_DEPTH:
-         params[0] = (GLfloat)(ctx->ClientAttribStackDepth);
-         break;
-      case GL_CLIP_PLANE0:
-         params[0] = BOOLEAN_TO_FLOAT((ctx->Transform.ClipPlanesEnabled >> 0) & 1);
-         break;
-      case GL_CLIP_PLANE1:
-         params[0] = BOOLEAN_TO_FLOAT((ctx->Transform.ClipPlanesEnabled >> 1) & 1);
-         break;
-      case GL_CLIP_PLANE2:
-         params[0] = BOOLEAN_TO_FLOAT((ctx->Transform.ClipPlanesEnabled >> 2) & 1);
-         break;
-      case GL_CLIP_PLANE3:
-         params[0] = BOOLEAN_TO_FLOAT((ctx->Transform.ClipPlanesEnabled >> 3) & 1);
-         break;
-      case GL_CLIP_PLANE4:
-         params[0] = BOOLEAN_TO_FLOAT((ctx->Transform.ClipPlanesEnabled >> 4) & 1);
-         break;
-      case GL_CLIP_PLANE5:
-         params[0] = BOOLEAN_TO_FLOAT((ctx->Transform.ClipPlanesEnabled >> 5) & 1);
-         break;
-      case GL_COLOR_CLEAR_VALUE:
-         params[0] = ctx->Color.ClearColor[0];
-         params[1] = ctx->Color.ClearColor[1];
-         params[2] = ctx->Color.ClearColor[2];
-         params[3] = ctx->Color.ClearColor[3];
-         break;
-      case GL_COLOR_MATERIAL:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Light.ColorMaterialEnabled);
-         break;
-      case GL_COLOR_MATERIAL_FACE:
-         params[0] = ENUM_TO_FLOAT(ctx->Light.ColorMaterialFace);
-         break;
-      case GL_COLOR_MATERIAL_PARAMETER:
-         params[0] = ENUM_TO_FLOAT(ctx->Light.ColorMaterialMode);
-         break;
-      case GL_COLOR_WRITEMASK:
-         params[0] = (GLfloat)(ctx->Color.ColorMask[0][RCOMP] ? 1 : 0);
-         params[1] = (GLfloat)(ctx->Color.ColorMask[0][GCOMP] ? 1 : 0);
-         params[2] = (GLfloat)(ctx->Color.ColorMask[0][BCOMP] ? 1 : 0);
-         params[3] = (GLfloat)(ctx->Color.ColorMask[0][ACOMP] ? 1 : 0);
-         break;
-      case GL_CULL_FACE:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Polygon.CullFlag);
-         break;
-      case GL_CULL_FACE_MODE:
-         params[0] = ENUM_TO_FLOAT(ctx->Polygon.CullFaceMode);
-         break;
-      case GL_CURRENT_COLOR:
-         {
-         FLUSH_CURRENT(ctx, 0);
-         params[0] = ctx->Current.Attrib[VERT_ATTRIB_COLOR0][0];
-         params[1] = ctx->Current.Attrib[VERT_ATTRIB_COLOR0][1];
-         params[2] = ctx->Current.Attrib[VERT_ATTRIB_COLOR0][2];
-         params[3] = ctx->Current.Attrib[VERT_ATTRIB_COLOR0][3];
-         }
-         break;
-      case GL_CURRENT_INDEX:
-         {
-         FLUSH_CURRENT(ctx, 0);
-         params[0] = ctx->Current.Attrib[VERT_ATTRIB_COLOR_INDEX][0];
-         }
-         break;
-      case GL_CURRENT_NORMAL:
-         {
-         FLUSH_CURRENT(ctx, 0);
-         params[0] = ctx->Current.Attrib[VERT_ATTRIB_NORMAL][0];
-         params[1] = ctx->Current.Attrib[VERT_ATTRIB_NORMAL][1];
-         params[2] = ctx->Current.Attrib[VERT_ATTRIB_NORMAL][2];
-         }
-         break;
-      case GL_CURRENT_RASTER_COLOR:
-         params[0] = ctx->Current.RasterColor[0];
-         params[1] = ctx->Current.RasterColor[1];
-         params[2] = ctx->Current.RasterColor[2];
-         params[3] = ctx->Current.RasterColor[3];
-         break;
-      case GL_CURRENT_RASTER_DISTANCE:
-         params[0] = ctx->Current.RasterDistance;
-         break;
-      case GL_CURRENT_RASTER_INDEX:
-         params[0] = 1.0;
-         break;
-      case GL_CURRENT_RASTER_POSITION:
-         params[0] = ctx->Current.RasterPos[0];
-         params[1] = ctx->Current.RasterPos[1];
-         params[2] = ctx->Current.RasterPos[2];
-         params[3] = ctx->Current.RasterPos[3];
-         break;
-      case GL_CURRENT_RASTER_SECONDARY_COLOR:
-         params[0] = ctx->Current.RasterSecondaryColor[0];
-         params[1] = ctx->Current.RasterSecondaryColor[1];
-         params[2] = ctx->Current.RasterSecondaryColor[2];
-         params[3] = ctx->Current.RasterSecondaryColor[3];
-         break;
-      case GL_CURRENT_RASTER_TEXTURE_COORDS:
-         {
-         const GLuint unit = ctx->Texture.CurrentUnit;
-         if (unit >= ctx->Const.MaxTextureCoordUnits) {
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glGet(raster tex coords, unit %u)", unit);
-            return;
-         }
-         params[0] = ctx->Current.RasterTexCoords[unit][0];
-         params[1] = ctx->Current.RasterTexCoords[unit][1];
-         params[2] = ctx->Current.RasterTexCoords[unit][2];
-         params[3] = ctx->Current.RasterTexCoords[unit][3];
-         }
-         break;
-      case GL_CURRENT_RASTER_POSITION_VALID:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Current.RasterPosValid);
-         break;
-      case GL_CURRENT_TEXTURE_COORDS:
-         {
-         const GLuint unit = ctx->Texture.CurrentUnit;
-         if (unit >= ctx->Const.MaxTextureCoordUnits) {
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glGet(current tex coords, unit %u)", unit);
-            return;
-         }
-         FLUSH_CURRENT(ctx, 0);
-         params[0] = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit][0];
-         params[1] = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit][1];
-         params[2] = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit][2];
-         params[3] = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit][3];
-         }
-         break;
-      case GL_DEPTH_BIAS:
-         params[0] = ctx->Pixel.DepthBias;
-         break;
-      case GL_DEPTH_BITS:
-         params[0] = (GLfloat)(ctx->DrawBuffer->Visual.depthBits);
-         break;
-      case GL_DEPTH_CLEAR_VALUE:
-         params[0] = ((GLfloat) ctx->Depth.Clear);
-         break;
-      case GL_DEPTH_FUNC:
-         params[0] = ENUM_TO_FLOAT(ctx->Depth.Func);
-         break;
-      case GL_DEPTH_RANGE:
-         params[0] = ctx->Viewport.Near;
-         params[1] = ctx->Viewport.Far;
-         break;
-      case GL_DEPTH_SCALE:
-         params[0] = ctx->Pixel.DepthScale;
-         break;
-      case GL_DEPTH_TEST:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Depth.Test);
-         break;
-      case GL_DEPTH_WRITEMASK:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Depth.Mask);
-         break;
-      case GL_DITHER:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Color.DitherFlag);
-         break;
-      case GL_DOUBLEBUFFER:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->DrawBuffer->Visual.doubleBufferMode);
-         break;
-      case GL_DRAW_BUFFER:
-         params[0] = ENUM_TO_FLOAT(ctx->DrawBuffer->ColorDrawBuffer[0]);
-         break;
-      case GL_EDGE_FLAG:
-         {
-         FLUSH_CURRENT(ctx, 0);
-         params[0] = BOOLEAN_TO_FLOAT((ctx->Current.Attrib[VERT_ATTRIB_EDGEFLAG][0] == 1.0));
-         }
-         break;
-      case GL_FEEDBACK_BUFFER_SIZE:
-         params[0] = (GLfloat)(ctx->Feedback.BufferSize);
-         break;
-      case GL_FEEDBACK_BUFFER_TYPE:
-         params[0] = ENUM_TO_FLOAT(ctx->Feedback.Type);
-         break;
-      case GL_FOG:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Fog.Enabled);
-         break;
-      case GL_FOG_COLOR:
-         params[0] = ctx->Fog.Color[0];
-         params[1] = ctx->Fog.Color[1];
-         params[2] = ctx->Fog.Color[2];
-         params[3] = ctx->Fog.Color[3];
-         break;
-      case GL_FOG_DENSITY:
-         params[0] = ctx->Fog.Density;
-         break;
-      case GL_FOG_END:
-         params[0] = ctx->Fog.End;
-         break;
-      case GL_FOG_HINT:
-         params[0] = ENUM_TO_FLOAT(ctx->Hint.Fog);
-         break;
-      case GL_FOG_INDEX:
-         params[0] = ctx->Fog.Index;
-         break;
-      case GL_FOG_MODE:
-         params[0] = ENUM_TO_FLOAT(ctx->Fog.Mode);
-         break;
-      case GL_FOG_START:
-         params[0] = ctx->Fog.Start;
-         break;
-      case GL_FRONT_FACE:
-         params[0] = ENUM_TO_FLOAT(ctx->Polygon.FrontFace);
-         break;
-      case GL_GREEN_BIAS:
-         params[0] = ctx->Pixel.GreenBias;
-         break;
-      case GL_GREEN_BITS:
-         params[0] = (GLfloat)(ctx->DrawBuffer->Visual.greenBits);
-         break;
-      case GL_GREEN_SCALE:
-         params[0] = ctx->Pixel.GreenScale;
-         break;
-      case GL_INDEX_BITS:
-         params[0] = (GLfloat)(ctx->DrawBuffer->Visual.indexBits);
-         break;
-      case GL_INDEX_CLEAR_VALUE:
-         params[0] = (GLfloat)(ctx->Color.ClearIndex);
-         break;
-      case GL_INDEX_MODE:
-         params[0] = BOOLEAN_TO_FLOAT(GL_FALSE);
-         break;
-      case GL_INDEX_OFFSET:
-         params[0] = (GLfloat)(ctx->Pixel.IndexOffset);
-         break;
-      case GL_INDEX_SHIFT:
-         params[0] = (GLfloat)(ctx->Pixel.IndexShift);
-         break;
-      case GL_INDEX_WRITEMASK:
-         params[0] = (GLfloat)(ctx->Color.IndexMask);
-         break;
-      case GL_LIGHT0:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Light.Light[0].Enabled);
-         break;
-      case GL_LIGHT1:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Light.Light[1].Enabled);
-         break;
-      case GL_LIGHT2:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Light.Light[2].Enabled);
-         break;
-      case GL_LIGHT3:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Light.Light[3].Enabled);
-         break;
-      case GL_LIGHT4:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Light.Light[4].Enabled);
-         break;
-      case GL_LIGHT5:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Light.Light[5].Enabled);
-         break;
-      case GL_LIGHT6:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Light.Light[6].Enabled);
-         break;
-      case GL_LIGHT7:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Light.Light[7].Enabled);
-         break;
-      case GL_LIGHTING:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Light.Enabled);
-         break;
-      case GL_LIGHT_MODEL_AMBIENT:
-         params[0] = ctx->Light.Model.Ambient[0];
-         params[1] = ctx->Light.Model.Ambient[1];
-         params[2] = ctx->Light.Model.Ambient[2];
-         params[3] = ctx->Light.Model.Ambient[3];
-         break;
-      case GL_LIGHT_MODEL_COLOR_CONTROL:
-         params[0] = ENUM_TO_FLOAT(ctx->Light.Model.ColorControl);
-         break;
-      case GL_LIGHT_MODEL_LOCAL_VIEWER:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Light.Model.LocalViewer);
-         break;
-      case GL_LIGHT_MODEL_TWO_SIDE:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Light.Model.TwoSide);
-         break;
-      case GL_LINE_SMOOTH:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Line.SmoothFlag);
-         break;
-      case GL_LINE_SMOOTH_HINT:
-         params[0] = ENUM_TO_FLOAT(ctx->Hint.LineSmooth);
-         break;
-      case GL_LINE_STIPPLE:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Line.StippleFlag);
-         break;
-      case GL_LINE_STIPPLE_PATTERN:
-         params[0] = (GLfloat)(ctx->Line.StipplePattern);
-         break;
-      case GL_LINE_STIPPLE_REPEAT:
-         params[0] = (GLfloat)(ctx->Line.StippleFactor);
-         break;
-      case GL_LINE_WIDTH:
-         params[0] = ctx->Line.Width;
-         break;
-      case GL_LINE_WIDTH_GRANULARITY:
-         params[0] = ctx->Const.LineWidthGranularity;
-         break;
-      case GL_LINE_WIDTH_RANGE:
-         params[0] = ctx->Const.MinLineWidthAA;
-         params[1] = ctx->Const.MaxLineWidthAA;
-         break;
-      case GL_ALIASED_LINE_WIDTH_RANGE:
-         params[0] = ctx->Const.MinLineWidth;
-         params[1] = ctx->Const.MaxLineWidth;
-         break;
-      case GL_LIST_BASE:
-         params[0] = (GLfloat)(ctx->List.ListBase);
-         break;
-      case GL_LIST_INDEX:
-         params[0] = (GLfloat)((ctx->ListState.CurrentList ? ctx->ListState.CurrentList->Name : 0));
-         break;
-      case GL_LIST_MODE:
-         {
-         GLenum mode;
-         if (!ctx->CompileFlag)
-            mode = 0;
-         else if (ctx->ExecuteFlag)
-            mode = GL_COMPILE_AND_EXECUTE;
-         else
-            mode = GL_COMPILE;
-         params[0] = ENUM_TO_FLOAT(mode);
-         }
-         break;
-      case GL_INDEX_LOGIC_OP:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Color.IndexLogicOpEnabled);
-         break;
-      case GL_COLOR_LOGIC_OP:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Color.ColorLogicOpEnabled);
-         break;
-      case GL_LOGIC_OP_MODE:
-         params[0] = ENUM_TO_FLOAT(ctx->Color.LogicOp);
-         break;
-      case GL_MAP1_COLOR_4:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1Color4);
-         break;
-      case GL_MAP1_GRID_DOMAIN:
-         params[0] = ctx->Eval.MapGrid1u1;
-         params[1] = ctx->Eval.MapGrid1u2;
-         break;
-      case GL_MAP1_GRID_SEGMENTS:
-         params[0] = (GLfloat)(ctx->Eval.MapGrid1un);
-         break;
-      case GL_MAP1_INDEX:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1Index);
-         break;
-      case GL_MAP1_NORMAL:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1Normal);
-         break;
-      case GL_MAP1_TEXTURE_COORD_1:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1TextureCoord1);
-         break;
-      case GL_MAP1_TEXTURE_COORD_2:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1TextureCoord2);
-         break;
-      case GL_MAP1_TEXTURE_COORD_3:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1TextureCoord3);
-         break;
-      case GL_MAP1_TEXTURE_COORD_4:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1TextureCoord4);
-         break;
-      case GL_MAP1_VERTEX_3:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1Vertex3);
-         break;
-      case GL_MAP1_VERTEX_4:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1Vertex4);
-         break;
-      case GL_MAP2_COLOR_4:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map2Color4);
-         break;
-      case GL_MAP2_GRID_DOMAIN:
-         params[0] = ctx->Eval.MapGrid2u1;
-         params[1] = ctx->Eval.MapGrid2u2;
-         params[2] = ctx->Eval.MapGrid2v1;
-         params[3] = ctx->Eval.MapGrid2v2;
-         break;
-      case GL_MAP2_GRID_SEGMENTS:
-         params[0] = (GLfloat)(ctx->Eval.MapGrid2un);
-         params[1] = (GLfloat)(ctx->Eval.MapGrid2vn);
-         break;
-      case GL_MAP2_INDEX:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map2Index);
-         break;
-      case GL_MAP2_NORMAL:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map2Normal);
-         break;
-      case GL_MAP2_TEXTURE_COORD_1:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map2TextureCoord1);
-         break;
-      case GL_MAP2_TEXTURE_COORD_2:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map2TextureCoord2);
-         break;
-      case GL_MAP2_TEXTURE_COORD_3:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map2TextureCoord3);
-         break;
-      case GL_MAP2_TEXTURE_COORD_4:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map2TextureCoord4);
-         break;
-      case GL_MAP2_VERTEX_3:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map2Vertex3);
-         break;
-      case GL_MAP2_VERTEX_4:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map2Vertex4);
-         break;
-      case GL_MAP_COLOR:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Pixel.MapColorFlag);
-         break;
-      case GL_MAP_STENCIL:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Pixel.MapStencilFlag);
-         break;
-      case GL_MATRIX_MODE:
-         params[0] = ENUM_TO_FLOAT(ctx->Transform.MatrixMode);
-         break;
-      case GL_MAX_ATTRIB_STACK_DEPTH:
-         params[0] = (GLfloat)(MAX_ATTRIB_STACK_DEPTH);
-         break;
-      case GL_MAX_CLIENT_ATTRIB_STACK_DEPTH:
-         params[0] = (GLfloat)(MAX_CLIENT_ATTRIB_STACK_DEPTH);
-         break;
-      case GL_MAX_CLIP_PLANES:
-         params[0] = (GLfloat)(ctx->Const.MaxClipPlanes);
-         break;
-      case GL_MAX_ELEMENTS_VERTICES:
-         params[0] = (GLfloat)(ctx->Const.MaxArrayLockSize);
-         break;
-      case GL_MAX_ELEMENTS_INDICES:
-         params[0] = (GLfloat)(ctx->Const.MaxArrayLockSize);
-         break;
-      case GL_MAX_EVAL_ORDER:
-         params[0] = (GLfloat)(MAX_EVAL_ORDER);
-         break;
-      case GL_MAX_LIGHTS:
-         params[0] = (GLfloat)(ctx->Const.MaxLights);
-         break;
-      case GL_MAX_LIST_NESTING:
-         params[0] = (GLfloat)(MAX_LIST_NESTING);
-         break;
-      case GL_MAX_MODELVIEW_STACK_DEPTH:
-         params[0] = (GLfloat)(MAX_MODELVIEW_STACK_DEPTH);
-         break;
-      case GL_MAX_NAME_STACK_DEPTH:
-         params[0] = (GLfloat)(MAX_NAME_STACK_DEPTH);
-         break;
-      case GL_MAX_PIXEL_MAP_TABLE:
-         params[0] = (GLfloat)(MAX_PIXEL_MAP_TABLE);
-         break;
-      case GL_MAX_PROJECTION_STACK_DEPTH:
-         params[0] = (GLfloat)(MAX_PROJECTION_STACK_DEPTH);
-         break;
-      case GL_MAX_TEXTURE_SIZE:
-         params[0] = (GLfloat)(1 << (ctx->Const.MaxTextureLevels - 1));
-         break;
-      case GL_MAX_3D_TEXTURE_SIZE:
-         params[0] = (GLfloat)(1 << (ctx->Const.Max3DTextureLevels - 1));
-         break;
-      case GL_MAX_TEXTURE_STACK_DEPTH:
-         params[0] = (GLfloat)(MAX_TEXTURE_STACK_DEPTH);
-         break;
-      case GL_MAX_VIEWPORT_DIMS:
-         params[0] = (GLfloat)(ctx->Const.MaxViewportWidth);
-         params[1] = (GLfloat)(ctx->Const.MaxViewportHeight);
-         break;
-      case GL_MODELVIEW_MATRIX:
-         {
-         const GLfloat *matrix = ctx->ModelviewMatrixStack.Top->m;
-         params[0] = matrix[0];
-         params[1] = matrix[1];
-         params[2] = matrix[2];
-         params[3] = matrix[3];
-         params[4] = matrix[4];
-         params[5] = matrix[5];
-         params[6] = matrix[6];
-         params[7] = matrix[7];
-         params[8] = matrix[8];
-         params[9] = matrix[9];
-         params[10] = matrix[10];
-         params[11] = matrix[11];
-         params[12] = matrix[12];
-         params[13] = matrix[13];
-         params[14] = matrix[14];
-         params[15] = matrix[15];
-         }
-         break;
-      case GL_MODELVIEW_STACK_DEPTH:
-         params[0] = (GLfloat)(ctx->ModelviewMatrixStack.Depth + 1);
-         break;
-      case GL_NAME_STACK_DEPTH:
-         params[0] = (GLfloat)(ctx->Select.NameStackDepth);
-         break;
-      case GL_NORMALIZE:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Transform.Normalize);
-         break;
-      case GL_PACK_ALIGNMENT:
-         params[0] = (GLfloat)(ctx->Pack.Alignment);
-         break;
-      case GL_PACK_LSB_FIRST:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Pack.LsbFirst);
-         break;
-      case GL_PACK_ROW_LENGTH:
-         params[0] = (GLfloat)(ctx->Pack.RowLength);
-         break;
-      case GL_PACK_SKIP_PIXELS:
-         params[0] = (GLfloat)(ctx->Pack.SkipPixels);
-         break;
-      case GL_PACK_SKIP_ROWS:
-         params[0] = (GLfloat)(ctx->Pack.SkipRows);
-         break;
-      case GL_PACK_SWAP_BYTES:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Pack.SwapBytes);
-         break;
-      case GL_PACK_SKIP_IMAGES_EXT:
-         params[0] = (GLfloat)(ctx->Pack.SkipImages);
-         break;
-      case GL_PACK_IMAGE_HEIGHT_EXT:
-         params[0] = (GLfloat)(ctx->Pack.ImageHeight);
-         break;
-      case GL_PACK_INVERT_MESA:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Pack.Invert);
-         break;
-      case GL_PERSPECTIVE_CORRECTION_HINT:
-         params[0] = ENUM_TO_FLOAT(ctx->Hint.PerspectiveCorrection);
-         break;
-      case GL_PIXEL_MAP_A_TO_A_SIZE:
-         params[0] = (GLfloat)(ctx->PixelMaps.AtoA.Size);
-         break;
-      case GL_PIXEL_MAP_B_TO_B_SIZE:
-         params[0] = (GLfloat)(ctx->PixelMaps.BtoB.Size);
-         break;
-      case GL_PIXEL_MAP_G_TO_G_SIZE:
-         params[0] = (GLfloat)(ctx->PixelMaps.GtoG.Size);
-         break;
-      case GL_PIXEL_MAP_I_TO_A_SIZE:
-         params[0] = (GLfloat)(ctx->PixelMaps.ItoA.Size);
-         break;
-      case GL_PIXEL_MAP_I_TO_B_SIZE:
-         params[0] = (GLfloat)(ctx->PixelMaps.ItoB.Size);
-         break;
-      case GL_PIXEL_MAP_I_TO_G_SIZE:
-         params[0] = (GLfloat)(ctx->PixelMaps.ItoG.Size);
-         break;
-      case GL_PIXEL_MAP_I_TO_I_SIZE:
-         params[0] = (GLfloat)(ctx->PixelMaps.ItoI.Size);
-         break;
-      case GL_PIXEL_MAP_I_TO_R_SIZE:
-         params[0] = (GLfloat)(ctx->PixelMaps.ItoR.Size);
-         break;
-      case GL_PIXEL_MAP_R_TO_R_SIZE:
-         params[0] = (GLfloat)(ctx->PixelMaps.RtoR.Size);
-         break;
-      case GL_PIXEL_MAP_S_TO_S_SIZE:
-         params[0] = (GLfloat)(ctx->PixelMaps.StoS.Size);
-         break;
-      case GL_POINT_SIZE:
-         params[0] = ctx->Point.Size;
-         break;
-      case GL_POINT_SIZE_GRANULARITY:
-         params[0] = ctx->Const.PointSizeGranularity;
-         break;
-      case GL_POINT_SIZE_RANGE:
-         params[0] = ctx->Const.MinPointSizeAA;
-         params[1] = ctx->Const.MaxPointSizeAA;
-         break;
-      case GL_ALIASED_POINT_SIZE_RANGE:
-         params[0] = ctx->Const.MinPointSize;
-         params[1] = ctx->Const.MaxPointSize;
-         break;
-      case GL_POINT_SMOOTH:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Point.SmoothFlag);
-         break;
-      case GL_POINT_SMOOTH_HINT:
-         params[0] = ENUM_TO_FLOAT(ctx->Hint.PointSmooth);
-         break;
-      case GL_POINT_SIZE_MIN_EXT:
-         params[0] = ctx->Point.MinSize;
-         break;
-      case GL_POINT_SIZE_MAX_EXT:
-         params[0] = ctx->Point.MaxSize;
-         break;
-      case GL_POINT_FADE_THRESHOLD_SIZE_EXT:
-         params[0] = ctx->Point.Threshold;
-         break;
-      case GL_DISTANCE_ATTENUATION_EXT:
-         params[0] = ctx->Point.Params[0];
-         params[1] = ctx->Point.Params[1];
-         params[2] = ctx->Point.Params[2];
-         break;
-      case GL_POLYGON_MODE:
-         params[0] = ENUM_TO_FLOAT(ctx->Polygon.FrontMode);
-         params[1] = ENUM_TO_FLOAT(ctx->Polygon.BackMode);
-         break;
-      case GL_POLYGON_OFFSET_BIAS_EXT:
-         params[0] = ctx->Polygon.OffsetUnits;
-         break;
-      case GL_POLYGON_OFFSET_FACTOR:
-         params[0] = ctx->Polygon.OffsetFactor ;
-         break;
-      case GL_POLYGON_OFFSET_UNITS:
-         params[0] = ctx->Polygon.OffsetUnits ;
-         break;
-      case GL_POLYGON_OFFSET_POINT:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Polygon.OffsetPoint);
-         break;
-      case GL_POLYGON_OFFSET_LINE:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Polygon.OffsetLine);
-         break;
-      case GL_POLYGON_OFFSET_FILL:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Polygon.OffsetFill);
-         break;
-      case GL_POLYGON_SMOOTH:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Polygon.SmoothFlag);
-         break;
-      case GL_POLYGON_SMOOTH_HINT:
-         params[0] = ENUM_TO_FLOAT(ctx->Hint.PolygonSmooth);
-         break;
-      case GL_POLYGON_STIPPLE:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Polygon.StippleFlag);
-         break;
-      case GL_PROJECTION_MATRIX:
-         {
-         const GLfloat *matrix = ctx->ProjectionMatrixStack.Top->m;
-         params[0] = matrix[0];
-         params[1] = matrix[1];
-         params[2] = matrix[2];
-         params[3] = matrix[3];
-         params[4] = matrix[4];
-         params[5] = matrix[5];
-         params[6] = matrix[6];
-         params[7] = matrix[7];
-         params[8] = matrix[8];
-         params[9] = matrix[9];
-         params[10] = matrix[10];
-         params[11] = matrix[11];
-         params[12] = matrix[12];
-         params[13] = matrix[13];
-         params[14] = matrix[14];
-         params[15] = matrix[15];
-         }
-         break;
-      case GL_PROJECTION_STACK_DEPTH:
-         params[0] = (GLfloat)(ctx->ProjectionMatrixStack.Depth + 1);
-         break;
-      case GL_READ_BUFFER:
-         params[0] = ENUM_TO_FLOAT(ctx->ReadBuffer->ColorReadBuffer);
-         break;
-      case GL_RED_BIAS:
-         params[0] = ctx->Pixel.RedBias;
-         break;
-      case GL_RED_BITS:
-         params[0] = (GLfloat)(ctx->DrawBuffer->Visual.redBits);
-         break;
-      case GL_RED_SCALE:
-         params[0] = ctx->Pixel.RedScale;
-         break;
-      case GL_RENDER_MODE:
-         params[0] = ENUM_TO_FLOAT(ctx->RenderMode);
-         break;
-      case GL_RESCALE_NORMAL:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Transform.RescaleNormals);
-         break;
-      case GL_RGBA_MODE:
-         params[0] = BOOLEAN_TO_FLOAT(GL_TRUE);
-         break;
-      case GL_SCISSOR_BOX:
-         params[0] = (GLfloat)(ctx->Scissor.X);
-         params[1] = (GLfloat)(ctx->Scissor.Y);
-         params[2] = (GLfloat)(ctx->Scissor.Width);
-         params[3] = (GLfloat)(ctx->Scissor.Height);
-         break;
-      case GL_SCISSOR_TEST:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Scissor.Enabled);
-         break;
-      case GL_SELECTION_BUFFER_SIZE:
-         params[0] = (GLfloat)(ctx->Select.BufferSize);
-         break;
-      case GL_SHADE_MODEL:
-         params[0] = ENUM_TO_FLOAT(ctx->Light.ShadeModel);
-         break;
-      case GL_SHARED_TEXTURE_PALETTE_EXT:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Texture.SharedPalette);
-         break;
-      case GL_STENCIL_BITS:
-         params[0] = (GLfloat)(ctx->DrawBuffer->Visual.stencilBits);
-         break;
-      case GL_STENCIL_CLEAR_VALUE:
-         params[0] = (GLfloat)(ctx->Stencil.Clear);
-         break;
-      case GL_STENCIL_FAIL:
-         params[0] = ENUM_TO_FLOAT(ctx->Stencil.FailFunc[ctx->Stencil.ActiveFace]);
-         break;
-      case GL_STENCIL_FUNC:
-         params[0] = ENUM_TO_FLOAT(ctx->Stencil.Function[ctx->Stencil.ActiveFace]);
-         break;
-      case GL_STENCIL_PASS_DEPTH_FAIL:
-         params[0] = ENUM_TO_FLOAT(ctx->Stencil.ZFailFunc[ctx->Stencil.ActiveFace]);
-         break;
-      case GL_STENCIL_PASS_DEPTH_PASS:
-         params[0] = ENUM_TO_FLOAT(ctx->Stencil.ZPassFunc[ctx->Stencil.ActiveFace]);
-         break;
-      case GL_STENCIL_REF:
-         params[0] = (GLfloat)(ctx->Stencil.Ref[ctx->Stencil.ActiveFace]);
-         break;
-      case GL_STENCIL_TEST:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Stencil.Enabled);
-         break;
-      case GL_STENCIL_VALUE_MASK:
-         params[0] = (GLfloat)(ctx->Stencil.ValueMask[ctx->Stencil.ActiveFace]);
-         break;
-      case GL_STENCIL_WRITEMASK:
-         params[0] = (GLfloat)(ctx->Stencil.WriteMask[ctx->Stencil.ActiveFace]);
-         break;
-      case GL_STEREO:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->DrawBuffer->Visual.stereoMode);
-         break;
-      case GL_SUBPIXEL_BITS:
-         params[0] = (GLfloat)(ctx->Const.SubPixelBits);
-         break;
-      case GL_TEXTURE_1D:
-         params[0] = BOOLEAN_TO_FLOAT(_mesa_IsEnabled(GL_TEXTURE_1D));
-         break;
-      case GL_TEXTURE_2D:
-         params[0] = BOOLEAN_TO_FLOAT(_mesa_IsEnabled(GL_TEXTURE_2D));
-         break;
-      case GL_TEXTURE_3D:
-         params[0] = BOOLEAN_TO_FLOAT(_mesa_IsEnabled(GL_TEXTURE_3D));
-         break;
-      case GL_TEXTURE_1D_ARRAY_EXT:
-         CHECK_EXT1(MESA_texture_array, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(_mesa_IsEnabled(GL_TEXTURE_1D_ARRAY_EXT));
-         break;
-      case GL_TEXTURE_2D_ARRAY_EXT:
-         CHECK_EXT1(MESA_texture_array, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(_mesa_IsEnabled(GL_TEXTURE_2D_ARRAY_EXT));
-         break;
-      case GL_TEXTURE_BINDING_1D:
-         params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_1D_INDEX]->Name);
-         break;
-      case GL_TEXTURE_BINDING_2D:
-         params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_2D_INDEX]->Name);
-         break;
-      case GL_TEXTURE_BINDING_3D:
-         params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_3D_INDEX]->Name);
-         break;
-      case GL_TEXTURE_BINDING_1D_ARRAY_EXT:
-         CHECK_EXT1(MESA_texture_array, "GetFloatv");
-         params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_1D_ARRAY_INDEX]->Name);
-         break;
-      case GL_TEXTURE_BINDING_2D_ARRAY_EXT:
-         CHECK_EXT1(MESA_texture_array, "GetFloatv");
-         params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_2D_ARRAY_INDEX]->Name);
-         break;
-      case GL_TEXTURE_GEN_S:
-         params[0] = BOOLEAN_TO_FLOAT(((ctx->Texture.Unit[ctx->Texture.CurrentUnit].TexGenEnabled & S_BIT) ? 1 : 0));
-         break;
-      case GL_TEXTURE_GEN_T:
-         params[0] = BOOLEAN_TO_FLOAT(((ctx->Texture.Unit[ctx->Texture.CurrentUnit].TexGenEnabled & T_BIT) ? 1 : 0));
-         break;
-      case GL_TEXTURE_GEN_R:
-         params[0] = BOOLEAN_TO_FLOAT(((ctx->Texture.Unit[ctx->Texture.CurrentUnit].TexGenEnabled & R_BIT) ? 1 : 0));
-         break;
-      case GL_TEXTURE_GEN_Q:
-         params[0] = BOOLEAN_TO_FLOAT(((ctx->Texture.Unit[ctx->Texture.CurrentUnit].TexGenEnabled & Q_BIT) ? 1 : 0));
-         break;
-      case GL_TEXTURE_MATRIX:
-         {
-         const GLfloat *matrix;
-         const GLuint unit = ctx->Texture.CurrentUnit;
-         if (unit >= ctx->Const.MaxTextureCoordUnits) {
-            _mesa_error(ctx, GL_INVALID_OPERATION, "glGet(texture matrix %u)",
-                        unit);
-            return;
-         }
-         matrix = ctx->TextureMatrixStack[unit].Top->m;
-         params[0] = matrix[0];
-         params[1] = matrix[1];
-         params[2] = matrix[2];
-         params[3] = matrix[3];
-         params[4] = matrix[4];
-         params[5] = matrix[5];
-         params[6] = matrix[6];
-         params[7] = matrix[7];
-         params[8] = matrix[8];
-         params[9] = matrix[9];
-         params[10] = matrix[10];
-         params[11] = matrix[11];
-         params[12] = matrix[12];
-         params[13] = matrix[13];
-         params[14] = matrix[14];
-         params[15] = matrix[15];
-         }
-         break;
-      case GL_TEXTURE_STACK_DEPTH:
-         {
-         const GLuint unit = ctx->Texture.CurrentUnit;
-         if (unit >= ctx->Const.MaxTextureCoordUnits) {
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glGet(texture stack depth, unit %u)", unit);
-            return;
-         }
-         params[0] = (GLfloat)(ctx->TextureMatrixStack[unit].Depth + 1);
-         }
-         break;
-      case GL_UNPACK_ALIGNMENT:
-         params[0] = (GLfloat)(ctx->Unpack.Alignment);
-         break;
-      case GL_UNPACK_LSB_FIRST:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Unpack.LsbFirst);
-         break;
-      case GL_UNPACK_ROW_LENGTH:
-         params[0] = (GLfloat)(ctx->Unpack.RowLength);
-         break;
-      case GL_UNPACK_SKIP_PIXELS:
-         params[0] = (GLfloat)(ctx->Unpack.SkipPixels);
-         break;
-      case GL_UNPACK_SKIP_ROWS:
-         params[0] = (GLfloat)(ctx->Unpack.SkipRows);
-         break;
-      case GL_UNPACK_SWAP_BYTES:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Unpack.SwapBytes);
-         break;
-      case GL_UNPACK_SKIP_IMAGES_EXT:
-         params[0] = (GLfloat)(ctx->Unpack.SkipImages);
-         break;
-      case GL_UNPACK_IMAGE_HEIGHT_EXT:
-         params[0] = (GLfloat)(ctx->Unpack.ImageHeight);
-         break;
-      case GL_UNPACK_CLIENT_STORAGE_APPLE:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Unpack.ClientStorage);
-         break;
-      case GL_VIEWPORT:
-         params[0] = (GLfloat)(ctx->Viewport.X);
-         params[1] = (GLfloat)(ctx->Viewport.Y);
-         params[2] = (GLfloat)(ctx->Viewport.Width);
-         params[3] = (GLfloat)(ctx->Viewport.Height);
-         break;
-      case GL_ZOOM_X:
-         params[0] = ctx->Pixel.ZoomX;
-         break;
-      case GL_ZOOM_Y:
-         params[0] = ctx->Pixel.ZoomY;
-         break;
-      case GL_VERTEX_ARRAY:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Array.ArrayObj->Vertex.Enabled);
-         break;
-      case GL_VERTEX_ARRAY_SIZE:
-         params[0] = (GLfloat)(ctx->Array.ArrayObj->Vertex.Size);
-         break;
-      case GL_VERTEX_ARRAY_TYPE:
-         params[0] = ENUM_TO_FLOAT(ctx->Array.ArrayObj->Vertex.Type);
-         break;
-      case GL_VERTEX_ARRAY_STRIDE:
-         params[0] = (GLfloat)(ctx->Array.ArrayObj->Vertex.Stride);
-         break;
-      case GL_VERTEX_ARRAY_COUNT_EXT:
-         params[0] = (GLfloat)(0);
-         break;
-      case GL_NORMAL_ARRAY:
-         params[0] = ENUM_TO_FLOAT(ctx->Array.ArrayObj->Normal.Enabled);
-         break;
-      case GL_NORMAL_ARRAY_TYPE:
-         params[0] = ENUM_TO_FLOAT(ctx->Array.ArrayObj->Normal.Type);
-         break;
-      case GL_NORMAL_ARRAY_STRIDE:
-         params[0] = (GLfloat)(ctx->Array.ArrayObj->Normal.Stride);
-         break;
-      case GL_NORMAL_ARRAY_COUNT_EXT:
-         params[0] = (GLfloat)(0);
-         break;
-      case GL_COLOR_ARRAY:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Array.ArrayObj->Color.Enabled);
-         break;
-      case GL_COLOR_ARRAY_SIZE:
-         params[0] = (GLfloat)(ctx->Array.ArrayObj->Color.Size);
-         break;
-      case GL_COLOR_ARRAY_TYPE:
-         params[0] = ENUM_TO_FLOAT(ctx->Array.ArrayObj->Color.Type);
-         break;
-      case GL_COLOR_ARRAY_STRIDE:
-         params[0] = (GLfloat)(ctx->Array.ArrayObj->Color.Stride);
-         break;
-      case GL_COLOR_ARRAY_COUNT_EXT:
-         params[0] = (GLfloat)(0);
-         break;
-      case GL_INDEX_ARRAY:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Array.ArrayObj->Index.Enabled);
-         break;
-      case GL_INDEX_ARRAY_TYPE:
-         params[0] = ENUM_TO_FLOAT(ctx->Array.ArrayObj->Index.Type);
-         break;
-      case GL_INDEX_ARRAY_STRIDE:
-         params[0] = (GLfloat)(ctx->Array.ArrayObj->Index.Stride);
-         break;
-      case GL_INDEX_ARRAY_COUNT_EXT:
-         params[0] = (GLfloat)(0);
-         break;
-      case GL_TEXTURE_COORD_ARRAY:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].Enabled);
-         break;
-      case GL_TEXTURE_COORD_ARRAY_SIZE:
-         params[0] = (GLfloat)(ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].Size);
-         break;
-      case GL_TEXTURE_COORD_ARRAY_TYPE:
-         params[0] = ENUM_TO_FLOAT(ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].Type);
-         break;
-      case GL_TEXTURE_COORD_ARRAY_STRIDE:
-         params[0] = (GLfloat)(ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].Stride);
-         break;
-      case GL_TEXTURE_COORD_ARRAY_COUNT_EXT:
-         params[0] = (GLfloat)(0);
-         break;
-      case GL_EDGE_FLAG_ARRAY:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Array.ArrayObj->EdgeFlag.Enabled);
-         break;
-      case GL_EDGE_FLAG_ARRAY_STRIDE:
-         params[0] = (GLfloat)(ctx->Array.ArrayObj->EdgeFlag.Stride);
-         break;
-      case GL_EDGE_FLAG_ARRAY_COUNT_EXT:
-         params[0] = (GLfloat)(0);
-         break;
-      case GL_MAX_TEXTURE_UNITS_ARB:
-         CHECK_EXT1(ARB_multitexture, "GetFloatv");
-         params[0] = (GLfloat)(ctx->Const.MaxTextureUnits);
-         break;
-      case GL_ACTIVE_TEXTURE_ARB:
-         CHECK_EXT1(ARB_multitexture, "GetFloatv");
-         params[0] = (GLfloat)(GL_TEXTURE0_ARB + ctx->Texture.CurrentUnit);
-         break;
-      case GL_CLIENT_ACTIVE_TEXTURE_ARB:
-         CHECK_EXT1(ARB_multitexture, "GetFloatv");
-         params[0] = (GLfloat)(GL_TEXTURE0_ARB + ctx->Array.ActiveTexture);
-         break;
-      case GL_TEXTURE_CUBE_MAP_ARB:
-         CHECK_EXT1(ARB_texture_cube_map, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(_mesa_IsEnabled(GL_TEXTURE_CUBE_MAP_ARB));
-         break;
-      case GL_TEXTURE_BINDING_CUBE_MAP_ARB:
-         CHECK_EXT1(ARB_texture_cube_map, "GetFloatv");
-         params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_CUBE_INDEX]->Name);
-         break;
-      case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB:
-         CHECK_EXT1(ARB_texture_cube_map, "GetFloatv");
-         params[0] = (GLfloat)((1 << (ctx->Const.MaxCubeTextureLevels - 1)));
-         break;
-      case GL_TEXTURE_COMPRESSION_HINT_ARB:
-         params[0] = (GLfloat)(ctx->Hint.TextureCompression);
-         break;
-      case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB:
-         params[0] = (GLfloat)(_mesa_get_compressed_formats(ctx, NULL, GL_FALSE));
-         break;
-      case GL_COMPRESSED_TEXTURE_FORMATS_ARB:
-         {
-         GLint formats[100];
-         GLuint i, n = _mesa_get_compressed_formats(ctx, formats, GL_FALSE);
-         ASSERT(n <= 100);
-         for (i = 0; i < n; i++)
-            params[i] = ENUM_TO_FLOAT(formats[i]);
-         }
-         break;
-      case GL_ARRAY_ELEMENT_LOCK_FIRST_EXT:
-         CHECK_EXT1(EXT_compiled_vertex_array, "GetFloatv");
-         params[0] = (GLfloat)(ctx->Array.LockFirst);
-         break;
-      case GL_ARRAY_ELEMENT_LOCK_COUNT_EXT:
-         CHECK_EXT1(EXT_compiled_vertex_array, "GetFloatv");
-         params[0] = (GLfloat)(ctx->Array.LockCount);
-         break;
-      case GL_TRANSPOSE_COLOR_MATRIX_ARB:
-         {
-         const GLfloat *matrix = ctx->ColorMatrixStack.Top->m;
-         params[0] = matrix[0];
-         params[1] = matrix[4];
-         params[2] = matrix[8];
-         params[3] = matrix[12];
-         params[4] = matrix[1];
-         params[5] = matrix[5];
-         params[6] = matrix[9];
-         params[7] = matrix[13];
-         params[8] = matrix[2];
-         params[9] = matrix[6];
-         params[10] = matrix[10];
-         params[11] = matrix[14];
-         params[12] = matrix[3];
-         params[13] = matrix[7];
-         params[14] = matrix[11];
-         params[15] = matrix[15];
-         }
-         break;
-      case GL_TRANSPOSE_MODELVIEW_MATRIX_ARB:
-         {
-         const GLfloat *matrix = ctx->ModelviewMatrixStack.Top->m;
-         params[0] = matrix[0];
-         params[1] = matrix[4];
-         params[2] = matrix[8];
-         params[3] = matrix[12];
-         params[4] = matrix[1];
-         params[5] = matrix[5];
-         params[6] = matrix[9];
-         params[7] = matrix[13];
-         params[8] = matrix[2];
-         params[9] = matrix[6];
-         params[10] = matrix[10];
-         params[11] = matrix[14];
-         params[12] = matrix[3];
-         params[13] = matrix[7];
-         params[14] = matrix[11];
-         params[15] = matrix[15];
-         }
-         break;
-      case GL_TRANSPOSE_PROJECTION_MATRIX_ARB:
-         {
-         const GLfloat *matrix = ctx->ProjectionMatrixStack.Top->m;
-         params[0] = matrix[0];
-         params[1] = matrix[4];
-         params[2] = matrix[8];
-         params[3] = matrix[12];
-         params[4] = matrix[1];
-         params[5] = matrix[5];
-         params[6] = matrix[9];
-         params[7] = matrix[13];
-         params[8] = matrix[2];
-         params[9] = matrix[6];
-         params[10] = matrix[10];
-         params[11] = matrix[14];
-         params[12] = matrix[3];
-         params[13] = matrix[7];
-         params[14] = matrix[11];
-         params[15] = matrix[15];
-         }
-         break;
-      case GL_TRANSPOSE_TEXTURE_MATRIX_ARB:
-         {
-         const GLfloat *matrix = ctx->TextureMatrixStack[ctx->Texture.CurrentUnit].Top->m;
-         params[0] = matrix[0];
-         params[1] = matrix[4];
-         params[2] = matrix[8];
-         params[3] = matrix[12];
-         params[4] = matrix[1];
-         params[5] = matrix[5];
-         params[6] = matrix[9];
-         params[7] = matrix[13];
-         params[8] = matrix[2];
-         params[9] = matrix[6];
-         params[10] = matrix[10];
-         params[11] = matrix[14];
-         params[12] = matrix[3];
-         params[13] = matrix[7];
-         params[14] = matrix[11];
-         params[15] = matrix[15];
-         }
-         break;
-      case GL_COLOR_MATRIX_SGI:
-         {
-         const GLfloat *matrix = ctx->ColorMatrixStack.Top->m;
-         params[0] = matrix[0];
-         params[1] = matrix[1];
-         params[2] = matrix[2];
-         params[3] = matrix[3];
-         params[4] = matrix[4];
-         params[5] = matrix[5];
-         params[6] = matrix[6];
-         params[7] = matrix[7];
-         params[8] = matrix[8];
-         params[9] = matrix[9];
-         params[10] = matrix[10];
-         params[11] = matrix[11];
-         params[12] = matrix[12];
-         params[13] = matrix[13];
-         params[14] = matrix[14];
-         params[15] = matrix[15];
-         }
-         break;
-      case GL_COLOR_MATRIX_STACK_DEPTH_SGI:
-         params[0] = (GLfloat)(ctx->ColorMatrixStack.Depth + 1);
-         break;
-      case GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI:
-         params[0] = (GLfloat)(MAX_COLOR_STACK_DEPTH);
-         break;
-      case GL_POST_COLOR_MATRIX_RED_SCALE_SGI:
-         params[0] = ctx->Pixel.PostColorMatrixScale[0];
-         break;
-      case GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI:
-         params[0] = ctx->Pixel.PostColorMatrixScale[1];
-         break;
-      case GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI:
-         params[0] = ctx->Pixel.PostColorMatrixScale[2];
-         break;
-      case GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI:
-         params[0] = ctx->Pixel.PostColorMatrixScale[3];
-         break;
-      case GL_POST_COLOR_MATRIX_RED_BIAS_SGI:
-         params[0] = ctx->Pixel.PostColorMatrixBias[0];
-         break;
-      case GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI:
-         params[0] = ctx->Pixel.PostColorMatrixBias[1];
-         break;
-      case GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI:
-         params[0] = ctx->Pixel.PostColorMatrixBias[2];
-         break;
-      case GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI:
-         params[0] = ctx->Pixel.PostColorMatrixBias[3];
-         break;
-      case GL_CONVOLUTION_1D_EXT:
-         CHECK_EXT1(EXT_convolution, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Pixel.Convolution1DEnabled);
-         break;
-      case GL_CONVOLUTION_2D_EXT:
-         CHECK_EXT1(EXT_convolution, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Pixel.Convolution2DEnabled);
-         break;
-      case GL_SEPARABLE_2D_EXT:
-         CHECK_EXT1(EXT_convolution, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Pixel.Separable2DEnabled);
-         break;
-      case GL_POST_CONVOLUTION_RED_SCALE_EXT:
-         CHECK_EXT1(EXT_convolution, "GetFloatv");
-         params[0] = ctx->Pixel.PostConvolutionScale[0];
-         break;
-      case GL_POST_CONVOLUTION_GREEN_SCALE_EXT:
-         CHECK_EXT1(EXT_convolution, "GetFloatv");
-         params[0] = ctx->Pixel.PostConvolutionScale[1];
-         break;
-      case GL_POST_CONVOLUTION_BLUE_SCALE_EXT:
-         CHECK_EXT1(EXT_convolution, "GetFloatv");
-         params[0] = ctx->Pixel.PostConvolutionScale[2];
-         break;
-      case GL_POST_CONVOLUTION_ALPHA_SCALE_EXT:
-         CHECK_EXT1(EXT_convolution, "GetFloatv");
-         params[0] = ctx->Pixel.PostConvolutionScale[3];
-         break;
-      case GL_POST_CONVOLUTION_RED_BIAS_EXT:
-         CHECK_EXT1(EXT_convolution, "GetFloatv");
-         params[0] = ctx->Pixel.PostConvolutionBias[0];
-         break;
-      case GL_POST_CONVOLUTION_GREEN_BIAS_EXT:
-         CHECK_EXT1(EXT_convolution, "GetFloatv");
-         params[0] = ctx->Pixel.PostConvolutionBias[1];
-         break;
-      case GL_POST_CONVOLUTION_BLUE_BIAS_EXT:
-         CHECK_EXT1(EXT_convolution, "GetFloatv");
-         params[0] = ctx->Pixel.PostConvolutionBias[2];
-         break;
-      case GL_POST_CONVOLUTION_ALPHA_BIAS_EXT:
-         CHECK_EXT1(EXT_convolution, "GetFloatv");
-         params[0] = ctx->Pixel.PostConvolutionBias[3];
-         break;
-      case GL_HISTOGRAM:
-         CHECK_EXT1(EXT_histogram, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Pixel.HistogramEnabled);
-         break;
-      case GL_MINMAX:
-         CHECK_EXT1(EXT_histogram, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Pixel.MinMaxEnabled);
-         break;
-      case GL_COLOR_TABLE_SGI:
-         CHECK_EXT1(SGI_color_table, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Pixel.ColorTableEnabled[COLORTABLE_PRECONVOLUTION]);
-         break;
-      case GL_POST_CONVOLUTION_COLOR_TABLE_SGI:
-         CHECK_EXT1(SGI_color_table, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Pixel.ColorTableEnabled[COLORTABLE_POSTCONVOLUTION]);
-         break;
-      case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
-         CHECK_EXT1(SGI_color_table, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Pixel.ColorTableEnabled[COLORTABLE_POSTCOLORMATRIX]);
-         break;
-      case GL_TEXTURE_COLOR_TABLE_SGI:
-         CHECK_EXT1(SGI_texture_color_table, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Texture.Unit[ctx->Texture.CurrentUnit].ColorTableEnabled);
-         break;
-      case GL_COLOR_SUM_EXT:
-         CHECK_EXT2(EXT_secondary_color, ARB_vertex_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Fog.ColorSumEnabled);
-         break;
-      case GL_CURRENT_SECONDARY_COLOR_EXT:
-         CHECK_EXT1(EXT_secondary_color, "GetFloatv");
-         {
-         FLUSH_CURRENT(ctx, 0);
-         params[0] = ctx->Current.Attrib[VERT_ATTRIB_COLOR1][0];
-         params[1] = ctx->Current.Attrib[VERT_ATTRIB_COLOR1][1];
-         params[2] = ctx->Current.Attrib[VERT_ATTRIB_COLOR1][2];
-         params[3] = ctx->Current.Attrib[VERT_ATTRIB_COLOR1][3];
-         }
-         break;
-      case GL_SECONDARY_COLOR_ARRAY_EXT:
-         CHECK_EXT1(EXT_secondary_color, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Array.ArrayObj->SecondaryColor.Enabled);
-         break;
-      case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT:
-         CHECK_EXT1(EXT_secondary_color, "GetFloatv");
-         params[0] = ENUM_TO_FLOAT(ctx->Array.ArrayObj->SecondaryColor.Type);
-         break;
-      case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT:
-         CHECK_EXT1(EXT_secondary_color, "GetFloatv");
-         params[0] = (GLfloat)(ctx->Array.ArrayObj->SecondaryColor.Stride);
-         break;
-      case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT:
-         CHECK_EXT1(EXT_secondary_color, "GetFloatv");
-         params[0] = (GLfloat)(ctx->Array.ArrayObj->SecondaryColor.Size);
-         break;
-      case GL_CURRENT_FOG_COORDINATE_EXT:
-         CHECK_EXT1(EXT_fog_coord, "GetFloatv");
-         {
-         FLUSH_CURRENT(ctx, 0);
-         params[0] = ctx->Current.Attrib[VERT_ATTRIB_FOG][0];
-         }
-         break;
-      case GL_FOG_COORDINATE_ARRAY_EXT:
-         CHECK_EXT1(EXT_fog_coord, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Array.ArrayObj->FogCoord.Enabled);
-         break;
-      case GL_FOG_COORDINATE_ARRAY_TYPE_EXT:
-         CHECK_EXT1(EXT_fog_coord, "GetFloatv");
-         params[0] = ENUM_TO_FLOAT(ctx->Array.ArrayObj->FogCoord.Type);
-         break;
-      case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT:
-         CHECK_EXT1(EXT_fog_coord, "GetFloatv");
-         params[0] = (GLfloat)(ctx->Array.ArrayObj->FogCoord.Stride);
-         break;
-      case GL_FOG_COORDINATE_SOURCE_EXT:
-         CHECK_EXT1(EXT_fog_coord, "GetFloatv");
-         params[0] = ENUM_TO_FLOAT(ctx->Fog.FogCoordinateSource);
-         break;
-      case GL_MAX_TEXTURE_LOD_BIAS_EXT:
-         CHECK_EXT1(EXT_texture_lod_bias, "GetFloatv");
-         params[0] = ctx->Const.MaxTextureLodBias;
-         break;
-      case GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT:
-         CHECK_EXT1(EXT_texture_filter_anisotropic, "GetFloatv");
-         params[0] = ctx->Const.MaxTextureMaxAnisotropy;
-         break;
-      case GL_MULTISAMPLE_ARB:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Multisample.Enabled);
-         break;
-      case GL_SAMPLE_ALPHA_TO_COVERAGE_ARB:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Multisample.SampleAlphaToCoverage);
-         break;
-      case GL_SAMPLE_ALPHA_TO_ONE_ARB:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Multisample.SampleAlphaToOne);
-         break;
-      case GL_SAMPLE_COVERAGE_ARB:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Multisample.SampleCoverage);
-         break;
-      case GL_SAMPLE_COVERAGE_VALUE_ARB:
-         params[0] = ctx->Multisample.SampleCoverageValue;
-         break;
-      case GL_SAMPLE_COVERAGE_INVERT_ARB:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Multisample.SampleCoverageInvert);
-         break;
-      case GL_SAMPLE_BUFFERS_ARB:
-         params[0] = (GLfloat)(ctx->DrawBuffer->Visual.sampleBuffers);
-         break;
-      case GL_SAMPLES_ARB:
-         params[0] = (GLfloat)(ctx->DrawBuffer->Visual.samples);
-         break;
-      case GL_RASTER_POSITION_UNCLIPPED_IBM:
-         CHECK_EXT1(IBM_rasterpos_clip, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Transform.RasterPositionUnclipped);
-         break;
-      case GL_POINT_SPRITE_NV:
-         CHECK_EXT2(NV_point_sprite, ARB_point_sprite, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Point.PointSprite);
-         break;
-      case GL_POINT_SPRITE_R_MODE_NV:
-         CHECK_EXT1(NV_point_sprite, "GetFloatv");
-         params[0] = ENUM_TO_FLOAT(ctx->Point.SpriteRMode);
-         break;
-      case GL_POINT_SPRITE_COORD_ORIGIN:
-         CHECK_EXT2(NV_point_sprite, ARB_point_sprite, "GetFloatv");
-         params[0] = ENUM_TO_FLOAT(ctx->Point.SpriteOrigin);
-         break;
-      case GL_GENERATE_MIPMAP_HINT_SGIS:
-         CHECK_EXT1(SGIS_generate_mipmap, "GetFloatv");
-         params[0] = ENUM_TO_FLOAT(ctx->Hint.GenerateMipmap);
-         break;
-      case GL_VERTEX_PROGRAM_BINDING_NV:
-         CHECK_EXT1(NV_vertex_program, "GetFloatv");
-         params[0] = (GLfloat)((ctx->VertexProgram.Current ? ctx->VertexProgram.Current->Base.Id : 0));
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY0_NV:
-         CHECK_EXT1(NV_vertex_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Array.ArrayObj->VertexAttrib[0].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY1_NV:
-         CHECK_EXT1(NV_vertex_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Array.ArrayObj->VertexAttrib[1].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY2_NV:
-         CHECK_EXT1(NV_vertex_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Array.ArrayObj->VertexAttrib[2].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY3_NV:
-         CHECK_EXT1(NV_vertex_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Array.ArrayObj->VertexAttrib[3].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Array.ArrayObj->VertexAttrib[4].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY5_NV:
-         CHECK_EXT1(NV_vertex_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Array.ArrayObj->VertexAttrib[5].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY6_NV:
-         CHECK_EXT1(NV_vertex_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Array.ArrayObj->VertexAttrib[6].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY7_NV:
-         CHECK_EXT1(NV_vertex_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Array.ArrayObj->VertexAttrib[7].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY8_NV:
-         CHECK_EXT1(NV_vertex_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Array.ArrayObj->VertexAttrib[8].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY9_NV:
-         CHECK_EXT1(NV_vertex_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Array.ArrayObj->VertexAttrib[9].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY10_NV:
-         CHECK_EXT1(NV_vertex_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Array.ArrayObj->VertexAttrib[10].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY11_NV:
-         CHECK_EXT1(NV_vertex_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Array.ArrayObj->VertexAttrib[11].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY12_NV:
-         CHECK_EXT1(NV_vertex_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Array.ArrayObj->VertexAttrib[12].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY13_NV:
-         CHECK_EXT1(NV_vertex_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Array.ArrayObj->VertexAttrib[13].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY14_NV:
-         CHECK_EXT1(NV_vertex_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Array.ArrayObj->VertexAttrib[14].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY15_NV:
-         CHECK_EXT1(NV_vertex_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Array.ArrayObj->VertexAttrib[15].Enabled);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB0_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1Attrib[0]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB1_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1Attrib[1]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB2_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1Attrib[2]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB3_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1Attrib[3]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB4_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1Attrib[4]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB5_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1Attrib[5]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB6_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1Attrib[6]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB7_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1Attrib[7]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB8_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1Attrib[8]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB9_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1Attrib[9]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB10_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1Attrib[10]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB11_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1Attrib[11]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB12_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1Attrib[12]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB13_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1Attrib[13]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB14_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1Attrib[14]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB15_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1Attrib[15]);
-         break;
-      case GL_FRAGMENT_PROGRAM_NV:
-         CHECK_EXT1(NV_fragment_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->FragmentProgram.Enabled);
-         break;
-      case GL_FRAGMENT_PROGRAM_BINDING_NV:
-         CHECK_EXT1(NV_fragment_program, "GetFloatv");
-         params[0] = (GLfloat)(ctx->FragmentProgram.Current ? ctx->FragmentProgram.Current->Base.Id : 0);
-         break;
-      case GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV:
-         CHECK_EXT1(NV_fragment_program, "GetFloatv");
-         params[0] = (GLfloat)(MAX_NV_FRAGMENT_PROGRAM_PARAMS);
-         break;
-      case GL_TEXTURE_RECTANGLE_NV:
-         CHECK_EXT1(NV_texture_rectangle, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(_mesa_IsEnabled(GL_TEXTURE_RECTANGLE_NV));
-         break;
-      case GL_TEXTURE_BINDING_RECTANGLE_NV:
-         CHECK_EXT1(NV_texture_rectangle, "GetFloatv");
-         params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_RECT_INDEX]->Name);
-         break;
-      case GL_MAX_RECTANGLE_TEXTURE_SIZE_NV:
-         CHECK_EXT1(NV_texture_rectangle, "GetFloatv");
-         params[0] = (GLfloat)(ctx->Const.MaxTextureRectSize);
-         break;
-      case GL_STENCIL_TEST_TWO_SIDE_EXT:
-         CHECK_EXT1(EXT_stencil_two_side, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Stencil.TestTwoSide);
-         break;
-      case GL_ACTIVE_STENCIL_FACE_EXT:
-         CHECK_EXT1(EXT_stencil_two_side, "GetFloatv");
-         params[0] = ENUM_TO_FLOAT(ctx->Stencil.ActiveFace ? GL_BACK : GL_FRONT);
-         break;
-      case GL_MAX_SHININESS_NV:
-         CHECK_EXT1(NV_light_max_exponent, "GetFloatv");
-         params[0] = ctx->Const.MaxShininess;
-         break;
-      case GL_MAX_SPOT_EXPONENT_NV:
-         CHECK_EXT1(NV_light_max_exponent, "GetFloatv");
-         params[0] = ctx->Const.MaxSpotExponent;
-         break;
-      case GL_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = (GLfloat)(ctx->Array.ArrayBufferObj->Name);
-         break;
-      case GL_VERTEX_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = (GLfloat)(ctx->Array.ArrayObj->Vertex.BufferObj->Name);
-         break;
-      case GL_NORMAL_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = (GLfloat)(ctx->Array.ArrayObj->Normal.BufferObj->Name);
-         break;
-      case GL_COLOR_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = (GLfloat)(ctx->Array.ArrayObj->Color.BufferObj->Name);
-         break;
-      case GL_INDEX_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = (GLfloat)(ctx->Array.ArrayObj->Index.BufferObj->Name);
-         break;
-      case GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = (GLfloat)(ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].BufferObj->Name);
-         break;
-      case GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = (GLfloat)(ctx->Array.ArrayObj->EdgeFlag.BufferObj->Name);
-         break;
-      case GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = (GLfloat)(ctx->Array.ArrayObj->SecondaryColor.BufferObj->Name);
-         break;
-      case GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = (GLfloat)(ctx->Array.ArrayObj->FogCoord.BufferObj->Name);
-         break;
-      case GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = (GLfloat)(ctx->Array.ElementArrayBufferObj->Name);
-         break;
-      case GL_PIXEL_PACK_BUFFER_BINDING_EXT:
-         CHECK_EXT1(EXT_pixel_buffer_object, "GetFloatv");
-         params[0] = (GLfloat)(ctx->Pack.BufferObj->Name);
-         break;
-      case GL_PIXEL_UNPACK_BUFFER_BINDING_EXT:
-         CHECK_EXT1(EXT_pixel_buffer_object, "GetFloatv");
-         params[0] = (GLfloat)(ctx->Unpack.BufferObj->Name);
-         break;
-      case GL_VERTEX_PROGRAM_ARB:
-         CHECK_EXT2(ARB_vertex_program, NV_vertex_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->VertexProgram.Enabled);
-         break;
-      case GL_VERTEX_PROGRAM_POINT_SIZE_ARB:
-         CHECK_EXT2(ARB_vertex_program, NV_vertex_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->VertexProgram.PointSizeEnabled);
-         break;
-      case GL_VERTEX_PROGRAM_TWO_SIDE_ARB:
-         CHECK_EXT2(ARB_vertex_program, NV_vertex_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->VertexProgram.TwoSideEnabled);
-         break;
-      case GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB:
-         CHECK_EXT3(ARB_vertex_program, ARB_fragment_program, NV_vertex_program, "GetFloatv");
-         params[0] = (GLfloat)(ctx->Const.MaxProgramMatrixStackDepth);
-         break;
-      case GL_MAX_PROGRAM_MATRICES_ARB:
-         CHECK_EXT3(ARB_vertex_program, ARB_fragment_program, NV_vertex_program, "GetFloatv");
-         params[0] = (GLfloat)(ctx->Const.MaxProgramMatrices);
-         break;
-      case GL_CURRENT_MATRIX_STACK_DEPTH_ARB:
-         CHECK_EXT3(ARB_vertex_program, ARB_fragment_program, NV_vertex_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->CurrentStack->Depth + 1);
-         break;
-      case GL_CURRENT_MATRIX_ARB:
-         CHECK_EXT3(ARB_vertex_program, ARB_fragment_program, NV_fragment_program, "GetFloatv");
-         {
-         const GLfloat *matrix = ctx->CurrentStack->Top->m;
-         params[0] = matrix[0];
-         params[1] = matrix[1];
-         params[2] = matrix[2];
-         params[3] = matrix[3];
-         params[4] = matrix[4];
-         params[5] = matrix[5];
-         params[6] = matrix[6];
-         params[7] = matrix[7];
-         params[8] = matrix[8];
-         params[9] = matrix[9];
-         params[10] = matrix[10];
-         params[11] = matrix[11];
-         params[12] = matrix[12];
-         params[13] = matrix[13];
-         params[14] = matrix[14];
-         params[15] = matrix[15];
-         }
-         break;
-      case GL_TRANSPOSE_CURRENT_MATRIX_ARB:
-         CHECK_EXT2(ARB_vertex_program, ARB_fragment_program, "GetFloatv");
-         {
-         const GLfloat *matrix = ctx->CurrentStack->Top->m;
-         params[0] = matrix[0];
-         params[1] = matrix[4];
-         params[2] = matrix[8];
-         params[3] = matrix[12];
-         params[4] = matrix[1];
-         params[5] = matrix[5];
-         params[6] = matrix[9];
-         params[7] = matrix[13];
-         params[8] = matrix[2];
-         params[9] = matrix[6];
-         params[10] = matrix[10];
-         params[11] = matrix[14];
-         params[12] = matrix[3];
-         params[13] = matrix[7];
-         params[14] = matrix[11];
-         params[15] = matrix[15];
-         }
-         break;
-      case GL_MAX_VERTEX_ATTRIBS_ARB:
-         CHECK_EXT1(ARB_vertex_program, "GetFloatv");
-         params[0] = (GLfloat)(ctx->Const.VertexProgram.MaxAttribs);
-         break;
-      case GL_PROGRAM_ERROR_POSITION_ARB:
-         CHECK_EXT4(NV_vertex_program, ARB_vertex_program, NV_fragment_program, ARB_fragment_program, "GetFloatv");
-         params[0] = (GLfloat)(ctx->Program.ErrorPos);
-         break;
-      case GL_FRAGMENT_PROGRAM_ARB:
-         CHECK_EXT1(ARB_fragment_program, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->FragmentProgram.Enabled);
-         break;
-      case GL_MAX_TEXTURE_COORDS_ARB:
-         CHECK_EXT2(ARB_fragment_program, NV_fragment_program, "GetFloatv");
-         params[0] = (GLfloat)(ctx->Const.MaxTextureCoordUnits);
-         break;
-      case GL_MAX_TEXTURE_IMAGE_UNITS_ARB:
-         CHECK_EXT2(ARB_fragment_program, NV_fragment_program, "GetFloatv");
-         params[0] = (GLfloat)(ctx->Const.MaxTextureImageUnits);
-         break;
-      case GL_DEPTH_BOUNDS_TEST_EXT:
-         CHECK_EXT1(EXT_depth_bounds_test, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Depth.BoundsTest);
-         break;
-      case GL_DEPTH_BOUNDS_EXT:
-         CHECK_EXT1(EXT_depth_bounds_test, "GetFloatv");
-         params[0] = ctx->Depth.BoundsMin;
-         params[1] = ctx->Depth.BoundsMax;
-         break;
-      case GL_DEPTH_CLAMP:
-         CHECK_EXT1(ARB_depth_clamp, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Transform.DepthClamp);
-         break;
-      case GL_MAX_DRAW_BUFFERS_ARB:
-         params[0] = (GLfloat)(ctx->Const.MaxDrawBuffers);
-         break;
-      case GL_DRAW_BUFFER0_ARB:
-         params[0] = ENUM_TO_FLOAT(ctx->DrawBuffer->ColorDrawBuffer[0]);
-         break;
-      case GL_DRAW_BUFFER1_ARB:
-         {
-         GLenum buffer;
-         if (pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glGet(GL_DRAW_BUFFERx_ARB)");
-            return;
-         }
-         buffer = ctx->DrawBuffer->ColorDrawBuffer[1];
-         params[0] = ENUM_TO_FLOAT(buffer);
-         }
-         break;
-      case GL_DRAW_BUFFER2_ARB:
-         {
-         GLenum buffer;
-         if (pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glGet(GL_DRAW_BUFFERx_ARB)");
-            return;
-         }
-         buffer = ctx->DrawBuffer->ColorDrawBuffer[2];
-         params[0] = ENUM_TO_FLOAT(buffer);
-         }
-         break;
-      case GL_DRAW_BUFFER3_ARB:
-         {
-         GLenum buffer;
-         if (pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glGet(GL_DRAW_BUFFERx_ARB)");
-            return;
-         }
-         buffer = ctx->DrawBuffer->ColorDrawBuffer[3];
-         params[0] = ENUM_TO_FLOAT(buffer);
-         }
-         break;
-      case GL_IMPLEMENTATION_COLOR_READ_TYPE_OES:
-         CHECK_EXT1(OES_read_format, "GetFloatv");
-         params[0] = (GLfloat)(_mesa_get_color_read_type(ctx));
-         break;
-      case GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES:
-         CHECK_EXT1(OES_read_format, "GetFloatv");
-         params[0] = (GLfloat)(_mesa_get_color_read_format(ctx));
-         break;
-      case GL_NUM_FRAGMENT_REGISTERS_ATI:
-         CHECK_EXT1(ATI_fragment_shader, "GetFloatv");
-         params[0] = (GLfloat)(6);
-         break;
-      case GL_NUM_FRAGMENT_CONSTANTS_ATI:
-         CHECK_EXT1(ATI_fragment_shader, "GetFloatv");
-         params[0] = (GLfloat)(8);
-         break;
-      case GL_NUM_PASSES_ATI:
-         CHECK_EXT1(ATI_fragment_shader, "GetFloatv");
-         params[0] = (GLfloat)(2);
-         break;
-      case GL_NUM_INSTRUCTIONS_PER_PASS_ATI:
-         CHECK_EXT1(ATI_fragment_shader, "GetFloatv");
-         params[0] = (GLfloat)(8);
-         break;
-      case GL_NUM_INSTRUCTIONS_TOTAL_ATI:
-         CHECK_EXT1(ATI_fragment_shader, "GetFloatv");
-         params[0] = (GLfloat)(16);
-         break;
-      case GL_COLOR_ALPHA_PAIRING_ATI:
-         CHECK_EXT1(ATI_fragment_shader, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(GL_TRUE);
-         break;
-      case GL_NUM_LOOPBACK_COMPONENTS_ATI:
-         CHECK_EXT1(ATI_fragment_shader, "GetFloatv");
-         params[0] = (GLfloat)(3);
-         break;
-      case GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI:
-         CHECK_EXT1(ATI_fragment_shader, "GetFloatv");
-         params[0] = (GLfloat)(3);
-         break;
-      case GL_STENCIL_BACK_FUNC:
-         params[0] = ENUM_TO_FLOAT(ctx->Stencil.Function[1]);
-         break;
-      case GL_STENCIL_BACK_VALUE_MASK:
-         params[0] = (GLfloat)(ctx->Stencil.ValueMask[1]);
-         break;
-      case GL_STENCIL_BACK_WRITEMASK:
-         params[0] = (GLfloat)(ctx->Stencil.WriteMask[1]);
-         break;
-      case GL_STENCIL_BACK_REF:
-         params[0] = (GLfloat)(ctx->Stencil.Ref[1]);
-         break;
-      case GL_STENCIL_BACK_FAIL:
-         params[0] = ENUM_TO_FLOAT(ctx->Stencil.FailFunc[1]);
-         break;
-      case GL_STENCIL_BACK_PASS_DEPTH_FAIL:
-         params[0] = ENUM_TO_FLOAT(ctx->Stencil.ZFailFunc[1]);
-         break;
-      case GL_STENCIL_BACK_PASS_DEPTH_PASS:
-         params[0] = ENUM_TO_FLOAT(ctx->Stencil.ZPassFunc[1]);
-         break;
-      case GL_FRAMEBUFFER_BINDING_EXT:
-         CHECK_EXT1(EXT_framebuffer_object, "GetFloatv");
-         params[0] = (GLfloat)(ctx->DrawBuffer->Name);
-         break;
-      case GL_RENDERBUFFER_BINDING_EXT:
-         CHECK_EXT1(EXT_framebuffer_object, "GetFloatv");
-         params[0] = (GLfloat)(ctx->CurrentRenderbuffer ? ctx->CurrentRenderbuffer->Name : 0);
-         break;
-      case GL_MAX_COLOR_ATTACHMENTS_EXT:
-         CHECK_EXT1(EXT_framebuffer_object, "GetFloatv");
-         params[0] = (GLfloat)(ctx->Const.MaxColorAttachments);
-         break;
-      case GL_MAX_RENDERBUFFER_SIZE_EXT:
-         CHECK_EXT1(EXT_framebuffer_object, "GetFloatv");
-         params[0] = (GLfloat)(ctx->Const.MaxRenderbufferSize);
-         break;
-      case GL_READ_FRAMEBUFFER_BINDING_EXT:
-         CHECK_EXT1(EXT_framebuffer_blit, "GetFloatv");
-         params[0] = (GLfloat)(ctx->ReadBuffer->Name);
-         break;
-      case GL_PROVOKING_VERTEX_EXT:
-         CHECK_EXT1(EXT_provoking_vertex, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Light.ProvokingVertex);
-         break;
-      case GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT:
-         CHECK_EXT1(EXT_provoking_vertex, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Const.QuadsFollowProvokingVertexConvention);
-         break;
-      case GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB:
-         CHECK_EXT1(ARB_fragment_shader, "GetFloatv");
-         params[0] = (GLfloat)(ctx->Const.FragmentProgram.MaxUniformComponents);
-         break;
-      case GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB:
-         CHECK_EXT1(ARB_fragment_shader, "GetFloatv");
-         params[0] = ENUM_TO_FLOAT(ctx->Hint.FragmentShaderDerivative);
-         break;
-      case GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB:
-         CHECK_EXT1(ARB_vertex_shader, "GetFloatv");
-         params[0] = (GLfloat)(ctx->Const.VertexProgram.MaxUniformComponents);
-         break;
-      case GL_MAX_VARYING_FLOATS_ARB:
-         CHECK_EXT1(ARB_vertex_shader, "GetFloatv");
-         params[0] = (GLfloat)(ctx->Const.MaxVarying * 4);
-         break;
-      case GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB:
-         CHECK_EXT1(ARB_vertex_shader, "GetFloatv");
-         params[0] = (GLfloat)(ctx->Const.MaxVertexTextureImageUnits);
-         break;
-      case GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB:
-         CHECK_EXT1(ARB_vertex_shader, "GetFloatv");
-         params[0] = (GLfloat)(ctx->Const.MaxCombinedTextureImageUnits);
-         break;
-      case GL_CURRENT_PROGRAM:
-         CHECK_EXT1(ARB_shader_objects, "GetFloatv");
-         params[0] = (GLfloat)(ctx->Shader.CurrentProgram ? ctx->Shader.CurrentProgram->Name : 0);
-         break;
-      case GL_MAX_SAMPLES:
-         CHECK_EXT1(ARB_framebuffer_object, "GetFloatv");
-         params[0] = (GLfloat)(ctx->Const.MaxSamples);
-         break;
-      case GL_VERTEX_ARRAY_BINDING_APPLE:
-         CHECK_EXT1(APPLE_vertex_array_object, "GetFloatv");
-         params[0] = (GLfloat)(ctx->Array.ArrayObj->Name);
-         break;
-      case GL_TEXTURE_CUBE_MAP_SEAMLESS:
-         CHECK_EXT1(ARB_seamless_cube_map, "GetFloatv");
-         params[0] = BOOLEAN_TO_FLOAT(ctx->Texture.CubeMapSeamless);
-         break;
-      case GL_MAX_SERVER_WAIT_TIMEOUT:
-         CHECK_EXT1(ARB_sync, "GetFloatv");
-         params[0] = (GLfloat)(ctx->Const.MaxServerWaitTimeout);
-         break;
-      case GL_NUM_EXTENSIONS:
-         params[0] = (GLfloat)(_mesa_get_extension_count(ctx));
-         break;
-      case GL_MAJOR_VERSION:
-         params[0] = (GLfloat)(ctx->VersionMajor);
-         break;
-      case GL_MINOR_VERSION:
-         params[0] = (GLfloat)(ctx->VersionMinor);
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetFloatv(pname=0x%x)", pname);
+   case TYPE_INT_4:
+      params[3] = (GLfloat) (((GLint *) p)[3]);
+   case TYPE_INT_3:
+      params[2] = (GLfloat) (((GLint *) p)[2]);
+   case TYPE_INT_2:
+   case TYPE_ENUM_2:
+      params[1] = (GLfloat) (((GLint *) p)[1]);
+   case TYPE_INT:
+   case TYPE_ENUM:
+      params[0] = (GLfloat) (((GLint *) p)[0]);
+      break;
+
+   case TYPE_INT_N:
+      for (i = 0; i < v.value_int_n.n; i++)
+	 params[i] = INT_TO_FLOAT(v.value_int_n.ints[i]);
+      break;
+
+   case TYPE_INT64:
+      params[0] = ((GLint64 *) p)[0];
+      break;
+
+   case TYPE_BOOLEAN:
+      params[0] = BOOLEAN_TO_FLOAT(*(GLboolean*) p);
+      break;		
+
+   case TYPE_MATRIX:
+      m = *(GLmatrix **) p;
+      for (i = 0; i < 16; i++)
+	 params[i] = m->m[i];
+      break;
+
+   case TYPE_MATRIX_T:
+      m = *(GLmatrix **) p;
+      for (i = 0; i < 16; i++)
+	 params[i] = m->m[transpose[i]];
+      break;
+
+   case TYPE_BIT_0:
+   case TYPE_BIT_1:
+   case TYPE_BIT_2:
+   case TYPE_BIT_3:
+   case TYPE_BIT_4:
+   case TYPE_BIT_5:
+      shift = d->type - TYPE_BIT_0;
+      params[0] = BOOLEAN_TO_FLOAT((*(GLbitfield *) p >> shift) & 1);
+      break;
    }
 }
 
 void GLAPIENTRY
-_mesa_GetIntegerv( GLenum pname, GLint *params )
+_mesa_GetIntegerv(GLenum pname, GLint *params)
 {
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
+   const struct value_desc *d;
+   union value v;
+   GLmatrix *m;
+   int shift, i;
+   void *p;
 
-   if (!params)
-      return;
+   d = find_value("glGetIntegerv", pname, &p, &v);
+   switch (d->type) {
+   case TYPE_INVALID:
+      break;
+   case TYPE_CONST:
+      params[0] = d->offset;
+      break;
 
-   if (ctx->NewState)
-      _mesa_update_state(ctx);
+   case TYPE_FLOAT_4:
+      params[3] = IROUND(((GLfloat *) p)[3]);
+   case TYPE_FLOAT_3:
+      params[2] = IROUND(((GLfloat *) p)[2]);
+   case TYPE_FLOAT_2:
+      params[1] = IROUND(((GLfloat *) p)[1]);
+   case TYPE_FLOAT:
+      params[0] = IROUND(((GLfloat *) p)[0]);
+      break;
 
-   if (ctx->Driver.GetIntegerv &&
-       ctx->Driver.GetIntegerv(ctx, pname, params))
-      return;
+   case TYPE_FLOATN_4:
+      params[3] = FLOAT_TO_INT(((GLfloat *) p)[3]);
+   case TYPE_FLOATN_3:
+      params[2] = FLOAT_TO_INT(((GLfloat *) p)[2]);
+   case TYPE_FLOATN_2:
+      params[1] = FLOAT_TO_INT(((GLfloat *) p)[1]);
+   case TYPE_FLOATN:
+      params[0] = FLOAT_TO_INT(((GLfloat *) p)[0]);
+      break;
 
-   switch (pname) {
-      case GL_ACCUM_RED_BITS:
-         params[0] = ctx->DrawBuffer->Visual.accumRedBits;
-         break;
-      case GL_ACCUM_GREEN_BITS:
-         params[0] = ctx->DrawBuffer->Visual.accumGreenBits;
-         break;
-      case GL_ACCUM_BLUE_BITS:
-         params[0] = ctx->DrawBuffer->Visual.accumBlueBits;
-         break;
-      case GL_ACCUM_ALPHA_BITS:
-         params[0] = ctx->DrawBuffer->Visual.accumAlphaBits;
-         break;
-      case GL_ACCUM_CLEAR_VALUE:
-         params[0] = FLOAT_TO_INT(ctx->Accum.ClearColor[0]);
-         params[1] = FLOAT_TO_INT(ctx->Accum.ClearColor[1]);
-         params[2] = FLOAT_TO_INT(ctx->Accum.ClearColor[2]);
-         params[3] = FLOAT_TO_INT(ctx->Accum.ClearColor[3]);
-         break;
-      case GL_ALPHA_BIAS:
-         params[0] = IROUND(ctx->Pixel.AlphaBias);
-         break;
-      case GL_ALPHA_BITS:
-         params[0] = ctx->DrawBuffer->Visual.alphaBits;
-         break;
-      case GL_ALPHA_SCALE:
-         params[0] = IROUND(ctx->Pixel.AlphaScale);
-         break;
-      case GL_ALPHA_TEST:
-         params[0] = BOOLEAN_TO_INT(ctx->Color.AlphaEnabled);
-         break;
-      case GL_ALPHA_TEST_FUNC:
-         params[0] = ENUM_TO_INT(ctx->Color.AlphaFunc);
-         break;
-      case GL_ALPHA_TEST_REF:
-         params[0] = FLOAT_TO_INT(ctx->Color.AlphaRef);
-         break;
-      case GL_ATTRIB_STACK_DEPTH:
-         params[0] = ctx->AttribStackDepth;
-         break;
-      case GL_AUTO_NORMAL:
-         params[0] = BOOLEAN_TO_INT(ctx->Eval.AutoNormal);
-         break;
-      case GL_AUX_BUFFERS:
-         params[0] = ctx->DrawBuffer->Visual.numAuxBuffers;
-         break;
-      case GL_BLEND:
-         params[0] = BOOLEAN_TO_INT((ctx->Color.BlendEnabled & 1));
-         break;
-      case GL_BLEND_DST:
-         params[0] = ENUM_TO_INT(ctx->Color.BlendDstRGB);
-         break;
-      case GL_BLEND_SRC:
-         params[0] = ENUM_TO_INT(ctx->Color.BlendSrcRGB);
-         break;
-      case GL_BLEND_SRC_RGB_EXT:
-         params[0] = ENUM_TO_INT(ctx->Color.BlendSrcRGB);
-         break;
-      case GL_BLEND_DST_RGB_EXT:
-         params[0] = ENUM_TO_INT(ctx->Color.BlendDstRGB);
-         break;
-      case GL_BLEND_SRC_ALPHA_EXT:
-         params[0] = ENUM_TO_INT(ctx->Color.BlendSrcA);
-         break;
-      case GL_BLEND_DST_ALPHA_EXT:
-         params[0] = ENUM_TO_INT(ctx->Color.BlendDstA);
-         break;
-      case GL_BLEND_EQUATION:
-         params[0] = ENUM_TO_INT(ctx->Color.BlendEquationRGB );
-         break;
-      case GL_BLEND_EQUATION_ALPHA_EXT:
-         params[0] = ENUM_TO_INT(ctx->Color.BlendEquationA );
-         break;
-      case GL_BLEND_COLOR_EXT:
-         params[0] = FLOAT_TO_INT(ctx->Color.BlendColor[0]);
-         params[1] = FLOAT_TO_INT(ctx->Color.BlendColor[1]);
-         params[2] = FLOAT_TO_INT(ctx->Color.BlendColor[2]);
-         params[3] = FLOAT_TO_INT(ctx->Color.BlendColor[3]);
-         break;
-      case GL_BLUE_BIAS:
-         params[0] = IROUND(ctx->Pixel.BlueBias);
-         break;
-      case GL_BLUE_BITS:
-         params[0] = ctx->DrawBuffer->Visual.blueBits;
-         break;
-      case GL_BLUE_SCALE:
-         params[0] = IROUND(ctx->Pixel.BlueScale);
-         break;
-      case GL_CLIENT_ATTRIB_STACK_DEPTH:
-         params[0] = ctx->ClientAttribStackDepth;
-         break;
-      case GL_CLIP_PLANE0:
-         params[0] = BOOLEAN_TO_INT((ctx->Transform.ClipPlanesEnabled >> 0) & 1);
-         break;
-      case GL_CLIP_PLANE1:
-         params[0] = BOOLEAN_TO_INT((ctx->Transform.ClipPlanesEnabled >> 1) & 1);
-         break;
-      case GL_CLIP_PLANE2:
-         params[0] = BOOLEAN_TO_INT((ctx->Transform.ClipPlanesEnabled >> 2) & 1);
-         break;
-      case GL_CLIP_PLANE3:
-         params[0] = BOOLEAN_TO_INT((ctx->Transform.ClipPlanesEnabled >> 3) & 1);
-         break;
-      case GL_CLIP_PLANE4:
-         params[0] = BOOLEAN_TO_INT((ctx->Transform.ClipPlanesEnabled >> 4) & 1);
-         break;
-      case GL_CLIP_PLANE5:
-         params[0] = BOOLEAN_TO_INT((ctx->Transform.ClipPlanesEnabled >> 5) & 1);
-         break;
-      case GL_COLOR_CLEAR_VALUE:
-         params[0] = FLOAT_TO_INT(ctx->Color.ClearColor[0]);
-         params[1] = FLOAT_TO_INT(ctx->Color.ClearColor[1]);
-         params[2] = FLOAT_TO_INT(ctx->Color.ClearColor[2]);
-         params[3] = FLOAT_TO_INT(ctx->Color.ClearColor[3]);
-         break;
-      case GL_COLOR_MATERIAL:
-         params[0] = BOOLEAN_TO_INT(ctx->Light.ColorMaterialEnabled);
-         break;
-      case GL_COLOR_MATERIAL_FACE:
-         params[0] = ENUM_TO_INT(ctx->Light.ColorMaterialFace);
-         break;
-      case GL_COLOR_MATERIAL_PARAMETER:
-         params[0] = ENUM_TO_INT(ctx->Light.ColorMaterialMode);
-         break;
-      case GL_COLOR_WRITEMASK:
-         params[0] = ctx->Color.ColorMask[0][RCOMP] ? 1 : 0;
-         params[1] = ctx->Color.ColorMask[0][GCOMP] ? 1 : 0;
-         params[2] = ctx->Color.ColorMask[0][BCOMP] ? 1 : 0;
-         params[3] = ctx->Color.ColorMask[0][ACOMP] ? 1 : 0;
-         break;
-      case GL_CULL_FACE:
-         params[0] = BOOLEAN_TO_INT(ctx->Polygon.CullFlag);
-         break;
-      case GL_CULL_FACE_MODE:
-         params[0] = ENUM_TO_INT(ctx->Polygon.CullFaceMode);
-         break;
-      case GL_CURRENT_COLOR:
-         {
-         FLUSH_CURRENT(ctx, 0);
-         params[0] = FLOAT_TO_INT(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][0]);
-         params[1] = FLOAT_TO_INT(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][1]);
-         params[2] = FLOAT_TO_INT(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][2]);
-         params[3] = FLOAT_TO_INT(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][3]);
-         }
-         break;
-      case GL_CURRENT_INDEX:
-         {
-         FLUSH_CURRENT(ctx, 0);
-         params[0] = IROUND(ctx->Current.Attrib[VERT_ATTRIB_COLOR_INDEX][0]);
-         }
-         break;
-      case GL_CURRENT_NORMAL:
-         {
-         FLUSH_CURRENT(ctx, 0);
-         params[0] = FLOAT_TO_INT(ctx->Current.Attrib[VERT_ATTRIB_NORMAL][0]);
-         params[1] = FLOAT_TO_INT(ctx->Current.Attrib[VERT_ATTRIB_NORMAL][1]);
-         params[2] = FLOAT_TO_INT(ctx->Current.Attrib[VERT_ATTRIB_NORMAL][2]);
-         }
-         break;
-      case GL_CURRENT_RASTER_COLOR:
-         params[0] = FLOAT_TO_INT(ctx->Current.RasterColor[0]);
-         params[1] = FLOAT_TO_INT(ctx->Current.RasterColor[1]);
-         params[2] = FLOAT_TO_INT(ctx->Current.RasterColor[2]);
-         params[3] = FLOAT_TO_INT(ctx->Current.RasterColor[3]);
-         break;
-      case GL_CURRENT_RASTER_DISTANCE:
-         params[0] = IROUND(ctx->Current.RasterDistance);
-         break;
-      case GL_CURRENT_RASTER_INDEX:
-         params[0] = IROUND(1.0);
-         break;
-      case GL_CURRENT_RASTER_POSITION:
-         params[0] = IROUND(ctx->Current.RasterPos[0]);
-         params[1] = IROUND(ctx->Current.RasterPos[1]);
-         params[2] = IROUND(ctx->Current.RasterPos[2]);
-         params[3] = IROUND(ctx->Current.RasterPos[3]);
-         break;
-      case GL_CURRENT_RASTER_SECONDARY_COLOR:
-         params[0] = FLOAT_TO_INT(ctx->Current.RasterSecondaryColor[0]);
-         params[1] = FLOAT_TO_INT(ctx->Current.RasterSecondaryColor[1]);
-         params[2] = FLOAT_TO_INT(ctx->Current.RasterSecondaryColor[2]);
-         params[3] = FLOAT_TO_INT(ctx->Current.RasterSecondaryColor[3]);
-         break;
-      case GL_CURRENT_RASTER_TEXTURE_COORDS:
-         {
-         const GLuint unit = ctx->Texture.CurrentUnit;
-         if (unit >= ctx->Const.MaxTextureCoordUnits) {
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glGet(raster tex coords, unit %u)", unit);
-            return;
-         }
-         params[0] = IROUND(ctx->Current.RasterTexCoords[unit][0]);
-         params[1] = IROUND(ctx->Current.RasterTexCoords[unit][1]);
-         params[2] = IROUND(ctx->Current.RasterTexCoords[unit][2]);
-         params[3] = IROUND(ctx->Current.RasterTexCoords[unit][3]);
-         }
-         break;
-      case GL_CURRENT_RASTER_POSITION_VALID:
-         params[0] = BOOLEAN_TO_INT(ctx->Current.RasterPosValid);
-         break;
-      case GL_CURRENT_TEXTURE_COORDS:
-         {
-         const GLuint unit = ctx->Texture.CurrentUnit;
-         if (unit >= ctx->Const.MaxTextureCoordUnits) {
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glGet(current tex coords, unit %u)", unit);
-            return;
-         }
-         FLUSH_CURRENT(ctx, 0);
-         params[0] = IROUND(ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit][0]);
-         params[1] = IROUND(ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit][1]);
-         params[2] = IROUND(ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit][2]);
-         params[3] = IROUND(ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit][3]);
-         }
-         break;
-      case GL_DEPTH_BIAS:
-         params[0] = IROUND(ctx->Pixel.DepthBias);
-         break;
-      case GL_DEPTH_BITS:
-         params[0] = ctx->DrawBuffer->Visual.depthBits;
-         break;
-      case GL_DEPTH_CLEAR_VALUE:
-         params[0] = FLOAT_TO_INT(((GLfloat) ctx->Depth.Clear));
-         break;
-      case GL_DEPTH_FUNC:
-         params[0] = ENUM_TO_INT(ctx->Depth.Func);
-         break;
-      case GL_DEPTH_RANGE:
-         params[0] = FLOAT_TO_INT(ctx->Viewport.Near);
-         params[1] = FLOAT_TO_INT(ctx->Viewport.Far);
-         break;
-      case GL_DEPTH_SCALE:
-         params[0] = IROUND(ctx->Pixel.DepthScale);
-         break;
-      case GL_DEPTH_TEST:
-         params[0] = BOOLEAN_TO_INT(ctx->Depth.Test);
-         break;
-      case GL_DEPTH_WRITEMASK:
-         params[0] = BOOLEAN_TO_INT(ctx->Depth.Mask);
-         break;
-      case GL_DITHER:
-         params[0] = BOOLEAN_TO_INT(ctx->Color.DitherFlag);
-         break;
-      case GL_DOUBLEBUFFER:
-         params[0] = BOOLEAN_TO_INT(ctx->DrawBuffer->Visual.doubleBufferMode);
-         break;
-      case GL_DRAW_BUFFER:
-         params[0] = ENUM_TO_INT(ctx->DrawBuffer->ColorDrawBuffer[0]);
-         break;
-      case GL_EDGE_FLAG:
-         {
-         FLUSH_CURRENT(ctx, 0);
-         params[0] = BOOLEAN_TO_INT((ctx->Current.Attrib[VERT_ATTRIB_EDGEFLAG][0] == 1.0));
-         }
-         break;
-      case GL_FEEDBACK_BUFFER_SIZE:
-         params[0] = ctx->Feedback.BufferSize;
-         break;
-      case GL_FEEDBACK_BUFFER_TYPE:
-         params[0] = ENUM_TO_INT(ctx->Feedback.Type);
-         break;
-      case GL_FOG:
-         params[0] = BOOLEAN_TO_INT(ctx->Fog.Enabled);
-         break;
-      case GL_FOG_COLOR:
-         params[0] = FLOAT_TO_INT(ctx->Fog.Color[0]);
-         params[1] = FLOAT_TO_INT(ctx->Fog.Color[1]);
-         params[2] = FLOAT_TO_INT(ctx->Fog.Color[2]);
-         params[3] = FLOAT_TO_INT(ctx->Fog.Color[3]);
-         break;
-      case GL_FOG_DENSITY:
-         params[0] = IROUND(ctx->Fog.Density);
-         break;
-      case GL_FOG_END:
-         params[0] = IROUND(ctx->Fog.End);
-         break;
-      case GL_FOG_HINT:
-         params[0] = ENUM_TO_INT(ctx->Hint.Fog);
-         break;
-      case GL_FOG_INDEX:
-         params[0] = IROUND(ctx->Fog.Index);
-         break;
-      case GL_FOG_MODE:
-         params[0] = ENUM_TO_INT(ctx->Fog.Mode);
-         break;
-      case GL_FOG_START:
-         params[0] = IROUND(ctx->Fog.Start);
-         break;
-      case GL_FRONT_FACE:
-         params[0] = ENUM_TO_INT(ctx->Polygon.FrontFace);
-         break;
-      case GL_GREEN_BIAS:
-         params[0] = IROUND(ctx->Pixel.GreenBias);
-         break;
-      case GL_GREEN_BITS:
-         params[0] = ctx->DrawBuffer->Visual.greenBits;
-         break;
-      case GL_GREEN_SCALE:
-         params[0] = IROUND(ctx->Pixel.GreenScale);
-         break;
-      case GL_INDEX_BITS:
-         params[0] = ctx->DrawBuffer->Visual.indexBits;
-         break;
-      case GL_INDEX_CLEAR_VALUE:
-         params[0] = ctx->Color.ClearIndex;
-         break;
-      case GL_INDEX_MODE:
-         params[0] = BOOLEAN_TO_INT(GL_FALSE);
-         break;
-      case GL_INDEX_OFFSET:
-         params[0] = ctx->Pixel.IndexOffset;
-         break;
-      case GL_INDEX_SHIFT:
-         params[0] = ctx->Pixel.IndexShift;
-         break;
-      case GL_INDEX_WRITEMASK:
-         params[0] = ctx->Color.IndexMask;
-         break;
-      case GL_LIGHT0:
-         params[0] = BOOLEAN_TO_INT(ctx->Light.Light[0].Enabled);
-         break;
-      case GL_LIGHT1:
-         params[0] = BOOLEAN_TO_INT(ctx->Light.Light[1].Enabled);
-         break;
-      case GL_LIGHT2:
-         params[0] = BOOLEAN_TO_INT(ctx->Light.Light[2].Enabled);
-         break;
-      case GL_LIGHT3:
-         params[0] = BOOLEAN_TO_INT(ctx->Light.Light[3].Enabled);
-         break;
-      case GL_LIGHT4:
-         params[0] = BOOLEAN_TO_INT(ctx->Light.Light[4].Enabled);
-         break;
-      case GL_LIGHT5:
-         params[0] = BOOLEAN_TO_INT(ctx->Light.Light[5].Enabled);
-         break;
-      case GL_LIGHT6:
-         params[0] = BOOLEAN_TO_INT(ctx->Light.Light[6].Enabled);
-         break;
-      case GL_LIGHT7:
-         params[0] = BOOLEAN_TO_INT(ctx->Light.Light[7].Enabled);
-         break;
-      case GL_LIGHTING:
-         params[0] = BOOLEAN_TO_INT(ctx->Light.Enabled);
-         break;
-      case GL_LIGHT_MODEL_AMBIENT:
-         params[0] = FLOAT_TO_INT(ctx->Light.Model.Ambient[0]);
-         params[1] = FLOAT_TO_INT(ctx->Light.Model.Ambient[1]);
-         params[2] = FLOAT_TO_INT(ctx->Light.Model.Ambient[2]);
-         params[3] = FLOAT_TO_INT(ctx->Light.Model.Ambient[3]);
-         break;
-      case GL_LIGHT_MODEL_COLOR_CONTROL:
-         params[0] = ENUM_TO_INT(ctx->Light.Model.ColorControl);
-         break;
-      case GL_LIGHT_MODEL_LOCAL_VIEWER:
-         params[0] = BOOLEAN_TO_INT(ctx->Light.Model.LocalViewer);
-         break;
-      case GL_LIGHT_MODEL_TWO_SIDE:
-         params[0] = BOOLEAN_TO_INT(ctx->Light.Model.TwoSide);
-         break;
-      case GL_LINE_SMOOTH:
-         params[0] = BOOLEAN_TO_INT(ctx->Line.SmoothFlag);
-         break;
-      case GL_LINE_SMOOTH_HINT:
-         params[0] = ENUM_TO_INT(ctx->Hint.LineSmooth);
-         break;
-      case GL_LINE_STIPPLE:
-         params[0] = BOOLEAN_TO_INT(ctx->Line.StippleFlag);
-         break;
-      case GL_LINE_STIPPLE_PATTERN:
-         params[0] = ctx->Line.StipplePattern;
-         break;
-      case GL_LINE_STIPPLE_REPEAT:
-         params[0] = ctx->Line.StippleFactor;
-         break;
-      case GL_LINE_WIDTH:
-         params[0] = IROUND(ctx->Line.Width);
-         break;
-      case GL_LINE_WIDTH_GRANULARITY:
-         params[0] = IROUND(ctx->Const.LineWidthGranularity);
-         break;
-      case GL_LINE_WIDTH_RANGE:
-         params[0] = IROUND(ctx->Const.MinLineWidthAA);
-         params[1] = IROUND(ctx->Const.MaxLineWidthAA);
-         break;
-      case GL_ALIASED_LINE_WIDTH_RANGE:
-         params[0] = IROUND(ctx->Const.MinLineWidth);
-         params[1] = IROUND(ctx->Const.MaxLineWidth);
-         break;
-      case GL_LIST_BASE:
-         params[0] = ctx->List.ListBase;
-         break;
-      case GL_LIST_INDEX:
-         params[0] = (ctx->ListState.CurrentList ? ctx->ListState.CurrentList->Name : 0);
-         break;
-      case GL_LIST_MODE:
-         {
-         GLenum mode;
-         if (!ctx->CompileFlag)
-            mode = 0;
-         else if (ctx->ExecuteFlag)
-            mode = GL_COMPILE_AND_EXECUTE;
-         else
-            mode = GL_COMPILE;
-         params[0] = ENUM_TO_INT(mode);
-         }
-         break;
-      case GL_INDEX_LOGIC_OP:
-         params[0] = BOOLEAN_TO_INT(ctx->Color.IndexLogicOpEnabled);
-         break;
-      case GL_COLOR_LOGIC_OP:
-         params[0] = BOOLEAN_TO_INT(ctx->Color.ColorLogicOpEnabled);
-         break;
-      case GL_LOGIC_OP_MODE:
-         params[0] = ENUM_TO_INT(ctx->Color.LogicOp);
-         break;
-      case GL_MAP1_COLOR_4:
-         params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1Color4);
-         break;
-      case GL_MAP1_GRID_DOMAIN:
-         params[0] = IROUND(ctx->Eval.MapGrid1u1);
-         params[1] = IROUND(ctx->Eval.MapGrid1u2);
-         break;
-      case GL_MAP1_GRID_SEGMENTS:
-         params[0] = ctx->Eval.MapGrid1un;
-         break;
-      case GL_MAP1_INDEX:
-         params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1Index);
-         break;
-      case GL_MAP1_NORMAL:
-         params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1Normal);
-         break;
-      case GL_MAP1_TEXTURE_COORD_1:
-         params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1TextureCoord1);
-         break;
-      case GL_MAP1_TEXTURE_COORD_2:
-         params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1TextureCoord2);
-         break;
-      case GL_MAP1_TEXTURE_COORD_3:
-         params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1TextureCoord3);
-         break;
-      case GL_MAP1_TEXTURE_COORD_4:
-         params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1TextureCoord4);
-         break;
-      case GL_MAP1_VERTEX_3:
-         params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1Vertex3);
-         break;
-      case GL_MAP1_VERTEX_4:
-         params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1Vertex4);
-         break;
-      case GL_MAP2_COLOR_4:
-         params[0] = BOOLEAN_TO_INT(ctx->Eval.Map2Color4);
-         break;
-      case GL_MAP2_GRID_DOMAIN:
-         params[0] = IROUND(ctx->Eval.MapGrid2u1);
-         params[1] = IROUND(ctx->Eval.MapGrid2u2);
-         params[2] = IROUND(ctx->Eval.MapGrid2v1);
-         params[3] = IROUND(ctx->Eval.MapGrid2v2);
-         break;
-      case GL_MAP2_GRID_SEGMENTS:
-         params[0] = ctx->Eval.MapGrid2un;
-         params[1] = ctx->Eval.MapGrid2vn;
-         break;
-      case GL_MAP2_INDEX:
-         params[0] = BOOLEAN_TO_INT(ctx->Eval.Map2Index);
-         break;
-      case GL_MAP2_NORMAL:
-         params[0] = BOOLEAN_TO_INT(ctx->Eval.Map2Normal);
-         break;
-      case GL_MAP2_TEXTURE_COORD_1:
-         params[0] = BOOLEAN_TO_INT(ctx->Eval.Map2TextureCoord1);
-         break;
-      case GL_MAP2_TEXTURE_COORD_2:
-         params[0] = BOOLEAN_TO_INT(ctx->Eval.Map2TextureCoord2);
-         break;
-      case GL_MAP2_TEXTURE_COORD_3:
-         params[0] = BOOLEAN_TO_INT(ctx->Eval.Map2TextureCoord3);
-         break;
-      case GL_MAP2_TEXTURE_COORD_4:
-         params[0] = BOOLEAN_TO_INT(ctx->Eval.Map2TextureCoord4);
-         break;
-      case GL_MAP2_VERTEX_3:
-         params[0] = BOOLEAN_TO_INT(ctx->Eval.Map2Vertex3);
-         break;
-      case GL_MAP2_VERTEX_4:
-         params[0] = BOOLEAN_TO_INT(ctx->Eval.Map2Vertex4);
-         break;
-      case GL_MAP_COLOR:
-         params[0] = BOOLEAN_TO_INT(ctx->Pixel.MapColorFlag);
-         break;
-      case GL_MAP_STENCIL:
-         params[0] = BOOLEAN_TO_INT(ctx->Pixel.MapStencilFlag);
-         break;
-      case GL_MATRIX_MODE:
-         params[0] = ENUM_TO_INT(ctx->Transform.MatrixMode);
-         break;
-      case GL_MAX_ATTRIB_STACK_DEPTH:
-         params[0] = MAX_ATTRIB_STACK_DEPTH;
-         break;
-      case GL_MAX_CLIENT_ATTRIB_STACK_DEPTH:
-         params[0] = MAX_CLIENT_ATTRIB_STACK_DEPTH;
-         break;
-      case GL_MAX_CLIP_PLANES:
-         params[0] = ctx->Const.MaxClipPlanes;
-         break;
-      case GL_MAX_ELEMENTS_VERTICES:
-         params[0] = ctx->Const.MaxArrayLockSize;
-         break;
-      case GL_MAX_ELEMENTS_INDICES:
-         params[0] = ctx->Const.MaxArrayLockSize;
-         break;
-      case GL_MAX_EVAL_ORDER:
-         params[0] = MAX_EVAL_ORDER;
-         break;
-      case GL_MAX_LIGHTS:
-         params[0] = ctx->Const.MaxLights;
-         break;
-      case GL_MAX_LIST_NESTING:
-         params[0] = MAX_LIST_NESTING;
-         break;
-      case GL_MAX_MODELVIEW_STACK_DEPTH:
-         params[0] = MAX_MODELVIEW_STACK_DEPTH;
-         break;
-      case GL_MAX_NAME_STACK_DEPTH:
-         params[0] = MAX_NAME_STACK_DEPTH;
-         break;
-      case GL_MAX_PIXEL_MAP_TABLE:
-         params[0] = MAX_PIXEL_MAP_TABLE;
-         break;
-      case GL_MAX_PROJECTION_STACK_DEPTH:
-         params[0] = MAX_PROJECTION_STACK_DEPTH;
-         break;
-      case GL_MAX_TEXTURE_SIZE:
-         params[0] = 1 << (ctx->Const.MaxTextureLevels - 1);
-         break;
-      case GL_MAX_3D_TEXTURE_SIZE:
-         params[0] = 1 << (ctx->Const.Max3DTextureLevels - 1);
-         break;
-      case GL_MAX_TEXTURE_STACK_DEPTH:
-         params[0] = MAX_TEXTURE_STACK_DEPTH;
-         break;
-      case GL_MAX_VIEWPORT_DIMS:
-         params[0] = ctx->Const.MaxViewportWidth;
-         params[1] = ctx->Const.MaxViewportHeight;
-         break;
-      case GL_MODELVIEW_MATRIX:
-         {
-         const GLfloat *matrix = ctx->ModelviewMatrixStack.Top->m;
-         params[0] = IROUND(matrix[0]);
-         params[1] = IROUND(matrix[1]);
-         params[2] = IROUND(matrix[2]);
-         params[3] = IROUND(matrix[3]);
-         params[4] = IROUND(matrix[4]);
-         params[5] = IROUND(matrix[5]);
-         params[6] = IROUND(matrix[6]);
-         params[7] = IROUND(matrix[7]);
-         params[8] = IROUND(matrix[8]);
-         params[9] = IROUND(matrix[9]);
-         params[10] = IROUND(matrix[10]);
-         params[11] = IROUND(matrix[11]);
-         params[12] = IROUND(matrix[12]);
-         params[13] = IROUND(matrix[13]);
-         params[14] = IROUND(matrix[14]);
-         params[15] = IROUND(matrix[15]);
-         }
-         break;
-      case GL_MODELVIEW_STACK_DEPTH:
-         params[0] = ctx->ModelviewMatrixStack.Depth + 1;
-         break;
-      case GL_NAME_STACK_DEPTH:
-         params[0] = ctx->Select.NameStackDepth;
-         break;
-      case GL_NORMALIZE:
-         params[0] = BOOLEAN_TO_INT(ctx->Transform.Normalize);
-         break;
-      case GL_PACK_ALIGNMENT:
-         params[0] = ctx->Pack.Alignment;
-         break;
-      case GL_PACK_LSB_FIRST:
-         params[0] = BOOLEAN_TO_INT(ctx->Pack.LsbFirst);
-         break;
-      case GL_PACK_ROW_LENGTH:
-         params[0] = ctx->Pack.RowLength;
-         break;
-      case GL_PACK_SKIP_PIXELS:
-         params[0] = ctx->Pack.SkipPixels;
-         break;
-      case GL_PACK_SKIP_ROWS:
-         params[0] = ctx->Pack.SkipRows;
-         break;
-      case GL_PACK_SWAP_BYTES:
-         params[0] = BOOLEAN_TO_INT(ctx->Pack.SwapBytes);
-         break;
-      case GL_PACK_SKIP_IMAGES_EXT:
-         params[0] = ctx->Pack.SkipImages;
-         break;
-      case GL_PACK_IMAGE_HEIGHT_EXT:
-         params[0] = ctx->Pack.ImageHeight;
-         break;
-      case GL_PACK_INVERT_MESA:
-         params[0] = BOOLEAN_TO_INT(ctx->Pack.Invert);
-         break;
-      case GL_PERSPECTIVE_CORRECTION_HINT:
-         params[0] = ENUM_TO_INT(ctx->Hint.PerspectiveCorrection);
-         break;
-      case GL_PIXEL_MAP_A_TO_A_SIZE:
-         params[0] = ctx->PixelMaps.AtoA.Size;
-         break;
-      case GL_PIXEL_MAP_B_TO_B_SIZE:
-         params[0] = ctx->PixelMaps.BtoB.Size;
-         break;
-      case GL_PIXEL_MAP_G_TO_G_SIZE:
-         params[0] = ctx->PixelMaps.GtoG.Size;
-         break;
-      case GL_PIXEL_MAP_I_TO_A_SIZE:
-         params[0] = ctx->PixelMaps.ItoA.Size;
-         break;
-      case GL_PIXEL_MAP_I_TO_B_SIZE:
-         params[0] = ctx->PixelMaps.ItoB.Size;
-         break;
-      case GL_PIXEL_MAP_I_TO_G_SIZE:
-         params[0] = ctx->PixelMaps.ItoG.Size;
-         break;
-      case GL_PIXEL_MAP_I_TO_I_SIZE:
-         params[0] = ctx->PixelMaps.ItoI.Size;
-         break;
-      case GL_PIXEL_MAP_I_TO_R_SIZE:
-         params[0] = ctx->PixelMaps.ItoR.Size;
-         break;
-      case GL_PIXEL_MAP_R_TO_R_SIZE:
-         params[0] = ctx->PixelMaps.RtoR.Size;
-         break;
-      case GL_PIXEL_MAP_S_TO_S_SIZE:
-         params[0] = ctx->PixelMaps.StoS.Size;
-         break;
-      case GL_POINT_SIZE:
-         params[0] = IROUND(ctx->Point.Size);
-         break;
-      case GL_POINT_SIZE_GRANULARITY:
-         params[0] = IROUND(ctx->Const.PointSizeGranularity);
-         break;
-      case GL_POINT_SIZE_RANGE:
-         params[0] = IROUND(ctx->Const.MinPointSizeAA);
-         params[1] = IROUND(ctx->Const.MaxPointSizeAA);
-         break;
-      case GL_ALIASED_POINT_SIZE_RANGE:
-         params[0] = IROUND(ctx->Const.MinPointSize);
-         params[1] = IROUND(ctx->Const.MaxPointSize);
-         break;
-      case GL_POINT_SMOOTH:
-         params[0] = BOOLEAN_TO_INT(ctx->Point.SmoothFlag);
-         break;
-      case GL_POINT_SMOOTH_HINT:
-         params[0] = ENUM_TO_INT(ctx->Hint.PointSmooth);
-         break;
-      case GL_POINT_SIZE_MIN_EXT:
-         params[0] = IROUND(ctx->Point.MinSize);
-         break;
-      case GL_POINT_SIZE_MAX_EXT:
-         params[0] = IROUND(ctx->Point.MaxSize);
-         break;
-      case GL_POINT_FADE_THRESHOLD_SIZE_EXT:
-         params[0] = IROUND(ctx->Point.Threshold);
-         break;
-      case GL_DISTANCE_ATTENUATION_EXT:
-         params[0] = IROUND(ctx->Point.Params[0]);
-         params[1] = IROUND(ctx->Point.Params[1]);
-         params[2] = IROUND(ctx->Point.Params[2]);
-         break;
-      case GL_POLYGON_MODE:
-         params[0] = ENUM_TO_INT(ctx->Polygon.FrontMode);
-         params[1] = ENUM_TO_INT(ctx->Polygon.BackMode);
-         break;
-      case GL_POLYGON_OFFSET_BIAS_EXT:
-         params[0] = IROUND(ctx->Polygon.OffsetUnits);
-         break;
-      case GL_POLYGON_OFFSET_FACTOR:
-         params[0] = IROUND(ctx->Polygon.OffsetFactor );
-         break;
-      case GL_POLYGON_OFFSET_UNITS:
-         params[0] = IROUND(ctx->Polygon.OffsetUnits );
-         break;
-      case GL_POLYGON_OFFSET_POINT:
-         params[0] = BOOLEAN_TO_INT(ctx->Polygon.OffsetPoint);
-         break;
-      case GL_POLYGON_OFFSET_LINE:
-         params[0] = BOOLEAN_TO_INT(ctx->Polygon.OffsetLine);
-         break;
-      case GL_POLYGON_OFFSET_FILL:
-         params[0] = BOOLEAN_TO_INT(ctx->Polygon.OffsetFill);
-         break;
-      case GL_POLYGON_SMOOTH:
-         params[0] = BOOLEAN_TO_INT(ctx->Polygon.SmoothFlag);
-         break;
-      case GL_POLYGON_SMOOTH_HINT:
-         params[0] = ENUM_TO_INT(ctx->Hint.PolygonSmooth);
-         break;
-      case GL_POLYGON_STIPPLE:
-         params[0] = BOOLEAN_TO_INT(ctx->Polygon.StippleFlag);
-         break;
-      case GL_PROJECTION_MATRIX:
-         {
-         const GLfloat *matrix = ctx->ProjectionMatrixStack.Top->m;
-         params[0] = IROUND(matrix[0]);
-         params[1] = IROUND(matrix[1]);
-         params[2] = IROUND(matrix[2]);
-         params[3] = IROUND(matrix[3]);
-         params[4] = IROUND(matrix[4]);
-         params[5] = IROUND(matrix[5]);
-         params[6] = IROUND(matrix[6]);
-         params[7] = IROUND(matrix[7]);
-         params[8] = IROUND(matrix[8]);
-         params[9] = IROUND(matrix[9]);
-         params[10] = IROUND(matrix[10]);
-         params[11] = IROUND(matrix[11]);
-         params[12] = IROUND(matrix[12]);
-         params[13] = IROUND(matrix[13]);
-         params[14] = IROUND(matrix[14]);
-         params[15] = IROUND(matrix[15]);
-         }
-         break;
-      case GL_PROJECTION_STACK_DEPTH:
-         params[0] = ctx->ProjectionMatrixStack.Depth + 1;
-         break;
-      case GL_READ_BUFFER:
-         params[0] = ENUM_TO_INT(ctx->ReadBuffer->ColorReadBuffer);
-         break;
-      case GL_RED_BIAS:
-         params[0] = IROUND(ctx->Pixel.RedBias);
-         break;
-      case GL_RED_BITS:
-         params[0] = ctx->DrawBuffer->Visual.redBits;
-         break;
-      case GL_RED_SCALE:
-         params[0] = IROUND(ctx->Pixel.RedScale);
-         break;
-      case GL_RENDER_MODE:
-         params[0] = ENUM_TO_INT(ctx->RenderMode);
-         break;
-      case GL_RESCALE_NORMAL:
-         params[0] = BOOLEAN_TO_INT(ctx->Transform.RescaleNormals);
-         break;
-      case GL_RGBA_MODE:
-         params[0] = BOOLEAN_TO_INT(GL_TRUE);
-         break;
-      case GL_SCISSOR_BOX:
-         params[0] = ctx->Scissor.X;
-         params[1] = ctx->Scissor.Y;
-         params[2] = ctx->Scissor.Width;
-         params[3] = ctx->Scissor.Height;
-         break;
-      case GL_SCISSOR_TEST:
-         params[0] = BOOLEAN_TO_INT(ctx->Scissor.Enabled);
-         break;
-      case GL_SELECTION_BUFFER_SIZE:
-         params[0] = ctx->Select.BufferSize;
-         break;
-      case GL_SHADE_MODEL:
-         params[0] = ENUM_TO_INT(ctx->Light.ShadeModel);
-         break;
-      case GL_SHARED_TEXTURE_PALETTE_EXT:
-         params[0] = BOOLEAN_TO_INT(ctx->Texture.SharedPalette);
-         break;
-      case GL_STENCIL_BITS:
-         params[0] = ctx->DrawBuffer->Visual.stencilBits;
-         break;
-      case GL_STENCIL_CLEAR_VALUE:
-         params[0] = ctx->Stencil.Clear;
-         break;
-      case GL_STENCIL_FAIL:
-         params[0] = ENUM_TO_INT(ctx->Stencil.FailFunc[ctx->Stencil.ActiveFace]);
-         break;
-      case GL_STENCIL_FUNC:
-         params[0] = ENUM_TO_INT(ctx->Stencil.Function[ctx->Stencil.ActiveFace]);
-         break;
-      case GL_STENCIL_PASS_DEPTH_FAIL:
-         params[0] = ENUM_TO_INT(ctx->Stencil.ZFailFunc[ctx->Stencil.ActiveFace]);
-         break;
-      case GL_STENCIL_PASS_DEPTH_PASS:
-         params[0] = ENUM_TO_INT(ctx->Stencil.ZPassFunc[ctx->Stencil.ActiveFace]);
-         break;
-      case GL_STENCIL_REF:
-         params[0] = ctx->Stencil.Ref[ctx->Stencil.ActiveFace];
-         break;
-      case GL_STENCIL_TEST:
-         params[0] = BOOLEAN_TO_INT(ctx->Stencil.Enabled);
-         break;
-      case GL_STENCIL_VALUE_MASK:
-         params[0] = ctx->Stencil.ValueMask[ctx->Stencil.ActiveFace];
-         break;
-      case GL_STENCIL_WRITEMASK:
-         params[0] = ctx->Stencil.WriteMask[ctx->Stencil.ActiveFace];
-         break;
-      case GL_STEREO:
-         params[0] = BOOLEAN_TO_INT(ctx->DrawBuffer->Visual.stereoMode);
-         break;
-      case GL_SUBPIXEL_BITS:
-         params[0] = ctx->Const.SubPixelBits;
-         break;
-      case GL_TEXTURE_1D:
-         params[0] = BOOLEAN_TO_INT(_mesa_IsEnabled(GL_TEXTURE_1D));
-         break;
-      case GL_TEXTURE_2D:
-         params[0] = BOOLEAN_TO_INT(_mesa_IsEnabled(GL_TEXTURE_2D));
-         break;
-      case GL_TEXTURE_3D:
-         params[0] = BOOLEAN_TO_INT(_mesa_IsEnabled(GL_TEXTURE_3D));
-         break;
-      case GL_TEXTURE_1D_ARRAY_EXT:
-         CHECK_EXT1(MESA_texture_array, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(_mesa_IsEnabled(GL_TEXTURE_1D_ARRAY_EXT));
-         break;
-      case GL_TEXTURE_2D_ARRAY_EXT:
-         CHECK_EXT1(MESA_texture_array, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(_mesa_IsEnabled(GL_TEXTURE_2D_ARRAY_EXT));
-         break;
-      case GL_TEXTURE_BINDING_1D:
-         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_1D_INDEX]->Name;
-         break;
-      case GL_TEXTURE_BINDING_2D:
-         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_2D_INDEX]->Name;
-         break;
-      case GL_TEXTURE_BINDING_3D:
-         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_3D_INDEX]->Name;
-         break;
-      case GL_TEXTURE_BINDING_1D_ARRAY_EXT:
-         CHECK_EXT1(MESA_texture_array, "GetIntegerv");
-         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_1D_ARRAY_INDEX]->Name;
-         break;
-      case GL_TEXTURE_BINDING_2D_ARRAY_EXT:
-         CHECK_EXT1(MESA_texture_array, "GetIntegerv");
-         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_2D_ARRAY_INDEX]->Name;
-         break;
-      case GL_TEXTURE_GEN_S:
-         params[0] = BOOLEAN_TO_INT(((ctx->Texture.Unit[ctx->Texture.CurrentUnit].TexGenEnabled & S_BIT) ? 1 : 0));
-         break;
-      case GL_TEXTURE_GEN_T:
-         params[0] = BOOLEAN_TO_INT(((ctx->Texture.Unit[ctx->Texture.CurrentUnit].TexGenEnabled & T_BIT) ? 1 : 0));
-         break;
-      case GL_TEXTURE_GEN_R:
-         params[0] = BOOLEAN_TO_INT(((ctx->Texture.Unit[ctx->Texture.CurrentUnit].TexGenEnabled & R_BIT) ? 1 : 0));
-         break;
-      case GL_TEXTURE_GEN_Q:
-         params[0] = BOOLEAN_TO_INT(((ctx->Texture.Unit[ctx->Texture.CurrentUnit].TexGenEnabled & Q_BIT) ? 1 : 0));
-         break;
-      case GL_TEXTURE_MATRIX:
-         {
-         const GLfloat *matrix;
-         const GLuint unit = ctx->Texture.CurrentUnit;
-         if (unit >= ctx->Const.MaxTextureCoordUnits) {
-            _mesa_error(ctx, GL_INVALID_OPERATION, "glGet(texture matrix %u)",
-                        unit);
-            return;
-         }
-         matrix = ctx->TextureMatrixStack[unit].Top->m;
-         params[0] = IROUND(matrix[0]);
-         params[1] = IROUND(matrix[1]);
-         params[2] = IROUND(matrix[2]);
-         params[3] = IROUND(matrix[3]);
-         params[4] = IROUND(matrix[4]);
-         params[5] = IROUND(matrix[5]);
-         params[6] = IROUND(matrix[6]);
-         params[7] = IROUND(matrix[7]);
-         params[8] = IROUND(matrix[8]);
-         params[9] = IROUND(matrix[9]);
-         params[10] = IROUND(matrix[10]);
-         params[11] = IROUND(matrix[11]);
-         params[12] = IROUND(matrix[12]);
-         params[13] = IROUND(matrix[13]);
-         params[14] = IROUND(matrix[14]);
-         params[15] = IROUND(matrix[15]);
-         }
-         break;
-      case GL_TEXTURE_STACK_DEPTH:
-         {
-         const GLuint unit = ctx->Texture.CurrentUnit;
-         if (unit >= ctx->Const.MaxTextureCoordUnits) {
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glGet(texture stack depth, unit %u)", unit);
-            return;
-         }
-         params[0] = ctx->TextureMatrixStack[unit].Depth + 1;
-         }
-         break;
-      case GL_UNPACK_ALIGNMENT:
-         params[0] = ctx->Unpack.Alignment;
-         break;
-      case GL_UNPACK_LSB_FIRST:
-         params[0] = BOOLEAN_TO_INT(ctx->Unpack.LsbFirst);
-         break;
-      case GL_UNPACK_ROW_LENGTH:
-         params[0] = ctx->Unpack.RowLength;
-         break;
-      case GL_UNPACK_SKIP_PIXELS:
-         params[0] = ctx->Unpack.SkipPixels;
-         break;
-      case GL_UNPACK_SKIP_ROWS:
-         params[0] = ctx->Unpack.SkipRows;
-         break;
-      case GL_UNPACK_SWAP_BYTES:
-         params[0] = BOOLEAN_TO_INT(ctx->Unpack.SwapBytes);
-         break;
-      case GL_UNPACK_SKIP_IMAGES_EXT:
-         params[0] = ctx->Unpack.SkipImages;
-         break;
-      case GL_UNPACK_IMAGE_HEIGHT_EXT:
-         params[0] = ctx->Unpack.ImageHeight;
-         break;
-      case GL_UNPACK_CLIENT_STORAGE_APPLE:
-         params[0] = BOOLEAN_TO_INT(ctx->Unpack.ClientStorage);
-         break;
-      case GL_VIEWPORT:
-         params[0] = ctx->Viewport.X;
-         params[1] = ctx->Viewport.Y;
-         params[2] = ctx->Viewport.Width;
-         params[3] = ctx->Viewport.Height;
-         break;
-      case GL_ZOOM_X:
-         params[0] = IROUND(ctx->Pixel.ZoomX);
-         break;
-      case GL_ZOOM_Y:
-         params[0] = IROUND(ctx->Pixel.ZoomY);
-         break;
-      case GL_VERTEX_ARRAY:
-         params[0] = BOOLEAN_TO_INT(ctx->Array.ArrayObj->Vertex.Enabled);
-         break;
-      case GL_VERTEX_ARRAY_SIZE:
-         params[0] = ctx->Array.ArrayObj->Vertex.Size;
-         break;
-      case GL_VERTEX_ARRAY_TYPE:
-         params[0] = ENUM_TO_INT(ctx->Array.ArrayObj->Vertex.Type);
-         break;
-      case GL_VERTEX_ARRAY_STRIDE:
-         params[0] = ctx->Array.ArrayObj->Vertex.Stride;
-         break;
-      case GL_VERTEX_ARRAY_COUNT_EXT:
-         params[0] = 0;
-         break;
-      case GL_NORMAL_ARRAY:
-         params[0] = ENUM_TO_INT(ctx->Array.ArrayObj->Normal.Enabled);
-         break;
-      case GL_NORMAL_ARRAY_TYPE:
-         params[0] = ENUM_TO_INT(ctx->Array.ArrayObj->Normal.Type);
-         break;
-      case GL_NORMAL_ARRAY_STRIDE:
-         params[0] = ctx->Array.ArrayObj->Normal.Stride;
-         break;
-      case GL_NORMAL_ARRAY_COUNT_EXT:
-         params[0] = 0;
-         break;
-      case GL_COLOR_ARRAY:
-         params[0] = BOOLEAN_TO_INT(ctx->Array.ArrayObj->Color.Enabled);
-         break;
-      case GL_COLOR_ARRAY_SIZE:
-         params[0] = ctx->Array.ArrayObj->Color.Size;
-         break;
-      case GL_COLOR_ARRAY_TYPE:
-         params[0] = ENUM_TO_INT(ctx->Array.ArrayObj->Color.Type);
-         break;
-      case GL_COLOR_ARRAY_STRIDE:
-         params[0] = ctx->Array.ArrayObj->Color.Stride;
-         break;
-      case GL_COLOR_ARRAY_COUNT_EXT:
-         params[0] = 0;
-         break;
-      case GL_INDEX_ARRAY:
-         params[0] = BOOLEAN_TO_INT(ctx->Array.ArrayObj->Index.Enabled);
-         break;
-      case GL_INDEX_ARRAY_TYPE:
-         params[0] = ENUM_TO_INT(ctx->Array.ArrayObj->Index.Type);
-         break;
-      case GL_INDEX_ARRAY_STRIDE:
-         params[0] = ctx->Array.ArrayObj->Index.Stride;
-         break;
-      case GL_INDEX_ARRAY_COUNT_EXT:
-         params[0] = 0;
-         break;
-      case GL_TEXTURE_COORD_ARRAY:
-         params[0] = BOOLEAN_TO_INT(ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].Enabled);
-         break;
-      case GL_TEXTURE_COORD_ARRAY_SIZE:
-         params[0] = ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].Size;
-         break;
-      case GL_TEXTURE_COORD_ARRAY_TYPE:
-         params[0] = ENUM_TO_INT(ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].Type);
-         break;
-      case GL_TEXTURE_COORD_ARRAY_STRIDE:
-         params[0] = ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].Stride;
-         break;
-      case GL_TEXTURE_COORD_ARRAY_COUNT_EXT:
-         params[0] = 0;
-         break;
-      case GL_EDGE_FLAG_ARRAY:
-         params[0] = BOOLEAN_TO_INT(ctx->Array.ArrayObj->EdgeFlag.Enabled);
-         break;
-      case GL_EDGE_FLAG_ARRAY_STRIDE:
-         params[0] = ctx->Array.ArrayObj->EdgeFlag.Stride;
-         break;
-      case GL_EDGE_FLAG_ARRAY_COUNT_EXT:
-         params[0] = 0;
-         break;
-      case GL_MAX_TEXTURE_UNITS_ARB:
-         CHECK_EXT1(ARB_multitexture, "GetIntegerv");
-         params[0] = ctx->Const.MaxTextureUnits;
-         break;
-      case GL_ACTIVE_TEXTURE_ARB:
-         CHECK_EXT1(ARB_multitexture, "GetIntegerv");
-         params[0] = GL_TEXTURE0_ARB + ctx->Texture.CurrentUnit;
-         break;
-      case GL_CLIENT_ACTIVE_TEXTURE_ARB:
-         CHECK_EXT1(ARB_multitexture, "GetIntegerv");
-         params[0] = GL_TEXTURE0_ARB + ctx->Array.ActiveTexture;
-         break;
-      case GL_TEXTURE_CUBE_MAP_ARB:
-         CHECK_EXT1(ARB_texture_cube_map, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(_mesa_IsEnabled(GL_TEXTURE_CUBE_MAP_ARB));
-         break;
-      case GL_TEXTURE_BINDING_CUBE_MAP_ARB:
-         CHECK_EXT1(ARB_texture_cube_map, "GetIntegerv");
-         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_CUBE_INDEX]->Name;
-         break;
-      case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB:
-         CHECK_EXT1(ARB_texture_cube_map, "GetIntegerv");
-         params[0] = (1 << (ctx->Const.MaxCubeTextureLevels - 1));
-         break;
-      case GL_TEXTURE_COMPRESSION_HINT_ARB:
-         params[0] = ctx->Hint.TextureCompression;
-         break;
-      case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB:
-         params[0] = _mesa_get_compressed_formats(ctx, NULL, GL_FALSE);
-         break;
-      case GL_COMPRESSED_TEXTURE_FORMATS_ARB:
-         {
-         GLint formats[100];
-         GLuint i, n = _mesa_get_compressed_formats(ctx, formats, GL_FALSE);
-         ASSERT(n <= 100);
-         for (i = 0; i < n; i++)
-            params[i] = ENUM_TO_INT(formats[i]);
-         }
-         break;
-      case GL_ARRAY_ELEMENT_LOCK_FIRST_EXT:
-         CHECK_EXT1(EXT_compiled_vertex_array, "GetIntegerv");
-         params[0] = ctx->Array.LockFirst;
-         break;
-      case GL_ARRAY_ELEMENT_LOCK_COUNT_EXT:
-         CHECK_EXT1(EXT_compiled_vertex_array, "GetIntegerv");
-         params[0] = ctx->Array.LockCount;
-         break;
-      case GL_TRANSPOSE_COLOR_MATRIX_ARB:
-         {
-         const GLfloat *matrix = ctx->ColorMatrixStack.Top->m;
-         params[0] = IROUND(matrix[0]);
-         params[1] = IROUND(matrix[4]);
-         params[2] = IROUND(matrix[8]);
-         params[3] = IROUND(matrix[12]);
-         params[4] = IROUND(matrix[1]);
-         params[5] = IROUND(matrix[5]);
-         params[6] = IROUND(matrix[9]);
-         params[7] = IROUND(matrix[13]);
-         params[8] = IROUND(matrix[2]);
-         params[9] = IROUND(matrix[6]);
-         params[10] = IROUND(matrix[10]);
-         params[11] = IROUND(matrix[14]);
-         params[12] = IROUND(matrix[3]);
-         params[13] = IROUND(matrix[7]);
-         params[14] = IROUND(matrix[11]);
-         params[15] = IROUND(matrix[15]);
-         }
-         break;
-      case GL_TRANSPOSE_MODELVIEW_MATRIX_ARB:
-         {
-         const GLfloat *matrix = ctx->ModelviewMatrixStack.Top->m;
-         params[0] = IROUND(matrix[0]);
-         params[1] = IROUND(matrix[4]);
-         params[2] = IROUND(matrix[8]);
-         params[3] = IROUND(matrix[12]);
-         params[4] = IROUND(matrix[1]);
-         params[5] = IROUND(matrix[5]);
-         params[6] = IROUND(matrix[9]);
-         params[7] = IROUND(matrix[13]);
-         params[8] = IROUND(matrix[2]);
-         params[9] = IROUND(matrix[6]);
-         params[10] = IROUND(matrix[10]);
-         params[11] = IROUND(matrix[14]);
-         params[12] = IROUND(matrix[3]);
-         params[13] = IROUND(matrix[7]);
-         params[14] = IROUND(matrix[11]);
-         params[15] = IROUND(matrix[15]);
-         }
-         break;
-      case GL_TRANSPOSE_PROJECTION_MATRIX_ARB:
-         {
-         const GLfloat *matrix = ctx->ProjectionMatrixStack.Top->m;
-         params[0] = IROUND(matrix[0]);
-         params[1] = IROUND(matrix[4]);
-         params[2] = IROUND(matrix[8]);
-         params[3] = IROUND(matrix[12]);
-         params[4] = IROUND(matrix[1]);
-         params[5] = IROUND(matrix[5]);
-         params[6] = IROUND(matrix[9]);
-         params[7] = IROUND(matrix[13]);
-         params[8] = IROUND(matrix[2]);
-         params[9] = IROUND(matrix[6]);
-         params[10] = IROUND(matrix[10]);
-         params[11] = IROUND(matrix[14]);
-         params[12] = IROUND(matrix[3]);
-         params[13] = IROUND(matrix[7]);
-         params[14] = IROUND(matrix[11]);
-         params[15] = IROUND(matrix[15]);
-         }
-         break;
-      case GL_TRANSPOSE_TEXTURE_MATRIX_ARB:
-         {
-         const GLfloat *matrix = ctx->TextureMatrixStack[ctx->Texture.CurrentUnit].Top->m;
-         params[0] = IROUND(matrix[0]);
-         params[1] = IROUND(matrix[4]);
-         params[2] = IROUND(matrix[8]);
-         params[3] = IROUND(matrix[12]);
-         params[4] = IROUND(matrix[1]);
-         params[5] = IROUND(matrix[5]);
-         params[6] = IROUND(matrix[9]);
-         params[7] = IROUND(matrix[13]);
-         params[8] = IROUND(matrix[2]);
-         params[9] = IROUND(matrix[6]);
-         params[10] = IROUND(matrix[10]);
-         params[11] = IROUND(matrix[14]);
-         params[12] = IROUND(matrix[3]);
-         params[13] = IROUND(matrix[7]);
-         params[14] = IROUND(matrix[11]);
-         params[15] = IROUND(matrix[15]);
-         }
-         break;
-      case GL_COLOR_MATRIX_SGI:
-         {
-         const GLfloat *matrix = ctx->ColorMatrixStack.Top->m;
-         params[0] = IROUND(matrix[0]);
-         params[1] = IROUND(matrix[1]);
-         params[2] = IROUND(matrix[2]);
-         params[3] = IROUND(matrix[3]);
-         params[4] = IROUND(matrix[4]);
-         params[5] = IROUND(matrix[5]);
-         params[6] = IROUND(matrix[6]);
-         params[7] = IROUND(matrix[7]);
-         params[8] = IROUND(matrix[8]);
-         params[9] = IROUND(matrix[9]);
-         params[10] = IROUND(matrix[10]);
-         params[11] = IROUND(matrix[11]);
-         params[12] = IROUND(matrix[12]);
-         params[13] = IROUND(matrix[13]);
-         params[14] = IROUND(matrix[14]);
-         params[15] = IROUND(matrix[15]);
-         }
-         break;
-      case GL_COLOR_MATRIX_STACK_DEPTH_SGI:
-         params[0] = ctx->ColorMatrixStack.Depth + 1;
-         break;
-      case GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI:
-         params[0] = MAX_COLOR_STACK_DEPTH;
-         break;
-      case GL_POST_COLOR_MATRIX_RED_SCALE_SGI:
-         params[0] = IROUND(ctx->Pixel.PostColorMatrixScale[0]);
-         break;
-      case GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI:
-         params[0] = IROUND(ctx->Pixel.PostColorMatrixScale[1]);
-         break;
-      case GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI:
-         params[0] = IROUND(ctx->Pixel.PostColorMatrixScale[2]);
-         break;
-      case GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI:
-         params[0] = IROUND(ctx->Pixel.PostColorMatrixScale[3]);
-         break;
-      case GL_POST_COLOR_MATRIX_RED_BIAS_SGI:
-         params[0] = IROUND(ctx->Pixel.PostColorMatrixBias[0]);
-         break;
-      case GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI:
-         params[0] = IROUND(ctx->Pixel.PostColorMatrixBias[1]);
-         break;
-      case GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI:
-         params[0] = IROUND(ctx->Pixel.PostColorMatrixBias[2]);
-         break;
-      case GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI:
-         params[0] = IROUND(ctx->Pixel.PostColorMatrixBias[3]);
-         break;
-      case GL_CONVOLUTION_1D_EXT:
-         CHECK_EXT1(EXT_convolution, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Pixel.Convolution1DEnabled);
-         break;
-      case GL_CONVOLUTION_2D_EXT:
-         CHECK_EXT1(EXT_convolution, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Pixel.Convolution2DEnabled);
-         break;
-      case GL_SEPARABLE_2D_EXT:
-         CHECK_EXT1(EXT_convolution, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Pixel.Separable2DEnabled);
-         break;
-      case GL_POST_CONVOLUTION_RED_SCALE_EXT:
-         CHECK_EXT1(EXT_convolution, "GetIntegerv");
-         params[0] = IROUND(ctx->Pixel.PostConvolutionScale[0]);
-         break;
-      case GL_POST_CONVOLUTION_GREEN_SCALE_EXT:
-         CHECK_EXT1(EXT_convolution, "GetIntegerv");
-         params[0] = IROUND(ctx->Pixel.PostConvolutionScale[1]);
-         break;
-      case GL_POST_CONVOLUTION_BLUE_SCALE_EXT:
-         CHECK_EXT1(EXT_convolution, "GetIntegerv");
-         params[0] = IROUND(ctx->Pixel.PostConvolutionScale[2]);
-         break;
-      case GL_POST_CONVOLUTION_ALPHA_SCALE_EXT:
-         CHECK_EXT1(EXT_convolution, "GetIntegerv");
-         params[0] = IROUND(ctx->Pixel.PostConvolutionScale[3]);
-         break;
-      case GL_POST_CONVOLUTION_RED_BIAS_EXT:
-         CHECK_EXT1(EXT_convolution, "GetIntegerv");
-         params[0] = IROUND(ctx->Pixel.PostConvolutionBias[0]);
-         break;
-      case GL_POST_CONVOLUTION_GREEN_BIAS_EXT:
-         CHECK_EXT1(EXT_convolution, "GetIntegerv");
-         params[0] = IROUND(ctx->Pixel.PostConvolutionBias[1]);
-         break;
-      case GL_POST_CONVOLUTION_BLUE_BIAS_EXT:
-         CHECK_EXT1(EXT_convolution, "GetIntegerv");
-         params[0] = IROUND(ctx->Pixel.PostConvolutionBias[2]);
-         break;
-      case GL_POST_CONVOLUTION_ALPHA_BIAS_EXT:
-         CHECK_EXT1(EXT_convolution, "GetIntegerv");
-         params[0] = IROUND(ctx->Pixel.PostConvolutionBias[3]);
-         break;
-      case GL_HISTOGRAM:
-         CHECK_EXT1(EXT_histogram, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Pixel.HistogramEnabled);
-         break;
-      case GL_MINMAX:
-         CHECK_EXT1(EXT_histogram, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Pixel.MinMaxEnabled);
-         break;
-      case GL_COLOR_TABLE_SGI:
-         CHECK_EXT1(SGI_color_table, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Pixel.ColorTableEnabled[COLORTABLE_PRECONVOLUTION]);
-         break;
-      case GL_POST_CONVOLUTION_COLOR_TABLE_SGI:
-         CHECK_EXT1(SGI_color_table, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Pixel.ColorTableEnabled[COLORTABLE_POSTCONVOLUTION]);
-         break;
-      case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
-         CHECK_EXT1(SGI_color_table, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Pixel.ColorTableEnabled[COLORTABLE_POSTCOLORMATRIX]);
-         break;
-      case GL_TEXTURE_COLOR_TABLE_SGI:
-         CHECK_EXT1(SGI_texture_color_table, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Texture.Unit[ctx->Texture.CurrentUnit].ColorTableEnabled);
-         break;
-      case GL_COLOR_SUM_EXT:
-         CHECK_EXT2(EXT_secondary_color, ARB_vertex_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Fog.ColorSumEnabled);
-         break;
-      case GL_CURRENT_SECONDARY_COLOR_EXT:
-         CHECK_EXT1(EXT_secondary_color, "GetIntegerv");
-         {
-         FLUSH_CURRENT(ctx, 0);
-         params[0] = FLOAT_TO_INT(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][0]);
-         params[1] = FLOAT_TO_INT(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][1]);
-         params[2] = FLOAT_TO_INT(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][2]);
-         params[3] = FLOAT_TO_INT(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][3]);
-         }
-         break;
-      case GL_SECONDARY_COLOR_ARRAY_EXT:
-         CHECK_EXT1(EXT_secondary_color, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Array.ArrayObj->SecondaryColor.Enabled);
-         break;
-      case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT:
-         CHECK_EXT1(EXT_secondary_color, "GetIntegerv");
-         params[0] = ENUM_TO_INT(ctx->Array.ArrayObj->SecondaryColor.Type);
-         break;
-      case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT:
-         CHECK_EXT1(EXT_secondary_color, "GetIntegerv");
-         params[0] = ctx->Array.ArrayObj->SecondaryColor.Stride;
-         break;
-      case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT:
-         CHECK_EXT1(EXT_secondary_color, "GetIntegerv");
-         params[0] = ctx->Array.ArrayObj->SecondaryColor.Size;
-         break;
-      case GL_CURRENT_FOG_COORDINATE_EXT:
-         CHECK_EXT1(EXT_fog_coord, "GetIntegerv");
-         {
-         FLUSH_CURRENT(ctx, 0);
-         params[0] = IROUND(ctx->Current.Attrib[VERT_ATTRIB_FOG][0]);
-         }
-         break;
-      case GL_FOG_COORDINATE_ARRAY_EXT:
-         CHECK_EXT1(EXT_fog_coord, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Array.ArrayObj->FogCoord.Enabled);
-         break;
-      case GL_FOG_COORDINATE_ARRAY_TYPE_EXT:
-         CHECK_EXT1(EXT_fog_coord, "GetIntegerv");
-         params[0] = ENUM_TO_INT(ctx->Array.ArrayObj->FogCoord.Type);
-         break;
-      case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT:
-         CHECK_EXT1(EXT_fog_coord, "GetIntegerv");
-         params[0] = ctx->Array.ArrayObj->FogCoord.Stride;
-         break;
-      case GL_FOG_COORDINATE_SOURCE_EXT:
-         CHECK_EXT1(EXT_fog_coord, "GetIntegerv");
-         params[0] = ENUM_TO_INT(ctx->Fog.FogCoordinateSource);
-         break;
-      case GL_MAX_TEXTURE_LOD_BIAS_EXT:
-         CHECK_EXT1(EXT_texture_lod_bias, "GetIntegerv");
-         params[0] = IROUND(ctx->Const.MaxTextureLodBias);
-         break;
-      case GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT:
-         CHECK_EXT1(EXT_texture_filter_anisotropic, "GetIntegerv");
-         params[0] = IROUND(ctx->Const.MaxTextureMaxAnisotropy);
-         break;
-      case GL_MULTISAMPLE_ARB:
-         params[0] = BOOLEAN_TO_INT(ctx->Multisample.Enabled);
-         break;
-      case GL_SAMPLE_ALPHA_TO_COVERAGE_ARB:
-         params[0] = BOOLEAN_TO_INT(ctx->Multisample.SampleAlphaToCoverage);
-         break;
-      case GL_SAMPLE_ALPHA_TO_ONE_ARB:
-         params[0] = BOOLEAN_TO_INT(ctx->Multisample.SampleAlphaToOne);
-         break;
-      case GL_SAMPLE_COVERAGE_ARB:
-         params[0] = BOOLEAN_TO_INT(ctx->Multisample.SampleCoverage);
-         break;
-      case GL_SAMPLE_COVERAGE_VALUE_ARB:
-         params[0] = IROUND(ctx->Multisample.SampleCoverageValue);
-         break;
-      case GL_SAMPLE_COVERAGE_INVERT_ARB:
-         params[0] = BOOLEAN_TO_INT(ctx->Multisample.SampleCoverageInvert);
-         break;
-      case GL_SAMPLE_BUFFERS_ARB:
-         params[0] = ctx->DrawBuffer->Visual.sampleBuffers;
-         break;
-      case GL_SAMPLES_ARB:
-         params[0] = ctx->DrawBuffer->Visual.samples;
-         break;
-      case GL_RASTER_POSITION_UNCLIPPED_IBM:
-         CHECK_EXT1(IBM_rasterpos_clip, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Transform.RasterPositionUnclipped);
-         break;
-      case GL_POINT_SPRITE_NV:
-         CHECK_EXT2(NV_point_sprite, ARB_point_sprite, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Point.PointSprite);
-         break;
-      case GL_POINT_SPRITE_R_MODE_NV:
-         CHECK_EXT1(NV_point_sprite, "GetIntegerv");
-         params[0] = ENUM_TO_INT(ctx->Point.SpriteRMode);
-         break;
-      case GL_POINT_SPRITE_COORD_ORIGIN:
-         CHECK_EXT2(NV_point_sprite, ARB_point_sprite, "GetIntegerv");
-         params[0] = ENUM_TO_INT(ctx->Point.SpriteOrigin);
-         break;
-      case GL_GENERATE_MIPMAP_HINT_SGIS:
-         CHECK_EXT1(SGIS_generate_mipmap, "GetIntegerv");
-         params[0] = ENUM_TO_INT(ctx->Hint.GenerateMipmap);
-         break;
-      case GL_VERTEX_PROGRAM_BINDING_NV:
-         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
-         params[0] = (ctx->VertexProgram.Current ? ctx->VertexProgram.Current->Base.Id : 0);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY0_NV:
-         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Array.ArrayObj->VertexAttrib[0].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY1_NV:
-         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Array.ArrayObj->VertexAttrib[1].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY2_NV:
-         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Array.ArrayObj->VertexAttrib[2].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY3_NV:
-         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Array.ArrayObj->VertexAttrib[3].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Array.ArrayObj->VertexAttrib[4].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY5_NV:
-         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Array.ArrayObj->VertexAttrib[5].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY6_NV:
-         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Array.ArrayObj->VertexAttrib[6].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY7_NV:
-         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Array.ArrayObj->VertexAttrib[7].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY8_NV:
-         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Array.ArrayObj->VertexAttrib[8].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY9_NV:
-         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Array.ArrayObj->VertexAttrib[9].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY10_NV:
-         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Array.ArrayObj->VertexAttrib[10].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY11_NV:
-         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Array.ArrayObj->VertexAttrib[11].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY12_NV:
-         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Array.ArrayObj->VertexAttrib[12].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY13_NV:
-         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Array.ArrayObj->VertexAttrib[13].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY14_NV:
-         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Array.ArrayObj->VertexAttrib[14].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY15_NV:
-         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Array.ArrayObj->VertexAttrib[15].Enabled);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB0_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1Attrib[0]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB1_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1Attrib[1]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB2_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1Attrib[2]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB3_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1Attrib[3]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB4_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1Attrib[4]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB5_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1Attrib[5]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB6_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1Attrib[6]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB7_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1Attrib[7]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB8_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1Attrib[8]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB9_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1Attrib[9]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB10_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1Attrib[10]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB11_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1Attrib[11]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB12_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1Attrib[12]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB13_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1Attrib[13]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB14_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1Attrib[14]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB15_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1Attrib[15]);
-         break;
-      case GL_FRAGMENT_PROGRAM_NV:
-         CHECK_EXT1(NV_fragment_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->FragmentProgram.Enabled);
-         break;
-      case GL_FRAGMENT_PROGRAM_BINDING_NV:
-         CHECK_EXT1(NV_fragment_program, "GetIntegerv");
-         params[0] = ctx->FragmentProgram.Current ? ctx->FragmentProgram.Current->Base.Id : 0;
-         break;
-      case GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV:
-         CHECK_EXT1(NV_fragment_program, "GetIntegerv");
-         params[0] = MAX_NV_FRAGMENT_PROGRAM_PARAMS;
-         break;
-      case GL_TEXTURE_RECTANGLE_NV:
-         CHECK_EXT1(NV_texture_rectangle, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(_mesa_IsEnabled(GL_TEXTURE_RECTANGLE_NV));
-         break;
-      case GL_TEXTURE_BINDING_RECTANGLE_NV:
-         CHECK_EXT1(NV_texture_rectangle, "GetIntegerv");
-         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_RECT_INDEX]->Name;
-         break;
-      case GL_MAX_RECTANGLE_TEXTURE_SIZE_NV:
-         CHECK_EXT1(NV_texture_rectangle, "GetIntegerv");
-         params[0] = ctx->Const.MaxTextureRectSize;
-         break;
-      case GL_STENCIL_TEST_TWO_SIDE_EXT:
-         CHECK_EXT1(EXT_stencil_two_side, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Stencil.TestTwoSide);
-         break;
-      case GL_ACTIVE_STENCIL_FACE_EXT:
-         CHECK_EXT1(EXT_stencil_two_side, "GetIntegerv");
-         params[0] = ENUM_TO_INT(ctx->Stencil.ActiveFace ? GL_BACK : GL_FRONT);
-         break;
-      case GL_MAX_SHININESS_NV:
-         CHECK_EXT1(NV_light_max_exponent, "GetIntegerv");
-         params[0] = IROUND(ctx->Const.MaxShininess);
-         break;
-      case GL_MAX_SPOT_EXPONENT_NV:
-         CHECK_EXT1(NV_light_max_exponent, "GetIntegerv");
-         params[0] = IROUND(ctx->Const.MaxSpotExponent);
-         break;
-      case GL_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = ctx->Array.ArrayBufferObj->Name;
-         break;
-      case GL_VERTEX_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = ctx->Array.ArrayObj->Vertex.BufferObj->Name;
-         break;
-      case GL_NORMAL_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = ctx->Array.ArrayObj->Normal.BufferObj->Name;
-         break;
-      case GL_COLOR_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = ctx->Array.ArrayObj->Color.BufferObj->Name;
-         break;
-      case GL_INDEX_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = ctx->Array.ArrayObj->Index.BufferObj->Name;
-         break;
-      case GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].BufferObj->Name;
-         break;
-      case GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = ctx->Array.ArrayObj->EdgeFlag.BufferObj->Name;
-         break;
-      case GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = ctx->Array.ArrayObj->SecondaryColor.BufferObj->Name;
-         break;
-      case GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = ctx->Array.ArrayObj->FogCoord.BufferObj->Name;
-         break;
-      case GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = ctx->Array.ElementArrayBufferObj->Name;
-         break;
-      case GL_PIXEL_PACK_BUFFER_BINDING_EXT:
-         CHECK_EXT1(EXT_pixel_buffer_object, "GetIntegerv");
-         params[0] = ctx->Pack.BufferObj->Name;
-         break;
-      case GL_PIXEL_UNPACK_BUFFER_BINDING_EXT:
-         CHECK_EXT1(EXT_pixel_buffer_object, "GetIntegerv");
-         params[0] = ctx->Unpack.BufferObj->Name;
-         break;
-      case GL_VERTEX_PROGRAM_ARB:
-         CHECK_EXT2(ARB_vertex_program, NV_vertex_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->VertexProgram.Enabled);
-         break;
-      case GL_VERTEX_PROGRAM_POINT_SIZE_ARB:
-         CHECK_EXT2(ARB_vertex_program, NV_vertex_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->VertexProgram.PointSizeEnabled);
-         break;
-      case GL_VERTEX_PROGRAM_TWO_SIDE_ARB:
-         CHECK_EXT2(ARB_vertex_program, NV_vertex_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->VertexProgram.TwoSideEnabled);
-         break;
-      case GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB:
-         CHECK_EXT3(ARB_vertex_program, ARB_fragment_program, NV_vertex_program, "GetIntegerv");
-         params[0] = ctx->Const.MaxProgramMatrixStackDepth;
-         break;
-      case GL_MAX_PROGRAM_MATRICES_ARB:
-         CHECK_EXT3(ARB_vertex_program, ARB_fragment_program, NV_vertex_program, "GetIntegerv");
-         params[0] = ctx->Const.MaxProgramMatrices;
-         break;
-      case GL_CURRENT_MATRIX_STACK_DEPTH_ARB:
-         CHECK_EXT3(ARB_vertex_program, ARB_fragment_program, NV_vertex_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->CurrentStack->Depth + 1);
-         break;
-      case GL_CURRENT_MATRIX_ARB:
-         CHECK_EXT3(ARB_vertex_program, ARB_fragment_program, NV_fragment_program, "GetIntegerv");
-         {
-         const GLfloat *matrix = ctx->CurrentStack->Top->m;
-         params[0] = IROUND(matrix[0]);
-         params[1] = IROUND(matrix[1]);
-         params[2] = IROUND(matrix[2]);
-         params[3] = IROUND(matrix[3]);
-         params[4] = IROUND(matrix[4]);
-         params[5] = IROUND(matrix[5]);
-         params[6] = IROUND(matrix[6]);
-         params[7] = IROUND(matrix[7]);
-         params[8] = IROUND(matrix[8]);
-         params[9] = IROUND(matrix[9]);
-         params[10] = IROUND(matrix[10]);
-         params[11] = IROUND(matrix[11]);
-         params[12] = IROUND(matrix[12]);
-         params[13] = IROUND(matrix[13]);
-         params[14] = IROUND(matrix[14]);
-         params[15] = IROUND(matrix[15]);
-         }
-         break;
-      case GL_TRANSPOSE_CURRENT_MATRIX_ARB:
-         CHECK_EXT2(ARB_vertex_program, ARB_fragment_program, "GetIntegerv");
-         {
-         const GLfloat *matrix = ctx->CurrentStack->Top->m;
-         params[0] = IROUND(matrix[0]);
-         params[1] = IROUND(matrix[4]);
-         params[2] = IROUND(matrix[8]);
-         params[3] = IROUND(matrix[12]);
-         params[4] = IROUND(matrix[1]);
-         params[5] = IROUND(matrix[5]);
-         params[6] = IROUND(matrix[9]);
-         params[7] = IROUND(matrix[13]);
-         params[8] = IROUND(matrix[2]);
-         params[9] = IROUND(matrix[6]);
-         params[10] = IROUND(matrix[10]);
-         params[11] = IROUND(matrix[14]);
-         params[12] = IROUND(matrix[3]);
-         params[13] = IROUND(matrix[7]);
-         params[14] = IROUND(matrix[11]);
-         params[15] = IROUND(matrix[15]);
-         }
-         break;
-      case GL_MAX_VERTEX_ATTRIBS_ARB:
-         CHECK_EXT1(ARB_vertex_program, "GetIntegerv");
-         params[0] = ctx->Const.VertexProgram.MaxAttribs;
-         break;
-      case GL_PROGRAM_ERROR_POSITION_ARB:
-         CHECK_EXT4(NV_vertex_program, ARB_vertex_program, NV_fragment_program, ARB_fragment_program, "GetIntegerv");
-         params[0] = ctx->Program.ErrorPos;
-         break;
-      case GL_FRAGMENT_PROGRAM_ARB:
-         CHECK_EXT1(ARB_fragment_program, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->FragmentProgram.Enabled);
-         break;
-      case GL_MAX_TEXTURE_COORDS_ARB:
-         CHECK_EXT2(ARB_fragment_program, NV_fragment_program, "GetIntegerv");
-         params[0] = ctx->Const.MaxTextureCoordUnits;
-         break;
-      case GL_MAX_TEXTURE_IMAGE_UNITS_ARB:
-         CHECK_EXT2(ARB_fragment_program, NV_fragment_program, "GetIntegerv");
-         params[0] = ctx->Const.MaxTextureImageUnits;
-         break;
-      case GL_DEPTH_BOUNDS_TEST_EXT:
-         CHECK_EXT1(EXT_depth_bounds_test, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Depth.BoundsTest);
-         break;
-      case GL_DEPTH_BOUNDS_EXT:
-         CHECK_EXT1(EXT_depth_bounds_test, "GetIntegerv");
-         params[0] = IROUND(ctx->Depth.BoundsMin);
-         params[1] = IROUND(ctx->Depth.BoundsMax);
-         break;
-      case GL_DEPTH_CLAMP:
-         CHECK_EXT1(ARB_depth_clamp, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Transform.DepthClamp);
-         break;
-      case GL_MAX_DRAW_BUFFERS_ARB:
-         params[0] = ctx->Const.MaxDrawBuffers;
-         break;
-      case GL_DRAW_BUFFER0_ARB:
-         params[0] = ENUM_TO_INT(ctx->DrawBuffer->ColorDrawBuffer[0]);
-         break;
-      case GL_DRAW_BUFFER1_ARB:
-         {
-         GLenum buffer;
-         if (pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glGet(GL_DRAW_BUFFERx_ARB)");
-            return;
-         }
-         buffer = ctx->DrawBuffer->ColorDrawBuffer[1];
-         params[0] = ENUM_TO_INT(buffer);
-         }
-         break;
-      case GL_DRAW_BUFFER2_ARB:
-         {
-         GLenum buffer;
-         if (pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glGet(GL_DRAW_BUFFERx_ARB)");
-            return;
-         }
-         buffer = ctx->DrawBuffer->ColorDrawBuffer[2];
-         params[0] = ENUM_TO_INT(buffer);
-         }
-         break;
-      case GL_DRAW_BUFFER3_ARB:
-         {
-         GLenum buffer;
-         if (pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glGet(GL_DRAW_BUFFERx_ARB)");
-            return;
-         }
-         buffer = ctx->DrawBuffer->ColorDrawBuffer[3];
-         params[0] = ENUM_TO_INT(buffer);
-         }
-         break;
-      case GL_IMPLEMENTATION_COLOR_READ_TYPE_OES:
-         CHECK_EXT1(OES_read_format, "GetIntegerv");
-         params[0] = _mesa_get_color_read_type(ctx);
-         break;
-      case GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES:
-         CHECK_EXT1(OES_read_format, "GetIntegerv");
-         params[0] = _mesa_get_color_read_format(ctx);
-         break;
-      case GL_NUM_FRAGMENT_REGISTERS_ATI:
-         CHECK_EXT1(ATI_fragment_shader, "GetIntegerv");
-         params[0] = 6;
-         break;
-      case GL_NUM_FRAGMENT_CONSTANTS_ATI:
-         CHECK_EXT1(ATI_fragment_shader, "GetIntegerv");
-         params[0] = 8;
-         break;
-      case GL_NUM_PASSES_ATI:
-         CHECK_EXT1(ATI_fragment_shader, "GetIntegerv");
-         params[0] = 2;
-         break;
-      case GL_NUM_INSTRUCTIONS_PER_PASS_ATI:
-         CHECK_EXT1(ATI_fragment_shader, "GetIntegerv");
-         params[0] = 8;
-         break;
-      case GL_NUM_INSTRUCTIONS_TOTAL_ATI:
-         CHECK_EXT1(ATI_fragment_shader, "GetIntegerv");
-         params[0] = 16;
-         break;
-      case GL_COLOR_ALPHA_PAIRING_ATI:
-         CHECK_EXT1(ATI_fragment_shader, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(GL_TRUE);
-         break;
-      case GL_NUM_LOOPBACK_COMPONENTS_ATI:
-         CHECK_EXT1(ATI_fragment_shader, "GetIntegerv");
-         params[0] = 3;
-         break;
-      case GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI:
-         CHECK_EXT1(ATI_fragment_shader, "GetIntegerv");
-         params[0] = 3;
-         break;
-      case GL_STENCIL_BACK_FUNC:
-         params[0] = ENUM_TO_INT(ctx->Stencil.Function[1]);
-         break;
-      case GL_STENCIL_BACK_VALUE_MASK:
-         params[0] = ctx->Stencil.ValueMask[1];
-         break;
-      case GL_STENCIL_BACK_WRITEMASK:
-         params[0] = ctx->Stencil.WriteMask[1];
-         break;
-      case GL_STENCIL_BACK_REF:
-         params[0] = ctx->Stencil.Ref[1];
-         break;
-      case GL_STENCIL_BACK_FAIL:
-         params[0] = ENUM_TO_INT(ctx->Stencil.FailFunc[1]);
-         break;
-      case GL_STENCIL_BACK_PASS_DEPTH_FAIL:
-         params[0] = ENUM_TO_INT(ctx->Stencil.ZFailFunc[1]);
-         break;
-      case GL_STENCIL_BACK_PASS_DEPTH_PASS:
-         params[0] = ENUM_TO_INT(ctx->Stencil.ZPassFunc[1]);
-         break;
-      case GL_FRAMEBUFFER_BINDING_EXT:
-         CHECK_EXT1(EXT_framebuffer_object, "GetIntegerv");
-         params[0] = ctx->DrawBuffer->Name;
-         break;
-      case GL_RENDERBUFFER_BINDING_EXT:
-         CHECK_EXT1(EXT_framebuffer_object, "GetIntegerv");
-         params[0] = ctx->CurrentRenderbuffer ? ctx->CurrentRenderbuffer->Name : 0;
-         break;
-      case GL_MAX_COLOR_ATTACHMENTS_EXT:
-         CHECK_EXT1(EXT_framebuffer_object, "GetIntegerv");
-         params[0] = ctx->Const.MaxColorAttachments;
-         break;
-      case GL_MAX_RENDERBUFFER_SIZE_EXT:
-         CHECK_EXT1(EXT_framebuffer_object, "GetIntegerv");
-         params[0] = ctx->Const.MaxRenderbufferSize;
-         break;
-      case GL_READ_FRAMEBUFFER_BINDING_EXT:
-         CHECK_EXT1(EXT_framebuffer_blit, "GetIntegerv");
-         params[0] = ctx->ReadBuffer->Name;
-         break;
-      case GL_PROVOKING_VERTEX_EXT:
-         CHECK_EXT1(EXT_provoking_vertex, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Light.ProvokingVertex);
-         break;
-      case GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT:
-         CHECK_EXT1(EXT_provoking_vertex, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Const.QuadsFollowProvokingVertexConvention);
-         break;
-      case GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB:
-         CHECK_EXT1(ARB_fragment_shader, "GetIntegerv");
-         params[0] = ctx->Const.FragmentProgram.MaxUniformComponents;
-         break;
-      case GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB:
-         CHECK_EXT1(ARB_fragment_shader, "GetIntegerv");
-         params[0] = ENUM_TO_INT(ctx->Hint.FragmentShaderDerivative);
-         break;
-      case GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB:
-         CHECK_EXT1(ARB_vertex_shader, "GetIntegerv");
-         params[0] = ctx->Const.VertexProgram.MaxUniformComponents;
-         break;
-      case GL_MAX_VARYING_FLOATS_ARB:
-         CHECK_EXT1(ARB_vertex_shader, "GetIntegerv");
-         params[0] = ctx->Const.MaxVarying * 4;
-         break;
-      case GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB:
-         CHECK_EXT1(ARB_vertex_shader, "GetIntegerv");
-         params[0] = ctx->Const.MaxVertexTextureImageUnits;
-         break;
-      case GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB:
-         CHECK_EXT1(ARB_vertex_shader, "GetIntegerv");
-         params[0] = ctx->Const.MaxCombinedTextureImageUnits;
-         break;
-      case GL_CURRENT_PROGRAM:
-         CHECK_EXT1(ARB_shader_objects, "GetIntegerv");
-         params[0] = ctx->Shader.CurrentProgram ? ctx->Shader.CurrentProgram->Name : 0;
-         break;
-      case GL_MAX_SAMPLES:
-         CHECK_EXT1(ARB_framebuffer_object, "GetIntegerv");
-         params[0] = ctx->Const.MaxSamples;
-         break;
-      case GL_VERTEX_ARRAY_BINDING_APPLE:
-         CHECK_EXT1(APPLE_vertex_array_object, "GetIntegerv");
-         params[0] = ctx->Array.ArrayObj->Name;
-         break;
-      case GL_TEXTURE_CUBE_MAP_SEAMLESS:
-         CHECK_EXT1(ARB_seamless_cube_map, "GetIntegerv");
-         params[0] = BOOLEAN_TO_INT(ctx->Texture.CubeMapSeamless);
-         break;
-      case GL_MAX_SERVER_WAIT_TIMEOUT:
-         CHECK_EXT1(ARB_sync, "GetIntegerv");
-         params[0] = INT64_TO_INT(ctx->Const.MaxServerWaitTimeout);
-         break;
-      case GL_NUM_EXTENSIONS:
-         params[0] = _mesa_get_extension_count(ctx);
-         break;
-      case GL_MAJOR_VERSION:
-         params[0] = ctx->VersionMajor;
-         break;
-      case GL_MINOR_VERSION:
-         params[0] = ctx->VersionMinor;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetIntegerv(pname=0x%x)", pname);
+   case TYPE_DOUBLEN:
+      params[0] = FLOAT_TO_INT(((GLdouble *) p)[0]);
+      break;
+
+   case TYPE_INT_4:
+      params[3] = ((GLint *) p)[3];
+   case TYPE_INT_3:
+      params[2] = ((GLint *) p)[2];
+   case TYPE_INT_2:
+   case TYPE_ENUM_2:
+      params[1] = ((GLint *) p)[1];
+   case TYPE_INT:
+   case TYPE_ENUM:
+      params[0] = ((GLint *) p)[0];
+      break;
+
+   case TYPE_INT_N:
+      for (i = 0; i < v.value_int_n.n; i++)
+	 params[i] = v.value_int_n.ints[i];
+      break;
+
+   case TYPE_INT64:
+      params[0] = INT64_TO_INT(((GLint64 *) p)[0]);
+      break;
+
+   case TYPE_BOOLEAN:
+      params[0] = BOOLEAN_TO_INT(*(GLboolean*) p);
+      break;		
+
+   case TYPE_MATRIX:
+      m = *(GLmatrix **) p;
+      for (i = 0; i < 16; i++)
+	 params[i] = FLOAT_TO_INT(m->m[i]);
+      break;
+
+   case TYPE_MATRIX_T:
+      m = *(GLmatrix **) p;
+      for (i = 0; i < 16; i++)
+	 params[i] = FLOAT_TO_INT(m->m[transpose[i]]);
+      break;
+
+   case TYPE_BIT_0:
+   case TYPE_BIT_1:
+   case TYPE_BIT_2:
+   case TYPE_BIT_3:
+   case TYPE_BIT_4:
+   case TYPE_BIT_5:
+      shift = d->type - TYPE_BIT_0;
+      params[0] = (*(GLbitfield *) p >> shift) & 1;
+      break;
    }
 }
 
 #if FEATURE_ARB_sync
 void GLAPIENTRY
-_mesa_GetInteger64v( GLenum pname, GLint64 *params )
+_mesa_GetInteger64v(GLenum pname, GLint64 *params)
 {
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
+   const struct value_desc *d;
+   union value v;
+   GLmatrix *m;
+   int shift, i;
+   void *p;
 
-   if (!params)
-      return;
+   d = find_value("glGetInteger64v", pname, &p, &v);
+   switch (d->type) {
+   case TYPE_INVALID:
+      break;
+   case TYPE_CONST:
+      params[0] = d->offset;
+      break;
 
-   if (ctx->NewState)
-      _mesa_update_state(ctx);
+   case TYPE_FLOAT_4:
+      params[3] = IROUND64(((GLfloat *) p)[3]);
+   case TYPE_FLOAT_3:
+      params[2] = IROUND64(((GLfloat *) p)[2]);
+   case TYPE_FLOAT_2:
+      params[1] = IROUND64(((GLfloat *) p)[1]);
+   case TYPE_FLOAT:
+      params[0] = IROUND64(((GLfloat *) p)[0]);
+      break;
 
-   if (ctx->Driver.GetInteger64v &&
-       ctx->Driver.GetInteger64v(ctx, pname, params))
-      return;
+   case TYPE_FLOATN_4:
+      params[3] = FLOAT_TO_INT64(((GLfloat *) p)[3]);
+   case TYPE_FLOATN_3:
+      params[2] = FLOAT_TO_INT64(((GLfloat *) p)[2]);
+   case TYPE_FLOATN_2:
+      params[1] = FLOAT_TO_INT64(((GLfloat *) p)[1]);
+   case TYPE_FLOATN:
+      params[0] = FLOAT_TO_INT64(((GLfloat *) p)[0]);
+      break;
 
-   switch (pname) {
-      case GL_ACCUM_RED_BITS:
-         params[0] = (GLint64)(ctx->DrawBuffer->Visual.accumRedBits);
-         break;
-      case GL_ACCUM_GREEN_BITS:
-         params[0] = (GLint64)(ctx->DrawBuffer->Visual.accumGreenBits);
-         break;
-      case GL_ACCUM_BLUE_BITS:
-         params[0] = (GLint64)(ctx->DrawBuffer->Visual.accumBlueBits);
-         break;
-      case GL_ACCUM_ALPHA_BITS:
-         params[0] = (GLint64)(ctx->DrawBuffer->Visual.accumAlphaBits);
-         break;
-      case GL_ACCUM_CLEAR_VALUE:
-         params[0] = FLOAT_TO_INT64(ctx->Accum.ClearColor[0]);
-         params[1] = FLOAT_TO_INT64(ctx->Accum.ClearColor[1]);
-         params[2] = FLOAT_TO_INT64(ctx->Accum.ClearColor[2]);
-         params[3] = FLOAT_TO_INT64(ctx->Accum.ClearColor[3]);
-         break;
-      case GL_ALPHA_BIAS:
-         params[0] = IROUND64(ctx->Pixel.AlphaBias);
-         break;
-      case GL_ALPHA_BITS:
-         params[0] = (GLint64)(ctx->DrawBuffer->Visual.alphaBits);
-         break;
-      case GL_ALPHA_SCALE:
-         params[0] = IROUND64(ctx->Pixel.AlphaScale);
-         break;
-      case GL_ALPHA_TEST:
-         params[0] = BOOLEAN_TO_INT64(ctx->Color.AlphaEnabled);
-         break;
-      case GL_ALPHA_TEST_FUNC:
-         params[0] = ENUM_TO_INT64(ctx->Color.AlphaFunc);
-         break;
-      case GL_ALPHA_TEST_REF:
-         params[0] = FLOAT_TO_INT64(ctx->Color.AlphaRef);
-         break;
-      case GL_ATTRIB_STACK_DEPTH:
-         params[0] = (GLint64)(ctx->AttribStackDepth);
-         break;
-      case GL_AUTO_NORMAL:
-         params[0] = BOOLEAN_TO_INT64(ctx->Eval.AutoNormal);
-         break;
-      case GL_AUX_BUFFERS:
-         params[0] = (GLint64)(ctx->DrawBuffer->Visual.numAuxBuffers);
-         break;
-      case GL_BLEND:
-         params[0] = BOOLEAN_TO_INT64((ctx->Color.BlendEnabled & 1));
-         break;
-      case GL_BLEND_DST:
-         params[0] = ENUM_TO_INT64(ctx->Color.BlendDstRGB);
-         break;
-      case GL_BLEND_SRC:
-         params[0] = ENUM_TO_INT64(ctx->Color.BlendSrcRGB);
-         break;
-      case GL_BLEND_SRC_RGB_EXT:
-         params[0] = ENUM_TO_INT64(ctx->Color.BlendSrcRGB);
-         break;
-      case GL_BLEND_DST_RGB_EXT:
-         params[0] = ENUM_TO_INT64(ctx->Color.BlendDstRGB);
-         break;
-      case GL_BLEND_SRC_ALPHA_EXT:
-         params[0] = ENUM_TO_INT64(ctx->Color.BlendSrcA);
-         break;
-      case GL_BLEND_DST_ALPHA_EXT:
-         params[0] = ENUM_TO_INT64(ctx->Color.BlendDstA);
-         break;
-      case GL_BLEND_EQUATION:
-         params[0] = ENUM_TO_INT64(ctx->Color.BlendEquationRGB );
-         break;
-      case GL_BLEND_EQUATION_ALPHA_EXT:
-         params[0] = ENUM_TO_INT64(ctx->Color.BlendEquationA );
-         break;
-      case GL_BLEND_COLOR_EXT:
-         params[0] = FLOAT_TO_INT64(ctx->Color.BlendColor[0]);
-         params[1] = FLOAT_TO_INT64(ctx->Color.BlendColor[1]);
-         params[2] = FLOAT_TO_INT64(ctx->Color.BlendColor[2]);
-         params[3] = FLOAT_TO_INT64(ctx->Color.BlendColor[3]);
-         break;
-      case GL_BLUE_BIAS:
-         params[0] = IROUND64(ctx->Pixel.BlueBias);
-         break;
-      case GL_BLUE_BITS:
-         params[0] = (GLint64)(ctx->DrawBuffer->Visual.blueBits);
-         break;
-      case GL_BLUE_SCALE:
-         params[0] = IROUND64(ctx->Pixel.BlueScale);
-         break;
-      case GL_CLIENT_ATTRIB_STACK_DEPTH:
-         params[0] = (GLint64)(ctx->ClientAttribStackDepth);
-         break;
-      case GL_CLIP_PLANE0:
-         params[0] = BOOLEAN_TO_INT64((ctx->Transform.ClipPlanesEnabled >> 0) & 1);
-         break;
-      case GL_CLIP_PLANE1:
-         params[0] = BOOLEAN_TO_INT64((ctx->Transform.ClipPlanesEnabled >> 1) & 1);
-         break;
-      case GL_CLIP_PLANE2:
-         params[0] = BOOLEAN_TO_INT64((ctx->Transform.ClipPlanesEnabled >> 2) & 1);
-         break;
-      case GL_CLIP_PLANE3:
-         params[0] = BOOLEAN_TO_INT64((ctx->Transform.ClipPlanesEnabled >> 3) & 1);
-         break;
-      case GL_CLIP_PLANE4:
-         params[0] = BOOLEAN_TO_INT64((ctx->Transform.ClipPlanesEnabled >> 4) & 1);
-         break;
-      case GL_CLIP_PLANE5:
-         params[0] = BOOLEAN_TO_INT64((ctx->Transform.ClipPlanesEnabled >> 5) & 1);
-         break;
-      case GL_COLOR_CLEAR_VALUE:
-         params[0] = FLOAT_TO_INT64(ctx->Color.ClearColor[0]);
-         params[1] = FLOAT_TO_INT64(ctx->Color.ClearColor[1]);
-         params[2] = FLOAT_TO_INT64(ctx->Color.ClearColor[2]);
-         params[3] = FLOAT_TO_INT64(ctx->Color.ClearColor[3]);
-         break;
-      case GL_COLOR_MATERIAL:
-         params[0] = BOOLEAN_TO_INT64(ctx->Light.ColorMaterialEnabled);
-         break;
-      case GL_COLOR_MATERIAL_FACE:
-         params[0] = ENUM_TO_INT64(ctx->Light.ColorMaterialFace);
-         break;
-      case GL_COLOR_MATERIAL_PARAMETER:
-         params[0] = ENUM_TO_INT64(ctx->Light.ColorMaterialMode);
-         break;
-      case GL_COLOR_WRITEMASK:
-         params[0] = (GLint64)(ctx->Color.ColorMask[0][RCOMP] ? 1 : 0);
-         params[1] = (GLint64)(ctx->Color.ColorMask[0][GCOMP] ? 1 : 0);
-         params[2] = (GLint64)(ctx->Color.ColorMask[0][BCOMP] ? 1 : 0);
-         params[3] = (GLint64)(ctx->Color.ColorMask[0][ACOMP] ? 1 : 0);
-         break;
-      case GL_CULL_FACE:
-         params[0] = BOOLEAN_TO_INT64(ctx->Polygon.CullFlag);
-         break;
-      case GL_CULL_FACE_MODE:
-         params[0] = ENUM_TO_INT64(ctx->Polygon.CullFaceMode);
-         break;
-      case GL_CURRENT_COLOR:
-         {
-         FLUSH_CURRENT(ctx, 0);
-         params[0] = FLOAT_TO_INT64(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][0]);
-         params[1] = FLOAT_TO_INT64(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][1]);
-         params[2] = FLOAT_TO_INT64(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][2]);
-         params[3] = FLOAT_TO_INT64(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][3]);
-         }
-         break;
-      case GL_CURRENT_INDEX:
-         {
-         FLUSH_CURRENT(ctx, 0);
-         params[0] = IROUND64(ctx->Current.Attrib[VERT_ATTRIB_COLOR_INDEX][0]);
-         }
-         break;
-      case GL_CURRENT_NORMAL:
-         {
-         FLUSH_CURRENT(ctx, 0);
-         params[0] = FLOAT_TO_INT64(ctx->Current.Attrib[VERT_ATTRIB_NORMAL][0]);
-         params[1] = FLOAT_TO_INT64(ctx->Current.Attrib[VERT_ATTRIB_NORMAL][1]);
-         params[2] = FLOAT_TO_INT64(ctx->Current.Attrib[VERT_ATTRIB_NORMAL][2]);
-         }
-         break;
-      case GL_CURRENT_RASTER_COLOR:
-         params[0] = FLOAT_TO_INT64(ctx->Current.RasterColor[0]);
-         params[1] = FLOAT_TO_INT64(ctx->Current.RasterColor[1]);
-         params[2] = FLOAT_TO_INT64(ctx->Current.RasterColor[2]);
-         params[3] = FLOAT_TO_INT64(ctx->Current.RasterColor[3]);
-         break;
-      case GL_CURRENT_RASTER_DISTANCE:
-         params[0] = IROUND64(ctx->Current.RasterDistance);
-         break;
-      case GL_CURRENT_RASTER_INDEX:
-         params[0] = IROUND64(1.0);
-         break;
-      case GL_CURRENT_RASTER_POSITION:
-         params[0] = IROUND64(ctx->Current.RasterPos[0]);
-         params[1] = IROUND64(ctx->Current.RasterPos[1]);
-         params[2] = IROUND64(ctx->Current.RasterPos[2]);
-         params[3] = IROUND64(ctx->Current.RasterPos[3]);
-         break;
-      case GL_CURRENT_RASTER_SECONDARY_COLOR:
-         params[0] = FLOAT_TO_INT64(ctx->Current.RasterSecondaryColor[0]);
-         params[1] = FLOAT_TO_INT64(ctx->Current.RasterSecondaryColor[1]);
-         params[2] = FLOAT_TO_INT64(ctx->Current.RasterSecondaryColor[2]);
-         params[3] = FLOAT_TO_INT64(ctx->Current.RasterSecondaryColor[3]);
-         break;
-      case GL_CURRENT_RASTER_TEXTURE_COORDS:
-         {
-         const GLuint unit = ctx->Texture.CurrentUnit;
-         if (unit >= ctx->Const.MaxTextureCoordUnits) {
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glGet(raster tex coords, unit %u)", unit);
-            return;
-         }
-         params[0] = IROUND64(ctx->Current.RasterTexCoords[unit][0]);
-         params[1] = IROUND64(ctx->Current.RasterTexCoords[unit][1]);
-         params[2] = IROUND64(ctx->Current.RasterTexCoords[unit][2]);
-         params[3] = IROUND64(ctx->Current.RasterTexCoords[unit][3]);
-         }
-         break;
-      case GL_CURRENT_RASTER_POSITION_VALID:
-         params[0] = BOOLEAN_TO_INT64(ctx->Current.RasterPosValid);
-         break;
-      case GL_CURRENT_TEXTURE_COORDS:
-         {
-         const GLuint unit = ctx->Texture.CurrentUnit;
-         if (unit >= ctx->Const.MaxTextureCoordUnits) {
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glGet(current tex coords, unit %u)", unit);
-            return;
-         }
-         FLUSH_CURRENT(ctx, 0);
-         params[0] = IROUND64(ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit][0]);
-         params[1] = IROUND64(ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit][1]);
-         params[2] = IROUND64(ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit][2]);
-         params[3] = IROUND64(ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit][3]);
-         }
-         break;
-      case GL_DEPTH_BIAS:
-         params[0] = IROUND64(ctx->Pixel.DepthBias);
-         break;
-      case GL_DEPTH_BITS:
-         params[0] = (GLint64)(ctx->DrawBuffer->Visual.depthBits);
-         break;
-      case GL_DEPTH_CLEAR_VALUE:
-         params[0] = FLOAT_TO_INT64(((GLfloat) ctx->Depth.Clear));
-         break;
-      case GL_DEPTH_FUNC:
-         params[0] = ENUM_TO_INT64(ctx->Depth.Func);
-         break;
-      case GL_DEPTH_RANGE:
-         params[0] = FLOAT_TO_INT64(ctx->Viewport.Near);
-         params[1] = FLOAT_TO_INT64(ctx->Viewport.Far);
-         break;
-      case GL_DEPTH_SCALE:
-         params[0] = IROUND64(ctx->Pixel.DepthScale);
-         break;
-      case GL_DEPTH_TEST:
-         params[0] = BOOLEAN_TO_INT64(ctx->Depth.Test);
-         break;
-      case GL_DEPTH_WRITEMASK:
-         params[0] = BOOLEAN_TO_INT64(ctx->Depth.Mask);
-         break;
-      case GL_DITHER:
-         params[0] = BOOLEAN_TO_INT64(ctx->Color.DitherFlag);
-         break;
-      case GL_DOUBLEBUFFER:
-         params[0] = BOOLEAN_TO_INT64(ctx->DrawBuffer->Visual.doubleBufferMode);
-         break;
-      case GL_DRAW_BUFFER:
-         params[0] = ENUM_TO_INT64(ctx->DrawBuffer->ColorDrawBuffer[0]);
-         break;
-      case GL_EDGE_FLAG:
-         {
-         FLUSH_CURRENT(ctx, 0);
-         params[0] = BOOLEAN_TO_INT64((ctx->Current.Attrib[VERT_ATTRIB_EDGEFLAG][0] == 1.0));
-         }
-         break;
-      case GL_FEEDBACK_BUFFER_SIZE:
-         params[0] = (GLint64)(ctx->Feedback.BufferSize);
-         break;
-      case GL_FEEDBACK_BUFFER_TYPE:
-         params[0] = ENUM_TO_INT64(ctx->Feedback.Type);
-         break;
-      case GL_FOG:
-         params[0] = BOOLEAN_TO_INT64(ctx->Fog.Enabled);
-         break;
-      case GL_FOG_COLOR:
-         params[0] = FLOAT_TO_INT64(ctx->Fog.Color[0]);
-         params[1] = FLOAT_TO_INT64(ctx->Fog.Color[1]);
-         params[2] = FLOAT_TO_INT64(ctx->Fog.Color[2]);
-         params[3] = FLOAT_TO_INT64(ctx->Fog.Color[3]);
-         break;
-      case GL_FOG_DENSITY:
-         params[0] = IROUND64(ctx->Fog.Density);
-         break;
-      case GL_FOG_END:
-         params[0] = IROUND64(ctx->Fog.End);
-         break;
-      case GL_FOG_HINT:
-         params[0] = ENUM_TO_INT64(ctx->Hint.Fog);
-         break;
-      case GL_FOG_INDEX:
-         params[0] = IROUND64(ctx->Fog.Index);
-         break;
-      case GL_FOG_MODE:
-         params[0] = ENUM_TO_INT64(ctx->Fog.Mode);
-         break;
-      case GL_FOG_START:
-         params[0] = IROUND64(ctx->Fog.Start);
-         break;
-      case GL_FRONT_FACE:
-         params[0] = ENUM_TO_INT64(ctx->Polygon.FrontFace);
-         break;
-      case GL_GREEN_BIAS:
-         params[0] = IROUND64(ctx->Pixel.GreenBias);
-         break;
-      case GL_GREEN_BITS:
-         params[0] = (GLint64)(ctx->DrawBuffer->Visual.greenBits);
-         break;
-      case GL_GREEN_SCALE:
-         params[0] = IROUND64(ctx->Pixel.GreenScale);
-         break;
-      case GL_INDEX_BITS:
-         params[0] = (GLint64)(ctx->DrawBuffer->Visual.indexBits);
-         break;
-      case GL_INDEX_CLEAR_VALUE:
-         params[0] = (GLint64)(ctx->Color.ClearIndex);
-         break;
-      case GL_INDEX_MODE:
-         params[0] = BOOLEAN_TO_INT64(GL_FALSE);
-         break;
-      case GL_INDEX_OFFSET:
-         params[0] = (GLint64)(ctx->Pixel.IndexOffset);
-         break;
-      case GL_INDEX_SHIFT:
-         params[0] = (GLint64)(ctx->Pixel.IndexShift);
-         break;
-      case GL_INDEX_WRITEMASK:
-         params[0] = (GLint64)(ctx->Color.IndexMask);
-         break;
-      case GL_LIGHT0:
-         params[0] = BOOLEAN_TO_INT64(ctx->Light.Light[0].Enabled);
-         break;
-      case GL_LIGHT1:
-         params[0] = BOOLEAN_TO_INT64(ctx->Light.Light[1].Enabled);
-         break;
-      case GL_LIGHT2:
-         params[0] = BOOLEAN_TO_INT64(ctx->Light.Light[2].Enabled);
-         break;
-      case GL_LIGHT3:
-         params[0] = BOOLEAN_TO_INT64(ctx->Light.Light[3].Enabled);
-         break;
-      case GL_LIGHT4:
-         params[0] = BOOLEAN_TO_INT64(ctx->Light.Light[4].Enabled);
-         break;
-      case GL_LIGHT5:
-         params[0] = BOOLEAN_TO_INT64(ctx->Light.Light[5].Enabled);
-         break;
-      case GL_LIGHT6:
-         params[0] = BOOLEAN_TO_INT64(ctx->Light.Light[6].Enabled);
-         break;
-      case GL_LIGHT7:
-         params[0] = BOOLEAN_TO_INT64(ctx->Light.Light[7].Enabled);
-         break;
-      case GL_LIGHTING:
-         params[0] = BOOLEAN_TO_INT64(ctx->Light.Enabled);
-         break;
-      case GL_LIGHT_MODEL_AMBIENT:
-         params[0] = FLOAT_TO_INT64(ctx->Light.Model.Ambient[0]);
-         params[1] = FLOAT_TO_INT64(ctx->Light.Model.Ambient[1]);
-         params[2] = FLOAT_TO_INT64(ctx->Light.Model.Ambient[2]);
-         params[3] = FLOAT_TO_INT64(ctx->Light.Model.Ambient[3]);
-         break;
-      case GL_LIGHT_MODEL_COLOR_CONTROL:
-         params[0] = ENUM_TO_INT64(ctx->Light.Model.ColorControl);
-         break;
-      case GL_LIGHT_MODEL_LOCAL_VIEWER:
-         params[0] = BOOLEAN_TO_INT64(ctx->Light.Model.LocalViewer);
-         break;
-      case GL_LIGHT_MODEL_TWO_SIDE:
-         params[0] = BOOLEAN_TO_INT64(ctx->Light.Model.TwoSide);
-         break;
-      case GL_LINE_SMOOTH:
-         params[0] = BOOLEAN_TO_INT64(ctx->Line.SmoothFlag);
-         break;
-      case GL_LINE_SMOOTH_HINT:
-         params[0] = ENUM_TO_INT64(ctx->Hint.LineSmooth);
-         break;
-      case GL_LINE_STIPPLE:
-         params[0] = BOOLEAN_TO_INT64(ctx->Line.StippleFlag);
-         break;
-      case GL_LINE_STIPPLE_PATTERN:
-         params[0] = (GLint64)(ctx->Line.StipplePattern);
-         break;
-      case GL_LINE_STIPPLE_REPEAT:
-         params[0] = (GLint64)(ctx->Line.StippleFactor);
-         break;
-      case GL_LINE_WIDTH:
-         params[0] = IROUND64(ctx->Line.Width);
-         break;
-      case GL_LINE_WIDTH_GRANULARITY:
-         params[0] = IROUND64(ctx->Const.LineWidthGranularity);
-         break;
-      case GL_LINE_WIDTH_RANGE:
-         params[0] = IROUND64(ctx->Const.MinLineWidthAA);
-         params[1] = IROUND64(ctx->Const.MaxLineWidthAA);
-         break;
-      case GL_ALIASED_LINE_WIDTH_RANGE:
-         params[0] = IROUND64(ctx->Const.MinLineWidth);
-         params[1] = IROUND64(ctx->Const.MaxLineWidth);
-         break;
-      case GL_LIST_BASE:
-         params[0] = (GLint64)(ctx->List.ListBase);
-         break;
-      case GL_LIST_INDEX:
-         params[0] = (GLint64)((ctx->ListState.CurrentList ? ctx->ListState.CurrentList->Name : 0));
-         break;
-      case GL_LIST_MODE:
-         {
-         GLenum mode;
-         if (!ctx->CompileFlag)
-            mode = 0;
-         else if (ctx->ExecuteFlag)
-            mode = GL_COMPILE_AND_EXECUTE;
-         else
-            mode = GL_COMPILE;
-         params[0] = ENUM_TO_INT64(mode);
-         }
-         break;
-      case GL_INDEX_LOGIC_OP:
-         params[0] = BOOLEAN_TO_INT64(ctx->Color.IndexLogicOpEnabled);
-         break;
-      case GL_COLOR_LOGIC_OP:
-         params[0] = BOOLEAN_TO_INT64(ctx->Color.ColorLogicOpEnabled);
-         break;
-      case GL_LOGIC_OP_MODE:
-         params[0] = ENUM_TO_INT64(ctx->Color.LogicOp);
-         break;
-      case GL_MAP1_COLOR_4:
-         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Color4);
-         break;
-      case GL_MAP1_GRID_DOMAIN:
-         params[0] = IROUND64(ctx->Eval.MapGrid1u1);
-         params[1] = IROUND64(ctx->Eval.MapGrid1u2);
-         break;
-      case GL_MAP1_GRID_SEGMENTS:
-         params[0] = (GLint64)(ctx->Eval.MapGrid1un);
-         break;
-      case GL_MAP1_INDEX:
-         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Index);
-         break;
-      case GL_MAP1_NORMAL:
-         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Normal);
-         break;
-      case GL_MAP1_TEXTURE_COORD_1:
-         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1TextureCoord1);
-         break;
-      case GL_MAP1_TEXTURE_COORD_2:
-         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1TextureCoord2);
-         break;
-      case GL_MAP1_TEXTURE_COORD_3:
-         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1TextureCoord3);
-         break;
-      case GL_MAP1_TEXTURE_COORD_4:
-         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1TextureCoord4);
-         break;
-      case GL_MAP1_VERTEX_3:
-         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Vertex3);
-         break;
-      case GL_MAP1_VERTEX_4:
-         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Vertex4);
-         break;
-      case GL_MAP2_COLOR_4:
-         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map2Color4);
-         break;
-      case GL_MAP2_GRID_DOMAIN:
-         params[0] = IROUND64(ctx->Eval.MapGrid2u1);
-         params[1] = IROUND64(ctx->Eval.MapGrid2u2);
-         params[2] = IROUND64(ctx->Eval.MapGrid2v1);
-         params[3] = IROUND64(ctx->Eval.MapGrid2v2);
-         break;
-      case GL_MAP2_GRID_SEGMENTS:
-         params[0] = (GLint64)(ctx->Eval.MapGrid2un);
-         params[1] = (GLint64)(ctx->Eval.MapGrid2vn);
-         break;
-      case GL_MAP2_INDEX:
-         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map2Index);
-         break;
-      case GL_MAP2_NORMAL:
-         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map2Normal);
-         break;
-      case GL_MAP2_TEXTURE_COORD_1:
-         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map2TextureCoord1);
-         break;
-      case GL_MAP2_TEXTURE_COORD_2:
-         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map2TextureCoord2);
-         break;
-      case GL_MAP2_TEXTURE_COORD_3:
-         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map2TextureCoord3);
-         break;
-      case GL_MAP2_TEXTURE_COORD_4:
-         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map2TextureCoord4);
-         break;
-      case GL_MAP2_VERTEX_3:
-         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map2Vertex3);
-         break;
-      case GL_MAP2_VERTEX_4:
-         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map2Vertex4);
-         break;
-      case GL_MAP_COLOR:
-         params[0] = BOOLEAN_TO_INT64(ctx->Pixel.MapColorFlag);
-         break;
-      case GL_MAP_STENCIL:
-         params[0] = BOOLEAN_TO_INT64(ctx->Pixel.MapStencilFlag);
-         break;
-      case GL_MATRIX_MODE:
-         params[0] = ENUM_TO_INT64(ctx->Transform.MatrixMode);
-         break;
-      case GL_MAX_ATTRIB_STACK_DEPTH:
-         params[0] = (GLint64)(MAX_ATTRIB_STACK_DEPTH);
-         break;
-      case GL_MAX_CLIENT_ATTRIB_STACK_DEPTH:
-         params[0] = (GLint64)(MAX_CLIENT_ATTRIB_STACK_DEPTH);
-         break;
-      case GL_MAX_CLIP_PLANES:
-         params[0] = (GLint64)(ctx->Const.MaxClipPlanes);
-         break;
-      case GL_MAX_ELEMENTS_VERTICES:
-         params[0] = (GLint64)(ctx->Const.MaxArrayLockSize);
-         break;
-      case GL_MAX_ELEMENTS_INDICES:
-         params[0] = (GLint64)(ctx->Const.MaxArrayLockSize);
-         break;
-      case GL_MAX_EVAL_ORDER:
-         params[0] = (GLint64)(MAX_EVAL_ORDER);
-         break;
-      case GL_MAX_LIGHTS:
-         params[0] = (GLint64)(ctx->Const.MaxLights);
-         break;
-      case GL_MAX_LIST_NESTING:
-         params[0] = (GLint64)(MAX_LIST_NESTING);
-         break;
-      case GL_MAX_MODELVIEW_STACK_DEPTH:
-         params[0] = (GLint64)(MAX_MODELVIEW_STACK_DEPTH);
-         break;
-      case GL_MAX_NAME_STACK_DEPTH:
-         params[0] = (GLint64)(MAX_NAME_STACK_DEPTH);
-         break;
-      case GL_MAX_PIXEL_MAP_TABLE:
-         params[0] = (GLint64)(MAX_PIXEL_MAP_TABLE);
-         break;
-      case GL_MAX_PROJECTION_STACK_DEPTH:
-         params[0] = (GLint64)(MAX_PROJECTION_STACK_DEPTH);
-         break;
-      case GL_MAX_TEXTURE_SIZE:
-         params[0] = (GLint64)(1 << (ctx->Const.MaxTextureLevels - 1));
-         break;
-      case GL_MAX_3D_TEXTURE_SIZE:
-         params[0] = (GLint64)(1 << (ctx->Const.Max3DTextureLevels - 1));
-         break;
-      case GL_MAX_TEXTURE_STACK_DEPTH:
-         params[0] = (GLint64)(MAX_TEXTURE_STACK_DEPTH);
-         break;
-      case GL_MAX_VIEWPORT_DIMS:
-         params[0] = (GLint64)(ctx->Const.MaxViewportWidth);
-         params[1] = (GLint64)(ctx->Const.MaxViewportHeight);
-         break;
-      case GL_MODELVIEW_MATRIX:
-         {
-         const GLfloat *matrix = ctx->ModelviewMatrixStack.Top->m;
-         params[0] = IROUND64(matrix[0]);
-         params[1] = IROUND64(matrix[1]);
-         params[2] = IROUND64(matrix[2]);
-         params[3] = IROUND64(matrix[3]);
-         params[4] = IROUND64(matrix[4]);
-         params[5] = IROUND64(matrix[5]);
-         params[6] = IROUND64(matrix[6]);
-         params[7] = IROUND64(matrix[7]);
-         params[8] = IROUND64(matrix[8]);
-         params[9] = IROUND64(matrix[9]);
-         params[10] = IROUND64(matrix[10]);
-         params[11] = IROUND64(matrix[11]);
-         params[12] = IROUND64(matrix[12]);
-         params[13] = IROUND64(matrix[13]);
-         params[14] = IROUND64(matrix[14]);
-         params[15] = IROUND64(matrix[15]);
-         }
-         break;
-      case GL_MODELVIEW_STACK_DEPTH:
-         params[0] = (GLint64)(ctx->ModelviewMatrixStack.Depth + 1);
-         break;
-      case GL_NAME_STACK_DEPTH:
-         params[0] = (GLint64)(ctx->Select.NameStackDepth);
-         break;
-      case GL_NORMALIZE:
-         params[0] = BOOLEAN_TO_INT64(ctx->Transform.Normalize);
-         break;
-      case GL_PACK_ALIGNMENT:
-         params[0] = (GLint64)(ctx->Pack.Alignment);
-         break;
-      case GL_PACK_LSB_FIRST:
-         params[0] = BOOLEAN_TO_INT64(ctx->Pack.LsbFirst);
-         break;
-      case GL_PACK_ROW_LENGTH:
-         params[0] = (GLint64)(ctx->Pack.RowLength);
-         break;
-      case GL_PACK_SKIP_PIXELS:
-         params[0] = (GLint64)(ctx->Pack.SkipPixels);
-         break;
-      case GL_PACK_SKIP_ROWS:
-         params[0] = (GLint64)(ctx->Pack.SkipRows);
-         break;
-      case GL_PACK_SWAP_BYTES:
-         params[0] = BOOLEAN_TO_INT64(ctx->Pack.SwapBytes);
-         break;
-      case GL_PACK_SKIP_IMAGES_EXT:
-         params[0] = (GLint64)(ctx->Pack.SkipImages);
-         break;
-      case GL_PACK_IMAGE_HEIGHT_EXT:
-         params[0] = (GLint64)(ctx->Pack.ImageHeight);
-         break;
-      case GL_PACK_INVERT_MESA:
-         params[0] = BOOLEAN_TO_INT64(ctx->Pack.Invert);
-         break;
-      case GL_PERSPECTIVE_CORRECTION_HINT:
-         params[0] = ENUM_TO_INT64(ctx->Hint.PerspectiveCorrection);
-         break;
-      case GL_PIXEL_MAP_A_TO_A_SIZE:
-         params[0] = (GLint64)(ctx->PixelMaps.AtoA.Size);
-         break;
-      case GL_PIXEL_MAP_B_TO_B_SIZE:
-         params[0] = (GLint64)(ctx->PixelMaps.BtoB.Size);
-         break;
-      case GL_PIXEL_MAP_G_TO_G_SIZE:
-         params[0] = (GLint64)(ctx->PixelMaps.GtoG.Size);
-         break;
-      case GL_PIXEL_MAP_I_TO_A_SIZE:
-         params[0] = (GLint64)(ctx->PixelMaps.ItoA.Size);
-         break;
-      case GL_PIXEL_MAP_I_TO_B_SIZE:
-         params[0] = (GLint64)(ctx->PixelMaps.ItoB.Size);
-         break;
-      case GL_PIXEL_MAP_I_TO_G_SIZE:
-         params[0] = (GLint64)(ctx->PixelMaps.ItoG.Size);
-         break;
-      case GL_PIXEL_MAP_I_TO_I_SIZE:
-         params[0] = (GLint64)(ctx->PixelMaps.ItoI.Size);
-         break;
-      case GL_PIXEL_MAP_I_TO_R_SIZE:
-         params[0] = (GLint64)(ctx->PixelMaps.ItoR.Size);
-         break;
-      case GL_PIXEL_MAP_R_TO_R_SIZE:
-         params[0] = (GLint64)(ctx->PixelMaps.RtoR.Size);
-         break;
-      case GL_PIXEL_MAP_S_TO_S_SIZE:
-         params[0] = (GLint64)(ctx->PixelMaps.StoS.Size);
-         break;
-      case GL_POINT_SIZE:
-         params[0] = IROUND64(ctx->Point.Size);
-         break;
-      case GL_POINT_SIZE_GRANULARITY:
-         params[0] = IROUND64(ctx->Const.PointSizeGranularity);
-         break;
-      case GL_POINT_SIZE_RANGE:
-         params[0] = IROUND64(ctx->Const.MinPointSizeAA);
-         params[1] = IROUND64(ctx->Const.MaxPointSizeAA);
-         break;
-      case GL_ALIASED_POINT_SIZE_RANGE:
-         params[0] = IROUND64(ctx->Const.MinPointSize);
-         params[1] = IROUND64(ctx->Const.MaxPointSize);
-         break;
-      case GL_POINT_SMOOTH:
-         params[0] = BOOLEAN_TO_INT64(ctx->Point.SmoothFlag);
-         break;
-      case GL_POINT_SMOOTH_HINT:
-         params[0] = ENUM_TO_INT64(ctx->Hint.PointSmooth);
-         break;
-      case GL_POINT_SIZE_MIN_EXT:
-         params[0] = IROUND64(ctx->Point.MinSize);
-         break;
-      case GL_POINT_SIZE_MAX_EXT:
-         params[0] = IROUND64(ctx->Point.MaxSize);
-         break;
-      case GL_POINT_FADE_THRESHOLD_SIZE_EXT:
-         params[0] = IROUND64(ctx->Point.Threshold);
-         break;
-      case GL_DISTANCE_ATTENUATION_EXT:
-         params[0] = IROUND64(ctx->Point.Params[0]);
-         params[1] = IROUND64(ctx->Point.Params[1]);
-         params[2] = IROUND64(ctx->Point.Params[2]);
-         break;
-      case GL_POLYGON_MODE:
-         params[0] = ENUM_TO_INT64(ctx->Polygon.FrontMode);
-         params[1] = ENUM_TO_INT64(ctx->Polygon.BackMode);
-         break;
-      case GL_POLYGON_OFFSET_BIAS_EXT:
-         params[0] = IROUND64(ctx->Polygon.OffsetUnits);
-         break;
-      case GL_POLYGON_OFFSET_FACTOR:
-         params[0] = IROUND64(ctx->Polygon.OffsetFactor );
-         break;
-      case GL_POLYGON_OFFSET_UNITS:
-         params[0] = IROUND64(ctx->Polygon.OffsetUnits );
-         break;
-      case GL_POLYGON_OFFSET_POINT:
-         params[0] = BOOLEAN_TO_INT64(ctx->Polygon.OffsetPoint);
-         break;
-      case GL_POLYGON_OFFSET_LINE:
-         params[0] = BOOLEAN_TO_INT64(ctx->Polygon.OffsetLine);
-         break;
-      case GL_POLYGON_OFFSET_FILL:
-         params[0] = BOOLEAN_TO_INT64(ctx->Polygon.OffsetFill);
-         break;
-      case GL_POLYGON_SMOOTH:
-         params[0] = BOOLEAN_TO_INT64(ctx->Polygon.SmoothFlag);
-         break;
-      case GL_POLYGON_SMOOTH_HINT:
-         params[0] = ENUM_TO_INT64(ctx->Hint.PolygonSmooth);
-         break;
-      case GL_POLYGON_STIPPLE:
-         params[0] = BOOLEAN_TO_INT64(ctx->Polygon.StippleFlag);
-         break;
-      case GL_PROJECTION_MATRIX:
-         {
-         const GLfloat *matrix = ctx->ProjectionMatrixStack.Top->m;
-         params[0] = IROUND64(matrix[0]);
-         params[1] = IROUND64(matrix[1]);
-         params[2] = IROUND64(matrix[2]);
-         params[3] = IROUND64(matrix[3]);
-         params[4] = IROUND64(matrix[4]);
-         params[5] = IROUND64(matrix[5]);
-         params[6] = IROUND64(matrix[6]);
-         params[7] = IROUND64(matrix[7]);
-         params[8] = IROUND64(matrix[8]);
-         params[9] = IROUND64(matrix[9]);
-         params[10] = IROUND64(matrix[10]);
-         params[11] = IROUND64(matrix[11]);
-         params[12] = IROUND64(matrix[12]);
-         params[13] = IROUND64(matrix[13]);
-         params[14] = IROUND64(matrix[14]);
-         params[15] = IROUND64(matrix[15]);
-         }
-         break;
-      case GL_PROJECTION_STACK_DEPTH:
-         params[0] = (GLint64)(ctx->ProjectionMatrixStack.Depth + 1);
-         break;
-      case GL_READ_BUFFER:
-         params[0] = ENUM_TO_INT64(ctx->ReadBuffer->ColorReadBuffer);
-         break;
-      case GL_RED_BIAS:
-         params[0] = IROUND64(ctx->Pixel.RedBias);
-         break;
-      case GL_RED_BITS:
-         params[0] = (GLint64)(ctx->DrawBuffer->Visual.redBits);
-         break;
-      case GL_RED_SCALE:
-         params[0] = IROUND64(ctx->Pixel.RedScale);
-         break;
-      case GL_RENDER_MODE:
-         params[0] = ENUM_TO_INT64(ctx->RenderMode);
-         break;
-      case GL_RESCALE_NORMAL:
-         params[0] = BOOLEAN_TO_INT64(ctx->Transform.RescaleNormals);
-         break;
-      case GL_RGBA_MODE:
-         params[0] = BOOLEAN_TO_INT64(GL_TRUE);
-         break;
-      case GL_SCISSOR_BOX:
-         params[0] = (GLint64)(ctx->Scissor.X);
-         params[1] = (GLint64)(ctx->Scissor.Y);
-         params[2] = (GLint64)(ctx->Scissor.Width);
-         params[3] = (GLint64)(ctx->Scissor.Height);
-         break;
-      case GL_SCISSOR_TEST:
-         params[0] = BOOLEAN_TO_INT64(ctx->Scissor.Enabled);
-         break;
-      case GL_SELECTION_BUFFER_SIZE:
-         params[0] = (GLint64)(ctx->Select.BufferSize);
-         break;
-      case GL_SHADE_MODEL:
-         params[0] = ENUM_TO_INT64(ctx->Light.ShadeModel);
-         break;
-      case GL_SHARED_TEXTURE_PALETTE_EXT:
-         params[0] = BOOLEAN_TO_INT64(ctx->Texture.SharedPalette);
-         break;
-      case GL_STENCIL_BITS:
-         params[0] = (GLint64)(ctx->DrawBuffer->Visual.stencilBits);
-         break;
-      case GL_STENCIL_CLEAR_VALUE:
-         params[0] = (GLint64)(ctx->Stencil.Clear);
-         break;
-      case GL_STENCIL_FAIL:
-         params[0] = ENUM_TO_INT64(ctx->Stencil.FailFunc[ctx->Stencil.ActiveFace]);
-         break;
-      case GL_STENCIL_FUNC:
-         params[0] = ENUM_TO_INT64(ctx->Stencil.Function[ctx->Stencil.ActiveFace]);
-         break;
-      case GL_STENCIL_PASS_DEPTH_FAIL:
-         params[0] = ENUM_TO_INT64(ctx->Stencil.ZFailFunc[ctx->Stencil.ActiveFace]);
-         break;
-      case GL_STENCIL_PASS_DEPTH_PASS:
-         params[0] = ENUM_TO_INT64(ctx->Stencil.ZPassFunc[ctx->Stencil.ActiveFace]);
-         break;
-      case GL_STENCIL_REF:
-         params[0] = (GLint64)(ctx->Stencil.Ref[ctx->Stencil.ActiveFace]);
-         break;
-      case GL_STENCIL_TEST:
-         params[0] = BOOLEAN_TO_INT64(ctx->Stencil.Enabled);
-         break;
-      case GL_STENCIL_VALUE_MASK:
-         params[0] = (GLint64)(ctx->Stencil.ValueMask[ctx->Stencil.ActiveFace]);
-         break;
-      case GL_STENCIL_WRITEMASK:
-         params[0] = (GLint64)(ctx->Stencil.WriteMask[ctx->Stencil.ActiveFace]);
-         break;
-      case GL_STEREO:
-         params[0] = BOOLEAN_TO_INT64(ctx->DrawBuffer->Visual.stereoMode);
-         break;
-      case GL_SUBPIXEL_BITS:
-         params[0] = (GLint64)(ctx->Const.SubPixelBits);
-         break;
-      case GL_TEXTURE_1D:
-         params[0] = BOOLEAN_TO_INT64(_mesa_IsEnabled(GL_TEXTURE_1D));
-         break;
-      case GL_TEXTURE_2D:
-         params[0] = BOOLEAN_TO_INT64(_mesa_IsEnabled(GL_TEXTURE_2D));
-         break;
-      case GL_TEXTURE_3D:
-         params[0] = BOOLEAN_TO_INT64(_mesa_IsEnabled(GL_TEXTURE_3D));
-         break;
-      case GL_TEXTURE_1D_ARRAY_EXT:
-         CHECK_EXT1(MESA_texture_array, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(_mesa_IsEnabled(GL_TEXTURE_1D_ARRAY_EXT));
-         break;
-      case GL_TEXTURE_2D_ARRAY_EXT:
-         CHECK_EXT1(MESA_texture_array, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(_mesa_IsEnabled(GL_TEXTURE_2D_ARRAY_EXT));
-         break;
-      case GL_TEXTURE_BINDING_1D:
-         params[0] = (GLint64)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_1D_INDEX]->Name);
-         break;
-      case GL_TEXTURE_BINDING_2D:
-         params[0] = (GLint64)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_2D_INDEX]->Name);
-         break;
-      case GL_TEXTURE_BINDING_3D:
-         params[0] = (GLint64)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_3D_INDEX]->Name);
-         break;
-      case GL_TEXTURE_BINDING_1D_ARRAY_EXT:
-         CHECK_EXT1(MESA_texture_array, "GetInteger64v");
-         params[0] = (GLint64)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_1D_ARRAY_INDEX]->Name);
-         break;
-      case GL_TEXTURE_BINDING_2D_ARRAY_EXT:
-         CHECK_EXT1(MESA_texture_array, "GetInteger64v");
-         params[0] = (GLint64)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_2D_ARRAY_INDEX]->Name);
-         break;
-      case GL_TEXTURE_GEN_S:
-         params[0] = BOOLEAN_TO_INT64(((ctx->Texture.Unit[ctx->Texture.CurrentUnit].TexGenEnabled & S_BIT) ? 1 : 0));
-         break;
-      case GL_TEXTURE_GEN_T:
-         params[0] = BOOLEAN_TO_INT64(((ctx->Texture.Unit[ctx->Texture.CurrentUnit].TexGenEnabled & T_BIT) ? 1 : 0));
-         break;
-      case GL_TEXTURE_GEN_R:
-         params[0] = BOOLEAN_TO_INT64(((ctx->Texture.Unit[ctx->Texture.CurrentUnit].TexGenEnabled & R_BIT) ? 1 : 0));
-         break;
-      case GL_TEXTURE_GEN_Q:
-         params[0] = BOOLEAN_TO_INT64(((ctx->Texture.Unit[ctx->Texture.CurrentUnit].TexGenEnabled & Q_BIT) ? 1 : 0));
-         break;
-      case GL_TEXTURE_MATRIX:
-         {
-         const GLfloat *matrix;
-         const GLuint unit = ctx->Texture.CurrentUnit;
-         if (unit >= ctx->Const.MaxTextureCoordUnits) {
-            _mesa_error(ctx, GL_INVALID_OPERATION, "glGet(texture matrix %u)",
-                        unit);
-            return;
-         }
-         matrix = ctx->TextureMatrixStack[unit].Top->m;
-         params[0] = IROUND64(matrix[0]);
-         params[1] = IROUND64(matrix[1]);
-         params[2] = IROUND64(matrix[2]);
-         params[3] = IROUND64(matrix[3]);
-         params[4] = IROUND64(matrix[4]);
-         params[5] = IROUND64(matrix[5]);
-         params[6] = IROUND64(matrix[6]);
-         params[7] = IROUND64(matrix[7]);
-         params[8] = IROUND64(matrix[8]);
-         params[9] = IROUND64(matrix[9]);
-         params[10] = IROUND64(matrix[10]);
-         params[11] = IROUND64(matrix[11]);
-         params[12] = IROUND64(matrix[12]);
-         params[13] = IROUND64(matrix[13]);
-         params[14] = IROUND64(matrix[14]);
-         params[15] = IROUND64(matrix[15]);
-         }
-         break;
-      case GL_TEXTURE_STACK_DEPTH:
-         {
-         const GLuint unit = ctx->Texture.CurrentUnit;
-         if (unit >= ctx->Const.MaxTextureCoordUnits) {
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glGet(texture stack depth, unit %u)", unit);
-            return;
-         }
-         params[0] = (GLint64)(ctx->TextureMatrixStack[unit].Depth + 1);
-         }
-         break;
-      case GL_UNPACK_ALIGNMENT:
-         params[0] = (GLint64)(ctx->Unpack.Alignment);
-         break;
-      case GL_UNPACK_LSB_FIRST:
-         params[0] = BOOLEAN_TO_INT64(ctx->Unpack.LsbFirst);
-         break;
-      case GL_UNPACK_ROW_LENGTH:
-         params[0] = (GLint64)(ctx->Unpack.RowLength);
-         break;
-      case GL_UNPACK_SKIP_PIXELS:
-         params[0] = (GLint64)(ctx->Unpack.SkipPixels);
-         break;
-      case GL_UNPACK_SKIP_ROWS:
-         params[0] = (GLint64)(ctx->Unpack.SkipRows);
-         break;
-      case GL_UNPACK_SWAP_BYTES:
-         params[0] = BOOLEAN_TO_INT64(ctx->Unpack.SwapBytes);
-         break;
-      case GL_UNPACK_SKIP_IMAGES_EXT:
-         params[0] = (GLint64)(ctx->Unpack.SkipImages);
-         break;
-      case GL_UNPACK_IMAGE_HEIGHT_EXT:
-         params[0] = (GLint64)(ctx->Unpack.ImageHeight);
-         break;
-      case GL_UNPACK_CLIENT_STORAGE_APPLE:
-         params[0] = BOOLEAN_TO_INT64(ctx->Unpack.ClientStorage);
-         break;
-      case GL_VIEWPORT:
-         params[0] = (GLint64)(ctx->Viewport.X);
-         params[1] = (GLint64)(ctx->Viewport.Y);
-         params[2] = (GLint64)(ctx->Viewport.Width);
-         params[3] = (GLint64)(ctx->Viewport.Height);
-         break;
-      case GL_ZOOM_X:
-         params[0] = IROUND64(ctx->Pixel.ZoomX);
-         break;
-      case GL_ZOOM_Y:
-         params[0] = IROUND64(ctx->Pixel.ZoomY);
-         break;
-      case GL_VERTEX_ARRAY:
-         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->Vertex.Enabled);
-         break;
-      case GL_VERTEX_ARRAY_SIZE:
-         params[0] = (GLint64)(ctx->Array.ArrayObj->Vertex.Size);
-         break;
-      case GL_VERTEX_ARRAY_TYPE:
-         params[0] = ENUM_TO_INT64(ctx->Array.ArrayObj->Vertex.Type);
-         break;
-      case GL_VERTEX_ARRAY_STRIDE:
-         params[0] = (GLint64)(ctx->Array.ArrayObj->Vertex.Stride);
-         break;
-      case GL_VERTEX_ARRAY_COUNT_EXT:
-         params[0] = (GLint64)(0);
-         break;
-      case GL_NORMAL_ARRAY:
-         params[0] = ENUM_TO_INT64(ctx->Array.ArrayObj->Normal.Enabled);
-         break;
-      case GL_NORMAL_ARRAY_TYPE:
-         params[0] = ENUM_TO_INT64(ctx->Array.ArrayObj->Normal.Type);
-         break;
-      case GL_NORMAL_ARRAY_STRIDE:
-         params[0] = (GLint64)(ctx->Array.ArrayObj->Normal.Stride);
-         break;
-      case GL_NORMAL_ARRAY_COUNT_EXT:
-         params[0] = (GLint64)(0);
-         break;
-      case GL_COLOR_ARRAY:
-         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->Color.Enabled);
-         break;
-      case GL_COLOR_ARRAY_SIZE:
-         params[0] = (GLint64)(ctx->Array.ArrayObj->Color.Size);
-         break;
-      case GL_COLOR_ARRAY_TYPE:
-         params[0] = ENUM_TO_INT64(ctx->Array.ArrayObj->Color.Type);
-         break;
-      case GL_COLOR_ARRAY_STRIDE:
-         params[0] = (GLint64)(ctx->Array.ArrayObj->Color.Stride);
-         break;
-      case GL_COLOR_ARRAY_COUNT_EXT:
-         params[0] = (GLint64)(0);
-         break;
-      case GL_INDEX_ARRAY:
-         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->Index.Enabled);
-         break;
-      case GL_INDEX_ARRAY_TYPE:
-         params[0] = ENUM_TO_INT64(ctx->Array.ArrayObj->Index.Type);
-         break;
-      case GL_INDEX_ARRAY_STRIDE:
-         params[0] = (GLint64)(ctx->Array.ArrayObj->Index.Stride);
-         break;
-      case GL_INDEX_ARRAY_COUNT_EXT:
-         params[0] = (GLint64)(0);
-         break;
-      case GL_TEXTURE_COORD_ARRAY:
-         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].Enabled);
-         break;
-      case GL_TEXTURE_COORD_ARRAY_SIZE:
-         params[0] = (GLint64)(ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].Size);
-         break;
-      case GL_TEXTURE_COORD_ARRAY_TYPE:
-         params[0] = ENUM_TO_INT64(ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].Type);
-         break;
-      case GL_TEXTURE_COORD_ARRAY_STRIDE:
-         params[0] = (GLint64)(ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].Stride);
-         break;
-      case GL_TEXTURE_COORD_ARRAY_COUNT_EXT:
-         params[0] = (GLint64)(0);
-         break;
-      case GL_EDGE_FLAG_ARRAY:
-         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->EdgeFlag.Enabled);
-         break;
-      case GL_EDGE_FLAG_ARRAY_STRIDE:
-         params[0] = (GLint64)(ctx->Array.ArrayObj->EdgeFlag.Stride);
-         break;
-      case GL_EDGE_FLAG_ARRAY_COUNT_EXT:
-         params[0] = (GLint64)(0);
-         break;
-      case GL_MAX_TEXTURE_UNITS_ARB:
-         CHECK_EXT1(ARB_multitexture, "GetInteger64v");
-         params[0] = (GLint64)(ctx->Const.MaxTextureUnits);
-         break;
-      case GL_ACTIVE_TEXTURE_ARB:
-         CHECK_EXT1(ARB_multitexture, "GetInteger64v");
-         params[0] = (GLint64)(GL_TEXTURE0_ARB + ctx->Texture.CurrentUnit);
-         break;
-      case GL_CLIENT_ACTIVE_TEXTURE_ARB:
-         CHECK_EXT1(ARB_multitexture, "GetInteger64v");
-         params[0] = (GLint64)(GL_TEXTURE0_ARB + ctx->Array.ActiveTexture);
-         break;
-      case GL_TEXTURE_CUBE_MAP_ARB:
-         CHECK_EXT1(ARB_texture_cube_map, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(_mesa_IsEnabled(GL_TEXTURE_CUBE_MAP_ARB));
-         break;
-      case GL_TEXTURE_BINDING_CUBE_MAP_ARB:
-         CHECK_EXT1(ARB_texture_cube_map, "GetInteger64v");
-         params[0] = (GLint64)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_CUBE_INDEX]->Name);
-         break;
-      case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB:
-         CHECK_EXT1(ARB_texture_cube_map, "GetInteger64v");
-         params[0] = (GLint64)((1 << (ctx->Const.MaxCubeTextureLevels - 1)));
-         break;
-      case GL_TEXTURE_COMPRESSION_HINT_ARB:
-         params[0] = (GLint64)(ctx->Hint.TextureCompression);
-         break;
-      case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB:
-         params[0] = (GLint64)(_mesa_get_compressed_formats(ctx, NULL, GL_FALSE));
-         break;
-      case GL_COMPRESSED_TEXTURE_FORMATS_ARB:
-         {
-         GLint formats[100];
-         GLuint i, n = _mesa_get_compressed_formats(ctx, formats, GL_FALSE);
-         ASSERT(n <= 100);
-         for (i = 0; i < n; i++)
-            params[i] = ENUM_TO_INT64(formats[i]);
-         }
-         break;
-      case GL_ARRAY_ELEMENT_LOCK_FIRST_EXT:
-         CHECK_EXT1(EXT_compiled_vertex_array, "GetInteger64v");
-         params[0] = (GLint64)(ctx->Array.LockFirst);
-         break;
-      case GL_ARRAY_ELEMENT_LOCK_COUNT_EXT:
-         CHECK_EXT1(EXT_compiled_vertex_array, "GetInteger64v");
-         params[0] = (GLint64)(ctx->Array.LockCount);
-         break;
-      case GL_TRANSPOSE_COLOR_MATRIX_ARB:
-         {
-         const GLfloat *matrix = ctx->ColorMatrixStack.Top->m;
-         params[0] = IROUND64(matrix[0]);
-         params[1] = IROUND64(matrix[4]);
-         params[2] = IROUND64(matrix[8]);
-         params[3] = IROUND64(matrix[12]);
-         params[4] = IROUND64(matrix[1]);
-         params[5] = IROUND64(matrix[5]);
-         params[6] = IROUND64(matrix[9]);
-         params[7] = IROUND64(matrix[13]);
-         params[8] = IROUND64(matrix[2]);
-         params[9] = IROUND64(matrix[6]);
-         params[10] = IROUND64(matrix[10]);
-         params[11] = IROUND64(matrix[14]);
-         params[12] = IROUND64(matrix[3]);
-         params[13] = IROUND64(matrix[7]);
-         params[14] = IROUND64(matrix[11]);
-         params[15] = IROUND64(matrix[15]);
-         }
-         break;
-      case GL_TRANSPOSE_MODELVIEW_MATRIX_ARB:
-         {
-         const GLfloat *matrix = ctx->ModelviewMatrixStack.Top->m;
-         params[0] = IROUND64(matrix[0]);
-         params[1] = IROUND64(matrix[4]);
-         params[2] = IROUND64(matrix[8]);
-         params[3] = IROUND64(matrix[12]);
-         params[4] = IROUND64(matrix[1]);
-         params[5] = IROUND64(matrix[5]);
-         params[6] = IROUND64(matrix[9]);
-         params[7] = IROUND64(matrix[13]);
-         params[8] = IROUND64(matrix[2]);
-         params[9] = IROUND64(matrix[6]);
-         params[10] = IROUND64(matrix[10]);
-         params[11] = IROUND64(matrix[14]);
-         params[12] = IROUND64(matrix[3]);
-         params[13] = IROUND64(matrix[7]);
-         params[14] = IROUND64(matrix[11]);
-         params[15] = IROUND64(matrix[15]);
-         }
-         break;
-      case GL_TRANSPOSE_PROJECTION_MATRIX_ARB:
-         {
-         const GLfloat *matrix = ctx->ProjectionMatrixStack.Top->m;
-         params[0] = IROUND64(matrix[0]);
-         params[1] = IROUND64(matrix[4]);
-         params[2] = IROUND64(matrix[8]);
-         params[3] = IROUND64(matrix[12]);
-         params[4] = IROUND64(matrix[1]);
-         params[5] = IROUND64(matrix[5]);
-         params[6] = IROUND64(matrix[9]);
-         params[7] = IROUND64(matrix[13]);
-         params[8] = IROUND64(matrix[2]);
-         params[9] = IROUND64(matrix[6]);
-         params[10] = IROUND64(matrix[10]);
-         params[11] = IROUND64(matrix[14]);
-         params[12] = IROUND64(matrix[3]);
-         params[13] = IROUND64(matrix[7]);
-         params[14] = IROUND64(matrix[11]);
-         params[15] = IROUND64(matrix[15]);
-         }
-         break;
-      case GL_TRANSPOSE_TEXTURE_MATRIX_ARB:
-         {
-         const GLfloat *matrix = ctx->TextureMatrixStack[ctx->Texture.CurrentUnit].Top->m;
-         params[0] = IROUND64(matrix[0]);
-         params[1] = IROUND64(matrix[4]);
-         params[2] = IROUND64(matrix[8]);
-         params[3] = IROUND64(matrix[12]);
-         params[4] = IROUND64(matrix[1]);
-         params[5] = IROUND64(matrix[5]);
-         params[6] = IROUND64(matrix[9]);
-         params[7] = IROUND64(matrix[13]);
-         params[8] = IROUND64(matrix[2]);
-         params[9] = IROUND64(matrix[6]);
-         params[10] = IROUND64(matrix[10]);
-         params[11] = IROUND64(matrix[14]);
-         params[12] = IROUND64(matrix[3]);
-         params[13] = IROUND64(matrix[7]);
-         params[14] = IROUND64(matrix[11]);
-         params[15] = IROUND64(matrix[15]);
-         }
-         break;
-      case GL_COLOR_MATRIX_SGI:
-         {
-         const GLfloat *matrix = ctx->ColorMatrixStack.Top->m;
-         params[0] = IROUND64(matrix[0]);
-         params[1] = IROUND64(matrix[1]);
-         params[2] = IROUND64(matrix[2]);
-         params[3] = IROUND64(matrix[3]);
-         params[4] = IROUND64(matrix[4]);
-         params[5] = IROUND64(matrix[5]);
-         params[6] = IROUND64(matrix[6]);
-         params[7] = IROUND64(matrix[7]);
-         params[8] = IROUND64(matrix[8]);
-         params[9] = IROUND64(matrix[9]);
-         params[10] = IROUND64(matrix[10]);
-         params[11] = IROUND64(matrix[11]);
-         params[12] = IROUND64(matrix[12]);
-         params[13] = IROUND64(matrix[13]);
-         params[14] = IROUND64(matrix[14]);
-         params[15] = IROUND64(matrix[15]);
-         }
-         break;
-      case GL_COLOR_MATRIX_STACK_DEPTH_SGI:
-         params[0] = (GLint64)(ctx->ColorMatrixStack.Depth + 1);
-         break;
-      case GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI:
-         params[0] = (GLint64)(MAX_COLOR_STACK_DEPTH);
-         break;
-      case GL_POST_COLOR_MATRIX_RED_SCALE_SGI:
-         params[0] = IROUND64(ctx->Pixel.PostColorMatrixScale[0]);
-         break;
-      case GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI:
-         params[0] = IROUND64(ctx->Pixel.PostColorMatrixScale[1]);
-         break;
-      case GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI:
-         params[0] = IROUND64(ctx->Pixel.PostColorMatrixScale[2]);
-         break;
-      case GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI:
-         params[0] = IROUND64(ctx->Pixel.PostColorMatrixScale[3]);
-         break;
-      case GL_POST_COLOR_MATRIX_RED_BIAS_SGI:
-         params[0] = IROUND64(ctx->Pixel.PostColorMatrixBias[0]);
-         break;
-      case GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI:
-         params[0] = IROUND64(ctx->Pixel.PostColorMatrixBias[1]);
-         break;
-      case GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI:
-         params[0] = IROUND64(ctx->Pixel.PostColorMatrixBias[2]);
-         break;
-      case GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI:
-         params[0] = IROUND64(ctx->Pixel.PostColorMatrixBias[3]);
-         break;
-      case GL_CONVOLUTION_1D_EXT:
-         CHECK_EXT1(EXT_convolution, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Pixel.Convolution1DEnabled);
-         break;
-      case GL_CONVOLUTION_2D_EXT:
-         CHECK_EXT1(EXT_convolution, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Pixel.Convolution2DEnabled);
-         break;
-      case GL_SEPARABLE_2D_EXT:
-         CHECK_EXT1(EXT_convolution, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Pixel.Separable2DEnabled);
-         break;
-      case GL_POST_CONVOLUTION_RED_SCALE_EXT:
-         CHECK_EXT1(EXT_convolution, "GetInteger64v");
-         params[0] = IROUND64(ctx->Pixel.PostConvolutionScale[0]);
-         break;
-      case GL_POST_CONVOLUTION_GREEN_SCALE_EXT:
-         CHECK_EXT1(EXT_convolution, "GetInteger64v");
-         params[0] = IROUND64(ctx->Pixel.PostConvolutionScale[1]);
-         break;
-      case GL_POST_CONVOLUTION_BLUE_SCALE_EXT:
-         CHECK_EXT1(EXT_convolution, "GetInteger64v");
-         params[0] = IROUND64(ctx->Pixel.PostConvolutionScale[2]);
-         break;
-      case GL_POST_CONVOLUTION_ALPHA_SCALE_EXT:
-         CHECK_EXT1(EXT_convolution, "GetInteger64v");
-         params[0] = IROUND64(ctx->Pixel.PostConvolutionScale[3]);
-         break;
-      case GL_POST_CONVOLUTION_RED_BIAS_EXT:
-         CHECK_EXT1(EXT_convolution, "GetInteger64v");
-         params[0] = IROUND64(ctx->Pixel.PostConvolutionBias[0]);
-         break;
-      case GL_POST_CONVOLUTION_GREEN_BIAS_EXT:
-         CHECK_EXT1(EXT_convolution, "GetInteger64v");
-         params[0] = IROUND64(ctx->Pixel.PostConvolutionBias[1]);
-         break;
-      case GL_POST_CONVOLUTION_BLUE_BIAS_EXT:
-         CHECK_EXT1(EXT_convolution, "GetInteger64v");
-         params[0] = IROUND64(ctx->Pixel.PostConvolutionBias[2]);
-         break;
-      case GL_POST_CONVOLUTION_ALPHA_BIAS_EXT:
-         CHECK_EXT1(EXT_convolution, "GetInteger64v");
-         params[0] = IROUND64(ctx->Pixel.PostConvolutionBias[3]);
-         break;
-      case GL_HISTOGRAM:
-         CHECK_EXT1(EXT_histogram, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Pixel.HistogramEnabled);
-         break;
-      case GL_MINMAX:
-         CHECK_EXT1(EXT_histogram, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Pixel.MinMaxEnabled);
-         break;
-      case GL_COLOR_TABLE_SGI:
-         CHECK_EXT1(SGI_color_table, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Pixel.ColorTableEnabled[COLORTABLE_PRECONVOLUTION]);
-         break;
-      case GL_POST_CONVOLUTION_COLOR_TABLE_SGI:
-         CHECK_EXT1(SGI_color_table, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Pixel.ColorTableEnabled[COLORTABLE_POSTCONVOLUTION]);
-         break;
-      case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
-         CHECK_EXT1(SGI_color_table, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Pixel.ColorTableEnabled[COLORTABLE_POSTCOLORMATRIX]);
-         break;
-      case GL_TEXTURE_COLOR_TABLE_SGI:
-         CHECK_EXT1(SGI_texture_color_table, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Texture.Unit[ctx->Texture.CurrentUnit].ColorTableEnabled);
-         break;
-      case GL_COLOR_SUM_EXT:
-         CHECK_EXT2(EXT_secondary_color, ARB_vertex_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Fog.ColorSumEnabled);
-         break;
-      case GL_CURRENT_SECONDARY_COLOR_EXT:
-         CHECK_EXT1(EXT_secondary_color, "GetInteger64v");
-         {
-         FLUSH_CURRENT(ctx, 0);
-         params[0] = FLOAT_TO_INT64(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][0]);
-         params[1] = FLOAT_TO_INT64(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][1]);
-         params[2] = FLOAT_TO_INT64(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][2]);
-         params[3] = FLOAT_TO_INT64(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][3]);
-         }
-         break;
-      case GL_SECONDARY_COLOR_ARRAY_EXT:
-         CHECK_EXT1(EXT_secondary_color, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->SecondaryColor.Enabled);
-         break;
-      case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT:
-         CHECK_EXT1(EXT_secondary_color, "GetInteger64v");
-         params[0] = ENUM_TO_INT64(ctx->Array.ArrayObj->SecondaryColor.Type);
-         break;
-      case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT:
-         CHECK_EXT1(EXT_secondary_color, "GetInteger64v");
-         params[0] = (GLint64)(ctx->Array.ArrayObj->SecondaryColor.Stride);
-         break;
-      case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT:
-         CHECK_EXT1(EXT_secondary_color, "GetInteger64v");
-         params[0] = (GLint64)(ctx->Array.ArrayObj->SecondaryColor.Size);
-         break;
-      case GL_CURRENT_FOG_COORDINATE_EXT:
-         CHECK_EXT1(EXT_fog_coord, "GetInteger64v");
-         {
-         FLUSH_CURRENT(ctx, 0);
-         params[0] = IROUND64(ctx->Current.Attrib[VERT_ATTRIB_FOG][0]);
-         }
-         break;
-      case GL_FOG_COORDINATE_ARRAY_EXT:
-         CHECK_EXT1(EXT_fog_coord, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->FogCoord.Enabled);
-         break;
-      case GL_FOG_COORDINATE_ARRAY_TYPE_EXT:
-         CHECK_EXT1(EXT_fog_coord, "GetInteger64v");
-         params[0] = ENUM_TO_INT64(ctx->Array.ArrayObj->FogCoord.Type);
-         break;
-      case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT:
-         CHECK_EXT1(EXT_fog_coord, "GetInteger64v");
-         params[0] = (GLint64)(ctx->Array.ArrayObj->FogCoord.Stride);
-         break;
-      case GL_FOG_COORDINATE_SOURCE_EXT:
-         CHECK_EXT1(EXT_fog_coord, "GetInteger64v");
-         params[0] = ENUM_TO_INT64(ctx->Fog.FogCoordinateSource);
-         break;
-      case GL_MAX_TEXTURE_LOD_BIAS_EXT:
-         CHECK_EXT1(EXT_texture_lod_bias, "GetInteger64v");
-         params[0] = IROUND64(ctx->Const.MaxTextureLodBias);
-         break;
-      case GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT:
-         CHECK_EXT1(EXT_texture_filter_anisotropic, "GetInteger64v");
-         params[0] = IROUND64(ctx->Const.MaxTextureMaxAnisotropy);
-         break;
-      case GL_MULTISAMPLE_ARB:
-         params[0] = BOOLEAN_TO_INT64(ctx->Multisample.Enabled);
-         break;
-      case GL_SAMPLE_ALPHA_TO_COVERAGE_ARB:
-         params[0] = BOOLEAN_TO_INT64(ctx->Multisample.SampleAlphaToCoverage);
-         break;
-      case GL_SAMPLE_ALPHA_TO_ONE_ARB:
-         params[0] = BOOLEAN_TO_INT64(ctx->Multisample.SampleAlphaToOne);
-         break;
-      case GL_SAMPLE_COVERAGE_ARB:
-         params[0] = BOOLEAN_TO_INT64(ctx->Multisample.SampleCoverage);
-         break;
-      case GL_SAMPLE_COVERAGE_VALUE_ARB:
-         params[0] = IROUND64(ctx->Multisample.SampleCoverageValue);
-         break;
-      case GL_SAMPLE_COVERAGE_INVERT_ARB:
-         params[0] = BOOLEAN_TO_INT64(ctx->Multisample.SampleCoverageInvert);
-         break;
-      case GL_SAMPLE_BUFFERS_ARB:
-         params[0] = (GLint64)(ctx->DrawBuffer->Visual.sampleBuffers);
-         break;
-      case GL_SAMPLES_ARB:
-         params[0] = (GLint64)(ctx->DrawBuffer->Visual.samples);
-         break;
-      case GL_RASTER_POSITION_UNCLIPPED_IBM:
-         CHECK_EXT1(IBM_rasterpos_clip, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Transform.RasterPositionUnclipped);
-         break;
-      case GL_POINT_SPRITE_NV:
-         CHECK_EXT2(NV_point_sprite, ARB_point_sprite, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Point.PointSprite);
-         break;
-      case GL_POINT_SPRITE_R_MODE_NV:
-         CHECK_EXT1(NV_point_sprite, "GetInteger64v");
-         params[0] = ENUM_TO_INT64(ctx->Point.SpriteRMode);
-         break;
-      case GL_POINT_SPRITE_COORD_ORIGIN:
-         CHECK_EXT2(NV_point_sprite, ARB_point_sprite, "GetInteger64v");
-         params[0] = ENUM_TO_INT64(ctx->Point.SpriteOrigin);
-         break;
-      case GL_GENERATE_MIPMAP_HINT_SGIS:
-         CHECK_EXT1(SGIS_generate_mipmap, "GetInteger64v");
-         params[0] = ENUM_TO_INT64(ctx->Hint.GenerateMipmap);
-         break;
-      case GL_VERTEX_PROGRAM_BINDING_NV:
-         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
-         params[0] = (GLint64)((ctx->VertexProgram.Current ? ctx->VertexProgram.Current->Base.Id : 0));
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY0_NV:
-         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[0].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY1_NV:
-         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[1].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY2_NV:
-         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[2].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY3_NV:
-         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[3].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[4].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY5_NV:
-         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[5].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY6_NV:
-         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[6].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY7_NV:
-         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[7].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY8_NV:
-         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[8].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY9_NV:
-         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[9].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY10_NV:
-         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[10].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY11_NV:
-         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[11].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY12_NV:
-         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[12].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY13_NV:
-         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[13].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY14_NV:
-         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[14].Enabled);
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY15_NV:
-         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[15].Enabled);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB0_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[0]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB1_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[1]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB2_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[2]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB3_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[3]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB4_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[4]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB5_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[5]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB6_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[6]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB7_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[7]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB8_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[8]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB9_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[9]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB10_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[10]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB11_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[11]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB12_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[12]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB13_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[13]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB14_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[14]);
-         break;
-      case GL_MAP1_VERTEX_ATTRIB15_4_NV:
-         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[15]);
-         break;
-      case GL_FRAGMENT_PROGRAM_NV:
-         CHECK_EXT1(NV_fragment_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->FragmentProgram.Enabled);
-         break;
-      case GL_FRAGMENT_PROGRAM_BINDING_NV:
-         CHECK_EXT1(NV_fragment_program, "GetInteger64v");
-         params[0] = (GLint64)(ctx->FragmentProgram.Current ? ctx->FragmentProgram.Current->Base.Id : 0);
-         break;
-      case GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV:
-         CHECK_EXT1(NV_fragment_program, "GetInteger64v");
-         params[0] = (GLint64)(MAX_NV_FRAGMENT_PROGRAM_PARAMS);
-         break;
-      case GL_TEXTURE_RECTANGLE_NV:
-         CHECK_EXT1(NV_texture_rectangle, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(_mesa_IsEnabled(GL_TEXTURE_RECTANGLE_NV));
-         break;
-      case GL_TEXTURE_BINDING_RECTANGLE_NV:
-         CHECK_EXT1(NV_texture_rectangle, "GetInteger64v");
-         params[0] = (GLint64)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_RECT_INDEX]->Name);
-         break;
-      case GL_MAX_RECTANGLE_TEXTURE_SIZE_NV:
-         CHECK_EXT1(NV_texture_rectangle, "GetInteger64v");
-         params[0] = (GLint64)(ctx->Const.MaxTextureRectSize);
-         break;
-      case GL_STENCIL_TEST_TWO_SIDE_EXT:
-         CHECK_EXT1(EXT_stencil_two_side, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Stencil.TestTwoSide);
-         break;
-      case GL_ACTIVE_STENCIL_FACE_EXT:
-         CHECK_EXT1(EXT_stencil_two_side, "GetInteger64v");
-         params[0] = ENUM_TO_INT64(ctx->Stencil.ActiveFace ? GL_BACK : GL_FRONT);
-         break;
-      case GL_MAX_SHININESS_NV:
-         CHECK_EXT1(NV_light_max_exponent, "GetInteger64v");
-         params[0] = IROUND64(ctx->Const.MaxShininess);
-         break;
-      case GL_MAX_SPOT_EXPONENT_NV:
-         CHECK_EXT1(NV_light_max_exponent, "GetInteger64v");
-         params[0] = IROUND64(ctx->Const.MaxSpotExponent);
-         break;
-      case GL_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = (GLint64)(ctx->Array.ArrayBufferObj->Name);
-         break;
-      case GL_VERTEX_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = (GLint64)(ctx->Array.ArrayObj->Vertex.BufferObj->Name);
-         break;
-      case GL_NORMAL_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = (GLint64)(ctx->Array.ArrayObj->Normal.BufferObj->Name);
-         break;
-      case GL_COLOR_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = (GLint64)(ctx->Array.ArrayObj->Color.BufferObj->Name);
-         break;
-      case GL_INDEX_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = (GLint64)(ctx->Array.ArrayObj->Index.BufferObj->Name);
-         break;
-      case GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = (GLint64)(ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].BufferObj->Name);
-         break;
-      case GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = (GLint64)(ctx->Array.ArrayObj->EdgeFlag.BufferObj->Name);
-         break;
-      case GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = (GLint64)(ctx->Array.ArrayObj->SecondaryColor.BufferObj->Name);
-         break;
-      case GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = (GLint64)(ctx->Array.ArrayObj->FogCoord.BufferObj->Name);
-         break;
-      case GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = (GLint64)(ctx->Array.ElementArrayBufferObj->Name);
-         break;
-      case GL_PIXEL_PACK_BUFFER_BINDING_EXT:
-         CHECK_EXT1(EXT_pixel_buffer_object, "GetInteger64v");
-         params[0] = (GLint64)(ctx->Pack.BufferObj->Name);
-         break;
-      case GL_PIXEL_UNPACK_BUFFER_BINDING_EXT:
-         CHECK_EXT1(EXT_pixel_buffer_object, "GetInteger64v");
-         params[0] = (GLint64)(ctx->Unpack.BufferObj->Name);
-         break;
-      case GL_VERTEX_PROGRAM_ARB:
-         CHECK_EXT2(ARB_vertex_program, NV_vertex_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->VertexProgram.Enabled);
-         break;
-      case GL_VERTEX_PROGRAM_POINT_SIZE_ARB:
-         CHECK_EXT2(ARB_vertex_program, NV_vertex_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->VertexProgram.PointSizeEnabled);
-         break;
-      case GL_VERTEX_PROGRAM_TWO_SIDE_ARB:
-         CHECK_EXT2(ARB_vertex_program, NV_vertex_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->VertexProgram.TwoSideEnabled);
-         break;
-      case GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB:
-         CHECK_EXT3(ARB_vertex_program, ARB_fragment_program, NV_vertex_program, "GetInteger64v");
-         params[0] = (GLint64)(ctx->Const.MaxProgramMatrixStackDepth);
-         break;
-      case GL_MAX_PROGRAM_MATRICES_ARB:
-         CHECK_EXT3(ARB_vertex_program, ARB_fragment_program, NV_vertex_program, "GetInteger64v");
-         params[0] = (GLint64)(ctx->Const.MaxProgramMatrices);
-         break;
-      case GL_CURRENT_MATRIX_STACK_DEPTH_ARB:
-         CHECK_EXT3(ARB_vertex_program, ARB_fragment_program, NV_vertex_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->CurrentStack->Depth + 1);
-         break;
-      case GL_CURRENT_MATRIX_ARB:
-         CHECK_EXT3(ARB_vertex_program, ARB_fragment_program, NV_fragment_program, "GetInteger64v");
-         {
-         const GLfloat *matrix = ctx->CurrentStack->Top->m;
-         params[0] = IROUND64(matrix[0]);
-         params[1] = IROUND64(matrix[1]);
-         params[2] = IROUND64(matrix[2]);
-         params[3] = IROUND64(matrix[3]);
-         params[4] = IROUND64(matrix[4]);
-         params[5] = IROUND64(matrix[5]);
-         params[6] = IROUND64(matrix[6]);
-         params[7] = IROUND64(matrix[7]);
-         params[8] = IROUND64(matrix[8]);
-         params[9] = IROUND64(matrix[9]);
-         params[10] = IROUND64(matrix[10]);
-         params[11] = IROUND64(matrix[11]);
-         params[12] = IROUND64(matrix[12]);
-         params[13] = IROUND64(matrix[13]);
-         params[14] = IROUND64(matrix[14]);
-         params[15] = IROUND64(matrix[15]);
-         }
-         break;
-      case GL_TRANSPOSE_CURRENT_MATRIX_ARB:
-         CHECK_EXT2(ARB_vertex_program, ARB_fragment_program, "GetInteger64v");
-         {
-         const GLfloat *matrix = ctx->CurrentStack->Top->m;
-         params[0] = IROUND64(matrix[0]);
-         params[1] = IROUND64(matrix[4]);
-         params[2] = IROUND64(matrix[8]);
-         params[3] = IROUND64(matrix[12]);
-         params[4] = IROUND64(matrix[1]);
-         params[5] = IROUND64(matrix[5]);
-         params[6] = IROUND64(matrix[9]);
-         params[7] = IROUND64(matrix[13]);
-         params[8] = IROUND64(matrix[2]);
-         params[9] = IROUND64(matrix[6]);
-         params[10] = IROUND64(matrix[10]);
-         params[11] = IROUND64(matrix[14]);
-         params[12] = IROUND64(matrix[3]);
-         params[13] = IROUND64(matrix[7]);
-         params[14] = IROUND64(matrix[11]);
-         params[15] = IROUND64(matrix[15]);
-         }
-         break;
-      case GL_MAX_VERTEX_ATTRIBS_ARB:
-         CHECK_EXT1(ARB_vertex_program, "GetInteger64v");
-         params[0] = (GLint64)(ctx->Const.VertexProgram.MaxAttribs);
-         break;
-      case GL_PROGRAM_ERROR_POSITION_ARB:
-         CHECK_EXT4(NV_vertex_program, ARB_vertex_program, NV_fragment_program, ARB_fragment_program, "GetInteger64v");
-         params[0] = (GLint64)(ctx->Program.ErrorPos);
-         break;
-      case GL_FRAGMENT_PROGRAM_ARB:
-         CHECK_EXT1(ARB_fragment_program, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->FragmentProgram.Enabled);
-         break;
-      case GL_MAX_TEXTURE_COORDS_ARB:
-         CHECK_EXT2(ARB_fragment_program, NV_fragment_program, "GetInteger64v");
-         params[0] = (GLint64)(ctx->Const.MaxTextureCoordUnits);
-         break;
-      case GL_MAX_TEXTURE_IMAGE_UNITS_ARB:
-         CHECK_EXT2(ARB_fragment_program, NV_fragment_program, "GetInteger64v");
-         params[0] = (GLint64)(ctx->Const.MaxTextureImageUnits);
-         break;
-      case GL_DEPTH_BOUNDS_TEST_EXT:
-         CHECK_EXT1(EXT_depth_bounds_test, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Depth.BoundsTest);
-         break;
-      case GL_DEPTH_BOUNDS_EXT:
-         CHECK_EXT1(EXT_depth_bounds_test, "GetInteger64v");
-         params[0] = IROUND64(ctx->Depth.BoundsMin);
-         params[1] = IROUND64(ctx->Depth.BoundsMax);
-         break;
-      case GL_DEPTH_CLAMP:
-         CHECK_EXT1(ARB_depth_clamp, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Transform.DepthClamp);
-         break;
-      case GL_MAX_DRAW_BUFFERS_ARB:
-         params[0] = (GLint64)(ctx->Const.MaxDrawBuffers);
-         break;
-      case GL_DRAW_BUFFER0_ARB:
-         params[0] = ENUM_TO_INT64(ctx->DrawBuffer->ColorDrawBuffer[0]);
-         break;
-      case GL_DRAW_BUFFER1_ARB:
-         {
-         GLenum buffer;
-         if (pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glGet(GL_DRAW_BUFFERx_ARB)");
-            return;
-         }
-         buffer = ctx->DrawBuffer->ColorDrawBuffer[1];
-         params[0] = ENUM_TO_INT64(buffer);
-         }
-         break;
-      case GL_DRAW_BUFFER2_ARB:
-         {
-         GLenum buffer;
-         if (pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glGet(GL_DRAW_BUFFERx_ARB)");
-            return;
-         }
-         buffer = ctx->DrawBuffer->ColorDrawBuffer[2];
-         params[0] = ENUM_TO_INT64(buffer);
-         }
-         break;
-      case GL_DRAW_BUFFER3_ARB:
-         {
-         GLenum buffer;
-         if (pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glGet(GL_DRAW_BUFFERx_ARB)");
-            return;
-         }
-         buffer = ctx->DrawBuffer->ColorDrawBuffer[3];
-         params[0] = ENUM_TO_INT64(buffer);
-         }
-         break;
-      case GL_IMPLEMENTATION_COLOR_READ_TYPE_OES:
-         CHECK_EXT1(OES_read_format, "GetInteger64v");
-         params[0] = (GLint64)(_mesa_get_color_read_type(ctx));
-         break;
-      case GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES:
-         CHECK_EXT1(OES_read_format, "GetInteger64v");
-         params[0] = (GLint64)(_mesa_get_color_read_format(ctx));
-         break;
-      case GL_NUM_FRAGMENT_REGISTERS_ATI:
-         CHECK_EXT1(ATI_fragment_shader, "GetInteger64v");
-         params[0] = (GLint64)(6);
-         break;
-      case GL_NUM_FRAGMENT_CONSTANTS_ATI:
-         CHECK_EXT1(ATI_fragment_shader, "GetInteger64v");
-         params[0] = (GLint64)(8);
-         break;
-      case GL_NUM_PASSES_ATI:
-         CHECK_EXT1(ATI_fragment_shader, "GetInteger64v");
-         params[0] = (GLint64)(2);
-         break;
-      case GL_NUM_INSTRUCTIONS_PER_PASS_ATI:
-         CHECK_EXT1(ATI_fragment_shader, "GetInteger64v");
-         params[0] = (GLint64)(8);
-         break;
-      case GL_NUM_INSTRUCTIONS_TOTAL_ATI:
-         CHECK_EXT1(ATI_fragment_shader, "GetInteger64v");
-         params[0] = (GLint64)(16);
-         break;
-      case GL_COLOR_ALPHA_PAIRING_ATI:
-         CHECK_EXT1(ATI_fragment_shader, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(GL_TRUE);
-         break;
-      case GL_NUM_LOOPBACK_COMPONENTS_ATI:
-         CHECK_EXT1(ATI_fragment_shader, "GetInteger64v");
-         params[0] = (GLint64)(3);
-         break;
-      case GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI:
-         CHECK_EXT1(ATI_fragment_shader, "GetInteger64v");
-         params[0] = (GLint64)(3);
-         break;
-      case GL_STENCIL_BACK_FUNC:
-         params[0] = ENUM_TO_INT64(ctx->Stencil.Function[1]);
-         break;
-      case GL_STENCIL_BACK_VALUE_MASK:
-         params[0] = (GLint64)(ctx->Stencil.ValueMask[1]);
-         break;
-      case GL_STENCIL_BACK_WRITEMASK:
-         params[0] = (GLint64)(ctx->Stencil.WriteMask[1]);
-         break;
-      case GL_STENCIL_BACK_REF:
-         params[0] = (GLint64)(ctx->Stencil.Ref[1]);
-         break;
-      case GL_STENCIL_BACK_FAIL:
-         params[0] = ENUM_TO_INT64(ctx->Stencil.FailFunc[1]);
-         break;
-      case GL_STENCIL_BACK_PASS_DEPTH_FAIL:
-         params[0] = ENUM_TO_INT64(ctx->Stencil.ZFailFunc[1]);
-         break;
-      case GL_STENCIL_BACK_PASS_DEPTH_PASS:
-         params[0] = ENUM_TO_INT64(ctx->Stencil.ZPassFunc[1]);
-         break;
-      case GL_FRAMEBUFFER_BINDING_EXT:
-         CHECK_EXT1(EXT_framebuffer_object, "GetInteger64v");
-         params[0] = (GLint64)(ctx->DrawBuffer->Name);
-         break;
-      case GL_RENDERBUFFER_BINDING_EXT:
-         CHECK_EXT1(EXT_framebuffer_object, "GetInteger64v");
-         params[0] = (GLint64)(ctx->CurrentRenderbuffer ? ctx->CurrentRenderbuffer->Name : 0);
-         break;
-      case GL_MAX_COLOR_ATTACHMENTS_EXT:
-         CHECK_EXT1(EXT_framebuffer_object, "GetInteger64v");
-         params[0] = (GLint64)(ctx->Const.MaxColorAttachments);
-         break;
-      case GL_MAX_RENDERBUFFER_SIZE_EXT:
-         CHECK_EXT1(EXT_framebuffer_object, "GetInteger64v");
-         params[0] = (GLint64)(ctx->Const.MaxRenderbufferSize);
-         break;
-      case GL_READ_FRAMEBUFFER_BINDING_EXT:
-         CHECK_EXT1(EXT_framebuffer_blit, "GetInteger64v");
-         params[0] = (GLint64)(ctx->ReadBuffer->Name);
-         break;
-      case GL_PROVOKING_VERTEX_EXT:
-         CHECK_EXT1(EXT_provoking_vertex, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Light.ProvokingVertex);
-         break;
-      case GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT:
-         CHECK_EXT1(EXT_provoking_vertex, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Const.QuadsFollowProvokingVertexConvention);
-         break;
-      case GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB:
-         CHECK_EXT1(ARB_fragment_shader, "GetInteger64v");
-         params[0] = (GLint64)(ctx->Const.FragmentProgram.MaxUniformComponents);
-         break;
-      case GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB:
-         CHECK_EXT1(ARB_fragment_shader, "GetInteger64v");
-         params[0] = ENUM_TO_INT64(ctx->Hint.FragmentShaderDerivative);
-         break;
-      case GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB:
-         CHECK_EXT1(ARB_vertex_shader, "GetInteger64v");
-         params[0] = (GLint64)(ctx->Const.VertexProgram.MaxUniformComponents);
-         break;
-      case GL_MAX_VARYING_FLOATS_ARB:
-         CHECK_EXT1(ARB_vertex_shader, "GetInteger64v");
-         params[0] = (GLint64)(ctx->Const.MaxVarying * 4);
-         break;
-      case GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB:
-         CHECK_EXT1(ARB_vertex_shader, "GetInteger64v");
-         params[0] = (GLint64)(ctx->Const.MaxVertexTextureImageUnits);
-         break;
-      case GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB:
-         CHECK_EXT1(ARB_vertex_shader, "GetInteger64v");
-         params[0] = (GLint64)(ctx->Const.MaxCombinedTextureImageUnits);
-         break;
-      case GL_CURRENT_PROGRAM:
-         CHECK_EXT1(ARB_shader_objects, "GetInteger64v");
-         params[0] = (GLint64)(ctx->Shader.CurrentProgram ? ctx->Shader.CurrentProgram->Name : 0);
-         break;
-      case GL_MAX_SAMPLES:
-         CHECK_EXT1(ARB_framebuffer_object, "GetInteger64v");
-         params[0] = (GLint64)(ctx->Const.MaxSamples);
-         break;
-      case GL_VERTEX_ARRAY_BINDING_APPLE:
-         CHECK_EXT1(APPLE_vertex_array_object, "GetInteger64v");
-         params[0] = (GLint64)(ctx->Array.ArrayObj->Name);
-         break;
-      case GL_TEXTURE_CUBE_MAP_SEAMLESS:
-         CHECK_EXT1(ARB_seamless_cube_map, "GetInteger64v");
-         params[0] = BOOLEAN_TO_INT64(ctx->Texture.CubeMapSeamless);
-         break;
-      case GL_MAX_SERVER_WAIT_TIMEOUT:
-         CHECK_EXT1(ARB_sync, "GetInteger64v");
-         params[0] = ctx->Const.MaxServerWaitTimeout;
-         break;
-      case GL_NUM_EXTENSIONS:
-         params[0] = (GLint64)(_mesa_get_extension_count(ctx));
-         break;
-      case GL_MAJOR_VERSION:
-         params[0] = (GLint64)(ctx->VersionMajor);
-         break;
-      case GL_MINOR_VERSION:
-         params[0] = (GLint64)(ctx->VersionMinor);
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetInteger64v(pname=0x%x)", pname);
+   case TYPE_DOUBLEN:
+      params[0] = FLOAT_TO_INT64(((GLdouble *) p)[0]);
+      break;
+
+   case TYPE_INT_4:
+      params[3] = ((GLint *) p)[3];
+   case TYPE_INT_3:
+      params[2] = ((GLint *) p)[2];
+   case TYPE_INT_2:
+   case TYPE_ENUM_2:
+      params[1] = ((GLint *) p)[1];
+   case TYPE_INT:
+   case TYPE_ENUM:
+      params[0] = ((GLint *) p)[0];
+      break;
+
+   case TYPE_INT_N:
+      for (i = 0; i < v.value_int_n.n; i++)
+	 params[i] = INT_TO_BOOLEAN(v.value_int_n.ints[i]);
+      break;
+
+   case TYPE_INT64:
+      params[0] = ((GLint64 *) p)[0];
+      break;
+
+   case TYPE_BOOLEAN:
+      params[0] = ((GLboolean*) p)[0];
+      break;		
+
+   case TYPE_MATRIX:
+      m = *(GLmatrix **) p;
+      for (i = 0; i < 16; i++)
+	 params[i] = FLOAT_TO_INT64(m->m[i]);
+      break;
+
+   case TYPE_MATRIX_T:
+      m = *(GLmatrix **) p;
+      for (i = 0; i < 16; i++)
+	 params[i] = FLOAT_TO_INT64(m->m[transpose[i]]);
+      break;
+
+   case TYPE_BIT_0:
+   case TYPE_BIT_1:
+   case TYPE_BIT_2:
+   case TYPE_BIT_3:
+   case TYPE_BIT_4:
+   case TYPE_BIT_5:
+      shift = d->type - TYPE_BIT_0;
+      params[0] = (*(GLbitfield *) p >> shift) & 1;
+      break;
    }
 }
 #endif /* FEATURE_ARB_sync */
 
-
 void GLAPIENTRY
-_mesa_GetDoublev( GLenum pname, GLdouble *params )
+_mesa_GetDoublev(GLenum pname, GLdouble *params)
 {
-   const GLfloat magic = -1234.5F;
-   GLfloat values[16];
-   GLuint i;
+   const struct value_desc *d;
+   union value v;
+   GLmatrix *m;
+   int shift, i;
+   void *p;
 
-   if (!params)
-      return;
+   d = find_value("glGetDoublev", pname, &p, &v);
+   switch (d->type) {
+   case TYPE_INVALID:
+      break;
+   case TYPE_CONST:
+      params[0] = d->offset;
+      break;
 
-   /* Init temp array to magic numbers so we can figure out how many values
-    * are returned by the GetFloatv() call.
-    */
-   for (i = 0; i < 16; i++)
-      values[i] = magic;
+   case TYPE_FLOAT_4:
+   case TYPE_FLOATN_4:
+      params[3] = ((GLfloat *) p)[3];
+   case TYPE_FLOAT_3:
+   case TYPE_FLOATN_3:
+      params[2] = ((GLfloat *) p)[2];
+   case TYPE_FLOAT_2:
+   case TYPE_FLOATN_2:
+      params[1] = ((GLfloat *) p)[1];
+   case TYPE_FLOAT:
+   case TYPE_FLOATN:
+      params[0] = ((GLfloat *) p)[0];
+      break;
 
-   _mesa_GetFloatv(pname, values);
-   
-   for (i = 0; i < 16 && values[i] != magic; i++)
-      params[i] = (GLdouble) values[i];
+   case TYPE_DOUBLEN:
+      params[0] = ((GLdouble *) p)[0];
+      break;
+
+   case TYPE_INT_4:
+      params[3] = ((GLint *) p)[3];
+   case TYPE_INT_3:
+      params[2] = ((GLint *) p)[2];
+   case TYPE_INT_2:
+   case TYPE_ENUM_2:
+      params[1] = ((GLint *) p)[1];
+   case TYPE_INT:
+   case TYPE_ENUM:
+      params[0] = ((GLint *) p)[0];
+      break;
+
+   case TYPE_INT_N:
+      for (i = 0; i < v.value_int_n.n; i++)
+	 params[i] = v.value_int_n.ints[i];
+      break;
+
+   case TYPE_INT64:
+      params[0] = ((GLint64 *) p)[0];
+      break;
+
+   case TYPE_BOOLEAN:
+      params[0] = *(GLboolean*) p;
+      break;		
+
+   case TYPE_MATRIX:
+      m = *(GLmatrix **) p;
+      for (i = 0; i < 16; i++)
+	 params[i] = m->m[i];
+      break;
+
+   case TYPE_MATRIX_T:
+      m = *(GLmatrix **) p;
+      for (i = 0; i < 16; i++)
+	 params[i] = m->m[transpose[i]];
+      break;
+
+   case TYPE_BIT_0:
+   case TYPE_BIT_1:
+   case TYPE_BIT_2:
+   case TYPE_BIT_3:
+   case TYPE_BIT_4:
+   case TYPE_BIT_5:
+      shift = d->type - TYPE_BIT_0;
+      params[0] = (*(GLbitfield *) p >> shift) & 1;
+      break;
+   }
 }
 
-void GLAPIENTRY
-_mesa_GetBooleanIndexedv( GLenum pname, GLuint index, GLboolean *params )
+static enum value_type
+find_value_indexed(const char *func, GLenum pname, int index, union value *v)
 {
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-   if (!params)
-      return;
+   switch (pname) {
 
-   if (ctx->NewState)
-      _mesa_update_state(ctx);
+   case GL_BLEND:
+      if (index >= ctx->Const.MaxDrawBuffers)
+	 goto invalid_value;
+      if (!ctx->Extensions.EXT_draw_buffers2)
+	 goto invalid_enum;
+      v->value_int = (ctx->Color.BlendEnabled >> index) & 1;
+      return TYPE_INT;
 
-   switch (pname) {
-      case GL_BLEND:
-         CHECK_EXT1(EXT_draw_buffers2, "GetBooleanIndexedv");
-         if (index >= ctx->Const.MaxDrawBuffers) {
-            _mesa_error(ctx, GL_INVALID_VALUE, "glGetBooleanIndexedv(index=%u), index", pname);
-         }
-         params[0] = INT_TO_BOOLEAN(((ctx->Color.BlendEnabled >> index) & 1));
-         break;
-      case GL_COLOR_WRITEMASK:
-         CHECK_EXT1(EXT_draw_buffers2, "GetBooleanIndexedv");
-         if (index >= ctx->Const.MaxDrawBuffers) {
-            _mesa_error(ctx, GL_INVALID_VALUE, "glGetBooleanIndexedv(index=%u), index", pname);
-         }
-         params[0] = INT_TO_BOOLEAN(ctx->Color.ColorMask[index][RCOMP] ? 1 : 0);
-         params[1] = INT_TO_BOOLEAN(ctx->Color.ColorMask[index][GCOMP] ? 1 : 0);
-         params[2] = INT_TO_BOOLEAN(ctx->Color.ColorMask[index][BCOMP] ? 1 : 0);
-         params[3] = INT_TO_BOOLEAN(ctx->Color.ColorMask[index][ACOMP] ? 1 : 0);
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetBooleanIndexedv(pname=0x%x)", pname);
+   case GL_COLOR_WRITEMASK:
+      if (index >= ctx->Const.MaxDrawBuffers)
+	 goto invalid_value;
+      if (!ctx->Extensions.EXT_draw_buffers2)
+	 goto invalid_enum;
+      v->value_int_4[0] = ctx->Color.ColorMask[index][RCOMP] ? 1 : 0;
+      v->value_int_4[1] = ctx->Color.ColorMask[index][GCOMP] ? 1 : 0;
+      v->value_int_4[2] = ctx->Color.ColorMask[index][BCOMP] ? 1 : 0;
+      v->value_int_4[3] = ctx->Color.ColorMask[index][ACOMP] ? 1 : 0;
+      return TYPE_INT_4;
+
+   case GL_TRANSFORM_FEEDBACK_BUFFER_START:
+      if (index >= ctx->Const.MaxTransformFeedbackSeparateAttribs)
+	 goto invalid_value;
+      if (!ctx->Extensions.EXT_transform_feedback)
+	 goto invalid_enum;
+      v->value_int64 = ctx->TransformFeedback.CurrentObject->Offset[index];
+      return TYPE_INT64;
+
+   case GL_TRANSFORM_FEEDBACK_BUFFER_SIZE:
+      if (index >= ctx->Const.MaxTransformFeedbackSeparateAttribs)
+	 goto invalid_value;
+      if (!ctx->Extensions.EXT_transform_feedback)
+	 goto invalid_enum;
+      v->value_int64 = ctx->TransformFeedback.CurrentObject->Size[index];
+      return TYPE_INT64;
+
+   case GL_TRANSFORM_FEEDBACK_BUFFER_BINDING:
+      if (index >= ctx->Const.MaxTransformFeedbackSeparateAttribs)
+	 goto invalid_value;
+      if (!ctx->Extensions.EXT_transform_feedback)
+	 goto invalid_enum;
+      v->value_int = ctx->TransformFeedback.CurrentObject->Buffers[index]->Name;
+      return TYPE_INT;
    }
+
+ invalid_enum:
+   _mesa_error(ctx, GL_INVALID_ENUM, "%s(pname=%s)", func,
+               _mesa_lookup_enum_by_nr(pname));
+   return TYPE_INVALID;
+ invalid_value:
+   _mesa_error(ctx, GL_INVALID_VALUE, "%s(pname=%s)", func,
+               _mesa_lookup_enum_by_nr(pname));
+   return TYPE_INVALID;
 }
 
 void GLAPIENTRY
-_mesa_GetIntegerIndexedv( GLenum pname, GLuint index, GLint *params )
+_mesa_GetBooleanIndexedv( GLenum pname, GLuint index, GLboolean *params )
 {
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
+   union value v;
 
-   if (!params)
-      return;
+   switch (find_value_indexed("glGetBooleanIndexedv", pname, index, &v)) {
+   case TYPE_INT:
+      params[0] = INT_TO_BOOLEAN(v.value_int);
+      break;
+   case TYPE_INT_4:
+      params[0] = INT_TO_BOOLEAN(v.value_int_4[0]);
+      params[1] = INT_TO_BOOLEAN(v.value_int_4[1]);
+      params[2] = INT_TO_BOOLEAN(v.value_int_4[2]);
+      params[3] = INT_TO_BOOLEAN(v.value_int_4[3]);
+      break;
+   case TYPE_INT64:
+      params[0] = INT64_TO_BOOLEAN(v.value_int);
+      break;
+   default:
+      assert(0);
+   }
+}
 
-   if (ctx->NewState)
-      _mesa_update_state(ctx);
+void GLAPIENTRY
+_mesa_GetIntegerIndexedv( GLenum pname, GLuint index, GLint *params )
+{
+   union value v;
 
-   switch (pname) {
-      case GL_BLEND:
-         CHECK_EXT1(EXT_draw_buffers2, "GetIntegerIndexedv");
-         if (index >= ctx->Const.MaxDrawBuffers) {
-            _mesa_error(ctx, GL_INVALID_VALUE, "glGetIntegerIndexedv(index=%u), index", pname);
-         }
-         params[0] = ((ctx->Color.BlendEnabled >> index) & 1);
-         break;
-      case GL_COLOR_WRITEMASK:
-         CHECK_EXT1(EXT_draw_buffers2, "GetIntegerIndexedv");
-         if (index >= ctx->Const.MaxDrawBuffers) {
-            _mesa_error(ctx, GL_INVALID_VALUE, "glGetIntegerIndexedv(index=%u), index", pname);
-         }
-         params[0] = ctx->Color.ColorMask[index][RCOMP] ? 1 : 0;
-         params[1] = ctx->Color.ColorMask[index][GCOMP] ? 1 : 0;
-         params[2] = ctx->Color.ColorMask[index][BCOMP] ? 1 : 0;
-         params[3] = ctx->Color.ColorMask[index][ACOMP] ? 1 : 0;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetIntegerIndexedv(pname=0x%x)", pname);
+   switch (find_value_indexed("glGetIntegerIndexedv", pname, index, &v)) {
+   case TYPE_INT:
+      params[0] = v.value_int;
+      break;
+   case TYPE_INT_4:
+      params[0] = v.value_int_4[0];
+      params[1] = v.value_int_4[1];
+      params[2] = v.value_int_4[2];
+      params[3] = v.value_int_4[3];
+      break;
+   case TYPE_INT64:
+      params[0] = INT64_TO_INT(v.value_int);
+      break;
+   default:
+      assert(0);
    }
 }
 
@@ -7643,36 +2364,109 @@ _mesa_GetIntegerIndexedv( GLenum pname, GLuint index, GLint *params )
 void GLAPIENTRY
 _mesa_GetInteger64Indexedv( GLenum pname, GLuint index, GLint64 *params )
 {
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (!params)
-      return;
+   union value v;
 
-   if (ctx->NewState)
-      _mesa_update_state(ctx);
-
-   switch (pname) {
-      case GL_BLEND:
-         CHECK_EXT1(EXT_draw_buffers2, "GetInteger64Indexedv");
-         if (index >= ctx->Const.MaxDrawBuffers) {
-            _mesa_error(ctx, GL_INVALID_VALUE, "glGetInteger64Indexedv(index=%u), index", pname);
-         }
-         params[0] = (GLint64)(((ctx->Color.BlendEnabled >> index) & 1));
-         break;
-      case GL_COLOR_WRITEMASK:
-         CHECK_EXT1(EXT_draw_buffers2, "GetInteger64Indexedv");
-         if (index >= ctx->Const.MaxDrawBuffers) {
-            _mesa_error(ctx, GL_INVALID_VALUE, "glGetInteger64Indexedv(index=%u), index", pname);
-         }
-         params[0] = (GLint64)(ctx->Color.ColorMask[index][RCOMP] ? 1 : 0);
-         params[1] = (GLint64)(ctx->Color.ColorMask[index][GCOMP] ? 1 : 0);
-         params[2] = (GLint64)(ctx->Color.ColorMask[index][BCOMP] ? 1 : 0);
-         params[3] = (GLint64)(ctx->Color.ColorMask[index][ACOMP] ? 1 : 0);
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetInteger64Indexedv(pname=0x%x)", pname);
+   switch (find_value_indexed("glGetIntegerIndexedv", pname, index, &v)) {
+   case TYPE_INT:
+      params[0] = v.value_int;
+      break;
+   case TYPE_INT_4:
+      params[0] = v.value_int_4[0];
+      params[1] = v.value_int_4[1];
+      params[2] = v.value_int_4[2];
+      params[3] = v.value_int_4[3];
+      break;
+   case TYPE_INT64:
+      params[0] = v.value_int;
+      break;
+   default:
+      assert(0);
    }
 }
 #endif /* FEATURE_ARB_sync */
 
+#if FEATURE_ES1
+void GLAPIENTRY
+_mesa_GetFixedv(GLenum pname, GLfixed *params)
+{
+   const struct value_desc *d;
+   union value v;
+   GLmatrix *m;
+   int shift, i;
+   void *p;
+
+   d = find_value("glGetDoublev", pname, &p, &v);
+   switch (d->type) {
+   case TYPE_INVALID:
+      break;
+   case TYPE_CONST:
+      params[0] = INT_TO_FIXED(d->offset);
+      break;
+
+   case TYPE_FLOAT_4:
+   case TYPE_FLOATN_4:
+      params[3] = FLOAT_TO_FIXED(((GLfloat *) p)[3]);
+   case TYPE_FLOAT_3:
+   case TYPE_FLOATN_3:
+      params[2] = FLOAT_TO_FIXED(((GLfloat *) p)[2]);
+   case TYPE_FLOAT_2:
+   case TYPE_FLOATN_2:
+      params[1] = FLOAT_TO_FIXED(((GLfloat *) p)[1]);
+   case TYPE_FLOAT:
+   case TYPE_FLOATN:
+      params[0] = FLOAT_TO_FIXED(((GLfloat *) p)[0]);
+      break;
+
+   case TYPE_DOUBLEN:
+      params[0] = FLOAT_TO_FIXED(((GLdouble *) p)[0]);
+      break;
+
+   case TYPE_INT_4:
+      params[3] = INT_TO_FIXED(((GLint *) p)[3]);
+   case TYPE_INT_3:
+      params[2] = INT_TO_FIXED(((GLint *) p)[2]);
+   case TYPE_INT_2:
+   case TYPE_ENUM_2:
+      params[1] = INT_TO_FIXED(((GLint *) p)[1]);
+   case TYPE_INT:
+   case TYPE_ENUM:
+      params[0] = INT_TO_FIXED(((GLint *) p)[0]);
+      break;
+
+   case TYPE_INT_N:
+      for (i = 0; i < v.value_int_n.n; i++)
+	 params[i] = INT_TO_FIXED(v.value_int_n.ints[i]);
+      break;
+
+   case TYPE_INT64:
+      params[0] = ((GLint64 *) p)[0];
+      break;
+
+   case TYPE_BOOLEAN:
+      params[0] = BOOLEAN_TO_FIXED(((GLboolean*) p)[0]);
+      break;		
+
+   case TYPE_MATRIX:
+      m = *(GLmatrix **) p;
+      for (i = 0; i < 16; i++)
+	 params[i] = FLOAT_TO_FIXED(m->m[i]);
+      break;
+
+   case TYPE_MATRIX_T:
+      m = *(GLmatrix **) p;
+      for (i = 0; i < 16; i++)
+	 params[i] = FLOAT_TO_FIXED(m->m[transpose[i]]);
+      break;
+
+   case TYPE_BIT_0:
+   case TYPE_BIT_1:
+   case TYPE_BIT_2:
+   case TYPE_BIT_3:
+   case TYPE_BIT_4:
+   case TYPE_BIT_5:
+      shift = d->type - TYPE_BIT_0;
+      params[0] = BOOLEAN_TO_FIXED((*(GLbitfield *) p >> shift) & 1);
+      break;
+   }
+}
+#endif
diff --git a/mesalib/src/mesa/main/get.h b/mesalib/src/mesa/main/get.h
index cc426fc0f..99a004b71 100644
--- a/mesalib/src/mesa/main/get.h
+++ b/mesalib/src/mesa/main/get.h
@@ -32,7 +32,7 @@
 #define GET_H
 
 
-#include "mtypes.h"
+#include "glheader.h"
 
 
 extern void GLAPIENTRY
@@ -51,6 +51,9 @@ extern void GLAPIENTRY
 _mesa_GetInteger64v( GLenum pname, GLint64 *params );
 
 extern void GLAPIENTRY
+_mesa_GetFixedv(GLenum pname, GLfixed *params);
+
+extern void GLAPIENTRY
 _mesa_GetBooleanIndexedv( GLenum pname, GLuint index, GLboolean *params );
 
 extern void GLAPIENTRY
diff --git a/mesalib/src/mesa/main/getstring.c b/mesalib/src/mesa/main/getstring.c
index 51dd5f779..3910047fb 100644
--- a/mesalib/src/mesa/main/getstring.c
+++ b/mesalib/src/mesa/main/getstring.c
@@ -32,6 +32,46 @@
 
 
 /**
+ * Return the string for a glGetString(GL_SHADING_LANGUAGE_VERSION) query.
+ */
+static const GLubyte *
+shading_language_version(GLcontext *ctx)
+{
+   switch (ctx->API) {
+   case API_OPENGL:
+      if (!ctx->Extensions.ARB_shader_objects) {
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetString");
+         return (const GLubyte *) 0;
+      }
+
+      switch (ctx->Const.GLSLVersion) {
+      case 110:
+         return (const GLubyte *) "1.10";
+      case 120:
+         return (const GLubyte *) "1.20";
+      case 130:
+         return (const GLubyte *) "1.30";
+      default:
+         _mesa_problem(ctx,
+                       "Invalid GLSL version in shading_language_version()");
+         return (const GLubyte *) 0;
+      }
+      break;
+
+   case API_OPENGLES2:
+      return (const GLubyte *) "OpenGL ES GLSL ES 1.0.16";
+
+   case API_OPENGLES:
+      /* fall-through */
+
+   default:
+      _mesa_problem(ctx, "Unexpected API value in shading_language_version()");
+      return (const GLubyte *) 0;
+   }
+}
+
+
+/**
  * Query string-valued state.  The return value should _not_ be freed by
  * the caller.
  *
@@ -71,16 +111,10 @@ _mesa_GetString( GLenum name )
       case GL_VERSION:
          return (const GLubyte *) ctx->VersionString;
       case GL_EXTENSIONS:
-         if (!ctx->Extensions.String)
-            ctx->Extensions.String = _mesa_make_extension_string(ctx);
          return (const GLubyte *) ctx->Extensions.String;
-#if FEATURE_ARB_shading_language_100
-      case GL_SHADING_LANGUAGE_VERSION_ARB:
-         if (ctx->Extensions.ARB_shading_language_120)
-            return (const GLubyte *) "1.20";
-         else if (ctx->Extensions.ARB_shading_language_100)
-            return (const GLubyte *) "1.10";
-         goto error;
+#if FEATURE_ARB_shading_language_100 || FEATURE_ES2
+      case GL_SHADING_LANGUAGE_VERSION:
+	 return shading_language_version(ctx);
 #endif
 #if FEATURE_NV_fragment_program || FEATURE_ARB_fragment_program || \
     FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program
@@ -93,9 +127,6 @@ _mesa_GetString( GLenum name )
          }
          /* FALL-THROUGH */
 #endif
-#if FEATURE_ARB_shading_language_100
-      error:
-#endif
       default:
          _mesa_error( ctx, GL_INVALID_ENUM, "glGetString" );
          return (const GLubyte *) 0;
@@ -155,10 +186,6 @@ _mesa_GetPointerv( GLenum pname, GLvoid **params )
    if (MESA_VERBOSE & VERBOSE_API)
       _mesa_debug(ctx, "glGetPointerv %s\n", _mesa_lookup_enum_by_nr(pname));
 
-   if (ctx->Driver.GetPointerv
-       && (*ctx->Driver.GetPointerv)(ctx, pname, params))
-      return;
-
    switch (pname) {
       case GL_VERTEX_ARRAY_POINTER:
          *params = (GLvoid *) ctx->Array.ArrayObj->Vertex.Ptr;
diff --git a/mesalib/src/mesa/main/glheader.h b/mesalib/src/mesa/main/glheader.h
index 77544c88c..45f7b55ad 100644
--- a/mesalib/src/mesa/main/glheader.h
+++ b/mesalib/src/mesa/main/glheader.h
@@ -55,11 +55,11 @@
 #include "GL/internal/glcore.h"
 
 
-#ifndef GL_FIXED
-#define GL_FIXED 0x140C
+/**
+ * GL_FIXED is defined in glext.h version 64 but these typedefs aren't (yet).
+ */
 typedef int GLfixed;
 typedef int GLclampx;
-#endif
 
 
 #ifndef GL_OES_EGL_image
@@ -85,11 +85,61 @@ typedef void *GLeglImageOES;
 #define GL_PROGRAM_BINARY_LENGTH_OES 0x8741
 #endif
 
+/* GLES 2.0 tokens */
+#ifndef GL_RGB565
+#define GL_RGB565 0x8D62
+#endif
+
+#ifndef GL_TEXTURE_GEN_STR_OES
+#define GL_TEXTURE_GEN_STR_OES                                  0x8D60
+#endif
+
+#ifndef GL_OES_compressed_paletted_texture
+#define GL_PALETTE4_RGB8_OES                                    0x8B90
+#define GL_PALETTE4_RGBA8_OES                                   0x8B91
+#define GL_PALETTE4_R5_G6_B5_OES                                0x8B92
+#define GL_PALETTE4_RGBA4_OES                                   0x8B93
+#define GL_PALETTE4_RGB5_A1_OES                                 0x8B94
+#define GL_PALETTE8_RGB8_OES                                    0x8B95
+#define GL_PALETTE8_RGBA8_OES                                   0x8B96
+#define GL_PALETTE8_R5_G6_B5_OES                                0x8B97
+#define GL_PALETTE8_RGBA4_OES                                   0x8B98
+#define GL_PALETTE8_RGB5_A1_OES                                 0x8B99
+#endif
+
+#ifndef GL_OES_matrix_get
+#define GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES               0x898D
+#define GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES              0x898E
+#define GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES                 0x898F
+#endif
+
+#ifndef GL_ES_VERSION_2_0
+#define GL_SHADER_BINARY_FORMATS            0x8DF8
+#define GL_NUM_SHADER_BINARY_FORMATS        0x8DF9
+#define GL_SHADER_COMPILER                  0x8DFA
+#define GL_MAX_VERTEX_UNIFORM_VECTORS       0x8DFB
+#define GL_MAX_VARYING_VECTORS              0x8DFC
+#define GL_MAX_FRAGMENT_UNIFORM_VECTORS     0x8DFD
+#endif
+
+
 
 /**
- * Special, internal token
+ * Internal token to represent a GLSL shader program (a collection of
+ * one or more shaders that get linked together).  Note that GLSL
+ * shaders and shader programs share one name space (one hash table)
+ * so we need a value that's different from any of the
+ * GL_VERTEX/FRAGMENT/GEOMETRY_PROGRAM tokens.
  */
 #define GL_SHADER_PROGRAM_MESA 0x9999
 
 
+/**
+ * Internal token for geometry programs.
+ * Use the value for GL_GEOMETRY_PROGRAM_NV for now.
+ */
+#define MESA_GEOMETRY_PROGRAM 0x8c26
+
+
+
 #endif /* GLHEADER_H */
diff --git a/mesalib/src/mesa/main/histogram.c b/mesalib/src/mesa/main/histogram.c
index 3a65bb192..4e482bcd5 100644
--- a/mesalib/src/mesa/main/histogram.c
+++ b/mesalib/src/mesa/main/histogram.c
@@ -29,6 +29,7 @@
 #include "context.h"
 #include "image.h"
 #include "histogram.h"
+#include "macros.h"
 #include "main/dispatch.h"
 
 
diff --git a/mesalib/src/mesa/main/image.c b/mesalib/src/mesa/main/image.c
index dc8d97728..86aa6d0d7 100644
--- a/mesalib/src/mesa/main/image.c
+++ b/mesalib/src/mesa/main/image.c
@@ -32,7 +32,6 @@
 
 #include "glheader.h"
 #include "colormac.h"
-#include "context.h"
 #include "enums.h"
 #include "image.h"
 #include "imports.h"
@@ -274,17 +273,25 @@ _mesa_components_in_format( GLenum format )
       case GL_STENCIL_INDEX:
       case GL_DEPTH_COMPONENT:
       case GL_RED:
+      case GL_RED_INTEGER_EXT:
       case GL_GREEN:
+      case GL_GREEN_INTEGER_EXT:
       case GL_BLUE:
+      case GL_BLUE_INTEGER_EXT:
       case GL_ALPHA:
+      case GL_ALPHA_INTEGER_EXT:
       case GL_LUMINANCE:
+      case GL_LUMINANCE_INTEGER_EXT:
       case GL_INTENSITY:
          return 1;
       case GL_LUMINANCE_ALPHA:
+      case GL_LUMINANCE_ALPHA_INTEGER_EXT:
 	 return 2;
       case GL_RGB:
+      case GL_RGB_INTEGER_EXT:
 	 return 3;
       case GL_RGBA:
+      case GL_RGBA_INTEGER_EXT:
 	 return 4;
       case GL_BGR:
 	 return 3;
@@ -523,6 +530,28 @@ _mesa_is_legal_format_and_type( GLcontext *ctx, GLenum format, GLenum type )
             default:
                return GL_FALSE;
          }
+      case GL_RED_INTEGER_EXT:
+      case GL_GREEN_INTEGER_EXT:
+      case GL_BLUE_INTEGER_EXT:
+      case GL_ALPHA_INTEGER_EXT:
+      case GL_RGB_INTEGER_EXT:
+      case GL_RGBA_INTEGER_EXT:
+      case GL_BGR_INTEGER_EXT:
+      case GL_BGRA_INTEGER_EXT:
+      case GL_LUMINANCE_INTEGER_EXT:
+      case GL_LUMINANCE_ALPHA_INTEGER_EXT:
+         switch (type) {
+            case GL_BYTE:
+            case GL_UNSIGNED_BYTE:
+            case GL_SHORT:
+            case GL_UNSIGNED_SHORT:
+            case GL_INT:
+            case GL_UNSIGNED_INT:
+               return ctx->Extensions.EXT_texture_integer;
+            default:
+               return GL_FALSE;
+         }
+
       default:
          ; /* fall-through */
    }
@@ -734,6 +763,32 @@ _mesa_is_depthstencil_format(GLenum format)
    }
 }
 
+
+/**
+ * Test if the given image format is a depth or stencil format.
+ */
+GLboolean
+_mesa_is_depth_or_stencil_format(GLenum format)
+{
+   switch (format) {
+      case GL_DEPTH_COMPONENT:
+      case GL_DEPTH_COMPONENT16:
+      case GL_DEPTH_COMPONENT24:
+      case GL_DEPTH_COMPONENT32:
+      case GL_STENCIL_INDEX:
+      case GL_STENCIL_INDEX1_EXT:
+      case GL_STENCIL_INDEX4_EXT:
+      case GL_STENCIL_INDEX8_EXT:
+      case GL_STENCIL_INDEX16_EXT:
+      case GL_DEPTH_STENCIL_EXT:
+      case GL_DEPTH24_STENCIL8_EXT:
+         return GL_TRUE;
+      default:
+         return GL_FALSE;
+   }
+}
+
+
 /**
  * Test if the given image format is a dudv format.
  */
@@ -751,6 +806,64 @@ _mesa_is_dudv_format(GLenum format)
 
 
 /**
+ * Test if the given format is an integer (non-normalized) format.
+ */
+GLboolean
+_mesa_is_integer_format(GLenum format)
+{
+   switch (format) {
+   case GL_RED_INTEGER_EXT:
+   case GL_GREEN_INTEGER_EXT:
+   case GL_BLUE_INTEGER_EXT:
+   case GL_ALPHA_INTEGER_EXT:
+   case GL_RGB_INTEGER_EXT:
+   case GL_RGBA_INTEGER_EXT:
+   case GL_BGR_INTEGER_EXT:
+   case GL_BGRA_INTEGER_EXT:
+   case GL_LUMINANCE_INTEGER_EXT:
+   case GL_LUMINANCE_ALPHA_INTEGER_EXT:
+      return GL_TRUE;
+   default:
+      return GL_FALSE;
+   }
+}
+
+
+/**
+ * Test if an image format is a supported compressed format.
+ * \param format the internal format token provided by the user.
+ * \return GL_TRUE if compressed, GL_FALSE if uncompressed
+ */
+GLboolean
+_mesa_is_compressed_format(GLcontext *ctx, GLenum format)
+{
+   switch (format) {
+   case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
+   case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
+   case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
+   case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
+      return ctx->Extensions.EXT_texture_compression_s3tc;
+   case GL_RGB_S3TC:
+   case GL_RGB4_S3TC:
+   case GL_RGBA_S3TC:
+   case GL_RGBA4_S3TC:
+      return ctx->Extensions.S3_s3tc;
+   case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:
+   case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
+   case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:
+   case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:
+      return ctx->Extensions.EXT_texture_sRGB
+         && ctx->Extensions.EXT_texture_compression_s3tc;
+   case GL_COMPRESSED_RGB_FXT1_3DFX:
+   case GL_COMPRESSED_RGBA_FXT1_3DFX:
+      return ctx->Extensions.TDFX_texture_compression_FXT1;
+   default:
+      return GL_FALSE;
+   }
+}
+
+
+/**
  * Return the address of a specific pixel in an image (1D, 2D or 3D).
  *
  * Pixel unpacking/packing parameters are observed according to \p packing.
@@ -3215,6 +3328,8 @@ extract_float_rgba(GLuint n, GLfloat rgba[][4],
    GLint redIndex, greenIndex, blueIndex, alphaIndex;
    GLint stride;
    GLint rComp, bComp, gComp, aComp;
+   GLboolean intFormat;
+   GLfloat rs = 1.0f, gs = 1.0f, bs = 1.0f, as = 1.0f; /* scale factors */
 
    ASSERT(srcFormat == GL_RED ||
           srcFormat == GL_GREEN ||
@@ -3229,7 +3344,17 @@ extract_float_rgba(GLuint n, GLfloat rgba[][4],
           srcFormat == GL_BGRA ||
           srcFormat == GL_ABGR_EXT ||
           srcFormat == GL_DU8DV8_ATI ||
-          srcFormat == GL_DUDV_ATI);
+          srcFormat == GL_DUDV_ATI ||
+          srcFormat == GL_RED_INTEGER_EXT ||
+          srcFormat == GL_GREEN_INTEGER_EXT ||
+          srcFormat == GL_BLUE_INTEGER_EXT ||
+          srcFormat == GL_ALPHA_INTEGER_EXT ||
+          srcFormat == GL_RGB_INTEGER_EXT ||
+          srcFormat == GL_RGBA_INTEGER_EXT ||
+          srcFormat == GL_BGR_INTEGER_EXT ||
+          srcFormat == GL_BGRA_INTEGER_EXT ||
+          srcFormat == GL_LUMINANCE_INTEGER_EXT ||
+          srcFormat == GL_LUMINANCE_ALPHA_INTEGER_EXT);
 
    ASSERT(srcType == GL_UNSIGNED_BYTE ||
           srcType == GL_BYTE ||
@@ -3256,31 +3381,37 @@ extract_float_rgba(GLuint n, GLfloat rgba[][4],
 
    switch (srcFormat) {
       case GL_RED:
+      case GL_RED_INTEGER_EXT:
          redIndex = 0;
          greenIndex = blueIndex = alphaIndex = -1;
          stride = 1;
          break;
       case GL_GREEN:
+      case GL_GREEN_INTEGER_EXT:
          greenIndex = 0;
          redIndex = blueIndex = alphaIndex = -1;
          stride = 1;
          break;
       case GL_BLUE:
+      case GL_BLUE_INTEGER_EXT:
          blueIndex = 0;
          redIndex = greenIndex = alphaIndex = -1;
          stride = 1;
          break;
       case GL_ALPHA:
+      case GL_ALPHA_INTEGER_EXT:
          redIndex = greenIndex = blueIndex = -1;
          alphaIndex = 0;
          stride = 1;
          break;
       case GL_LUMINANCE:
+      case GL_LUMINANCE_INTEGER_EXT:
          redIndex = greenIndex = blueIndex = 0;
          alphaIndex = -1;
          stride = 1;
          break;
       case GL_LUMINANCE_ALPHA:
+      case GL_LUMINANCE_ALPHA_INTEGER_EXT:
          redIndex = greenIndex = blueIndex = 0;
          alphaIndex = 1;
          stride = 2;
@@ -3290,6 +3421,7 @@ extract_float_rgba(GLuint n, GLfloat rgba[][4],
          stride = 1;
          break;
       case GL_RGB:
+      case GL_RGB_INTEGER:
          redIndex = 0;
          greenIndex = 1;
          blueIndex = 2;
@@ -3312,6 +3444,7 @@ extract_float_rgba(GLuint n, GLfloat rgba[][4],
          stride = 3;
          break;
       case GL_RGBA:
+      case GL_RGBA_INTEGER:
          redIndex = 0;
          greenIndex = 1;
          blueIndex = 2;
@@ -3358,12 +3491,20 @@ extract_float_rgba(GLuint n, GLfloat rgba[][4],
          return;
    }
 
+   intFormat = _mesa_is_integer_format(srcFormat);
 
-#define PROCESS(INDEX, CHANNEL, DEFAULT, TYPE, CONVERSION)		\
+#define PROCESS(INDEX, CHANNEL, DEFAULT, DEFAULT_INT, TYPE, CONVERSION) \
    if ((INDEX) < 0) {							\
       GLuint i;								\
-      for (i = 0; i < n; i++) {						\
-         rgba[i][CHANNEL] = DEFAULT;					\
+      if (intFormat) {							\
+         for (i = 0; i < n; i++) {					\
+            rgba[i][CHANNEL] = DEFAULT_INT;				\
+         }								\
+      }									\
+      else {								\
+         for (i = 0; i < n; i++) {					\
+            rgba[i][CHANNEL] = DEFAULT;					\
+         }								\
       }									\
    }									\
    else if (swapBytes) {						\
@@ -3377,77 +3518,93 @@ extract_float_rgba(GLuint n, GLfloat rgba[][4],
          else if (sizeof(TYPE) == 4) {					\
             SWAP4BYTE(value);						\
          }								\
-         rgba[i][CHANNEL] = (GLfloat) CONVERSION(value);		\
+         if (intFormat)							\
+            rgba[i][CHANNEL] = (GLfloat) value;				\
+         else								\
+            rgba[i][CHANNEL] = (GLfloat) CONVERSION(value);		\
          s += stride;							\
       }									\
    }									\
    else {								\
       const TYPE *s = (const TYPE *) src;				\
       GLuint i;								\
-      for (i = 0; i < n; i++) {						\
-         rgba[i][CHANNEL] = (GLfloat) CONVERSION(s[INDEX]);		\
-         s += stride;							\
+      if (intFormat) {							\
+         for (i = 0; i < n; i++) {					\
+            rgba[i][CHANNEL] = (GLfloat) s[INDEX];			\
+            s += stride;						\
+         }								\
+      }									\
+      else {								\
+         for (i = 0; i < n; i++) {					\
+            rgba[i][CHANNEL] = (GLfloat) CONVERSION(s[INDEX]);		\
+            s += stride;						\
+         }								\
       }									\
    }
 
    switch (srcType) {
       case GL_UNSIGNED_BYTE:
-         PROCESS(redIndex,   RCOMP, 0.0F, GLubyte, UBYTE_TO_FLOAT);
-         PROCESS(greenIndex, GCOMP, 0.0F, GLubyte, UBYTE_TO_FLOAT);
-         PROCESS(blueIndex,  BCOMP, 0.0F, GLubyte, UBYTE_TO_FLOAT);
-         PROCESS(alphaIndex, ACOMP, 1.0F, GLubyte, UBYTE_TO_FLOAT);
+         PROCESS(redIndex,   RCOMP, 0.0F,   0, GLubyte, UBYTE_TO_FLOAT);
+         PROCESS(greenIndex, GCOMP, 0.0F,   0, GLubyte, UBYTE_TO_FLOAT);
+         PROCESS(blueIndex,  BCOMP, 0.0F,   0, GLubyte, UBYTE_TO_FLOAT);
+         PROCESS(alphaIndex, ACOMP, 1.0F, 255, GLubyte, UBYTE_TO_FLOAT);
          break;
       case GL_BYTE:
-         PROCESS(redIndex,   RCOMP, 0.0F, GLbyte, BYTE_TO_FLOAT);
-         PROCESS(greenIndex, GCOMP, 0.0F, GLbyte, BYTE_TO_FLOAT);
-         PROCESS(blueIndex,  BCOMP, 0.0F, GLbyte, BYTE_TO_FLOAT);
-         PROCESS(alphaIndex, ACOMP, 1.0F, GLbyte, BYTE_TO_FLOAT);
+         PROCESS(redIndex,   RCOMP, 0.0F,   0, GLbyte, BYTE_TO_FLOAT);
+         PROCESS(greenIndex, GCOMP, 0.0F,   0, GLbyte, BYTE_TO_FLOAT);
+         PROCESS(blueIndex,  BCOMP, 0.0F,   0, GLbyte, BYTE_TO_FLOAT);
+         PROCESS(alphaIndex, ACOMP, 1.0F, 127, GLbyte, BYTE_TO_FLOAT);
          break;
       case GL_UNSIGNED_SHORT:
-         PROCESS(redIndex,   RCOMP, 0.0F, GLushort, USHORT_TO_FLOAT);
-         PROCESS(greenIndex, GCOMP, 0.0F, GLushort, USHORT_TO_FLOAT);
-         PROCESS(blueIndex,  BCOMP, 0.0F, GLushort, USHORT_TO_FLOAT);
-         PROCESS(alphaIndex, ACOMP, 1.0F, GLushort, USHORT_TO_FLOAT);
+         PROCESS(redIndex,   RCOMP, 0.0F,      0, GLushort, USHORT_TO_FLOAT);
+         PROCESS(greenIndex, GCOMP, 0.0F,      0, GLushort, USHORT_TO_FLOAT);
+         PROCESS(blueIndex,  BCOMP, 0.0F,      0, GLushort, USHORT_TO_FLOAT);
+         PROCESS(alphaIndex, ACOMP, 1.0F, 0xffff, GLushort, USHORT_TO_FLOAT);
          break;
       case GL_SHORT:
-         PROCESS(redIndex,   RCOMP, 0.0F, GLshort, SHORT_TO_FLOAT);
-         PROCESS(greenIndex, GCOMP, 0.0F, GLshort, SHORT_TO_FLOAT);
-         PROCESS(blueIndex,  BCOMP, 0.0F, GLshort, SHORT_TO_FLOAT);
-         PROCESS(alphaIndex, ACOMP, 1.0F, GLshort, SHORT_TO_FLOAT);
+         PROCESS(redIndex,   RCOMP, 0.0F,     0, GLshort, SHORT_TO_FLOAT);
+         PROCESS(greenIndex, GCOMP, 0.0F,     0, GLshort, SHORT_TO_FLOAT);
+         PROCESS(blueIndex,  BCOMP, 0.0F,     0, GLshort, SHORT_TO_FLOAT);
+         PROCESS(alphaIndex, ACOMP, 1.0F, 32767, GLshort, SHORT_TO_FLOAT);
          break;
       case GL_UNSIGNED_INT:
-         PROCESS(redIndex,   RCOMP, 0.0F, GLuint, UINT_TO_FLOAT);
-         PROCESS(greenIndex, GCOMP, 0.0F, GLuint, UINT_TO_FLOAT);
-         PROCESS(blueIndex,  BCOMP, 0.0F, GLuint, UINT_TO_FLOAT);
-         PROCESS(alphaIndex, ACOMP, 1.0F, GLuint, UINT_TO_FLOAT);
+         PROCESS(redIndex,   RCOMP, 0.0F,          0, GLuint, UINT_TO_FLOAT);
+         PROCESS(greenIndex, GCOMP, 0.0F,          0, GLuint, UINT_TO_FLOAT);
+         PROCESS(blueIndex,  BCOMP, 0.0F,          0, GLuint, UINT_TO_FLOAT);
+         PROCESS(alphaIndex, ACOMP, 1.0F, 0xffffffff, GLuint, UINT_TO_FLOAT);
          break;
       case GL_INT:
-         PROCESS(redIndex,   RCOMP, 0.0F, GLint, INT_TO_FLOAT);
-         PROCESS(greenIndex, GCOMP, 0.0F, GLint, INT_TO_FLOAT);
-         PROCESS(blueIndex,  BCOMP, 0.0F, GLint, INT_TO_FLOAT);
-         PROCESS(alphaIndex, ACOMP, 1.0F, GLint, INT_TO_FLOAT);
+         PROCESS(redIndex,   RCOMP, 0.0F,          0, GLint, INT_TO_FLOAT);
+         PROCESS(greenIndex, GCOMP, 0.0F,          0, GLint, INT_TO_FLOAT);
+         PROCESS(blueIndex,  BCOMP, 0.0F,          0, GLint, INT_TO_FLOAT);
+         PROCESS(alphaIndex, ACOMP, 1.0F, 2147483647, GLint, INT_TO_FLOAT);
          break;
       case GL_FLOAT:
-         PROCESS(redIndex,   RCOMP, 0.0F, GLfloat, (GLfloat));
-         PROCESS(greenIndex, GCOMP, 0.0F, GLfloat, (GLfloat));
-         PROCESS(blueIndex,  BCOMP, 0.0F, GLfloat, (GLfloat));
-         PROCESS(alphaIndex, ACOMP, 1.0F, GLfloat, (GLfloat));
+         PROCESS(redIndex,   RCOMP, 0.0F, 0.0F, GLfloat, (GLfloat));
+         PROCESS(greenIndex, GCOMP, 0.0F, 0.0F, GLfloat, (GLfloat));
+         PROCESS(blueIndex,  BCOMP, 0.0F, 0.0F, GLfloat, (GLfloat));
+         PROCESS(alphaIndex, ACOMP, 1.0F, 1.0F, GLfloat, (GLfloat));
          break;
       case GL_HALF_FLOAT_ARB:
-         PROCESS(redIndex,   RCOMP, 0.0F, GLhalfARB, _mesa_half_to_float);
-         PROCESS(greenIndex, GCOMP, 0.0F, GLhalfARB, _mesa_half_to_float);
-         PROCESS(blueIndex,  BCOMP, 0.0F, GLhalfARB, _mesa_half_to_float);
-         PROCESS(alphaIndex, ACOMP, 1.0F, GLhalfARB, _mesa_half_to_float);
+         PROCESS(redIndex,   RCOMP, 0.0F, 0.0F, GLhalfARB, _mesa_half_to_float);
+         PROCESS(greenIndex, GCOMP, 0.0F, 0.0F, GLhalfARB, _mesa_half_to_float);
+         PROCESS(blueIndex,  BCOMP, 0.0F, 0.0F, GLhalfARB, _mesa_half_to_float);
+         PROCESS(alphaIndex, ACOMP, 1.0F, 1.0F, GLhalfARB, _mesa_half_to_float);
          break;
       case GL_UNSIGNED_BYTE_3_3_2:
          {
             const GLubyte *ubsrc = (const GLubyte *) src;
             GLuint i;
+            if (!intFormat) {
+               rs = 1.0F / 7.0F;
+               gs = 1.0F / 7.0F;
+               bs = 1.0F / 3.0F;
+            }
             for (i = 0; i < n; i ++) {
                GLubyte p = ubsrc[i];
-               rgba[i][rComp] = ((p >> 5)      ) * (1.0F / 7.0F);
-               rgba[i][gComp] = ((p >> 2) & 0x7) * (1.0F / 7.0F);
-               rgba[i][bComp] = ((p     ) & 0x3) * (1.0F / 3.0F);
+               rgba[i][rComp] = ((p >> 5)      ) * rs;
+               rgba[i][gComp] = ((p >> 2) & 0x7) * gs;
+               rgba[i][bComp] = ((p     ) & 0x3) * bs;
                rgba[i][aComp] = 1.0F;
             }
          }
@@ -3456,25 +3613,35 @@ extract_float_rgba(GLuint n, GLfloat rgba[][4],
          {
             const GLubyte *ubsrc = (const GLubyte *) src;
             GLuint i;
+            if (!intFormat) {
+               rs = 1.0F / 7.0F;
+               gs = 1.0F / 7.0F;
+               bs = 1.0F / 3.0F;
+            }
             for (i = 0; i < n; i ++) {
                GLubyte p = ubsrc[i];
-               rgba[i][rComp] = ((p     ) & 0x7) * (1.0F / 7.0F);
-               rgba[i][gComp] = ((p >> 3) & 0x7) * (1.0F / 7.0F);
-               rgba[i][bComp] = ((p >> 6)      ) * (1.0F / 3.0F);
+               rgba[i][rComp] = ((p     ) & 0x7) * rs;
+               rgba[i][gComp] = ((p >> 3) & 0x7) * gs;
+               rgba[i][bComp] = ((p >> 6)      ) * bs;
                rgba[i][aComp] = 1.0F;
             }
          }
          break;
       case GL_UNSIGNED_SHORT_5_6_5:
+         if (!intFormat) {
+            rs = 1.0F / 31.0F;
+            gs = 1.0F / 63.0F;
+            bs = 1.0F / 31.0F;
+         }
          if (swapBytes) {
             const GLushort *ussrc = (const GLushort *) src;
             GLuint i;
             for (i = 0; i < n; i ++) {
                GLushort p = ussrc[i];
                SWAP2BYTE(p);
-               rgba[i][rComp] = ((p >> 11)       ) * (1.0F / 31.0F);
-               rgba[i][gComp] = ((p >>  5) & 0x3f) * (1.0F / 63.0F);
-               rgba[i][bComp] = ((p      ) & 0x1f) * (1.0F / 31.0F);
+               rgba[i][rComp] = ((p >> 11)       ) * rs;
+               rgba[i][gComp] = ((p >>  5) & 0x3f) * gs;
+               rgba[i][bComp] = ((p      ) & 0x1f) * bs;
                rgba[i][aComp] = 1.0F;
             }
          }
@@ -3483,23 +3650,28 @@ extract_float_rgba(GLuint n, GLfloat rgba[][4],
             GLuint i;
             for (i = 0; i < n; i ++) {
                GLushort p = ussrc[i];
-               rgba[i][rComp] = ((p >> 11)       ) * (1.0F / 31.0F);
-               rgba[i][gComp] = ((p >>  5) & 0x3f) * (1.0F / 63.0F);
-               rgba[i][bComp] = ((p      ) & 0x1f) * (1.0F / 31.0F);
+               rgba[i][rComp] = ((p >> 11)       ) * rs;
+               rgba[i][gComp] = ((p >>  5) & 0x3f) * gs;
+               rgba[i][bComp] = ((p      ) & 0x1f) * bs;
                rgba[i][aComp] = 1.0F;
             }
          }
          break;
       case GL_UNSIGNED_SHORT_5_6_5_REV:
+         if (!intFormat) {
+            rs = 1.0F / 31.0F;
+            gs = 1.0F / 63.0F;
+            bs = 1.0F / 31.0F;
+         }
          if (swapBytes) {
             const GLushort *ussrc = (const GLushort *) src;
             GLuint i;
             for (i = 0; i < n; i ++) {
                GLushort p = ussrc[i];
                SWAP2BYTE(p);
-               rgba[i][rComp] = ((p      ) & 0x1f) * (1.0F / 31.0F);
-               rgba[i][gComp] = ((p >>  5) & 0x3f) * (1.0F / 63.0F);
-               rgba[i][bComp] = ((p >> 11)       ) * (1.0F / 31.0F);
+               rgba[i][rComp] = ((p      ) & 0x1f) * rs;
+               rgba[i][gComp] = ((p >>  5) & 0x3f) * gs;
+               rgba[i][bComp] = ((p >> 11)       ) * bs;
                rgba[i][aComp] = 1.0F;
             }
          }
@@ -3508,24 +3680,27 @@ extract_float_rgba(GLuint n, GLfloat rgba[][4],
             GLuint i;
             for (i = 0; i < n; i ++) {
                GLushort p = ussrc[i];
-               rgba[i][rComp] = ((p      ) & 0x1f) * (1.0F / 31.0F);
-               rgba[i][gComp] = ((p >>  5) & 0x3f) * (1.0F / 63.0F);
-               rgba[i][bComp] = ((p >> 11)       ) * (1.0F / 31.0F);
+               rgba[i][rComp] = ((p      ) & 0x1f) * rs;
+               rgba[i][gComp] = ((p >>  5) & 0x3f) * gs;
+               rgba[i][bComp] = ((p >> 11)       ) * bs;
                rgba[i][aComp] = 1.0F;
             }
          }
          break;
       case GL_UNSIGNED_SHORT_4_4_4_4:
+         if (!intFormat) {
+            rs = gs = bs = as = 1.0F / 15.0F;
+         }
          if (swapBytes) {
             const GLushort *ussrc = (const GLushort *) src;
             GLuint i;
             for (i = 0; i < n; i ++) {
                GLushort p = ussrc[i];
                SWAP2BYTE(p);
-               rgba[i][rComp] = ((p >> 12)      ) * (1.0F / 15.0F);
-               rgba[i][gComp] = ((p >>  8) & 0xf) * (1.0F / 15.0F);
-               rgba[i][bComp] = ((p >>  4) & 0xf) * (1.0F / 15.0F);
-               rgba[i][aComp] = ((p      ) & 0xf) * (1.0F / 15.0F);
+               rgba[i][rComp] = ((p >> 12)      ) * rs;
+               rgba[i][gComp] = ((p >>  8) & 0xf) * gs;
+               rgba[i][bComp] = ((p >>  4) & 0xf) * bs;
+               rgba[i][aComp] = ((p      ) & 0xf) * as;
             }
          }
          else {
@@ -3533,24 +3708,27 @@ extract_float_rgba(GLuint n, GLfloat rgba[][4],
             GLuint i;
             for (i = 0; i < n; i ++) {
                GLushort p = ussrc[i];
-               rgba[i][rComp] = ((p >> 12)      ) * (1.0F / 15.0F);
-               rgba[i][gComp] = ((p >>  8) & 0xf) * (1.0F / 15.0F);
-               rgba[i][bComp] = ((p >>  4) & 0xf) * (1.0F / 15.0F);
-               rgba[i][aComp] = ((p      ) & 0xf) * (1.0F / 15.0F);
+               rgba[i][rComp] = ((p >> 12)      ) * rs;
+               rgba[i][gComp] = ((p >>  8) & 0xf) * gs;
+               rgba[i][bComp] = ((p >>  4) & 0xf) * bs;
+               rgba[i][aComp] = ((p      ) & 0xf) * as;
             }
          }
          break;
       case GL_UNSIGNED_SHORT_4_4_4_4_REV:
+         if (!intFormat) {
+            rs = gs = bs = as = 1.0F / 15.0F;
+         }
          if (swapBytes) {
             const GLushort *ussrc = (const GLushort *) src;
             GLuint i;
             for (i = 0; i < n; i ++) {
                GLushort p = ussrc[i];
                SWAP2BYTE(p);
-               rgba[i][rComp] = ((p      ) & 0xf) * (1.0F / 15.0F);
-               rgba[i][gComp] = ((p >>  4) & 0xf) * (1.0F / 15.0F);
-               rgba[i][bComp] = ((p >>  8) & 0xf) * (1.0F / 15.0F);
-               rgba[i][aComp] = ((p >> 12)      ) * (1.0F / 15.0F);
+               rgba[i][rComp] = ((p      ) & 0xf) * rs;
+               rgba[i][gComp] = ((p >>  4) & 0xf) * gs;
+               rgba[i][bComp] = ((p >>  8) & 0xf) * bs;
+               rgba[i][aComp] = ((p >> 12)      ) * as;
             }
          }
          else {
@@ -3558,24 +3736,27 @@ extract_float_rgba(GLuint n, GLfloat rgba[][4],
             GLuint i;
             for (i = 0; i < n; i ++) {
                GLushort p = ussrc[i];
-               rgba[i][rComp] = ((p      ) & 0xf) * (1.0F / 15.0F);
-               rgba[i][gComp] = ((p >>  4) & 0xf) * (1.0F / 15.0F);
-               rgba[i][bComp] = ((p >>  8) & 0xf) * (1.0F / 15.0F);
-               rgba[i][aComp] = ((p >> 12)      ) * (1.0F / 15.0F);
+               rgba[i][rComp] = ((p      ) & 0xf) * rs;
+               rgba[i][gComp] = ((p >>  4) & 0xf) * gs;
+               rgba[i][bComp] = ((p >>  8) & 0xf) * bs;
+               rgba[i][aComp] = ((p >> 12)      ) * as;
             }
          }
          break;
       case GL_UNSIGNED_SHORT_5_5_5_1:
+         if (!intFormat) {
+            rs = gs = bs = 1.0F / 31.0F;
+         }
          if (swapBytes) {
             const GLushort *ussrc = (const GLushort *) src;
             GLuint i;
             for (i = 0; i < n; i ++) {
                GLushort p = ussrc[i];
                SWAP2BYTE(p);
-               rgba[i][rComp] = ((p >> 11)       ) * (1.0F / 31.0F);
-               rgba[i][gComp] = ((p >>  6) & 0x1f) * (1.0F / 31.0F);
-               rgba[i][bComp] = ((p >>  1) & 0x1f) * (1.0F / 31.0F);
-               rgba[i][aComp] = ((p      ) & 0x1)  * (1.0F /  1.0F);
+               rgba[i][rComp] = ((p >> 11)       ) * rs;
+               rgba[i][gComp] = ((p >>  6) & 0x1f) * gs;
+               rgba[i][bComp] = ((p >>  1) & 0x1f) * bs;
+               rgba[i][aComp] = ((p      ) & 0x1)  * as;
             }
          }
          else {
@@ -3583,24 +3764,27 @@ extract_float_rgba(GLuint n, GLfloat rgba[][4],
             GLuint i;
             for (i = 0; i < n; i ++) {
                GLushort p = ussrc[i];
-               rgba[i][rComp] = ((p >> 11)       ) * (1.0F / 31.0F);
-               rgba[i][gComp] = ((p >>  6) & 0x1f) * (1.0F / 31.0F);
-               rgba[i][bComp] = ((p >>  1) & 0x1f) * (1.0F / 31.0F);
-               rgba[i][aComp] = ((p      ) & 0x1)  * (1.0F /  1.0F);
+               rgba[i][rComp] = ((p >> 11)       ) * rs;
+               rgba[i][gComp] = ((p >>  6) & 0x1f) * gs;
+               rgba[i][bComp] = ((p >>  1) & 0x1f) * bs;
+               rgba[i][aComp] = ((p      ) & 0x1)  * as;
             }
          }
          break;
       case GL_UNSIGNED_SHORT_1_5_5_5_REV:
+         if (!intFormat) {
+            rs = gs = bs = 1.0F / 31.0F;
+         }
          if (swapBytes) {
             const GLushort *ussrc = (const GLushort *) src;
             GLuint i;
             for (i = 0; i < n; i ++) {
                GLushort p = ussrc[i];
                SWAP2BYTE(p);
-               rgba[i][rComp] = ((p      ) & 0x1f) * (1.0F / 31.0F);
-               rgba[i][gComp] = ((p >>  5) & 0x1f) * (1.0F / 31.0F);
-               rgba[i][bComp] = ((p >> 10) & 0x1f) * (1.0F / 31.0F);
-               rgba[i][aComp] = ((p >> 15)       ) * (1.0F /  1.0F);
+               rgba[i][rComp] = ((p      ) & 0x1f) * rs;
+               rgba[i][gComp] = ((p >>  5) & 0x1f) * gs;
+               rgba[i][bComp] = ((p >> 10) & 0x1f) * bs;
+               rgba[i][aComp] = ((p >> 15)       ) * as;
             }
          }
          else {
@@ -3608,10 +3792,10 @@ extract_float_rgba(GLuint n, GLfloat rgba[][4],
             GLuint i;
             for (i = 0; i < n; i ++) {
                GLushort p = ussrc[i];
-               rgba[i][rComp] = ((p      ) & 0x1f) * (1.0F / 31.0F);
-               rgba[i][gComp] = ((p >>  5) & 0x1f) * (1.0F / 31.0F);
-               rgba[i][bComp] = ((p >> 10) & 0x1f) * (1.0F / 31.0F);
-               rgba[i][aComp] = ((p >> 15)       ) * (1.0F /  1.0F);
+               rgba[i][rComp] = ((p      ) & 0x1f) * rs;
+               rgba[i][gComp] = ((p >>  5) & 0x1f) * gs;
+               rgba[i][bComp] = ((p >> 10) & 0x1f) * bs;
+               rgba[i][aComp] = ((p >> 15)       ) * as;
             }
          }
          break;
@@ -3619,23 +3803,45 @@ extract_float_rgba(GLuint n, GLfloat rgba[][4],
          if (swapBytes) {
             const GLuint *uisrc = (const GLuint *) src;
             GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLuint p = uisrc[i];
-               rgba[i][rComp] = UBYTE_TO_FLOAT((p      ) & 0xff);
-               rgba[i][gComp] = UBYTE_TO_FLOAT((p >>  8) & 0xff);
-               rgba[i][bComp] = UBYTE_TO_FLOAT((p >> 16) & 0xff);
-               rgba[i][aComp] = UBYTE_TO_FLOAT((p >> 24)       );
+            if (intFormat) {
+               for (i = 0; i < n; i ++) {
+                  GLuint p = uisrc[i];
+                  rgba[i][rComp] = (GLfloat) ((p      ) & 0xff);
+                  rgba[i][gComp] = (GLfloat) ((p >>  8) & 0xff);
+                  rgba[i][bComp] = (GLfloat) ((p >> 16) & 0xff);
+                  rgba[i][aComp] = (GLfloat) ((p >> 24)       );
+               }
+            }
+            else {
+               for (i = 0; i < n; i ++) {
+                  GLuint p = uisrc[i];
+                  rgba[i][rComp] = UBYTE_TO_FLOAT((p      ) & 0xff);
+                  rgba[i][gComp] = UBYTE_TO_FLOAT((p >>  8) & 0xff);
+                  rgba[i][bComp] = UBYTE_TO_FLOAT((p >> 16) & 0xff);
+                  rgba[i][aComp] = UBYTE_TO_FLOAT((p >> 24)       );
+               }
             }
          }
          else {
             const GLuint *uisrc = (const GLuint *) src;
             GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLuint p = uisrc[i];
-               rgba[i][rComp] = UBYTE_TO_FLOAT((p >> 24)       );
-               rgba[i][gComp] = UBYTE_TO_FLOAT((p >> 16) & 0xff);
-               rgba[i][bComp] = UBYTE_TO_FLOAT((p >>  8) & 0xff);
-               rgba[i][aComp] = UBYTE_TO_FLOAT((p      ) & 0xff);
+            if (intFormat) {
+               for (i = 0; i < n; i ++) {
+                  GLuint p = uisrc[i];
+                  rgba[i][rComp] = (GLfloat) ((p >> 24)       );
+                  rgba[i][gComp] = (GLfloat) ((p >> 16) & 0xff);
+                  rgba[i][bComp] = (GLfloat) ((p >>  8) & 0xff);
+                  rgba[i][aComp] = (GLfloat) ((p      ) & 0xff);
+               }
+            }
+            else {
+               for (i = 0; i < n; i ++) {
+                  GLuint p = uisrc[i];
+                  rgba[i][rComp] = UBYTE_TO_FLOAT((p >> 24)       );
+                  rgba[i][gComp] = UBYTE_TO_FLOAT((p >> 16) & 0xff);
+                  rgba[i][bComp] = UBYTE_TO_FLOAT((p >>  8) & 0xff);
+                  rgba[i][aComp] = UBYTE_TO_FLOAT((p      ) & 0xff);
+               }
             }
          }
          break;
@@ -3643,37 +3849,65 @@ extract_float_rgba(GLuint n, GLfloat rgba[][4],
          if (swapBytes) {
             const GLuint *uisrc = (const GLuint *) src;
             GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLuint p = uisrc[i];
-               rgba[i][rComp] = UBYTE_TO_FLOAT((p >> 24)       );
-               rgba[i][gComp] = UBYTE_TO_FLOAT((p >> 16) & 0xff);
-               rgba[i][bComp] = UBYTE_TO_FLOAT((p >>  8) & 0xff);
-               rgba[i][aComp] = UBYTE_TO_FLOAT((p      ) & 0xff);
+            if (intFormat) {
+               for (i = 0; i < n; i ++) {
+                  GLuint p = uisrc[i];
+                  rgba[i][rComp] = (GLfloat) ((p >> 24)       );
+                  rgba[i][gComp] = (GLfloat) ((p >> 16) & 0xff);
+                  rgba[i][bComp] = (GLfloat) ((p >>  8) & 0xff);
+                  rgba[i][aComp] = (GLfloat) ((p      ) & 0xff);
+               }
+            }
+            else {
+               for (i = 0; i < n; i ++) {
+                  GLuint p = uisrc[i];
+                  rgba[i][rComp] = UBYTE_TO_FLOAT((p >> 24)       );
+                  rgba[i][gComp] = UBYTE_TO_FLOAT((p >> 16) & 0xff);
+                  rgba[i][bComp] = UBYTE_TO_FLOAT((p >>  8) & 0xff);
+                  rgba[i][aComp] = UBYTE_TO_FLOAT((p      ) & 0xff);
+               }
             }
          }
          else {
             const GLuint *uisrc = (const GLuint *) src;
             GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLuint p = uisrc[i];
-               rgba[i][rComp] = UBYTE_TO_FLOAT((p      ) & 0xff);
-               rgba[i][gComp] = UBYTE_TO_FLOAT((p >>  8) & 0xff);
-               rgba[i][bComp] = UBYTE_TO_FLOAT((p >> 16) & 0xff);
-               rgba[i][aComp] = UBYTE_TO_FLOAT((p >> 24)       );
+            if (intFormat) {
+               for (i = 0; i < n; i ++) {
+                  GLuint p = uisrc[i];
+                  rgba[i][rComp] = (GLfloat) ((p      ) & 0xff);
+                  rgba[i][gComp] = (GLfloat) ((p >>  8) & 0xff);
+                  rgba[i][bComp] = (GLfloat) ((p >> 16) & 0xff);
+                  rgba[i][aComp] = (GLfloat) ((p >> 24)       );
+               }
+            }
+            else {
+               for (i = 0; i < n; i ++) {
+                  GLuint p = uisrc[i];
+                  rgba[i][rComp] = UBYTE_TO_FLOAT((p      ) & 0xff);
+                  rgba[i][gComp] = UBYTE_TO_FLOAT((p >>  8) & 0xff);
+                  rgba[i][bComp] = UBYTE_TO_FLOAT((p >> 16) & 0xff);
+                  rgba[i][aComp] = UBYTE_TO_FLOAT((p >> 24)       );
+               }
             }
          }
          break;
       case GL_UNSIGNED_INT_10_10_10_2:
+         if (!intFormat) {
+            rs = 1.0F / 1023.0F;
+            gs = 1.0F / 1023.0F;
+            bs = 1.0F / 1023.0F;
+            as = 1.0F / 3.0F;
+         }
          if (swapBytes) {
             const GLuint *uisrc = (const GLuint *) src;
             GLuint i;
             for (i = 0; i < n; i ++) {
                GLuint p = uisrc[i];
                SWAP4BYTE(p);
-               rgba[i][rComp] = ((p >> 22)        ) * (1.0F / 1023.0F);
-               rgba[i][gComp] = ((p >> 12) & 0x3ff) * (1.0F / 1023.0F);
-               rgba[i][bComp] = ((p >>  2) & 0x3ff) * (1.0F / 1023.0F);
-               rgba[i][aComp] = ((p      ) & 0x3  ) * (1.0F /    3.0F);
+               rgba[i][rComp] = ((p >> 22)        ) * rs;
+               rgba[i][gComp] = ((p >> 12) & 0x3ff) * gs;
+               rgba[i][bComp] = ((p >>  2) & 0x3ff) * bs;
+               rgba[i][aComp] = ((p      ) & 0x3  ) * as;
             }
          }
          else {
@@ -3681,24 +3915,30 @@ extract_float_rgba(GLuint n, GLfloat rgba[][4],
             GLuint i;
             for (i = 0; i < n; i ++) {
                GLuint p = uisrc[i];
-               rgba[i][rComp] = ((p >> 22)        ) * (1.0F / 1023.0F);
-               rgba[i][gComp] = ((p >> 12) & 0x3ff) * (1.0F / 1023.0F);
-               rgba[i][bComp] = ((p >>  2) & 0x3ff) * (1.0F / 1023.0F);
-               rgba[i][aComp] = ((p      ) & 0x3  ) * (1.0F /    3.0F);
+               rgba[i][rComp] = ((p >> 22)        ) * rs;
+               rgba[i][gComp] = ((p >> 12) & 0x3ff) * gs;
+               rgba[i][bComp] = ((p >>  2) & 0x3ff) * bs;
+               rgba[i][aComp] = ((p      ) & 0x3  ) * as;
             }
          }
          break;
       case GL_UNSIGNED_INT_2_10_10_10_REV:
+         if (!intFormat) {
+            rs = 1.0F / 1023.0F;
+            gs = 1.0F / 1023.0F;
+            bs = 1.0F / 1023.0F;
+            as = 1.0F / 3.0F;
+         }
          if (swapBytes) {
             const GLuint *uisrc = (const GLuint *) src;
             GLuint i;
             for (i = 0; i < n; i ++) {
                GLuint p = uisrc[i];
                SWAP4BYTE(p);
-               rgba[i][rComp] = ((p      ) & 0x3ff) * (1.0F / 1023.0F);
-               rgba[i][gComp] = ((p >> 10) & 0x3ff) * (1.0F / 1023.0F);
-               rgba[i][bComp] = ((p >> 20) & 0x3ff) * (1.0F / 1023.0F);
-               rgba[i][aComp] = ((p >> 30)        ) * (1.0F /    3.0F);
+               rgba[i][rComp] = ((p      ) & 0x3ff) * rs;
+               rgba[i][gComp] = ((p >> 10) & 0x3ff) * gs;
+               rgba[i][bComp] = ((p >> 20) & 0x3ff) * bs;
+               rgba[i][aComp] = ((p >> 30)        ) * as;
             }
          }
          else {
@@ -3706,10 +3946,10 @@ extract_float_rgba(GLuint n, GLfloat rgba[][4],
             GLuint i;
             for (i = 0; i < n; i ++) {
                GLuint p = uisrc[i];
-               rgba[i][rComp] = ((p      ) & 0x3ff) * (1.0F / 1023.0F);
-               rgba[i][gComp] = ((p >> 10) & 0x3ff) * (1.0F / 1023.0F);
-               rgba[i][bComp] = ((p >> 20) & 0x3ff) * (1.0F / 1023.0F);
-               rgba[i][aComp] = ((p >> 30)        ) * (1.0F /    3.0F);
+               rgba[i][rComp] = ((p      ) & 0x3ff) * rs;
+               rgba[i][gComp] = ((p >> 10) & 0x3ff) * gs;
+               rgba[i][bComp] = ((p >> 20) & 0x3ff) * bs;
+               rgba[i][aComp] = ((p >> 30)        ) * as;
             }
          }
          break;
@@ -4101,6 +4341,16 @@ _mesa_unpack_color_span_float( GLcontext *ctx,
           srcFormat == GL_RGBA ||
           srcFormat == GL_BGRA ||
           srcFormat == GL_ABGR_EXT ||
+          srcFormat == GL_RED_INTEGER_EXT ||
+          srcFormat == GL_GREEN_INTEGER_EXT ||
+          srcFormat == GL_BLUE_INTEGER_EXT ||
+          srcFormat == GL_ALPHA_INTEGER_EXT ||
+          srcFormat == GL_RGB_INTEGER_EXT ||
+          srcFormat == GL_RGBA_INTEGER_EXT ||
+          srcFormat == GL_BGR_INTEGER_EXT ||
+          srcFormat == GL_BGRA_INTEGER_EXT ||
+          srcFormat == GL_LUMINANCE_INTEGER_EXT ||
+          srcFormat == GL_LUMINANCE_ALPHA_INTEGER_EXT ||
           srcFormat == GL_COLOR_INDEX);
 
    ASSERT(srcType == GL_BITMAP ||
diff --git a/mesalib/src/mesa/main/image.h b/mesalib/src/mesa/main/image.h
index 9b34be0df..8b180d6bf 100644
--- a/mesalib/src/mesa/main/image.h
+++ b/mesalib/src/mesa/main/image.h
@@ -73,8 +73,16 @@ extern GLboolean
 _mesa_is_depthstencil_format(GLenum format);
 
 extern GLboolean
+_mesa_is_depth_or_stencil_format(GLenum format);
+
+extern GLboolean
 _mesa_is_dudv_format(GLenum format);
 
+extern GLboolean
+_mesa_is_integer_format(GLenum format);
+
+extern GLboolean
+_mesa_is_compressed_format(GLcontext *ctx, GLenum format);
 
 extern GLvoid *
 _mesa_image_address( GLuint dimensions,
diff --git a/mesalib/src/mesa/main/imports.c b/mesalib/src/mesa/main/imports.c
index b1389b25f..46e5c932d 100644
--- a/mesalib/src/mesa/main/imports.c
+++ b/mesalib/src/mesa/main/imports.c
@@ -243,41 +243,6 @@ _mesa_memset16( unsigned short *dst, unsigned short val, size_t n )
 /** \name Math */
 /*@{*/
 
-/** Wrapper around sin() */
-double
-_mesa_sin(double a)
-{
-   return sin(a);
-}
-
-/** Single precision wrapper around sin() */
-float
-_mesa_sinf(float a)
-{
-   return (float) sin((double) a);
-}
-
-/** Wrapper around cos() */
-double
-_mesa_cos(double a)
-{
-   return cos(a);
-}
-
-/** Single precision wrapper around asin() */
-float
-_mesa_asinf(float x)
-{
-   return (float) asin((double) x);
-}
-
-/** Single precision wrapper around atan() */
-float
-_mesa_atanf(float x)
-{
-   return (float) atan((double) x);
-}
-
 /** Wrapper around sqrt() */
 double
 _mesa_sqrtd(double x)
@@ -486,15 +451,6 @@ _mesa_inv_sqrtf(float n)
 #endif
 }
 
-
-/** Wrapper around pow() */
-double
-_mesa_pow(double x, double y)
-{
-   return pow(x, y);
-}
-
-
 /**
  * Find the first bit set in a word.
  */
@@ -800,7 +756,7 @@ _mesa_strdup( const char *s )
 float
 _mesa_strtof( const char *s, char **end )
 {
-#ifdef _GNU_SOURCE
+#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
    static locale_t loc = NULL;
    if (!loc) {
       loc = newlocale(LC_CTYPE_MASK, "C", NULL);
diff --git a/mesalib/src/mesa/main/imports.h b/mesalib/src/mesa/main/imports.h
index 1c263aabc..751f20650 100644
--- a/mesalib/src/mesa/main/imports.h
+++ b/mesalib/src/mesa/main/imports.h
@@ -116,6 +116,42 @@ typedef union { GLfloat f; GLint i; } fi_type;
 #endif
 
 
+/**
+ * \name Work-arounds for platforms that lack C99 math functions
+ */
+/*@{*/
+#if (!defined(_XOPEN_SOURCE) || (_XOPEN_SOURCE < 600)) && !defined(_ISOC99_SOURCE) \
+   && (!defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L)) \
+   && (!defined(_MSC_VER) || (_MSC_VER < 1400))
+#define acosf(f) ((float) acos(f))
+#define asinf(f) ((float) asin(f))
+#define atan2f(x,y) ((float) atan2(x,y))
+#define atanf(f) ((float) atan(f))
+#define cielf(f) ((float) ciel(f))
+#define cosf(f) ((float) cos(f))
+#define coshf(f) ((float) cosh(f))
+#define expf(f) ((float) exp(f))
+#define exp2f(f) ((float) exp2(f))
+#define floorf(f) ((float) floor(f))
+#define logf(f) ((float) log(f))
+#define log2f(f) ((float) log2(f))
+#define powf(x,y) ((float) pow(x,y))
+#define sinf(f) ((float) sin(f))
+#define sinhf(f) ((float) sinh(f))
+#define sqrtf(f) ((float) sqrt(f))
+#define tanf(f) ((float) tan(f))
+#define tanhf(f) ((float) tanh(f))
+#endif
+
+#if defined(_MSC_VER)
+static INLINE float truncf(float x) { return x < 0.0f ? ceilf(x) : floorf(x); }
+static INLINE float exp2f(float x) { return powf(2.0f, x); }
+static INLINE float log2f(float x) { return logf(x) * 1.442695041f; }
+static INLINE int isblank(int ch) { return ch == ' ' || ch == '\t'; }
+#define strtoll(p, e, b) _strtoi64(p, e, b)
+#endif
+/*@}*/
+
 /***
  *** LOG2: Log base 2 of float
  ***/
@@ -444,42 +480,6 @@ _mesa_next_pow_two_64(uint64_t x)
 }
 
 
-/***
- *** UNCLAMPED_FLOAT_TO_UBYTE: clamp float to [0,1] and map to ubyte in [0,255]
- *** CLAMPED_FLOAT_TO_UBYTE: map float known to be in [0,1] to ubyte in [0,255]
- ***/
-#if defined(USE_IEEE) && !defined(DEBUG)
-#define IEEE_0996 0x3f7f0000	/* 0.996 or so */
-/* This function/macro is sensitive to precision.  Test very carefully
- * if you change it!
- */
-#define UNCLAMPED_FLOAT_TO_UBYTE(UB, F)					\
-        do {								\
-           fi_type __tmp;						\
-           __tmp.f = (F);						\
-           if (__tmp.i < 0)						\
-              UB = (GLubyte) 0;						\
-           else if (__tmp.i >= IEEE_0996)				\
-              UB = (GLubyte) 255;					\
-           else {							\
-              __tmp.f = __tmp.f * (255.0F/256.0F) + 32768.0F;		\
-              UB = (GLubyte) __tmp.i;					\
-           }								\
-        } while (0)
-#define CLAMPED_FLOAT_TO_UBYTE(UB, F)					\
-        do {								\
-           fi_type __tmp;						\
-           __tmp.f = (F) * (255.0F/256.0F) + 32768.0F;			\
-           UB = (GLubyte) __tmp.i;					\
-        } while (0)
-#else
-#define UNCLAMPED_FLOAT_TO_UBYTE(ub, f) \
-	ub = ((GLubyte) IROUND(CLAMP((f), 0.0F, 1.0F) * 255.0F))
-#define CLAMPED_FLOAT_TO_UBYTE(ub, f) \
-	ub = ((GLubyte) IROUND((f) * 255.0F))
-#endif
-
-
 /**
  * Return 1 if this is a little endian machine, 0 if big endian.
  */
@@ -522,21 +522,6 @@ extern void
 _mesa_memset16( unsigned short *dst, unsigned short val, size_t n );
 
 extern double
-_mesa_sin(double a);
-
-extern float
-_mesa_sinf(float a);
-
-extern double
-_mesa_cos(double a);
-
-extern float
-_mesa_asinf(float x);
-
-extern float
-_mesa_atanf(float x);
-
-extern double
 _mesa_sqrtd(double x);
 
 extern float
@@ -548,9 +533,6 @@ _mesa_inv_sqrtf(float x);
 extern void
 _mesa_init_sqrt_table(void);
 
-extern double
-_mesa_pow(double x, double y);
-
 extern int
 _mesa_ffs(int32_t i);
 
@@ -584,19 +566,25 @@ extern unsigned int
 _mesa_str_checksum(const char *str);
 
 extern int
-_mesa_snprintf( char *str, size_t size, const char *fmt, ... );
+_mesa_snprintf( char *str, size_t size, const char *fmt, ... ) PRINTFLIKE(3, 4);
 
 extern void
-_mesa_warning( __GLcontext *gc, const char *fmtString, ... );
+_mesa_warning( __GLcontext *gc, const char *fmtString, ... ) PRINTFLIKE(2, 3);
 
 extern void
-_mesa_problem( const __GLcontext *ctx, const char *fmtString, ... );
+_mesa_problem( const __GLcontext *ctx, const char *fmtString, ... ) PRINTFLIKE(2, 3);
 
 extern void
-_mesa_error( __GLcontext *ctx, GLenum error, const char *fmtString, ... );
+_mesa_error( __GLcontext *ctx, GLenum error, const char *fmtString, ... ) PRINTFLIKE(3, 4);
 
 extern void
-_mesa_debug( const __GLcontext *ctx, const char *fmtString, ... );
+_mesa_debug( const __GLcontext *ctx, const char *fmtString, ... ) PRINTFLIKE(2, 3);
+
+
+#if defined(_MSC_VER) && !defined(snprintf)
+#define snprintf _snprintf
+#endif
+
 
 #ifdef __cplusplus
 }
diff --git a/mesalib/src/mesa/main/light.c b/mesalib/src/mesa/main/light.c
index 19dc96892..43ae28c25 100644
--- a/mesalib/src/mesa/main/light.c
+++ b/mesalib/src/mesa/main/light.c
@@ -162,7 +162,7 @@ _mesa_light(GLcontext *ctx, GLuint lnum, GLenum pname, const GLfloat *params)
          return;
       FLUSH_VERTICES(ctx, _NEW_LIGHT);
       light->SpotCutoff = params[0];
-      light->_CosCutoffNeg = (GLfloat) (_mesa_cos(light->SpotCutoff * DEG2RAD));
+      light->_CosCutoffNeg = (GLfloat) (cos(light->SpotCutoff * DEG2RAD));
       if (light->_CosCutoffNeg < 0)
          light->_CosCutoff = 0;
       else
@@ -599,7 +599,7 @@ _mesa_material_bitmask( GLcontext *ctx, GLenum face, GLenum pname,
          bitmask |= MAT_BIT_FRONT_INDEXES  | MAT_BIT_BACK_INDEXES;
          break;
       default:
-         _mesa_error( ctx, GL_INVALID_ENUM, where );
+         _mesa_error( ctx, GL_INVALID_ENUM, "%s", where );
          return 0;
    }
 
@@ -610,12 +610,12 @@ _mesa_material_bitmask( GLcontext *ctx, GLenum face, GLenum pname,
       bitmask &= BACK_MATERIAL_BITS;
    }
    else if (face != GL_FRONT_AND_BACK) {
-      _mesa_error( ctx, GL_INVALID_ENUM, where );
+      _mesa_error( ctx, GL_INVALID_ENUM, "%s", where );
       return 0;
    }
 
    if (bitmask & ~legal) {
-      _mesa_error( ctx, GL_INVALID_ENUM, where );
+      _mesa_error( ctx, GL_INVALID_ENUM, "%s", where );
       return 0;
    }
 
@@ -950,7 +950,7 @@ validate_spot_exp_table( struct gl_light *l )
 
    for (i = EXP_TABLE_SIZE - 1; i > 0 ;i--) {
       if (clamp == 0) {
-	 tmp = _mesa_pow(i / (GLdouble) (EXP_TABLE_SIZE - 1), exponent);
+	 tmp = pow(i / (GLdouble) (EXP_TABLE_SIZE - 1), exponent);
 	 if (tmp < FLT_MIN * 100.0) {
 	    tmp = 0.0;
 	    clamp = 1;
@@ -1012,7 +1012,7 @@ validate_shine_table( GLcontext *ctx, GLuint side, GLfloat shininess )
             GLdouble t, x = j / (GLfloat) (SHINE_TABLE_SIZE - 1);
             if (x < 0.005) /* underflow check */
                x = 0.005;
-            t = _mesa_pow(x, shininess);
+            t = pow(x, shininess);
 	    if (t > 1e-20)
 	       m[j] = (GLfloat) t;
 	    else
diff --git a/mesalib/src/mesa/main/light.h b/mesalib/src/mesa/main/light.h
index 9c1a5eefa..b3436114d 100644
--- a/mesalib/src/mesa/main/light.h
+++ b/mesalib/src/mesa/main/light.h
@@ -94,7 +94,7 @@ do {									\
    int k = (int) f;							\
    if (k < 0 /* gcc may cast an overflow float value to negative int value*/ \
 	|| k > SHINE_TABLE_SIZE-2)					\
-      result = (GLfloat) _mesa_pow( dp, _tab->shininess );		\
+      result = (GLfloat) pow( dp, _tab->shininess );		\
    else									\
       result = _tab->tab[k] + (f-k)*(_tab->tab[k+1]-_tab->tab[k]);	\
 } while (0)
diff --git a/mesalib/src/mesa/main/macros.h b/mesalib/src/mesa/main/macros.h
index a8624574d..b2ec0ba9b 100644
--- a/mesalib/src/mesa/main/macros.h
+++ b/mesalib/src/mesa/main/macros.h
@@ -127,6 +127,44 @@ extern GLfloat _mesa_ubyte_to_float_color_tab[256];
 #define CLAMPED_FLOAT_TO_USHORT(us, f)  \
         us = ( (GLushort) IROUND( (f) * 65535.0F) )
 
+#define UNCLAMPED_FLOAT_TO_SHORT(s, f)  \
+        s = ( (GLshort) IROUND( CLAMP((f), -1.0F, 1.0F) * 32767.0F) )
+
+/***
+ *** UNCLAMPED_FLOAT_TO_UBYTE: clamp float to [0,1] and map to ubyte in [0,255]
+ *** CLAMPED_FLOAT_TO_UBYTE: map float known to be in [0,1] to ubyte in [0,255]
+ ***/
+#if defined(USE_IEEE) && !defined(DEBUG)
+#define IEEE_0996 0x3f7f0000	/* 0.996 or so */
+/* This function/macro is sensitive to precision.  Test very carefully
+ * if you change it!
+ */
+#define UNCLAMPED_FLOAT_TO_UBYTE(UB, F)					\
+        do {								\
+           fi_type __tmp;						\
+           __tmp.f = (F);						\
+           if (__tmp.i < 0)						\
+              UB = (GLubyte) 0;						\
+           else if (__tmp.i >= IEEE_0996)				\
+              UB = (GLubyte) 255;					\
+           else {							\
+              __tmp.f = __tmp.f * (255.0F/256.0F) + 32768.0F;		\
+              UB = (GLubyte) __tmp.i;					\
+           }								\
+        } while (0)
+#define CLAMPED_FLOAT_TO_UBYTE(UB, F)					\
+        do {								\
+           fi_type __tmp;						\
+           __tmp.f = (F) * (255.0F/256.0F) + 32768.0F;			\
+           UB = (GLubyte) __tmp.i;					\
+        } while (0)
+#else
+#define UNCLAMPED_FLOAT_TO_UBYTE(ub, f) \
+	ub = ((GLubyte) IROUND(CLAMP((f), 0.0F, 1.0F) * 255.0F))
+#define CLAMPED_FLOAT_TO_UBYTE(ub, f) \
+	ub = ((GLubyte) IROUND((f) * 255.0F))
+#endif
+
 /*@}*/
 
 
diff --git a/mesalib/src/mesa/main/mfeatures.h b/mesalib/src/mesa/main/mfeatures.h
index cb96c4d1d..92311ef7f 100644
--- a/mesalib/src/mesa/main/mfeatures.h
+++ b/mesalib/src/mesa/main/mfeatures.h
@@ -42,9 +42,6 @@
 /**
  * A feature can be anything.  But most of them share certain characteristics.
  *
- * When a feature defines driver entries, they can be initialized by
- *   _MESA_INIT_<FEATURE>_FUNCTIONS
- *
  * When a feature defines vtxfmt entries, they can be initialized and
  * installed by
  *   _MESA_INIT_<FEATURE>_VTXFMT
@@ -68,62 +65,85 @@
  * enabled or not.
  */
 
+#ifndef FEATURE_ES1
+#define FEATURE_ES1 0
+#endif
+#ifndef FEATURE_ES2
+#define FEATURE_ES2 0
+#endif
+
+#define FEATURE_ES (FEATURE_ES1 || FEATURE_ES2)
+
+#ifndef FEATURE_GL
+#define FEATURE_GL !FEATURE_ES
+#endif
+
 #ifdef IN_DRI_DRIVER
-#define FEATURE_remap_table 1
+#define FEATURE_remap_table               1
 #else
-#define FEATURE_remap_table 0
+#define FEATURE_remap_table               0
 #endif
 
-#define FEATURE_accum  _HAVE_FULL_GL
-#define FEATURE_arrayelt  _HAVE_FULL_GL
-#define FEATURE_attrib_stack  _HAVE_FULL_GL
+#define FEATURE_dispatch                  1
+#define FEATURE_texgen                    1
+#define FEATURE_userclip                  1
+
+#define FEATURE_accum                     FEATURE_GL
+#define FEATURE_arrayelt                  FEATURE_GL
+#define FEATURE_attrib_stack              FEATURE_GL
 /* this disables vtxfmt, api_loopback, and api_noop completely */
-#define FEATURE_beginend  _HAVE_FULL_GL
-#define FEATURE_colortable  _HAVE_FULL_GL
-#define FEATURE_convolve  _HAVE_FULL_GL
-#define FEATURE_dispatch  _HAVE_FULL_GL
-#define FEATURE_dlist  (_HAVE_FULL_GL && FEATURE_arrayelt && FEATURE_beginend)
-#define FEATURE_draw_read_buffer  _HAVE_FULL_GL
-#define FEATURE_drawpix  _HAVE_FULL_GL
-#define FEATURE_evaluators  _HAVE_FULL_GL
-#define FEATURE_feedback  _HAVE_FULL_GL
-#define FEATURE_fixedpt 0
-#define FEATURE_histogram  _HAVE_FULL_GL
-#define FEATURE_pixel_transfer  _HAVE_FULL_GL
-#define FEATURE_point_size_array 0
-#define FEATURE_queryobj  _HAVE_FULL_GL
-#define FEATURE_rastpos  _HAVE_FULL_GL
-#define FEATURE_texgen  _HAVE_FULL_GL
-#define FEATURE_texture_fxt1  _HAVE_FULL_GL
-#define FEATURE_texture_s3tc  _HAVE_FULL_GL
-#define FEATURE_userclip  _HAVE_FULL_GL
-#define FEATURE_vertex_array_byte 0
-#define FEATURE_es2_glsl 0
-
-#define FEATURE_ARB_fragment_program  _HAVE_FULL_GL
-#define FEATURE_ARB_framebuffer_object  _HAVE_FULL_GL
-#define FEATURE_ARB_map_buffer_range  _HAVE_FULL_GL
-#define FEATURE_ARB_pixel_buffer_object  _HAVE_FULL_GL
-#define FEATURE_ARB_vertex_buffer_object  _HAVE_FULL_GL
-#define FEATURE_ARB_vertex_program  _HAVE_FULL_GL
-#define FEATURE_ARB_vertex_shader _HAVE_FULL_GL
-#define FEATURE_ARB_fragment_shader _HAVE_FULL_GL
-#define FEATURE_ARB_shader_objects (FEATURE_ARB_vertex_shader || FEATURE_ARB_fragment_shader)
-#define FEATURE_ARB_shading_language_100 FEATURE_ARB_shader_objects
-#define FEATURE_ARB_shading_language_120 FEATURE_ARB_shader_objects
-#define FEATURE_ARB_sync _HAVE_FULL_GL
-
-#define FEATURE_EXT_framebuffer_blit _HAVE_FULL_GL
-#define FEATURE_EXT_framebuffer_object _HAVE_FULL_GL
-#define FEATURE_EXT_pixel_buffer_object  _HAVE_FULL_GL
-#define FEATURE_APPLE_object_purgeable _HAVE_FULL_GL
-#define FEATURE_EXT_texture_sRGB _HAVE_FULL_GL
-#define FEATURE_ATI_fragment_shader _HAVE_FULL_GL
-#define FEATURE_NV_fence  _HAVE_FULL_GL
-#define FEATURE_NV_fragment_program  _HAVE_FULL_GL
-#define FEATURE_NV_vertex_program  _HAVE_FULL_GL
-
-#define FEATURE_OES_EGL_image _HAVE_FULL_GL
+#define FEATURE_beginend                  FEATURE_GL
+#define FEATURE_colortable                FEATURE_GL
+#define FEATURE_convolve                  FEATURE_GL
+#define FEATURE_dlist                     (FEATURE_GL && FEATURE_arrayelt && FEATURE_beginend)
+#define FEATURE_draw_read_buffer          FEATURE_GL
+#define FEATURE_drawpix                   FEATURE_GL
+#define FEATURE_evaluators                FEATURE_GL
+#define FEATURE_feedback                  FEATURE_GL
+#define FEATURE_histogram                 FEATURE_GL
+#define FEATURE_pixel_transfer            FEATURE_GL
+#define FEATURE_queryobj                  FEATURE_GL
+#define FEATURE_rastpos                   FEATURE_GL
+#define FEATURE_texture_fxt1              FEATURE_GL
+#define FEATURE_texture_s3tc              FEATURE_GL
+
+#define FEATURE_extra_context_init        FEATURE_ES
+#define FEATURE_fixedpt                   FEATURE_ES
+#define FEATURE_point_size_array          FEATURE_ES
+#define FEATURE_vertex_array_byte         FEATURE_ES
+
+#define FEATURE_es2_glsl                  FEATURE_ES2
+
+#define FEATURE_ARB_fragment_program      1
+#define FEATURE_ARB_vertex_program        1
+#define FEATURE_ARB_vertex_shader         1
+#define FEATURE_ARB_fragment_shader       1
+#define FEATURE_ARB_shader_objects        (FEATURE_ARB_vertex_shader || FEATURE_ARB_fragment_shader)
+#define FEATURE_ARB_shading_language_100  FEATURE_ARB_shader_objects
+#define FEATURE_ARB_shading_language_120  FEATURE_ARB_shader_objects
+#define FEATURE_ARB_geometry_shader4      FEATURE_ARB_shader_objects
+
+#define FEATURE_ARB_framebuffer_object    (FEATURE_GL && FEATURE_EXT_framebuffer_object)
+#define FEATURE_ARB_map_buffer_range      FEATURE_GL
+#define FEATURE_ARB_pixel_buffer_object   (FEATURE_GL && FEATURE_EXT_pixel_buffer_object)
+#define FEATURE_ARB_sync                  FEATURE_GL
+#define FEATURE_ARB_vertex_buffer_object  1
+
+#define FEATURE_EXT_framebuffer_blit      FEATURE_GL
+#define FEATURE_EXT_framebuffer_object    1
+#define FEATURE_EXT_pixel_buffer_object   1
+#define FEATURE_EXT_texture_sRGB          FEATURE_GL
+#define FEATURE_EXT_transform_feedback    FEATURE_GL
+
+#define FEATURE_APPLE_object_purgeable    FEATURE_GL
+#define FEATURE_ATI_fragment_shader       FEATURE_GL
+#define FEATURE_NV_fence                  FEATURE_GL
+#define FEATURE_NV_fragment_program       FEATURE_GL
+#define FEATURE_NV_vertex_program         FEATURE_GL
 
+#define FEATURE_OES_EGL_image             1
+#define FEATURE_OES_draw_texture          FEATURE_ES1
+#define FEATURE_OES_framebuffer_object    FEATURE_ES
+#define FEATURE_OES_mapbuffer             FEATURE_ES
 
 #endif /* FEATURES_H */
diff --git a/mesalib/src/mesa/main/mipmap.c b/mesalib/src/mesa/main/mipmap.c
index 51f7edfab..3d1a4c49c 100644
--- a/mesalib/src/mesa/main/mipmap.c
+++ b/mesalib/src/mesa/main/mipmap.c
@@ -415,7 +415,7 @@ do_row(GLenum datatype, GLuint comps, GLint srcWidth,
       GLuint i, j, k;
       const GLuint *rowA = (const GLuint *) srcRowA;
       const GLuint *rowB = (const GLuint *) srcRowB;
-      GLfloat *dst = (GLfloat *) dstRow;
+      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);
@@ -1005,21 +1005,28 @@ make_2d_mipmap(GLenum datatype, GLuint comps, GLint border,
    const GLint dstRowBytes = bpt * dstRowStride;
    const GLubyte *srcA, *srcB;
    GLubyte *dst;
-   GLint row;
+   GLint row, srcRowStep;
 
    /* Compute src and dst pointers, skipping any border */
    srcA = srcPtr + border * ((srcWidth + 1) * bpt);
-   if (srcHeight > 1) 
+   if (srcHeight > 1 && srcHeight > dstHeight) {
+      /* sample from two source rows */
       srcB = srcA + srcRowBytes;
-   else
+      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 += 2 * srcRowBytes;
-      srcB += 2 * srcRowBytes;
+      srcA += srcRowStep * srcRowBytes;
+      srcB += srcRowStep * srcRowBytes;
       dst += dstRowBytes;
    }
 
@@ -1581,7 +1588,7 @@ _mesa_generate_mipmap(GLcontext *ctx, GLenum target,
       struct gl_texture_image *dstImage;
       GLint srcWidth, srcHeight, srcDepth;
       GLint dstWidth, dstHeight, dstDepth;
-      GLint border, bytesPerTexel;
+      GLint border;
       GLboolean nextLevel;
 
       /* get src image parameters */
@@ -1623,33 +1630,24 @@ _mesa_generate_mipmap(GLcontext *ctx, GLenum target,
       dstImage->FetchTexelc = srcImage->FetchTexelc;
       dstImage->FetchTexelf = srcImage->FetchTexelf;
 
-      /* Alloc new teximage data buffer.
-       * Setup src and dest data pointers.
-       */
-      if (_mesa_is_format_compressed(dstImage->TexFormat)) {
-         GLuint dstCompressedSize = 
-            _mesa_format_image_size(dstImage->TexFormat, dstImage->Width,
-                                    dstImage->Height, dstImage->Depth);
-         ASSERT(dstCompressedSize > 0);
-
-         dstImage->Data = _mesa_alloc_texmemory(dstCompressedSize);
+      /* 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 {
-         bytesPerTexel = _mesa_get_format_bytes(dstImage->TexFormat);
-         ASSERT(dstWidth * dstHeight * dstDepth * bytesPerTexel > 0);
-         dstImage->Data = _mesa_alloc_texmemory(dstWidth * dstHeight
-                                                * dstDepth * bytesPerTexel);
-         if (!dstImage->Data) {
-            _mesa_error(ctx, GL_OUT_OF_MEMORY, "generating mipmaps");
-            return;
-         }
          srcData = (const GLubyte *) srcImage->Data;
          dstData = (GLubyte *) dstImage->Data;
       }
diff --git a/mesalib/src/mesa/main/mm.c b/mesalib/src/mesa/main/mm.c
index 3ef38e94b..25a029370 100644
--- a/mesalib/src/mesa/main/mm.c
+++ b/mesalib/src/mesa/main/mm.c
@@ -22,6 +22,11 @@
  *
  */
 
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "compiler.h"
 #include "mm.h"
 
 
diff --git a/mesalib/src/mesa/main/mm.h b/mesalib/src/mesa/main/mm.h
index df340808a..228721ca2 100644
--- a/mesalib/src/mesa/main/mm.h
+++ b/mesalib/src/mesa/main/mm.h
@@ -32,9 +32,6 @@
 #define MM_H
 
 
-#include "imports.h"
-
-
 struct mem_block {
    struct mem_block *next, *prev;
    struct mem_block *next_free, *prev_free;
diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h
index 9d9b475dd..5494be8f4 100644
--- a/mesalib/src/mesa/main/mtypes.h
+++ b/mesalib/src/mesa/main/mtypes.h
@@ -36,12 +36,19 @@
 
 #include "main/glheader.h"
 #include "main/config.h"
-#include "main/compiler.h"
 #include "main/mfeatures.h"
 #include "glapi/glapi.h"
 #include "math/m_matrix.h"	/* GLmatrix */
 #include "main/simple_list.h"	/* struct simple_node */
 
+/* Shader stages. Note that these will become 5 with tessellation.
+ * These MUST have the same values as PIPE_SHADER_*
+ */
+#define MESA_SHADER_VERTEX   0
+#define MESA_SHADER_FRAGMENT 1
+#define MESA_SHADER_GEOMETRY 2
+#define MESA_SHADER_TYPES    3
+
 
 /**
  * Color channel data type.
@@ -238,6 +245,78 @@ typedef enum
 } gl_vert_result;
 
 
+/*********************************************/
+
+/**
+ * Indexes for geometry program attributes.
+ */
+typedef enum
+{
+   GEOM_ATTRIB_POSITION = 0,
+   GEOM_ATTRIB_COLOR0 = 1,
+   GEOM_ATTRIB_COLOR1 = 2,
+   GEOM_ATTRIB_SECONDARY_COLOR0 = 3,
+   GEOM_ATTRIB_SECONDARY_COLOR1 = 4,
+   GEOM_ATTRIB_FOG_FRAG_COORD = 5,
+   GEOM_ATTRIB_POINT_SIZE = 6,
+   GEOM_ATTRIB_CLIP_VERTEX = 7,
+   GEOM_ATTRIB_PRIMITIVE_ID = 8,
+   GEOM_ATTRIB_TEX_COORD = 9,
+
+   GEOM_ATTRIB_VAR0 = 16,
+   GEOM_ATTRIB_MAX = (GEOM_ATTRIB_VAR0 + MAX_VARYING)
+} gl_geom_attrib;
+
+/**
+ * Bitflags for geometry attributes.
+ * These are used in bitfields in many places.
+ */
+/*@{*/
+#define GEOM_BIT_COLOR0      (1 << GEOM_ATTRIB_COLOR0)
+#define GEOM_BIT_COLOR1      (1 << GEOM_ATTRIB_COLOR1)
+#define GEOM_BIT_SCOLOR0     (1 << GEOM_ATTRIB_SECONDARY_COLOR0)
+#define GEOM_BIT_SCOLOR1     (1 << GEOM_ATTRIB_SECONDARY_COLOR1)
+#define GEOM_BIT_TEX_COORD   (1 << GEOM_ATTRIB_TEX_COORD)
+#define GEOM_BIT_FOG_COORD   (1 << GEOM_ATTRIB_FOG_FRAG_COORD)
+#define GEOM_BIT_POSITION    (1 << GEOM_ATTRIB_POSITION)
+#define GEOM_BIT_POINT_SIDE  (1 << GEOM_ATTRIB_POINT_SIZE)
+#define GEOM_BIT_CLIP_VERTEX (1 << GEOM_ATTRIB_CLIP_VERTEX)
+#define GEOM_BIT_PRIM_ID     (1 << GEOM_ATTRIB_PRIMITIVE_ID)
+#define GEOM_BIT_VAR0        (1 << GEOM_ATTRIB_VAR0)
+
+#define GEOM_BIT_VAR(g)  (1 << (GEOM_BIT_VAR0 + (g)))
+/*@}*/
+
+
+/**
+ * Indexes for geometry program result attributes
+ */
+/*@{*/
+typedef enum {
+   GEOM_RESULT_POS  = 0,
+   GEOM_RESULT_COL0  = 1,
+   GEOM_RESULT_COL1  = 2,
+   GEOM_RESULT_SCOL0 = 3,
+   GEOM_RESULT_SCOL1 = 4,
+   GEOM_RESULT_FOGC = 5,
+   GEOM_RESULT_TEX0 = 6,
+   GEOM_RESULT_TEX1 = 7,
+   GEOM_RESULT_TEX2 = 8,
+   GEOM_RESULT_TEX3 = 9,
+   GEOM_RESULT_TEX4 = 10,
+   GEOM_RESULT_TEX5 = 11,
+   GEOM_RESULT_TEX6 = 12,
+   GEOM_RESULT_TEX7 = 13,
+   GEOM_RESULT_PSIZ = 14,
+   GEOM_RESULT_CLPV = 15,
+   GEOM_RESULT_PRID = 16,
+   GEOM_RESULT_LAYR = 17,
+   GEOM_RESULT_VAR0 = 18,  /**< shader varying, should really be 16 */
+   /* ### we need to -2 because var0 is 18 instead 16 like in the others */
+   GEOM_RESULT_MAX  =  (GEOM_RESULT_VAR0 + MAX_VARYING - 2)
+} gl_geom_result;
+/*@}*/
+
 /**
  * Indexes for fragment program input attributes.
  */
@@ -1076,6 +1155,7 @@ typedef enum
 #define T_BIT 2
 #define R_BIT 4
 #define Q_BIT 8
+#define STR_BITS (S_BIT | T_BIT | R_BIT)
 /*@}*/
 
 
@@ -1547,12 +1627,15 @@ struct gl_array_attrib
    GLuint LockFirst;            /**< GL_EXT_compiled_vertex_array */
    GLuint LockCount;            /**< GL_EXT_compiled_vertex_array */
 
+   /** GL 3.1 (slightly different from GL_NV_primitive_restart) */
+   GLboolean PrimitiveRestart;
+   GLuint RestartIndex;
+
    GLbitfield NewState;		/**< mask of _NEW_ARRAY_* values */
 
-#if FEATURE_ARB_vertex_buffer_object
+   /* GL_ARB_vertex_buffer_object */
    struct gl_buffer_object *ArrayBufferObj;
    struct gl_buffer_object *ElementArrayBufferObj;
-#endif
 };
 
 
@@ -1724,6 +1807,11 @@ struct gl_program
    /** Which texture target is being sampled (TEXTURE_1D/2D/3D/etc_INDEX) */
    gl_texture_index SamplerTargets[MAX_SAMPLERS];
 
+   /** Bitmask of which register files are read/written with indirect
+    * addressing.  Mask of (1 << PROGRAM_x) bits.
+    */
+   GLbitfield IndirectRegisterFiles;
+
    /** Logical counts */
    /*@{*/
    GLuint NumInstructions;
@@ -1758,6 +1846,18 @@ struct gl_vertex_program
 };
 
 
+/** Geometry program object */
+struct gl_geometry_program
+{
+   struct gl_program Base;   /**< base class */
+
+   GLint VerticesOut;
+   GLenum InputType;  /**< GL_POINTS, GL_LINES, GL_LINES_ADJACENCY_ARB,
+                           GL_TRIANGLES, or GL_TRIANGLES_ADJACENCY_ARB */
+   GLenum OutputType; /**< GL_POINTS, GL_LINE_STRIP or GL_TRIANGLE_STRIP */
+};
+
+
 /** Fragment program object */
 struct gl_fragment_program
 {
@@ -1816,6 +1916,26 @@ struct gl_vertex_program_state
 
 
 /**
+ * Context state for geometry programs.
+ */
+struct gl_geometry_program_state
+{
+   GLboolean Enabled;               /**< GL_ARB_GEOMETRY_SHADER4 */
+   GLboolean _Enabled;              /**< Enabled and valid program? */
+   struct gl_geometry_program *Current;  /**< user-bound geometry program */
+
+   /** Currently enabled and valid program (including internal programs
+    * and compiled shader programs).
+    */
+   struct gl_geometry_program *_Current;
+
+   GLfloat Parameters[MAX_PROGRAM_ENV_PARAMS][4]; /**< Env params */
+
+   /** Cache of fixed-function programs */
+   struct gl_program_cache *Cache;
+};
+
+/**
  * Context state for fragment programs.
  */
 struct gl_fragment_program_state
@@ -1910,6 +2030,14 @@ struct gl_query_state
 
    /** GL_NV_conditional_render */
    struct gl_query_object *CondRenderQuery;
+
+   /** GL_EXT_transform_feedback */
+   struct gl_query_object *PrimitivesGenerated;
+   struct gl_query_object *PrimitivesWritten;
+
+   /** GL_ARB_timer_query */
+   struct gl_query_object *TimeElapsed;
+
    GLenum CondRenderMode;
 };
 
@@ -1944,7 +2072,7 @@ struct gl_sl_pragmas
  */
 struct gl_shader
 {
-   GLenum Type;  /**< GL_FRAGMENT_SHADER || GL_VERTEX_SHADER (first field!) */
+   GLenum Type;  /**< GL_FRAGMENT_SHADER || GL_VERTEX_SHADER || GL_GEOMETRY_SHADER_ARB (first field!) */
    GLuint Name;  /**< AKA the handle */
    GLint RefCount;  /**< Reference count */
    GLboolean DeletePending;
@@ -1956,6 +2084,15 @@ struct gl_shader
    struct gl_program *Program;  /**< Post-compile assembly code */
    GLchar *InfoLog;
    struct gl_sl_pragmas Pragmas;
+
+   unsigned Version;       /**< GLSL version used for linking */
+
+   struct exec_list *ir;
+   struct glsl_symbol_table *symbols;
+
+   /** Shaders containing built-in functions that are used for linking. */
+   struct gl_shader *builtins_to_link[16];
+   unsigned num_builtins_to_link;
 };
 
 
@@ -1976,15 +2113,41 @@ struct gl_shader_program
    /** User-defined attribute bindings (glBindAttribLocation) */
    struct gl_program_parameter_list *Attributes;
 
+   /** Transform feedback varyings */
+   struct {
+      GLenum BufferMode;
+      GLuint NumVarying;
+      GLchar **VaryingNames;  /**< Array [NumVarying] of char * */
+   } TransformFeedback;
+
+   /** Geometry shader state - copied into gl_geometry_program at link time */
+   struct {
+      GLint VerticesOut;
+      GLenum InputType;  /**< GL_POINTS, GL_LINES, GL_LINES_ADJACENCY_ARB,
+                              GL_TRIANGLES, or GL_TRIANGLES_ADJACENCY_ARB */
+      GLenum OutputType; /**< GL_POINTS, GL_LINE_STRIP or GL_TRIANGLE_STRIP */
+   } Geom;
+
    /* post-link info: */
    struct gl_vertex_program *VertexProgram;     /**< Linked vertex program */
    struct gl_fragment_program *FragmentProgram; /**< Linked fragment prog */
+   struct gl_geometry_program *GeometryProgram; /**< Linked geometry prog */
    struct gl_uniform_list *Uniforms;
    struct gl_program_parameter_list *Varying;
    GLboolean LinkStatus;   /**< GL_LINK_STATUS */
    GLboolean Validated;
    GLboolean _Used;        /**< Ever used for drawing? */
    GLchar *InfoLog;
+
+   unsigned Version;       /**< GLSL version used for linking */
+
+   /**
+    * Per-stage shaders resulting from the first stage of linking.
+    */
+   /*@{*/
+   GLuint _NumLinkedShaders;
+   struct gl_shader *_LinkedShaders[2];
+   /*@}*/
 };   
 
 
@@ -2004,17 +2167,89 @@ struct gl_shader_program
 struct gl_shader_state
 {
    struct gl_shader_program *CurrentProgram; /**< The user-bound program */
+   void *MemPool;
+
+   GLbitfield Flags;                    /**< Mask of GLSL_x flags */
+};
+
+/**
+ * Compiler options for a single GLSL shaders type
+ */
+struct gl_shader_compiler_options
+{
    /** Driver-selectable options: */
-   GLboolean EmitHighLevelInstructions; /**< IF/ELSE/ENDIF vs. BRA, etc. */
-   GLboolean EmitContReturn;            /**< Emit CONT/RET opcodes? */
    GLboolean EmitCondCodes;             /**< Use condition codes? */
-   GLboolean EmitComments;              /**< Annotated instructions */
    GLboolean EmitNVTempInitialization;  /**< 0-fill NV temp registers */
-   void *MemPool;
-   GLbitfield Flags;                    /**< Mask of GLSL_x flags */
+   /**
+    * Attempts to flatten all ir_if (OPCODE_IF) for GPUs that can't
+    * support control flow.
+    */
+   GLboolean EmitNoIfs;
+   GLboolean EmitNoLoops;
+   GLboolean EmitNoFunctions;
+   GLboolean EmitNoCont;                  /**< Emit CONT opcode? */
+   GLboolean EmitNoMainReturn;            /**< Emit CONT/RET opcodes? */
+   GLboolean EmitNoNoise;                 /**< Emit NOISE opcodes? */
+
+   /**
+    * \name Forms of indirect addressing the driver cannot do.
+    */
+   /*@{*/
+   GLboolean EmitNoIndirectInput;   /**< No indirect addressing of inputs */
+   GLboolean EmitNoIndirectOutput;  /**< No indirect addressing of outputs */
+   GLboolean EmitNoIndirectTemp;    /**< No indirect addressing of temps */
+   GLboolean EmitNoIndirectUniform; /**< No indirect addressing of constants */
+   /*@}*/
+
+   GLuint MaxUnrollIterations;
+
    struct gl_sl_pragmas DefaultPragmas; /**< Default #pragma settings */
 };
 
+/**
+ * Transform feedback object state
+ */
+struct gl_transform_feedback_object
+{
+   GLuint Name;  /**< AKA the object ID */
+   GLint RefCount;
+   GLboolean Active;  /**< Is transform feedback enabled? */
+   GLboolean Paused;  /**< Is transform feedback paused? */
+
+   /** The feedback buffers */
+   GLuint BufferNames[MAX_FEEDBACK_ATTRIBS];
+   struct gl_buffer_object *Buffers[MAX_FEEDBACK_ATTRIBS];
+
+   /** Start of feedback data in dest buffer */
+   GLintptr Offset[MAX_FEEDBACK_ATTRIBS];
+   /** Max data to put into dest buffer (in bytes) */
+   GLsizeiptr Size[MAX_FEEDBACK_ATTRIBS];
+};
+
+
+/**
+ * Context state for transform feedback.
+ */
+struct gl_transform_feedback
+{
+   GLenum Mode;       /**< GL_POINTS, GL_LINES or GL_TRIANGLES */
+
+   GLboolean RasterDiscard;  /**< GL_RASTERIZER_DISCARD */
+
+   /** The general binding point (GL_TRANSFORM_FEEDBACK_BUFFER) */
+   struct gl_buffer_object *CurrentBuffer;
+
+   /** The table of all transform feedback objects */
+   struct _mesa_HashTable *Objects;
+
+   /** The current xform-fb object (GL_TRANSFORM_FEEDBACK_BINDING) */
+   struct gl_transform_feedback_object *CurrentObject;
+
+   /** The default xform-fb object (Name==0) */
+   struct gl_transform_feedback_object *DefaultObject;
+};
+
+
 
 /**
  * State which can be shared by multiple contexts:
@@ -2047,40 +2282,30 @@ struct gl_shared_state
    struct gl_buffer_object *NullBufferObj;
 
    /**
-    * \name Vertex/fragment programs
+    * \name Vertex/geometry/fragment programs
     */
    /*@{*/
    struct _mesa_HashTable *Programs; /**< All vertex/fragment programs */
-#if FEATURE_ARB_vertex_program
    struct gl_vertex_program *DefaultVertexProgram;
-#endif
-#if FEATURE_ARB_fragment_program
    struct gl_fragment_program *DefaultFragmentProgram;
-#endif
+   struct gl_geometry_program *DefaultGeometryProgram;
    /*@}*/
 
-#if FEATURE_ATI_fragment_shader
+   /* GL_ATI_fragment_shader */
    struct _mesa_HashTable *ATIShaders;
    struct ati_fragment_shader *DefaultFragmentShader;
-#endif
 
-#if FEATURE_ARB_vertex_buffer_object || FEATURE_ARB_pixel_buffer_object
    struct _mesa_HashTable *BufferObjects;
-#endif
 
-#if FEATURE_ARB_shader_objects
    /** Table of both gl_shader and gl_shader_program objects */
    struct _mesa_HashTable *ShaderObjects;
-#endif
 
-#if FEATURE_EXT_framebuffer_object
+   /* GL_EXT_framebuffer_object */
    struct _mesa_HashTable *RenderBuffers;
    struct _mesa_HashTable *FrameBuffers;
-#endif
 
-#if FEATURE_ARB_sync
+   /* GL_ARB_sync */
    struct simple_node SyncObjects;
-#endif
 
    void *DriverData;  /**< Device driver shared state */
 };
@@ -2289,32 +2514,39 @@ struct gl_framebuffer
 
 
 /**
- * Limits for vertex and fragment programs.
+ * Limits for vertex and fragment programs/shaders.
  */
 struct gl_program_constants
 {
    /* logical limits */
    GLuint MaxInstructions;
-   GLuint MaxAluInstructions; /* fragment programs only, for now */
-   GLuint MaxTexInstructions; /* fragment programs only, for now */
-   GLuint MaxTexIndirections; /* fragment programs only, for now */
+   GLuint MaxAluInstructions;
+   GLuint MaxTexInstructions;
+   GLuint MaxTexIndirections;
    GLuint MaxAttribs;
    GLuint MaxTemps;
-   GLuint MaxAddressRegs; /* vertex program only, for now */
+   GLuint MaxAddressRegs;
    GLuint MaxParameters;
    GLuint MaxLocalParams;
    GLuint MaxEnvParams;
    /* native/hardware limits */
    GLuint MaxNativeInstructions;
-   GLuint MaxNativeAluInstructions; /* fragment programs only, for now */
-   GLuint MaxNativeTexInstructions; /* fragment programs only, for now */
-   GLuint MaxNativeTexIndirections; /* fragment programs only, for now */
+   GLuint MaxNativeAluInstructions;
+   GLuint MaxNativeTexInstructions;
+   GLuint MaxNativeTexIndirections;
    GLuint MaxNativeAttribs;
    GLuint MaxNativeTemps;
-   GLuint MaxNativeAddressRegs; /* vertex program only, for now */
+   GLuint MaxNativeAddressRegs;
    GLuint MaxNativeParameters;
    /* For shaders */
    GLuint MaxUniformComponents;
+   /* GL_ARB_geometry_shader4 */
+   GLuint MaxGeometryTextureImageUnits;
+   GLuint MaxGeometryVaryingComponents;
+   GLuint MaxVertexVaryingComponents;
+   GLuint MaxGeometryUniformComponents;
+   GLuint MaxGeometryOutputVertices;
+   GLuint MaxGeometryTotalOutputComponents;
 };
 
 
@@ -2361,6 +2593,7 @@ struct gl_constants
 
    struct gl_program_constants VertexProgram;   /**< GL_ARB_vertex_program */
    struct gl_program_constants FragmentProgram; /**< GL_ARB_fragment_program */
+   struct gl_program_constants GeometryProgram;  /**< GL_ARB_geometry_shader4 */
    GLuint MaxProgramMatrices;
    GLuint MaxProgramMatrixStackDepth;
 
@@ -2375,16 +2608,29 @@ struct gl_constants
 
    GLuint MaxVarying;  /**< Number of float[4] varying parameters */
 
-   GLbitfield SupportedBumpUnits; /**> units supporting GL_ATI_envmap_bumpmap as targets */
+   GLuint GLSLVersion;  /**< GLSL version supported (ex: 120 = 1.20) */
+
+   /** Which texture units support GL_ATI_envmap_bumpmap as targets */
+   GLbitfield SupportedBumpUnits;
 
    /**
     * Maximum amount of time, measured in nanseconds, that the server can wait.
     */
    GLuint64 MaxServerWaitTimeout;
 
-
-   /**< GL_EXT_provoking_vertex */
+   /** GL_EXT_provoking_vertex */
    GLboolean QuadsFollowProvokingVertexConvention;
+
+   /** OpenGL version 3.0 */
+   GLbitfield ContextFlags;  /**< Ex: GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT */
+
+   /** OpenGL version 3.2 */
+   GLbitfield ProfileMask;   /**< Mask of CONTEXT_x_PROFILE_BIT */
+
+   /** GL_EXT_transform_feedback */
+   GLuint MaxTransformFeedbackSeparateAttribs;
+   GLuint MaxTransformFeedbackSeparateComponents;
+   GLuint MaxTransformFeedbackInterleavedComponents;
 };
 
 
@@ -2395,32 +2641,40 @@ struct gl_constants
 struct gl_extensions
 {
    GLboolean dummy;  /* don't remove this! */
+   GLboolean ARB_blend_func_extended;
    GLboolean ARB_copy_buffer;
-   GLboolean ARB_depth_texture;
+   GLboolean ARB_depth_buffer_float;
    GLboolean ARB_depth_clamp;
+   GLboolean ARB_depth_texture;
    GLboolean ARB_draw_buffers;
    GLboolean ARB_draw_elements_base_vertex;
+   GLboolean ARB_draw_instanced;
    GLboolean ARB_fragment_coord_conventions;
    GLboolean ARB_fragment_program;
    GLboolean ARB_fragment_program_shadow;
    GLboolean ARB_fragment_shader;
    GLboolean ARB_framebuffer_object;
+   GLboolean ARB_explicit_attrib_location;
+   GLboolean ARB_geometry_shader4;
    GLboolean ARB_half_float_pixel;
    GLboolean ARB_half_float_vertex;
    GLboolean ARB_imaging;
+   GLboolean ARB_instanced_arrays;
    GLboolean ARB_map_buffer_range;
    GLboolean ARB_multisample;
    GLboolean ARB_multitexture;
    GLboolean ARB_occlusion_query;
+   GLboolean ARB_occlusion_query2;
    GLboolean ARB_point_sprite;
+   GLboolean ARB_sampler_objects;
    GLboolean ARB_seamless_cube_map;
    GLboolean ARB_shader_objects;
    GLboolean ARB_shading_language_100;
-   GLboolean ARB_shading_language_120;
    GLboolean ARB_shadow;
-   GLboolean ARB_shadow_ambient; /* or GL_ARB_shadow_ambient */
+   GLboolean ARB_shadow_ambient;
    GLboolean ARB_sync;
    GLboolean ARB_texture_border_clamp;
+   GLboolean ARB_texture_buffer_object;
    GLboolean ARB_texture_compression;
    GLboolean ARB_texture_cube_map;
    GLboolean ARB_texture_env_combine;
@@ -2428,12 +2682,19 @@ struct gl_extensions
    GLboolean ARB_texture_env_dot3;
    GLboolean ARB_texture_float;
    GLboolean ARB_texture_mirrored_repeat;
+   GLboolean ARB_texture_multisample;
    GLboolean ARB_texture_non_power_of_two;
+   GLboolean ARB_texture_rg;
+   GLboolean ARB_texture_rgb10_a2ui;
+   GLboolean ARB_timer_query;
+   GLboolean ARB_transform_feedback2;
    GLboolean ARB_transpose_matrix;
+   GLboolean ARB_uniform_buffer_object;
    GLboolean ARB_vertex_array_object;
    GLboolean ARB_vertex_buffer_object;
    GLboolean ARB_vertex_program;
    GLboolean ARB_vertex_shader;
+   GLboolean ARB_vertex_type_2_10_10_10_rev;
    GLboolean ARB_window_pos;
    GLboolean EXT_abgr;
    GLboolean EXT_bgra;
@@ -2455,11 +2716,13 @@ struct gl_extensions
    GLboolean EXT_framebuffer_blit;
    GLboolean EXT_framebuffer_multisample;
    GLboolean EXT_framebuffer_object;
+   GLboolean EXT_framebuffer_sRGB;
    GLboolean EXT_gpu_program_parameters;
    GLboolean EXT_histogram;
    GLboolean EXT_multi_draw_arrays;
    GLboolean EXT_paletted_texture;
    GLboolean EXT_packed_depth_stencil;
+   GLboolean EXT_packed_float;
    GLboolean EXT_packed_pixels;
    GLboolean EXT_pixel_buffer_object;
    GLboolean EXT_point_parameters;
@@ -2478,14 +2741,18 @@ struct gl_extensions
    GLboolean EXT_texture3D;
    GLboolean EXT_texture_array;
    GLboolean EXT_texture_compression_s3tc;
+   GLboolean EXT_texture_compression_rgtc;
    GLboolean EXT_texture_env_add;
    GLboolean EXT_texture_env_combine;
    GLboolean EXT_texture_env_dot3;
    GLboolean EXT_texture_filter_anisotropic;
+   GLboolean EXT_texture_integer;
    GLboolean EXT_texture_lod_bias;
    GLboolean EXT_texture_mirror_clamp;
+   GLboolean EXT_texture_shared_exponent;
    GLboolean EXT_texture_sRGB;
    GLboolean EXT_texture_swizzle;
+   GLboolean EXT_transform_feedback;
    GLboolean EXT_timer_query;
    GLboolean EXT_vertex_array;
    GLboolean EXT_vertex_array_bgra;
@@ -2514,6 +2781,7 @@ struct gl_extensions
    GLboolean NV_fragment_program_option;
    GLboolean NV_light_max_exponent;
    GLboolean NV_point_sprite;
+   GLboolean NV_primitive_restart;
    GLboolean NV_texgen_reflection;
    GLboolean NV_texture_env_combine4;
    GLboolean NV_texture_rectangle;
@@ -2528,9 +2796,8 @@ struct gl_extensions
    GLboolean SGIS_texture_lod;
    GLboolean TDFX_texture_compression_FXT1;
    GLboolean S3_s3tc;
-#if FEATURE_OES_draw_texture
+   GLboolean OES_EGL_image;
    GLboolean OES_draw_texture;
-#endif /* FEATURE_OES_draw_texture */
    /** The extension string */
    const GLubyte *String;
    /** Number of supported extensions */
@@ -2815,6 +3082,14 @@ struct gl_dlist_state
    } Current;
 };
 
+/**
+ * Enum for the OpenGL APIs we know about and may support.
+ */
+typedef enum {
+   API_OPENGL,
+   API_OPENGLES,
+   API_OPENGLES2
+} gl_api;
 
 /**
  * Mesa rendering context.
@@ -2833,6 +3108,7 @@ struct __GLcontextRec
 
    /** \name API function pointer tables */
    /*@{*/
+   gl_api API;
    struct _glapi_table *Save;	/**< Display list save functions */
    struct _glapi_table *Exec;	/**< Execute functions */
    struct _glapi_table *CurrentDispatch;  /**< == Save or Exec !! */
@@ -2947,21 +3223,24 @@ struct __GLcontextRec
    struct gl_program_state Program;  /**< general program state */
    struct gl_vertex_program_state VertexProgram;
    struct gl_fragment_program_state FragmentProgram;
+   struct gl_geometry_program_state GeometryProgram;
    struct gl_ati_fragment_shader_state ATIFragmentShader;
 
    struct gl_shader_state Shader; /**< GLSL shader object state */
+   struct gl_shader_compiler_options ShaderCompilerOptions[MESA_SHADER_TYPES];
 
    struct gl_query_state Query;  /**< occlusion, timer queries */
 
+   struct gl_transform_feedback TransformFeedback;
+
    struct gl_buffer_object *CopyReadBuffer; /**< GL_ARB_copy_buffer */
    struct gl_buffer_object *CopyWriteBuffer; /**< GL_ARB_copy_buffer */
    /*@}*/
 
    struct gl_meta_state *Meta;  /**< for "meta" operations */
 
-#if FEATURE_EXT_framebuffer_object
+   /* GL_EXT_framebuffer_object */
    struct gl_renderbuffer *CurrentRenderbuffer;
-#endif
 
    GLenum ErrorValue;        /**< Last error code */
 
diff --git a/mesalib/src/mesa/main/multisample.h b/mesalib/src/mesa/main/multisample.h
index 4305900cc..998488ef4 100644
--- a/mesalib/src/mesa/main/multisample.h
+++ b/mesalib/src/mesa/main/multisample.h
@@ -26,6 +26,7 @@
 #ifndef MULTISAMPLE_H
 #define MULTISAMPLE_H
 
+#include "mtypes.h"
 
 extern void GLAPIENTRY
 _mesa_SampleCoverageARB(GLclampf value, GLboolean invert);
diff --git a/mesalib/src/mesa/shader/nvprogram.c b/mesalib/src/mesa/main/nvprogram.c
index 19020be42..3a570b7dd 100644
--- a/mesalib/src/mesa/shader/nvprogram.c
+++ b/mesalib/src/mesa/main/nvprogram.c
@@ -42,13 +42,13 @@
 #include "main/hash.h"
 #include "main/imports.h"
 #include "main/macros.h"
-#include "program.h"
-#include "prog_parameter.h"
-#include "prog_instruction.h"
-#include "nvfragparse.h"
-#include "nvvertparse.h"
-#include "arbprogparse.h"
-#include "nvprogram.h"
+#include "main/nvprogram.h"
+#include "program/arbprogparse.h"
+#include "program/nvfragparse.h"
+#include "program/nvvertparse.h"
+#include "program/program.h"
+#include "program/prog_instruction.h"
+#include "program/prog_parameter.h"
 
 
 
@@ -516,8 +516,10 @@ _mesa_emit_nv_temp_initialization(GLcontext *ctx,
 {
    struct prog_instruction *inst;
    GLuint i;
+   struct gl_shader_compiler_options* options =
+         &ctx->ShaderCompilerOptions[_mesa_program_target_to_index(program->Target)];
 
-   if (!ctx->Shader.EmitNVTempInitialization)
+   if (!options->EmitNVTempInitialization)
       return;
 
    /* We'll swizzle up a zero temporary so we can use it for the
diff --git a/mesalib/src/mesa/shader/nvprogram.h b/mesalib/src/mesa/main/nvprogram.h
index 8ee59661b..260a25ba9 100644
--- a/mesalib/src/mesa/shader/nvprogram.h
+++ b/mesalib/src/mesa/main/nvprogram.h
@@ -29,6 +29,8 @@
 #ifndef NVPROGRAM_H
 #define NVPROGRAM_H
 
+#include "glheader.h"
+#include "mtypes.h"
 
 extern void GLAPIENTRY
 _mesa_ExecuteProgramNV(GLenum target, GLuint id, const GLfloat *params);
diff --git a/mesalib/src/mesa/main/pixelstore.h b/mesalib/src/mesa/main/pixelstore.h
index ee963f9ba..47bff4276 100644
--- a/mesalib/src/mesa/main/pixelstore.h
+++ b/mesalib/src/mesa/main/pixelstore.h
@@ -33,6 +33,7 @@
 
 
 #include "glheader.h"
+#include "mtypes.h"
 
 
 extern void GLAPIENTRY
diff --git a/mesalib/src/mesa/main/querymatrix.c b/mesalib/src/mesa/main/querymatrix.c
new file mode 100644
index 000000000..36236eb9a
--- /dev/null
+++ b/mesalib/src/mesa/main/querymatrix.c
@@ -0,0 +1,216 @@
+/**************************************************************************
+ *
+ * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ *
+ **************************************************************************/
+
+
+/**
+ * Code to implement GL_OES_query_matrix.  See the spec at:
+ * http://www.khronos.org/registry/gles/extensions/OES/OES_query_matrix.txt
+ */
+
+
+#include <stdlib.h>
+#include <math.h>
+#include "GLES/gl.h"
+#include "GLES/glext.h"
+
+
+/**
+ * This is from the GL_OES_query_matrix extension specification:
+ *
+ *  GLbitfield glQueryMatrixxOES( GLfixed mantissa[16],
+ *                                GLint   exponent[16] )
+ *  mantissa[16] contains the contents of the current matrix in GLfixed
+ *  format.  exponent[16] contains the unbiased exponents applied to the
+ *  matrix components, so that the internal representation of component i
+ *  is close to mantissa[i] * 2^exponent[i].  The function returns a status
+ *  word which is zero if all the components are valid. If
+ *  status & (1<<i) != 0, the component i is invalid (e.g., NaN, Inf).
+ *  The implementations are not required to keep track of overflows.  In
+ *  that case, the invalid bits are never set.
+ */
+
+#define INT_TO_FIXED(x) ((GLfixed) ((x) << 16))
+#define FLOAT_TO_FIXED(x) ((GLfixed) ((x) * 65536.0))
+
+#if defined(_MSC_VER)
+/* Oddly, the fpclassify() function doesn't exist in such a form
+ * on MSVC.  This is an implementation using slightly different
+ * lower-level Windows functions.
+ */
+#include <float.h>
+
+enum {FP_NAN, FP_INFINITE, FP_ZERO, FP_SUBNORMAL, FP_NORMAL}
+fpclassify(double x)
+{
+    switch(_fpclass(x)) {
+        case _FPCLASS_SNAN: /* signaling NaN */
+        case _FPCLASS_QNAN: /* quiet NaN */
+            return FP_NAN;
+        case _FPCLASS_NINF: /* negative infinity */
+        case _FPCLASS_PINF: /* positive infinity */
+            return FP_INFINITE;
+        case _FPCLASS_NN:   /* negative normal */
+        case _FPCLASS_PN:   /* positive normal */
+            return FP_NORMAL;
+        case _FPCLASS_ND:   /* negative denormalized */
+        case _FPCLASS_PD:   /* positive denormalized */
+            return FP_SUBNORMAL;
+        case _FPCLASS_NZ:   /* negative zero */
+        case _FPCLASS_PZ:   /* positive zero */
+            return FP_ZERO;
+        default:
+            /* Should never get here; but if we do, this will guarantee
+             * that the pattern is not treated like a number.
+             */
+            return FP_NAN;
+    }
+}
+
+#elif defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__) || \
+     defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || \
+     (defined(__sun) && defined(__C99FEATURES__)) || defined(__MINGW32__) || \
+     (defined(__sun) && defined(__GNUC__))
+
+/* fpclassify is available. */
+
+#elif !defined(_XOPEN_SOURCE) || _XOPEN_SOURCE < 600
+
+enum {FP_NAN, FP_INFINITE, FP_ZERO, FP_SUBNORMAL, FP_NORMAL}
+fpclassify(double x)
+{
+   /* XXX do something better someday */
+   return FP_NORMAL;
+}
+
+#endif
+
+extern GLbitfield GL_APIENTRY _es_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16]);
+
+/* The Mesa functions we'll need */
+extern void GL_APIENTRY _mesa_GetIntegerv(GLenum pname, GLint *params);
+extern void GL_APIENTRY _mesa_GetFloatv(GLenum pname, GLfloat *params);
+
+GLbitfield GL_APIENTRY _es_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16])
+{
+    GLfloat matrix[16];
+    GLint tmp;
+    GLenum currentMode = GL_FALSE;
+    GLenum desiredMatrix = GL_FALSE;
+    /* The bitfield returns 1 for each component that is invalid (i.e.
+     * NaN or Inf).  In case of error, everything is invalid.
+     */
+    GLbitfield rv;
+    register unsigned int i;
+    unsigned int bit;
+
+    /* This data structure defines the mapping between the current matrix
+     * mode and the desired matrix identifier.
+     */
+    static struct {
+        GLenum currentMode;
+        GLenum desiredMatrix;
+    } modes[] = {
+        {GL_MODELVIEW, GL_MODELVIEW_MATRIX},
+        {GL_PROJECTION, GL_PROJECTION_MATRIX},
+        {GL_TEXTURE, GL_TEXTURE_MATRIX},
+#if 0
+        /* this doesn't exist in GLES */
+        {GL_COLOR, GL_COLOR_MATRIX},
+#endif
+    };
+
+    /* Call Mesa to get the current matrix in floating-point form.  First,
+     * we have to figure out what the current matrix mode is.
+     */
+    _mesa_GetIntegerv(GL_MATRIX_MODE, &tmp);
+    currentMode = (GLenum) tmp;
+
+    /* The mode is either GL_FALSE, if for some reason we failed to query
+     * the mode, or a given mode from the above table.  Search for the
+     * returned mode to get the desired matrix; if we don't find it,
+     * we can return immediately, as _mesa_GetInteger() will have
+     * logged the necessary error already.
+     */
+    for (i = 0; i < sizeof(modes)/sizeof(modes[0]); i++) {
+        if (modes[i].currentMode == currentMode) {
+            desiredMatrix = modes[i].desiredMatrix;
+            break;
+        }
+    }
+    if (desiredMatrix == GL_FALSE) {
+        /* Early error means all values are invalid. */
+        return 0xffff;
+    }
+
+    /* Now pull the matrix itself. */
+    _mesa_GetFloatv(desiredMatrix, matrix);
+
+    rv = 0;
+    for (i = 0, bit = 1; i < 16; i++, bit<<=1) {
+        float normalizedFraction;
+        int exp;
+
+        switch (fpclassify(matrix[i])) {
+            /* A "subnormal" or denormalized number is too small to be
+             * represented in normal format; but despite that it's a
+             * valid floating point number.  FP_ZERO and FP_NORMAL
+             * are both valid as well.  We should be fine treating
+             * these three cases as legitimate floating-point numbers.
+             */
+            case FP_SUBNORMAL:
+            case FP_NORMAL:
+            case FP_ZERO:
+                normalizedFraction = (GLfloat)frexp(matrix[i], &exp);
+                mantissa[i] = FLOAT_TO_FIXED(normalizedFraction);
+                exponent[i] = (GLint) exp;
+                break;
+
+            /* If the entry is not-a-number or an infinity, then the
+             * matrix component is invalid.  The invalid flag for
+             * the component is already set; might as well set the
+             * other return values to known values.  We'll set
+             * distinct values so that a savvy end user could determine
+             * whether the matrix component was a NaN or an infinity,
+             * but this is more useful for debugging than anything else
+             * since the standard doesn't specify any such magic
+             * values to return.
+             */
+            case FP_NAN:
+                mantissa[i] = INT_TO_FIXED(0);
+                exponent[i] = (GLint) 0;
+                rv |= bit;
+                break;
+
+            case FP_INFINITE:
+                /* Return +/- 1 based on whether it's a positive or
+                 * negative infinity.
+                 */
+                if (matrix[i] > 0) {
+                    mantissa[i] = INT_TO_FIXED(1);
+                }
+                else {
+                    mantissa[i] = -INT_TO_FIXED(1);
+                }
+                exponent[i] = (GLint) 0;
+                rv |= bit;
+                break;
+
+            /* We should never get here; but here's a catching case
+             * in case fpclassify() is returnings something unexpected.
+             */
+            default:
+                mantissa[i] = INT_TO_FIXED(2);
+                exponent[i] = (GLint) 0;
+                rv |= bit;
+                break;
+        }
+
+    } /* for each component */
+
+    /* All done */
+    return rv;
+}
diff --git a/mesalib/src/mesa/main/queryobj.c b/mesalib/src/mesa/main/queryobj.c
index e14511a38..a907dac83 100644
--- a/mesalib/src/mesa/main/queryobj.c
+++ b/mesalib/src/mesa/main/queryobj.c
@@ -130,6 +130,42 @@ _mesa_init_query_object_functions(struct dd_function_table *driver)
 }
 
 
+/**
+ * Return pointer to the query object binding point for the given target.
+ * \return NULL if invalid target, else the address of binding point
+ */
+static struct gl_query_object **
+get_query_binding_point(GLcontext *ctx, GLenum target)
+{
+   switch (target) {
+   case GL_SAMPLES_PASSED_ARB:
+      if (ctx->Extensions.ARB_occlusion_query)
+         return &ctx->Query.CurrentOcclusionObject;
+      else
+         return NULL;
+   case GL_TIME_ELAPSED_EXT:
+      if (ctx->Extensions.EXT_timer_query)
+         return &ctx->Query.CurrentTimerObject;
+      else
+         return NULL;
+#if FEATURE_EXT_transform_feedback
+   case GL_PRIMITIVES_GENERATED:
+      if (ctx->Extensions.EXT_transform_feedback)
+         return &ctx->Query.PrimitivesGenerated;
+      else
+         return NULL;
+   case GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN:
+      if (ctx->Extensions.EXT_transform_feedback)
+         return &ctx->Query.PrimitivesWritten;
+      else
+         return NULL;
+#endif
+   default:
+      return NULL;
+   }
+}
+
+
 void GLAPIENTRY
 _mesa_GenQueriesARB(GLsizei n, GLuint *ids)
 {
@@ -214,36 +250,16 @@ _mesa_IsQueryARB(GLuint id)
 static void GLAPIENTRY
 _mesa_BeginQueryARB(GLenum target, GLuint id)
 {
-   struct gl_query_object *q;
+   struct gl_query_object *q, **bindpt;
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    FLUSH_VERTICES(ctx, _NEW_DEPTH);
 
-   switch (target) {
-      case GL_SAMPLES_PASSED_ARB:
-         if (!ctx->Extensions.ARB_occlusion_query) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glBeginQueryARB(target)");
-            return;
-         }
-         if (ctx->Query.CurrentOcclusionObject) {
-            _mesa_error(ctx, GL_INVALID_OPERATION, "glBeginQueryARB");
-            return;
-         }
-         break;
-      case GL_TIME_ELAPSED_EXT:
-         if (!ctx->Extensions.EXT_timer_query) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glBeginQueryARB(target)");
-            return;
-         }
-         if (ctx->Query.CurrentTimerObject) {
-            _mesa_error(ctx, GL_INVALID_OPERATION, "glBeginQueryARB");
-            return;
-         }
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glBeginQueryARB(target)");
-         return;
+   bindpt = get_query_binding_point(ctx, target);
+   if (!bindpt) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glBeginQueryARB(target)");
+      return;
    }
 
    if (id == 0) {
@@ -275,12 +291,8 @@ _mesa_BeginQueryARB(GLenum target, GLuint id)
    q->Result = 0;
    q->Ready = GL_FALSE;
 
-   if (target == GL_SAMPLES_PASSED_ARB) {
-      ctx->Query.CurrentOcclusionObject = q;
-   }
-   else if (target == GL_TIME_ELAPSED_EXT) {
-      ctx->Query.CurrentTimerObject = q;
-   }
+   /* XXX should probably refcount query objects */
+   *bindpt = q;
 
    ctx->Driver.BeginQuery(ctx, q);
 }
@@ -289,34 +301,22 @@ _mesa_BeginQueryARB(GLenum target, GLuint id)
 static void GLAPIENTRY
 _mesa_EndQueryARB(GLenum target)
 {
-   struct gl_query_object *q;
+   struct gl_query_object *q, **bindpt;
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    FLUSH_VERTICES(ctx, _NEW_DEPTH);
 
-   switch (target) {
-      case GL_SAMPLES_PASSED_ARB:
-         if (!ctx->Extensions.ARB_occlusion_query) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glEndQueryARB(target)");
-            return;
-         }
-         q = ctx->Query.CurrentOcclusionObject;
-         ctx->Query.CurrentOcclusionObject = NULL;
-         break;
-      case GL_TIME_ELAPSED_EXT:
-         if (!ctx->Extensions.EXT_timer_query) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glEndQueryARB(target)");
-            return;
-         }
-         q = ctx->Query.CurrentTimerObject;
-         ctx->Query.CurrentTimerObject = NULL;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glEndQueryARB(target)");
-         return;
+   bindpt = get_query_binding_point(ctx, target);
+   if (!bindpt) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glEndQueryARB(target)");
+      return;
    }
 
+   /* XXX should probably refcount query objects */
+   q = *bindpt;
+   *bindpt = NULL;
+
    if (!q || !q->Active) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
                   "glEndQueryARB(no matching glBeginQueryARB)");
@@ -331,30 +331,18 @@ _mesa_EndQueryARB(GLenum target)
 void GLAPIENTRY
 _mesa_GetQueryivARB(GLenum target, GLenum pname, GLint *params)
 {
-   struct gl_query_object *q;
+   struct gl_query_object *q, **bindpt;
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-   switch (target) {
-      case GL_SAMPLES_PASSED_ARB:
-         if (!ctx->Extensions.ARB_occlusion_query) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glEndQueryARB(target)");
-            return;
-         }
-         q = ctx->Query.CurrentOcclusionObject;
-         break;
-      case GL_TIME_ELAPSED_EXT:
-         if (!ctx->Extensions.EXT_timer_query) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glEndQueryARB(target)");
-            return;
-         }
-         q = ctx->Query.CurrentTimerObject;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryivARB(target)");
-         return;
+   bindpt = get_query_binding_point(ctx, target);
+   if (!bindpt) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryARB(target)");
+      return;
    }
 
+   q = *bindpt;
+
    switch (pname) {
       case GL_QUERY_COUNTER_BITS_ARB:
          *params = 8 * sizeof(q->Result);
diff --git a/mesalib/src/mesa/main/queryobj.h b/mesalib/src/mesa/main/queryobj.h
index ba8b5dd00..8746ed15e 100644
--- a/mesalib/src/mesa/main/queryobj.h
+++ b/mesalib/src/mesa/main/queryobj.h
@@ -33,17 +33,6 @@
 
 #if FEATURE_queryobj
 
-#define _MESA_INIT_QUERYOBJ_FUNCTIONS(driver, impl)      \
-   do {                                                  \
-      (driver)->NewQueryObject = impl ## NewQueryObject; \
-      (driver)->DeleteQuery    = impl ## DeleteQuery;    \
-      (driver)->BeginQuery     = impl ## BeginQuery;     \
-      (driver)->EndQuery       = impl ## EndQuery;       \
-      (driver)->WaitQuery      = impl ## WaitQuery;      \
-      (driver)->CheckQuery     = impl ## CheckQuery;     \
-   } while (0)
-
-
 static INLINE struct gl_query_object *
 _mesa_lookup_query_object(GLcontext *ctx, GLuint id)
 {
@@ -78,7 +67,11 @@ _mesa_init_queryobj_dispatch(struct _glapi_table *disp);
 
 #else /* FEATURE_queryobj */
 
-#define _MESA_INIT_QUERYOBJ_FUNCTIONS(driver, impl) do { } while (0)
+static INLINE struct gl_query_object *
+_mesa_lookup_query_object(GLcontext *ctx, GLuint id)
+{
+   return NULL;
+}
 
 static INLINE void
 _mesa_init_query_object_functions(struct dd_function_table *driver)
diff --git a/mesalib/src/mesa/main/rastpos.h b/mesalib/src/mesa/main/rastpos.h
index b2127225b..4994616d4 100644
--- a/mesalib/src/mesa/main/rastpos.h
+++ b/mesalib/src/mesa/main/rastpos.h
@@ -37,18 +37,11 @@
 
 #if FEATURE_rastpos
 
-#define _MESA_INIT_RASTPOS_FUNCTIONS(driver, impl) \
-   do {                                            \
-      (driver)->RasterPos = impl ## RasterPos;     \
-   } while (0)
-
 extern void
 _mesa_init_rastpos_dispatch(struct _glapi_table *disp);
 
 #else /* FEATURE_rastpos */
 
-#define _MESA_INIT_RASTPOS_FUNCTIONS(driver, impl) do { } while (0)
-
 static INLINE void
 _mesa_init_rastpos_dispatch(struct _glapi_table *disp)
 {
diff --git a/mesalib/src/mesa/main/rbadaptors.c b/mesalib/src/mesa/main/rbadaptors.c
deleted file mode 100644
index 1060c5796..000000000
--- a/mesalib/src/mesa/main/rbadaptors.c
+++ /dev/null
@@ -1,565 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.3
- *
- * 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.
- */
-
-
-/**
- * Renderbuffer adaptors.
- * These fuctions are used to convert rendering from core Mesa's GLchan
- * colors to 8 or 16-bit color channels in RGBA renderbuffers.
- * This means Mesa can be compiled for 16 or 32-bit color processing
- * and still render into 8 and 16-bit/channel renderbuffers.
- */
-
-
-#include "glheader.h"
-#include "mtypes.h"
-#include "colormac.h"
-#include "renderbuffer.h"
-#include "rbadaptors.h"
-
-
-static void
-Delete_wrapper(struct gl_renderbuffer *rb)
-{
-   /* Decrement reference count on the buffer we're wrapping and delete
-    * it if refcount hits zero.
-    */
-   _mesa_reference_renderbuffer(&rb->Wrapped, NULL);
-
-   /* delete myself */
-   _mesa_delete_renderbuffer(rb);
-}
-
-
-static GLboolean
-AllocStorage_wrapper(GLcontext *ctx, struct gl_renderbuffer *rb,
-                     GLenum internalFormat, GLuint width, GLuint height)
-{
-   GLboolean b = rb->Wrapped->AllocStorage(ctx, rb->Wrapped, internalFormat,
-                                           width, height);
-   if (b) {
-      rb->Width = width;
-      rb->Height = height;
-   }
-   return b;
-}
-
-
-static void *
-GetPointer_wrapper(GLcontext *ctx, struct gl_renderbuffer *rb,
-                   GLint x, GLint y)
-{
-   (void) ctx;
-   (void) rb;
-   (void) x;
-   (void) y;
-   return NULL;
-}
-
-
-static void
-GetRow_16wrap8(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
-               GLint x, GLint y, void *values)
-{
-   GLubyte values8[MAX_WIDTH * 4];
-   GLushort *values16 = (GLushort *) values;
-   GLuint i;
-   ASSERT(rb->DataType == GL_UNSIGNED_SHORT);
-   ASSERT(rb->Wrapped->DataType == GL_UNSIGNED_BYTE);
-   ASSERT(count <= MAX_WIDTH);
-
-   /* get 8bpp values */
-   rb->Wrapped->GetRow(ctx, rb->Wrapped, count, x, y, values8);
-
-   /* convert 8bpp to 16bpp */
-   for (i = 0; i < 4 * count; i++) {
-      values16[i] = (values8[i] << 8) | values8[i];
-   }
-}
-
-
-static void
-GetValues_16wrap8(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
-                  const GLint x[], const GLint y[], void *values)
-{
-   GLubyte values8[MAX_WIDTH * 4];
-   GLushort *values16 = (GLushort *) values;
-   GLuint i;
-   ASSERT(rb->DataType == GL_UNSIGNED_SHORT);
-   ASSERT(rb->Wrapped->DataType == GL_UNSIGNED_BYTE);
-
-   rb->Wrapped->GetValues(ctx, rb->Wrapped, count, x, y, values8);
-
-   for (i = 0; i < 4 * count; i++) {
-      values16[i] = (values8[i] << 8) | values8[i];
-   }
-}
-
-
-static void
-PutRow_16wrap8(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
-               GLint x, GLint y, const void *values, const GLubyte *mask)
-{
-   GLubyte values8[MAX_WIDTH * 4];
-   GLushort *values16 = (GLushort *) values;
-   GLuint i;
-   ASSERT(rb->DataType == GL_UNSIGNED_SHORT);
-   ASSERT(rb->Wrapped->DataType == GL_UNSIGNED_BYTE);
-   for (i = 0; i < 4 * count; i++) {
-      values8[i] = values16[i] >> 8;
-   }
-   rb->Wrapped->PutRow(ctx, rb->Wrapped, count, x, y, values8, mask);
-}
-
-
-static void
-PutRowRGB_16wrap8(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
-                  GLint x, GLint y, const void *values, const GLubyte *mask)
-{
-   GLubyte values8[MAX_WIDTH * 3];
-   GLushort *values16 = (GLushort *) values;
-   GLuint i;
-   ASSERT(rb->DataType == GL_UNSIGNED_SHORT);
-   ASSERT(rb->Wrapped->DataType == GL_UNSIGNED_BYTE);
-   for (i = 0; i < 3 * count; i++) {
-      values8[i] = values16[i] >> 8;
-   }
-   rb->Wrapped->PutRowRGB(ctx, rb->Wrapped, count, x, y, values8, mask);
-}
-
-
-static void
-PutMonoRow_16wrap8(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
-                   GLint x, GLint y, const void *value, const GLubyte *mask)
-{
-   GLubyte value8[4];
-   GLushort *value16 = (GLushort *) value;
-   ASSERT(rb->DataType == GL_UNSIGNED_SHORT);
-   ASSERT(rb->Wrapped->DataType == GL_UNSIGNED_BYTE);
-   value8[0] = value16[0] >> 8;
-   value8[1] = value16[1] >> 8;
-   value8[2] = value16[2] >> 8;
-   value8[3] = value16[3] >> 8;
-   rb->Wrapped->PutMonoRow(ctx, rb->Wrapped, count, x, y, value8, mask);
-}
-
-
-static void
-PutValues_16wrap8(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
-                  const GLint x[], const GLint y[], const void *values,
-                  const GLubyte *mask)
-{
-   GLubyte values8[MAX_WIDTH * 4];
-   GLushort *values16 = (GLushort *) values;
-   GLuint i;
-   ASSERT(rb->DataType == GL_UNSIGNED_SHORT);
-   ASSERT(rb->Wrapped->DataType == GL_UNSIGNED_BYTE);
-   for (i = 0; i < 4 * count; i++) {
-      values8[i] = values16[i] >> 8;
-   }
-   rb->Wrapped->PutValues(ctx, rb->Wrapped, count, x, y, values8, mask);
-}
-
-
-static void
-PutMonoValues_16wrap8(GLcontext *ctx, struct gl_renderbuffer *rb,
-                      GLuint count, const GLint x[], const GLint y[],
-                      const void *value, const GLubyte *mask)
-{
-   GLubyte value8[4];
-   GLushort *value16 = (GLushort *) value;
-   ASSERT(rb->DataType == GL_UNSIGNED_SHORT);
-   ASSERT(rb->Wrapped->DataType == GL_UNSIGNED_BYTE);
-   value8[0] = value16[0] >> 8;
-   value8[1] = value16[1] >> 8;
-   value8[2] = value16[2] >> 8;
-   value8[3] = value16[3] >> 8;
-   rb->Wrapped->PutMonoValues(ctx, rb->Wrapped, count, x, y, value8, mask);
-}
-
-
-/**
- * Wrap an 8-bit/channel renderbuffer with a 16-bit/channel
- * renderbuffer adaptor.
- */
-struct gl_renderbuffer *
-_mesa_new_renderbuffer_16wrap8(GLcontext *ctx, struct gl_renderbuffer *rb8)
-{
-   struct gl_renderbuffer *rb16;
-
-   rb16 = _mesa_new_renderbuffer(ctx, rb8->Name);
-   if (rb16) {
-      ASSERT(rb8->DataType == GL_UNSIGNED_BYTE);
-      ASSERT(rb8->_BaseFormat == GL_RGBA);
-
-      _glthread_LOCK_MUTEX(rb8->Mutex);
-      rb8->RefCount++;
-      _glthread_UNLOCK_MUTEX(rb8->Mutex);
-
-      rb16->InternalFormat = rb8->InternalFormat;
-      rb16->Format = rb8->Format; /* XXX is this right? */
-      rb16->_BaseFormat = rb8->_BaseFormat;
-      rb16->DataType = GL_UNSIGNED_SHORT;
-      /* Note: passing through underlying bits/channel */
-      rb16->Wrapped = rb8;
-
-      rb16->AllocStorage = AllocStorage_wrapper;
-      rb16->Delete = Delete_wrapper;
-      rb16->GetPointer = GetPointer_wrapper;
-      rb16->GetRow = GetRow_16wrap8;
-      rb16->GetValues = GetValues_16wrap8;
-      rb16->PutRow = PutRow_16wrap8;
-      rb16->PutRowRGB = PutRowRGB_16wrap8;
-      rb16->PutMonoRow = PutMonoRow_16wrap8;
-      rb16->PutValues = PutValues_16wrap8;
-      rb16->PutMonoValues = PutMonoValues_16wrap8;
-   }
-   return rb16;
-}
-
-
-
-
-static void
-GetRow_32wrap8(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
-               GLint x, GLint y, void *values)
-{
-   GLubyte values8[MAX_WIDTH * 4];
-   GLfloat *values32 = (GLfloat *) values;
-   GLuint i;
-   ASSERT(rb->DataType == GL_FLOAT);
-   ASSERT(rb->Wrapped->DataType == GL_UNSIGNED_BYTE);
-   ASSERT(count <= MAX_WIDTH);
-
-   /* get 8bpp values */
-   rb->Wrapped->GetRow(ctx, rb->Wrapped, count, x, y, values8);
-
-   /* convert 8bpp to 32bpp */
-   for (i = 0; i < 4 * count; i++) {
-      values32[i] = UBYTE_TO_FLOAT(values8[i]);
-   }
-}
-
-
-static void
-GetValues_32wrap8(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
-                  const GLint x[], const GLint y[], void *values)
-{
-   GLubyte values8[MAX_WIDTH * 4];
-   GLfloat *values32 = (GLfloat *) values;
-   GLuint i;
-   ASSERT(rb->DataType == GL_FLOAT);
-   ASSERT(rb->Wrapped->DataType == GL_UNSIGNED_BYTE);
-
-   rb->Wrapped->GetValues(ctx, rb->Wrapped, count, x, y, values8);
-
-   for (i = 0; i < 4 * count; i++) {
-      values32[i] = UBYTE_TO_FLOAT(values8[i]);
-   }
-}
-
-
-static void
-PutRow_32wrap8(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
-               GLint x, GLint y, const void *values, const GLubyte *mask)
-{
-   GLubyte values8[MAX_WIDTH * 4];
-   GLfloat *values32 = (GLfloat *) values;
-   GLuint i;
-   ASSERT(rb->DataType == GL_FLOAT);
-   ASSERT(rb->Wrapped->DataType == GL_UNSIGNED_BYTE);
-   for (i = 0; i < 4 * count; i++) {
-      UNCLAMPED_FLOAT_TO_UBYTE(values8[i], values32[i]);
-   }
-   rb->Wrapped->PutRow(ctx, rb->Wrapped, count, x, y, values8, mask);
-}
-
-
-static void
-PutRowRGB_32wrap8(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
-                  GLint x, GLint y, const void *values, const GLubyte *mask)
-{
-   GLubyte values8[MAX_WIDTH * 3];
-   GLfloat *values32 = (GLfloat *) values;
-   GLuint i;
-   ASSERT(rb->DataType == GL_FLOAT);
-   ASSERT(rb->Wrapped->DataType == GL_UNSIGNED_BYTE);
-   for (i = 0; i < 3 * count; i++) {
-      UNCLAMPED_FLOAT_TO_UBYTE(values8[i], values32[i]);
-   }
-   rb->Wrapped->PutRowRGB(ctx, rb->Wrapped, count, x, y, values8, mask);
-}
-
-
-static void
-PutMonoRow_32wrap8(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
-                   GLint x, GLint y, const void *value, const GLubyte *mask)
-{
-   GLubyte value8[4];
-   GLfloat *value32 = (GLfloat *) value;
-   ASSERT(rb->DataType == GL_FLOAT);
-   ASSERT(rb->Wrapped->DataType == GL_UNSIGNED_BYTE);
-   UNCLAMPED_FLOAT_TO_UBYTE(value8[0], value32[0]);
-   UNCLAMPED_FLOAT_TO_UBYTE(value8[1], value32[1]);
-   UNCLAMPED_FLOAT_TO_UBYTE(value8[2], value32[2]);
-   UNCLAMPED_FLOAT_TO_UBYTE(value8[3], value32[3]);
-   rb->Wrapped->PutMonoRow(ctx, rb->Wrapped, count, x, y, value8, mask);
-}
-
-
-static void
-PutValues_32wrap8(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
-                  const GLint x[], const GLint y[], const void *values,
-                  const GLubyte *mask)
-{
-   GLubyte values8[MAX_WIDTH * 4];
-   GLfloat *values32 = (GLfloat *) values;
-   GLuint i;
-   ASSERT(rb->DataType == GL_FLOAT);
-   ASSERT(rb->Wrapped->DataType == GL_UNSIGNED_BYTE);
-   for (i = 0; i < 4 * count; i++) {
-      UNCLAMPED_FLOAT_TO_UBYTE(values8[i], values32[i]);
-   }
-   rb->Wrapped->PutValues(ctx, rb->Wrapped, count, x, y, values8, mask);
-}
-
-
-static void
-PutMonoValues_32wrap8(GLcontext *ctx, struct gl_renderbuffer *rb,
-                      GLuint count, const GLint x[], const GLint y[],
-                      const void *value, const GLubyte *mask)
-{
-   GLubyte value8[4];
-   GLfloat *value32 = (GLfloat *) value;
-   ASSERT(rb->DataType == GL_FLOAT);
-   ASSERT(rb->Wrapped->DataType == GL_UNSIGNED_BYTE);
-   UNCLAMPED_FLOAT_TO_UBYTE(value8[0], value32[0]);
-   UNCLAMPED_FLOAT_TO_UBYTE(value8[1], value32[1]);
-   UNCLAMPED_FLOAT_TO_UBYTE(value8[2], value32[2]);
-   UNCLAMPED_FLOAT_TO_UBYTE(value8[3], value32[3]);
-   rb->Wrapped->PutMonoValues(ctx, rb->Wrapped, count, x, y, value8, mask);
-}
-
-
-/**
- * Wrap an 8-bit/channel renderbuffer with a 32-bit/channel
- * renderbuffer adaptor.
- */
-struct gl_renderbuffer *
-_mesa_new_renderbuffer_32wrap8(GLcontext *ctx, struct gl_renderbuffer *rb8)
-{
-   struct gl_renderbuffer *rb32;
-
-   rb32 = _mesa_new_renderbuffer(ctx, rb8->Name);
-   if (rb32) {
-      ASSERT(rb8->DataType == GL_UNSIGNED_BYTE);
-      ASSERT(rb8->_BaseFormat == GL_RGBA);
-
-      _glthread_LOCK_MUTEX(rb8->Mutex);
-      rb8->RefCount++;
-      _glthread_UNLOCK_MUTEX(rb8->Mutex);
-
-      rb32->InternalFormat = rb8->InternalFormat;
-      rb32->Format = rb8->Format;  /* XXX is this right? */
-      rb32->_BaseFormat = rb8->_BaseFormat;
-      rb32->DataType = GL_FLOAT;
-      /* Note: passing through underlying bits/channel */
-      rb32->Wrapped = rb8;
-
-      rb32->AllocStorage = AllocStorage_wrapper;
-      rb32->Delete = Delete_wrapper;
-      rb32->GetPointer = GetPointer_wrapper;
-      rb32->GetRow = GetRow_32wrap8;
-      rb32->GetValues = GetValues_32wrap8;
-      rb32->PutRow = PutRow_32wrap8;
-      rb32->PutRowRGB = PutRowRGB_32wrap8;
-      rb32->PutMonoRow = PutMonoRow_32wrap8;
-      rb32->PutValues = PutValues_32wrap8;
-      rb32->PutMonoValues = PutMonoValues_32wrap8;
-   }
-   return rb32;
-}
-
-
-
-
-static void
-GetRow_32wrap16(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
-                GLint x, GLint y, void *values)
-{
-   GLushort values16[MAX_WIDTH * 4];
-   GLfloat *values32 = (GLfloat *) values;
-   GLuint i;
-   ASSERT(rb->DataType == GL_FLOAT);
-   ASSERT(rb->Wrapped->DataType == GL_UNSIGNED_SHORT);
-   ASSERT(count <= MAX_WIDTH);
-
-   /* get 16bpp values */
-   rb->Wrapped->GetRow(ctx, rb->Wrapped, count, x, y, values16);
-
-   /* convert 16bpp to 32bpp */
-   for (i = 0; i < 4 * count; i++) {
-      values32[i] = USHORT_TO_FLOAT(values16[i]);
-   }
-}
-
-
-static void
-GetValues_32wrap16(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
-                   const GLint x[], const GLint y[], void *values)
-{
-   GLushort values16[MAX_WIDTH * 4];
-   GLfloat *values32 = (GLfloat *) values;
-   GLuint i;
-   ASSERT(rb->DataType == GL_FLOAT);
-   ASSERT(rb->Wrapped->DataType == GL_UNSIGNED_SHORT);
-
-   rb->Wrapped->GetValues(ctx, rb->Wrapped, count, x, y, values16);
-
-   for (i = 0; i < 4 * count; i++) {
-      values32[i] = USHORT_TO_FLOAT(values16[i]);
-   }
-}
-
-
-static void
-PutRow_32wrap16(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
-                GLint x, GLint y, const void *values, const GLubyte *mask)
-{
-   GLushort values16[MAX_WIDTH * 4];
-   GLfloat *values32 = (GLfloat *) values;
-   GLuint i;
-   ASSERT(rb->DataType == GL_FLOAT);
-   ASSERT(rb->Wrapped->DataType == GL_UNSIGNED_SHORT);
-   for (i = 0; i < 4 * count; i++) {
-      UNCLAMPED_FLOAT_TO_USHORT(values16[i], values32[i]);
-   }
-   rb->Wrapped->PutRow(ctx, rb->Wrapped, count, x, y, values16, mask);
-}
-
-
-static void
-PutRowRGB_32wrap16(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
-                   GLint x, GLint y, const void *values, const GLubyte *mask)
-{
-   GLushort values16[MAX_WIDTH * 3];
-   GLfloat *values32 = (GLfloat *) values;
-   GLuint i;
-   ASSERT(rb->DataType == GL_FLOAT);
-   ASSERT(rb->Wrapped->DataType == GL_UNSIGNED_SHORT);
-   for (i = 0; i < 3 * count; i++) {
-      UNCLAMPED_FLOAT_TO_USHORT(values16[i], values32[i]);
-   }
-   rb->Wrapped->PutRowRGB(ctx, rb->Wrapped, count, x, y, values16, mask);
-}
-
-
-static void
-PutMonoRow_32wrap16(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
-                    GLint x, GLint y, const void *value, const GLubyte *mask)
-{
-   GLushort value16[4];
-   GLfloat *value32 = (GLfloat *) value;
-   ASSERT(rb->DataType == GL_FLOAT);
-   ASSERT(rb->Wrapped->DataType == GL_UNSIGNED_SHORT);
-   UNCLAMPED_FLOAT_TO_USHORT(value16[0], value32[0]);
-   UNCLAMPED_FLOAT_TO_USHORT(value16[1], value32[1]);
-   UNCLAMPED_FLOAT_TO_USHORT(value16[2], value32[2]);
-   UNCLAMPED_FLOAT_TO_USHORT(value16[3], value32[3]);
-   rb->Wrapped->PutMonoRow(ctx, rb->Wrapped, count, x, y, value16, mask);
-}
-
-
-static void
-PutValues_32wrap16(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
-                   const GLint x[], const GLint y[], const void *values,
-                   const GLubyte *mask)
-{
-   GLushort values16[MAX_WIDTH * 4];
-   GLfloat *values32 = (GLfloat *) values;
-   GLuint i;
-   ASSERT(rb->DataType == GL_FLOAT);
-   ASSERT(rb->Wrapped->DataType == GL_UNSIGNED_SHORT);
-   for (i = 0; i < 4 * count; i++) {
-      UNCLAMPED_FLOAT_TO_USHORT(values16[i], values32[i]);
-   }
-   rb->Wrapped->PutValues(ctx, rb->Wrapped, count, x, y, values16, mask);
-}
-
-
-static void
-PutMonoValues_32wrap16(GLcontext *ctx, struct gl_renderbuffer *rb,
-                       GLuint count, const GLint x[], const GLint y[],
-                       const void *value, const GLubyte *mask)
-{
-   GLushort value16[4];
-   GLfloat *value32 = (GLfloat *) value;
-   ASSERT(rb->DataType == GL_FLOAT);
-   ASSERT(rb->Wrapped->DataType == GL_UNSIGNED_SHORT);
-   UNCLAMPED_FLOAT_TO_USHORT(value16[0], value32[0]);
-   UNCLAMPED_FLOAT_TO_USHORT(value16[1], value32[1]);
-   UNCLAMPED_FLOAT_TO_USHORT(value16[2], value32[2]);
-   UNCLAMPED_FLOAT_TO_USHORT(value16[3], value32[3]);
-   rb->Wrapped->PutMonoValues(ctx, rb->Wrapped, count, x, y, value16, mask);
-}
-
-
-/**
- * Wrap an 16-bit/channel renderbuffer with a 32-bit/channel
- * renderbuffer adaptor.
- */
-struct gl_renderbuffer *
-_mesa_new_renderbuffer_32wrap16(GLcontext *ctx, struct gl_renderbuffer *rb16)
-{
-   struct gl_renderbuffer *rb32;
-
-   rb32 = _mesa_new_renderbuffer(ctx, rb16->Name);
-   if (rb32) {
-      ASSERT(rb16->DataType == GL_UNSIGNED_SHORT);
-      ASSERT(rb16->_BaseFormat == GL_RGBA);
-
-      _glthread_LOCK_MUTEX(rb16->Mutex);
-      rb16->RefCount++;
-      _glthread_UNLOCK_MUTEX(rb16->Mutex);
-
-      rb32->InternalFormat = rb16->InternalFormat;
-      rb32->Format = rb16->Format;  /* XXX is this right? */
-      rb32->_BaseFormat = rb16->_BaseFormat;
-      rb32->DataType = GL_FLOAT;
-      /* Note: passing through underlying bits/channel */
-      rb32->Wrapped = rb16;
-
-      rb32->AllocStorage = AllocStorage_wrapper;
-      rb32->Delete = Delete_wrapper;
-      rb32->GetPointer = GetPointer_wrapper;
-      rb32->GetRow = GetRow_32wrap16;
-      rb32->GetValues = GetValues_32wrap16;
-      rb32->PutRow = PutRow_32wrap16;
-      rb32->PutRowRGB = PutRowRGB_32wrap16;
-      rb32->PutMonoRow = PutMonoRow_32wrap16;
-      rb32->PutValues = PutValues_32wrap16;
-      rb32->PutMonoValues = PutMonoValues_32wrap16;
-   }
-   return rb32;
-}
diff --git a/mesalib/src/mesa/main/rbadaptors.h b/mesalib/src/mesa/main/rbadaptors.h
deleted file mode 100644
index 1d45b287d..000000000
--- a/mesalib/src/mesa/main/rbadaptors.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.1
- *
- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#ifndef RBADAPTORS_H
-#define RBADAPTORS_H
-
-
-extern struct gl_renderbuffer *
-_mesa_new_renderbuffer_16wrap8(GLcontext *ctx, struct gl_renderbuffer *rb8);
-
-extern struct gl_renderbuffer *
-_mesa_new_renderbuffer_32wrap8(GLcontext *ctx, struct gl_renderbuffer *rb8);
-
-extern struct gl_renderbuffer *
-_mesa_new_renderbuffer_32wrap16(GLcontext *ctx, struct gl_renderbuffer *rb16);
-
-
-#endif /* RBADAPTORS_H */
diff --git a/mesalib/src/mesa/main/readpix.c b/mesalib/src/mesa/main/readpix.c
index f4d74e8be..93f2bd31c 100644
--- a/mesalib/src/mesa/main/readpix.c
+++ b/mesalib/src/mesa/main/readpix.c
@@ -103,6 +103,12 @@ _mesa_error_check_format_type(GLcontext *ctx, GLenum format, GLenum type,
                         "glReadPixels(no color buffer)");
             return GL_TRUE;
          }
+         /* We no longer support CI-mode color buffers so trying to read
+          * GL_COLOR_INDEX pixels is always an error.
+          */
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glReadPixels(color buffer is RGB)");
+         return GL_TRUE;
       }
       break;
    case GL_STENCIL_INDEX:
diff --git a/mesalib/src/mesa/main/remap.c b/mesalib/src/mesa/main/remap.c
index 8d9df6b83..2341f8488 100644
--- a/mesalib/src/mesa/main/remap.c
+++ b/mesalib/src/mesa/main/remap.c
@@ -14,12 +14,13 @@
  * 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,
+ * THE SOFTWARE IS PROVIDED "AS 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.
+ * 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.
  */
 
 
@@ -35,25 +36,18 @@
  * a dynamic entry, or the corresponding static entry, in glapi.
  */
 
-#include "remap.h"
-#include "imports.h"
-
-#include "main/dispatch.h"
-
+#include "mfeatures.h"
 
 #if FEATURE_remap_table
 
-
-#define need_MESA_remap_table
-#include "main/remap_helper.h"
+#include "remap.h"
+#include "imports.h"
+#include "glapi/glapi.h"
 
 #define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0]))
 #define MAX_ENTRY_POINTS 16
 
-
-/* this is global for quick access */
-int driDispatchRemapTable[driDispatchRemapTable_size];
-
+static const char *_mesa_function_pool;
 
 /**
  * Return the spec string associated with the given function index.
@@ -66,10 +60,7 @@ int driDispatchRemapTable[driDispatchRemapTable_size];
 const char *
 _mesa_get_function_spec(GLint func_index)
 {
-   if (func_index < ARRAY_SIZE(_mesa_function_pool))
-      return _mesa_function_pool + func_index;
-   else
-      return NULL;
+   return _mesa_function_pool + func_index;
 }
 
 
@@ -161,32 +152,14 @@ _mesa_map_function_array(const struct gl_function_remap *func_array)
 
 
 /**
- * Map the functions which are already static.
- *
- * When a extension function are incorporated into the ABI, the
- * extension suffix is usually stripped.  Mapping such functions
- * makes sure the alternative names are available.
- *
- * Note that functions mapped by _mesa_init_remap_table() are
- * excluded.
- */
-void
-_mesa_map_static_functions(void)
-{
-   /* Remap static functions which have alternative names and are in the ABI.
-    * This is to be on the safe side.  glapi should have defined those names.
-    */
-   _mesa_map_function_array(MESA_alt_functions);
-}
-
-
-/**
  * Initialize the remap table.  This is called in one_time_init().
  * The remap table needs to be initialized before calling the
  * CALL/GET/SET macros defined in main/dispatch.h.
  */
 void
-_mesa_init_remap_table(void)
+_mesa_do_init_remap_table(const char *pool,
+			  int size,
+			  const struct gl_function_pool_remap *remap)
 {
    static GLboolean initialized = GL_FALSE;
    GLint i;
@@ -194,15 +167,16 @@ _mesa_init_remap_table(void)
    if (initialized)
       return;
    initialized = GL_TRUE;
+   _mesa_function_pool = pool;
 
    /* initialize the remap table */
-   for (i = 0; i < ARRAY_SIZE(driDispatchRemapTable); i++) {
+   for (i = 0; i < size; i++) {
       GLint offset;
       const char *spec;
 
       /* sanity check */
-      ASSERT(i == MESA_remap_table_functions[i].remap_index);
-      spec = _mesa_function_pool + MESA_remap_table_functions[i].pool_index;
+      ASSERT(i == remap[i].remap_index);
+      spec = _mesa_function_pool + remap[i].pool_index;
 
       offset = _mesa_map_function_spec(spec);
       /* store the dispatch offset in the remap table */
diff --git a/mesalib/src/mesa/main/remap.h b/mesalib/src/mesa/main/remap.h
index 7fb56e360..a2a55f615 100644
--- a/mesalib/src/mesa/main/remap.h
+++ b/mesalib/src/mesa/main/remap.h
@@ -14,12 +14,13 @@
  * 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,
+ * THE SOFTWARE IS PROVIDED "AS 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.
+ * 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.
  */
 
 
@@ -27,9 +28,18 @@
 #define REMAP_H
 
 
-#include "main/mtypes.h"
+#include "main/compiler.h"
+#include "main/mfeatures.h"
 
-struct gl_function_remap;
+struct gl_function_pool_remap {
+   int pool_index;
+   int remap_index;
+};
+
+struct gl_function_remap {
+   int func_index;
+   int dispatch_offset; /* for sanity check */
+};
 
 
 #if FEATURE_remap_table
@@ -38,9 +48,9 @@ extern int
 driDispatchRemapTable[];
 
 extern const char *
-_mesa_get_function_spec(GLint func_index);
+_mesa_get_function_spec(int func_index);
 
-extern GLint
+extern int
 _mesa_map_function_spec(const char *spec);
 
 extern void
@@ -50,17 +60,34 @@ extern void
 _mesa_map_static_functions(void);
 
 extern void
+_mesa_map_static_functions_es1(void);
+
+extern void
+_mesa_map_static_functions_es2(void);
+
+extern void
+_mesa_do_init_remap_table(const char *pool,
+			  int size,
+			  const struct gl_function_pool_remap *remap);
+
+extern void
 _mesa_init_remap_table(void);
 
+extern void
+_mesa_init_remap_table_es1(void);
+
+extern void
+_mesa_init_remap_table_es2(void);
+
 #else /* FEATURE_remap_table */
 
 static INLINE const char *
-_mesa_get_function_spec(GLint func_index)
+_mesa_get_function_spec(int func_index)
 {
    return NULL;
 }
 
-static INLINE GLint
+static INLINE int
 _mesa_map_function_spec(const char *spec)
 {
    return -1;
@@ -76,11 +103,39 @@ _mesa_map_static_functions(void)
 {
 }
 
+
+static INLINE void
+_mesa_map_static_functions_es1(void)
+{
+}
+
+static INLINE void
+_mesa_map_static_functions_es2(void)
+{
+}
+
+static INLINE void
+_mesa_do_init_remap_table(const char *pool,
+			  int size,
+			  const struct gl_function_pool_remap *remap)
+{
+}
+
 static INLINE void
 _mesa_init_remap_table(void)
 {
 }
 
+static INLINE void
+_mesa_init_remap_table_es1(void)
+{
+}
+
+static INLINE void
+_mesa_init_remap_table_es2(void)
+{
+}
+
 #endif /* FEATURE_remap_table */
 
 
diff --git a/mesalib/src/mesa/main/remap_helper.h b/mesalib/src/mesa/main/remap_helper.h
index ee898efa5..631cc9015 100644
--- a/mesalib/src/mesa/main/remap_helper.h
+++ b/mesalib/src/mesa/main/remap_helper.h
@@ -26,11 +26,7 @@
  */
 
 #include "main/dispatch.h"
-
-struct gl_function_remap {
-   GLint func_index;
-   GLint dispatch_offset; /* for sanity check */
-};
+#include "main/remap.h"
 
 /* this is internal to remap.c */
 #ifdef need_MESA_remap_table
@@ -450,9 +446,9 @@ static const char _mesa_function_pool[] =
    "\0"
    "glCreateProgramObjectARB\0"
    "\0"
-   /* _mesa_function_pool[2906]: FragmentLightModelivSGIX (dynamic) */
+   /* _mesa_function_pool[2906]: DeleteTransformFeedbacks (will be remapped) */
    "ip\0"
-   "glFragmentLightModelivSGIX\0"
+   "glDeleteTransformFeedbacks\0"
    "\0"
    /* _mesa_function_pool[2937]: UniformMatrix4x3fv (will be remapped) */
    "iiip\0"
@@ -668,3711 +664,3801 @@ static const char _mesa_function_pool[] =
    "iip\0"
    "glGetTexEnvfv\0"
    "\0"
-   /* _mesa_function_pool[4480]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[4480]: BindTransformFeedback (will be remapped) */
+   "ii\0"
+   "glBindTransformFeedback\0"
+   "\0"
+   /* _mesa_function_pool[4508]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
    "ffffffffffff\0"
    "glTexCoord2fColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[4533]: Indexub (offset 315) */
+   /* _mesa_function_pool[4561]: Indexub (offset 315) */
    "i\0"
    "glIndexub\0"
    "\0"
-   /* _mesa_function_pool[4546]: TexEnvi (offset 186) */
+   /* _mesa_function_pool[4574]: TexEnvi (offset 186) */
    "iii\0"
    "glTexEnvi\0"
    "\0"
-   /* _mesa_function_pool[4561]: GetClipPlane (offset 259) */
+   /* _mesa_function_pool[4589]: GetClipPlane (offset 259) */
    "ip\0"
    "glGetClipPlane\0"
    "\0"
-   /* _mesa_function_pool[4580]: CombinerParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[4608]: CombinerParameterfvNV (will be remapped) */
    "ip\0"
    "glCombinerParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[4608]: VertexAttribs3dvNV (will be remapped) */
+   /* _mesa_function_pool[4636]: VertexAttribs3dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3dvNV\0"
    "\0"
-   /* _mesa_function_pool[4634]: VertexAttribs4fvNV (will be remapped) */
+   /* _mesa_function_pool[4662]: VertexAttribs4fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4fvNV\0"
    "\0"
-   /* _mesa_function_pool[4660]: VertexArrayRangeNV (will be remapped) */
+   /* _mesa_function_pool[4688]: VertexArrayRangeNV (will be remapped) */
    "ip\0"
    "glVertexArrayRangeNV\0"
    "\0"
-   /* _mesa_function_pool[4685]: FragmentLightiSGIX (dynamic) */
+   /* _mesa_function_pool[4713]: FragmentLightiSGIX (dynamic) */
    "iii\0"
    "glFragmentLightiSGIX\0"
    "\0"
-   /* _mesa_function_pool[4711]: PolygonOffsetEXT (will be remapped) */
+   /* _mesa_function_pool[4739]: PolygonOffsetEXT (will be remapped) */
    "ff\0"
    "glPolygonOffsetEXT\0"
    "\0"
-   /* _mesa_function_pool[4734]: PollAsyncSGIX (dynamic) */
+   /* _mesa_function_pool[4762]: PollAsyncSGIX (dynamic) */
    "p\0"
    "glPollAsyncSGIX\0"
    "\0"
-   /* _mesa_function_pool[4753]: DeleteFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[4781]: DeleteFragmentShaderATI (will be remapped) */
    "i\0"
    "glDeleteFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[4782]: Scaled (offset 301) */
+   /* _mesa_function_pool[4810]: Scaled (offset 301) */
    "ddd\0"
    "glScaled\0"
    "\0"
-   /* _mesa_function_pool[4796]: Scalef (offset 302) */
+   /* _mesa_function_pool[4824]: ResumeTransformFeedback (will be remapped) */
+   "\0"
+   "glResumeTransformFeedback\0"
+   "\0"
+   /* _mesa_function_pool[4852]: Scalef (offset 302) */
    "fff\0"
    "glScalef\0"
    "\0"
-   /* _mesa_function_pool[4810]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[4866]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[4848]: MultTransposeMatrixdARB (will be remapped) */
+   /* _mesa_function_pool[4904]: MultTransposeMatrixdARB (will be remapped) */
    "p\0"
    "glMultTransposeMatrixd\0"
    "glMultTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[4900]: ObjectUnpurgeableAPPLE (will be remapped) */
+   /* _mesa_function_pool[4956]: ColorMaskIndexedEXT (will be remapped) */
+   "iiiii\0"
+   "glColorMaskIndexedEXT\0"
+   "\0"
+   /* _mesa_function_pool[4985]: ObjectUnpurgeableAPPLE (will be remapped) */
    "iii\0"
    "glObjectUnpurgeableAPPLE\0"
    "\0"
-   /* _mesa_function_pool[4930]: AlphaFunc (offset 240) */
+   /* _mesa_function_pool[5015]: AlphaFunc (offset 240) */
    "if\0"
    "glAlphaFunc\0"
    "\0"
-   /* _mesa_function_pool[4946]: WindowPos2svMESA (will be remapped) */
+   /* _mesa_function_pool[5031]: WindowPos2svMESA (will be remapped) */
    "p\0"
    "glWindowPos2sv\0"
    "glWindowPos2svARB\0"
    "glWindowPos2svMESA\0"
    "\0"
-   /* _mesa_function_pool[5001]: EdgeFlag (offset 41) */
+   /* _mesa_function_pool[5086]: EdgeFlag (offset 41) */
    "i\0"
    "glEdgeFlag\0"
    "\0"
-   /* _mesa_function_pool[5015]: TexCoord2iv (offset 107) */
+   /* _mesa_function_pool[5100]: TexCoord2iv (offset 107) */
    "p\0"
    "glTexCoord2iv\0"
    "\0"
-   /* _mesa_function_pool[5032]: CompressedTexImage1DARB (will be remapped) */
+   /* _mesa_function_pool[5117]: CompressedTexImage1DARB (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexImage1D\0"
    "glCompressedTexImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[5090]: Rotated (offset 299) */
+   /* _mesa_function_pool[5175]: Rotated (offset 299) */
    "dddd\0"
    "glRotated\0"
    "\0"
-   /* _mesa_function_pool[5106]: VertexAttrib2sNV (will be remapped) */
+   /* _mesa_function_pool[5191]: VertexAttrib2sNV (will be remapped) */
    "iii\0"
    "glVertexAttrib2sNV\0"
    "\0"
-   /* _mesa_function_pool[5130]: ReadPixels (offset 256) */
+   /* _mesa_function_pool[5215]: ReadPixels (offset 256) */
    "iiiiiip\0"
    "glReadPixels\0"
    "\0"
-   /* _mesa_function_pool[5152]: EdgeFlagv (offset 42) */
+   /* _mesa_function_pool[5237]: EdgeFlagv (offset 42) */
    "p\0"
    "glEdgeFlagv\0"
    "\0"
-   /* _mesa_function_pool[5167]: NormalPointerListIBM (dynamic) */
+   /* _mesa_function_pool[5252]: NormalPointerListIBM (dynamic) */
    "iipi\0"
    "glNormalPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[5196]: IndexPointerEXT (will be remapped) */
+   /* _mesa_function_pool[5281]: IndexPointerEXT (will be remapped) */
    "iiip\0"
    "glIndexPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[5220]: Color4iv (offset 32) */
+   /* _mesa_function_pool[5305]: Color4iv (offset 32) */
    "p\0"
    "glColor4iv\0"
    "\0"
-   /* _mesa_function_pool[5234]: TexParameterf (offset 178) */
+   /* _mesa_function_pool[5319]: TexParameterf (offset 178) */
    "iif\0"
    "glTexParameterf\0"
    "\0"
-   /* _mesa_function_pool[5255]: TexParameteri (offset 180) */
+   /* _mesa_function_pool[5340]: TexParameteri (offset 180) */
    "iii\0"
    "glTexParameteri\0"
    "\0"
-   /* _mesa_function_pool[5276]: NormalPointerEXT (will be remapped) */
+   /* _mesa_function_pool[5361]: NormalPointerEXT (will be remapped) */
    "iiip\0"
    "glNormalPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[5301]: MultiTexCoord3dARB (offset 392) */
+   /* _mesa_function_pool[5386]: MultiTexCoord3dARB (offset 392) */
    "iddd\0"
    "glMultiTexCoord3d\0"
    "glMultiTexCoord3dARB\0"
    "\0"
-   /* _mesa_function_pool[5346]: MultiTexCoord2iARB (offset 388) */
+   /* _mesa_function_pool[5431]: MultiTexCoord2iARB (offset 388) */
    "iii\0"
    "glMultiTexCoord2i\0"
    "glMultiTexCoord2iARB\0"
    "\0"
-   /* _mesa_function_pool[5390]: DrawPixels (offset 257) */
+   /* _mesa_function_pool[5475]: DrawPixels (offset 257) */
    "iiiip\0"
    "glDrawPixels\0"
    "\0"
-   /* _mesa_function_pool[5410]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[5495]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
    "iffffffff\0"
    "glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[5470]: MultiTexCoord2svARB (offset 391) */
+   /* _mesa_function_pool[5555]: MultiTexCoord2svARB (offset 391) */
    "ip\0"
    "glMultiTexCoord2sv\0"
    "glMultiTexCoord2svARB\0"
    "\0"
-   /* _mesa_function_pool[5515]: ReplacementCodeubvSUN (dynamic) */
+   /* _mesa_function_pool[5600]: ReplacementCodeubvSUN (dynamic) */
    "p\0"
    "glReplacementCodeubvSUN\0"
    "\0"
-   /* _mesa_function_pool[5542]: Uniform3iARB (will be remapped) */
+   /* _mesa_function_pool[5627]: Uniform3iARB (will be remapped) */
    "iiii\0"
    "glUniform3i\0"
    "glUniform3iARB\0"
    "\0"
-   /* _mesa_function_pool[5575]: GetFragmentMaterialfvSGIX (dynamic) */
+   /* _mesa_function_pool[5660]: DrawTransformFeedback (will be remapped) */
+   "ii\0"
+   "glDrawTransformFeedback\0"
+   "\0"
+   /* _mesa_function_pool[5688]: GetFragmentMaterialfvSGIX (dynamic) */
    "iip\0"
    "glGetFragmentMaterialfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[5608]: GetShaderInfoLog (will be remapped) */
+   /* _mesa_function_pool[5721]: GetShaderInfoLog (will be remapped) */
    "iipp\0"
    "glGetShaderInfoLog\0"
    "\0"
-   /* _mesa_function_pool[5633]: WeightivARB (dynamic) */
+   /* _mesa_function_pool[5746]: WeightivARB (dynamic) */
    "ip\0"
    "glWeightivARB\0"
    "\0"
-   /* _mesa_function_pool[5651]: PollInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[5764]: PollInstrumentsSGIX (dynamic) */
    "p\0"
    "glPollInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[5676]: GlobalAlphaFactordSUN (dynamic) */
+   /* _mesa_function_pool[5789]: GlobalAlphaFactordSUN (dynamic) */
    "d\0"
    "glGlobalAlphaFactordSUN\0"
    "\0"
-   /* _mesa_function_pool[5703]: GetFinalCombinerInputParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[5816]: GetFinalCombinerInputParameterfvNV (will be remapped) */
    "iip\0"
    "glGetFinalCombinerInputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[5745]: GenerateMipmapEXT (will be remapped) */
+   /* _mesa_function_pool[5858]: GenerateMipmapEXT (will be remapped) */
    "i\0"
    "glGenerateMipmap\0"
    "glGenerateMipmapEXT\0"
    "\0"
-   /* _mesa_function_pool[5785]: GenLists (offset 5) */
+   /* _mesa_function_pool[5898]: GenLists (offset 5) */
    "i\0"
    "glGenLists\0"
    "\0"
-   /* _mesa_function_pool[5799]: SetFragmentShaderConstantATI (will be remapped) */
+   /* _mesa_function_pool[5912]: SetFragmentShaderConstantATI (will be remapped) */
    "ip\0"
    "glSetFragmentShaderConstantATI\0"
    "\0"
-   /* _mesa_function_pool[5834]: GetMapAttribParameterivNV (dynamic) */
+   /* _mesa_function_pool[5947]: GetMapAttribParameterivNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[5868]: CreateShaderObjectARB (will be remapped) */
+   /* _mesa_function_pool[5981]: CreateShaderObjectARB (will be remapped) */
    "i\0"
    "glCreateShaderObjectARB\0"
    "\0"
-   /* _mesa_function_pool[5895]: GetSharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[6008]: GetSharpenTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[5923]: BufferDataARB (will be remapped) */
+   /* _mesa_function_pool[6036]: BufferDataARB (will be remapped) */
    "iipi\0"
    "glBufferData\0"
    "glBufferDataARB\0"
    "\0"
-   /* _mesa_function_pool[5958]: FlushVertexArrayRangeNV (will be remapped) */
+   /* _mesa_function_pool[6071]: FlushVertexArrayRangeNV (will be remapped) */
    "\0"
    "glFlushVertexArrayRangeNV\0"
    "\0"
-   /* _mesa_function_pool[5986]: MapGrid2d (offset 226) */
+   /* _mesa_function_pool[6099]: MapGrid2d (offset 226) */
    "iddidd\0"
    "glMapGrid2d\0"
    "\0"
-   /* _mesa_function_pool[6006]: MapGrid2f (offset 227) */
+   /* _mesa_function_pool[6119]: MapGrid2f (offset 227) */
    "iffiff\0"
    "glMapGrid2f\0"
    "\0"
-   /* _mesa_function_pool[6026]: SampleMapATI (will be remapped) */
+   /* _mesa_function_pool[6139]: SampleMapATI (will be remapped) */
    "iii\0"
    "glSampleMapATI\0"
    "\0"
-   /* _mesa_function_pool[6046]: VertexPointerEXT (will be remapped) */
+   /* _mesa_function_pool[6159]: VertexPointerEXT (will be remapped) */
    "iiiip\0"
    "glVertexPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[6072]: GetTexFilterFuncSGIS (dynamic) */
+   /* _mesa_function_pool[6185]: GetTexFilterFuncSGIS (dynamic) */
    "iip\0"
    "glGetTexFilterFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[6100]: Scissor (offset 176) */
+   /* _mesa_function_pool[6213]: Scissor (offset 176) */
    "iiii\0"
    "glScissor\0"
    "\0"
-   /* _mesa_function_pool[6116]: Fogf (offset 153) */
+   /* _mesa_function_pool[6229]: Fogf (offset 153) */
    "if\0"
    "glFogf\0"
    "\0"
-   /* _mesa_function_pool[6127]: GetCombinerOutputParameterfvNV (will be remapped) */
-   "iiip\0"
-   "glGetCombinerOutputParameterfvNV\0"
+   /* _mesa_function_pool[6240]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
+   "ppp\0"
+   "glReplacementCodeuiColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[6166]: TexSubImage1D (offset 332) */
+   /* _mesa_function_pool[6285]: TexSubImage1D (offset 332) */
    "iiiiiip\0"
    "glTexSubImage1D\0"
    "glTexSubImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[6210]: VertexAttrib1sARB (will be remapped) */
+   /* _mesa_function_pool[6329]: VertexAttrib1sARB (will be remapped) */
    "ii\0"
    "glVertexAttrib1s\0"
    "glVertexAttrib1sARB\0"
    "\0"
-   /* _mesa_function_pool[6251]: FenceSync (will be remapped) */
+   /* _mesa_function_pool[6370]: FenceSync (will be remapped) */
    "ii\0"
    "glFenceSync\0"
    "\0"
-   /* _mesa_function_pool[6267]: Color4usv (offset 40) */
+   /* _mesa_function_pool[6386]: Color4usv (offset 40) */
    "p\0"
    "glColor4usv\0"
    "\0"
-   /* _mesa_function_pool[6282]: Fogi (offset 155) */
+   /* _mesa_function_pool[6401]: Fogi (offset 155) */
    "ii\0"
    "glFogi\0"
    "\0"
-   /* _mesa_function_pool[6293]: DepthRange (offset 288) */
+   /* _mesa_function_pool[6412]: DepthRange (offset 288) */
    "dd\0"
    "glDepthRange\0"
    "\0"
-   /* _mesa_function_pool[6310]: RasterPos3iv (offset 75) */
+   /* _mesa_function_pool[6429]: RasterPos3iv (offset 75) */
    "p\0"
    "glRasterPos3iv\0"
    "\0"
-   /* _mesa_function_pool[6328]: FinalCombinerInputNV (will be remapped) */
+   /* _mesa_function_pool[6447]: FinalCombinerInputNV (will be remapped) */
    "iiii\0"
    "glFinalCombinerInputNV\0"
    "\0"
-   /* _mesa_function_pool[6357]: TexCoord2i (offset 106) */
+   /* _mesa_function_pool[6476]: TexCoord2i (offset 106) */
    "ii\0"
    "glTexCoord2i\0"
    "\0"
-   /* _mesa_function_pool[6374]: PixelMapfv (offset 251) */
+   /* _mesa_function_pool[6493]: PixelMapfv (offset 251) */
    "iip\0"
    "glPixelMapfv\0"
    "\0"
-   /* _mesa_function_pool[6392]: Color4ui (offset 37) */
+   /* _mesa_function_pool[6511]: Color4ui (offset 37) */
    "iiii\0"
    "glColor4ui\0"
    "\0"
-   /* _mesa_function_pool[6409]: RasterPos3s (offset 76) */
+   /* _mesa_function_pool[6528]: RasterPos3s (offset 76) */
    "iii\0"
    "glRasterPos3s\0"
    "\0"
-   /* _mesa_function_pool[6428]: Color3usv (offset 24) */
+   /* _mesa_function_pool[6547]: Color3usv (offset 24) */
    "p\0"
    "glColor3usv\0"
    "\0"
-   /* _mesa_function_pool[6443]: FlushRasterSGIX (dynamic) */
+   /* _mesa_function_pool[6562]: FlushRasterSGIX (dynamic) */
    "\0"
    "glFlushRasterSGIX\0"
    "\0"
-   /* _mesa_function_pool[6463]: TexCoord2f (offset 104) */
+   /* _mesa_function_pool[6582]: TexCoord2f (offset 104) */
    "ff\0"
    "glTexCoord2f\0"
    "\0"
-   /* _mesa_function_pool[6480]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[6599]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
    "ifffff\0"
    "glReplacementCodeuiTexCoord2fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[6529]: TexCoord2d (offset 102) */
+   /* _mesa_function_pool[6648]: TexCoord2d (offset 102) */
    "dd\0"
    "glTexCoord2d\0"
    "\0"
-   /* _mesa_function_pool[6546]: RasterPos3d (offset 70) */
+   /* _mesa_function_pool[6665]: RasterPos3d (offset 70) */
    "ddd\0"
    "glRasterPos3d\0"
    "\0"
-   /* _mesa_function_pool[6565]: RasterPos3f (offset 72) */
+   /* _mesa_function_pool[6684]: RasterPos3f (offset 72) */
    "fff\0"
    "glRasterPos3f\0"
    "\0"
-   /* _mesa_function_pool[6584]: Uniform1fARB (will be remapped) */
+   /* _mesa_function_pool[6703]: Uniform1fARB (will be remapped) */
    "if\0"
    "glUniform1f\0"
    "glUniform1fARB\0"
    "\0"
-   /* _mesa_function_pool[6615]: AreTexturesResident (offset 322) */
+   /* _mesa_function_pool[6734]: AreTexturesResident (offset 322) */
    "ipp\0"
    "glAreTexturesResident\0"
    "glAreTexturesResidentEXT\0"
    "\0"
-   /* _mesa_function_pool[6667]: TexCoord2s (offset 108) */
+   /* _mesa_function_pool[6786]: TexCoord2s (offset 108) */
    "ii\0"
    "glTexCoord2s\0"
    "\0"
-   /* _mesa_function_pool[6684]: StencilOpSeparate (will be remapped) */
+   /* _mesa_function_pool[6803]: StencilOpSeparate (will be remapped) */
    "iiii\0"
    "glStencilOpSeparate\0"
    "glStencilOpSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[6733]: ColorTableParameteriv (offset 341) */
+   /* _mesa_function_pool[6852]: ColorTableParameteriv (offset 341) */
    "iip\0"
    "glColorTableParameteriv\0"
    "glColorTableParameterivSGI\0"
    "\0"
-   /* _mesa_function_pool[6789]: FogCoordPointerListIBM (dynamic) */
+   /* _mesa_function_pool[6908]: FogCoordPointerListIBM (dynamic) */
    "iipi\0"
    "glFogCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[6820]: WindowPos3dMESA (will be remapped) */
+   /* _mesa_function_pool[6939]: WindowPos3dMESA (will be remapped) */
    "ddd\0"
    "glWindowPos3d\0"
    "glWindowPos3dARB\0"
    "glWindowPos3dMESA\0"
    "\0"
-   /* _mesa_function_pool[6874]: Color4us (offset 39) */
+   /* _mesa_function_pool[6993]: Color4us (offset 39) */
    "iiii\0"
    "glColor4us\0"
    "\0"
-   /* _mesa_function_pool[6891]: PointParameterfvEXT (will be remapped) */
+   /* _mesa_function_pool[7010]: PointParameterfvEXT (will be remapped) */
    "ip\0"
    "glPointParameterfv\0"
    "glPointParameterfvARB\0"
    "glPointParameterfvEXT\0"
    "glPointParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[6981]: Color3bv (offset 10) */
+   /* _mesa_function_pool[7100]: Color3bv (offset 10) */
    "p\0"
    "glColor3bv\0"
    "\0"
-   /* _mesa_function_pool[6995]: WindowPos2fvMESA (will be remapped) */
+   /* _mesa_function_pool[7114]: WindowPos2fvMESA (will be remapped) */
    "p\0"
    "glWindowPos2fv\0"
    "glWindowPos2fvARB\0"
    "glWindowPos2fvMESA\0"
    "\0"
-   /* _mesa_function_pool[7050]: SecondaryColor3bvEXT (will be remapped) */
+   /* _mesa_function_pool[7169]: SecondaryColor3bvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3bv\0"
    "glSecondaryColor3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[7096]: VertexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[7215]: VertexPointerListIBM (dynamic) */
    "iiipi\0"
    "glVertexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[7126]: GetProgramLocalParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[7245]: GetProgramLocalParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[7163]: FragmentMaterialfSGIX (dynamic) */
+   /* _mesa_function_pool[7282]: FragmentMaterialfSGIX (dynamic) */
    "iif\0"
    "glFragmentMaterialfSGIX\0"
    "\0"
-   /* _mesa_function_pool[7192]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[7311]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[7234]: RenderbufferStorageEXT (will be remapped) */
+   /* _mesa_function_pool[7353]: RenderbufferStorageEXT (will be remapped) */
    "iiii\0"
    "glRenderbufferStorage\0"
    "glRenderbufferStorageEXT\0"
    "\0"
-   /* _mesa_function_pool[7287]: IsFenceNV (will be remapped) */
+   /* _mesa_function_pool[7406]: IsFenceNV (will be remapped) */
    "i\0"
    "glIsFenceNV\0"
    "\0"
-   /* _mesa_function_pool[7302]: AttachObjectARB (will be remapped) */
+   /* _mesa_function_pool[7421]: AttachObjectARB (will be remapped) */
    "ii\0"
    "glAttachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[7324]: GetFragmentLightivSGIX (dynamic) */
+   /* _mesa_function_pool[7443]: GetFragmentLightivSGIX (dynamic) */
    "iip\0"
    "glGetFragmentLightivSGIX\0"
    "\0"
-   /* _mesa_function_pool[7354]: UniformMatrix2fvARB (will be remapped) */
+   /* _mesa_function_pool[7473]: UniformMatrix2fvARB (will be remapped) */
    "iiip\0"
    "glUniformMatrix2fv\0"
    "glUniformMatrix2fvARB\0"
    "\0"
-   /* _mesa_function_pool[7401]: MultiTexCoord2fARB (offset 386) */
+   /* _mesa_function_pool[7520]: MultiTexCoord2fARB (offset 386) */
    "iff\0"
    "glMultiTexCoord2f\0"
    "glMultiTexCoord2fARB\0"
    "\0"
-   /* _mesa_function_pool[7445]: ColorTable (offset 339) */
+   /* _mesa_function_pool[7564]: ColorTable (offset 339) */
    "iiiiip\0"
    "glColorTable\0"
    "glColorTableSGI\0"
    "glColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[7498]: IndexPointer (offset 314) */
+   /* _mesa_function_pool[7617]: IndexPointer (offset 314) */
    "iip\0"
    "glIndexPointer\0"
    "\0"
-   /* _mesa_function_pool[7518]: Accum (offset 213) */
+   /* _mesa_function_pool[7637]: Accum (offset 213) */
    "if\0"
    "glAccum\0"
    "\0"
-   /* _mesa_function_pool[7530]: GetTexImage (offset 281) */
+   /* _mesa_function_pool[7649]: GetTexImage (offset 281) */
    "iiiip\0"
    "glGetTexImage\0"
    "\0"
-   /* _mesa_function_pool[7551]: MapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[7670]: MapControlPointsNV (dynamic) */
    "iiiiiiiip\0"
    "glMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[7583]: ConvolutionFilter2D (offset 349) */
+   /* _mesa_function_pool[7702]: ConvolutionFilter2D (offset 349) */
    "iiiiiip\0"
    "glConvolutionFilter2D\0"
    "glConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[7639]: Finish (offset 216) */
+   /* _mesa_function_pool[7758]: Finish (offset 216) */
    "\0"
    "glFinish\0"
    "\0"
-   /* _mesa_function_pool[7650]: MapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[7769]: MapParameterfvNV (dynamic) */
    "iip\0"
    "glMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[7674]: ClearStencil (offset 207) */
+   /* _mesa_function_pool[7793]: ClearStencil (offset 207) */
    "i\0"
    "glClearStencil\0"
    "\0"
-   /* _mesa_function_pool[7692]: VertexAttrib3dvARB (will be remapped) */
+   /* _mesa_function_pool[7811]: VertexAttrib3dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3dv\0"
    "glVertexAttrib3dvARB\0"
    "\0"
-   /* _mesa_function_pool[7735]: HintPGI (dynamic) */
+   /* _mesa_function_pool[7854]: HintPGI (dynamic) */
    "ii\0"
    "glHintPGI\0"
    "\0"
-   /* _mesa_function_pool[7749]: ConvolutionParameteriv (offset 353) */
+   /* _mesa_function_pool[7868]: ConvolutionParameteriv (offset 353) */
    "iip\0"
    "glConvolutionParameteriv\0"
    "glConvolutionParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[7807]: Color4s (offset 33) */
+   /* _mesa_function_pool[7926]: Color4s (offset 33) */
    "iiii\0"
    "glColor4s\0"
    "\0"
-   /* _mesa_function_pool[7823]: InterleavedArrays (offset 317) */
+   /* _mesa_function_pool[7942]: InterleavedArrays (offset 317) */
    "iip\0"
    "glInterleavedArrays\0"
    "\0"
-   /* _mesa_function_pool[7848]: RasterPos2fv (offset 65) */
+   /* _mesa_function_pool[7967]: RasterPos2fv (offset 65) */
    "p\0"
    "glRasterPos2fv\0"
    "\0"
-   /* _mesa_function_pool[7866]: TexCoord1fv (offset 97) */
+   /* _mesa_function_pool[7985]: TexCoord1fv (offset 97) */
    "p\0"
    "glTexCoord1fv\0"
    "\0"
-   /* _mesa_function_pool[7883]: Vertex2d (offset 126) */
+   /* _mesa_function_pool[8002]: Vertex2d (offset 126) */
    "dd\0"
    "glVertex2d\0"
    "\0"
-   /* _mesa_function_pool[7898]: CullParameterdvEXT (will be remapped) */
+   /* _mesa_function_pool[8017]: CullParameterdvEXT (will be remapped) */
    "ip\0"
    "glCullParameterdvEXT\0"
    "\0"
-   /* _mesa_function_pool[7923]: ProgramNamedParameter4fNV (will be remapped) */
+   /* _mesa_function_pool[8042]: ProgramNamedParameter4fNV (will be remapped) */
    "iipffff\0"
    "glProgramNamedParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[7960]: Color3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[8079]: Color3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[7989]: ProgramEnvParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[8108]: ProgramEnvParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramEnvParameter4fvARB\0"
    "glProgramParameter4fvNV\0"
    "\0"
-   /* _mesa_function_pool[8046]: Color4i (offset 31) */
+   /* _mesa_function_pool[8165]: Color4i (offset 31) */
    "iiii\0"
    "glColor4i\0"
    "\0"
-   /* _mesa_function_pool[8062]: Color4f (offset 29) */
+   /* _mesa_function_pool[8181]: Color4f (offset 29) */
    "ffff\0"
    "glColor4f\0"
    "\0"
-   /* _mesa_function_pool[8078]: RasterPos4fv (offset 81) */
+   /* _mesa_function_pool[8197]: RasterPos4fv (offset 81) */
    "p\0"
    "glRasterPos4fv\0"
    "\0"
-   /* _mesa_function_pool[8096]: Color4d (offset 27) */
+   /* _mesa_function_pool[8215]: Color4d (offset 27) */
    "dddd\0"
    "glColor4d\0"
    "\0"
-   /* _mesa_function_pool[8112]: ClearIndex (offset 205) */
+   /* _mesa_function_pool[8231]: ClearIndex (offset 205) */
    "f\0"
    "glClearIndex\0"
    "\0"
-   /* _mesa_function_pool[8128]: Color4b (offset 25) */
+   /* _mesa_function_pool[8247]: Color4b (offset 25) */
    "iiii\0"
    "glColor4b\0"
    "\0"
-   /* _mesa_function_pool[8144]: LoadMatrixd (offset 292) */
+   /* _mesa_function_pool[8263]: LoadMatrixd (offset 292) */
    "p\0"
    "glLoadMatrixd\0"
    "\0"
-   /* _mesa_function_pool[8161]: FragmentLightModeliSGIX (dynamic) */
+   /* _mesa_function_pool[8280]: FragmentLightModeliSGIX (dynamic) */
    "ii\0"
    "glFragmentLightModeliSGIX\0"
    "\0"
-   /* _mesa_function_pool[8191]: RasterPos2dv (offset 63) */
+   /* _mesa_function_pool[8310]: RasterPos2dv (offset 63) */
    "p\0"
    "glRasterPos2dv\0"
    "\0"
-   /* _mesa_function_pool[8209]: ConvolutionParameterfv (offset 351) */
+   /* _mesa_function_pool[8328]: ConvolutionParameterfv (offset 351) */
    "iip\0"
    "glConvolutionParameterfv\0"
    "glConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[8267]: TbufferMask3DFX (dynamic) */
+   /* _mesa_function_pool[8386]: TbufferMask3DFX (dynamic) */
    "i\0"
    "glTbufferMask3DFX\0"
    "\0"
-   /* _mesa_function_pool[8288]: GetTexGendv (offset 278) */
+   /* _mesa_function_pool[8407]: GetTexGendv (offset 278) */
    "iip\0"
    "glGetTexGendv\0"
    "\0"
-   /* _mesa_function_pool[8307]: ColorMaskIndexedEXT (will be remapped) */
-   "iiiii\0"
-   "glColorMaskIndexedEXT\0"
+   /* _mesa_function_pool[8426]: GetVertexAttribfvNV (will be remapped) */
+   "iip\0"
+   "glGetVertexAttribfvNV\0"
+   "\0"
+   /* _mesa_function_pool[8453]: BeginTransformFeedbackEXT (will be remapped) */
+   "i\0"
+   "glBeginTransformFeedbackEXT\0"
+   "glBeginTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[8336]: LoadProgramNV (will be remapped) */
+   /* _mesa_function_pool[8509]: LoadProgramNV (will be remapped) */
    "iiip\0"
    "glLoadProgramNV\0"
    "\0"
-   /* _mesa_function_pool[8358]: WaitSync (will be remapped) */
+   /* _mesa_function_pool[8531]: WaitSync (will be remapped) */
    "iii\0"
    "glWaitSync\0"
    "\0"
-   /* _mesa_function_pool[8374]: EndList (offset 1) */
+   /* _mesa_function_pool[8547]: EndList (offset 1) */
    "\0"
    "glEndList\0"
    "\0"
-   /* _mesa_function_pool[8386]: VertexAttrib4fvNV (will be remapped) */
+   /* _mesa_function_pool[8559]: VertexAttrib4fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4fvNV\0"
    "\0"
-   /* _mesa_function_pool[8410]: GetAttachedObjectsARB (will be remapped) */
+   /* _mesa_function_pool[8583]: GetAttachedObjectsARB (will be remapped) */
    "iipp\0"
    "glGetAttachedObjectsARB\0"
    "\0"
-   /* _mesa_function_pool[8440]: Uniform3fvARB (will be remapped) */
+   /* _mesa_function_pool[8613]: Uniform3fvARB (will be remapped) */
    "iip\0"
    "glUniform3fv\0"
    "glUniform3fvARB\0"
    "\0"
-   /* _mesa_function_pool[8474]: EvalCoord1fv (offset 231) */
+   /* _mesa_function_pool[8647]: EvalCoord1fv (offset 231) */
    "p\0"
    "glEvalCoord1fv\0"
    "\0"
-   /* _mesa_function_pool[8492]: DrawRangeElements (offset 338) */
+   /* _mesa_function_pool[8665]: DrawRangeElements (offset 338) */
    "iiiiip\0"
    "glDrawRangeElements\0"
    "glDrawRangeElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[8543]: EvalMesh2 (offset 238) */
+   /* _mesa_function_pool[8716]: EvalMesh2 (offset 238) */
    "iiiii\0"
    "glEvalMesh2\0"
    "\0"
-   /* _mesa_function_pool[8562]: Vertex4fv (offset 145) */
+   /* _mesa_function_pool[8735]: Vertex4fv (offset 145) */
    "p\0"
    "glVertex4fv\0"
    "\0"
-   /* _mesa_function_pool[8577]: SpriteParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[8750]: GenTransformFeedbacks (will be remapped) */
+   "ip\0"
+   "glGenTransformFeedbacks\0"
+   "\0"
+   /* _mesa_function_pool[8778]: SpriteParameterfvSGIX (dynamic) */
    "ip\0"
    "glSpriteParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[8605]: CheckFramebufferStatusEXT (will be remapped) */
+   /* _mesa_function_pool[8806]: CheckFramebufferStatusEXT (will be remapped) */
    "i\0"
    "glCheckFramebufferStatus\0"
    "glCheckFramebufferStatusEXT\0"
    "\0"
-   /* _mesa_function_pool[8661]: GlobalAlphaFactoruiSUN (dynamic) */
+   /* _mesa_function_pool[8862]: GlobalAlphaFactoruiSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactoruiSUN\0"
    "\0"
-   /* _mesa_function_pool[8689]: GetHandleARB (will be remapped) */
+   /* _mesa_function_pool[8890]: GetHandleARB (will be remapped) */
    "i\0"
    "glGetHandleARB\0"
    "\0"
-   /* _mesa_function_pool[8707]: GetVertexAttribivARB (will be remapped) */
+   /* _mesa_function_pool[8908]: GetVertexAttribivARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribiv\0"
    "glGetVertexAttribivARB\0"
    "\0"
-   /* _mesa_function_pool[8755]: GetCombinerInputParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[8956]: GetCombinerInputParameterfvNV (will be remapped) */
    "iiiip\0"
    "glGetCombinerInputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[8794]: CreateProgram (will be remapped) */
+   /* _mesa_function_pool[8995]: CreateProgram (will be remapped) */
    "\0"
    "glCreateProgram\0"
    "\0"
-   /* _mesa_function_pool[8812]: LoadTransposeMatrixdARB (will be remapped) */
+   /* _mesa_function_pool[9013]: LoadTransposeMatrixdARB (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixd\0"
    "glLoadTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[8864]: GetMinmax (offset 364) */
+   /* _mesa_function_pool[9065]: GetMinmax (offset 364) */
    "iiiip\0"
    "glGetMinmax\0"
    "glGetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[8898]: StencilFuncSeparate (will be remapped) */
+   /* _mesa_function_pool[9099]: StencilFuncSeparate (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparate\0"
    "\0"
-   /* _mesa_function_pool[8926]: SecondaryColor3sEXT (will be remapped) */
+   /* _mesa_function_pool[9127]: SecondaryColor3sEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3s\0"
    "glSecondaryColor3sEXT\0"
    "\0"
-   /* _mesa_function_pool[8972]: Color3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[9173]: Color3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[8998]: Normal3fv (offset 57) */
+   /* _mesa_function_pool[9199]: Normal3fv (offset 57) */
    "p\0"
    "glNormal3fv\0"
    "\0"
-   /* _mesa_function_pool[9013]: GlobalAlphaFactorbSUN (dynamic) */
+   /* _mesa_function_pool[9214]: GlobalAlphaFactorbSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorbSUN\0"
    "\0"
-   /* _mesa_function_pool[9040]: Color3us (offset 23) */
+   /* _mesa_function_pool[9241]: Color3us (offset 23) */
    "iii\0"
    "glColor3us\0"
    "\0"
-   /* _mesa_function_pool[9056]: ImageTransformParameterfvHP (dynamic) */
+   /* _mesa_function_pool[9257]: ImageTransformParameterfvHP (dynamic) */
    "iip\0"
    "glImageTransformParameterfvHP\0"
    "\0"
-   /* _mesa_function_pool[9091]: VertexAttrib4ivARB (will be remapped) */
+   /* _mesa_function_pool[9292]: VertexAttrib4ivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4iv\0"
    "glVertexAttrib4ivARB\0"
    "\0"
-   /* _mesa_function_pool[9134]: End (offset 43) */
+   /* _mesa_function_pool[9335]: End (offset 43) */
    "\0"
    "glEnd\0"
    "\0"
-   /* _mesa_function_pool[9142]: VertexAttrib3fNV (will be remapped) */
+   /* _mesa_function_pool[9343]: VertexAttrib3fNV (will be remapped) */
    "ifff\0"
    "glVertexAttrib3fNV\0"
    "\0"
-   /* _mesa_function_pool[9167]: VertexAttribs2dvNV (will be remapped) */
+   /* _mesa_function_pool[9368]: VertexAttribs2dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2dvNV\0"
    "\0"
-   /* _mesa_function_pool[9193]: GetQueryObjectui64vEXT (will be remapped) */
+   /* _mesa_function_pool[9394]: GetQueryObjectui64vEXT (will be remapped) */
    "iip\0"
    "glGetQueryObjectui64vEXT\0"
    "\0"
-   /* _mesa_function_pool[9223]: MultiTexCoord3fvARB (offset 395) */
+   /* _mesa_function_pool[9424]: MultiTexCoord3fvARB (offset 395) */
    "ip\0"
    "glMultiTexCoord3fv\0"
    "glMultiTexCoord3fvARB\0"
    "\0"
-   /* _mesa_function_pool[9268]: SecondaryColor3dEXT (will be remapped) */
+   /* _mesa_function_pool[9469]: SecondaryColor3dEXT (will be remapped) */
    "ddd\0"
    "glSecondaryColor3d\0"
    "glSecondaryColor3dEXT\0"
    "\0"
-   /* _mesa_function_pool[9314]: Color3ub (offset 19) */
+   /* _mesa_function_pool[9515]: Color3ub (offset 19) */
    "iii\0"
    "glColor3ub\0"
    "\0"
-   /* _mesa_function_pool[9330]: GetProgramParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[9531]: GetProgramParameterfvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[9362]: TangentPointerEXT (dynamic) */
+   /* _mesa_function_pool[9563]: TangentPointerEXT (dynamic) */
    "iip\0"
    "glTangentPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[9387]: Color4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[9588]: Color4fNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[9422]: GetInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[9623]: GetInstrumentsSGIX (dynamic) */
    "\0"
    "glGetInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[9445]: Color3ui (offset 21) */
+   /* _mesa_function_pool[9646]: Color3ui (offset 21) */
    "iii\0"
    "glColor3ui\0"
    "\0"
-   /* _mesa_function_pool[9461]: EvalMapsNV (dynamic) */
+   /* _mesa_function_pool[9662]: EvalMapsNV (dynamic) */
    "ii\0"
    "glEvalMapsNV\0"
    "\0"
-   /* _mesa_function_pool[9478]: TexSubImage2D (offset 333) */
+   /* _mesa_function_pool[9679]: TexSubImage2D (offset 333) */
    "iiiiiiiip\0"
    "glTexSubImage2D\0"
    "glTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[9524]: FragmentLightivSGIX (dynamic) */
+   /* _mesa_function_pool[9725]: FragmentLightivSGIX (dynamic) */
    "iip\0"
    "glFragmentLightivSGIX\0"
    "\0"
-   /* _mesa_function_pool[9551]: GetTexParameterPointervAPPLE (will be remapped) */
+   /* _mesa_function_pool[9752]: GetTexParameterPointervAPPLE (will be remapped) */
    "iip\0"
    "glGetTexParameterPointervAPPLE\0"
    "\0"
-   /* _mesa_function_pool[9587]: TexGenfv (offset 191) */
+   /* _mesa_function_pool[9788]: TexGenfv (offset 191) */
    "iip\0"
    "glTexGenfv\0"
    "\0"
-   /* _mesa_function_pool[9603]: PixelTransformParameterfvEXT (dynamic) */
-   "iip\0"
-   "glPixelTransformParameterfvEXT\0"
+   /* _mesa_function_pool[9804]: GetTransformFeedbackVaryingEXT (will be remapped) */
+   "iiipppp\0"
+   "glGetTransformFeedbackVaryingEXT\0"
+   "glGetTransformFeedbackVarying\0"
    "\0"
-   /* _mesa_function_pool[9639]: VertexAttrib4bvARB (will be remapped) */
+   /* _mesa_function_pool[9876]: VertexAttrib4bvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4bv\0"
    "glVertexAttrib4bvARB\0"
    "\0"
-   /* _mesa_function_pool[9682]: AlphaFragmentOp2ATI (will be remapped) */
+   /* _mesa_function_pool[9919]: AlphaFragmentOp2ATI (will be remapped) */
    "iiiiiiiii\0"
    "glAlphaFragmentOp2ATI\0"
    "\0"
-   /* _mesa_function_pool[9715]: GetIntegerIndexedvEXT (will be remapped) */
+   /* _mesa_function_pool[9952]: GetIntegerIndexedvEXT (will be remapped) */
    "iip\0"
    "glGetIntegerIndexedvEXT\0"
    "\0"
-   /* _mesa_function_pool[9744]: MultiTexCoord4sARB (offset 406) */
+   /* _mesa_function_pool[9981]: MultiTexCoord4sARB (offset 406) */
    "iiiii\0"
    "glMultiTexCoord4s\0"
    "glMultiTexCoord4sARB\0"
    "\0"
-   /* _mesa_function_pool[9790]: GetFragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[10027]: GetFragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glGetFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[9823]: WindowPos4dMESA (will be remapped) */
+   /* _mesa_function_pool[10060]: WindowPos4dMESA (will be remapped) */
    "dddd\0"
    "glWindowPos4dMESA\0"
    "\0"
-   /* _mesa_function_pool[9847]: WeightPointerARB (dynamic) */
+   /* _mesa_function_pool[10084]: WeightPointerARB (dynamic) */
    "iiip\0"
    "glWeightPointerARB\0"
    "\0"
-   /* _mesa_function_pool[9872]: WindowPos2dMESA (will be remapped) */
+   /* _mesa_function_pool[10109]: WindowPos2dMESA (will be remapped) */
    "dd\0"
    "glWindowPos2d\0"
    "glWindowPos2dARB\0"
    "glWindowPos2dMESA\0"
    "\0"
-   /* _mesa_function_pool[9925]: FramebufferTexture3DEXT (will be remapped) */
+   /* _mesa_function_pool[10162]: FramebufferTexture3DEXT (will be remapped) */
    "iiiiii\0"
    "glFramebufferTexture3D\0"
    "glFramebufferTexture3DEXT\0"
    "\0"
-   /* _mesa_function_pool[9982]: BlendEquation (offset 337) */
+   /* _mesa_function_pool[10219]: BlendEquation (offset 337) */
    "i\0"
    "glBlendEquation\0"
    "glBlendEquationEXT\0"
    "\0"
-   /* _mesa_function_pool[10020]: VertexAttrib3dNV (will be remapped) */
+   /* _mesa_function_pool[10257]: VertexAttrib3dNV (will be remapped) */
    "iddd\0"
    "glVertexAttrib3dNV\0"
    "\0"
-   /* _mesa_function_pool[10045]: VertexAttrib3dARB (will be remapped) */
+   /* _mesa_function_pool[10282]: VertexAttrib3dARB (will be remapped) */
    "iddd\0"
    "glVertexAttrib3d\0"
    "glVertexAttrib3dARB\0"
    "\0"
-   /* _mesa_function_pool[10088]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[10325]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "ppppp\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[10152]: VertexAttrib4fARB (will be remapped) */
+   /* _mesa_function_pool[10389]: VertexAttrib4fARB (will be remapped) */
    "iffff\0"
    "glVertexAttrib4f\0"
    "glVertexAttrib4fARB\0"
    "\0"
-   /* _mesa_function_pool[10196]: GetError (offset 261) */
+   /* _mesa_function_pool[10433]: GetError (offset 261) */
    "\0"
    "glGetError\0"
    "\0"
-   /* _mesa_function_pool[10209]: IndexFuncEXT (dynamic) */
+   /* _mesa_function_pool[10446]: IndexFuncEXT (dynamic) */
    "if\0"
    "glIndexFuncEXT\0"
    "\0"
-   /* _mesa_function_pool[10228]: TexCoord3dv (offset 111) */
+   /* _mesa_function_pool[10465]: TexCoord3dv (offset 111) */
    "p\0"
    "glTexCoord3dv\0"
    "\0"
-   /* _mesa_function_pool[10245]: Indexdv (offset 45) */
+   /* _mesa_function_pool[10482]: Indexdv (offset 45) */
    "p\0"
    "glIndexdv\0"
    "\0"
-   /* _mesa_function_pool[10258]: FramebufferTexture2DEXT (will be remapped) */
+   /* _mesa_function_pool[10495]: FramebufferTexture2DEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture2D\0"
    "glFramebufferTexture2DEXT\0"
    "\0"
-   /* _mesa_function_pool[10314]: Normal3s (offset 60) */
+   /* _mesa_function_pool[10551]: Normal3s (offset 60) */
    "iii\0"
    "glNormal3s\0"
    "\0"
-   /* _mesa_function_pool[10330]: GetObjectParameterivAPPLE (will be remapped) */
+   /* _mesa_function_pool[10567]: GetObjectParameterivAPPLE (will be remapped) */
    "iiip\0"
    "glGetObjectParameterivAPPLE\0"
    "\0"
-   /* _mesa_function_pool[10364]: PushName (offset 201) */
+   /* _mesa_function_pool[10601]: PushName (offset 201) */
    "i\0"
    "glPushName\0"
    "\0"
-   /* _mesa_function_pool[10378]: MultiTexCoord2dvARB (offset 385) */
+   /* _mesa_function_pool[10615]: MultiTexCoord2dvARB (offset 385) */
    "ip\0"
    "glMultiTexCoord2dv\0"
    "glMultiTexCoord2dvARB\0"
    "\0"
-   /* _mesa_function_pool[10423]: CullParameterfvEXT (will be remapped) */
+   /* _mesa_function_pool[10660]: CullParameterfvEXT (will be remapped) */
    "ip\0"
    "glCullParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[10448]: Normal3i (offset 58) */
+   /* _mesa_function_pool[10685]: Normal3i (offset 58) */
    "iii\0"
    "glNormal3i\0"
    "\0"
-   /* _mesa_function_pool[10464]: ProgramNamedParameter4fvNV (will be remapped) */
+   /* _mesa_function_pool[10701]: ProgramNamedParameter4fvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4fvNV\0"
    "\0"
-   /* _mesa_function_pool[10499]: SecondaryColorPointerEXT (will be remapped) */
+   /* _mesa_function_pool[10736]: SecondaryColorPointerEXT (will be remapped) */
    "iiip\0"
    "glSecondaryColorPointer\0"
    "glSecondaryColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[10556]: VertexAttrib4fvARB (will be remapped) */
+   /* _mesa_function_pool[10793]: VertexAttrib4fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4fv\0"
    "glVertexAttrib4fvARB\0"
    "\0"
-   /* _mesa_function_pool[10599]: ColorPointerListIBM (dynamic) */
+   /* _mesa_function_pool[10836]: ColorPointerListIBM (dynamic) */
    "iiipi\0"
    "glColorPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[10628]: GetActiveUniformARB (will be remapped) */
+   /* _mesa_function_pool[10865]: GetActiveUniformARB (will be remapped) */
    "iiipppp\0"
    "glGetActiveUniform\0"
    "glGetActiveUniformARB\0"
    "\0"
-   /* _mesa_function_pool[10678]: ImageTransformParameteriHP (dynamic) */
+   /* _mesa_function_pool[10915]: ImageTransformParameteriHP (dynamic) */
    "iii\0"
    "glImageTransformParameteriHP\0"
    "\0"
-   /* _mesa_function_pool[10712]: Normal3b (offset 52) */
+   /* _mesa_function_pool[10949]: Normal3b (offset 52) */
    "iii\0"
    "glNormal3b\0"
    "\0"
-   /* _mesa_function_pool[10728]: Normal3d (offset 54) */
+   /* _mesa_function_pool[10965]: Normal3d (offset 54) */
    "ddd\0"
    "glNormal3d\0"
    "\0"
-   /* _mesa_function_pool[10744]: Normal3f (offset 56) */
+   /* _mesa_function_pool[10981]: Normal3f (offset 56) */
    "fff\0"
    "glNormal3f\0"
    "\0"
-   /* _mesa_function_pool[10760]: MultiTexCoord1svARB (offset 383) */
+   /* _mesa_function_pool[10997]: MultiTexCoord1svARB (offset 383) */
    "ip\0"
    "glMultiTexCoord1sv\0"
    "glMultiTexCoord1svARB\0"
    "\0"
-   /* _mesa_function_pool[10805]: Indexi (offset 48) */
+   /* _mesa_function_pool[11042]: Indexi (offset 48) */
    "i\0"
    "glIndexi\0"
    "\0"
-   /* _mesa_function_pool[10817]: EGLImageTargetTexture2DOES (will be remapped) */
+   /* _mesa_function_pool[11054]: EGLImageTargetTexture2DOES (will be remapped) */
    "ip\0"
    "glEGLImageTargetTexture2DOES\0"
    "\0"
-   /* _mesa_function_pool[10850]: EndQueryARB (will be remapped) */
+   /* _mesa_function_pool[11087]: EndQueryARB (will be remapped) */
    "i\0"
    "glEndQuery\0"
    "glEndQueryARB\0"
    "\0"
-   /* _mesa_function_pool[10878]: DeleteFencesNV (will be remapped) */
+   /* _mesa_function_pool[11115]: DeleteFencesNV (will be remapped) */
    "ip\0"
    "glDeleteFencesNV\0"
    "\0"
-   /* _mesa_function_pool[10899]: DepthMask (offset 211) */
+   /* _mesa_function_pool[11136]: BindBufferRangeEXT (will be remapped) */
+   "iiiii\0"
+   "glBindBufferRangeEXT\0"
+   "glBindBufferRange\0"
+   "\0"
+   /* _mesa_function_pool[11182]: DepthMask (offset 211) */
    "i\0"
    "glDepthMask\0"
    "\0"
-   /* _mesa_function_pool[10914]: IsShader (will be remapped) */
+   /* _mesa_function_pool[11197]: IsShader (will be remapped) */
    "i\0"
    "glIsShader\0"
    "\0"
-   /* _mesa_function_pool[10928]: Indexf (offset 46) */
+   /* _mesa_function_pool[11211]: Indexf (offset 46) */
    "f\0"
    "glIndexf\0"
    "\0"
-   /* _mesa_function_pool[10940]: GetImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[11223]: GetImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glGetImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[10978]: Indexd (offset 44) */
+   /* _mesa_function_pool[11261]: Indexd (offset 44) */
    "d\0"
    "glIndexd\0"
    "\0"
-   /* _mesa_function_pool[10990]: GetMaterialiv (offset 270) */
+   /* _mesa_function_pool[11273]: GetMaterialiv (offset 270) */
    "iip\0"
    "glGetMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[11011]: StencilOp (offset 244) */
+   /* _mesa_function_pool[11294]: StencilOp (offset 244) */
    "iii\0"
    "glStencilOp\0"
    "\0"
-   /* _mesa_function_pool[11028]: WindowPos4ivMESA (will be remapped) */
+   /* _mesa_function_pool[11311]: WindowPos4ivMESA (will be remapped) */
    "p\0"
    "glWindowPos4ivMESA\0"
    "\0"
-   /* _mesa_function_pool[11050]: MultiTexCoord3svARB (offset 399) */
+   /* _mesa_function_pool[11333]: FramebufferTextureLayer (dynamic) */
+   "iiiii\0"
+   "glFramebufferTextureLayerARB\0"
+   "\0"
+   /* _mesa_function_pool[11369]: MultiTexCoord3svARB (offset 399) */
    "ip\0"
    "glMultiTexCoord3sv\0"
    "glMultiTexCoord3svARB\0"
    "\0"
-   /* _mesa_function_pool[11095]: TexEnvfv (offset 185) */
+   /* _mesa_function_pool[11414]: TexEnvfv (offset 185) */
    "iip\0"
    "glTexEnvfv\0"
    "\0"
-   /* _mesa_function_pool[11111]: MultiTexCoord4iARB (offset 404) */
+   /* _mesa_function_pool[11430]: MultiTexCoord4iARB (offset 404) */
    "iiiii\0"
    "glMultiTexCoord4i\0"
    "glMultiTexCoord4iARB\0"
    "\0"
-   /* _mesa_function_pool[11157]: Indexs (offset 50) */
+   /* _mesa_function_pool[11476]: Indexs (offset 50) */
    "i\0"
    "glIndexs\0"
    "\0"
-   /* _mesa_function_pool[11169]: Binormal3ivEXT (dynamic) */
+   /* _mesa_function_pool[11488]: Binormal3ivEXT (dynamic) */
    "p\0"
    "glBinormal3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[11189]: ResizeBuffersMESA (will be remapped) */
+   /* _mesa_function_pool[11508]: ResizeBuffersMESA (will be remapped) */
    "\0"
    "glResizeBuffersMESA\0"
    "\0"
-   /* _mesa_function_pool[11211]: GetUniformivARB (will be remapped) */
+   /* _mesa_function_pool[11530]: GetUniformivARB (will be remapped) */
    "iip\0"
    "glGetUniformiv\0"
    "glGetUniformivARB\0"
    "\0"
-   /* _mesa_function_pool[11249]: PixelTexGenParameteriSGIS (will be remapped) */
+   /* _mesa_function_pool[11568]: PixelTexGenParameteriSGIS (will be remapped) */
    "ii\0"
    "glPixelTexGenParameteriSGIS\0"
    "\0"
-   /* _mesa_function_pool[11281]: VertexPointervINTEL (dynamic) */
+   /* _mesa_function_pool[11600]: VertexPointervINTEL (dynamic) */
    "iip\0"
    "glVertexPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[11308]: Vertex2i (offset 130) */
+   /* _mesa_function_pool[11627]: Vertex2i (offset 130) */
    "ii\0"
    "glVertex2i\0"
    "\0"
-   /* _mesa_function_pool[11323]: LoadMatrixf (offset 291) */
+   /* _mesa_function_pool[11642]: LoadMatrixf (offset 291) */
    "p\0"
    "glLoadMatrixf\0"
    "\0"
-   /* _mesa_function_pool[11340]: Vertex2f (offset 128) */
+   /* _mesa_function_pool[11659]: Vertex2f (offset 128) */
    "ff\0"
    "glVertex2f\0"
    "\0"
-   /* _mesa_function_pool[11355]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[11674]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[11408]: Color4bv (offset 26) */
+   /* _mesa_function_pool[11727]: Color4bv (offset 26) */
    "p\0"
    "glColor4bv\0"
    "\0"
-   /* _mesa_function_pool[11422]: VertexPointer (offset 321) */
+   /* _mesa_function_pool[11741]: VertexPointer (offset 321) */
    "iiip\0"
    "glVertexPointer\0"
    "\0"
-   /* _mesa_function_pool[11444]: SecondaryColor3uiEXT (will be remapped) */
+   /* _mesa_function_pool[11763]: SecondaryColor3uiEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3ui\0"
    "glSecondaryColor3uiEXT\0"
    "\0"
-   /* _mesa_function_pool[11492]: StartInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[11811]: StartInstrumentsSGIX (dynamic) */
    "\0"
    "glStartInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[11517]: SecondaryColor3usvEXT (will be remapped) */
+   /* _mesa_function_pool[11836]: SecondaryColor3usvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3usv\0"
    "glSecondaryColor3usvEXT\0"
    "\0"
-   /* _mesa_function_pool[11565]: VertexAttrib2fvNV (will be remapped) */
+   /* _mesa_function_pool[11884]: VertexAttrib2fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2fvNV\0"
    "\0"
-   /* _mesa_function_pool[11589]: ProgramLocalParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[11908]: ProgramLocalParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4dvARB\0"
    "\0"
-   /* _mesa_function_pool[11624]: DeleteLists (offset 4) */
+   /* _mesa_function_pool[11943]: DeleteLists (offset 4) */
    "ii\0"
    "glDeleteLists\0"
    "\0"
-   /* _mesa_function_pool[11642]: LogicOp (offset 242) */
+   /* _mesa_function_pool[11961]: LogicOp (offset 242) */
    "i\0"
    "glLogicOp\0"
    "\0"
-   /* _mesa_function_pool[11655]: MatrixIndexuivARB (dynamic) */
+   /* _mesa_function_pool[11974]: MatrixIndexuivARB (dynamic) */
    "ip\0"
    "glMatrixIndexuivARB\0"
    "\0"
-   /* _mesa_function_pool[11679]: Vertex2s (offset 132) */
+   /* _mesa_function_pool[11998]: Vertex2s (offset 132) */
    "ii\0"
    "glVertex2s\0"
    "\0"
-   /* _mesa_function_pool[11694]: RenderbufferStorageMultisample (will be remapped) */
+   /* _mesa_function_pool[12013]: RenderbufferStorageMultisample (will be remapped) */
    "iiiii\0"
    "glRenderbufferStorageMultisample\0"
    "glRenderbufferStorageMultisampleEXT\0"
    "\0"
-   /* _mesa_function_pool[11770]: TexCoord4fv (offset 121) */
+   /* _mesa_function_pool[12089]: TexCoord4fv (offset 121) */
    "p\0"
    "glTexCoord4fv\0"
    "\0"
-   /* _mesa_function_pool[11787]: Tangent3sEXT (dynamic) */
+   /* _mesa_function_pool[12106]: Tangent3sEXT (dynamic) */
    "iii\0"
    "glTangent3sEXT\0"
    "\0"
-   /* _mesa_function_pool[11807]: GlobalAlphaFactorfSUN (dynamic) */
+   /* _mesa_function_pool[12126]: GlobalAlphaFactorfSUN (dynamic) */
    "f\0"
    "glGlobalAlphaFactorfSUN\0"
    "\0"
-   /* _mesa_function_pool[11834]: MultiTexCoord3iARB (offset 396) */
+   /* _mesa_function_pool[12153]: MultiTexCoord3iARB (offset 396) */
    "iiii\0"
    "glMultiTexCoord3i\0"
    "glMultiTexCoord3iARB\0"
    "\0"
-   /* _mesa_function_pool[11879]: IsProgram (will be remapped) */
+   /* _mesa_function_pool[12198]: IsProgram (will be remapped) */
    "i\0"
    "glIsProgram\0"
    "\0"
-   /* _mesa_function_pool[11894]: TexCoordPointerListIBM (dynamic) */
+   /* _mesa_function_pool[12213]: TexCoordPointerListIBM (dynamic) */
    "iiipi\0"
    "glTexCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[11926]: GlobalAlphaFactorusSUN (dynamic) */
+   /* _mesa_function_pool[12245]: GlobalAlphaFactorusSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorusSUN\0"
    "\0"
-   /* _mesa_function_pool[11954]: VertexAttrib2dvNV (will be remapped) */
+   /* _mesa_function_pool[12273]: VertexAttrib2dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2dvNV\0"
    "\0"
-   /* _mesa_function_pool[11978]: FramebufferRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[12297]: FramebufferRenderbufferEXT (will be remapped) */
    "iiii\0"
    "glFramebufferRenderbuffer\0"
    "glFramebufferRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[12039]: VertexAttrib1dvNV (will be remapped) */
+   /* _mesa_function_pool[12358]: VertexAttrib1dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1dvNV\0"
    "\0"
-   /* _mesa_function_pool[12063]: GenTextures (offset 328) */
+   /* _mesa_function_pool[12382]: GenTextures (offset 328) */
    "ip\0"
    "glGenTextures\0"
    "glGenTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[12098]: SetFenceNV (will be remapped) */
+   /* _mesa_function_pool[12417]: FramebufferTextureARB (will be remapped) */
+   "iiii\0"
+   "glFramebufferTextureARB\0"
+   "\0"
+   /* _mesa_function_pool[12447]: SetFenceNV (will be remapped) */
    "ii\0"
    "glSetFenceNV\0"
    "\0"
-   /* _mesa_function_pool[12115]: FramebufferTexture1DEXT (will be remapped) */
+   /* _mesa_function_pool[12464]: FramebufferTexture1DEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture1D\0"
    "glFramebufferTexture1DEXT\0"
    "\0"
-   /* _mesa_function_pool[12171]: GetCombinerOutputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[12520]: GetCombinerOutputParameterivNV (will be remapped) */
    "iiip\0"
    "glGetCombinerOutputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[12210]: MultiModeDrawArraysIBM (will be remapped) */
+   /* _mesa_function_pool[12559]: MultiModeDrawArraysIBM (will be remapped) */
    "pppii\0"
    "glMultiModeDrawArraysIBM\0"
    "\0"
-   /* _mesa_function_pool[12242]: PixelTexGenParameterivSGIS (will be remapped) */
+   /* _mesa_function_pool[12591]: PixelTexGenParameterivSGIS (will be remapped) */
    "ip\0"
    "glPixelTexGenParameterivSGIS\0"
    "\0"
-   /* _mesa_function_pool[12275]: TextureNormalEXT (dynamic) */
+   /* _mesa_function_pool[12624]: TextureNormalEXT (dynamic) */
    "i\0"
    "glTextureNormalEXT\0"
    "\0"
-   /* _mesa_function_pool[12297]: IndexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[12646]: IndexPointerListIBM (dynamic) */
    "iipi\0"
    "glIndexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[12325]: WeightfvARB (dynamic) */
+   /* _mesa_function_pool[12674]: WeightfvARB (dynamic) */
    "ip\0"
    "glWeightfvARB\0"
    "\0"
-   /* _mesa_function_pool[12343]: RasterPos2sv (offset 69) */
+   /* _mesa_function_pool[12692]: GetCombinerOutputParameterfvNV (will be remapped) */
+   "iiip\0"
+   "glGetCombinerOutputParameterfvNV\0"
+   "\0"
+   /* _mesa_function_pool[12731]: RasterPos2sv (offset 69) */
    "p\0"
    "glRasterPos2sv\0"
    "\0"
-   /* _mesa_function_pool[12361]: Color4ubv (offset 36) */
+   /* _mesa_function_pool[12749]: Color4ubv (offset 36) */
    "p\0"
    "glColor4ubv\0"
    "\0"
-   /* _mesa_function_pool[12376]: DrawBuffer (offset 202) */
+   /* _mesa_function_pool[12764]: DrawBuffer (offset 202) */
    "i\0"
    "glDrawBuffer\0"
    "\0"
-   /* _mesa_function_pool[12392]: TexCoord2fv (offset 105) */
+   /* _mesa_function_pool[12780]: TexCoord2fv (offset 105) */
    "p\0"
    "glTexCoord2fv\0"
    "\0"
-   /* _mesa_function_pool[12409]: WindowPos4fMESA (will be remapped) */
+   /* _mesa_function_pool[12797]: WindowPos4fMESA (will be remapped) */
    "ffff\0"
    "glWindowPos4fMESA\0"
    "\0"
-   /* _mesa_function_pool[12433]: TexCoord1sv (offset 101) */
+   /* _mesa_function_pool[12821]: TexCoord1sv (offset 101) */
    "p\0"
    "glTexCoord1sv\0"
    "\0"
-   /* _mesa_function_pool[12450]: WindowPos3dvMESA (will be remapped) */
+   /* _mesa_function_pool[12838]: WindowPos3dvMESA (will be remapped) */
    "p\0"
    "glWindowPos3dv\0"
    "glWindowPos3dvARB\0"
    "glWindowPos3dvMESA\0"
    "\0"
-   /* _mesa_function_pool[12505]: DepthFunc (offset 245) */
+   /* _mesa_function_pool[12893]: DepthFunc (offset 245) */
    "i\0"
    "glDepthFunc\0"
    "\0"
-   /* _mesa_function_pool[12520]: PixelMapusv (offset 253) */
+   /* _mesa_function_pool[12908]: PixelMapusv (offset 253) */
    "iip\0"
    "glPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[12539]: GetQueryObjecti64vEXT (will be remapped) */
+   /* _mesa_function_pool[12927]: GetQueryObjecti64vEXT (will be remapped) */
    "iip\0"
    "glGetQueryObjecti64vEXT\0"
    "\0"
-   /* _mesa_function_pool[12568]: MultiTexCoord1dARB (offset 376) */
+   /* _mesa_function_pool[12956]: MultiTexCoord1dARB (offset 376) */
    "id\0"
    "glMultiTexCoord1d\0"
    "glMultiTexCoord1dARB\0"
    "\0"
-   /* _mesa_function_pool[12611]: PointParameterivNV (will be remapped) */
+   /* _mesa_function_pool[12999]: PointParameterivNV (will be remapped) */
    "ip\0"
    "glPointParameteriv\0"
    "glPointParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[12655]: BlendFunc (offset 241) */
+   /* _mesa_function_pool[13043]: BlendFunc (offset 241) */
    "ii\0"
    "glBlendFunc\0"
    "\0"
-   /* _mesa_function_pool[12671]: Uniform2fvARB (will be remapped) */
+   /* _mesa_function_pool[13059]: EndTransformFeedbackEXT (will be remapped) */
+   "\0"
+   "glEndTransformFeedbackEXT\0"
+   "glEndTransformFeedback\0"
+   "\0"
+   /* _mesa_function_pool[13110]: Uniform2fvARB (will be remapped) */
    "iip\0"
    "glUniform2fv\0"
    "glUniform2fvARB\0"
    "\0"
-   /* _mesa_function_pool[12705]: BufferParameteriAPPLE (will be remapped) */
+   /* _mesa_function_pool[13144]: BufferParameteriAPPLE (will be remapped) */
    "iii\0"
    "glBufferParameteriAPPLE\0"
    "\0"
-   /* _mesa_function_pool[12734]: MultiTexCoord3dvARB (offset 393) */
+   /* _mesa_function_pool[13173]: MultiTexCoord3dvARB (offset 393) */
    "ip\0"
    "glMultiTexCoord3dv\0"
    "glMultiTexCoord3dvARB\0"
    "\0"
-   /* _mesa_function_pool[12779]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[13218]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[12835]: DeleteObjectARB (will be remapped) */
+   /* _mesa_function_pool[13274]: DeleteObjectARB (will be remapped) */
    "i\0"
    "glDeleteObjectARB\0"
    "\0"
-   /* _mesa_function_pool[12856]: MatrixIndexPointerARB (dynamic) */
+   /* _mesa_function_pool[13295]: MatrixIndexPointerARB (dynamic) */
    "iiip\0"
    "glMatrixIndexPointerARB\0"
    "\0"
-   /* _mesa_function_pool[12886]: ProgramNamedParameter4dvNV (will be remapped) */
+   /* _mesa_function_pool[13325]: ProgramNamedParameter4dvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[12921]: Tangent3fvEXT (dynamic) */
+   /* _mesa_function_pool[13360]: Tangent3fvEXT (dynamic) */
    "p\0"
    "glTangent3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[12940]: Flush (offset 217) */
+   /* _mesa_function_pool[13379]: Flush (offset 217) */
    "\0"
    "glFlush\0"
    "\0"
-   /* _mesa_function_pool[12950]: Color4uiv (offset 38) */
+   /* _mesa_function_pool[13389]: Color4uiv (offset 38) */
    "p\0"
    "glColor4uiv\0"
    "\0"
-   /* _mesa_function_pool[12965]: GenVertexArrays (will be remapped) */
+   /* _mesa_function_pool[13404]: GenVertexArrays (will be remapped) */
    "ip\0"
    "glGenVertexArrays\0"
    "\0"
-   /* _mesa_function_pool[12987]: RasterPos3sv (offset 77) */
+   /* _mesa_function_pool[13426]: RasterPos3sv (offset 77) */
    "p\0"
    "glRasterPos3sv\0"
    "\0"
-   /* _mesa_function_pool[13005]: BindFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[13444]: BindFramebufferEXT (will be remapped) */
    "ii\0"
    "glBindFramebuffer\0"
    "glBindFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[13048]: ReferencePlaneSGIX (dynamic) */
+   /* _mesa_function_pool[13487]: ReferencePlaneSGIX (dynamic) */
    "p\0"
    "glReferencePlaneSGIX\0"
    "\0"
-   /* _mesa_function_pool[13072]: PushAttrib (offset 219) */
+   /* _mesa_function_pool[13511]: PushAttrib (offset 219) */
    "i\0"
    "glPushAttrib\0"
    "\0"
-   /* _mesa_function_pool[13088]: RasterPos2i (offset 66) */
+   /* _mesa_function_pool[13527]: RasterPos2i (offset 66) */
    "ii\0"
    "glRasterPos2i\0"
    "\0"
-   /* _mesa_function_pool[13106]: ValidateProgramARB (will be remapped) */
+   /* _mesa_function_pool[13545]: ValidateProgramARB (will be remapped) */
    "i\0"
    "glValidateProgram\0"
    "glValidateProgramARB\0"
    "\0"
-   /* _mesa_function_pool[13148]: TexParameteriv (offset 181) */
+   /* _mesa_function_pool[13587]: TexParameteriv (offset 181) */
    "iip\0"
    "glTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[13170]: UnlockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[13609]: UnlockArraysEXT (will be remapped) */
    "\0"
    "glUnlockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[13190]: TexCoord2fColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[13629]: TexCoord2fColor3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[13231]: WindowPos3fvMESA (will be remapped) */
+   /* _mesa_function_pool[13670]: WindowPos3fvMESA (will be remapped) */
    "p\0"
    "glWindowPos3fv\0"
    "glWindowPos3fvARB\0"
    "glWindowPos3fvMESA\0"
    "\0"
-   /* _mesa_function_pool[13286]: RasterPos2f (offset 64) */
+   /* _mesa_function_pool[13725]: RasterPos2f (offset 64) */
    "ff\0"
    "glRasterPos2f\0"
    "\0"
-   /* _mesa_function_pool[13304]: VertexAttrib1svNV (will be remapped) */
+   /* _mesa_function_pool[13743]: VertexAttrib1svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1svNV\0"
    "\0"
-   /* _mesa_function_pool[13328]: RasterPos2d (offset 62) */
+   /* _mesa_function_pool[13767]: RasterPos2d (offset 62) */
    "dd\0"
    "glRasterPos2d\0"
    "\0"
-   /* _mesa_function_pool[13346]: RasterPos3fv (offset 73) */
+   /* _mesa_function_pool[13785]: RasterPos3fv (offset 73) */
    "p\0"
    "glRasterPos3fv\0"
    "\0"
-   /* _mesa_function_pool[13364]: CopyTexSubImage3D (offset 373) */
+   /* _mesa_function_pool[13803]: CopyTexSubImage3D (offset 373) */
    "iiiiiiiii\0"
    "glCopyTexSubImage3D\0"
    "glCopyTexSubImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[13418]: VertexAttrib2dARB (will be remapped) */
+   /* _mesa_function_pool[13857]: VertexAttrib2dARB (will be remapped) */
    "idd\0"
    "glVertexAttrib2d\0"
    "glVertexAttrib2dARB\0"
    "\0"
-   /* _mesa_function_pool[13460]: Color4ub (offset 35) */
+   /* _mesa_function_pool[13899]: Color4ub (offset 35) */
    "iiii\0"
    "glColor4ub\0"
    "\0"
-   /* _mesa_function_pool[13477]: GetInteger64v (will be remapped) */
+   /* _mesa_function_pool[13916]: GetInteger64v (will be remapped) */
    "ip\0"
    "glGetInteger64v\0"
    "\0"
-   /* _mesa_function_pool[13497]: TextureColorMaskSGIS (dynamic) */
+   /* _mesa_function_pool[13936]: TextureColorMaskSGIS (dynamic) */
    "iiii\0"
    "glTextureColorMaskSGIS\0"
    "\0"
-   /* _mesa_function_pool[13526]: RasterPos2s (offset 68) */
+   /* _mesa_function_pool[13965]: RasterPos2s (offset 68) */
    "ii\0"
    "glRasterPos2s\0"
    "\0"
-   /* _mesa_function_pool[13544]: GetColorTable (offset 343) */
+   /* _mesa_function_pool[13983]: GetColorTable (offset 343) */
    "iiip\0"
    "glGetColorTable\0"
    "glGetColorTableSGI\0"
    "glGetColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[13604]: SelectBuffer (offset 195) */
+   /* _mesa_function_pool[14043]: SelectBuffer (offset 195) */
    "ip\0"
    "glSelectBuffer\0"
    "\0"
-   /* _mesa_function_pool[13623]: Indexiv (offset 49) */
+   /* _mesa_function_pool[14062]: Indexiv (offset 49) */
    "p\0"
    "glIndexiv\0"
    "\0"
-   /* _mesa_function_pool[13636]: TexCoord3i (offset 114) */
+   /* _mesa_function_pool[14075]: TexCoord3i (offset 114) */
    "iii\0"
    "glTexCoord3i\0"
    "\0"
-   /* _mesa_function_pool[13654]: CopyColorTable (offset 342) */
+   /* _mesa_function_pool[14093]: CopyColorTable (offset 342) */
    "iiiii\0"
    "glCopyColorTable\0"
    "glCopyColorTableSGI\0"
    "\0"
-   /* _mesa_function_pool[13698]: GetHistogramParameterfv (offset 362) */
+   /* _mesa_function_pool[14137]: GetHistogramParameterfv (offset 362) */
    "iip\0"
    "glGetHistogramParameterfv\0"
    "glGetHistogramParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[13758]: Frustum (offset 289) */
+   /* _mesa_function_pool[14197]: Frustum (offset 289) */
    "dddddd\0"
    "glFrustum\0"
    "\0"
-   /* _mesa_function_pool[13776]: GetString (offset 275) */
+   /* _mesa_function_pool[14215]: GetString (offset 275) */
    "i\0"
    "glGetString\0"
    "\0"
-   /* _mesa_function_pool[13791]: ColorPointervINTEL (dynamic) */
+   /* _mesa_function_pool[14230]: ColorPointervINTEL (dynamic) */
    "iip\0"
    "glColorPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[13817]: TexEnvf (offset 184) */
+   /* _mesa_function_pool[14256]: TexEnvf (offset 184) */
    "iif\0"
    "glTexEnvf\0"
    "\0"
-   /* _mesa_function_pool[13832]: TexCoord3d (offset 110) */
+   /* _mesa_function_pool[14271]: TexCoord3d (offset 110) */
    "ddd\0"
    "glTexCoord3d\0"
    "\0"
-   /* _mesa_function_pool[13850]: AlphaFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[14289]: AlphaFragmentOp1ATI (will be remapped) */
    "iiiiii\0"
    "glAlphaFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[13880]: TexCoord3f (offset 112) */
+   /* _mesa_function_pool[14319]: TexCoord3f (offset 112) */
    "fff\0"
    "glTexCoord3f\0"
    "\0"
-   /* _mesa_function_pool[13898]: MultiTexCoord3ivARB (offset 397) */
+   /* _mesa_function_pool[14337]: MultiTexCoord3ivARB (offset 397) */
    "ip\0"
    "glMultiTexCoord3iv\0"
    "glMultiTexCoord3ivARB\0"
    "\0"
-   /* _mesa_function_pool[13943]: MultiTexCoord2sARB (offset 390) */
+   /* _mesa_function_pool[14382]: MultiTexCoord2sARB (offset 390) */
    "iii\0"
    "glMultiTexCoord2s\0"
    "glMultiTexCoord2sARB\0"
    "\0"
-   /* _mesa_function_pool[13987]: VertexAttrib1dvARB (will be remapped) */
+   /* _mesa_function_pool[14426]: VertexAttrib1dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1dv\0"
    "glVertexAttrib1dvARB\0"
    "\0"
-   /* _mesa_function_pool[14030]: DeleteTextures (offset 327) */
+   /* _mesa_function_pool[14469]: DeleteTextures (offset 327) */
    "ip\0"
    "glDeleteTextures\0"
    "glDeleteTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[14071]: TexCoordPointerEXT (will be remapped) */
+   /* _mesa_function_pool[14510]: TexCoordPointerEXT (will be remapped) */
    "iiiip\0"
    "glTexCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[14099]: TexSubImage4DSGIS (dynamic) */
+   /* _mesa_function_pool[14538]: TexSubImage4DSGIS (dynamic) */
    "iiiiiiiiiiiip\0"
    "glTexSubImage4DSGIS\0"
    "\0"
-   /* _mesa_function_pool[14134]: TexCoord3s (offset 116) */
+   /* _mesa_function_pool[14573]: TexCoord3s (offset 116) */
    "iii\0"
    "glTexCoord3s\0"
    "\0"
-   /* _mesa_function_pool[14152]: GetTexLevelParameteriv (offset 285) */
+   /* _mesa_function_pool[14591]: GetTexLevelParameteriv (offset 285) */
    "iiip\0"
    "glGetTexLevelParameteriv\0"
    "\0"
-   /* _mesa_function_pool[14183]: CombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[14622]: DrawArraysInstanced (will be remapped) */
+   "iiii\0"
+   "glDrawArraysInstanced\0"
+   "glDrawArraysInstancedARB\0"
+   "glDrawArraysInstancedEXT\0"
+   "\0"
+   /* _mesa_function_pool[14700]: CombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[14217]: StopInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[14734]: StopInstrumentsSGIX (dynamic) */
    "i\0"
    "glStopInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[14242]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[14759]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
    "fffffffffffffff\0"
    "glTexCoord4fColor4fNormal3fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[14298]: ClearAccum (offset 204) */
+   /* _mesa_function_pool[14815]: ClearAccum (offset 204) */
    "ffff\0"
    "glClearAccum\0"
    "\0"
-   /* _mesa_function_pool[14317]: DeformSGIX (dynamic) */
+   /* _mesa_function_pool[14834]: DeformSGIX (dynamic) */
    "i\0"
    "glDeformSGIX\0"
    "\0"
-   /* _mesa_function_pool[14333]: GetVertexAttribfvARB (will be remapped) */
+   /* _mesa_function_pool[14850]: GetVertexAttribfvARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribfv\0"
    "glGetVertexAttribfvARB\0"
    "\0"
-   /* _mesa_function_pool[14381]: SecondaryColor3ivEXT (will be remapped) */
+   /* _mesa_function_pool[14898]: SecondaryColor3ivEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3iv\0"
    "glSecondaryColor3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[14427]: TexCoord4iv (offset 123) */
+   /* _mesa_function_pool[14944]: TexCoord4iv (offset 123) */
    "p\0"
    "glTexCoord4iv\0"
    "\0"
-   /* _mesa_function_pool[14444]: UniformMatrix4x2fv (will be remapped) */
+   /* _mesa_function_pool[14961]: UniformMatrix4x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x2fv\0"
    "\0"
-   /* _mesa_function_pool[14471]: GetDetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[14988]: GetDetailTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[14498]: GetCombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[15015]: GetCombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glGetCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[14535]: PolygonOffset (offset 319) */
+   /* _mesa_function_pool[15052]: PolygonOffset (offset 319) */
    "ff\0"
    "glPolygonOffset\0"
    "\0"
-   /* _mesa_function_pool[14555]: BindVertexArray (will be remapped) */
+   /* _mesa_function_pool[15072]: BindVertexArray (will be remapped) */
    "i\0"
    "glBindVertexArray\0"
    "\0"
-   /* _mesa_function_pool[14576]: Color4ubVertex2fvSUN (dynamic) */
+   /* _mesa_function_pool[15093]: Color4ubVertex2fvSUN (dynamic) */
    "pp\0"
    "glColor4ubVertex2fvSUN\0"
    "\0"
-   /* _mesa_function_pool[14603]: Rectd (offset 86) */
+   /* _mesa_function_pool[15120]: Rectd (offset 86) */
    "dddd\0"
    "glRectd\0"
    "\0"
-   /* _mesa_function_pool[14617]: TexFilterFuncSGIS (dynamic) */
+   /* _mesa_function_pool[15134]: TexFilterFuncSGIS (dynamic) */
    "iiip\0"
    "glTexFilterFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[14643]: SampleMaskSGIS (will be remapped) */
+   /* _mesa_function_pool[15160]: SampleMaskSGIS (will be remapped) */
    "fi\0"
    "glSampleMaskSGIS\0"
    "glSampleMaskEXT\0"
    "\0"
-   /* _mesa_function_pool[14680]: GetAttribLocationARB (will be remapped) */
+   /* _mesa_function_pool[15197]: GetAttribLocationARB (will be remapped) */
    "ip\0"
    "glGetAttribLocation\0"
    "glGetAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[14727]: RasterPos3i (offset 74) */
+   /* _mesa_function_pool[15244]: RasterPos3i (offset 74) */
    "iii\0"
    "glRasterPos3i\0"
    "\0"
-   /* _mesa_function_pool[14746]: VertexAttrib4ubvARB (will be remapped) */
+   /* _mesa_function_pool[15263]: VertexAttrib4ubvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4ubv\0"
    "glVertexAttrib4ubvARB\0"
    "\0"
-   /* _mesa_function_pool[14791]: DetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[15308]: DetailTexFuncSGIS (dynamic) */
    "iip\0"
    "glDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[14816]: Normal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[15333]: Normal3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[14846]: CopyTexImage2D (offset 324) */
+   /* _mesa_function_pool[15363]: CopyTexImage2D (offset 324) */
    "iiiiiiii\0"
    "glCopyTexImage2D\0"
    "glCopyTexImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[14893]: GetBufferPointervARB (will be remapped) */
+   /* _mesa_function_pool[15410]: GetBufferPointervARB (will be remapped) */
    "iip\0"
    "glGetBufferPointerv\0"
    "glGetBufferPointervARB\0"
    "\0"
-   /* _mesa_function_pool[14941]: ProgramEnvParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[15458]: ProgramEnvParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramEnvParameter4fARB\0"
    "glProgramParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[14999]: Uniform3ivARB (will be remapped) */
+   /* _mesa_function_pool[15516]: Uniform3ivARB (will be remapped) */
    "iip\0"
    "glUniform3iv\0"
    "glUniform3ivARB\0"
    "\0"
-   /* _mesa_function_pool[15033]: Lightfv (offset 160) */
+   /* _mesa_function_pool[15550]: Lightfv (offset 160) */
    "iip\0"
    "glLightfv\0"
    "\0"
-   /* _mesa_function_pool[15048]: ClearDepth (offset 208) */
+   /* _mesa_function_pool[15565]: ClearDepth (offset 208) */
    "d\0"
    "glClearDepth\0"
    "\0"
-   /* _mesa_function_pool[15064]: GetFenceivNV (will be remapped) */
+   /* _mesa_function_pool[15581]: GetFenceivNV (will be remapped) */
    "iip\0"
    "glGetFenceivNV\0"
    "\0"
-   /* _mesa_function_pool[15084]: WindowPos4dvMESA (will be remapped) */
+   /* _mesa_function_pool[15601]: WindowPos4dvMESA (will be remapped) */
    "p\0"
    "glWindowPos4dvMESA\0"
    "\0"
-   /* _mesa_function_pool[15106]: ColorSubTable (offset 346) */
+   /* _mesa_function_pool[15623]: ColorSubTable (offset 346) */
    "iiiiip\0"
    "glColorSubTable\0"
    "glColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[15149]: Color4fv (offset 30) */
+   /* _mesa_function_pool[15666]: Color4fv (offset 30) */
    "p\0"
    "glColor4fv\0"
    "\0"
-   /* _mesa_function_pool[15163]: MultiTexCoord4ivARB (offset 405) */
+   /* _mesa_function_pool[15680]: MultiTexCoord4ivARB (offset 405) */
    "ip\0"
    "glMultiTexCoord4iv\0"
    "glMultiTexCoord4ivARB\0"
    "\0"
-   /* _mesa_function_pool[15208]: ProgramLocalParameters4fvEXT (will be remapped) */
-   "iiip\0"
-   "glProgramLocalParameters4fvEXT\0"
+   /* _mesa_function_pool[15725]: DrawElementsInstanced (will be remapped) */
+   "iiipi\0"
+   "glDrawElementsInstanced\0"
+   "glDrawElementsInstancedARB\0"
+   "glDrawElementsInstancedEXT\0"
    "\0"
-   /* _mesa_function_pool[15245]: ColorPointer (offset 308) */
+   /* _mesa_function_pool[15810]: ColorPointer (offset 308) */
    "iiip\0"
    "glColorPointer\0"
    "\0"
-   /* _mesa_function_pool[15266]: Rects (offset 92) */
+   /* _mesa_function_pool[15831]: Rects (offset 92) */
    "iiii\0"
    "glRects\0"
    "\0"
-   /* _mesa_function_pool[15280]: GetMapAttribParameterfvNV (dynamic) */
+   /* _mesa_function_pool[15845]: GetMapAttribParameterfvNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[15314]: Lightiv (offset 162) */
+   /* _mesa_function_pool[15879]: Lightiv (offset 162) */
    "iip\0"
    "glLightiv\0"
    "\0"
-   /* _mesa_function_pool[15329]: VertexAttrib4sARB (will be remapped) */
+   /* _mesa_function_pool[15894]: VertexAttrib4sARB (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4s\0"
    "glVertexAttrib4sARB\0"
    "\0"
-   /* _mesa_function_pool[15373]: GetQueryObjectuivARB (will be remapped) */
+   /* _mesa_function_pool[15938]: GetQueryObjectuivARB (will be remapped) */
    "iip\0"
    "glGetQueryObjectuiv\0"
    "glGetQueryObjectuivARB\0"
    "\0"
-   /* _mesa_function_pool[15421]: GetTexParameteriv (offset 283) */
+   /* _mesa_function_pool[15986]: GetTexParameteriv (offset 283) */
    "iip\0"
    "glGetTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[15446]: MapParameterivNV (dynamic) */
+   /* _mesa_function_pool[16011]: MapParameterivNV (dynamic) */
    "iip\0"
    "glMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[15470]: GenRenderbuffersEXT (will be remapped) */
+   /* _mesa_function_pool[16035]: GenRenderbuffersEXT (will be remapped) */
    "ip\0"
    "glGenRenderbuffers\0"
    "glGenRenderbuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[15515]: VertexAttrib2dvARB (will be remapped) */
+   /* _mesa_function_pool[16080]: VertexAttrib2dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2dv\0"
    "glVertexAttrib2dvARB\0"
    "\0"
-   /* _mesa_function_pool[15558]: EdgeFlagPointerEXT (will be remapped) */
+   /* _mesa_function_pool[16123]: EdgeFlagPointerEXT (will be remapped) */
    "iip\0"
    "glEdgeFlagPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[15584]: VertexAttribs2svNV (will be remapped) */
+   /* _mesa_function_pool[16149]: VertexAttribs2svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2svNV\0"
    "\0"
-   /* _mesa_function_pool[15610]: WeightbvARB (dynamic) */
+   /* _mesa_function_pool[16175]: WeightbvARB (dynamic) */
    "ip\0"
    "glWeightbvARB\0"
    "\0"
-   /* _mesa_function_pool[15628]: VertexAttrib2fvARB (will be remapped) */
+   /* _mesa_function_pool[16193]: VertexAttrib2fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2fv\0"
    "glVertexAttrib2fvARB\0"
    "\0"
-   /* _mesa_function_pool[15671]: GetBufferParameterivARB (will be remapped) */
+   /* _mesa_function_pool[16236]: GetBufferParameterivARB (will be remapped) */
    "iip\0"
    "glGetBufferParameteriv\0"
    "glGetBufferParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[15725]: Rectdv (offset 87) */
+   /* _mesa_function_pool[16290]: Rectdv (offset 87) */
    "pp\0"
    "glRectdv\0"
    "\0"
-   /* _mesa_function_pool[15738]: ListParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[16303]: ListParameteriSGIX (dynamic) */
    "iii\0"
    "glListParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[15764]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[16329]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffff\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[15823]: InstrumentsBufferSGIX (dynamic) */
+   /* _mesa_function_pool[16388]: InstrumentsBufferSGIX (dynamic) */
    "ip\0"
    "glInstrumentsBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[15851]: VertexAttrib4NivARB (will be remapped) */
+   /* _mesa_function_pool[16416]: VertexAttrib4NivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Niv\0"
    "glVertexAttrib4NivARB\0"
    "\0"
-   /* _mesa_function_pool[15896]: GetAttachedShaders (will be remapped) */
+   /* _mesa_function_pool[16461]: GetAttachedShaders (will be remapped) */
    "iipp\0"
    "glGetAttachedShaders\0"
    "\0"
-   /* _mesa_function_pool[15923]: GenVertexArraysAPPLE (will be remapped) */
+   /* _mesa_function_pool[16488]: GenVertexArraysAPPLE (will be remapped) */
    "ip\0"
    "glGenVertexArraysAPPLE\0"
    "\0"
-   /* _mesa_function_pool[15950]: Materialiv (offset 172) */
+   /* _mesa_function_pool[16515]: Materialiv (offset 172) */
    "iip\0"
    "glMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[15968]: PushClientAttrib (offset 335) */
+   /* _mesa_function_pool[16533]: PushClientAttrib (offset 335) */
    "i\0"
    "glPushClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[15990]: ProgramEnvParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[16555]: ProgramEnvParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramEnvParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[16025]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[16590]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[16071]: WindowPos2iMESA (will be remapped) */
+   /* _mesa_function_pool[16636]: WindowPos2iMESA (will be remapped) */
    "ii\0"
    "glWindowPos2i\0"
    "glWindowPos2iARB\0"
    "glWindowPos2iMESA\0"
    "\0"
-   /* _mesa_function_pool[16124]: SecondaryColor3fvEXT (will be remapped) */
+   /* _mesa_function_pool[16689]: SecondaryColor3fvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3fv\0"
    "glSecondaryColor3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[16170]: PolygonMode (offset 174) */
+   /* _mesa_function_pool[16735]: PolygonMode (offset 174) */
    "ii\0"
    "glPolygonMode\0"
    "\0"
-   /* _mesa_function_pool[16188]: CompressedTexSubImage1DARB (will be remapped) */
+   /* _mesa_function_pool[16753]: CompressedTexSubImage1DARB (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexSubImage1D\0"
    "glCompressedTexSubImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[16252]: GetVertexAttribivNV (will be remapped) */
+   /* _mesa_function_pool[16817]: GetVertexAttribivNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribivNV\0"
    "\0"
-   /* _mesa_function_pool[16279]: GetProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[16844]: GetProgramStringARB (will be remapped) */
    "iip\0"
    "glGetProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[16306]: TexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[16871]: TexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[16334]: CompileShaderARB (will be remapped) */
+   /* _mesa_function_pool[16899]: CompileShaderARB (will be remapped) */
    "i\0"
    "glCompileShader\0"
    "glCompileShaderARB\0"
    "\0"
-   /* _mesa_function_pool[16372]: DeleteShader (will be remapped) */
+   /* _mesa_function_pool[16937]: DeleteShader (will be remapped) */
    "i\0"
    "glDeleteShader\0"
    "\0"
-   /* _mesa_function_pool[16390]: DisableClientState (offset 309) */
+   /* _mesa_function_pool[16955]: DisableClientState (offset 309) */
    "i\0"
    "glDisableClientState\0"
    "\0"
-   /* _mesa_function_pool[16414]: TexGeni (offset 192) */
+   /* _mesa_function_pool[16979]: TexGeni (offset 192) */
    "iii\0"
    "glTexGeni\0"
    "\0"
-   /* _mesa_function_pool[16429]: TexGenf (offset 190) */
+   /* _mesa_function_pool[16994]: TexGenf (offset 190) */
    "iif\0"
    "glTexGenf\0"
    "\0"
-   /* _mesa_function_pool[16444]: Uniform3fARB (will be remapped) */
+   /* _mesa_function_pool[17009]: Uniform3fARB (will be remapped) */
    "ifff\0"
    "glUniform3f\0"
    "glUniform3fARB\0"
    "\0"
-   /* _mesa_function_pool[16477]: TexGend (offset 188) */
+   /* _mesa_function_pool[17042]: TexGend (offset 188) */
    "iid\0"
    "glTexGend\0"
    "\0"
-   /* _mesa_function_pool[16492]: ListParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[17057]: ListParameterfvSGIX (dynamic) */
    "iip\0"
    "glListParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[16519]: GetPolygonStipple (offset 274) */
+   /* _mesa_function_pool[17084]: GetPolygonStipple (offset 274) */
    "p\0"
    "glGetPolygonStipple\0"
    "\0"
-   /* _mesa_function_pool[16542]: Tangent3dvEXT (dynamic) */
+   /* _mesa_function_pool[17107]: Tangent3dvEXT (dynamic) */
    "p\0"
    "glTangent3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[16561]: GetVertexAttribfvNV (will be remapped) */
-   "iip\0"
-   "glGetVertexAttribfvNV\0"
+   /* _mesa_function_pool[17126]: BindBufferOffsetEXT (will be remapped) */
+   "iiii\0"
+   "glBindBufferOffsetEXT\0"
    "\0"
-   /* _mesa_function_pool[16588]: WindowPos3sMESA (will be remapped) */
+   /* _mesa_function_pool[17154]: WindowPos3sMESA (will be remapped) */
    "iii\0"
    "glWindowPos3s\0"
    "glWindowPos3sARB\0"
    "glWindowPos3sMESA\0"
    "\0"
-   /* _mesa_function_pool[16642]: VertexAttrib2svNV (will be remapped) */
+   /* _mesa_function_pool[17208]: VertexAttrib2svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2svNV\0"
    "\0"
-   /* _mesa_function_pool[16666]: VertexAttribs1fvNV (will be remapped) */
-   "iip\0"
-   "glVertexAttribs1fvNV\0"
+   /* _mesa_function_pool[17232]: DisableIndexedEXT (will be remapped) */
+   "ii\0"
+   "glDisableIndexedEXT\0"
+   "\0"
+   /* _mesa_function_pool[17256]: BindBufferBaseEXT (will be remapped) */
+   "iii\0"
+   "glBindBufferBaseEXT\0"
+   "glBindBufferBase\0"
    "\0"
-   /* _mesa_function_pool[16692]: TexCoord2fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[17298]: TexCoord2fVertex3fvSUN (dynamic) */
    "pp\0"
    "glTexCoord2fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[16721]: WindowPos4sMESA (will be remapped) */
+   /* _mesa_function_pool[17327]: WindowPos4sMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4sMESA\0"
    "\0"
-   /* _mesa_function_pool[16745]: VertexAttrib4NuivARB (will be remapped) */
+   /* _mesa_function_pool[17351]: VertexAttrib4NuivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nuiv\0"
    "glVertexAttrib4NuivARB\0"
    "\0"
-   /* _mesa_function_pool[16792]: ClientActiveTextureARB (offset 375) */
+   /* _mesa_function_pool[17398]: ClientActiveTextureARB (offset 375) */
    "i\0"
    "glClientActiveTexture\0"
    "glClientActiveTextureARB\0"
    "\0"
-   /* _mesa_function_pool[16842]: PixelTexGenSGIX (will be remapped) */
+   /* _mesa_function_pool[17448]: PixelTexGenSGIX (will be remapped) */
    "i\0"
    "glPixelTexGenSGIX\0"
    "\0"
-   /* _mesa_function_pool[16863]: ReplacementCodeusvSUN (dynamic) */
+   /* _mesa_function_pool[17469]: ReplacementCodeusvSUN (dynamic) */
    "p\0"
    "glReplacementCodeusvSUN\0"
    "\0"
-   /* _mesa_function_pool[16890]: Uniform4fARB (will be remapped) */
+   /* _mesa_function_pool[17496]: Uniform4fARB (will be remapped) */
    "iffff\0"
    "glUniform4f\0"
    "glUniform4fARB\0"
    "\0"
-   /* _mesa_function_pool[16924]: Color4sv (offset 34) */
+   /* _mesa_function_pool[17530]: Color4sv (offset 34) */
    "p\0"
    "glColor4sv\0"
    "\0"
-   /* _mesa_function_pool[16938]: FlushMappedBufferRange (will be remapped) */
+   /* _mesa_function_pool[17544]: FlushMappedBufferRange (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRange\0"
    "\0"
-   /* _mesa_function_pool[16968]: IsProgramNV (will be remapped) */
+   /* _mesa_function_pool[17574]: IsProgramNV (will be remapped) */
    "i\0"
    "glIsProgramARB\0"
    "glIsProgramNV\0"
    "\0"
-   /* _mesa_function_pool[17000]: FlushMappedBufferRangeAPPLE (will be remapped) */
+   /* _mesa_function_pool[17606]: FlushMappedBufferRangeAPPLE (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRangeAPPLE\0"
    "\0"
-   /* _mesa_function_pool[17035]: PixelZoom (offset 246) */
+   /* _mesa_function_pool[17641]: PixelZoom (offset 246) */
    "ff\0"
    "glPixelZoom\0"
    "\0"
-   /* _mesa_function_pool[17051]: ReplacementCodePointerSUN (dynamic) */
+   /* _mesa_function_pool[17657]: ReplacementCodePointerSUN (dynamic) */
    "iip\0"
    "glReplacementCodePointerSUN\0"
    "\0"
-   /* _mesa_function_pool[17084]: ProgramEnvParameter4dARB (will be remapped) */
+   /* _mesa_function_pool[17690]: ProgramEnvParameter4dARB (will be remapped) */
    "iidddd\0"
    "glProgramEnvParameter4dARB\0"
    "glProgramParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[17142]: ColorTableParameterfv (offset 340) */
+   /* _mesa_function_pool[17748]: ColorTableParameterfv (offset 340) */
    "iip\0"
    "glColorTableParameterfv\0"
    "glColorTableParameterfvSGI\0"
    "\0"
-   /* _mesa_function_pool[17198]: FragmentLightModelfSGIX (dynamic) */
+   /* _mesa_function_pool[17804]: FragmentLightModelfSGIX (dynamic) */
    "if\0"
    "glFragmentLightModelfSGIX\0"
    "\0"
-   /* _mesa_function_pool[17228]: Binormal3bvEXT (dynamic) */
+   /* _mesa_function_pool[17834]: Binormal3bvEXT (dynamic) */
    "p\0"
    "glBinormal3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[17248]: PixelMapuiv (offset 252) */
+   /* _mesa_function_pool[17854]: PixelMapuiv (offset 252) */
    "iip\0"
    "glPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[17267]: Color3dv (offset 12) */
+   /* _mesa_function_pool[17873]: Color3dv (offset 12) */
    "p\0"
    "glColor3dv\0"
    "\0"
-   /* _mesa_function_pool[17281]: IsTexture (offset 330) */
+   /* _mesa_function_pool[17887]: IsTexture (offset 330) */
    "i\0"
    "glIsTexture\0"
    "glIsTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[17311]: VertexWeightfvEXT (dynamic) */
+   /* _mesa_function_pool[17917]: VertexWeightfvEXT (dynamic) */
    "p\0"
    "glVertexWeightfvEXT\0"
    "\0"
-   /* _mesa_function_pool[17334]: VertexAttrib1dARB (will be remapped) */
+   /* _mesa_function_pool[17940]: VertexAttrib1dARB (will be remapped) */
    "id\0"
    "glVertexAttrib1d\0"
    "glVertexAttrib1dARB\0"
    "\0"
-   /* _mesa_function_pool[17375]: ImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[17981]: ImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[17410]: TexCoord4i (offset 122) */
+   /* _mesa_function_pool[18016]: TexCoord4i (offset 122) */
    "iiii\0"
    "glTexCoord4i\0"
    "\0"
-   /* _mesa_function_pool[17429]: DeleteQueriesARB (will be remapped) */
+   /* _mesa_function_pool[18035]: DeleteQueriesARB (will be remapped) */
    "ip\0"
    "glDeleteQueries\0"
    "glDeleteQueriesARB\0"
    "\0"
-   /* _mesa_function_pool[17468]: Color4ubVertex2fSUN (dynamic) */
+   /* _mesa_function_pool[18074]: Color4ubVertex2fSUN (dynamic) */
    "iiiiff\0"
    "glColor4ubVertex2fSUN\0"
    "\0"
-   /* _mesa_function_pool[17498]: FragmentColorMaterialSGIX (dynamic) */
+   /* _mesa_function_pool[18104]: FragmentColorMaterialSGIX (dynamic) */
    "ii\0"
    "glFragmentColorMaterialSGIX\0"
    "\0"
-   /* _mesa_function_pool[17530]: CurrentPaletteMatrixARB (dynamic) */
+   /* _mesa_function_pool[18136]: CurrentPaletteMatrixARB (dynamic) */
    "i\0"
    "glCurrentPaletteMatrixARB\0"
    "\0"
-   /* _mesa_function_pool[17559]: GetMapdv (offset 266) */
+   /* _mesa_function_pool[18165]: GetMapdv (offset 266) */
    "iip\0"
    "glGetMapdv\0"
    "\0"
-   /* _mesa_function_pool[17575]: ObjectPurgeableAPPLE (will be remapped) */
+   /* _mesa_function_pool[18181]: ObjectPurgeableAPPLE (will be remapped) */
    "iii\0"
    "glObjectPurgeableAPPLE\0"
    "\0"
-   /* _mesa_function_pool[17603]: SamplePatternSGIS (will be remapped) */
+   /* _mesa_function_pool[18209]: SamplePatternSGIS (will be remapped) */
    "i\0"
    "glSamplePatternSGIS\0"
    "glSamplePatternEXT\0"
    "\0"
-   /* _mesa_function_pool[17645]: PixelStoref (offset 249) */
+   /* _mesa_function_pool[18251]: PixelStoref (offset 249) */
    "if\0"
    "glPixelStoref\0"
    "\0"
-   /* _mesa_function_pool[17663]: IsQueryARB (will be remapped) */
+   /* _mesa_function_pool[18269]: IsQueryARB (will be remapped) */
    "i\0"
    "glIsQuery\0"
    "glIsQueryARB\0"
    "\0"
-   /* _mesa_function_pool[17689]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[18295]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
    "iiiiifff\0"
    "glReplacementCodeuiColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[17738]: PixelStorei (offset 250) */
+   /* _mesa_function_pool[18344]: PixelStorei (offset 250) */
    "ii\0"
    "glPixelStorei\0"
    "\0"
-   /* _mesa_function_pool[17756]: VertexAttrib4usvARB (will be remapped) */
+   /* _mesa_function_pool[18362]: VertexAttrib4usvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4usv\0"
    "glVertexAttrib4usvARB\0"
    "\0"
-   /* _mesa_function_pool[17801]: LinkProgramARB (will be remapped) */
+   /* _mesa_function_pool[18407]: LinkProgramARB (will be remapped) */
    "i\0"
    "glLinkProgram\0"
    "glLinkProgramARB\0"
    "\0"
-   /* _mesa_function_pool[17835]: VertexAttrib2fNV (will be remapped) */
+   /* _mesa_function_pool[18441]: VertexAttrib2fNV (will be remapped) */
    "iff\0"
    "glVertexAttrib2fNV\0"
    "\0"
-   /* _mesa_function_pool[17859]: ShaderSourceARB (will be remapped) */
+   /* _mesa_function_pool[18465]: ShaderSourceARB (will be remapped) */
    "iipp\0"
    "glShaderSource\0"
    "glShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[17898]: FragmentMaterialiSGIX (dynamic) */
+   /* _mesa_function_pool[18504]: FragmentMaterialiSGIX (dynamic) */
    "iii\0"
    "glFragmentMaterialiSGIX\0"
    "\0"
-   /* _mesa_function_pool[17927]: EvalCoord2dv (offset 233) */
+   /* _mesa_function_pool[18533]: EvalCoord2dv (offset 233) */
    "p\0"
    "glEvalCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[17945]: VertexAttrib3svARB (will be remapped) */
+   /* _mesa_function_pool[18551]: VertexAttrib3svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3sv\0"
    "glVertexAttrib3svARB\0"
    "\0"
-   /* _mesa_function_pool[17988]: ColorMaterial (offset 151) */
+   /* _mesa_function_pool[18594]: ColorMaterial (offset 151) */
    "ii\0"
    "glColorMaterial\0"
    "\0"
-   /* _mesa_function_pool[18008]: CompressedTexSubImage3DARB (will be remapped) */
+   /* _mesa_function_pool[18614]: CompressedTexSubImage3DARB (will be remapped) */
    "iiiiiiiiiip\0"
    "glCompressedTexSubImage3D\0"
    "glCompressedTexSubImage3DARB\0"
    "\0"
-   /* _mesa_function_pool[18076]: WindowPos2ivMESA (will be remapped) */
+   /* _mesa_function_pool[18682]: WindowPos2ivMESA (will be remapped) */
    "p\0"
    "glWindowPos2iv\0"
    "glWindowPos2ivARB\0"
    "glWindowPos2ivMESA\0"
    "\0"
-   /* _mesa_function_pool[18131]: IsFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[18737]: IsFramebufferEXT (will be remapped) */
    "i\0"
    "glIsFramebuffer\0"
    "glIsFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[18169]: Uniform4ivARB (will be remapped) */
+   /* _mesa_function_pool[18775]: Uniform4ivARB (will be remapped) */
    "iip\0"
    "glUniform4iv\0"
    "glUniform4ivARB\0"
    "\0"
-   /* _mesa_function_pool[18203]: GetVertexAttribdvARB (will be remapped) */
+   /* _mesa_function_pool[18809]: GetVertexAttribdvARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribdv\0"
    "glGetVertexAttribdvARB\0"
    "\0"
-   /* _mesa_function_pool[18251]: TexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[18857]: TexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[18279]: GetSeparableFilter (offset 359) */
+   /* _mesa_function_pool[18885]: GetSeparableFilter (offset 359) */
    "iiippp\0"
    "glGetSeparableFilter\0"
    "glGetSeparableFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[18332]: Binormal3dEXT (dynamic) */
+   /* _mesa_function_pool[18938]: Binormal3dEXT (dynamic) */
    "ddd\0"
    "glBinormal3dEXT\0"
    "\0"
-   /* _mesa_function_pool[18353]: SpriteParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[18959]: SpriteParameteriSGIX (dynamic) */
    "ii\0"
    "glSpriteParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[18380]: RequestResidentProgramsNV (will be remapped) */
+   /* _mesa_function_pool[18986]: RequestResidentProgramsNV (will be remapped) */
    "ip\0"
    "glRequestResidentProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[18412]: TagSampleBufferSGIX (dynamic) */
+   /* _mesa_function_pool[19018]: TagSampleBufferSGIX (dynamic) */
    "\0"
    "glTagSampleBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[18436]: ReplacementCodeusSUN (dynamic) */
-   "i\0"
-   "glReplacementCodeusSUN\0"
+   /* _mesa_function_pool[19042]: TransformFeedbackVaryingsEXT (will be remapped) */
+   "iipi\0"
+   "glTransformFeedbackVaryingsEXT\0"
+   "glTransformFeedbackVaryings\0"
    "\0"
-   /* _mesa_function_pool[18462]: FeedbackBuffer (offset 194) */
+   /* _mesa_function_pool[19107]: FeedbackBuffer (offset 194) */
    "iip\0"
    "glFeedbackBuffer\0"
    "\0"
-   /* _mesa_function_pool[18484]: RasterPos2iv (offset 67) */
+   /* _mesa_function_pool[19129]: RasterPos2iv (offset 67) */
    "p\0"
    "glRasterPos2iv\0"
    "\0"
-   /* _mesa_function_pool[18502]: TexImage1D (offset 182) */
+   /* _mesa_function_pool[19147]: TexImage1D (offset 182) */
    "iiiiiiip\0"
    "glTexImage1D\0"
    "\0"
-   /* _mesa_function_pool[18525]: ListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[19170]: ListParameterivSGIX (dynamic) */
    "iip\0"
    "glListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[18552]: MultiDrawElementsEXT (will be remapped) */
+   /* _mesa_function_pool[19197]: MultiDrawElementsEXT (will be remapped) */
    "ipipi\0"
    "glMultiDrawElements\0"
    "glMultiDrawElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[18602]: Color3s (offset 17) */
+   /* _mesa_function_pool[19247]: Color3s (offset 17) */
    "iii\0"
    "glColor3s\0"
    "\0"
-   /* _mesa_function_pool[18617]: Uniform1ivARB (will be remapped) */
+   /* _mesa_function_pool[19262]: Uniform1ivARB (will be remapped) */
    "iip\0"
    "glUniform1iv\0"
    "glUniform1ivARB\0"
    "\0"
-   /* _mesa_function_pool[18651]: WindowPos2sMESA (will be remapped) */
+   /* _mesa_function_pool[19296]: WindowPos2sMESA (will be remapped) */
    "ii\0"
    "glWindowPos2s\0"
    "glWindowPos2sARB\0"
    "glWindowPos2sMESA\0"
    "\0"
-   /* _mesa_function_pool[18704]: WeightusvARB (dynamic) */
+   /* _mesa_function_pool[19349]: WeightusvARB (dynamic) */
    "ip\0"
    "glWeightusvARB\0"
    "\0"
-   /* _mesa_function_pool[18723]: TexCoordPointer (offset 320) */
+   /* _mesa_function_pool[19368]: TexCoordPointer (offset 320) */
    "iiip\0"
    "glTexCoordPointer\0"
    "\0"
-   /* _mesa_function_pool[18747]: FogCoordPointerEXT (will be remapped) */
+   /* _mesa_function_pool[19392]: FogCoordPointerEXT (will be remapped) */
    "iip\0"
    "glFogCoordPointer\0"
    "glFogCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[18791]: IndexMaterialEXT (dynamic) */
+   /* _mesa_function_pool[19436]: IndexMaterialEXT (dynamic) */
    "ii\0"
    "glIndexMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[18814]: Color3i (offset 15) */
+   /* _mesa_function_pool[19459]: Color3i (offset 15) */
    "iii\0"
    "glColor3i\0"
    "\0"
-   /* _mesa_function_pool[18829]: FrontFace (offset 157) */
+   /* _mesa_function_pool[19474]: FrontFace (offset 157) */
    "i\0"
    "glFrontFace\0"
    "\0"
-   /* _mesa_function_pool[18844]: EvalCoord2d (offset 232) */
+   /* _mesa_function_pool[19489]: EvalCoord2d (offset 232) */
    "dd\0"
    "glEvalCoord2d\0"
    "\0"
-   /* _mesa_function_pool[18862]: SecondaryColor3ubvEXT (will be remapped) */
+   /* _mesa_function_pool[19507]: SecondaryColor3ubvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3ubv\0"
    "glSecondaryColor3ubvEXT\0"
    "\0"
-   /* _mesa_function_pool[18910]: EvalCoord2f (offset 234) */
+   /* _mesa_function_pool[19555]: EvalCoord2f (offset 234) */
    "ff\0"
    "glEvalCoord2f\0"
    "\0"
-   /* _mesa_function_pool[18928]: VertexAttrib4dvARB (will be remapped) */
+   /* _mesa_function_pool[19573]: VertexAttrib4dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4dv\0"
    "glVertexAttrib4dvARB\0"
    "\0"
-   /* _mesa_function_pool[18971]: BindAttribLocationARB (will be remapped) */
+   /* _mesa_function_pool[19616]: BindAttribLocationARB (will be remapped) */
    "iip\0"
    "glBindAttribLocation\0"
    "glBindAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[19021]: Color3b (offset 9) */
+   /* _mesa_function_pool[19666]: Color3b (offset 9) */
    "iii\0"
    "glColor3b\0"
    "\0"
-   /* _mesa_function_pool[19036]: MultiTexCoord2dARB (offset 384) */
+   /* _mesa_function_pool[19681]: MultiTexCoord2dARB (offset 384) */
    "idd\0"
    "glMultiTexCoord2d\0"
    "glMultiTexCoord2dARB\0"
    "\0"
-   /* _mesa_function_pool[19080]: ExecuteProgramNV (will be remapped) */
+   /* _mesa_function_pool[19725]: ExecuteProgramNV (will be remapped) */
    "iip\0"
    "glExecuteProgramNV\0"
    "\0"
-   /* _mesa_function_pool[19104]: Color3f (offset 13) */
+   /* _mesa_function_pool[19749]: Color3f (offset 13) */
    "fff\0"
    "glColor3f\0"
    "\0"
-   /* _mesa_function_pool[19119]: LightEnviSGIX (dynamic) */
+   /* _mesa_function_pool[19764]: LightEnviSGIX (dynamic) */
    "ii\0"
    "glLightEnviSGIX\0"
    "\0"
-   /* _mesa_function_pool[19139]: Color3d (offset 11) */
+   /* _mesa_function_pool[19784]: Color3d (offset 11) */
    "ddd\0"
    "glColor3d\0"
    "\0"
-   /* _mesa_function_pool[19154]: Normal3dv (offset 55) */
+   /* _mesa_function_pool[19799]: Normal3dv (offset 55) */
    "p\0"
    "glNormal3dv\0"
    "\0"
-   /* _mesa_function_pool[19169]: Lightf (offset 159) */
+   /* _mesa_function_pool[19814]: Lightf (offset 159) */
    "iif\0"
    "glLightf\0"
    "\0"
-   /* _mesa_function_pool[19183]: ReplacementCodeuiSUN (dynamic) */
+   /* _mesa_function_pool[19828]: ReplacementCodeuiSUN (dynamic) */
    "i\0"
    "glReplacementCodeuiSUN\0"
    "\0"
-   /* _mesa_function_pool[19209]: MatrixMode (offset 293) */
+   /* _mesa_function_pool[19854]: MatrixMode (offset 293) */
    "i\0"
    "glMatrixMode\0"
    "\0"
-   /* _mesa_function_pool[19225]: GetPixelMapusv (offset 273) */
+   /* _mesa_function_pool[19870]: GetPixelMapusv (offset 273) */
    "ip\0"
    "glGetPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[19246]: Lighti (offset 161) */
+   /* _mesa_function_pool[19891]: Lighti (offset 161) */
    "iii\0"
    "glLighti\0"
    "\0"
-   /* _mesa_function_pool[19260]: VertexAttribPointerNV (will be remapped) */
+   /* _mesa_function_pool[19905]: VertexAttribPointerNV (will be remapped) */
    "iiiip\0"
    "glVertexAttribPointerNV\0"
    "\0"
-   /* _mesa_function_pool[19291]: GetBooleanIndexedvEXT (will be remapped) */
+   /* _mesa_function_pool[19936]: ProgramLocalParameters4fvEXT (will be remapped) */
+   "iiip\0"
+   "glProgramLocalParameters4fvEXT\0"
+   "\0"
+   /* _mesa_function_pool[19973]: GetBooleanIndexedvEXT (will be remapped) */
    "iip\0"
    "glGetBooleanIndexedvEXT\0"
    "\0"
-   /* _mesa_function_pool[19320]: GetFramebufferAttachmentParameterivEXT (will be remapped) */
+   /* _mesa_function_pool[20002]: GetFramebufferAttachmentParameterivEXT (will be remapped) */
    "iiip\0"
    "glGetFramebufferAttachmentParameteriv\0"
    "glGetFramebufferAttachmentParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[19405]: PixelTransformParameterfEXT (dynamic) */
+   /* _mesa_function_pool[20087]: PixelTransformParameterfEXT (dynamic) */
    "iif\0"
    "glPixelTransformParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[19440]: MultiTexCoord4dvARB (offset 401) */
+   /* _mesa_function_pool[20122]: MultiTexCoord4dvARB (offset 401) */
    "ip\0"
    "glMultiTexCoord4dv\0"
    "glMultiTexCoord4dvARB\0"
    "\0"
-   /* _mesa_function_pool[19485]: PixelTransformParameteriEXT (dynamic) */
+   /* _mesa_function_pool[20167]: PixelTransformParameteriEXT (dynamic) */
    "iii\0"
    "glPixelTransformParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[19520]: GetDoublev (offset 260) */
+   /* _mesa_function_pool[20202]: GetDoublev (offset 260) */
    "ip\0"
    "glGetDoublev\0"
    "\0"
-   /* _mesa_function_pool[19537]: MultMatrixd (offset 295) */
+   /* _mesa_function_pool[20219]: MultMatrixd (offset 295) */
    "p\0"
    "glMultMatrixd\0"
    "\0"
-   /* _mesa_function_pool[19554]: MultMatrixf (offset 294) */
+   /* _mesa_function_pool[20236]: MultMatrixf (offset 294) */
    "p\0"
    "glMultMatrixf\0"
    "\0"
-   /* _mesa_function_pool[19571]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[20253]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
    "ffiiiifff\0"
    "glTexCoord2fColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[19614]: Uniform1iARB (will be remapped) */
+   /* _mesa_function_pool[20296]: Uniform1iARB (will be remapped) */
    "ii\0"
    "glUniform1i\0"
    "glUniform1iARB\0"
    "\0"
-   /* _mesa_function_pool[19645]: VertexAttribPointerARB (will be remapped) */
+   /* _mesa_function_pool[20327]: VertexAttribPointerARB (will be remapped) */
    "iiiiip\0"
    "glVertexAttribPointer\0"
    "glVertexAttribPointerARB\0"
    "\0"
-   /* _mesa_function_pool[19700]: SharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[20382]: VertexAttrib3sNV (will be remapped) */
+   "iiii\0"
+   "glVertexAttrib3sNV\0"
+   "\0"
+   /* _mesa_function_pool[20407]: SharpenTexFuncSGIS (dynamic) */
    "iip\0"
    "glSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[19726]: MultiTexCoord4fvARB (offset 403) */
+   /* _mesa_function_pool[20433]: MultiTexCoord4fvARB (offset 403) */
    "ip\0"
    "glMultiTexCoord4fv\0"
    "glMultiTexCoord4fvARB\0"
    "\0"
-   /* _mesa_function_pool[19771]: UniformMatrix2x3fv (will be remapped) */
+   /* _mesa_function_pool[20478]: UniformMatrix2x3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2x3fv\0"
    "\0"
-   /* _mesa_function_pool[19798]: TrackMatrixNV (will be remapped) */
+   /* _mesa_function_pool[20505]: TrackMatrixNV (will be remapped) */
    "iiii\0"
    "glTrackMatrixNV\0"
    "\0"
-   /* _mesa_function_pool[19820]: CombinerParameteriNV (will be remapped) */
+   /* _mesa_function_pool[20527]: CombinerParameteriNV (will be remapped) */
    "ii\0"
    "glCombinerParameteriNV\0"
    "\0"
-   /* _mesa_function_pool[19847]: DeleteAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[20554]: DeleteAsyncMarkersSGIX (dynamic) */
    "ii\0"
    "glDeleteAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[19876]: IsAsyncMarkerSGIX (dynamic) */
+   /* _mesa_function_pool[20583]: ReplacementCodeusSUN (dynamic) */
+   "i\0"
+   "glReplacementCodeusSUN\0"
+   "\0"
+   /* _mesa_function_pool[20609]: IsAsyncMarkerSGIX (dynamic) */
    "i\0"
    "glIsAsyncMarkerSGIX\0"
    "\0"
-   /* _mesa_function_pool[19899]: FrameZoomSGIX (dynamic) */
+   /* _mesa_function_pool[20632]: FrameZoomSGIX (dynamic) */
    "i\0"
    "glFrameZoomSGIX\0"
    "\0"
-   /* _mesa_function_pool[19918]: Normal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[20651]: Normal3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[19945]: RasterPos4sv (offset 85) */
+   /* _mesa_function_pool[20678]: RasterPos4sv (offset 85) */
    "p\0"
    "glRasterPos4sv\0"
    "\0"
-   /* _mesa_function_pool[19963]: VertexAttrib4NsvARB (will be remapped) */
+   /* _mesa_function_pool[20696]: VertexAttrib4NsvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nsv\0"
    "glVertexAttrib4NsvARB\0"
    "\0"
-   /* _mesa_function_pool[20008]: VertexAttrib3fvARB (will be remapped) */
+   /* _mesa_function_pool[20741]: VertexAttrib3fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3fv\0"
    "glVertexAttrib3fvARB\0"
    "\0"
-   /* _mesa_function_pool[20051]: ClearColor (offset 206) */
+   /* _mesa_function_pool[20784]: ClearColor (offset 206) */
    "ffff\0"
    "glClearColor\0"
    "\0"
-   /* _mesa_function_pool[20070]: GetSynciv (will be remapped) */
+   /* _mesa_function_pool[20803]: GetSynciv (will be remapped) */
    "iiipp\0"
    "glGetSynciv\0"
    "\0"
-   /* _mesa_function_pool[20089]: DeleteFramebuffersEXT (will be remapped) */
+   /* _mesa_function_pool[20822]: DeleteFramebuffersEXT (will be remapped) */
    "ip\0"
    "glDeleteFramebuffers\0"
    "glDeleteFramebuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[20138]: GlobalAlphaFactorsSUN (dynamic) */
+   /* _mesa_function_pool[20871]: GlobalAlphaFactorsSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorsSUN\0"
    "\0"
-   /* _mesa_function_pool[20165]: IsEnabledIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[20898]: IsEnabledIndexedEXT (will be remapped) */
    "ii\0"
    "glIsEnabledIndexedEXT\0"
    "\0"
-   /* _mesa_function_pool[20191]: TexEnviv (offset 187) */
+   /* _mesa_function_pool[20924]: TexEnviv (offset 187) */
    "iip\0"
    "glTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[20207]: TexSubImage3D (offset 372) */
+   /* _mesa_function_pool[20940]: TexSubImage3D (offset 372) */
    "iiiiiiiiiip\0"
    "glTexSubImage3D\0"
    "glTexSubImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[20255]: Tangent3fEXT (dynamic) */
+   /* _mesa_function_pool[20988]: Tangent3fEXT (dynamic) */
    "fff\0"
    "glTangent3fEXT\0"
    "\0"
-   /* _mesa_function_pool[20275]: SecondaryColor3uivEXT (will be remapped) */
+   /* _mesa_function_pool[21008]: SecondaryColor3uivEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3uiv\0"
    "glSecondaryColor3uivEXT\0"
    "\0"
-   /* _mesa_function_pool[20323]: MatrixIndexubvARB (dynamic) */
+   /* _mesa_function_pool[21056]: MatrixIndexubvARB (dynamic) */
    "ip\0"
    "glMatrixIndexubvARB\0"
    "\0"
-   /* _mesa_function_pool[20347]: Color4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[21080]: Color4fNormal3fVertex3fSUN (dynamic) */
    "ffffffffff\0"
    "glColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[20388]: PixelTexGenParameterfSGIS (will be remapped) */
+   /* _mesa_function_pool[21121]: PixelTexGenParameterfSGIS (will be remapped) */
    "if\0"
    "glPixelTexGenParameterfSGIS\0"
    "\0"
-   /* _mesa_function_pool[20420]: CreateShader (will be remapped) */
+   /* _mesa_function_pool[21153]: CreateShader (will be remapped) */
    "i\0"
    "glCreateShader\0"
    "\0"
-   /* _mesa_function_pool[20438]: GetColorTableParameterfv (offset 344) */
+   /* _mesa_function_pool[21171]: GetColorTableParameterfv (offset 344) */
    "iip\0"
    "glGetColorTableParameterfv\0"
    "glGetColorTableParameterfvSGI\0"
    "glGetColorTableParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[20530]: FragmentLightModelfvSGIX (dynamic) */
+   /* _mesa_function_pool[21263]: FragmentLightModelfvSGIX (dynamic) */
    "ip\0"
    "glFragmentLightModelfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[20561]: Bitmap (offset 8) */
+   /* _mesa_function_pool[21294]: Bitmap (offset 8) */
    "iiffffp\0"
    "glBitmap\0"
    "\0"
-   /* _mesa_function_pool[20579]: MultiTexCoord3fARB (offset 394) */
+   /* _mesa_function_pool[21312]: MultiTexCoord3fARB (offset 394) */
    "ifff\0"
    "glMultiTexCoord3f\0"
    "glMultiTexCoord3fARB\0"
    "\0"
-   /* _mesa_function_pool[20624]: GetTexLevelParameterfv (offset 284) */
+   /* _mesa_function_pool[21357]: GetTexLevelParameterfv (offset 284) */
    "iiip\0"
    "glGetTexLevelParameterfv\0"
    "\0"
-   /* _mesa_function_pool[20655]: GetPixelTexGenParameterfvSGIS (will be remapped) */
+   /* _mesa_function_pool[21388]: GetPixelTexGenParameterfvSGIS (will be remapped) */
    "ip\0"
    "glGetPixelTexGenParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[20691]: GenFramebuffersEXT (will be remapped) */
+   /* _mesa_function_pool[21424]: GenFramebuffersEXT (will be remapped) */
    "ip\0"
    "glGenFramebuffers\0"
    "glGenFramebuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[20734]: GetProgramParameterdvNV (will be remapped) */
+   /* _mesa_function_pool[21467]: GetProgramParameterdvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterdvNV\0"
    "\0"
-   /* _mesa_function_pool[20766]: Vertex2sv (offset 133) */
+   /* _mesa_function_pool[21499]: Vertex2sv (offset 133) */
    "p\0"
    "glVertex2sv\0"
    "\0"
-   /* _mesa_function_pool[20781]: GetIntegerv (offset 263) */
+   /* _mesa_function_pool[21514]: GetIntegerv (offset 263) */
    "ip\0"
    "glGetIntegerv\0"
    "\0"
-   /* _mesa_function_pool[20799]: IsVertexArrayAPPLE (will be remapped) */
+   /* _mesa_function_pool[21532]: IsVertexArrayAPPLE (will be remapped) */
    "i\0"
    "glIsVertexArray\0"
    "glIsVertexArrayAPPLE\0"
    "\0"
-   /* _mesa_function_pool[20839]: FragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[21572]: FragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[20866]: DetachShader (will be remapped) */
+   /* _mesa_function_pool[21599]: DetachShader (will be remapped) */
    "ii\0"
    "glDetachShader\0"
    "\0"
-   /* _mesa_function_pool[20885]: VertexAttrib4NubARB (will be remapped) */
+   /* _mesa_function_pool[21618]: VertexAttrib4NubARB (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4Nub\0"
    "glVertexAttrib4NubARB\0"
    "\0"
-   /* _mesa_function_pool[20933]: GetProgramEnvParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[21666]: GetProgramEnvParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[20968]: GetTrackMatrixivNV (will be remapped) */
+   /* _mesa_function_pool[21701]: GetTrackMatrixivNV (will be remapped) */
    "iiip\0"
    "glGetTrackMatrixivNV\0"
    "\0"
-   /* _mesa_function_pool[20995]: VertexAttrib3svNV (will be remapped) */
+   /* _mesa_function_pool[21728]: VertexAttrib3svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3svNV\0"
    "\0"
-   /* _mesa_function_pool[21019]: Uniform4fvARB (will be remapped) */
+   /* _mesa_function_pool[21752]: Uniform4fvARB (will be remapped) */
    "iip\0"
    "glUniform4fv\0"
    "glUniform4fvARB\0"
    "\0"
-   /* _mesa_function_pool[21053]: MultTransposeMatrixfARB (will be remapped) */
+   /* _mesa_function_pool[21786]: MultTransposeMatrixfARB (will be remapped) */
    "p\0"
    "glMultTransposeMatrixf\0"
    "glMultTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[21105]: GetTexEnviv (offset 277) */
+   /* _mesa_function_pool[21838]: GetTexEnviv (offset 277) */
    "iip\0"
    "glGetTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[21124]: ColorFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[21857]: ColorFragmentOp1ATI (will be remapped) */
    "iiiiiii\0"
    "glColorFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[21155]: GetUniformfvARB (will be remapped) */
+   /* _mesa_function_pool[21888]: GetUniformfvARB (will be remapped) */
    "iip\0"
    "glGetUniformfv\0"
    "glGetUniformfvARB\0"
    "\0"
-   /* _mesa_function_pool[21193]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
+   /* _mesa_function_pool[21926]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
    "ip\0"
    "glEGLImageTargetRenderbufferStorageOES\0"
    "\0"
-   /* _mesa_function_pool[21236]: PopClientAttrib (offset 334) */
+   /* _mesa_function_pool[21969]: PopClientAttrib (offset 334) */
    "\0"
    "glPopClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[21256]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[21989]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffffff\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[21327]: DetachObjectARB (will be remapped) */
+   /* _mesa_function_pool[22060]: DetachObjectARB (will be remapped) */
    "ii\0"
    "glDetachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[21349]: VertexBlendARB (dynamic) */
+   /* _mesa_function_pool[22082]: VertexBlendARB (dynamic) */
    "i\0"
    "glVertexBlendARB\0"
    "\0"
-   /* _mesa_function_pool[21369]: WindowPos3iMESA (will be remapped) */
+   /* _mesa_function_pool[22102]: WindowPos3iMESA (will be remapped) */
    "iii\0"
    "glWindowPos3i\0"
    "glWindowPos3iARB\0"
    "glWindowPos3iMESA\0"
    "\0"
-   /* _mesa_function_pool[21423]: SeparableFilter2D (offset 360) */
+   /* _mesa_function_pool[22156]: SeparableFilter2D (offset 360) */
    "iiiiiipp\0"
    "glSeparableFilter2D\0"
    "glSeparableFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[21476]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
-   "ppp\0"
-   "glReplacementCodeuiColor4ubVertex3fvSUN\0"
+   /* _mesa_function_pool[22209]: ProgramParameteriARB (will be remapped) */
+   "iii\0"
+   "glProgramParameteriARB\0"
    "\0"
-   /* _mesa_function_pool[21521]: Map1d (offset 220) */
+   /* _mesa_function_pool[22237]: Map1d (offset 220) */
    "iddiip\0"
    "glMap1d\0"
    "\0"
-   /* _mesa_function_pool[21537]: Map1f (offset 221) */
+   /* _mesa_function_pool[22253]: Map1f (offset 221) */
    "iffiip\0"
    "glMap1f\0"
    "\0"
-   /* _mesa_function_pool[21553]: CompressedTexImage2DARB (will be remapped) */
+   /* _mesa_function_pool[22269]: CompressedTexImage2DARB (will be remapped) */
    "iiiiiiip\0"
    "glCompressedTexImage2D\0"
    "glCompressedTexImage2DARB\0"
    "\0"
-   /* _mesa_function_pool[21612]: ArrayElement (offset 306) */
+   /* _mesa_function_pool[22328]: ArrayElement (offset 306) */
    "i\0"
    "glArrayElement\0"
    "glArrayElementEXT\0"
    "\0"
-   /* _mesa_function_pool[21648]: TexImage2D (offset 183) */
+   /* _mesa_function_pool[22364]: TexImage2D (offset 183) */
    "iiiiiiiip\0"
    "glTexImage2D\0"
    "\0"
-   /* _mesa_function_pool[21672]: DepthBoundsEXT (will be remapped) */
+   /* _mesa_function_pool[22388]: DepthBoundsEXT (will be remapped) */
    "dd\0"
    "glDepthBoundsEXT\0"
    "\0"
-   /* _mesa_function_pool[21693]: ProgramParameters4fvNV (will be remapped) */
+   /* _mesa_function_pool[22409]: ProgramParameters4fvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4fvNV\0"
    "\0"
-   /* _mesa_function_pool[21724]: DeformationMap3fSGIX (dynamic) */
+   /* _mesa_function_pool[22440]: DeformationMap3fSGIX (dynamic) */
    "iffiiffiiffiip\0"
    "glDeformationMap3fSGIX\0"
    "\0"
-   /* _mesa_function_pool[21763]: GetProgramivNV (will be remapped) */
+   /* _mesa_function_pool[22479]: GetProgramivNV (will be remapped) */
    "iip\0"
    "glGetProgramivNV\0"
    "\0"
-   /* _mesa_function_pool[21785]: GetMinmaxParameteriv (offset 366) */
+   /* _mesa_function_pool[22501]: GetMinmaxParameteriv (offset 366) */
    "iip\0"
    "glGetMinmaxParameteriv\0"
    "glGetMinmaxParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[21839]: PixelTransferf (offset 247) */
+   /* _mesa_function_pool[22555]: PixelTransferf (offset 247) */
    "if\0"
    "glPixelTransferf\0"
    "\0"
-   /* _mesa_function_pool[21860]: CopyTexImage1D (offset 323) */
+   /* _mesa_function_pool[22576]: CopyTexImage1D (offset 323) */
    "iiiiiii\0"
    "glCopyTexImage1D\0"
    "glCopyTexImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[21906]: PushMatrix (offset 298) */
+   /* _mesa_function_pool[22622]: PushMatrix (offset 298) */
    "\0"
    "glPushMatrix\0"
    "\0"
-   /* _mesa_function_pool[21921]: Fogiv (offset 156) */
+   /* _mesa_function_pool[22637]: Fogiv (offset 156) */
    "ip\0"
    "glFogiv\0"
    "\0"
-   /* _mesa_function_pool[21933]: TexCoord1dv (offset 95) */
+   /* _mesa_function_pool[22649]: TexCoord1dv (offset 95) */
    "p\0"
    "glTexCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[21950]: AlphaFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[22666]: AlphaFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiii\0"
    "glAlphaFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[21986]: PixelTransferi (offset 248) */
+   /* _mesa_function_pool[22702]: PixelTransferi (offset 248) */
    "ii\0"
    "glPixelTransferi\0"
    "\0"
-   /* _mesa_function_pool[22007]: GetVertexAttribdvNV (will be remapped) */
+   /* _mesa_function_pool[22723]: GetVertexAttribdvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribdvNV\0"
    "\0"
-   /* _mesa_function_pool[22034]: VertexAttrib3fvNV (will be remapped) */
+   /* _mesa_function_pool[22750]: VertexAttrib3fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3fvNV\0"
    "\0"
-   /* _mesa_function_pool[22058]: Rotatef (offset 300) */
+   /* _mesa_function_pool[22774]: Rotatef (offset 300) */
    "ffff\0"
    "glRotatef\0"
    "\0"
-   /* _mesa_function_pool[22074]: GetFinalCombinerInputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[22790]: GetFinalCombinerInputParameterivNV (will be remapped) */
    "iip\0"
    "glGetFinalCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[22116]: Vertex3i (offset 138) */
+   /* _mesa_function_pool[22832]: Vertex3i (offset 138) */
    "iii\0"
    "glVertex3i\0"
    "\0"
-   /* _mesa_function_pool[22132]: Vertex3f (offset 136) */
+   /* _mesa_function_pool[22848]: Vertex3f (offset 136) */
    "fff\0"
    "glVertex3f\0"
    "\0"
-   /* _mesa_function_pool[22148]: Clear (offset 203) */
+   /* _mesa_function_pool[22864]: Clear (offset 203) */
    "i\0"
    "glClear\0"
    "\0"
-   /* _mesa_function_pool[22159]: Vertex3d (offset 134) */
+   /* _mesa_function_pool[22875]: Vertex3d (offset 134) */
    "ddd\0"
    "glVertex3d\0"
    "\0"
-   /* _mesa_function_pool[22175]: GetMapParameterivNV (dynamic) */
+   /* _mesa_function_pool[22891]: GetMapParameterivNV (dynamic) */
    "iip\0"
    "glGetMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[22202]: Uniform4iARB (will be remapped) */
+   /* _mesa_function_pool[22918]: Uniform4iARB (will be remapped) */
    "iiiii\0"
    "glUniform4i\0"
    "glUniform4iARB\0"
    "\0"
-   /* _mesa_function_pool[22236]: ReadBuffer (offset 254) */
+   /* _mesa_function_pool[22952]: ReadBuffer (offset 254) */
    "i\0"
    "glReadBuffer\0"
    "\0"
-   /* _mesa_function_pool[22252]: ConvolutionParameteri (offset 352) */
+   /* _mesa_function_pool[22968]: ConvolutionParameteri (offset 352) */
    "iii\0"
    "glConvolutionParameteri\0"
    "glConvolutionParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[22308]: Ortho (offset 296) */
+   /* _mesa_function_pool[23024]: Ortho (offset 296) */
    "dddddd\0"
    "glOrtho\0"
    "\0"
-   /* _mesa_function_pool[22324]: Binormal3sEXT (dynamic) */
+   /* _mesa_function_pool[23040]: Binormal3sEXT (dynamic) */
    "iii\0"
    "glBinormal3sEXT\0"
    "\0"
-   /* _mesa_function_pool[22345]: ListBase (offset 6) */
+   /* _mesa_function_pool[23061]: ListBase (offset 6) */
    "i\0"
    "glListBase\0"
    "\0"
-   /* _mesa_function_pool[22359]: Vertex3s (offset 140) */
+   /* _mesa_function_pool[23075]: Vertex3s (offset 140) */
    "iii\0"
    "glVertex3s\0"
    "\0"
-   /* _mesa_function_pool[22375]: ConvolutionParameterf (offset 350) */
+   /* _mesa_function_pool[23091]: ConvolutionParameterf (offset 350) */
    "iif\0"
    "glConvolutionParameterf\0"
    "glConvolutionParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[22431]: GetColorTableParameteriv (offset 345) */
+   /* _mesa_function_pool[23147]: GetColorTableParameteriv (offset 345) */
    "iip\0"
    "glGetColorTableParameteriv\0"
    "glGetColorTableParameterivSGI\0"
    "glGetColorTableParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[22523]: ProgramEnvParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[23239]: ProgramEnvParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramEnvParameter4dvARB\0"
    "glProgramParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[22580]: ShadeModel (offset 177) */
+   /* _mesa_function_pool[23296]: ShadeModel (offset 177) */
    "i\0"
    "glShadeModel\0"
    "\0"
-   /* _mesa_function_pool[22596]: VertexAttribs2fvNV (will be remapped) */
+   /* _mesa_function_pool[23312]: VertexAttribs2fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2fvNV\0"
    "\0"
-   /* _mesa_function_pool[22622]: Rectiv (offset 91) */
+   /* _mesa_function_pool[23338]: Rectiv (offset 91) */
    "pp\0"
    "glRectiv\0"
    "\0"
-   /* _mesa_function_pool[22635]: UseProgramObjectARB (will be remapped) */
+   /* _mesa_function_pool[23351]: UseProgramObjectARB (will be remapped) */
    "i\0"
    "glUseProgram\0"
    "glUseProgramObjectARB\0"
    "\0"
-   /* _mesa_function_pool[22673]: GetMapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[23389]: GetMapParameterfvNV (dynamic) */
    "iip\0"
    "glGetMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[22700]: EndConditionalRenderNV (will be remapped) */
+   /* _mesa_function_pool[23416]: EndConditionalRenderNV (will be remapped) */
    "\0"
    "glEndConditionalRenderNV\0"
    "\0"
-   /* _mesa_function_pool[22727]: PassTexCoordATI (will be remapped) */
+   /* _mesa_function_pool[23443]: PassTexCoordATI (will be remapped) */
    "iii\0"
    "glPassTexCoordATI\0"
    "\0"
-   /* _mesa_function_pool[22750]: DeleteProgram (will be remapped) */
+   /* _mesa_function_pool[23466]: DeleteProgram (will be remapped) */
    "i\0"
    "glDeleteProgram\0"
    "\0"
-   /* _mesa_function_pool[22769]: Tangent3ivEXT (dynamic) */
+   /* _mesa_function_pool[23485]: Tangent3ivEXT (dynamic) */
    "p\0"
    "glTangent3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[22788]: Tangent3dEXT (dynamic) */
+   /* _mesa_function_pool[23504]: Tangent3dEXT (dynamic) */
    "ddd\0"
    "glTangent3dEXT\0"
    "\0"
-   /* _mesa_function_pool[22808]: SecondaryColor3dvEXT (will be remapped) */
+   /* _mesa_function_pool[23524]: SecondaryColor3dvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3dv\0"
    "glSecondaryColor3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[22854]: Vertex2fv (offset 129) */
+   /* _mesa_function_pool[23570]: Vertex2fv (offset 129) */
    "p\0"
    "glVertex2fv\0"
    "\0"
-   /* _mesa_function_pool[22869]: MultiDrawArraysEXT (will be remapped) */
+   /* _mesa_function_pool[23585]: MultiDrawArraysEXT (will be remapped) */
    "ippi\0"
    "glMultiDrawArrays\0"
    "glMultiDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[22914]: BindRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[23630]: BindRenderbufferEXT (will be remapped) */
    "ii\0"
    "glBindRenderbuffer\0"
    "glBindRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[22959]: MultiTexCoord4dARB (offset 400) */
+   /* _mesa_function_pool[23675]: MultiTexCoord4dARB (offset 400) */
    "idddd\0"
    "glMultiTexCoord4d\0"
    "glMultiTexCoord4dARB\0"
    "\0"
-   /* _mesa_function_pool[23005]: Vertex3sv (offset 141) */
+   /* _mesa_function_pool[23721]: FramebufferTextureFaceARB (will be remapped) */
+   "iiiii\0"
+   "glFramebufferTextureFaceARB\0"
+   "\0"
+   /* _mesa_function_pool[23756]: Vertex3sv (offset 141) */
    "p\0"
    "glVertex3sv\0"
    "\0"
-   /* _mesa_function_pool[23020]: SecondaryColor3usEXT (will be remapped) */
+   /* _mesa_function_pool[23771]: SecondaryColor3usEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3us\0"
    "glSecondaryColor3usEXT\0"
    "\0"
-   /* _mesa_function_pool[23068]: ProgramLocalParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[23819]: ProgramLocalParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4fvARB\0"
    "\0"
-   /* _mesa_function_pool[23103]: DeleteProgramsNV (will be remapped) */
+   /* _mesa_function_pool[23854]: DeleteProgramsNV (will be remapped) */
    "ip\0"
    "glDeleteProgramsARB\0"
    "glDeleteProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[23146]: EvalMesh1 (offset 236) */
+   /* _mesa_function_pool[23897]: EvalMesh1 (offset 236) */
    "iii\0"
    "glEvalMesh1\0"
    "\0"
-   /* _mesa_function_pool[23163]: MultiTexCoord1sARB (offset 382) */
+   /* _mesa_function_pool[23914]: PauseTransformFeedback (will be remapped) */
+   "\0"
+   "glPauseTransformFeedback\0"
+   "\0"
+   /* _mesa_function_pool[23941]: MultiTexCoord1sARB (offset 382) */
    "ii\0"
    "glMultiTexCoord1s\0"
    "glMultiTexCoord1sARB\0"
    "\0"
-   /* _mesa_function_pool[23206]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[23984]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
    "iffffff\0"
    "glReplacementCodeuiColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[23253]: GetVertexAttribPointervNV (will be remapped) */
+   /* _mesa_function_pool[24031]: GetVertexAttribPointervNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribPointerv\0"
    "glGetVertexAttribPointervARB\0"
    "glGetVertexAttribPointervNV\0"
    "\0"
-   /* _mesa_function_pool[23341]: DisableIndexedEXT (will be remapped) */
-   "ii\0"
-   "glDisableIndexedEXT\0"
+   /* _mesa_function_pool[24119]: VertexAttribs1fvNV (will be remapped) */
+   "iip\0"
+   "glVertexAttribs1fvNV\0"
    "\0"
-   /* _mesa_function_pool[23365]: MultiTexCoord1dvARB (offset 377) */
+   /* _mesa_function_pool[24145]: MultiTexCoord1dvARB (offset 377) */
    "ip\0"
    "glMultiTexCoord1dv\0"
    "glMultiTexCoord1dvARB\0"
    "\0"
-   /* _mesa_function_pool[23410]: Uniform2iARB (will be remapped) */
+   /* _mesa_function_pool[24190]: Uniform2iARB (will be remapped) */
    "iii\0"
    "glUniform2i\0"
    "glUniform2iARB\0"
    "\0"
-   /* _mesa_function_pool[23442]: Vertex2iv (offset 131) */
+   /* _mesa_function_pool[24222]: Vertex2iv (offset 131) */
    "p\0"
    "glVertex2iv\0"
    "\0"
-   /* _mesa_function_pool[23457]: GetProgramStringNV (will be remapped) */
+   /* _mesa_function_pool[24237]: GetProgramStringNV (will be remapped) */
    "iip\0"
    "glGetProgramStringNV\0"
    "\0"
-   /* _mesa_function_pool[23483]: ColorPointerEXT (will be remapped) */
+   /* _mesa_function_pool[24263]: ColorPointerEXT (will be remapped) */
    "iiiip\0"
    "glColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[23508]: LineWidth (offset 168) */
+   /* _mesa_function_pool[24288]: LineWidth (offset 168) */
    "f\0"
    "glLineWidth\0"
    "\0"
-   /* _mesa_function_pool[23523]: MapBufferARB (will be remapped) */
+   /* _mesa_function_pool[24303]: MapBufferARB (will be remapped) */
    "ii\0"
    "glMapBuffer\0"
    "glMapBufferARB\0"
    "\0"
-   /* _mesa_function_pool[23554]: MultiDrawElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[24334]: MultiDrawElementsBaseVertex (will be remapped) */
    "ipipip\0"
    "glMultiDrawElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[23592]: Binormal3svEXT (dynamic) */
+   /* _mesa_function_pool[24372]: Binormal3svEXT (dynamic) */
    "p\0"
    "glBinormal3svEXT\0"
    "\0"
-   /* _mesa_function_pool[23612]: ApplyTextureEXT (dynamic) */
+   /* _mesa_function_pool[24392]: ApplyTextureEXT (dynamic) */
    "i\0"
    "glApplyTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[23633]: TexGendv (offset 189) */
+   /* _mesa_function_pool[24413]: TexGendv (offset 189) */
    "iip\0"
    "glTexGendv\0"
    "\0"
-   /* _mesa_function_pool[23649]: EnableIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[24429]: EnableIndexedEXT (will be remapped) */
    "ii\0"
    "glEnableIndexedEXT\0"
    "\0"
-   /* _mesa_function_pool[23672]: TextureMaterialEXT (dynamic) */
+   /* _mesa_function_pool[24452]: TextureMaterialEXT (dynamic) */
    "ii\0"
    "glTextureMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[23697]: TextureLightEXT (dynamic) */
+   /* _mesa_function_pool[24477]: TextureLightEXT (dynamic) */
    "i\0"
    "glTextureLightEXT\0"
    "\0"
-   /* _mesa_function_pool[23718]: ResetMinmax (offset 370) */
+   /* _mesa_function_pool[24498]: ResetMinmax (offset 370) */
    "i\0"
    "glResetMinmax\0"
    "glResetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[23752]: SpriteParameterfSGIX (dynamic) */
+   /* _mesa_function_pool[24532]: SpriteParameterfSGIX (dynamic) */
    "if\0"
    "glSpriteParameterfSGIX\0"
    "\0"
-   /* _mesa_function_pool[23779]: EnableClientState (offset 313) */
+   /* _mesa_function_pool[24559]: EnableClientState (offset 313) */
    "i\0"
    "glEnableClientState\0"
    "\0"
-   /* _mesa_function_pool[23802]: VertexAttrib4sNV (will be remapped) */
+   /* _mesa_function_pool[24582]: VertexAttrib4sNV (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4sNV\0"
    "\0"
-   /* _mesa_function_pool[23828]: GetConvolutionParameterfv (offset 357) */
+   /* _mesa_function_pool[24608]: GetConvolutionParameterfv (offset 357) */
    "iip\0"
    "glGetConvolutionParameterfv\0"
    "glGetConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[23892]: VertexAttribs4dvNV (will be remapped) */
+   /* _mesa_function_pool[24672]: VertexAttribs4dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4dvNV\0"
    "\0"
-   /* _mesa_function_pool[23918]: VertexAttrib4dARB (will be remapped) */
+   /* _mesa_function_pool[24698]: VertexAttrib4dARB (will be remapped) */
    "idddd\0"
    "glVertexAttrib4d\0"
    "glVertexAttrib4dARB\0"
    "\0"
-   /* _mesa_function_pool[23962]: GetTexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[24742]: GetTexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[23993]: ProgramNamedParameter4dNV (will be remapped) */
+   /* _mesa_function_pool[24773]: ProgramNamedParameter4dNV (will be remapped) */
    "iipdddd\0"
    "glProgramNamedParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[24030]: GetMaterialfv (offset 269) */
+   /* _mesa_function_pool[24810]: GetMaterialfv (offset 269) */
    "iip\0"
    "glGetMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[24051]: VertexWeightfEXT (dynamic) */
+   /* _mesa_function_pool[24831]: VertexWeightfEXT (dynamic) */
    "f\0"
    "glVertexWeightfEXT\0"
    "\0"
-   /* _mesa_function_pool[24073]: Binormal3fEXT (dynamic) */
+   /* _mesa_function_pool[24853]: Binormal3fEXT (dynamic) */
    "fff\0"
    "glBinormal3fEXT\0"
    "\0"
-   /* _mesa_function_pool[24094]: CallList (offset 2) */
+   /* _mesa_function_pool[24874]: CallList (offset 2) */
    "i\0"
    "glCallList\0"
    "\0"
-   /* _mesa_function_pool[24108]: Materialfv (offset 170) */
+   /* _mesa_function_pool[24888]: Materialfv (offset 170) */
    "iip\0"
    "glMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[24126]: TexCoord3fv (offset 113) */
+   /* _mesa_function_pool[24906]: TexCoord3fv (offset 113) */
    "p\0"
    "glTexCoord3fv\0"
    "\0"
-   /* _mesa_function_pool[24143]: FogCoordfvEXT (will be remapped) */
+   /* _mesa_function_pool[24923]: FogCoordfvEXT (will be remapped) */
    "p\0"
    "glFogCoordfv\0"
    "glFogCoordfvEXT\0"
    "\0"
-   /* _mesa_function_pool[24175]: MultiTexCoord1ivARB (offset 381) */
+   /* _mesa_function_pool[24955]: MultiTexCoord1ivARB (offset 381) */
    "ip\0"
    "glMultiTexCoord1iv\0"
    "glMultiTexCoord1ivARB\0"
    "\0"
-   /* _mesa_function_pool[24220]: SecondaryColor3ubEXT (will be remapped) */
+   /* _mesa_function_pool[25000]: SecondaryColor3ubEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3ub\0"
    "glSecondaryColor3ubEXT\0"
    "\0"
-   /* _mesa_function_pool[24268]: MultiTexCoord2ivARB (offset 389) */
+   /* _mesa_function_pool[25048]: MultiTexCoord2ivARB (offset 389) */
    "ip\0"
    "glMultiTexCoord2iv\0"
    "glMultiTexCoord2ivARB\0"
    "\0"
-   /* _mesa_function_pool[24313]: FogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[25093]: FogFuncSGIS (dynamic) */
    "ip\0"
    "glFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[24331]: CopyTexSubImage2D (offset 326) */
+   /* _mesa_function_pool[25111]: CopyTexSubImage2D (offset 326) */
    "iiiiiiii\0"
    "glCopyTexSubImage2D\0"
    "glCopyTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[24384]: GetObjectParameterivARB (will be remapped) */
+   /* _mesa_function_pool[25164]: GetObjectParameterivARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[24415]: Color3iv (offset 16) */
+   /* _mesa_function_pool[25195]: Color3iv (offset 16) */
    "p\0"
    "glColor3iv\0"
    "\0"
-   /* _mesa_function_pool[24429]: TexCoord4fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[25209]: TexCoord4fVertex4fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord4fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[24463]: DrawElements (offset 311) */
+   /* _mesa_function_pool[25243]: DrawElements (offset 311) */
    "iiip\0"
    "glDrawElements\0"
    "\0"
-   /* _mesa_function_pool[24484]: BindVertexArrayAPPLE (will be remapped) */
+   /* _mesa_function_pool[25264]: BindVertexArrayAPPLE (will be remapped) */
    "i\0"
    "glBindVertexArrayAPPLE\0"
    "\0"
-   /* _mesa_function_pool[24510]: GetProgramLocalParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[25290]: GetProgramLocalParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[24547]: GetHistogramParameteriv (offset 363) */
+   /* _mesa_function_pool[25327]: GetHistogramParameteriv (offset 363) */
    "iip\0"
    "glGetHistogramParameteriv\0"
    "glGetHistogramParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[24607]: MultiTexCoord1iARB (offset 380) */
+   /* _mesa_function_pool[25387]: MultiTexCoord1iARB (offset 380) */
    "ii\0"
    "glMultiTexCoord1i\0"
    "glMultiTexCoord1iARB\0"
    "\0"
-   /* _mesa_function_pool[24650]: GetConvolutionFilter (offset 356) */
+   /* _mesa_function_pool[25430]: GetConvolutionFilter (offset 356) */
    "iiip\0"
    "glGetConvolutionFilter\0"
    "glGetConvolutionFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[24705]: GetProgramivARB (will be remapped) */
+   /* _mesa_function_pool[25485]: GetProgramivARB (will be remapped) */
    "iip\0"
    "glGetProgramivARB\0"
    "\0"
-   /* _mesa_function_pool[24728]: BlendFuncSeparateEXT (will be remapped) */
+   /* _mesa_function_pool[25508]: BlendFuncSeparateEXT (will be remapped) */
    "iiii\0"
    "glBlendFuncSeparate\0"
    "glBlendFuncSeparateEXT\0"
    "glBlendFuncSeparateINGR\0"
    "\0"
-   /* _mesa_function_pool[24801]: MapBufferRange (will be remapped) */
+   /* _mesa_function_pool[25581]: MapBufferRange (will be remapped) */
    "iiii\0"
    "glMapBufferRange\0"
    "\0"
-   /* _mesa_function_pool[24824]: ProgramParameters4dvNV (will be remapped) */
+   /* _mesa_function_pool[25604]: ProgramParameters4dvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4dvNV\0"
    "\0"
-   /* _mesa_function_pool[24855]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[25635]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[24892]: EvalPoint2 (offset 239) */
+   /* _mesa_function_pool[25672]: EvalPoint2 (offset 239) */
    "ii\0"
    "glEvalPoint2\0"
    "\0"
-   /* _mesa_function_pool[24909]: EvalPoint1 (offset 237) */
+   /* _mesa_function_pool[25689]: EvalPoint1 (offset 237) */
    "i\0"
    "glEvalPoint1\0"
    "\0"
-   /* _mesa_function_pool[24925]: Binormal3dvEXT (dynamic) */
+   /* _mesa_function_pool[25705]: Binormal3dvEXT (dynamic) */
    "p\0"
    "glBinormal3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[24945]: PopMatrix (offset 297) */
+   /* _mesa_function_pool[25725]: PopMatrix (offset 297) */
    "\0"
    "glPopMatrix\0"
    "\0"
-   /* _mesa_function_pool[24959]: FinishFenceNV (will be remapped) */
+   /* _mesa_function_pool[25739]: FinishFenceNV (will be remapped) */
    "i\0"
    "glFinishFenceNV\0"
    "\0"
-   /* _mesa_function_pool[24978]: GetFogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[25758]: GetFogFuncSGIS (dynamic) */
    "p\0"
    "glGetFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[24998]: GetUniformLocationARB (will be remapped) */
+   /* _mesa_function_pool[25778]: GetUniformLocationARB (will be remapped) */
    "ip\0"
    "glGetUniformLocation\0"
    "glGetUniformLocationARB\0"
    "\0"
-   /* _mesa_function_pool[25047]: SecondaryColor3fEXT (will be remapped) */
+   /* _mesa_function_pool[25827]: SecondaryColor3fEXT (will be remapped) */
    "fff\0"
    "glSecondaryColor3f\0"
    "glSecondaryColor3fEXT\0"
    "\0"
-   /* _mesa_function_pool[25093]: GetTexGeniv (offset 280) */
+   /* _mesa_function_pool[25873]: GetTexGeniv (offset 280) */
    "iip\0"
    "glGetTexGeniv\0"
    "\0"
-   /* _mesa_function_pool[25112]: CombinerInputNV (will be remapped) */
+   /* _mesa_function_pool[25892]: CombinerInputNV (will be remapped) */
    "iiiiii\0"
    "glCombinerInputNV\0"
    "\0"
-   /* _mesa_function_pool[25138]: VertexAttrib3sARB (will be remapped) */
+   /* _mesa_function_pool[25918]: VertexAttrib3sARB (will be remapped) */
    "iiii\0"
    "glVertexAttrib3s\0"
    "glVertexAttrib3sARB\0"
    "\0"
-   /* _mesa_function_pool[25181]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[25961]: IsTransformFeedback (will be remapped) */
+   "i\0"
+   "glIsTransformFeedback\0"
+   "\0"
+   /* _mesa_function_pool[25986]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[25226]: Map2d (offset 222) */
+   /* _mesa_function_pool[26031]: Map2d (offset 222) */
    "iddiiddiip\0"
    "glMap2d\0"
    "\0"
-   /* _mesa_function_pool[25246]: Map2f (offset 223) */
+   /* _mesa_function_pool[26051]: Map2f (offset 223) */
    "iffiiffiip\0"
    "glMap2f\0"
    "\0"
-   /* _mesa_function_pool[25266]: ProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[26071]: ProgramStringARB (will be remapped) */
    "iiip\0"
    "glProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[25291]: Vertex4s (offset 148) */
+   /* _mesa_function_pool[26096]: Vertex4s (offset 148) */
    "iiii\0"
    "glVertex4s\0"
    "\0"
-   /* _mesa_function_pool[25308]: TexCoord4fVertex4fvSUN (dynamic) */
+   /* _mesa_function_pool[26113]: TexCoord4fVertex4fvSUN (dynamic) */
    "pp\0"
    "glTexCoord4fVertex4fvSUN\0"
    "\0"
-   /* _mesa_function_pool[25337]: VertexAttrib3sNV (will be remapped) */
-   "iiii\0"
-   "glVertexAttrib3sNV\0"
+   /* _mesa_function_pool[26142]: FragmentLightModelivSGIX (dynamic) */
+   "ip\0"
+   "glFragmentLightModelivSGIX\0"
    "\0"
-   /* _mesa_function_pool[25362]: VertexAttrib1fNV (will be remapped) */
+   /* _mesa_function_pool[26173]: VertexAttrib1fNV (will be remapped) */
    "if\0"
    "glVertexAttrib1fNV\0"
    "\0"
-   /* _mesa_function_pool[25385]: Vertex4f (offset 144) */
+   /* _mesa_function_pool[26196]: Vertex4f (offset 144) */
    "ffff\0"
    "glVertex4f\0"
    "\0"
-   /* _mesa_function_pool[25402]: EvalCoord1d (offset 228) */
+   /* _mesa_function_pool[26213]: EvalCoord1d (offset 228) */
    "d\0"
    "glEvalCoord1d\0"
    "\0"
-   /* _mesa_function_pool[25419]: Vertex4d (offset 142) */
+   /* _mesa_function_pool[26230]: Vertex4d (offset 142) */
    "dddd\0"
    "glVertex4d\0"
    "\0"
-   /* _mesa_function_pool[25436]: RasterPos4dv (offset 79) */
+   /* _mesa_function_pool[26247]: RasterPos4dv (offset 79) */
    "p\0"
    "glRasterPos4dv\0"
    "\0"
-   /* _mesa_function_pool[25454]: FragmentLightfSGIX (dynamic) */
+   /* _mesa_function_pool[26265]: FragmentLightfSGIX (dynamic) */
    "iif\0"
    "glFragmentLightfSGIX\0"
    "\0"
-   /* _mesa_function_pool[25480]: GetCompressedTexImageARB (will be remapped) */
+   /* _mesa_function_pool[26291]: GetCompressedTexImageARB (will be remapped) */
    "iip\0"
    "glGetCompressedTexImage\0"
    "glGetCompressedTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[25536]: GetTexGenfv (offset 279) */
+   /* _mesa_function_pool[26347]: GetTexGenfv (offset 279) */
    "iip\0"
    "glGetTexGenfv\0"
    "\0"
-   /* _mesa_function_pool[25555]: Vertex4i (offset 146) */
+   /* _mesa_function_pool[26366]: Vertex4i (offset 146) */
    "iiii\0"
    "glVertex4i\0"
    "\0"
-   /* _mesa_function_pool[25572]: VertexWeightPointerEXT (dynamic) */
+   /* _mesa_function_pool[26383]: VertexWeightPointerEXT (dynamic) */
    "iiip\0"
    "glVertexWeightPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[25603]: GetHistogram (offset 361) */
+   /* _mesa_function_pool[26414]: GetHistogram (offset 361) */
    "iiiip\0"
    "glGetHistogram\0"
    "glGetHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[25643]: ActiveStencilFaceEXT (will be remapped) */
+   /* _mesa_function_pool[26454]: ActiveStencilFaceEXT (will be remapped) */
    "i\0"
    "glActiveStencilFaceEXT\0"
    "\0"
-   /* _mesa_function_pool[25669]: StencilFuncSeparateATI (will be remapped) */
+   /* _mesa_function_pool[26480]: StencilFuncSeparateATI (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[25700]: Materialf (offset 169) */
+   /* _mesa_function_pool[26511]: Materialf (offset 169) */
    "iif\0"
    "glMaterialf\0"
    "\0"
-   /* _mesa_function_pool[25717]: GetShaderSourceARB (will be remapped) */
+   /* _mesa_function_pool[26528]: GetShaderSourceARB (will be remapped) */
    "iipp\0"
    "glGetShaderSource\0"
    "glGetShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[25762]: IglooInterfaceSGIX (dynamic) */
+   /* _mesa_function_pool[26573]: IglooInterfaceSGIX (dynamic) */
    "ip\0"
    "glIglooInterfaceSGIX\0"
    "\0"
-   /* _mesa_function_pool[25787]: Materiali (offset 171) */
+   /* _mesa_function_pool[26598]: Materiali (offset 171) */
    "iii\0"
    "glMateriali\0"
    "\0"
-   /* _mesa_function_pool[25804]: VertexAttrib4dNV (will be remapped) */
+   /* _mesa_function_pool[26615]: VertexAttrib4dNV (will be remapped) */
    "idddd\0"
    "glVertexAttrib4dNV\0"
    "\0"
-   /* _mesa_function_pool[25830]: MultiModeDrawElementsIBM (will be remapped) */
+   /* _mesa_function_pool[26641]: MultiModeDrawElementsIBM (will be remapped) */
    "ppipii\0"
    "glMultiModeDrawElementsIBM\0"
    "\0"
-   /* _mesa_function_pool[25865]: Indexsv (offset 51) */
+   /* _mesa_function_pool[26676]: Indexsv (offset 51) */
    "p\0"
    "glIndexsv\0"
    "\0"
-   /* _mesa_function_pool[25878]: MultiTexCoord4svARB (offset 407) */
+   /* _mesa_function_pool[26689]: MultiTexCoord4svARB (offset 407) */
    "ip\0"
    "glMultiTexCoord4sv\0"
    "glMultiTexCoord4svARB\0"
    "\0"
-   /* _mesa_function_pool[25923]: LightModelfv (offset 164) */
+   /* _mesa_function_pool[26734]: LightModelfv (offset 164) */
    "ip\0"
    "glLightModelfv\0"
    "\0"
-   /* _mesa_function_pool[25942]: TexCoord2dv (offset 103) */
+   /* _mesa_function_pool[26753]: TexCoord2dv (offset 103) */
    "p\0"
    "glTexCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[25959]: GenQueriesARB (will be remapped) */
+   /* _mesa_function_pool[26770]: GenQueriesARB (will be remapped) */
    "ip\0"
    "glGenQueries\0"
    "glGenQueriesARB\0"
    "\0"
-   /* _mesa_function_pool[25992]: EvalCoord1dv (offset 229) */
+   /* _mesa_function_pool[26803]: EvalCoord1dv (offset 229) */
    "p\0"
    "glEvalCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[26010]: ReplacementCodeuiVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[26821]: ReplacementCodeuiVertex3fSUN (dynamic) */
    "ifff\0"
    "glReplacementCodeuiVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[26047]: Translated (offset 303) */
+   /* _mesa_function_pool[26858]: Translated (offset 303) */
    "ddd\0"
    "glTranslated\0"
    "\0"
-   /* _mesa_function_pool[26065]: Translatef (offset 304) */
+   /* _mesa_function_pool[26876]: Translatef (offset 304) */
    "fff\0"
    "glTranslatef\0"
    "\0"
-   /* _mesa_function_pool[26083]: StencilMask (offset 209) */
+   /* _mesa_function_pool[26894]: StencilMask (offset 209) */
    "i\0"
    "glStencilMask\0"
    "\0"
-   /* _mesa_function_pool[26100]: Tangent3iEXT (dynamic) */
+   /* _mesa_function_pool[26911]: Tangent3iEXT (dynamic) */
    "iii\0"
    "glTangent3iEXT\0"
    "\0"
-   /* _mesa_function_pool[26120]: GetLightiv (offset 265) */
+   /* _mesa_function_pool[26931]: GetLightiv (offset 265) */
    "iip\0"
    "glGetLightiv\0"
    "\0"
-   /* _mesa_function_pool[26138]: DrawMeshArraysSUN (dynamic) */
+   /* _mesa_function_pool[26949]: DrawMeshArraysSUN (dynamic) */
    "iiii\0"
    "glDrawMeshArraysSUN\0"
    "\0"
-   /* _mesa_function_pool[26164]: IsList (offset 287) */
+   /* _mesa_function_pool[26975]: IsList (offset 287) */
    "i\0"
    "glIsList\0"
    "\0"
-   /* _mesa_function_pool[26176]: IsSync (will be remapped) */
+   /* _mesa_function_pool[26987]: IsSync (will be remapped) */
    "i\0"
    "glIsSync\0"
    "\0"
-   /* _mesa_function_pool[26188]: RenderMode (offset 196) */
+   /* _mesa_function_pool[26999]: RenderMode (offset 196) */
    "i\0"
    "glRenderMode\0"
    "\0"
-   /* _mesa_function_pool[26204]: GetMapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[27015]: GetMapControlPointsNV (dynamic) */
    "iiiiiip\0"
    "glGetMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[26237]: DrawBuffersARB (will be remapped) */
+   /* _mesa_function_pool[27048]: DrawBuffersARB (will be remapped) */
    "ip\0"
    "glDrawBuffers\0"
    "glDrawBuffersARB\0"
    "glDrawBuffersATI\0"
    "\0"
-   /* _mesa_function_pool[26289]: ProgramLocalParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[27100]: ProgramLocalParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramLocalParameter4fARB\0"
    "\0"
-   /* _mesa_function_pool[26326]: SpriteParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[27137]: SpriteParameterivSGIX (dynamic) */
    "ip\0"
    "glSpriteParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[26354]: ProvokingVertexEXT (will be remapped) */
+   /* _mesa_function_pool[27165]: ProvokingVertexEXT (will be remapped) */
    "i\0"
    "glProvokingVertexEXT\0"
    "glProvokingVertex\0"
    "\0"
-   /* _mesa_function_pool[26396]: MultiTexCoord1fARB (offset 378) */
+   /* _mesa_function_pool[27207]: MultiTexCoord1fARB (offset 378) */
    "if\0"
    "glMultiTexCoord1f\0"
    "glMultiTexCoord1fARB\0"
    "\0"
-   /* _mesa_function_pool[26439]: LoadName (offset 198) */
+   /* _mesa_function_pool[27250]: LoadName (offset 198) */
    "i\0"
    "glLoadName\0"
    "\0"
-   /* _mesa_function_pool[26453]: VertexAttribs4ubvNV (will be remapped) */
+   /* _mesa_function_pool[27264]: VertexAttribs4ubvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4ubvNV\0"
    "\0"
-   /* _mesa_function_pool[26480]: WeightsvARB (dynamic) */
+   /* _mesa_function_pool[27291]: WeightsvARB (dynamic) */
    "ip\0"
    "glWeightsvARB\0"
    "\0"
-   /* _mesa_function_pool[26498]: Uniform1fvARB (will be remapped) */
+   /* _mesa_function_pool[27309]: Uniform1fvARB (will be remapped) */
    "iip\0"
    "glUniform1fv\0"
    "glUniform1fvARB\0"
    "\0"
-   /* _mesa_function_pool[26532]: CopyTexSubImage1D (offset 325) */
+   /* _mesa_function_pool[27343]: CopyTexSubImage1D (offset 325) */
    "iiiiii\0"
    "glCopyTexSubImage1D\0"
    "glCopyTexSubImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[26583]: CullFace (offset 152) */
+   /* _mesa_function_pool[27394]: CullFace (offset 152) */
    "i\0"
    "glCullFace\0"
    "\0"
-   /* _mesa_function_pool[26597]: BindTexture (offset 307) */
+   /* _mesa_function_pool[27408]: BindTexture (offset 307) */
    "ii\0"
    "glBindTexture\0"
    "glBindTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[26632]: BeginFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[27443]: BeginFragmentShaderATI (will be remapped) */
    "\0"
    "glBeginFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[26659]: MultiTexCoord4fARB (offset 402) */
+   /* _mesa_function_pool[27470]: MultiTexCoord4fARB (offset 402) */
    "iffff\0"
    "glMultiTexCoord4f\0"
    "glMultiTexCoord4fARB\0"
    "\0"
-   /* _mesa_function_pool[26705]: VertexAttribs3svNV (will be remapped) */
+   /* _mesa_function_pool[27516]: VertexAttribs3svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3svNV\0"
    "\0"
-   /* _mesa_function_pool[26731]: StencilFunc (offset 243) */
+   /* _mesa_function_pool[27542]: StencilFunc (offset 243) */
    "iii\0"
    "glStencilFunc\0"
    "\0"
-   /* _mesa_function_pool[26750]: CopyPixels (offset 255) */
+   /* _mesa_function_pool[27561]: CopyPixels (offset 255) */
    "iiiii\0"
    "glCopyPixels\0"
    "\0"
-   /* _mesa_function_pool[26770]: Rectsv (offset 93) */
+   /* _mesa_function_pool[27581]: Rectsv (offset 93) */
    "pp\0"
    "glRectsv\0"
    "\0"
-   /* _mesa_function_pool[26783]: ReplacementCodeuivSUN (dynamic) */
+   /* _mesa_function_pool[27594]: ReplacementCodeuivSUN (dynamic) */
    "p\0"
    "glReplacementCodeuivSUN\0"
    "\0"
-   /* _mesa_function_pool[26810]: EnableVertexAttribArrayARB (will be remapped) */
+   /* _mesa_function_pool[27621]: EnableVertexAttribArrayARB (will be remapped) */
    "i\0"
    "glEnableVertexAttribArray\0"
    "glEnableVertexAttribArrayARB\0"
    "\0"
-   /* _mesa_function_pool[26868]: NormalPointervINTEL (dynamic) */
+   /* _mesa_function_pool[27679]: NormalPointervINTEL (dynamic) */
    "ip\0"
    "glNormalPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[26894]: CopyConvolutionFilter2D (offset 355) */
+   /* _mesa_function_pool[27705]: CopyConvolutionFilter2D (offset 355) */
    "iiiiii\0"
    "glCopyConvolutionFilter2D\0"
    "glCopyConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[26957]: WindowPos3ivMESA (will be remapped) */
+   /* _mesa_function_pool[27768]: WindowPos3ivMESA (will be remapped) */
    "p\0"
    "glWindowPos3iv\0"
    "glWindowPos3ivARB\0"
    "glWindowPos3ivMESA\0"
    "\0"
-   /* _mesa_function_pool[27012]: CopyBufferSubData (will be remapped) */
+   /* _mesa_function_pool[27823]: CopyBufferSubData (will be remapped) */
    "iiiii\0"
    "glCopyBufferSubData\0"
    "\0"
-   /* _mesa_function_pool[27039]: NormalPointer (offset 318) */
+   /* _mesa_function_pool[27850]: NormalPointer (offset 318) */
    "iip\0"
    "glNormalPointer\0"
    "\0"
-   /* _mesa_function_pool[27060]: TexParameterfv (offset 179) */
+   /* _mesa_function_pool[27871]: TexParameterfv (offset 179) */
    "iip\0"
    "glTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[27082]: IsBufferARB (will be remapped) */
+   /* _mesa_function_pool[27893]: IsBufferARB (will be remapped) */
    "i\0"
    "glIsBuffer\0"
    "glIsBufferARB\0"
    "\0"
-   /* _mesa_function_pool[27110]: WindowPos4iMESA (will be remapped) */
+   /* _mesa_function_pool[27921]: WindowPos4iMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4iMESA\0"
    "\0"
-   /* _mesa_function_pool[27134]: VertexAttrib4uivARB (will be remapped) */
+   /* _mesa_function_pool[27945]: VertexAttrib4uivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4uiv\0"
    "glVertexAttrib4uivARB\0"
    "\0"
-   /* _mesa_function_pool[27179]: Tangent3bvEXT (dynamic) */
+   /* _mesa_function_pool[27990]: Tangent3bvEXT (dynamic) */
    "p\0"
    "glTangent3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[27198]: UniformMatrix3x4fv (will be remapped) */
+   /* _mesa_function_pool[28009]: UniformMatrix3x4fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x4fv\0"
    "\0"
-   /* _mesa_function_pool[27225]: ClipPlane (offset 150) */
+   /* _mesa_function_pool[28036]: ClipPlane (offset 150) */
    "ip\0"
    "glClipPlane\0"
    "\0"
-   /* _mesa_function_pool[27241]: Recti (offset 90) */
+   /* _mesa_function_pool[28052]: Recti (offset 90) */
    "iiii\0"
    "glRecti\0"
    "\0"
-   /* _mesa_function_pool[27255]: DrawRangeElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[28066]: DrawRangeElementsBaseVertex (will be remapped) */
    "iiiiipi\0"
    "glDrawRangeElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[27294]: TexCoordPointervINTEL (dynamic) */
+   /* _mesa_function_pool[28105]: TexCoordPointervINTEL (dynamic) */
    "iip\0"
    "glTexCoordPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[27323]: DeleteBuffersARB (will be remapped) */
+   /* _mesa_function_pool[28134]: DeleteBuffersARB (will be remapped) */
    "ip\0"
    "glDeleteBuffers\0"
    "glDeleteBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[27362]: WindowPos4fvMESA (will be remapped) */
+   /* _mesa_function_pool[28173]: PixelTransformParameterfvEXT (dynamic) */
+   "iip\0"
+   "glPixelTransformParameterfvEXT\0"
+   "\0"
+   /* _mesa_function_pool[28209]: WindowPos4fvMESA (will be remapped) */
    "p\0"
    "glWindowPos4fvMESA\0"
    "\0"
-   /* _mesa_function_pool[27384]: GetPixelMapuiv (offset 272) */
+   /* _mesa_function_pool[28231]: GetPixelMapuiv (offset 272) */
    "ip\0"
    "glGetPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[27405]: Rectf (offset 88) */
+   /* _mesa_function_pool[28252]: Rectf (offset 88) */
    "ffff\0"
    "glRectf\0"
    "\0"
-   /* _mesa_function_pool[27419]: VertexAttrib1sNV (will be remapped) */
+   /* _mesa_function_pool[28266]: VertexAttrib1sNV (will be remapped) */
    "ii\0"
    "glVertexAttrib1sNV\0"
    "\0"
-   /* _mesa_function_pool[27442]: Indexfv (offset 47) */
+   /* _mesa_function_pool[28289]: Indexfv (offset 47) */
    "p\0"
    "glIndexfv\0"
    "\0"
-   /* _mesa_function_pool[27455]: SecondaryColor3svEXT (will be remapped) */
+   /* _mesa_function_pool[28302]: SecondaryColor3svEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3sv\0"
    "glSecondaryColor3svEXT\0"
    "\0"
-   /* _mesa_function_pool[27501]: LoadTransposeMatrixfARB (will be remapped) */
+   /* _mesa_function_pool[28348]: LoadTransposeMatrixfARB (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixf\0"
    "glLoadTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[27553]: GetPointerv (offset 329) */
+   /* _mesa_function_pool[28400]: GetPointerv (offset 329) */
    "ip\0"
    "glGetPointerv\0"
    "glGetPointervEXT\0"
    "\0"
-   /* _mesa_function_pool[27588]: Tangent3bEXT (dynamic) */
+   /* _mesa_function_pool[28435]: Tangent3bEXT (dynamic) */
    "iii\0"
    "glTangent3bEXT\0"
    "\0"
-   /* _mesa_function_pool[27608]: CombinerParameterfNV (will be remapped) */
+   /* _mesa_function_pool[28455]: CombinerParameterfNV (will be remapped) */
    "if\0"
    "glCombinerParameterfNV\0"
    "\0"
-   /* _mesa_function_pool[27635]: IndexMask (offset 212) */
+   /* _mesa_function_pool[28482]: IndexMask (offset 212) */
    "i\0"
    "glIndexMask\0"
    "\0"
-   /* _mesa_function_pool[27650]: BindProgramNV (will be remapped) */
+   /* _mesa_function_pool[28497]: BindProgramNV (will be remapped) */
    "ii\0"
    "glBindProgramARB\0"
    "glBindProgramNV\0"
    "\0"
-   /* _mesa_function_pool[27687]: VertexAttrib4svARB (will be remapped) */
+   /* _mesa_function_pool[28534]: VertexAttrib4svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4sv\0"
    "glVertexAttrib4svARB\0"
    "\0"
-   /* _mesa_function_pool[27730]: GetFloatv (offset 262) */
+   /* _mesa_function_pool[28577]: GetFloatv (offset 262) */
    "ip\0"
    "glGetFloatv\0"
    "\0"
-   /* _mesa_function_pool[27746]: CreateDebugObjectMESA (dynamic) */
+   /* _mesa_function_pool[28593]: CreateDebugObjectMESA (dynamic) */
    "\0"
    "glCreateDebugObjectMESA\0"
    "\0"
-   /* _mesa_function_pool[27772]: GetShaderiv (will be remapped) */
+   /* _mesa_function_pool[28619]: GetShaderiv (will be remapped) */
    "iip\0"
    "glGetShaderiv\0"
    "\0"
-   /* _mesa_function_pool[27791]: ClientWaitSync (will be remapped) */
+   /* _mesa_function_pool[28638]: ClientWaitSync (will be remapped) */
    "iii\0"
    "glClientWaitSync\0"
    "\0"
-   /* _mesa_function_pool[27813]: TexCoord4s (offset 124) */
+   /* _mesa_function_pool[28660]: TexCoord4s (offset 124) */
    "iiii\0"
    "glTexCoord4s\0"
    "\0"
-   /* _mesa_function_pool[27832]: TexCoord3sv (offset 117) */
+   /* _mesa_function_pool[28679]: TexCoord3sv (offset 117) */
    "p\0"
    "glTexCoord3sv\0"
    "\0"
-   /* _mesa_function_pool[27849]: BindFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[28696]: BindFragmentShaderATI (will be remapped) */
    "i\0"
    "glBindFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[27876]: PopAttrib (offset 218) */
+   /* _mesa_function_pool[28723]: PopAttrib (offset 218) */
    "\0"
    "glPopAttrib\0"
    "\0"
-   /* _mesa_function_pool[27890]: Fogfv (offset 154) */
+   /* _mesa_function_pool[28737]: Fogfv (offset 154) */
    "ip\0"
    "glFogfv\0"
    "\0"
-   /* _mesa_function_pool[27902]: UnmapBufferARB (will be remapped) */
+   /* _mesa_function_pool[28749]: UnmapBufferARB (will be remapped) */
    "i\0"
    "glUnmapBuffer\0"
    "glUnmapBufferARB\0"
    "\0"
-   /* _mesa_function_pool[27936]: InitNames (offset 197) */
+   /* _mesa_function_pool[28783]: InitNames (offset 197) */
    "\0"
    "glInitNames\0"
    "\0"
-   /* _mesa_function_pool[27950]: Normal3sv (offset 61) */
+   /* _mesa_function_pool[28797]: Normal3sv (offset 61) */
    "p\0"
    "glNormal3sv\0"
    "\0"
-   /* _mesa_function_pool[27965]: Minmax (offset 368) */
+   /* _mesa_function_pool[28812]: Minmax (offset 368) */
    "iii\0"
    "glMinmax\0"
    "glMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[27991]: TexCoord4d (offset 118) */
+   /* _mesa_function_pool[28838]: TexCoord4d (offset 118) */
    "dddd\0"
    "glTexCoord4d\0"
    "\0"
-   /* _mesa_function_pool[28010]: DeformationMap3dSGIX (dynamic) */
+   /* _mesa_function_pool[28857]: DeformationMap3dSGIX (dynamic) */
    "iddiiddiiddiip\0"
    "glDeformationMap3dSGIX\0"
    "\0"
-   /* _mesa_function_pool[28049]: TexCoord4f (offset 120) */
+   /* _mesa_function_pool[28896]: TexCoord4f (offset 120) */
    "ffff\0"
    "glTexCoord4f\0"
    "\0"
-   /* _mesa_function_pool[28068]: FogCoorddvEXT (will be remapped) */
+   /* _mesa_function_pool[28915]: FogCoorddvEXT (will be remapped) */
    "p\0"
    "glFogCoorddv\0"
    "glFogCoorddvEXT\0"
    "\0"
-   /* _mesa_function_pool[28100]: FinishTextureSUNX (dynamic) */
+   /* _mesa_function_pool[28947]: FinishTextureSUNX (dynamic) */
    "\0"
    "glFinishTextureSUNX\0"
    "\0"
-   /* _mesa_function_pool[28122]: GetFragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[28969]: GetFragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glGetFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[28152]: Binormal3fvEXT (dynamic) */
+   /* _mesa_function_pool[28999]: Binormal3fvEXT (dynamic) */
    "p\0"
    "glBinormal3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[28172]: GetBooleanv (offset 258) */
+   /* _mesa_function_pool[29019]: GetBooleanv (offset 258) */
    "ip\0"
    "glGetBooleanv\0"
    "\0"
-   /* _mesa_function_pool[28190]: ColorFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[29037]: ColorFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiiii\0"
    "glColorFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[28227]: Hint (offset 158) */
+   /* _mesa_function_pool[29074]: Hint (offset 158) */
    "ii\0"
    "glHint\0"
    "\0"
-   /* _mesa_function_pool[28238]: Color4dv (offset 28) */
+   /* _mesa_function_pool[29085]: Color4dv (offset 28) */
    "p\0"
    "glColor4dv\0"
    "\0"
-   /* _mesa_function_pool[28252]: VertexAttrib2svARB (will be remapped) */
+   /* _mesa_function_pool[29099]: VertexAttrib2svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2sv\0"
    "glVertexAttrib2svARB\0"
    "\0"
-   /* _mesa_function_pool[28295]: AreProgramsResidentNV (will be remapped) */
+   /* _mesa_function_pool[29142]: AreProgramsResidentNV (will be remapped) */
    "ipp\0"
    "glAreProgramsResidentNV\0"
    "\0"
-   /* _mesa_function_pool[28324]: WindowPos3svMESA (will be remapped) */
+   /* _mesa_function_pool[29171]: WindowPos3svMESA (will be remapped) */
    "p\0"
    "glWindowPos3sv\0"
    "glWindowPos3svARB\0"
    "glWindowPos3svMESA\0"
    "\0"
-   /* _mesa_function_pool[28379]: CopyColorSubTable (offset 347) */
+   /* _mesa_function_pool[29226]: CopyColorSubTable (offset 347) */
    "iiiii\0"
    "glCopyColorSubTable\0"
    "glCopyColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[28429]: WeightdvARB (dynamic) */
+   /* _mesa_function_pool[29276]: WeightdvARB (dynamic) */
    "ip\0"
    "glWeightdvARB\0"
    "\0"
-   /* _mesa_function_pool[28447]: DeleteRenderbuffersEXT (will be remapped) */
+   /* _mesa_function_pool[29294]: DeleteRenderbuffersEXT (will be remapped) */
    "ip\0"
    "glDeleteRenderbuffers\0"
    "glDeleteRenderbuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[28498]: VertexAttrib4NubvARB (will be remapped) */
+   /* _mesa_function_pool[29345]: VertexAttrib4NubvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nubv\0"
    "glVertexAttrib4NubvARB\0"
    "\0"
-   /* _mesa_function_pool[28545]: VertexAttrib3dvNV (will be remapped) */
+   /* _mesa_function_pool[29392]: VertexAttrib3dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3dvNV\0"
    "\0"
-   /* _mesa_function_pool[28569]: GetObjectParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[29416]: GetObjectParameterfvARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[28600]: Vertex4iv (offset 147) */
+   /* _mesa_function_pool[29447]: Vertex4iv (offset 147) */
    "p\0"
    "glVertex4iv\0"
    "\0"
-   /* _mesa_function_pool[28615]: GetProgramEnvParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[29462]: GetProgramEnvParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[28650]: TexCoord4dv (offset 119) */
+   /* _mesa_function_pool[29497]: TexCoord4dv (offset 119) */
    "p\0"
    "glTexCoord4dv\0"
    "\0"
-   /* _mesa_function_pool[28667]: LockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[29514]: LockArraysEXT (will be remapped) */
    "ii\0"
    "glLockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[28687]: Begin (offset 7) */
+   /* _mesa_function_pool[29534]: Begin (offset 7) */
    "i\0"
    "glBegin\0"
    "\0"
-   /* _mesa_function_pool[28698]: LightModeli (offset 165) */
+   /* _mesa_function_pool[29545]: LightModeli (offset 165) */
    "ii\0"
    "glLightModeli\0"
    "\0"
-   /* _mesa_function_pool[28716]: Rectfv (offset 89) */
+   /* _mesa_function_pool[29563]: Rectfv (offset 89) */
    "pp\0"
    "glRectfv\0"
    "\0"
-   /* _mesa_function_pool[28729]: LightModelf (offset 163) */
+   /* _mesa_function_pool[29576]: LightModelf (offset 163) */
    "if\0"
    "glLightModelf\0"
    "\0"
-   /* _mesa_function_pool[28747]: GetTexParameterfv (offset 282) */
+   /* _mesa_function_pool[29594]: GetTexParameterfv (offset 282) */
    "iip\0"
    "glGetTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[28772]: GetLightfv (offset 264) */
+   /* _mesa_function_pool[29619]: GetLightfv (offset 264) */
    "iip\0"
    "glGetLightfv\0"
    "\0"
-   /* _mesa_function_pool[28790]: PixelTransformParameterivEXT (dynamic) */
+   /* _mesa_function_pool[29637]: PixelTransformParameterivEXT (dynamic) */
    "iip\0"
    "glPixelTransformParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[28826]: BinormalPointerEXT (dynamic) */
+   /* _mesa_function_pool[29673]: BinormalPointerEXT (dynamic) */
    "iip\0"
    "glBinormalPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[28852]: VertexAttrib1dNV (will be remapped) */
+   /* _mesa_function_pool[29699]: VertexAttrib1dNV (will be remapped) */
    "id\0"
    "glVertexAttrib1dNV\0"
    "\0"
-   /* _mesa_function_pool[28875]: GetCombinerInputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[29722]: GetCombinerInputParameterivNV (will be remapped) */
    "iiiip\0"
    "glGetCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[28914]: Disable (offset 214) */
+   /* _mesa_function_pool[29761]: Disable (offset 214) */
    "i\0"
    "glDisable\0"
    "\0"
-   /* _mesa_function_pool[28927]: MultiTexCoord2fvARB (offset 387) */
+   /* _mesa_function_pool[29774]: MultiTexCoord2fvARB (offset 387) */
    "ip\0"
    "glMultiTexCoord2fv\0"
    "glMultiTexCoord2fvARB\0"
    "\0"
-   /* _mesa_function_pool[28972]: GetRenderbufferParameterivEXT (will be remapped) */
+   /* _mesa_function_pool[29819]: GetRenderbufferParameterivEXT (will be remapped) */
    "iip\0"
    "glGetRenderbufferParameteriv\0"
    "glGetRenderbufferParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[29038]: CombinerParameterivNV (will be remapped) */
+   /* _mesa_function_pool[29885]: CombinerParameterivNV (will be remapped) */
    "ip\0"
    "glCombinerParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[29066]: GenFragmentShadersATI (will be remapped) */
+   /* _mesa_function_pool[29913]: GenFragmentShadersATI (will be remapped) */
    "i\0"
    "glGenFragmentShadersATI\0"
    "\0"
-   /* _mesa_function_pool[29093]: DrawArrays (offset 310) */
+   /* _mesa_function_pool[29940]: DrawArrays (offset 310) */
    "iii\0"
    "glDrawArrays\0"
    "glDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[29127]: WeightuivARB (dynamic) */
+   /* _mesa_function_pool[29974]: WeightuivARB (dynamic) */
    "ip\0"
    "glWeightuivARB\0"
    "\0"
-   /* _mesa_function_pool[29146]: VertexAttrib2sARB (will be remapped) */
+   /* _mesa_function_pool[29993]: VertexAttrib2sARB (will be remapped) */
    "iii\0"
    "glVertexAttrib2s\0"
    "glVertexAttrib2sARB\0"
    "\0"
-   /* _mesa_function_pool[29188]: ColorMask (offset 210) */
+   /* _mesa_function_pool[30035]: ColorMask (offset 210) */
    "iiii\0"
    "glColorMask\0"
    "\0"
-   /* _mesa_function_pool[29206]: GenAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[30053]: GenAsyncMarkersSGIX (dynamic) */
    "i\0"
    "glGenAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[29231]: Tangent3svEXT (dynamic) */
+   /* _mesa_function_pool[30078]: Tangent3svEXT (dynamic) */
    "p\0"
    "glTangent3svEXT\0"
    "\0"
-   /* _mesa_function_pool[29250]: GetListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[30097]: GetListParameterivSGIX (dynamic) */
    "iip\0"
    "glGetListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[29280]: BindBufferARB (will be remapped) */
+   /* _mesa_function_pool[30127]: BindBufferARB (will be remapped) */
    "ii\0"
    "glBindBuffer\0"
    "glBindBufferARB\0"
    "\0"
-   /* _mesa_function_pool[29313]: GetInfoLogARB (will be remapped) */
+   /* _mesa_function_pool[30160]: GetInfoLogARB (will be remapped) */
    "iipp\0"
    "glGetInfoLogARB\0"
    "\0"
-   /* _mesa_function_pool[29335]: RasterPos4iv (offset 83) */
+   /* _mesa_function_pool[30182]: RasterPos4iv (offset 83) */
    "p\0"
    "glRasterPos4iv\0"
    "\0"
-   /* _mesa_function_pool[29353]: Enable (offset 215) */
+   /* _mesa_function_pool[30200]: Enable (offset 215) */
    "i\0"
    "glEnable\0"
    "\0"
-   /* _mesa_function_pool[29365]: LineStipple (offset 167) */
+   /* _mesa_function_pool[30212]: LineStipple (offset 167) */
    "ii\0"
    "glLineStipple\0"
    "\0"
-   /* _mesa_function_pool[29383]: VertexAttribs4svNV (will be remapped) */
+   /* _mesa_function_pool[30230]: VertexAttribs4svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4svNV\0"
    "\0"
-   /* _mesa_function_pool[29409]: EdgeFlagPointerListIBM (dynamic) */
+   /* _mesa_function_pool[30256]: EdgeFlagPointerListIBM (dynamic) */
    "ipi\0"
    "glEdgeFlagPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[29439]: UniformMatrix3x2fv (will be remapped) */
+   /* _mesa_function_pool[30286]: UniformMatrix3x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x2fv\0"
    "\0"
-   /* _mesa_function_pool[29466]: GetMinmaxParameterfv (offset 365) */
+   /* _mesa_function_pool[30313]: GetMinmaxParameterfv (offset 365) */
    "iip\0"
    "glGetMinmaxParameterfv\0"
    "glGetMinmaxParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[29520]: VertexAttrib1fvARB (will be remapped) */
+   /* _mesa_function_pool[30367]: VertexAttrib1fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1fv\0"
    "glVertexAttrib1fvARB\0"
    "\0"
-   /* _mesa_function_pool[29563]: GenBuffersARB (will be remapped) */
+   /* _mesa_function_pool[30410]: GenBuffersARB (will be remapped) */
    "ip\0"
    "glGenBuffers\0"
    "glGenBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[29596]: VertexAttribs1svNV (will be remapped) */
+   /* _mesa_function_pool[30443]: VertexAttribs1svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1svNV\0"
    "\0"
-   /* _mesa_function_pool[29622]: Vertex3fv (offset 137) */
+   /* _mesa_function_pool[30469]: Vertex3fv (offset 137) */
    "p\0"
    "glVertex3fv\0"
    "\0"
-   /* _mesa_function_pool[29637]: GetTexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[30484]: GetTexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[29668]: Binormal3bEXT (dynamic) */
+   /* _mesa_function_pool[30515]: Binormal3bEXT (dynamic) */
    "iii\0"
    "glBinormal3bEXT\0"
    "\0"
-   /* _mesa_function_pool[29689]: FragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[30536]: FragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[29719]: IsRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[30566]: IsRenderbufferEXT (will be remapped) */
    "i\0"
    "glIsRenderbuffer\0"
    "glIsRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[29759]: GenProgramsNV (will be remapped) */
+   /* _mesa_function_pool[30606]: GenProgramsNV (will be remapped) */
    "ip\0"
    "glGenProgramsARB\0"
    "glGenProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[29796]: VertexAttrib4dvNV (will be remapped) */
+   /* _mesa_function_pool[30643]: VertexAttrib4dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4dvNV\0"
    "\0"
-   /* _mesa_function_pool[29820]: EndFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[30667]: EndFragmentShaderATI (will be remapped) */
    "\0"
    "glEndFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[29845]: Binormal3iEXT (dynamic) */
+   /* _mesa_function_pool[30692]: Binormal3iEXT (dynamic) */
    "iii\0"
    "glBinormal3iEXT\0"
    "\0"
-   /* _mesa_function_pool[29866]: WindowPos2fMESA (will be remapped) */
+   /* _mesa_function_pool[30713]: WindowPos2fMESA (will be remapped) */
    "ff\0"
    "glWindowPos2f\0"
    "glWindowPos2fARB\0"
@@ -4381,410 +4467,426 @@ static const char _mesa_function_pool[] =
    ;
 
 /* these functions need to be remapped */
-static const struct {
-   GLint pool_index;
-   GLint remap_index;
-} MESA_remap_table_functions[] = {
+static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
    {  1461, AttachShader_remap_index },
-   {  8794, CreateProgram_remap_index },
-   { 20420, CreateShader_remap_index },
-   { 22750, DeleteProgram_remap_index },
-   { 16372, DeleteShader_remap_index },
-   { 20866, DetachShader_remap_index },
-   { 15896, GetAttachedShaders_remap_index },
+   {  8995, CreateProgram_remap_index },
+   { 21153, CreateShader_remap_index },
+   { 23466, DeleteProgram_remap_index },
+   { 16937, DeleteShader_remap_index },
+   { 21599, DetachShader_remap_index },
+   { 16461, GetAttachedShaders_remap_index },
    {  4275, GetProgramInfoLog_remap_index },
    {   361, GetProgramiv_remap_index },
-   {  5608, GetShaderInfoLog_remap_index },
-   { 27772, GetShaderiv_remap_index },
-   { 11879, IsProgram_remap_index },
-   { 10914, IsShader_remap_index },
-   {  8898, StencilFuncSeparate_remap_index },
+   {  5721, GetShaderInfoLog_remap_index },
+   { 28619, GetShaderiv_remap_index },
+   { 12198, IsProgram_remap_index },
+   { 11197, IsShader_remap_index },
+   {  9099, StencilFuncSeparate_remap_index },
    {  3487, StencilMaskSeparate_remap_index },
-   {  6684, StencilOpSeparate_remap_index },
-   { 19771, UniformMatrix2x3fv_remap_index },
+   {  6803, StencilOpSeparate_remap_index },
+   { 20478, UniformMatrix2x3fv_remap_index },
    {  2615, UniformMatrix2x4fv_remap_index },
-   { 29439, UniformMatrix3x2fv_remap_index },
-   { 27198, UniformMatrix3x4fv_remap_index },
-   { 14444, UniformMatrix4x2fv_remap_index },
+   { 30286, UniformMatrix3x2fv_remap_index },
+   { 28009, UniformMatrix3x4fv_remap_index },
+   { 14961, UniformMatrix4x2fv_remap_index },
    {  2937, UniformMatrix4x3fv_remap_index },
-   {  8812, LoadTransposeMatrixdARB_remap_index },
-   { 27501, LoadTransposeMatrixfARB_remap_index },
-   {  4848, MultTransposeMatrixdARB_remap_index },
-   { 21053, MultTransposeMatrixfARB_remap_index },
+   { 14622, DrawArraysInstanced_remap_index },
+   { 15725, DrawElementsInstanced_remap_index },
+   {  9013, LoadTransposeMatrixdARB_remap_index },
+   { 28348, LoadTransposeMatrixfARB_remap_index },
+   {  4904, MultTransposeMatrixdARB_remap_index },
+   { 21786, MultTransposeMatrixfARB_remap_index },
    {   172, SampleCoverageARB_remap_index },
-   {  5032, CompressedTexImage1DARB_remap_index },
-   { 21553, CompressedTexImage2DARB_remap_index },
+   {  5117, CompressedTexImage1DARB_remap_index },
+   { 22269, CompressedTexImage2DARB_remap_index },
    {  3550, CompressedTexImage3DARB_remap_index },
-   { 16188, CompressedTexSubImage1DARB_remap_index },
+   { 16753, CompressedTexSubImage1DARB_remap_index },
    {  1880, CompressedTexSubImage2DARB_remap_index },
-   { 18008, CompressedTexSubImage3DARB_remap_index },
-   { 25480, GetCompressedTexImageARB_remap_index },
+   { 18614, CompressedTexSubImage3DARB_remap_index },
+   { 26291, GetCompressedTexImageARB_remap_index },
    {  3395, DisableVertexAttribArrayARB_remap_index },
-   { 26810, EnableVertexAttribArrayARB_remap_index },
-   { 28615, GetProgramEnvParameterdvARB_remap_index },
-   { 20933, GetProgramEnvParameterfvARB_remap_index },
-   { 24510, GetProgramLocalParameterdvARB_remap_index },
-   {  7126, GetProgramLocalParameterfvARB_remap_index },
-   { 16279, GetProgramStringARB_remap_index },
-   { 24705, GetProgramivARB_remap_index },
-   { 18203, GetVertexAttribdvARB_remap_index },
-   { 14333, GetVertexAttribfvARB_remap_index },
-   {  8707, GetVertexAttribivARB_remap_index },
-   { 17084, ProgramEnvParameter4dARB_remap_index },
-   { 22523, ProgramEnvParameter4dvARB_remap_index },
-   { 14941, ProgramEnvParameter4fARB_remap_index },
-   {  7989, ProgramEnvParameter4fvARB_remap_index },
+   { 27621, EnableVertexAttribArrayARB_remap_index },
+   { 29462, GetProgramEnvParameterdvARB_remap_index },
+   { 21666, GetProgramEnvParameterfvARB_remap_index },
+   { 25290, GetProgramLocalParameterdvARB_remap_index },
+   {  7245, GetProgramLocalParameterfvARB_remap_index },
+   { 16844, GetProgramStringARB_remap_index },
+   { 25485, GetProgramivARB_remap_index },
+   { 18809, GetVertexAttribdvARB_remap_index },
+   { 14850, GetVertexAttribfvARB_remap_index },
+   {  8908, GetVertexAttribivARB_remap_index },
+   { 17690, ProgramEnvParameter4dARB_remap_index },
+   { 23239, ProgramEnvParameter4dvARB_remap_index },
+   { 15458, ProgramEnvParameter4fARB_remap_index },
+   {  8108, ProgramEnvParameter4fvARB_remap_index },
    {  3513, ProgramLocalParameter4dARB_remap_index },
-   { 11589, ProgramLocalParameter4dvARB_remap_index },
-   { 26289, ProgramLocalParameter4fARB_remap_index },
-   { 23068, ProgramLocalParameter4fvARB_remap_index },
-   { 25266, ProgramStringARB_remap_index },
-   { 17334, VertexAttrib1dARB_remap_index },
-   { 13987, VertexAttrib1dvARB_remap_index },
+   { 11908, ProgramLocalParameter4dvARB_remap_index },
+   { 27100, ProgramLocalParameter4fARB_remap_index },
+   { 23819, ProgramLocalParameter4fvARB_remap_index },
+   { 26071, ProgramStringARB_remap_index },
+   { 17940, VertexAttrib1dARB_remap_index },
+   { 14426, VertexAttrib1dvARB_remap_index },
    {  3688, VertexAttrib1fARB_remap_index },
-   { 29520, VertexAttrib1fvARB_remap_index },
-   {  6210, VertexAttrib1sARB_remap_index },
+   { 30367, VertexAttrib1fvARB_remap_index },
+   {  6329, VertexAttrib1sARB_remap_index },
    {  2054, VertexAttrib1svARB_remap_index },
-   { 13418, VertexAttrib2dARB_remap_index },
-   { 15515, VertexAttrib2dvARB_remap_index },
+   { 13857, VertexAttrib2dARB_remap_index },
+   { 16080, VertexAttrib2dvARB_remap_index },
    {  1480, VertexAttrib2fARB_remap_index },
-   { 15628, VertexAttrib2fvARB_remap_index },
-   { 29146, VertexAttrib2sARB_remap_index },
-   { 28252, VertexAttrib2svARB_remap_index },
-   { 10045, VertexAttrib3dARB_remap_index },
-   {  7692, VertexAttrib3dvARB_remap_index },
+   { 16193, VertexAttrib2fvARB_remap_index },
+   { 29993, VertexAttrib2sARB_remap_index },
+   { 29099, VertexAttrib2svARB_remap_index },
+   { 10282, VertexAttrib3dARB_remap_index },
+   {  7811, VertexAttrib3dvARB_remap_index },
    {  1567, VertexAttrib3fARB_remap_index },
-   { 20008, VertexAttrib3fvARB_remap_index },
-   { 25138, VertexAttrib3sARB_remap_index },
-   { 17945, VertexAttrib3svARB_remap_index },
+   { 20741, VertexAttrib3fvARB_remap_index },
+   { 25918, VertexAttrib3sARB_remap_index },
+   { 18551, VertexAttrib3svARB_remap_index },
    {  4301, VertexAttrib4NbvARB_remap_index },
-   { 15851, VertexAttrib4NivARB_remap_index },
-   { 19963, VertexAttrib4NsvARB_remap_index },
-   { 20885, VertexAttrib4NubARB_remap_index },
-   { 28498, VertexAttrib4NubvARB_remap_index },
-   { 16745, VertexAttrib4NuivARB_remap_index },
+   { 16416, VertexAttrib4NivARB_remap_index },
+   { 20696, VertexAttrib4NsvARB_remap_index },
+   { 21618, VertexAttrib4NubARB_remap_index },
+   { 29345, VertexAttrib4NubvARB_remap_index },
+   { 17351, VertexAttrib4NuivARB_remap_index },
    {  2810, VertexAttrib4NusvARB_remap_index },
-   {  9639, VertexAttrib4bvARB_remap_index },
-   { 23918, VertexAttrib4dARB_remap_index },
-   { 18928, VertexAttrib4dvARB_remap_index },
-   { 10152, VertexAttrib4fARB_remap_index },
-   { 10556, VertexAttrib4fvARB_remap_index },
-   {  9091, VertexAttrib4ivARB_remap_index },
-   { 15329, VertexAttrib4sARB_remap_index },
-   { 27687, VertexAttrib4svARB_remap_index },
-   { 14746, VertexAttrib4ubvARB_remap_index },
-   { 27134, VertexAttrib4uivARB_remap_index },
-   { 17756, VertexAttrib4usvARB_remap_index },
-   { 19645, VertexAttribPointerARB_remap_index },
-   { 29280, BindBufferARB_remap_index },
-   {  5923, BufferDataARB_remap_index },
+   {  9876, VertexAttrib4bvARB_remap_index },
+   { 24698, VertexAttrib4dARB_remap_index },
+   { 19573, VertexAttrib4dvARB_remap_index },
+   { 10389, VertexAttrib4fARB_remap_index },
+   { 10793, VertexAttrib4fvARB_remap_index },
+   {  9292, VertexAttrib4ivARB_remap_index },
+   { 15894, VertexAttrib4sARB_remap_index },
+   { 28534, VertexAttrib4svARB_remap_index },
+   { 15263, VertexAttrib4ubvARB_remap_index },
+   { 27945, VertexAttrib4uivARB_remap_index },
+   { 18362, VertexAttrib4usvARB_remap_index },
+   { 20327, VertexAttribPointerARB_remap_index },
+   { 30127, BindBufferARB_remap_index },
+   {  6036, BufferDataARB_remap_index },
    {  1382, BufferSubDataARB_remap_index },
-   { 27323, DeleteBuffersARB_remap_index },
-   { 29563, GenBuffersARB_remap_index },
-   { 15671, GetBufferParameterivARB_remap_index },
-   { 14893, GetBufferPointervARB_remap_index },
+   { 28134, DeleteBuffersARB_remap_index },
+   { 30410, GenBuffersARB_remap_index },
+   { 16236, GetBufferParameterivARB_remap_index },
+   { 15410, GetBufferPointervARB_remap_index },
    {  1335, GetBufferSubDataARB_remap_index },
-   { 27082, IsBufferARB_remap_index },
-   { 23523, MapBufferARB_remap_index },
-   { 27902, UnmapBufferARB_remap_index },
+   { 27893, IsBufferARB_remap_index },
+   { 24303, MapBufferARB_remap_index },
+   { 28749, UnmapBufferARB_remap_index },
    {   268, BeginQueryARB_remap_index },
-   { 17429, DeleteQueriesARB_remap_index },
-   { 10850, EndQueryARB_remap_index },
-   { 25959, GenQueriesARB_remap_index },
+   { 18035, DeleteQueriesARB_remap_index },
+   { 11087, EndQueryARB_remap_index },
+   { 26770, GenQueriesARB_remap_index },
    {  1772, GetQueryObjectivARB_remap_index },
-   { 15373, GetQueryObjectuivARB_remap_index },
+   { 15938, GetQueryObjectuivARB_remap_index },
    {  1624, GetQueryivARB_remap_index },
-   { 17663, IsQueryARB_remap_index },
-   {  7302, AttachObjectARB_remap_index },
-   { 16334, CompileShaderARB_remap_index },
+   { 18269, IsQueryARB_remap_index },
+   {  7421, AttachObjectARB_remap_index },
+   { 16899, CompileShaderARB_remap_index },
    {  2879, CreateProgramObjectARB_remap_index },
-   {  5868, CreateShaderObjectARB_remap_index },
-   { 12835, DeleteObjectARB_remap_index },
-   { 21327, DetachObjectARB_remap_index },
-   { 10628, GetActiveUniformARB_remap_index },
-   {  8410, GetAttachedObjectsARB_remap_index },
-   {  8689, GetHandleARB_remap_index },
-   { 29313, GetInfoLogARB_remap_index },
-   { 28569, GetObjectParameterfvARB_remap_index },
-   { 24384, GetObjectParameterivARB_remap_index },
-   { 25717, GetShaderSourceARB_remap_index },
-   { 24998, GetUniformLocationARB_remap_index },
-   { 21155, GetUniformfvARB_remap_index },
-   { 11211, GetUniformivARB_remap_index },
-   { 17801, LinkProgramARB_remap_index },
-   { 17859, ShaderSourceARB_remap_index },
-   {  6584, Uniform1fARB_remap_index },
-   { 26498, Uniform1fvARB_remap_index },
-   { 19614, Uniform1iARB_remap_index },
-   { 18617, Uniform1ivARB_remap_index },
+   {  5981, CreateShaderObjectARB_remap_index },
+   { 13274, DeleteObjectARB_remap_index },
+   { 22060, DetachObjectARB_remap_index },
+   { 10865, GetActiveUniformARB_remap_index },
+   {  8583, GetAttachedObjectsARB_remap_index },
+   {  8890, GetHandleARB_remap_index },
+   { 30160, GetInfoLogARB_remap_index },
+   { 29416, GetObjectParameterfvARB_remap_index },
+   { 25164, GetObjectParameterivARB_remap_index },
+   { 26528, GetShaderSourceARB_remap_index },
+   { 25778, GetUniformLocationARB_remap_index },
+   { 21888, GetUniformfvARB_remap_index },
+   { 11530, GetUniformivARB_remap_index },
+   { 18407, LinkProgramARB_remap_index },
+   { 18465, ShaderSourceARB_remap_index },
+   {  6703, Uniform1fARB_remap_index },
+   { 27309, Uniform1fvARB_remap_index },
+   { 20296, Uniform1iARB_remap_index },
+   { 19262, Uniform1ivARB_remap_index },
    {  2003, Uniform2fARB_remap_index },
-   { 12671, Uniform2fvARB_remap_index },
-   { 23410, Uniform2iARB_remap_index },
+   { 13110, Uniform2fvARB_remap_index },
+   { 24190, Uniform2iARB_remap_index },
    {  2123, Uniform2ivARB_remap_index },
-   { 16444, Uniform3fARB_remap_index },
-   {  8440, Uniform3fvARB_remap_index },
-   {  5542, Uniform3iARB_remap_index },
-   { 14999, Uniform3ivARB_remap_index },
-   { 16890, Uniform4fARB_remap_index },
-   { 21019, Uniform4fvARB_remap_index },
-   { 22202, Uniform4iARB_remap_index },
-   { 18169, Uniform4ivARB_remap_index },
-   {  7354, UniformMatrix2fvARB_remap_index },
+   { 17009, Uniform3fARB_remap_index },
+   {  8613, Uniform3fvARB_remap_index },
+   {  5627, Uniform3iARB_remap_index },
+   { 15516, Uniform3ivARB_remap_index },
+   { 17496, Uniform4fARB_remap_index },
+   { 21752, Uniform4fvARB_remap_index },
+   { 22918, Uniform4iARB_remap_index },
+   { 18775, Uniform4ivARB_remap_index },
+   {  7473, UniformMatrix2fvARB_remap_index },
    {    17, UniformMatrix3fvARB_remap_index },
    {  2475, UniformMatrix4fvARB_remap_index },
-   { 22635, UseProgramObjectARB_remap_index },
-   { 13106, ValidateProgramARB_remap_index },
-   { 18971, BindAttribLocationARB_remap_index },
+   { 23351, UseProgramObjectARB_remap_index },
+   { 13545, ValidateProgramARB_remap_index },
+   { 19616, BindAttribLocationARB_remap_index },
    {  4346, GetActiveAttribARB_remap_index },
-   { 14680, GetAttribLocationARB_remap_index },
-   { 26237, DrawBuffersARB_remap_index },
-   { 11694, RenderbufferStorageMultisample_remap_index },
-   { 16938, FlushMappedBufferRange_remap_index },
-   { 24801, MapBufferRange_remap_index },
-   { 14555, BindVertexArray_remap_index },
-   { 12965, GenVertexArrays_remap_index },
-   { 27012, CopyBufferSubData_remap_index },
-   { 27791, ClientWaitSync_remap_index },
+   { 15197, GetAttribLocationARB_remap_index },
+   { 27048, DrawBuffersARB_remap_index },
+   { 12013, RenderbufferStorageMultisample_remap_index },
+   { 12417, FramebufferTextureARB_remap_index },
+   { 23721, FramebufferTextureFaceARB_remap_index },
+   { 22209, ProgramParameteriARB_remap_index },
+   { 17544, FlushMappedBufferRange_remap_index },
+   { 25581, MapBufferRange_remap_index },
+   { 15072, BindVertexArray_remap_index },
+   { 13404, GenVertexArrays_remap_index },
+   { 27823, CopyBufferSubData_remap_index },
+   { 28638, ClientWaitSync_remap_index },
    {  2394, DeleteSync_remap_index },
-   {  6251, FenceSync_remap_index },
-   { 13477, GetInteger64v_remap_index },
-   { 20070, GetSynciv_remap_index },
-   { 26176, IsSync_remap_index },
-   {  8358, WaitSync_remap_index },
+   {  6370, FenceSync_remap_index },
+   { 13916, GetInteger64v_remap_index },
+   { 20803, GetSynciv_remap_index },
+   { 26987, IsSync_remap_index },
+   {  8531, WaitSync_remap_index },
    {  3363, DrawElementsBaseVertex_remap_index },
-   { 27255, DrawRangeElementsBaseVertex_remap_index },
-   { 23554, MultiDrawElementsBaseVertex_remap_index },
-   {  4711, PolygonOffsetEXT_remap_index },
-   { 20655, GetPixelTexGenParameterfvSGIS_remap_index },
+   { 28066, DrawRangeElementsBaseVertex_remap_index },
+   { 24334, MultiDrawElementsBaseVertex_remap_index },
+   {  4480, BindTransformFeedback_remap_index },
+   {  2906, DeleteTransformFeedbacks_remap_index },
+   {  5660, DrawTransformFeedback_remap_index },
+   {  8750, GenTransformFeedbacks_remap_index },
+   { 25961, IsTransformFeedback_remap_index },
+   { 23914, PauseTransformFeedback_remap_index },
+   {  4824, ResumeTransformFeedback_remap_index },
+   {  4739, PolygonOffsetEXT_remap_index },
+   { 21388, GetPixelTexGenParameterfvSGIS_remap_index },
    {  3895, GetPixelTexGenParameterivSGIS_remap_index },
-   { 20388, PixelTexGenParameterfSGIS_remap_index },
+   { 21121, PixelTexGenParameterfSGIS_remap_index },
    {   580, PixelTexGenParameterfvSGIS_remap_index },
-   { 11249, PixelTexGenParameteriSGIS_remap_index },
-   { 12242, PixelTexGenParameterivSGIS_remap_index },
-   { 14643, SampleMaskSGIS_remap_index },
-   { 17603, SamplePatternSGIS_remap_index },
-   { 23483, ColorPointerEXT_remap_index },
-   { 15558, EdgeFlagPointerEXT_remap_index },
-   {  5196, IndexPointerEXT_remap_index },
-   {  5276, NormalPointerEXT_remap_index },
-   { 14071, TexCoordPointerEXT_remap_index },
-   {  6046, VertexPointerEXT_remap_index },
+   { 11568, PixelTexGenParameteriSGIS_remap_index },
+   { 12591, PixelTexGenParameterivSGIS_remap_index },
+   { 15160, SampleMaskSGIS_remap_index },
+   { 18209, SamplePatternSGIS_remap_index },
+   { 24263, ColorPointerEXT_remap_index },
+   { 16123, EdgeFlagPointerEXT_remap_index },
+   {  5281, IndexPointerEXT_remap_index },
+   {  5361, NormalPointerEXT_remap_index },
+   { 14510, TexCoordPointerEXT_remap_index },
+   {  6159, VertexPointerEXT_remap_index },
    {  3165, PointParameterfEXT_remap_index },
-   {  6891, PointParameterfvEXT_remap_index },
-   { 28667, LockArraysEXT_remap_index },
-   { 13170, UnlockArraysEXT_remap_index },
-   {  7898, CullParameterdvEXT_remap_index },
-   { 10423, CullParameterfvEXT_remap_index },
+   {  7010, PointParameterfvEXT_remap_index },
+   { 29514, LockArraysEXT_remap_index },
+   { 13609, UnlockArraysEXT_remap_index },
+   {  8017, CullParameterdvEXT_remap_index },
+   { 10660, CullParameterfvEXT_remap_index },
    {  1151, SecondaryColor3bEXT_remap_index },
-   {  7050, SecondaryColor3bvEXT_remap_index },
-   {  9268, SecondaryColor3dEXT_remap_index },
-   { 22808, SecondaryColor3dvEXT_remap_index },
-   { 25047, SecondaryColor3fEXT_remap_index },
-   { 16124, SecondaryColor3fvEXT_remap_index },
+   {  7169, SecondaryColor3bvEXT_remap_index },
+   {  9469, SecondaryColor3dEXT_remap_index },
+   { 23524, SecondaryColor3dvEXT_remap_index },
+   { 25827, SecondaryColor3fEXT_remap_index },
+   { 16689, SecondaryColor3fvEXT_remap_index },
    {   426, SecondaryColor3iEXT_remap_index },
-   { 14381, SecondaryColor3ivEXT_remap_index },
-   {  8926, SecondaryColor3sEXT_remap_index },
-   { 27455, SecondaryColor3svEXT_remap_index },
-   { 24220, SecondaryColor3ubEXT_remap_index },
-   { 18862, SecondaryColor3ubvEXT_remap_index },
-   { 11444, SecondaryColor3uiEXT_remap_index },
-   { 20275, SecondaryColor3uivEXT_remap_index },
-   { 23020, SecondaryColor3usEXT_remap_index },
-   { 11517, SecondaryColor3usvEXT_remap_index },
-   { 10499, SecondaryColorPointerEXT_remap_index },
-   { 22869, MultiDrawArraysEXT_remap_index },
-   { 18552, MultiDrawElementsEXT_remap_index },
-   { 18747, FogCoordPointerEXT_remap_index },
+   { 14898, SecondaryColor3ivEXT_remap_index },
+   {  9127, SecondaryColor3sEXT_remap_index },
+   { 28302, SecondaryColor3svEXT_remap_index },
+   { 25000, SecondaryColor3ubEXT_remap_index },
+   { 19507, SecondaryColor3ubvEXT_remap_index },
+   { 11763, SecondaryColor3uiEXT_remap_index },
+   { 21008, SecondaryColor3uivEXT_remap_index },
+   { 23771, SecondaryColor3usEXT_remap_index },
+   { 11836, SecondaryColor3usvEXT_remap_index },
+   { 10736, SecondaryColorPointerEXT_remap_index },
+   { 23585, MultiDrawArraysEXT_remap_index },
+   { 19197, MultiDrawElementsEXT_remap_index },
+   { 19392, FogCoordPointerEXT_remap_index },
    {  4044, FogCoorddEXT_remap_index },
-   { 28068, FogCoorddvEXT_remap_index },
+   { 28915, FogCoorddvEXT_remap_index },
    {  4136, FogCoordfEXT_remap_index },
-   { 24143, FogCoordfvEXT_remap_index },
-   { 16842, PixelTexGenSGIX_remap_index },
-   { 24728, BlendFuncSeparateEXT_remap_index },
-   {  5958, FlushVertexArrayRangeNV_remap_index },
-   {  4660, VertexArrayRangeNV_remap_index },
-   { 25112, CombinerInputNV_remap_index },
+   { 24923, FogCoordfvEXT_remap_index },
+   { 17448, PixelTexGenSGIX_remap_index },
+   { 25508, BlendFuncSeparateEXT_remap_index },
+   {  6071, FlushVertexArrayRangeNV_remap_index },
+   {  4688, VertexArrayRangeNV_remap_index },
+   { 25892, CombinerInputNV_remap_index },
    {  1946, CombinerOutputNV_remap_index },
-   { 27608, CombinerParameterfNV_remap_index },
-   {  4580, CombinerParameterfvNV_remap_index },
-   { 19820, CombinerParameteriNV_remap_index },
-   { 29038, CombinerParameterivNV_remap_index },
-   {  6328, FinalCombinerInputNV_remap_index },
-   {  8755, GetCombinerInputParameterfvNV_remap_index },
-   { 28875, GetCombinerInputParameterivNV_remap_index },
-   {  6127, GetCombinerOutputParameterfvNV_remap_index },
-   { 12171, GetCombinerOutputParameterivNV_remap_index },
-   {  5703, GetFinalCombinerInputParameterfvNV_remap_index },
-   { 22074, GetFinalCombinerInputParameterivNV_remap_index },
-   { 11189, ResizeBuffersMESA_remap_index },
-   {  9872, WindowPos2dMESA_remap_index },
+   { 28455, CombinerParameterfNV_remap_index },
+   {  4608, CombinerParameterfvNV_remap_index },
+   { 20527, CombinerParameteriNV_remap_index },
+   { 29885, CombinerParameterivNV_remap_index },
+   {  6447, FinalCombinerInputNV_remap_index },
+   {  8956, GetCombinerInputParameterfvNV_remap_index },
+   { 29722, GetCombinerInputParameterivNV_remap_index },
+   { 12692, GetCombinerOutputParameterfvNV_remap_index },
+   { 12520, GetCombinerOutputParameterivNV_remap_index },
+   {  5816, GetFinalCombinerInputParameterfvNV_remap_index },
+   { 22790, GetFinalCombinerInputParameterivNV_remap_index },
+   { 11508, ResizeBuffersMESA_remap_index },
+   { 10109, WindowPos2dMESA_remap_index },
    {   944, WindowPos2dvMESA_remap_index },
-   { 29866, WindowPos2fMESA_remap_index },
-   {  6995, WindowPos2fvMESA_remap_index },
-   { 16071, WindowPos2iMESA_remap_index },
-   { 18076, WindowPos2ivMESA_remap_index },
-   { 18651, WindowPos2sMESA_remap_index },
-   {  4946, WindowPos2svMESA_remap_index },
-   {  6820, WindowPos3dMESA_remap_index },
-   { 12450, WindowPos3dvMESA_remap_index },
+   { 30713, WindowPos2fMESA_remap_index },
+   {  7114, WindowPos2fvMESA_remap_index },
+   { 16636, WindowPos2iMESA_remap_index },
+   { 18682, WindowPos2ivMESA_remap_index },
+   { 19296, WindowPos2sMESA_remap_index },
+   {  5031, WindowPos2svMESA_remap_index },
+   {  6939, WindowPos3dMESA_remap_index },
+   { 12838, WindowPos3dvMESA_remap_index },
    {   472, WindowPos3fMESA_remap_index },
-   { 13231, WindowPos3fvMESA_remap_index },
-   { 21369, WindowPos3iMESA_remap_index },
-   { 26957, WindowPos3ivMESA_remap_index },
-   { 16588, WindowPos3sMESA_remap_index },
-   { 28324, WindowPos3svMESA_remap_index },
-   {  9823, WindowPos4dMESA_remap_index },
-   { 15084, WindowPos4dvMESA_remap_index },
-   { 12409, WindowPos4fMESA_remap_index },
-   { 27362, WindowPos4fvMESA_remap_index },
-   { 27110, WindowPos4iMESA_remap_index },
-   { 11028, WindowPos4ivMESA_remap_index },
-   { 16721, WindowPos4sMESA_remap_index },
+   { 13670, WindowPos3fvMESA_remap_index },
+   { 22102, WindowPos3iMESA_remap_index },
+   { 27768, WindowPos3ivMESA_remap_index },
+   { 17154, WindowPos3sMESA_remap_index },
+   { 29171, WindowPos3svMESA_remap_index },
+   { 10060, WindowPos4dMESA_remap_index },
+   { 15601, WindowPos4dvMESA_remap_index },
+   { 12797, WindowPos4fMESA_remap_index },
+   { 28209, WindowPos4fvMESA_remap_index },
+   { 27921, WindowPos4iMESA_remap_index },
+   { 11311, WindowPos4ivMESA_remap_index },
+   { 17327, WindowPos4sMESA_remap_index },
    {  2857, WindowPos4svMESA_remap_index },
-   { 12210, MultiModeDrawArraysIBM_remap_index },
-   { 25830, MultiModeDrawElementsIBM_remap_index },
-   { 10878, DeleteFencesNV_remap_index },
-   { 24959, FinishFenceNV_remap_index },
+   { 12559, MultiModeDrawArraysIBM_remap_index },
+   { 26641, MultiModeDrawElementsIBM_remap_index },
+   { 11115, DeleteFencesNV_remap_index },
+   { 25739, FinishFenceNV_remap_index },
    {  3287, GenFencesNV_remap_index },
-   { 15064, GetFenceivNV_remap_index },
-   {  7287, IsFenceNV_remap_index },
-   { 12098, SetFenceNV_remap_index },
+   { 15581, GetFenceivNV_remap_index },
+   {  7406, IsFenceNV_remap_index },
+   { 12447, SetFenceNV_remap_index },
    {  3744, TestFenceNV_remap_index },
-   { 28295, AreProgramsResidentNV_remap_index },
-   { 27650, BindProgramNV_remap_index },
-   { 23103, DeleteProgramsNV_remap_index },
-   { 19080, ExecuteProgramNV_remap_index },
-   { 29759, GenProgramsNV_remap_index },
-   { 20734, GetProgramParameterdvNV_remap_index },
-   {  9330, GetProgramParameterfvNV_remap_index },
-   { 23457, GetProgramStringNV_remap_index },
-   { 21763, GetProgramivNV_remap_index },
-   { 20968, GetTrackMatrixivNV_remap_index },
-   { 23253, GetVertexAttribPointervNV_remap_index },
-   { 22007, GetVertexAttribdvNV_remap_index },
-   { 16561, GetVertexAttribfvNV_remap_index },
-   { 16252, GetVertexAttribivNV_remap_index },
-   { 16968, IsProgramNV_remap_index },
-   {  8336, LoadProgramNV_remap_index },
-   { 24824, ProgramParameters4dvNV_remap_index },
-   { 21693, ProgramParameters4fvNV_remap_index },
-   { 18380, RequestResidentProgramsNV_remap_index },
-   { 19798, TrackMatrixNV_remap_index },
-   { 28852, VertexAttrib1dNV_remap_index },
-   { 12039, VertexAttrib1dvNV_remap_index },
-   { 25362, VertexAttrib1fNV_remap_index },
+   { 29142, AreProgramsResidentNV_remap_index },
+   { 28497, BindProgramNV_remap_index },
+   { 23854, DeleteProgramsNV_remap_index },
+   { 19725, ExecuteProgramNV_remap_index },
+   { 30606, GenProgramsNV_remap_index },
+   { 21467, GetProgramParameterdvNV_remap_index },
+   {  9531, GetProgramParameterfvNV_remap_index },
+   { 24237, GetProgramStringNV_remap_index },
+   { 22479, GetProgramivNV_remap_index },
+   { 21701, GetTrackMatrixivNV_remap_index },
+   { 24031, GetVertexAttribPointervNV_remap_index },
+   { 22723, GetVertexAttribdvNV_remap_index },
+   {  8426, GetVertexAttribfvNV_remap_index },
+   { 16817, GetVertexAttribivNV_remap_index },
+   { 17574, IsProgramNV_remap_index },
+   {  8509, LoadProgramNV_remap_index },
+   { 25604, ProgramParameters4dvNV_remap_index },
+   { 22409, ProgramParameters4fvNV_remap_index },
+   { 18986, RequestResidentProgramsNV_remap_index },
+   { 20505, TrackMatrixNV_remap_index },
+   { 29699, VertexAttrib1dNV_remap_index },
+   { 12358, VertexAttrib1dvNV_remap_index },
+   { 26173, VertexAttrib1fNV_remap_index },
    {  2245, VertexAttrib1fvNV_remap_index },
-   { 27419, VertexAttrib1sNV_remap_index },
-   { 13304, VertexAttrib1svNV_remap_index },
+   { 28266, VertexAttrib1sNV_remap_index },
+   { 13743, VertexAttrib1svNV_remap_index },
    {  4251, VertexAttrib2dNV_remap_index },
-   { 11954, VertexAttrib2dvNV_remap_index },
-   { 17835, VertexAttrib2fNV_remap_index },
-   { 11565, VertexAttrib2fvNV_remap_index },
-   {  5106, VertexAttrib2sNV_remap_index },
-   { 16642, VertexAttrib2svNV_remap_index },
-   { 10020, VertexAttrib3dNV_remap_index },
-   { 28545, VertexAttrib3dvNV_remap_index },
-   {  9142, VertexAttrib3fNV_remap_index },
-   { 22034, VertexAttrib3fvNV_remap_index },
-   { 25337, VertexAttrib3sNV_remap_index },
-   { 20995, VertexAttrib3svNV_remap_index },
-   { 25804, VertexAttrib4dNV_remap_index },
-   { 29796, VertexAttrib4dvNV_remap_index },
+   { 12273, VertexAttrib2dvNV_remap_index },
+   { 18441, VertexAttrib2fNV_remap_index },
+   { 11884, VertexAttrib2fvNV_remap_index },
+   {  5191, VertexAttrib2sNV_remap_index },
+   { 17208, VertexAttrib2svNV_remap_index },
+   { 10257, VertexAttrib3dNV_remap_index },
+   { 29392, VertexAttrib3dvNV_remap_index },
+   {  9343, VertexAttrib3fNV_remap_index },
+   { 22750, VertexAttrib3fvNV_remap_index },
+   { 20382, VertexAttrib3sNV_remap_index },
+   { 21728, VertexAttrib3svNV_remap_index },
+   { 26615, VertexAttrib4dNV_remap_index },
+   { 30643, VertexAttrib4dvNV_remap_index },
    {  3945, VertexAttrib4fNV_remap_index },
-   {  8386, VertexAttrib4fvNV_remap_index },
-   { 23802, VertexAttrib4sNV_remap_index },
+   {  8559, VertexAttrib4fvNV_remap_index },
+   { 24582, VertexAttrib4sNV_remap_index },
    {  1293, VertexAttrib4svNV_remap_index },
    {  4409, VertexAttrib4ubNV_remap_index },
    {   734, VertexAttrib4ubvNV_remap_index },
-   { 19260, VertexAttribPointerNV_remap_index },
+   { 19905, VertexAttribPointerNV_remap_index },
    {  2097, VertexAttribs1dvNV_remap_index },
-   { 16666, VertexAttribs1fvNV_remap_index },
-   { 29596, VertexAttribs1svNV_remap_index },
-   {  9167, VertexAttribs2dvNV_remap_index },
-   { 22596, VertexAttribs2fvNV_remap_index },
-   { 15584, VertexAttribs2svNV_remap_index },
-   {  4608, VertexAttribs3dvNV_remap_index },
+   { 24119, VertexAttribs1fvNV_remap_index },
+   { 30443, VertexAttribs1svNV_remap_index },
+   {  9368, VertexAttribs2dvNV_remap_index },
+   { 23312, VertexAttribs2fvNV_remap_index },
+   { 16149, VertexAttribs2svNV_remap_index },
+   {  4636, VertexAttribs3dvNV_remap_index },
    {  1977, VertexAttribs3fvNV_remap_index },
-   { 26705, VertexAttribs3svNV_remap_index },
-   { 23892, VertexAttribs4dvNV_remap_index },
-   {  4634, VertexAttribs4fvNV_remap_index },
-   { 29383, VertexAttribs4svNV_remap_index },
-   { 26453, VertexAttribs4ubvNV_remap_index },
-   { 23962, GetTexBumpParameterfvATI_remap_index },
-   { 29637, GetTexBumpParameterivATI_remap_index },
-   { 16306, TexBumpParameterfvATI_remap_index },
-   { 18251, TexBumpParameterivATI_remap_index },
-   { 13850, AlphaFragmentOp1ATI_remap_index },
-   {  9682, AlphaFragmentOp2ATI_remap_index },
-   { 21950, AlphaFragmentOp3ATI_remap_index },
-   { 26632, BeginFragmentShaderATI_remap_index },
-   { 27849, BindFragmentShaderATI_remap_index },
-   { 21124, ColorFragmentOp1ATI_remap_index },
+   { 27516, VertexAttribs3svNV_remap_index },
+   { 24672, VertexAttribs4dvNV_remap_index },
+   {  4662, VertexAttribs4fvNV_remap_index },
+   { 30230, VertexAttribs4svNV_remap_index },
+   { 27264, VertexAttribs4ubvNV_remap_index },
+   { 24742, GetTexBumpParameterfvATI_remap_index },
+   { 30484, GetTexBumpParameterivATI_remap_index },
+   { 16871, TexBumpParameterfvATI_remap_index },
+   { 18857, TexBumpParameterivATI_remap_index },
+   { 14289, AlphaFragmentOp1ATI_remap_index },
+   {  9919, AlphaFragmentOp2ATI_remap_index },
+   { 22666, AlphaFragmentOp3ATI_remap_index },
+   { 27443, BeginFragmentShaderATI_remap_index },
+   { 28696, BindFragmentShaderATI_remap_index },
+   { 21857, ColorFragmentOp1ATI_remap_index },
    {  3823, ColorFragmentOp2ATI_remap_index },
-   { 28190, ColorFragmentOp3ATI_remap_index },
-   {  4753, DeleteFragmentShaderATI_remap_index },
-   { 29820, EndFragmentShaderATI_remap_index },
-   { 29066, GenFragmentShadersATI_remap_index },
-   { 22727, PassTexCoordATI_remap_index },
-   {  6026, SampleMapATI_remap_index },
-   {  5799, SetFragmentShaderConstantATI_remap_index },
+   { 29037, ColorFragmentOp3ATI_remap_index },
+   {  4781, DeleteFragmentShaderATI_remap_index },
+   { 30667, EndFragmentShaderATI_remap_index },
+   { 29913, GenFragmentShadersATI_remap_index },
+   { 23443, PassTexCoordATI_remap_index },
+   {  6139, SampleMapATI_remap_index },
+   {  5912, SetFragmentShaderConstantATI_remap_index },
    {   319, PointParameteriNV_remap_index },
-   { 12611, PointParameterivNV_remap_index },
-   { 25643, ActiveStencilFaceEXT_remap_index },
-   { 24484, BindVertexArrayAPPLE_remap_index },
+   { 12999, PointParameterivNV_remap_index },
+   { 26454, ActiveStencilFaceEXT_remap_index },
+   { 25264, BindVertexArrayAPPLE_remap_index },
    {  2522, DeleteVertexArraysAPPLE_remap_index },
-   { 15923, GenVertexArraysAPPLE_remap_index },
-   { 20799, IsVertexArrayAPPLE_remap_index },
+   { 16488, GenVertexArraysAPPLE_remap_index },
+   { 21532, IsVertexArrayAPPLE_remap_index },
    {   775, GetProgramNamedParameterdvNV_remap_index },
    {  3128, GetProgramNamedParameterfvNV_remap_index },
-   { 23993, ProgramNamedParameter4dNV_remap_index },
-   { 12886, ProgramNamedParameter4dvNV_remap_index },
-   {  7923, ProgramNamedParameter4fNV_remap_index },
-   { 10464, ProgramNamedParameter4fvNV_remap_index },
-   { 21672, DepthBoundsEXT_remap_index },
+   { 24773, ProgramNamedParameter4dNV_remap_index },
+   { 13325, ProgramNamedParameter4dvNV_remap_index },
+   {  8042, ProgramNamedParameter4fNV_remap_index },
+   { 10701, ProgramNamedParameter4fvNV_remap_index },
+   { 22388, DepthBoundsEXT_remap_index },
    {  1043, BlendEquationSeparateEXT_remap_index },
-   { 13005, BindFramebufferEXT_remap_index },
-   { 22914, BindRenderbufferEXT_remap_index },
-   {  8605, CheckFramebufferStatusEXT_remap_index },
-   { 20089, DeleteFramebuffersEXT_remap_index },
-   { 28447, DeleteRenderbuffersEXT_remap_index },
-   { 11978, FramebufferRenderbufferEXT_remap_index },
-   { 12115, FramebufferTexture1DEXT_remap_index },
-   { 10258, FramebufferTexture2DEXT_remap_index },
-   {  9925, FramebufferTexture3DEXT_remap_index },
-   { 20691, GenFramebuffersEXT_remap_index },
-   { 15470, GenRenderbuffersEXT_remap_index },
-   {  5745, GenerateMipmapEXT_remap_index },
-   { 19320, GetFramebufferAttachmentParameterivEXT_remap_index },
-   { 28972, GetRenderbufferParameterivEXT_remap_index },
-   { 18131, IsFramebufferEXT_remap_index },
-   { 29719, IsRenderbufferEXT_remap_index },
-   {  7234, RenderbufferStorageEXT_remap_index },
+   { 13444, BindFramebufferEXT_remap_index },
+   { 23630, BindRenderbufferEXT_remap_index },
+   {  8806, CheckFramebufferStatusEXT_remap_index },
+   { 20822, DeleteFramebuffersEXT_remap_index },
+   { 29294, DeleteRenderbuffersEXT_remap_index },
+   { 12297, FramebufferRenderbufferEXT_remap_index },
+   { 12464, FramebufferTexture1DEXT_remap_index },
+   { 10495, FramebufferTexture2DEXT_remap_index },
+   { 10162, FramebufferTexture3DEXT_remap_index },
+   { 21424, GenFramebuffersEXT_remap_index },
+   { 16035, GenRenderbuffersEXT_remap_index },
+   {  5858, GenerateMipmapEXT_remap_index },
+   { 20002, GetFramebufferAttachmentParameterivEXT_remap_index },
+   { 29819, GetRenderbufferParameterivEXT_remap_index },
+   { 18737, IsFramebufferEXT_remap_index },
+   { 30566, IsRenderbufferEXT_remap_index },
+   {  7353, RenderbufferStorageEXT_remap_index },
    {   651, BlitFramebufferEXT_remap_index },
-   { 12705, BufferParameteriAPPLE_remap_index },
-   { 17000, FlushMappedBufferRangeAPPLE_remap_index },
+   { 13144, BufferParameteriAPPLE_remap_index },
+   { 17606, FlushMappedBufferRangeAPPLE_remap_index },
    {  2701, FramebufferTextureLayerEXT_remap_index },
-   {  8307, ColorMaskIndexedEXT_remap_index },
-   { 23341, DisableIndexedEXT_remap_index },
-   { 23649, EnableIndexedEXT_remap_index },
-   { 19291, GetBooleanIndexedvEXT_remap_index },
-   {  9715, GetIntegerIndexedvEXT_remap_index },
-   { 20165, IsEnabledIndexedEXT_remap_index },
+   {  4956, ColorMaskIndexedEXT_remap_index },
+   { 17232, DisableIndexedEXT_remap_index },
+   { 24429, EnableIndexedEXT_remap_index },
+   { 19973, GetBooleanIndexedvEXT_remap_index },
+   {  9952, GetIntegerIndexedvEXT_remap_index },
+   { 20898, IsEnabledIndexedEXT_remap_index },
    {  4074, BeginConditionalRenderNV_remap_index },
-   { 22700, EndConditionalRenderNV_remap_index },
-   { 26354, ProvokingVertexEXT_remap_index },
-   {  9551, GetTexParameterPointervAPPLE_remap_index },
+   { 23416, EndConditionalRenderNV_remap_index },
+   {  8453, BeginTransformFeedbackEXT_remap_index },
+   { 17256, BindBufferBaseEXT_remap_index },
+   { 17126, BindBufferOffsetEXT_remap_index },
+   { 11136, BindBufferRangeEXT_remap_index },
+   { 13059, EndTransformFeedbackEXT_remap_index },
+   {  9804, GetTransformFeedbackVaryingEXT_remap_index },
+   { 19042, TransformFeedbackVaryingsEXT_remap_index },
+   { 27165, ProvokingVertexEXT_remap_index },
+   {  9752, GetTexParameterPointervAPPLE_remap_index },
    {  4436, TextureRangeAPPLE_remap_index },
-   { 10330, GetObjectParameterivAPPLE_remap_index },
-   { 17575, ObjectPurgeableAPPLE_remap_index },
-   {  4900, ObjectUnpurgeableAPPLE_remap_index },
-   { 25669, StencilFuncSeparateATI_remap_index },
-   { 15990, ProgramEnvParameters4fvEXT_remap_index },
-   { 15208, ProgramLocalParameters4fvEXT_remap_index },
-   { 12539, GetQueryObjecti64vEXT_remap_index },
-   {  9193, GetQueryObjectui64vEXT_remap_index },
-   { 21193, EGLImageTargetRenderbufferStorageOES_remap_index },
-   { 10817, EGLImageTargetTexture2DOES_remap_index },
+   { 10567, GetObjectParameterivAPPLE_remap_index },
+   { 18181, ObjectPurgeableAPPLE_remap_index },
+   {  4985, ObjectUnpurgeableAPPLE_remap_index },
+   { 26480, StencilFuncSeparateATI_remap_index },
+   { 16555, ProgramEnvParameters4fvEXT_remap_index },
+   { 19936, ProgramLocalParameters4fvEXT_remap_index },
+   { 12927, GetQueryObjecti64vEXT_remap_index },
+   {  9394, GetQueryObjectui64vEXT_remap_index },
+   { 21926, EGLImageTargetRenderbufferStorageOES_remap_index },
+   { 11054, EGLImageTargetTexture2DOES_remap_index },
    {    -1, -1 }
 };
 
@@ -4793,108 +4895,108 @@ static const struct gl_function_remap MESA_alt_functions[] = {
    /* from GL_EXT_blend_color */
    {  2440, _gloffset_BlendColor },
    /* from GL_EXT_blend_minmax */
-   {  9982, _gloffset_BlendEquation },
+   { 10219, _gloffset_BlendEquation },
    /* from GL_EXT_color_subtable */
-   { 15106, _gloffset_ColorSubTable },
-   { 28379, _gloffset_CopyColorSubTable },
+   { 15623, _gloffset_ColorSubTable },
+   { 29226, _gloffset_CopyColorSubTable },
    /* from GL_EXT_convolution */
    {   213, _gloffset_ConvolutionFilter1D },
    {  2284, _gloffset_CopyConvolutionFilter1D },
    {  3624, _gloffset_GetConvolutionParameteriv },
-   {  7583, _gloffset_ConvolutionFilter2D },
-   {  7749, _gloffset_ConvolutionParameteriv },
-   {  8209, _gloffset_ConvolutionParameterfv },
-   { 18279, _gloffset_GetSeparableFilter },
-   { 21423, _gloffset_SeparableFilter2D },
-   { 22252, _gloffset_ConvolutionParameteri },
-   { 22375, _gloffset_ConvolutionParameterf },
-   { 23828, _gloffset_GetConvolutionParameterfv },
-   { 24650, _gloffset_GetConvolutionFilter },
-   { 26894, _gloffset_CopyConvolutionFilter2D },
+   {  7702, _gloffset_ConvolutionFilter2D },
+   {  7868, _gloffset_ConvolutionParameteriv },
+   {  8328, _gloffset_ConvolutionParameterfv },
+   { 18885, _gloffset_GetSeparableFilter },
+   { 22156, _gloffset_SeparableFilter2D },
+   { 22968, _gloffset_ConvolutionParameteri },
+   { 23091, _gloffset_ConvolutionParameterf },
+   { 24608, _gloffset_GetConvolutionParameterfv },
+   { 25430, _gloffset_GetConvolutionFilter },
+   { 27705, _gloffset_CopyConvolutionFilter2D },
    /* from GL_EXT_copy_texture */
-   { 13364, _gloffset_CopyTexSubImage3D },
-   { 14846, _gloffset_CopyTexImage2D },
-   { 21860, _gloffset_CopyTexImage1D },
-   { 24331, _gloffset_CopyTexSubImage2D },
-   { 26532, _gloffset_CopyTexSubImage1D },
+   { 13803, _gloffset_CopyTexSubImage3D },
+   { 15363, _gloffset_CopyTexImage2D },
+   { 22576, _gloffset_CopyTexImage1D },
+   { 25111, _gloffset_CopyTexSubImage2D },
+   { 27343, _gloffset_CopyTexSubImage1D },
    /* from GL_EXT_draw_range_elements */
-   {  8492, _gloffset_DrawRangeElements },
+   {  8665, _gloffset_DrawRangeElements },
    /* from GL_EXT_histogram */
    {   812, _gloffset_Histogram },
    {  3088, _gloffset_ResetHistogram },
-   {  8864, _gloffset_GetMinmax },
-   { 13698, _gloffset_GetHistogramParameterfv },
-   { 21785, _gloffset_GetMinmaxParameteriv },
-   { 23718, _gloffset_ResetMinmax },
-   { 24547, _gloffset_GetHistogramParameteriv },
-   { 25603, _gloffset_GetHistogram },
-   { 27965, _gloffset_Minmax },
-   { 29466, _gloffset_GetMinmaxParameterfv },
+   {  9065, _gloffset_GetMinmax },
+   { 14137, _gloffset_GetHistogramParameterfv },
+   { 22501, _gloffset_GetMinmaxParameteriv },
+   { 24498, _gloffset_ResetMinmax },
+   { 25327, _gloffset_GetHistogramParameteriv },
+   { 26414, _gloffset_GetHistogram },
+   { 28812, _gloffset_Minmax },
+   { 30313, _gloffset_GetMinmaxParameterfv },
    /* from GL_EXT_paletted_texture */
-   {  7445, _gloffset_ColorTable },
-   { 13544, _gloffset_GetColorTable },
-   { 20438, _gloffset_GetColorTableParameterfv },
-   { 22431, _gloffset_GetColorTableParameteriv },
+   {  7564, _gloffset_ColorTable },
+   { 13983, _gloffset_GetColorTable },
+   { 21171, _gloffset_GetColorTableParameterfv },
+   { 23147, _gloffset_GetColorTableParameteriv },
    /* from GL_EXT_subtexture */
-   {  6166, _gloffset_TexSubImage1D },
-   {  9478, _gloffset_TexSubImage2D },
+   {  6285, _gloffset_TexSubImage1D },
+   {  9679, _gloffset_TexSubImage2D },
    /* from GL_EXT_texture3D */
    {  1658, _gloffset_TexImage3D },
-   { 20207, _gloffset_TexSubImage3D },
+   { 20940, _gloffset_TexSubImage3D },
    /* from GL_EXT_texture_object */
    {  2964, _gloffset_PrioritizeTextures },
-   {  6615, _gloffset_AreTexturesResident },
-   { 12063, _gloffset_GenTextures },
-   { 14030, _gloffset_DeleteTextures },
-   { 17281, _gloffset_IsTexture },
-   { 26597, _gloffset_BindTexture },
+   {  6734, _gloffset_AreTexturesResident },
+   { 12382, _gloffset_GenTextures },
+   { 14469, _gloffset_DeleteTextures },
+   { 17887, _gloffset_IsTexture },
+   { 27408, _gloffset_BindTexture },
    /* from GL_EXT_vertex_array */
-   { 21612, _gloffset_ArrayElement },
-   { 27553, _gloffset_GetPointerv },
-   { 29093, _gloffset_DrawArrays },
+   { 22328, _gloffset_ArrayElement },
+   { 28400, _gloffset_GetPointerv },
+   { 29940, _gloffset_DrawArrays },
    /* from GL_SGI_color_table */
-   {  6733, _gloffset_ColorTableParameteriv },
-   {  7445, _gloffset_ColorTable },
-   { 13544, _gloffset_GetColorTable },
-   { 13654, _gloffset_CopyColorTable },
-   { 17142, _gloffset_ColorTableParameterfv },
-   { 20438, _gloffset_GetColorTableParameterfv },
-   { 22431, _gloffset_GetColorTableParameteriv },
+   {  6852, _gloffset_ColorTableParameteriv },
+   {  7564, _gloffset_ColorTable },
+   { 13983, _gloffset_GetColorTable },
+   { 14093, _gloffset_CopyColorTable },
+   { 17748, _gloffset_ColorTableParameterfv },
+   { 21171, _gloffset_GetColorTableParameterfv },
+   { 23147, _gloffset_GetColorTableParameteriv },
    /* from GL_VERSION_1_3 */
    {   381, _gloffset_MultiTexCoord3sARB },
    {   613, _gloffset_ActiveTextureARB },
    {  3761, _gloffset_MultiTexCoord1fvARB },
-   {  5301, _gloffset_MultiTexCoord3dARB },
-   {  5346, _gloffset_MultiTexCoord2iARB },
-   {  5470, _gloffset_MultiTexCoord2svARB },
-   {  7401, _gloffset_MultiTexCoord2fARB },
-   {  9223, _gloffset_MultiTexCoord3fvARB },
-   {  9744, _gloffset_MultiTexCoord4sARB },
-   { 10378, _gloffset_MultiTexCoord2dvARB },
-   { 10760, _gloffset_MultiTexCoord1svARB },
-   { 11050, _gloffset_MultiTexCoord3svARB },
-   { 11111, _gloffset_MultiTexCoord4iARB },
-   { 11834, _gloffset_MultiTexCoord3iARB },
-   { 12568, _gloffset_MultiTexCoord1dARB },
-   { 12734, _gloffset_MultiTexCoord3dvARB },
-   { 13898, _gloffset_MultiTexCoord3ivARB },
-   { 13943, _gloffset_MultiTexCoord2sARB },
-   { 15163, _gloffset_MultiTexCoord4ivARB },
-   { 16792, _gloffset_ClientActiveTextureARB },
-   { 19036, _gloffset_MultiTexCoord2dARB },
-   { 19440, _gloffset_MultiTexCoord4dvARB },
-   { 19726, _gloffset_MultiTexCoord4fvARB },
-   { 20579, _gloffset_MultiTexCoord3fARB },
-   { 22959, _gloffset_MultiTexCoord4dARB },
-   { 23163, _gloffset_MultiTexCoord1sARB },
-   { 23365, _gloffset_MultiTexCoord1dvARB },
-   { 24175, _gloffset_MultiTexCoord1ivARB },
-   { 24268, _gloffset_MultiTexCoord2ivARB },
-   { 24607, _gloffset_MultiTexCoord1iARB },
-   { 25878, _gloffset_MultiTexCoord4svARB },
-   { 26396, _gloffset_MultiTexCoord1fARB },
-   { 26659, _gloffset_MultiTexCoord4fARB },
-   { 28927, _gloffset_MultiTexCoord2fvARB },
+   {  5386, _gloffset_MultiTexCoord3dARB },
+   {  5431, _gloffset_MultiTexCoord2iARB },
+   {  5555, _gloffset_MultiTexCoord2svARB },
+   {  7520, _gloffset_MultiTexCoord2fARB },
+   {  9424, _gloffset_MultiTexCoord3fvARB },
+   {  9981, _gloffset_MultiTexCoord4sARB },
+   { 10615, _gloffset_MultiTexCoord2dvARB },
+   { 10997, _gloffset_MultiTexCoord1svARB },
+   { 11369, _gloffset_MultiTexCoord3svARB },
+   { 11430, _gloffset_MultiTexCoord4iARB },
+   { 12153, _gloffset_MultiTexCoord3iARB },
+   { 12956, _gloffset_MultiTexCoord1dARB },
+   { 13173, _gloffset_MultiTexCoord3dvARB },
+   { 14337, _gloffset_MultiTexCoord3ivARB },
+   { 14382, _gloffset_MultiTexCoord2sARB },
+   { 15680, _gloffset_MultiTexCoord4ivARB },
+   { 17398, _gloffset_ClientActiveTextureARB },
+   { 19681, _gloffset_MultiTexCoord2dARB },
+   { 20122, _gloffset_MultiTexCoord4dvARB },
+   { 20433, _gloffset_MultiTexCoord4fvARB },
+   { 21312, _gloffset_MultiTexCoord3fARB },
+   { 23675, _gloffset_MultiTexCoord4dARB },
+   { 23941, _gloffset_MultiTexCoord1sARB },
+   { 24145, _gloffset_MultiTexCoord1dvARB },
+   { 24955, _gloffset_MultiTexCoord1ivARB },
+   { 25048, _gloffset_MultiTexCoord2ivARB },
+   { 25387, _gloffset_MultiTexCoord1iARB },
+   { 26689, _gloffset_MultiTexCoord4svARB },
+   { 27207, _gloffset_MultiTexCoord1fARB },
+   { 27470, _gloffset_MultiTexCoord4fARB },
+   { 29774, _gloffset_MultiTexCoord2fvARB },
    {    -1, -1 }
 };
 
@@ -4902,7 +5004,7 @@ static const struct gl_function_remap MESA_alt_functions[] = {
 
 #if defined(need_GL_3DFX_tbuffer)
 static const struct gl_function_remap GL_3DFX_tbuffer_functions[] = {
-   {  8267, -1 }, /* TbufferMask3DFX */
+   {  8386, -1 }, /* TbufferMask3DFX */
    {    -1, -1 }
 };
 #endif
@@ -4956,6 +5058,13 @@ static const struct gl_function_remap GL_ARB_draw_elements_base_vertex_functions
 };
 #endif
 
+#if defined(need_GL_ARB_draw_instanced)
+/* functions defined in MESA_remap_table_functions are excluded */
+static const struct gl_function_remap GL_ARB_draw_instanced_functions[] = {
+   {    -1, -1 }
+};
+#endif
+
 #if defined(need_GL_ARB_framebuffer_object)
 /* functions defined in MESA_remap_table_functions are excluded */
 static const struct gl_function_remap GL_ARB_framebuffer_object_functions[] = {
@@ -4963,6 +5072,14 @@ static const struct gl_function_remap GL_ARB_framebuffer_object_functions[] = {
 };
 #endif
 
+#if defined(need_GL_ARB_geometry_shader4)
+/* functions defined in MESA_remap_table_functions are excluded */
+static const struct gl_function_remap GL_ARB_geometry_shader4_functions[] = {
+   { 11333, -1 }, /* FramebufferTextureLayer */
+   {    -1, -1 }
+};
+#endif
+
 #if defined(need_GL_ARB_map_buffer_range)
 /* functions defined in MESA_remap_table_functions are excluded */
 static const struct gl_function_remap GL_ARB_map_buffer_range_functions[] = {
@@ -4973,10 +5090,10 @@ static const struct gl_function_remap GL_ARB_map_buffer_range_functions[] = {
 #if defined(need_GL_ARB_matrix_palette)
 static const struct gl_function_remap GL_ARB_matrix_palette_functions[] = {
    {  3339, -1 }, /* MatrixIndexusvARB */
-   { 11655, -1 }, /* MatrixIndexuivARB */
-   { 12856, -1 }, /* MatrixIndexPointerARB */
-   { 17530, -1 }, /* CurrentPaletteMatrixARB */
-   { 20323, -1 }, /* MatrixIndexubvARB */
+   { 11974, -1 }, /* MatrixIndexuivARB */
+   { 13295, -1 }, /* MatrixIndexPointerARB */
+   { 18136, -1 }, /* CurrentPaletteMatrixARB */
+   { 21056, -1 }, /* MatrixIndexubvARB */
    {    -1, -1 }
 };
 #endif
@@ -5030,6 +5147,13 @@ static const struct gl_function_remap GL_ARB_texture_compression_functions[] = {
 };
 #endif
 
+#if defined(need_GL_ARB_transform_feedback2)
+/* functions defined in MESA_remap_table_functions are excluded */
+static const struct gl_function_remap GL_ARB_transform_feedback2_functions[] = {
+   {    -1, -1 }
+};
+#endif
+
 #if defined(need_GL_ARB_transpose_matrix)
 /* functions defined in MESA_remap_table_functions are excluded */
 static const struct gl_function_remap GL_ARB_transpose_matrix_functions[] = {
@@ -5047,15 +5171,15 @@ static const struct gl_function_remap GL_ARB_vertex_array_object_functions[] = {
 #if defined(need_GL_ARB_vertex_blend)
 static const struct gl_function_remap GL_ARB_vertex_blend_functions[] = {
    {  2226, -1 }, /* WeightubvARB */
-   {  5633, -1 }, /* WeightivARB */
-   {  9847, -1 }, /* WeightPointerARB */
-   { 12325, -1 }, /* WeightfvARB */
-   { 15610, -1 }, /* WeightbvARB */
-   { 18704, -1 }, /* WeightusvARB */
-   { 21349, -1 }, /* VertexBlendARB */
-   { 26480, -1 }, /* WeightsvARB */
-   { 28429, -1 }, /* WeightdvARB */
-   { 29127, -1 }, /* WeightuivARB */
+   {  5746, -1 }, /* WeightivARB */
+   { 10084, -1 }, /* WeightPointerARB */
+   { 12674, -1 }, /* WeightfvARB */
+   { 16175, -1 }, /* WeightbvARB */
+   { 19349, -1 }, /* WeightusvARB */
+   { 22082, -1 }, /* VertexBlendARB */
+   { 27291, -1 }, /* WeightsvARB */
+   { 29276, -1 }, /* WeightdvARB */
+   { 29974, -1 }, /* WeightuivARB */
    {    -1, -1 }
 };
 #endif
@@ -5146,15 +5270,15 @@ static const struct gl_function_remap GL_EXT_blend_func_separate_functions[] = {
 
 #if defined(need_GL_EXT_blend_minmax)
 static const struct gl_function_remap GL_EXT_blend_minmax_functions[] = {
-   {  9982, _gloffset_BlendEquation },
+   { 10219, _gloffset_BlendEquation },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_color_subtable)
 static const struct gl_function_remap GL_EXT_color_subtable_functions[] = {
-   { 15106, _gloffset_ColorSubTable },
-   { 28379, _gloffset_CopyColorSubTable },
+   { 15623, _gloffset_ColorSubTable },
+   { 29226, _gloffset_CopyColorSubTable },
    {    -1, -1 }
 };
 #endif
@@ -5171,55 +5295,55 @@ static const struct gl_function_remap GL_EXT_convolution_functions[] = {
    {   213, _gloffset_ConvolutionFilter1D },
    {  2284, _gloffset_CopyConvolutionFilter1D },
    {  3624, _gloffset_GetConvolutionParameteriv },
-   {  7583, _gloffset_ConvolutionFilter2D },
-   {  7749, _gloffset_ConvolutionParameteriv },
-   {  8209, _gloffset_ConvolutionParameterfv },
-   { 18279, _gloffset_GetSeparableFilter },
-   { 21423, _gloffset_SeparableFilter2D },
-   { 22252, _gloffset_ConvolutionParameteri },
-   { 22375, _gloffset_ConvolutionParameterf },
-   { 23828, _gloffset_GetConvolutionParameterfv },
-   { 24650, _gloffset_GetConvolutionFilter },
-   { 26894, _gloffset_CopyConvolutionFilter2D },
+   {  7702, _gloffset_ConvolutionFilter2D },
+   {  7868, _gloffset_ConvolutionParameteriv },
+   {  8328, _gloffset_ConvolutionParameterfv },
+   { 18885, _gloffset_GetSeparableFilter },
+   { 22156, _gloffset_SeparableFilter2D },
+   { 22968, _gloffset_ConvolutionParameteri },
+   { 23091, _gloffset_ConvolutionParameterf },
+   { 24608, _gloffset_GetConvolutionParameterfv },
+   { 25430, _gloffset_GetConvolutionFilter },
+   { 27705, _gloffset_CopyConvolutionFilter2D },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_coordinate_frame)
 static const struct gl_function_remap GL_EXT_coordinate_frame_functions[] = {
-   {  9362, -1 }, /* TangentPointerEXT */
-   { 11169, -1 }, /* Binormal3ivEXT */
-   { 11787, -1 }, /* Tangent3sEXT */
-   { 12921, -1 }, /* Tangent3fvEXT */
-   { 16542, -1 }, /* Tangent3dvEXT */
-   { 17228, -1 }, /* Binormal3bvEXT */
-   { 18332, -1 }, /* Binormal3dEXT */
-   { 20255, -1 }, /* Tangent3fEXT */
-   { 22324, -1 }, /* Binormal3sEXT */
-   { 22769, -1 }, /* Tangent3ivEXT */
-   { 22788, -1 }, /* Tangent3dEXT */
-   { 23592, -1 }, /* Binormal3svEXT */
-   { 24073, -1 }, /* Binormal3fEXT */
-   { 24925, -1 }, /* Binormal3dvEXT */
-   { 26100, -1 }, /* Tangent3iEXT */
-   { 27179, -1 }, /* Tangent3bvEXT */
-   { 27588, -1 }, /* Tangent3bEXT */
-   { 28152, -1 }, /* Binormal3fvEXT */
-   { 28826, -1 }, /* BinormalPointerEXT */
-   { 29231, -1 }, /* Tangent3svEXT */
-   { 29668, -1 }, /* Binormal3bEXT */
-   { 29845, -1 }, /* Binormal3iEXT */
+   {  9563, -1 }, /* TangentPointerEXT */
+   { 11488, -1 }, /* Binormal3ivEXT */
+   { 12106, -1 }, /* Tangent3sEXT */
+   { 13360, -1 }, /* Tangent3fvEXT */
+   { 17107, -1 }, /* Tangent3dvEXT */
+   { 17834, -1 }, /* Binormal3bvEXT */
+   { 18938, -1 }, /* Binormal3dEXT */
+   { 20988, -1 }, /* Tangent3fEXT */
+   { 23040, -1 }, /* Binormal3sEXT */
+   { 23485, -1 }, /* Tangent3ivEXT */
+   { 23504, -1 }, /* Tangent3dEXT */
+   { 24372, -1 }, /* Binormal3svEXT */
+   { 24853, -1 }, /* Binormal3fEXT */
+   { 25705, -1 }, /* Binormal3dvEXT */
+   { 26911, -1 }, /* Tangent3iEXT */
+   { 27990, -1 }, /* Tangent3bvEXT */
+   { 28435, -1 }, /* Tangent3bEXT */
+   { 28999, -1 }, /* Binormal3fvEXT */
+   { 29673, -1 }, /* BinormalPointerEXT */
+   { 30078, -1 }, /* Tangent3svEXT */
+   { 30515, -1 }, /* Binormal3bEXT */
+   { 30692, -1 }, /* Binormal3iEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_copy_texture)
 static const struct gl_function_remap GL_EXT_copy_texture_functions[] = {
-   { 13364, _gloffset_CopyTexSubImage3D },
-   { 14846, _gloffset_CopyTexImage2D },
-   { 21860, _gloffset_CopyTexImage1D },
-   { 24331, _gloffset_CopyTexSubImage2D },
-   { 26532, _gloffset_CopyTexSubImage1D },
+   { 13803, _gloffset_CopyTexSubImage3D },
+   { 15363, _gloffset_CopyTexImage2D },
+   { 22576, _gloffset_CopyTexImage1D },
+   { 25111, _gloffset_CopyTexSubImage2D },
+   { 27343, _gloffset_CopyTexSubImage1D },
    {    -1, -1 }
 };
 #endif
@@ -5245,9 +5369,16 @@ static const struct gl_function_remap GL_EXT_draw_buffers2_functions[] = {
 };
 #endif
 
+#if defined(need_GL_EXT_draw_instanced)
+/* functions defined in MESA_remap_table_functions are excluded */
+static const struct gl_function_remap GL_EXT_draw_instanced_functions[] = {
+   {    -1, -1 }
+};
+#endif
+
 #if defined(need_GL_EXT_draw_range_elements)
 static const struct gl_function_remap GL_EXT_draw_range_elements_functions[] = {
-   {  8492, _gloffset_DrawRangeElements },
+   {  8665, _gloffset_DrawRangeElements },
    {    -1, -1 }
 };
 #endif
@@ -5291,37 +5422,37 @@ static const struct gl_function_remap GL_EXT_gpu_program_parameters_functions[]
 static const struct gl_function_remap GL_EXT_histogram_functions[] = {
    {   812, _gloffset_Histogram },
    {  3088, _gloffset_ResetHistogram },
-   {  8864, _gloffset_GetMinmax },
-   { 13698, _gloffset_GetHistogramParameterfv },
-   { 21785, _gloffset_GetMinmaxParameteriv },
-   { 23718, _gloffset_ResetMinmax },
-   { 24547, _gloffset_GetHistogramParameteriv },
-   { 25603, _gloffset_GetHistogram },
-   { 27965, _gloffset_Minmax },
-   { 29466, _gloffset_GetMinmaxParameterfv },
+   {  9065, _gloffset_GetMinmax },
+   { 14137, _gloffset_GetHistogramParameterfv },
+   { 22501, _gloffset_GetMinmaxParameteriv },
+   { 24498, _gloffset_ResetMinmax },
+   { 25327, _gloffset_GetHistogramParameteriv },
+   { 26414, _gloffset_GetHistogram },
+   { 28812, _gloffset_Minmax },
+   { 30313, _gloffset_GetMinmaxParameterfv },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_index_func)
 static const struct gl_function_remap GL_EXT_index_func_functions[] = {
-   { 10209, -1 }, /* IndexFuncEXT */
+   { 10446, -1 }, /* IndexFuncEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_index_material)
 static const struct gl_function_remap GL_EXT_index_material_functions[] = {
-   { 18791, -1 }, /* IndexMaterialEXT */
+   { 19436, -1 }, /* IndexMaterialEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_light_texture)
 static const struct gl_function_remap GL_EXT_light_texture_functions[] = {
-   { 23612, -1 }, /* ApplyTextureEXT */
-   { 23672, -1 }, /* TextureMaterialEXT */
-   { 23697, -1 }, /* TextureLightEXT */
+   { 24392, -1 }, /* ApplyTextureEXT */
+   { 24452, -1 }, /* TextureMaterialEXT */
+   { 24477, -1 }, /* TextureLightEXT */
    {    -1, -1 }
 };
 #endif
@@ -5342,20 +5473,20 @@ static const struct gl_function_remap GL_EXT_multisample_functions[] = {
 
 #if defined(need_GL_EXT_paletted_texture)
 static const struct gl_function_remap GL_EXT_paletted_texture_functions[] = {
-   {  7445, _gloffset_ColorTable },
-   { 13544, _gloffset_GetColorTable },
-   { 20438, _gloffset_GetColorTableParameterfv },
-   { 22431, _gloffset_GetColorTableParameteriv },
+   {  7564, _gloffset_ColorTable },
+   { 13983, _gloffset_GetColorTable },
+   { 21171, _gloffset_GetColorTableParameterfv },
+   { 23147, _gloffset_GetColorTableParameteriv },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_pixel_transform)
 static const struct gl_function_remap GL_EXT_pixel_transform_functions[] = {
-   {  9603, -1 }, /* PixelTransformParameterfvEXT */
-   { 19405, -1 }, /* PixelTransformParameterfEXT */
-   { 19485, -1 }, /* PixelTransformParameteriEXT */
-   { 28790, -1 }, /* PixelTransformParameterivEXT */
+   { 20087, -1 }, /* PixelTransformParameterfEXT */
+   { 20167, -1 }, /* PixelTransformParameteriEXT */
+   { 28173, -1 }, /* PixelTransformParameterfvEXT */
+   { 29637, -1 }, /* PixelTransformParameterivEXT */
    {    -1, -1 }
 };
 #endif
@@ -5397,8 +5528,8 @@ static const struct gl_function_remap GL_EXT_stencil_two_side_functions[] = {
 
 #if defined(need_GL_EXT_subtexture)
 static const struct gl_function_remap GL_EXT_subtexture_functions[] = {
-   {  6166, _gloffset_TexSubImage1D },
-   {  9478, _gloffset_TexSubImage2D },
+   {  6285, _gloffset_TexSubImage1D },
+   {  9679, _gloffset_TexSubImage2D },
    {    -1, -1 }
 };
 #endif
@@ -5406,7 +5537,7 @@ static const struct gl_function_remap GL_EXT_subtexture_functions[] = {
 #if defined(need_GL_EXT_texture3D)
 static const struct gl_function_remap GL_EXT_texture3D_functions[] = {
    {  1658, _gloffset_TexImage3D },
-   { 20207, _gloffset_TexSubImage3D },
+   { 20940, _gloffset_TexSubImage3D },
    {    -1, -1 }
 };
 #endif
@@ -5421,18 +5552,18 @@ static const struct gl_function_remap GL_EXT_texture_array_functions[] = {
 #if defined(need_GL_EXT_texture_object)
 static const struct gl_function_remap GL_EXT_texture_object_functions[] = {
    {  2964, _gloffset_PrioritizeTextures },
-   {  6615, _gloffset_AreTexturesResident },
-   { 12063, _gloffset_GenTextures },
-   { 14030, _gloffset_DeleteTextures },
-   { 17281, _gloffset_IsTexture },
-   { 26597, _gloffset_BindTexture },
+   {  6734, _gloffset_AreTexturesResident },
+   { 12382, _gloffset_GenTextures },
+   { 14469, _gloffset_DeleteTextures },
+   { 17887, _gloffset_IsTexture },
+   { 27408, _gloffset_BindTexture },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_texture_perturb_normal)
 static const struct gl_function_remap GL_EXT_texture_perturb_normal_functions[] = {
-   { 12275, -1 }, /* TextureNormalEXT */
+   { 12624, -1 }, /* TextureNormalEXT */
    {    -1, -1 }
 };
 #endif
@@ -5444,21 +5575,28 @@ static const struct gl_function_remap GL_EXT_timer_query_functions[] = {
 };
 #endif
 
+#if defined(need_GL_EXT_transform_feedback)
+/* functions defined in MESA_remap_table_functions are excluded */
+static const struct gl_function_remap GL_EXT_transform_feedback_functions[] = {
+   {    -1, -1 }
+};
+#endif
+
 #if defined(need_GL_EXT_vertex_array)
 /* functions defined in MESA_remap_table_functions are excluded */
 static const struct gl_function_remap GL_EXT_vertex_array_functions[] = {
-   { 21612, _gloffset_ArrayElement },
-   { 27553, _gloffset_GetPointerv },
-   { 29093, _gloffset_DrawArrays },
+   { 22328, _gloffset_ArrayElement },
+   { 28400, _gloffset_GetPointerv },
+   { 29940, _gloffset_DrawArrays },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_vertex_weighting)
 static const struct gl_function_remap GL_EXT_vertex_weighting_functions[] = {
-   { 17311, -1 }, /* VertexWeightfvEXT */
-   { 24051, -1 }, /* VertexWeightfEXT */
-   { 25572, -1 }, /* VertexWeightPointerEXT */
+   { 17917, -1 }, /* VertexWeightfvEXT */
+   { 24831, -1 }, /* VertexWeightfEXT */
+   { 26383, -1 }, /* VertexWeightPointerEXT */
    {    -1, -1 }
 };
 #endif
@@ -5467,10 +5605,10 @@ static const struct gl_function_remap GL_EXT_vertex_weighting_functions[] = {
 static const struct gl_function_remap GL_HP_image_transform_functions[] = {
    {  2157, -1 }, /* GetImageTransformParameterfvHP */
    {  3305, -1 }, /* ImageTransformParameterfHP */
-   {  9056, -1 }, /* ImageTransformParameterfvHP */
-   { 10678, -1 }, /* ImageTransformParameteriHP */
-   { 10940, -1 }, /* GetImageTransformParameterivHP */
-   { 17375, -1 }, /* ImageTransformParameterivHP */
+   {  9257, -1 }, /* ImageTransformParameterfvHP */
+   { 10915, -1 }, /* ImageTransformParameteriHP */
+   { 11223, -1 }, /* GetImageTransformParameterivHP */
+   { 17981, -1 }, /* ImageTransformParameterivHP */
    {    -1, -1 }
 };
 #endif
@@ -5485,13 +5623,13 @@ static const struct gl_function_remap GL_IBM_multimode_draw_arrays_functions[] =
 #if defined(need_GL_IBM_vertex_array_lists)
 static const struct gl_function_remap GL_IBM_vertex_array_lists_functions[] = {
    {  3857, -1 }, /* SecondaryColorPointerListIBM */
-   {  5167, -1 }, /* NormalPointerListIBM */
-   {  6789, -1 }, /* FogCoordPointerListIBM */
-   {  7096, -1 }, /* VertexPointerListIBM */
-   { 10599, -1 }, /* ColorPointerListIBM */
-   { 11894, -1 }, /* TexCoordPointerListIBM */
-   { 12297, -1 }, /* IndexPointerListIBM */
-   { 29409, -1 }, /* EdgeFlagPointerListIBM */
+   {  5252, -1 }, /* NormalPointerListIBM */
+   {  6908, -1 }, /* FogCoordPointerListIBM */
+   {  7215, -1 }, /* VertexPointerListIBM */
+   { 10836, -1 }, /* ColorPointerListIBM */
+   { 12213, -1 }, /* TexCoordPointerListIBM */
+   { 12646, -1 }, /* IndexPointerListIBM */
+   { 30256, -1 }, /* EdgeFlagPointerListIBM */
    {    -1, -1 }
 };
 #endif
@@ -5505,10 +5643,10 @@ static const struct gl_function_remap GL_INGR_blend_func_separate_functions[] =
 
 #if defined(need_GL_INTEL_parallel_arrays)
 static const struct gl_function_remap GL_INTEL_parallel_arrays_functions[] = {
-   { 11281, -1 }, /* VertexPointervINTEL */
-   { 13791, -1 }, /* ColorPointervINTEL */
-   { 26868, -1 }, /* NormalPointervINTEL */
-   { 27294, -1 }, /* TexCoordPointervINTEL */
+   { 11600, -1 }, /* VertexPointervINTEL */
+   { 14230, -1 }, /* ColorPointervINTEL */
+   { 27679, -1 }, /* NormalPointervINTEL */
+   { 28105, -1 }, /* TexCoordPointervINTEL */
    {    -1, -1 }
 };
 #endif
@@ -5525,7 +5663,7 @@ static const struct gl_function_remap GL_MESA_shader_debug_functions[] = {
    {  1522, -1 }, /* GetDebugLogLengthMESA */
    {  3063, -1 }, /* ClearDebugLogMESA */
    {  4018, -1 }, /* GetDebugLogMESA */
-   { 27746, -1 }, /* CreateDebugObjectMESA */
+   { 28593, -1 }, /* CreateDebugObjectMESA */
    {    -1, -1 }
 };
 #endif
@@ -5546,15 +5684,15 @@ static const struct gl_function_remap GL_NV_condtitional_render_functions[] = {
 
 #if defined(need_GL_NV_evaluators)
 static const struct gl_function_remap GL_NV_evaluators_functions[] = {
-   {  5834, -1 }, /* GetMapAttribParameterivNV */
-   {  7551, -1 }, /* MapControlPointsNV */
-   {  7650, -1 }, /* MapParameterfvNV */
-   {  9461, -1 }, /* EvalMapsNV */
-   { 15280, -1 }, /* GetMapAttribParameterfvNV */
-   { 15446, -1 }, /* MapParameterivNV */
-   { 22175, -1 }, /* GetMapParameterivNV */
-   { 22673, -1 }, /* GetMapParameterfvNV */
-   { 26204, -1 }, /* GetMapControlPointsNV */
+   {  5947, -1 }, /* GetMapAttribParameterivNV */
+   {  7670, -1 }, /* MapControlPointsNV */
+   {  7769, -1 }, /* MapParameterfvNV */
+   {  9662, -1 }, /* EvalMapsNV */
+   { 15845, -1 }, /* GetMapAttribParameterfvNV */
+   { 16011, -1 }, /* MapParameterivNV */
+   { 22891, -1 }, /* GetMapParameterivNV */
+   { 23389, -1 }, /* GetMapParameterfvNV */
+   { 27015, -1 }, /* GetMapControlPointsNV */
    {    -1, -1 }
 };
 #endif
@@ -5589,8 +5727,8 @@ static const struct gl_function_remap GL_NV_register_combiners_functions[] = {
 
 #if defined(need_GL_NV_register_combiners2)
 static const struct gl_function_remap GL_NV_register_combiners2_functions[] = {
-   { 14183, -1 }, /* CombinerStageParameterfvNV */
-   { 14498, -1 }, /* GetCombinerStageParameterfvNV */
+   { 14700, -1 }, /* CombinerStageParameterfvNV */
+   { 15015, -1 }, /* GetCombinerStageParameterfvNV */
    {    -1, -1 }
 };
 #endif
@@ -5618,23 +5756,23 @@ static const struct gl_function_remap GL_OES_EGL_image_functions[] = {
 
 #if defined(need_GL_PGI_misc_hints)
 static const struct gl_function_remap GL_PGI_misc_hints_functions[] = {
-   {  7735, -1 }, /* HintPGI */
+   {  7854, -1 }, /* HintPGI */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_detail_texture)
 static const struct gl_function_remap GL_SGIS_detail_texture_functions[] = {
-   { 14471, -1 }, /* GetDetailTexFuncSGIS */
-   { 14791, -1 }, /* DetailTexFuncSGIS */
+   { 14988, -1 }, /* GetDetailTexFuncSGIS */
+   { 15308, -1 }, /* DetailTexFuncSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_fog_function)
 static const struct gl_function_remap GL_SGIS_fog_function_functions[] = {
-   { 24313, -1 }, /* FogFuncSGIS */
-   { 24978, -1 }, /* GetFogFuncSGIS */
+   { 25093, -1 }, /* FogFuncSGIS */
+   { 25758, -1 }, /* GetFogFuncSGIS */
    {    -1, -1 }
 };
 #endif
@@ -5662,8 +5800,8 @@ static const struct gl_function_remap GL_SGIS_point_parameters_functions[] = {
 
 #if defined(need_GL_SGIS_sharpen_texture)
 static const struct gl_function_remap GL_SGIS_sharpen_texture_functions[] = {
-   {  5895, -1 }, /* GetSharpenTexFuncSGIS */
-   { 19700, -1 }, /* SharpenTexFuncSGIS */
+   {  6008, -1 }, /* GetSharpenTexFuncSGIS */
+   { 20407, -1 }, /* SharpenTexFuncSGIS */
    {    -1, -1 }
 };
 #endif
@@ -5671,22 +5809,22 @@ static const struct gl_function_remap GL_SGIS_sharpen_texture_functions[] = {
 #if defined(need_GL_SGIS_texture4D)
 static const struct gl_function_remap GL_SGIS_texture4D_functions[] = {
    {   894, -1 }, /* TexImage4DSGIS */
-   { 14099, -1 }, /* TexSubImage4DSGIS */
+   { 14538, -1 }, /* TexSubImage4DSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_texture_color_mask)
 static const struct gl_function_remap GL_SGIS_texture_color_mask_functions[] = {
-   { 13497, -1 }, /* TextureColorMaskSGIS */
+   { 13936, -1 }, /* TextureColorMaskSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_texture_filter4)
 static const struct gl_function_remap GL_SGIS_texture_filter4_functions[] = {
-   {  6072, -1 }, /* GetTexFilterFuncSGIS */
-   { 14617, -1 }, /* TexFilterFuncSGIS */
+   {  6185, -1 }, /* GetTexFilterFuncSGIS */
+   { 15134, -1 }, /* TexFilterFuncSGIS */
    {    -1, -1 }
 };
 #endif
@@ -5695,17 +5833,17 @@ static const struct gl_function_remap GL_SGIS_texture_filter4_functions[] = {
 static const struct gl_function_remap GL_SGIX_async_functions[] = {
    {  3014, -1 }, /* AsyncMarkerSGIX */
    {  3997, -1 }, /* FinishAsyncSGIX */
-   {  4734, -1 }, /* PollAsyncSGIX */
-   { 19847, -1 }, /* DeleteAsyncMarkersSGIX */
-   { 19876, -1 }, /* IsAsyncMarkerSGIX */
-   { 29206, -1 }, /* GenAsyncMarkersSGIX */
+   {  4762, -1 }, /* PollAsyncSGIX */
+   { 20554, -1 }, /* DeleteAsyncMarkersSGIX */
+   { 20609, -1 }, /* IsAsyncMarkerSGIX */
+   { 30053, -1 }, /* GenAsyncMarkersSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_flush_raster)
 static const struct gl_function_remap GL_SGIX_flush_raster_functions[] = {
-   {  6443, -1 }, /* FlushRasterSGIX */
+   {  6562, -1 }, /* FlushRasterSGIX */
    {    -1, -1 }
 };
 #endif
@@ -5713,37 +5851,37 @@ static const struct gl_function_remap GL_SGIX_flush_raster_functions[] = {
 #if defined(need_GL_SGIX_fragment_lighting)
 static const struct gl_function_remap GL_SGIX_fragment_lighting_functions[] = {
    {  2410, -1 }, /* FragmentMaterialfvSGIX */
-   {  2906, -1 }, /* FragmentLightModelivSGIX */
-   {  4685, -1 }, /* FragmentLightiSGIX */
-   {  5575, -1 }, /* GetFragmentMaterialfvSGIX */
-   {  7163, -1 }, /* FragmentMaterialfSGIX */
-   {  7324, -1 }, /* GetFragmentLightivSGIX */
-   {  8161, -1 }, /* FragmentLightModeliSGIX */
-   {  9524, -1 }, /* FragmentLightivSGIX */
-   {  9790, -1 }, /* GetFragmentMaterialivSGIX */
-   { 17198, -1 }, /* FragmentLightModelfSGIX */
-   { 17498, -1 }, /* FragmentColorMaterialSGIX */
-   { 17898, -1 }, /* FragmentMaterialiSGIX */
-   { 19119, -1 }, /* LightEnviSGIX */
-   { 20530, -1 }, /* FragmentLightModelfvSGIX */
-   { 20839, -1 }, /* FragmentLightfvSGIX */
-   { 25454, -1 }, /* FragmentLightfSGIX */
-   { 28122, -1 }, /* GetFragmentLightfvSGIX */
-   { 29689, -1 }, /* FragmentMaterialivSGIX */
+   {  4713, -1 }, /* FragmentLightiSGIX */
+   {  5688, -1 }, /* GetFragmentMaterialfvSGIX */
+   {  7282, -1 }, /* FragmentMaterialfSGIX */
+   {  7443, -1 }, /* GetFragmentLightivSGIX */
+   {  8280, -1 }, /* FragmentLightModeliSGIX */
+   {  9725, -1 }, /* FragmentLightivSGIX */
+   { 10027, -1 }, /* GetFragmentMaterialivSGIX */
+   { 17804, -1 }, /* FragmentLightModelfSGIX */
+   { 18104, -1 }, /* FragmentColorMaterialSGIX */
+   { 18504, -1 }, /* FragmentMaterialiSGIX */
+   { 19764, -1 }, /* LightEnviSGIX */
+   { 21263, -1 }, /* FragmentLightModelfvSGIX */
+   { 21572, -1 }, /* FragmentLightfvSGIX */
+   { 26142, -1 }, /* FragmentLightModelivSGIX */
+   { 26265, -1 }, /* FragmentLightfSGIX */
+   { 28969, -1 }, /* GetFragmentLightfvSGIX */
+   { 30536, -1 }, /* FragmentMaterialivSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_framezoom)
 static const struct gl_function_remap GL_SGIX_framezoom_functions[] = {
-   { 19899, -1 }, /* FrameZoomSGIX */
+   { 20632, -1 }, /* FrameZoomSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_igloo_interface)
 static const struct gl_function_remap GL_SGIX_igloo_interface_functions[] = {
-   { 25762, -1 }, /* IglooInterfaceSGIX */
+   { 26573, -1 }, /* IglooInterfaceSGIX */
    {    -1, -1 }
 };
 #endif
@@ -5751,11 +5889,11 @@ static const struct gl_function_remap GL_SGIX_igloo_interface_functions[] = {
 #if defined(need_GL_SGIX_instruments)
 static const struct gl_function_remap GL_SGIX_instruments_functions[] = {
    {  2573, -1 }, /* ReadInstrumentsSGIX */
-   {  5651, -1 }, /* PollInstrumentsSGIX */
-   {  9422, -1 }, /* GetInstrumentsSGIX */
-   { 11492, -1 }, /* StartInstrumentsSGIX */
-   { 14217, -1 }, /* StopInstrumentsSGIX */
-   { 15823, -1 }, /* InstrumentsBufferSGIX */
+   {  5764, -1 }, /* PollInstrumentsSGIX */
+   {  9623, -1 }, /* GetInstrumentsSGIX */
+   { 11811, -1 }, /* StartInstrumentsSGIX */
+   { 14734, -1 }, /* StopInstrumentsSGIX */
+   { 16388, -1 }, /* InstrumentsBufferSGIX */
    {    -1, -1 }
 };
 #endif
@@ -5764,10 +5902,10 @@ static const struct gl_function_remap GL_SGIX_instruments_functions[] = {
 static const struct gl_function_remap GL_SGIX_list_priority_functions[] = {
    {  1125, -1 }, /* ListParameterfSGIX */
    {  2763, -1 }, /* GetListParameterfvSGIX */
-   { 15738, -1 }, /* ListParameteriSGIX */
-   { 16492, -1 }, /* ListParameterfvSGIX */
-   { 18525, -1 }, /* ListParameterivSGIX */
-   { 29250, -1 }, /* GetListParameterivSGIX */
+   { 16303, -1 }, /* ListParameteriSGIX */
+   { 17057, -1 }, /* ListParameterfvSGIX */
+   { 19170, -1 }, /* ListParameterivSGIX */
+   { 30097, -1 }, /* GetListParameterivSGIX */
    {    -1, -1 }
 };
 #endif
@@ -5782,53 +5920,53 @@ static const struct gl_function_remap GL_SGIX_pixel_texture_functions[] = {
 #if defined(need_GL_SGIX_polynomial_ffd)
 static const struct gl_function_remap GL_SGIX_polynomial_ffd_functions[] = {
    {  3251, -1 }, /* LoadIdentityDeformationMapSGIX */
-   { 14317, -1 }, /* DeformSGIX */
-   { 21724, -1 }, /* DeformationMap3fSGIX */
-   { 28010, -1 }, /* DeformationMap3dSGIX */
+   { 14834, -1 }, /* DeformSGIX */
+   { 22440, -1 }, /* DeformationMap3fSGIX */
+   { 28857, -1 }, /* DeformationMap3dSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_reference_plane)
 static const struct gl_function_remap GL_SGIX_reference_plane_functions[] = {
-   { 13048, -1 }, /* ReferencePlaneSGIX */
+   { 13487, -1 }, /* ReferencePlaneSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_sprite)
 static const struct gl_function_remap GL_SGIX_sprite_functions[] = {
-   {  8577, -1 }, /* SpriteParameterfvSGIX */
-   { 18353, -1 }, /* SpriteParameteriSGIX */
-   { 23752, -1 }, /* SpriteParameterfSGIX */
-   { 26326, -1 }, /* SpriteParameterivSGIX */
+   {  8778, -1 }, /* SpriteParameterfvSGIX */
+   { 18959, -1 }, /* SpriteParameteriSGIX */
+   { 24532, -1 }, /* SpriteParameterfSGIX */
+   { 27137, -1 }, /* SpriteParameterivSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_tag_sample_buffer)
 static const struct gl_function_remap GL_SGIX_tag_sample_buffer_functions[] = {
-   { 18412, -1 }, /* TagSampleBufferSGIX */
+   { 19018, -1 }, /* TagSampleBufferSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGI_color_table)
 static const struct gl_function_remap GL_SGI_color_table_functions[] = {
-   {  6733, _gloffset_ColorTableParameteriv },
-   {  7445, _gloffset_ColorTable },
-   { 13544, _gloffset_GetColorTable },
-   { 13654, _gloffset_CopyColorTable },
-   { 17142, _gloffset_ColorTableParameterfv },
-   { 20438, _gloffset_GetColorTableParameterfv },
-   { 22431, _gloffset_GetColorTableParameteriv },
+   {  6852, _gloffset_ColorTableParameteriv },
+   {  7564, _gloffset_ColorTable },
+   { 13983, _gloffset_GetColorTable },
+   { 14093, _gloffset_CopyColorTable },
+   { 17748, _gloffset_ColorTableParameterfv },
+   { 21171, _gloffset_GetColorTableParameterfv },
+   { 23147, _gloffset_GetColorTableParameteriv },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUNX_constant_data)
 static const struct gl_function_remap GL_SUNX_constant_data_functions[] = {
-   { 28100, -1 }, /* FinishTextureSUNX */
+   { 28947, -1 }, /* FinishTextureSUNX */
    {    -1, -1 }
 };
 #endif
@@ -5837,19 +5975,19 @@ static const struct gl_function_remap GL_SUNX_constant_data_functions[] = {
 static const struct gl_function_remap GL_SUN_global_alpha_functions[] = {
    {  3035, -1 }, /* GlobalAlphaFactorubSUN */
    {  4224, -1 }, /* GlobalAlphaFactoriSUN */
-   {  5676, -1 }, /* GlobalAlphaFactordSUN */
-   {  8661, -1 }, /* GlobalAlphaFactoruiSUN */
-   {  9013, -1 }, /* GlobalAlphaFactorbSUN */
-   { 11807, -1 }, /* GlobalAlphaFactorfSUN */
-   { 11926, -1 }, /* GlobalAlphaFactorusSUN */
-   { 20138, -1 }, /* GlobalAlphaFactorsSUN */
+   {  5789, -1 }, /* GlobalAlphaFactordSUN */
+   {  8862, -1 }, /* GlobalAlphaFactoruiSUN */
+   {  9214, -1 }, /* GlobalAlphaFactorbSUN */
+   { 12126, -1 }, /* GlobalAlphaFactorfSUN */
+   { 12245, -1 }, /* GlobalAlphaFactorusSUN */
+   { 20871, -1 }, /* GlobalAlphaFactorsSUN */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUN_mesh_array)
 static const struct gl_function_remap GL_SUN_mesh_array_functions[] = {
-   { 26138, -1 }, /* DrawMeshArraysSUN */
+   { 26949, -1 }, /* DrawMeshArraysSUN */
    {    -1, -1 }
 };
 #endif
@@ -5857,12 +5995,12 @@ static const struct gl_function_remap GL_SUN_mesh_array_functions[] = {
 #if defined(need_GL_SUN_triangle_list)
 static const struct gl_function_remap GL_SUN_triangle_list_functions[] = {
    {  3971, -1 }, /* ReplacementCodeubSUN */
-   {  5515, -1 }, /* ReplacementCodeubvSUN */
-   { 16863, -1 }, /* ReplacementCodeusvSUN */
-   { 17051, -1 }, /* ReplacementCodePointerSUN */
-   { 18436, -1 }, /* ReplacementCodeusSUN */
-   { 19183, -1 }, /* ReplacementCodeuiSUN */
-   { 26783, -1 }, /* ReplacementCodeuivSUN */
+   {  5600, -1 }, /* ReplacementCodeubvSUN */
+   { 17469, -1 }, /* ReplacementCodeusvSUN */
+   { 17657, -1 }, /* ReplacementCodePointerSUN */
+   { 19828, -1 }, /* ReplacementCodeuiSUN */
+   { 20583, -1 }, /* ReplacementCodeusSUN */
+   { 27594, -1 }, /* ReplacementCodeuivSUN */
    {    -1, -1 }
 };
 #endif
@@ -5878,37 +6016,37 @@ static const struct gl_function_remap GL_SUN_vertex_functions[] = {
    {  2642, -1 }, /* Color4ubVertex3fvSUN */
    {  4105, -1 }, /* Color4ubVertex3fSUN */
    {  4181, -1 }, /* TexCoord2fVertex3fSUN */
-   {  4480, -1 }, /* TexCoord2fColor4fNormal3fVertex3fSUN */
-   {  4810, -1 }, /* TexCoord2fNormal3fVertex3fvSUN */
-   {  5410, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN */
-   {  6480, -1 }, /* ReplacementCodeuiTexCoord2fVertex3fSUN */
-   {  7192, -1 }, /* TexCoord2fNormal3fVertex3fSUN */
-   {  7960, -1 }, /* Color3fVertex3fSUN */
-   {  8972, -1 }, /* Color3fVertex3fvSUN */
-   {  9387, -1 }, /* Color4fNormal3fVertex3fvSUN */
-   { 10088, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN */
-   { 11355, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fvSUN */
-   { 12779, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN */
-   { 13190, -1 }, /* TexCoord2fColor3fVertex3fSUN */
-   { 14242, -1 }, /* TexCoord4fColor4fNormal3fVertex4fSUN */
-   { 14576, -1 }, /* Color4ubVertex2fvSUN */
-   { 14816, -1 }, /* Normal3fVertex3fSUN */
-   { 15764, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fSUN */
-   { 16025, -1 }, /* TexCoord2fColor4fNormal3fVertex3fvSUN */
-   { 16692, -1 }, /* TexCoord2fVertex3fvSUN */
-   { 17468, -1 }, /* Color4ubVertex2fSUN */
-   { 17689, -1 }, /* ReplacementCodeuiColor4ubVertex3fSUN */
-   { 19571, -1 }, /* TexCoord2fColor4ubVertex3fSUN */
-   { 19918, -1 }, /* Normal3fVertex3fvSUN */
-   { 20347, -1 }, /* Color4fNormal3fVertex3fSUN */
-   { 21256, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN */
-   { 21476, -1 }, /* ReplacementCodeuiColor4ubVertex3fvSUN */
-   { 23206, -1 }, /* ReplacementCodeuiColor3fVertex3fSUN */
-   { 24429, -1 }, /* TexCoord4fVertex4fSUN */
-   { 24855, -1 }, /* TexCoord2fColor3fVertex3fvSUN */
-   { 25181, -1 }, /* ReplacementCodeuiNormal3fVertex3fvSUN */
-   { 25308, -1 }, /* TexCoord4fVertex4fvSUN */
-   { 26010, -1 }, /* ReplacementCodeuiVertex3fSUN */
+   {  4508, -1 }, /* TexCoord2fColor4fNormal3fVertex3fSUN */
+   {  4866, -1 }, /* TexCoord2fNormal3fVertex3fvSUN */
+   {  5495, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN */
+   {  6240, -1 }, /* ReplacementCodeuiColor4ubVertex3fvSUN */
+   {  6599, -1 }, /* ReplacementCodeuiTexCoord2fVertex3fSUN */
+   {  7311, -1 }, /* TexCoord2fNormal3fVertex3fSUN */
+   {  8079, -1 }, /* Color3fVertex3fSUN */
+   {  9173, -1 }, /* Color3fVertex3fvSUN */
+   {  9588, -1 }, /* Color4fNormal3fVertex3fvSUN */
+   { 10325, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN */
+   { 11674, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fvSUN */
+   { 13218, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN */
+   { 13629, -1 }, /* TexCoord2fColor3fVertex3fSUN */
+   { 14759, -1 }, /* TexCoord4fColor4fNormal3fVertex4fSUN */
+   { 15093, -1 }, /* Color4ubVertex2fvSUN */
+   { 15333, -1 }, /* Normal3fVertex3fSUN */
+   { 16329, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fSUN */
+   { 16590, -1 }, /* TexCoord2fColor4fNormal3fVertex3fvSUN */
+   { 17298, -1 }, /* TexCoord2fVertex3fvSUN */
+   { 18074, -1 }, /* Color4ubVertex2fSUN */
+   { 18295, -1 }, /* ReplacementCodeuiColor4ubVertex3fSUN */
+   { 20253, -1 }, /* TexCoord2fColor4ubVertex3fSUN */
+   { 20651, -1 }, /* Normal3fVertex3fvSUN */
+   { 21080, -1 }, /* Color4fNormal3fVertex3fSUN */
+   { 21989, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN */
+   { 23984, -1 }, /* ReplacementCodeuiColor3fVertex3fSUN */
+   { 25209, -1 }, /* TexCoord4fVertex4fSUN */
+   { 25635, -1 }, /* TexCoord2fColor3fVertex3fvSUN */
+   { 25986, -1 }, /* ReplacementCodeuiNormal3fVertex3fvSUN */
+   { 26113, -1 }, /* TexCoord4fVertex4fvSUN */
+   { 26821, -1 }, /* ReplacementCodeuiVertex3fSUN */
    {    -1, -1 }
 };
 #endif
@@ -5919,37 +6057,37 @@ static const struct gl_function_remap GL_VERSION_1_3_functions[] = {
    {   381, _gloffset_MultiTexCoord3sARB },
    {   613, _gloffset_ActiveTextureARB },
    {  3761, _gloffset_MultiTexCoord1fvARB },
-   {  5301, _gloffset_MultiTexCoord3dARB },
-   {  5346, _gloffset_MultiTexCoord2iARB },
-   {  5470, _gloffset_MultiTexCoord2svARB },
-   {  7401, _gloffset_MultiTexCoord2fARB },
-   {  9223, _gloffset_MultiTexCoord3fvARB },
-   {  9744, _gloffset_MultiTexCoord4sARB },
-   { 10378, _gloffset_MultiTexCoord2dvARB },
-   { 10760, _gloffset_MultiTexCoord1svARB },
-   { 11050, _gloffset_MultiTexCoord3svARB },
-   { 11111, _gloffset_MultiTexCoord4iARB },
-   { 11834, _gloffset_MultiTexCoord3iARB },
-   { 12568, _gloffset_MultiTexCoord1dARB },
-   { 12734, _gloffset_MultiTexCoord3dvARB },
-   { 13898, _gloffset_MultiTexCoord3ivARB },
-   { 13943, _gloffset_MultiTexCoord2sARB },
-   { 15163, _gloffset_MultiTexCoord4ivARB },
-   { 16792, _gloffset_ClientActiveTextureARB },
-   { 19036, _gloffset_MultiTexCoord2dARB },
-   { 19440, _gloffset_MultiTexCoord4dvARB },
-   { 19726, _gloffset_MultiTexCoord4fvARB },
-   { 20579, _gloffset_MultiTexCoord3fARB },
-   { 22959, _gloffset_MultiTexCoord4dARB },
-   { 23163, _gloffset_MultiTexCoord1sARB },
-   { 23365, _gloffset_MultiTexCoord1dvARB },
-   { 24175, _gloffset_MultiTexCoord1ivARB },
-   { 24268, _gloffset_MultiTexCoord2ivARB },
-   { 24607, _gloffset_MultiTexCoord1iARB },
-   { 25878, _gloffset_MultiTexCoord4svARB },
-   { 26396, _gloffset_MultiTexCoord1fARB },
-   { 26659, _gloffset_MultiTexCoord4fARB },
-   { 28927, _gloffset_MultiTexCoord2fvARB },
+   {  5386, _gloffset_MultiTexCoord3dARB },
+   {  5431, _gloffset_MultiTexCoord2iARB },
+   {  5555, _gloffset_MultiTexCoord2svARB },
+   {  7520, _gloffset_MultiTexCoord2fARB },
+   {  9424, _gloffset_MultiTexCoord3fvARB },
+   {  9981, _gloffset_MultiTexCoord4sARB },
+   { 10615, _gloffset_MultiTexCoord2dvARB },
+   { 10997, _gloffset_MultiTexCoord1svARB },
+   { 11369, _gloffset_MultiTexCoord3svARB },
+   { 11430, _gloffset_MultiTexCoord4iARB },
+   { 12153, _gloffset_MultiTexCoord3iARB },
+   { 12956, _gloffset_MultiTexCoord1dARB },
+   { 13173, _gloffset_MultiTexCoord3dvARB },
+   { 14337, _gloffset_MultiTexCoord3ivARB },
+   { 14382, _gloffset_MultiTexCoord2sARB },
+   { 15680, _gloffset_MultiTexCoord4ivARB },
+   { 17398, _gloffset_ClientActiveTextureARB },
+   { 19681, _gloffset_MultiTexCoord2dARB },
+   { 20122, _gloffset_MultiTexCoord4dvARB },
+   { 20433, _gloffset_MultiTexCoord4fvARB },
+   { 21312, _gloffset_MultiTexCoord3fARB },
+   { 23675, _gloffset_MultiTexCoord4dARB },
+   { 23941, _gloffset_MultiTexCoord1sARB },
+   { 24145, _gloffset_MultiTexCoord1dvARB },
+   { 24955, _gloffset_MultiTexCoord1ivARB },
+   { 25048, _gloffset_MultiTexCoord2ivARB },
+   { 25387, _gloffset_MultiTexCoord1iARB },
+   { 26689, _gloffset_MultiTexCoord4svARB },
+   { 27207, _gloffset_MultiTexCoord1fARB },
+   { 27470, _gloffset_MultiTexCoord4fARB },
+   { 29774, _gloffset_MultiTexCoord2fvARB },
    {    -1, -1 }
 };
 #endif
@@ -5982,3 +6120,17 @@ static const struct gl_function_remap GL_VERSION_2_1_functions[] = {
 };
 #endif
 
+#if defined(need_GL_VERSION_3_0)
+/* functions defined in MESA_remap_table_functions are excluded */
+static const struct gl_function_remap GL_VERSION_3_0_functions[] = {
+   {    -1, -1 }
+};
+#endif
+
+#if defined(need_GL_VERSION_3_1)
+/* functions defined in MESA_remap_table_functions are excluded */
+static const struct gl_function_remap GL_VERSION_3_1_functions[] = {
+   {    -1, -1 }
+};
+#endif
+
diff --git a/mesalib/src/mesa/main/renderbuffer.c b/mesalib/src/mesa/main/renderbuffer.c
index 4d7b0aff0..adc1199d8 100644
--- a/mesalib/src/mesa/main/renderbuffer.c
+++ b/mesalib/src/mesa/main/renderbuffer.c
@@ -49,12 +49,6 @@
 #include "fbobject.h"
 #include "renderbuffer.h"
 
-#include "rbadaptors.h"
-
-
-/* 32-bit color index format.  Not a public format. */
-#define COLOR_INDEX32 0x424243
-
 
 /*
  * Routines for get/put values in common buffer formats follow.
@@ -992,6 +986,7 @@ _mesa_soft_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
       pixelSize = 4 * sizeof(GLubyte);
       break;
    case GL_RGBA16:
+   case GL_RGBA16_SNORM:
       /* for accum buffer */
       rb->Format = MESA_FORMAT_SIGNED_RGBA_16;
       rb->DataType = GL_SHORT;
@@ -1091,21 +1086,6 @@ _mesa_soft_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
       rb->PutMonoValues = put_mono_values_uint;
       pixelSize = sizeof(GLuint);
       break;
-   case GL_COLOR_INDEX8_EXT:
-   case GL_COLOR_INDEX16_EXT:
-   case COLOR_INDEX32:
-      rb->Format = MESA_FORMAT_CI8;
-      rb->DataType = GL_UNSIGNED_BYTE;
-      rb->GetPointer = get_pointer_ubyte;
-      rb->GetRow = get_row_ubyte;
-      rb->GetValues = get_values_ubyte;
-      rb->PutRow = put_row_ubyte;
-      rb->PutRowRGB = NULL;
-      rb->PutMonoRow = put_mono_row_ubyte;
-      rb->PutValues = put_values_ubyte;
-      rb->PutMonoValues = put_mono_values_ubyte;
-      pixelSize = sizeof(GLubyte);
-      break;
    default:
       _mesa_problem(ctx, "Bad internalFormat in _mesa_soft_renderbuffer_storage");
       return GL_FALSE;
@@ -1777,7 +1757,7 @@ _mesa_add_accum_renderbuffer(GLcontext *ctx, struct gl_framebuffer *fb,
    }
 
    rb->Format = MESA_FORMAT_SIGNED_RGBA_16;
-   rb->InternalFormat = GL_RGBA16;
+   rb->InternalFormat = GL_RGBA16_SNORM;
    rb->AllocStorage = _mesa_soft_renderbuffer_storage;
    _mesa_add_renderbuffer(fb, BUFFER_ACCUM, rb);
 
@@ -1909,8 +1889,6 @@ void
 _mesa_add_renderbuffer(struct gl_framebuffer *fb,
                        GLuint bufferName, struct gl_renderbuffer *rb)
 {
-   GLenum baseFormat;
-
    assert(fb);
    assert(rb);
    assert(bufferName < BUFFER_COUNT);
@@ -1931,26 +1909,6 @@ _mesa_add_renderbuffer(struct gl_framebuffer *fb,
       assert(!rb->Name);
    }
 
-   /* If Mesa's compiled with deep color channels (16 or 32 bits / channel)
-    * and the device driver is expecting 8-bit values (GLubyte), we can
-    * use a "renderbuffer adaptor/wrapper" to do the necessary conversions.
-    */
-   baseFormat = _mesa_get_format_base_format(rb->Format);
-   if (baseFormat == GL_RGBA) {
-      if (CHAN_BITS == 16 && rb->DataType == GL_UNSIGNED_BYTE) {
-         GET_CURRENT_CONTEXT(ctx);
-         rb = _mesa_new_renderbuffer_16wrap8(ctx, rb);
-      }
-      else if (CHAN_BITS == 32 && rb->DataType == GL_UNSIGNED_BYTE) {
-         GET_CURRENT_CONTEXT(ctx);
-         rb = _mesa_new_renderbuffer_32wrap8(ctx, rb);
-      }
-      else if (CHAN_BITS == 32 && rb->DataType == GL_UNSIGNED_SHORT) {
-         GET_CURRENT_CONTEXT(ctx);
-         rb = _mesa_new_renderbuffer_32wrap16(ctx, rb);
-      }
-   }
-
    fb->Attachment[bufferName].Type = GL_RENDERBUFFER_EXT;
    fb->Attachment[bufferName].Complete = GL_TRUE;
    _mesa_reference_renderbuffer(&fb->Attachment[bufferName].Renderbuffer, rb);
diff --git a/mesalib/src/mesa/main/renderbuffer.h b/mesalib/src/mesa/main/renderbuffer.h
index 7c205e141..bc92b2698 100644
--- a/mesalib/src/mesa/main/renderbuffer.h
+++ b/mesalib/src/mesa/main/renderbuffer.h
@@ -26,6 +26,11 @@
 #ifndef RENDERBUFFER_H
 #define RENDERBUFFER_H
 
+#include "glheader.h"
+#include "mtypes.h"
+
+struct gl_framebuffer;
+struct gl_renderbuffer;
 
 extern void
 _mesa_init_renderbuffer(struct gl_renderbuffer *rb, GLuint name);
diff --git a/mesalib/src/mesa/main/restart.c b/mesalib/src/mesa/main/restart.c
new file mode 100644
index 000000000..ff366496f
--- /dev/null
+++ b/mesalib/src/mesa/main/restart.c
@@ -0,0 +1,68 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.9
+ *
+ * Copyright (C) 2010  VMware, Inc.  All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT.  IN NO EVENT SHALL THE 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 "glheader.h"
+#include "imports.h"
+#include "context.h"
+#include "restart.h"
+
+
+/**
+ */
+void GLAPIENTRY
+_mesa_PrimitiveRestart(void)
+{
+   GET_CURRENT_CONTEXT(ctx);
+
+   if (ctx->VersionMajor * 10 + ctx->VersionMinor < 31) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glPrimitiveRestart()");
+      return;
+   }
+
+   /* XXX call into vbo module */
+}
+
+
+
+/**
+ */
+void GLAPIENTRY
+_mesa_PrimitiveRestartIndex(GLuint index)
+{
+   GET_CURRENT_CONTEXT(ctx);
+
+   if (ctx->VersionMajor * 10 + ctx->VersionMinor < 31) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glPrimitiveRestartIndex()");
+      return;
+   }
+
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   FLUSH_VERTICES(ctx, _NEW_TRANSFORM);
+
+   ctx->Array.RestartIndex = index;
+}
diff --git a/mesalib/src/mesa/shader/slang/library/slang_builtin_120_fragment.gc b/mesalib/src/mesa/main/restart.h
index 7d516046a..25f58f24c 100644
--- a/mesalib/src/mesa/shader/slang/library/slang_builtin_120_fragment.gc
+++ b/mesalib/src/mesa/main/restart.h
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5
+ * Version:  7.9
  *
- * Copyright (C) 2006  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2010  VMware, Inc.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -14,17 +14,28 @@
  * 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.
+ * THE SOFTWARE IS PROVIDED "AS 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.
  */
 
-//
-// From Shader Spec, ver. 1.20, rev. 6
-//
 
-varying vec2 gl_PointCoord;
+#ifndef RESTART_H
+#define RESTART_H
 
+#include "glheader.h"
+
+extern void GLAPIENTRY
+_mesa_PrimitiveRestart(void);
+
+
+extern void GLAPIENTRY
+_mesa_PrimitiveRestartIndex(GLuint index);
+
+
+#endif
diff --git a/mesalib/src/mesa/main/shaderapi.c b/mesalib/src/mesa/main/shaderapi.c
new file mode 100644
index 000000000..c25d2a197
--- /dev/null
+++ b/mesalib/src/mesa/main/shaderapi.c
@@ -0,0 +1,1642 @@
+/*
+ * Mesa 3-D graphics library
+ *
+ * Copyright (C) 2004-2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009-2010  VMware, Inc.  All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, 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 shaderapi.c
+ * \author Brian Paul
+ *
+ * Implementation of GLSL-related API functions.
+ * The glUniform* functions are in uniforms.c
+ *
+ *
+ * XXX things to do:
+ * 1. Check that the right error code is generated for all _mesa_error() calls.
+ * 2. Insert FLUSH_VERTICES calls in various places
+ */
+
+
+#include "main/glheader.h"
+#include "main/context.h"
+#include "main/dispatch.h"
+#include "main/enums.h"
+#include "main/hash.h"
+#include "main/shaderapi.h"
+#include "main/shaderobj.h"
+#include "program/program.h"
+#include "program/prog_parameter.h"
+#include "program/prog_uniform.h"
+#include "talloc.h"
+
+
+/** Define this to enable shader substitution (see below) */
+#define SHADER_SUBST 0
+
+
+/**
+ * Return mask of GLSL_x flags by examining the MESA_GLSL env var.
+ */
+static GLbitfield
+get_shader_flags(void)
+{
+   GLbitfield flags = 0x0;
+   const char *env = _mesa_getenv("MESA_GLSL");
+
+   if (env) {
+      if (strstr(env, "dump"))
+         flags |= GLSL_DUMP;
+      if (strstr(env, "log"))
+         flags |= GLSL_LOG;
+      if (strstr(env, "nopvert"))
+         flags |= GLSL_NOP_VERT;
+      if (strstr(env, "nopfrag"))
+         flags |= GLSL_NOP_FRAG;
+      if (strstr(env, "nopt"))
+         flags |= GLSL_NO_OPT;
+      else if (strstr(env, "opt"))
+         flags |= GLSL_OPT;
+      if (strstr(env, "uniform"))
+         flags |= GLSL_UNIFORMS;
+      if (strstr(env, "useprog"))
+         flags |= GLSL_USE_PROG;
+   }
+
+   return flags;
+}
+
+
+/**
+ * Initialize context's shader state.
+ */
+void
+_mesa_init_shader_state(GLcontext *ctx)
+{
+   /* Device drivers may override these to control what kind of instructions
+    * are generated by the GLSL compiler.
+    */
+   struct gl_shader_compiler_options options;
+   GLuint i;
+
+   memset(&options, 0, sizeof(options));
+   options.MaxUnrollIterations = 32;
+
+   /* Default pragma settings */
+   options.DefaultPragmas.Optimize = GL_TRUE;
+
+   for(i = 0; i < MESA_SHADER_TYPES; ++i)
+      memcpy(&ctx->ShaderCompilerOptions[i], &options, sizeof(options));
+
+   ctx->Shader.Flags = get_shader_flags();
+}
+
+
+/**
+ * Free the per-context shader-related state.
+ */
+void
+_mesa_free_shader_state(GLcontext *ctx)
+{
+   _mesa_reference_shader_program(ctx, &ctx->Shader.CurrentProgram, NULL);
+}
+
+
+/**
+ * Return the size of the given GLSL datatype, in floats (components).
+ */
+GLint
+_mesa_sizeof_glsl_type(GLenum type)
+{
+   switch (type) {
+   case GL_FLOAT:
+   case GL_INT:
+   case GL_BOOL:
+   case GL_SAMPLER_1D:
+   case GL_SAMPLER_2D:
+   case GL_SAMPLER_3D:
+   case GL_SAMPLER_CUBE:
+   case GL_SAMPLER_1D_SHADOW:
+   case GL_SAMPLER_2D_SHADOW:
+   case GL_SAMPLER_2D_RECT_ARB:
+   case GL_SAMPLER_2D_RECT_SHADOW_ARB:
+   case GL_SAMPLER_1D_ARRAY_EXT:
+   case GL_SAMPLER_2D_ARRAY_EXT:
+   case GL_SAMPLER_1D_ARRAY_SHADOW_EXT:
+   case GL_SAMPLER_2D_ARRAY_SHADOW_EXT:
+   case GL_SAMPLER_CUBE_SHADOW_EXT:
+      return 1;
+   case GL_FLOAT_VEC2:
+   case GL_INT_VEC2:
+   case GL_UNSIGNED_INT_VEC2:
+   case GL_BOOL_VEC2:
+      return 2;
+   case GL_FLOAT_VEC3:
+   case GL_INT_VEC3:
+   case GL_UNSIGNED_INT_VEC3:
+   case GL_BOOL_VEC3:
+      return 3;
+   case GL_FLOAT_VEC4:
+   case GL_INT_VEC4:
+   case GL_UNSIGNED_INT_VEC4:
+   case GL_BOOL_VEC4:
+      return 4;
+   case GL_FLOAT_MAT2:
+   case GL_FLOAT_MAT2x3:
+   case GL_FLOAT_MAT2x4:
+      return 8; /* two float[4] vectors */
+   case GL_FLOAT_MAT3:
+   case GL_FLOAT_MAT3x2:
+   case GL_FLOAT_MAT3x4:
+      return 12; /* three float[4] vectors */
+   case GL_FLOAT_MAT4:
+   case GL_FLOAT_MAT4x2:
+   case GL_FLOAT_MAT4x3:
+      return 16;  /* four float[4] vectors */
+   default:
+      _mesa_problem(NULL, "Invalid type in _mesa_sizeof_glsl_type()");
+      return 1;
+   }
+}
+
+
+/**
+ * Copy string from <src> to <dst>, up to maxLength characters, returning
+ * length of <dst> in <length>.
+ * \param src  the strings source
+ * \param maxLength  max chars to copy
+ * \param length  returns number of chars copied
+ * \param dst  the string destination
+ */
+void
+_mesa_copy_string(GLchar *dst, GLsizei maxLength,
+                  GLsizei *length, const GLchar *src)
+{
+   GLsizei len;
+   for (len = 0; len < maxLength - 1 && src && src[len]; len++)
+      dst[len] = src[len];
+   if (maxLength > 0)
+      dst[len] = 0;
+   if (length)
+      *length = len;
+}
+
+
+
+/**
+ * Find the length of the longest transform feedback varying name
+ * which was specified with glTransformFeedbackVaryings().
+ */
+static GLint
+longest_feedback_varying_name(const struct gl_shader_program *shProg)
+{
+   GLuint i;
+   GLint max = 0;
+   for (i = 0; i < shProg->TransformFeedback.NumVarying; i++) {
+      GLint len = strlen(shProg->TransformFeedback.VaryingNames[i]);
+      if (len > max)
+         max = len;
+   }
+   return max;
+}
+
+
+
+static GLboolean
+is_program(GLcontext *ctx, GLuint name)
+{
+   struct gl_shader_program *shProg = _mesa_lookup_shader_program(ctx, name);
+   return shProg ? GL_TRUE : GL_FALSE;
+}
+
+
+static GLboolean
+is_shader(GLcontext *ctx, GLuint name)
+{
+   struct gl_shader *shader = _mesa_lookup_shader(ctx, name);
+   return shader ? GL_TRUE : GL_FALSE;
+}
+
+
+/**
+ * Attach shader to a shader program.
+ */
+static void
+attach_shader(GLcontext *ctx, GLuint program, GLuint shader)
+{
+   struct gl_shader_program *shProg;
+   struct gl_shader *sh;
+   GLuint i, n;
+
+   shProg = _mesa_lookup_shader_program_err(ctx, program, "glAttachShader");
+   if (!shProg)
+      return;
+
+   sh = _mesa_lookup_shader_err(ctx, shader, "glAttachShader");
+   if (!sh) {
+      return;
+   }
+
+   n = shProg->NumShaders;
+   for (i = 0; i < n; i++) {
+      if (shProg->Shaders[i] == sh) {
+         /* The shader is already attched to this program.  The
+          * GL_ARB_shader_objects spec says:
+          *
+          *     "The error INVALID_OPERATION is generated by AttachObjectARB
+          *     if <obj> is already attached to <containerObj>."
+          */
+         _mesa_error(ctx, GL_INVALID_OPERATION, "glAttachShader");
+         return;
+      }
+   }
+
+   /* grow list */
+   shProg->Shaders = (struct gl_shader **)
+      _mesa_realloc(shProg->Shaders,
+                    n * sizeof(struct gl_shader *),
+                    (n + 1) * sizeof(struct gl_shader *));
+   if (!shProg->Shaders) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glAttachShader");
+      return;
+   }
+
+   /* append */
+   shProg->Shaders[n] = NULL; /* since realloc() didn't zero the new space */
+   _mesa_reference_shader(ctx, &shProg->Shaders[n], sh);
+   shProg->NumShaders++;
+}
+
+
+static GLint
+get_attrib_location(GLcontext *ctx, GLuint program, const GLchar *name)
+{
+   struct gl_shader_program *shProg
+      = _mesa_lookup_shader_program_err(ctx, program, "glGetAttribLocation");
+
+   if (!shProg) {
+      return -1;
+   }
+
+   if (!shProg->LinkStatus) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glGetAttribLocation(program not linked)");
+      return -1;
+   }
+
+   if (!name)
+      return -1;
+
+   if (shProg->VertexProgram) {
+      const struct gl_program_parameter_list *attribs =
+         shProg->VertexProgram->Base.Attributes;
+      if (attribs) {
+         GLint i = _mesa_lookup_parameter_index(attribs, -1, name);
+         if (i >= 0) {
+            return attribs->Parameters[i].StateIndexes[0];
+         }
+      }
+   }
+   return -1;
+}
+
+
+static void
+bind_attrib_location(GLcontext *ctx, GLuint program, GLuint index,
+                     const GLchar *name)
+{
+   struct gl_shader_program *shProg;
+   const GLint size = -1; /* unknown size */
+   GLint i, oldIndex;
+   GLenum datatype = GL_FLOAT_VEC4;
+
+   shProg = _mesa_lookup_shader_program_err(ctx, program,
+                                            "glBindAttribLocation");
+   if (!shProg) {
+      return;
+   }
+
+   if (!name)
+      return;
+
+   if (strncmp(name, "gl_", 3) == 0) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glBindAttribLocation(illegal name)");
+      return;
+   }
+
+   if (index >= ctx->Const.VertexProgram.MaxAttribs) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glBindAttribLocation(index)");
+      return;
+   }
+
+   if (shProg->LinkStatus) {
+      /* get current index/location for the attribute */
+      oldIndex = get_attrib_location(ctx, program, name);
+   }
+   else {
+      oldIndex = -1;
+   }
+
+   /* this will replace the current value if it's already in the list */
+   i = _mesa_add_attribute(shProg->Attributes, name, size, datatype, index);
+   if (i < 0) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindAttribLocation");
+      return;
+   }
+
+   /*
+    * Note that this attribute binding won't go into effect until
+    * glLinkProgram is called again.
+    */
+}
+
+
+static GLuint
+create_shader(GLcontext *ctx, GLenum type)
+{
+   struct gl_shader *sh;
+   GLuint name;
+
+   name = _mesa_HashFindFreeKeyBlock(ctx->Shared->ShaderObjects, 1);
+
+   switch (type) {
+   case GL_FRAGMENT_SHADER:
+   case GL_VERTEX_SHADER:
+   case GL_GEOMETRY_SHADER_ARB:
+      sh = ctx->Driver.NewShader(ctx, name, type);
+      break;
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM, "CreateShader(type)");
+      return 0;
+   }
+
+   _mesa_HashInsert(ctx->Shared->ShaderObjects, name, sh);
+
+   return name;
+}
+
+
+static GLuint 
+create_shader_program(GLcontext *ctx)
+{
+   GLuint name;
+   struct gl_shader_program *shProg;
+
+   name = _mesa_HashFindFreeKeyBlock(ctx->Shared->ShaderObjects, 1);
+
+   shProg = ctx->Driver.NewShaderProgram(ctx, name);
+
+   _mesa_HashInsert(ctx->Shared->ShaderObjects, name, shProg);
+
+   assert(shProg->RefCount == 1);
+
+   return name;
+}
+
+
+/**
+ * Named w/ "2" to indicate OpenGL 2.x vs GL_ARB_fragment_programs's
+ * DeleteProgramARB.
+ */
+static void
+delete_shader_program(GLcontext *ctx, GLuint name)
+{
+   /*
+    * NOTE: deleting shaders/programs works a bit differently than
+    * texture objects (and buffer objects, etc).  Shader/program
+    * handles/IDs exist in the hash table until the object is really
+    * deleted (refcount==0).  With texture objects, the handle/ID is
+    * removed from the hash table in glDeleteTextures() while the tex
+    * object itself might linger until its refcount goes to zero.
+    */
+   struct gl_shader_program *shProg;
+
+   shProg = _mesa_lookup_shader_program_err(ctx, name, "glDeleteProgram");
+   if (!shProg)
+      return;
+
+   shProg->DeletePending = GL_TRUE;
+
+   /* effectively, decr shProg's refcount */
+   _mesa_reference_shader_program(ctx, &shProg, NULL);
+}
+
+
+static void
+delete_shader(GLcontext *ctx, GLuint shader)
+{
+   struct gl_shader *sh;
+
+   sh = _mesa_lookup_shader_err(ctx, shader, "glDeleteShader");
+   if (!sh)
+      return;
+
+   sh->DeletePending = GL_TRUE;
+
+   /* effectively, decr sh's refcount */
+   _mesa_reference_shader(ctx, &sh, NULL);
+}
+
+
+static void
+detach_shader(GLcontext *ctx, GLuint program, GLuint shader)
+{
+   struct gl_shader_program *shProg;
+   GLuint n;
+   GLuint i, j;
+
+   shProg = _mesa_lookup_shader_program_err(ctx, program, "glDetachShader");
+   if (!shProg)
+      return;
+
+   n = shProg->NumShaders;
+
+   for (i = 0; i < n; i++) {
+      if (shProg->Shaders[i]->Name == shader) {
+         /* found it */
+         struct gl_shader **newList;
+
+         /* release */
+         _mesa_reference_shader(ctx, &shProg->Shaders[i], NULL);
+
+         /* alloc new, smaller array */
+         newList = (struct gl_shader **)
+            malloc((n - 1) * sizeof(struct gl_shader *));
+         if (!newList) {
+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glDetachShader");
+            return;
+         }
+         for (j = 0; j < i; j++) {
+            newList[j] = shProg->Shaders[j];
+         }
+         while (++i < n)
+            newList[j++] = shProg->Shaders[i];
+         free(shProg->Shaders);
+
+         shProg->Shaders = newList;
+         shProg->NumShaders = n - 1;
+
+#ifdef DEBUG
+         /* sanity check */
+         {
+            for (j = 0; j < shProg->NumShaders; j++) {
+               assert(shProg->Shaders[j]->Type == GL_VERTEX_SHADER ||
+                      shProg->Shaders[j]->Type == GL_FRAGMENT_SHADER);
+               assert(shProg->Shaders[j]->RefCount > 0);
+            }
+         }
+#endif
+
+         return;
+      }
+   }
+
+   /* not found */
+   {
+      GLenum err;
+      if (is_shader(ctx, shader))
+         err = GL_INVALID_OPERATION;
+      else if (is_program(ctx, shader))
+         err = GL_INVALID_OPERATION;
+      else
+         err = GL_INVALID_VALUE;
+      _mesa_error(ctx, err, "glDetachProgram(shader)");
+      return;
+   }
+}
+
+
+static void
+get_active_attrib(GLcontext *ctx, GLuint program, GLuint index,
+                  GLsizei maxLength, GLsizei *length, GLint *size,
+                  GLenum *type, GLchar *nameOut)
+{
+   const struct gl_program_parameter_list *attribs = NULL;
+   struct gl_shader_program *shProg;
+
+   shProg = _mesa_lookup_shader_program_err(ctx, program, "glGetActiveAttrib");
+   if (!shProg)
+      return;
+
+   if (shProg->VertexProgram)
+      attribs = shProg->VertexProgram->Base.Attributes;
+
+   if (!attribs || index >= attribs->NumParameters) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glGetActiveAttrib(index)");
+      return;
+   }
+
+   _mesa_copy_string(nameOut, maxLength, length,
+                     attribs->Parameters[index].Name);
+
+   if (size)
+      *size = attribs->Parameters[index].Size
+         / _mesa_sizeof_glsl_type(attribs->Parameters[index].DataType);
+
+   if (type)
+      *type = attribs->Parameters[index].DataType;
+}
+
+
+/**
+ * Return list of shaders attached to shader program.
+ */
+static void
+get_attached_shaders(GLcontext *ctx, GLuint program, GLsizei maxCount,
+                     GLsizei *count, GLuint *obj)
+{
+   struct gl_shader_program *shProg =
+      _mesa_lookup_shader_program_err(ctx, program, "glGetAttachedShaders");
+   if (shProg) {
+      GLuint i;
+      for (i = 0; i < (GLuint) maxCount && i < shProg->NumShaders; i++) {
+         obj[i] = shProg->Shaders[i]->Name;
+      }
+      if (count)
+         *count = i;
+   }
+}
+
+
+/**
+ * glGetHandleARB() - return ID/name of currently bound shader program.
+ */
+static GLuint
+get_handle(GLcontext *ctx, GLenum pname)
+{
+   if (pname == GL_PROGRAM_OBJECT_ARB) {
+      if (ctx->Shader.CurrentProgram)
+         return ctx->Shader.CurrentProgram->Name;
+      else
+         return 0;
+   }
+   else {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetHandleARB");
+      return 0;
+   }
+}
+
+
+/**
+ * glGetProgramiv() - get shader program state.
+ * Note that this is for GLSL shader programs, not ARB vertex/fragment
+ * programs (see glGetProgramivARB).
+ */
+static void
+get_programiv(GLcontext *ctx, GLuint program, GLenum pname, GLint *params)
+{
+   const struct gl_program_parameter_list *attribs;
+   struct gl_shader_program *shProg
+      = _mesa_lookup_shader_program(ctx, program);
+
+   if (!shProg) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glGetProgramiv(program)");
+      return;
+   }
+
+   if (shProg->VertexProgram)
+      attribs = shProg->VertexProgram->Base.Attributes;
+   else
+      attribs = NULL;
+
+   switch (pname) {
+   case GL_DELETE_STATUS:
+      *params = shProg->DeletePending;
+      break; 
+   case GL_LINK_STATUS:
+      *params = shProg->LinkStatus;
+      break;
+   case GL_VALIDATE_STATUS:
+      *params = shProg->Validated;
+      break;
+   case GL_INFO_LOG_LENGTH:
+      *params = shProg->InfoLog ? strlen(shProg->InfoLog) + 1 : 0;
+      break;
+   case GL_ATTACHED_SHADERS:
+      *params = shProg->NumShaders;
+      break;
+   case GL_ACTIVE_ATTRIBUTES:
+      *params = attribs ? attribs->NumParameters : 0;
+      break;
+   case GL_ACTIVE_ATTRIBUTE_MAX_LENGTH:
+      *params = _mesa_longest_parameter_name(attribs, PROGRAM_INPUT) + 1;
+      break;
+   case GL_ACTIVE_UNIFORMS:
+      *params = shProg->Uniforms ? shProg->Uniforms->NumUniforms : 0;
+      break;
+   case GL_ACTIVE_UNIFORM_MAX_LENGTH:
+      *params = _mesa_longest_uniform_name(shProg->Uniforms);
+      if (*params > 0)
+         (*params)++;  /* add one for terminating zero */
+      break;
+   case GL_PROGRAM_BINARY_LENGTH_OES:
+      *params = 0;
+      break;
+#if FEATURE_EXT_transform_feedback
+   case GL_TRANSFORM_FEEDBACK_VARYINGS:
+      *params = shProg->TransformFeedback.NumVarying;
+      break;
+   case GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH:
+      *params = longest_feedback_varying_name(shProg) + 1;
+      break;
+   case GL_TRANSFORM_FEEDBACK_BUFFER_MODE:
+      *params = shProg->TransformFeedback.BufferMode;
+      break;
+#endif
+#if FEATURE_ARB_geometry_shader4
+   case GL_GEOMETRY_VERTICES_OUT_ARB:
+      *params = shProg->Geom.VerticesOut;
+      break;
+   case GL_GEOMETRY_INPUT_TYPE_ARB:
+      *params = shProg->Geom.InputType;
+      break;
+   case GL_GEOMETRY_OUTPUT_TYPE_ARB:
+      *params = shProg->Geom.OutputType;
+      break;
+#endif
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramiv(pname)");
+      return;
+   }
+}
+
+
+/**
+ * glGetShaderiv() - get GLSL shader state
+ */
+static void
+get_shaderiv(GLcontext *ctx, GLuint name, GLenum pname, GLint *params)
+{
+   struct gl_shader *shader =
+      _mesa_lookup_shader_err(ctx, name, "glGetShaderiv");
+
+   if (!shader) {
+      return;
+   }
+
+   switch (pname) {
+   case GL_SHADER_TYPE:
+      *params = shader->Type;
+      break;
+   case GL_DELETE_STATUS:
+      *params = shader->DeletePending;
+      break;
+   case GL_COMPILE_STATUS:
+      *params = shader->CompileStatus;
+      break;
+   case GL_INFO_LOG_LENGTH:
+      *params = shader->InfoLog ? strlen(shader->InfoLog) + 1 : 0;
+      break;
+   case GL_SHADER_SOURCE_LENGTH:
+      *params = shader->Source ? strlen((char *) shader->Source) + 1 : 0;
+      break;
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetShaderiv(pname)");
+      return;
+   }
+}
+
+
+static void
+get_program_info_log(GLcontext *ctx, GLuint program, GLsizei bufSize,
+                     GLsizei *length, GLchar *infoLog)
+{
+   struct gl_shader_program *shProg
+      = _mesa_lookup_shader_program(ctx, program);
+   if (!shProg) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glGetProgramInfoLog(program)");
+      return;
+   }
+   _mesa_copy_string(infoLog, bufSize, length, shProg->InfoLog);
+}
+
+
+static void
+get_shader_info_log(GLcontext *ctx, GLuint shader, GLsizei bufSize,
+                    GLsizei *length, GLchar *infoLog)
+{
+   struct gl_shader *sh = _mesa_lookup_shader(ctx, shader);
+   if (!sh) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glGetShaderInfoLog(shader)");
+      return;
+   }
+   _mesa_copy_string(infoLog, bufSize, length, sh->InfoLog);
+}
+
+
+/**
+ * Return shader source code.
+ */
+static void
+get_shader_source(GLcontext *ctx, GLuint shader, GLsizei maxLength,
+                  GLsizei *length, GLchar *sourceOut)
+{
+   struct gl_shader *sh;
+   sh = _mesa_lookup_shader_err(ctx, shader, "glGetShaderSource");
+   if (!sh) {
+      return;
+   }
+   _mesa_copy_string(sourceOut, maxLength, length, sh->Source);
+}
+
+
+/**
+ * Set/replace shader source code.
+ */
+static void
+shader_source(GLcontext *ctx, GLuint shader, const GLchar *source)
+{
+   struct gl_shader *sh;
+
+   sh = _mesa_lookup_shader_err(ctx, shader, "glShaderSource");
+   if (!sh)
+      return;
+
+   /* free old shader source string and install new one */
+   if (sh->Source) {
+      free((void *) sh->Source);
+   }
+   sh->Source = source;
+   sh->CompileStatus = GL_FALSE;
+#ifdef DEBUG
+   sh->SourceChecksum = _mesa_str_checksum(sh->Source);
+#endif
+}
+
+
+/**
+ * Compile a shader.
+ */
+static void
+compile_shader(GLcontext *ctx, GLuint shaderObj)
+{
+   struct gl_shader *sh;
+   struct gl_shader_compiler_options *options;
+
+   sh = _mesa_lookup_shader_err(ctx, shaderObj, "glCompileShader");
+   if (!sh)
+      return;
+
+   options = &ctx->ShaderCompilerOptions[_mesa_shader_type_to_index(sh->Type)];
+
+   /* set default pragma state for shader */
+   sh->Pragmas = options->DefaultPragmas;
+
+   /* this call will set the sh->CompileStatus field to indicate if
+    * compilation was successful.
+    */
+   _mesa_glsl_compile_shader(ctx, sh);
+}
+
+
+/**
+ * Link a program's shaders.
+ */
+static void
+link_program(GLcontext *ctx, GLuint program)
+{
+   struct gl_shader_program *shProg;
+   struct gl_transform_feedback_object *obj =
+      ctx->TransformFeedback.CurrentObject;
+
+   shProg = _mesa_lookup_shader_program_err(ctx, program, "glLinkProgram");
+   if (!shProg)
+      return;
+
+   if (obj->Active && shProg == ctx->Shader.CurrentProgram) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glLinkProgram(transform feedback active");
+      return;
+   }
+
+   FLUSH_VERTICES(ctx, _NEW_PROGRAM);
+
+   _mesa_glsl_link_shader(ctx, shProg);
+
+   /* debug code */
+   if (0) {
+      GLuint i;
+
+      printf("Link %u shaders in program %u: %s\n",
+                   shProg->NumShaders, shProg->Name,
+                   shProg->LinkStatus ? "Success" : "Failed");
+
+      for (i = 0; i < shProg->NumShaders; i++) {
+         printf(" shader %u, type 0x%x\n",
+                      shProg->Shaders[i]->Name,
+                      shProg->Shaders[i]->Type);
+      }
+   }
+}
+
+
+/**
+ * Print basic shader info (for debug).
+ */
+static void
+print_shader_info(const struct gl_shader_program *shProg)
+{
+   GLuint i;
+
+   printf("Mesa: glUseProgram(%u)\n", shProg->Name);
+   for (i = 0; i < shProg->NumShaders; i++) {
+      const char *s;
+      switch (shProg->Shaders[i]->Type) {
+      case GL_VERTEX_SHADER:
+         s = "vertex";
+         break;
+      case GL_FRAGMENT_SHADER:
+         s = "fragment";
+         break;
+      case GL_GEOMETRY_SHADER:
+         s = "geometry";
+         break;
+      default:
+         s = "";
+      }
+      printf("  %s shader %u, checksum %u\n", s, 
+	     shProg->Shaders[i]->Name,
+	     shProg->Shaders[i]->SourceChecksum);
+   }
+   if (shProg->VertexProgram)
+      printf("  vert prog %u\n", shProg->VertexProgram->Base.Id);
+   if (shProg->FragmentProgram)
+      printf("  frag prog %u\n", shProg->FragmentProgram->Base.Id);
+}
+
+
+/**
+ * Use the named shader program for subsequent rendering.
+ */
+void
+_mesa_use_program(GLcontext *ctx, GLuint program)
+{
+   struct gl_shader_program *shProg;
+   struct gl_transform_feedback_object *obj =
+      ctx->TransformFeedback.CurrentObject;
+
+   if (obj->Active) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glUseProgram(transform feedback active)");
+      return;
+   }
+
+   if (ctx->Shader.CurrentProgram &&
+       ctx->Shader.CurrentProgram->Name == program) {
+      /* no-op */
+      return;
+   }
+
+   if (program) {
+      shProg = _mesa_lookup_shader_program_err(ctx, program, "glUseProgram");
+      if (!shProg) {
+         return;
+      }
+      if (!shProg->LinkStatus) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glUseProgram(program %u not linked)", program);
+         return;
+      }
+
+      /* debug code */
+      if (ctx->Shader.Flags & GLSL_USE_PROG) {
+         print_shader_info(shProg);
+      }
+   }
+   else {
+      shProg = NULL;
+   }
+
+   if (ctx->Shader.CurrentProgram != shProg) {
+      FLUSH_VERTICES(ctx, _NEW_PROGRAM | _NEW_PROGRAM_CONSTANTS);
+      _mesa_reference_shader_program(ctx, &ctx->Shader.CurrentProgram, shProg);
+   }
+
+   if (ctx->Driver.UseProgram)
+      ctx->Driver.UseProgram(ctx, shProg);
+}
+
+
+/**
+ * Validate a program's samplers.
+ * Specifically, check that there aren't two samplers of different types
+ * pointing to the same texture unit.
+ * \return GL_TRUE if valid, GL_FALSE if invalid
+ */
+static GLboolean
+validate_samplers(GLcontext *ctx, const struct gl_program *prog, char *errMsg)
+{
+   static const char *targetName[] = {
+      "TEXTURE_2D_ARRAY",
+      "TEXTURE_1D_ARRAY",
+      "TEXTURE_CUBE",
+      "TEXTURE_3D",
+      "TEXTURE_RECT",
+      "TEXTURE_2D",
+      "TEXTURE_1D",
+   };
+   GLint targetUsed[MAX_TEXTURE_IMAGE_UNITS];
+   GLbitfield samplersUsed = prog->SamplersUsed;
+   GLuint i;
+
+   assert(Elements(targetName) == NUM_TEXTURE_TARGETS);
+
+   if (samplersUsed == 0x0)
+      return GL_TRUE;
+
+   for (i = 0; i < Elements(targetUsed); i++)
+      targetUsed[i] = -1;
+
+   /* walk over bits which are set in 'samplers' */
+   while (samplersUsed) {
+      GLuint unit;
+      gl_texture_index target;
+      GLint sampler = _mesa_ffs(samplersUsed) - 1;
+      assert(sampler >= 0);
+      assert(sampler < MAX_TEXTURE_IMAGE_UNITS);
+      unit = prog->SamplerUnits[sampler];
+      target = prog->SamplerTargets[sampler];
+      if (targetUsed[unit] != -1 && targetUsed[unit] != target) {
+         _mesa_snprintf(errMsg, 100,
+		  "Texture unit %d is accessed both as %s and %s",
+		  unit, targetName[targetUsed[unit]], targetName[target]);
+         return GL_FALSE;
+      }
+      targetUsed[unit] = target;
+      samplersUsed ^= (1 << sampler);
+   }
+
+   return GL_TRUE;
+}
+
+
+/**
+ * Do validation of the given shader program.
+ * \param errMsg  returns error message if validation fails.
+ * \return GL_TRUE if valid, GL_FALSE if invalid (and set errMsg)
+ */
+static GLboolean
+validate_shader_program(GLcontext *ctx,
+                        const struct gl_shader_program *shProg,
+                        char *errMsg)
+{
+   const struct gl_vertex_program *vp = shProg->VertexProgram;
+   const struct gl_fragment_program *fp = shProg->FragmentProgram;
+
+   if (!shProg->LinkStatus) {
+      return GL_FALSE;
+   }
+
+   /* From the GL spec, a program is invalid if any of these are true:
+
+     any two active samplers in the current program object are of
+     different types, but refer to the same texture image unit,
+
+     any active sampler in the current program object refers to a texture
+     image unit where fixed-function fragment processing accesses a
+     texture target that does not match the sampler type, or 
+
+     the sum of the number of active samplers in the program and the
+     number of texture image units enabled for fixed-function fragment
+     processing exceeds the combined limit on the total number of texture
+     image units allowed.
+   */
+
+
+   /*
+    * Check: any two active samplers in the current program object are of
+    * different types, but refer to the same texture image unit,
+    */
+   if (vp && !validate_samplers(ctx, &vp->Base, errMsg)) {
+      return GL_FALSE;
+   }
+   if (fp && !validate_samplers(ctx, &fp->Base, errMsg)) {
+      return GL_FALSE;
+   }
+
+   return GL_TRUE;
+}
+
+
+/**
+ * Called via glValidateProgram()
+ */
+static void
+validate_program(GLcontext *ctx, GLuint program)
+{
+   struct gl_shader_program *shProg;
+   char errMsg[100];
+
+   shProg = _mesa_lookup_shader_program_err(ctx, program, "glValidateProgram");
+   if (!shProg) {
+      return;
+   }
+
+   shProg->Validated = validate_shader_program(ctx, shProg, errMsg);
+   if (!shProg->Validated) {
+      /* update info log */
+      if (shProg->InfoLog) {
+         talloc_free(shProg->InfoLog);
+      }
+      shProg->InfoLog = talloc_strdup(shProg, errMsg);
+   }
+}
+
+
+
+void GLAPIENTRY
+_mesa_AttachObjectARB(GLhandleARB program, GLhandleARB shader)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   attach_shader(ctx, program, shader);
+}
+
+
+void GLAPIENTRY
+_mesa_AttachShader(GLuint program, GLuint shader)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   attach_shader(ctx, program, shader);
+}
+
+
+void GLAPIENTRY
+_mesa_BindAttribLocationARB(GLhandleARB program, GLuint index,
+                            const GLcharARB *name)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   bind_attrib_location(ctx, program, index, name);
+}
+
+
+void GLAPIENTRY
+_mesa_CompileShaderARB(GLhandleARB shaderObj)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   compile_shader(ctx, shaderObj);
+}
+
+
+GLuint GLAPIENTRY
+_mesa_CreateShader(GLenum type)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   return create_shader(ctx, type);
+}
+
+
+GLhandleARB GLAPIENTRY
+_mesa_CreateShaderObjectARB(GLenum type)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   return create_shader(ctx, type);
+}
+
+
+GLuint GLAPIENTRY
+_mesa_CreateProgram(void)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   return create_shader_program(ctx);
+}
+
+
+GLhandleARB GLAPIENTRY
+_mesa_CreateProgramObjectARB(void)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   return create_shader_program(ctx);
+}
+
+
+void GLAPIENTRY
+_mesa_DeleteObjectARB(GLhandleARB obj)
+{
+   if (obj) {
+      GET_CURRENT_CONTEXT(ctx);
+      if (is_program(ctx, obj)) {
+         delete_shader_program(ctx, obj);
+      }
+      else if (is_shader(ctx, obj)) {
+         delete_shader(ctx, obj);
+      }
+      else {
+         /* error? */
+      }
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_DeleteProgram(GLuint name)
+{
+   if (name) {
+      GET_CURRENT_CONTEXT(ctx);
+      delete_shader_program(ctx, name);
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_DeleteShader(GLuint name)
+{
+   if (name) {
+      GET_CURRENT_CONTEXT(ctx);
+      delete_shader(ctx, name);
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_DetachObjectARB(GLhandleARB program, GLhandleARB shader)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   detach_shader(ctx, program, shader);
+}
+
+
+void GLAPIENTRY
+_mesa_DetachShader(GLuint program, GLuint shader)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   detach_shader(ctx, program, shader);
+}
+
+
+void GLAPIENTRY
+_mesa_GetActiveAttribARB(GLhandleARB program, GLuint index,
+                         GLsizei maxLength, GLsizei * length, GLint * size,
+                         GLenum * type, GLcharARB * name)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   get_active_attrib(ctx, program, index, maxLength, length, size, type, name);
+}
+
+
+void GLAPIENTRY
+_mesa_GetAttachedObjectsARB(GLhandleARB container, GLsizei maxCount,
+                            GLsizei * count, GLhandleARB * obj)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   get_attached_shaders(ctx, container, maxCount, count, obj);
+}
+
+
+void GLAPIENTRY
+_mesa_GetAttachedShaders(GLuint program, GLsizei maxCount,
+                         GLsizei *count, GLuint *obj)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   get_attached_shaders(ctx, program, maxCount, count, obj);
+}
+
+
+GLint GLAPIENTRY
+_mesa_GetAttribLocationARB(GLhandleARB program, const GLcharARB * name)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   return get_attrib_location(ctx, program, name);
+}
+
+
+void GLAPIENTRY
+_mesa_GetInfoLogARB(GLhandleARB object, GLsizei maxLength, GLsizei * length,
+                    GLcharARB * infoLog)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (is_program(ctx, object)) {
+      get_program_info_log(ctx, object, maxLength, length, infoLog);
+   }
+   else if (is_shader(ctx, object)) {
+      get_shader_info_log(ctx, object, maxLength, length, infoLog);
+   }
+   else {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetInfoLogARB");
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_GetObjectParameterivARB(GLhandleARB object, GLenum pname, GLint *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   /* Implement in terms of GetProgramiv, GetShaderiv */
+   if (is_program(ctx, object)) {
+      if (pname == GL_OBJECT_TYPE_ARB) {
+	 *params = GL_PROGRAM_OBJECT_ARB;
+      }
+      else {
+	 get_programiv(ctx, object, pname, params);
+      }
+   }
+   else if (is_shader(ctx, object)) {
+      if (pname == GL_OBJECT_TYPE_ARB) {
+	 *params = GL_SHADER_OBJECT_ARB;
+      }
+      else {
+	 get_shaderiv(ctx, object, pname, params);
+      }
+   }
+   else {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glGetObjectParameterivARB");
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_GetObjectParameterfvARB(GLhandleARB object, GLenum pname,
+                              GLfloat *params)
+{
+   GLint iparams[1];  /* XXX is one element enough? */
+   _mesa_GetObjectParameterivARB(object, pname, iparams);
+   params[0] = (GLfloat) iparams[0];
+}
+
+
+void GLAPIENTRY
+_mesa_GetProgramiv(GLuint program, GLenum pname, GLint *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   get_programiv(ctx, program, pname, params);
+}
+
+
+void GLAPIENTRY
+_mesa_GetShaderiv(GLuint shader, GLenum pname, GLint *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   get_shaderiv(ctx, shader, pname, params);
+}
+
+
+void GLAPIENTRY
+_mesa_GetProgramInfoLog(GLuint program, GLsizei bufSize,
+                        GLsizei *length, GLchar *infoLog)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   get_program_info_log(ctx, program, bufSize, length, infoLog);
+}
+
+
+void GLAPIENTRY
+_mesa_GetShaderInfoLog(GLuint shader, GLsizei bufSize,
+                       GLsizei *length, GLchar *infoLog)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   get_shader_info_log(ctx, shader, bufSize, length, infoLog);
+}
+
+
+void GLAPIENTRY
+_mesa_GetShaderSourceARB(GLhandleARB shader, GLsizei maxLength,
+                         GLsizei *length, GLcharARB *sourceOut)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   get_shader_source(ctx, shader, maxLength, length, sourceOut);
+}
+
+
+GLhandleARB GLAPIENTRY
+_mesa_GetHandleARB(GLenum pname)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   return get_handle(ctx, pname);
+}
+
+
+GLboolean GLAPIENTRY
+_mesa_IsProgram(GLuint name)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   return is_program(ctx, name);
+}
+
+
+GLboolean GLAPIENTRY
+_mesa_IsShader(GLuint name)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   return is_shader(ctx, name);
+}
+
+
+void GLAPIENTRY
+_mesa_LinkProgramARB(GLhandleARB programObj)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   link_program(ctx, programObj);
+}
+
+
+
+/**
+ * Read shader source code from a file.
+ * Useful for debugging to override an app's shader.
+ */
+static GLcharARB *
+read_shader(const char *fname)
+{
+   const int max = 50*1000;
+   FILE *f = fopen(fname, "r");
+   GLcharARB *buffer, *shader;
+   int len;
+
+   if (!f) {
+      return NULL;
+   }
+
+   buffer = (char *) malloc(max);
+   len = fread(buffer, 1, max, f);
+   buffer[len] = 0;
+
+   fclose(f);
+
+   shader = _mesa_strdup(buffer);
+   free(buffer);
+
+   return shader;
+}
+
+
+/**
+ * Called via glShaderSource() and glShaderSourceARB() API functions.
+ * Basically, concatenate the source code strings into one long string
+ * and pass it to _mesa_shader_source().
+ */
+void GLAPIENTRY
+_mesa_ShaderSourceARB(GLhandleARB shaderObj, GLsizei count,
+                      const GLcharARB ** string, const GLint * length)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint *offsets;
+   GLsizei i, totalLength;
+   GLcharARB *source;
+   GLuint checksum;
+
+   if (!shaderObj || string == NULL) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glShaderSourceARB");
+      return;
+   }
+
+   /*
+    * This array holds offsets of where the appropriate string ends, thus the
+    * last element will be set to the total length of the source code.
+    */
+   offsets = (GLint *) malloc(count * sizeof(GLint));
+   if (offsets == NULL) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glShaderSourceARB");
+      return;
+   }
+
+   for (i = 0; i < count; i++) {
+      if (string[i] == NULL) {
+         free((GLvoid *) offsets);
+         _mesa_error(ctx, GL_INVALID_OPERATION, "glShaderSourceARB(null string)");
+         return;
+      }
+      if (length == NULL || length[i] < 0)
+         offsets[i] = strlen(string[i]);
+      else
+         offsets[i] = length[i];
+      /* accumulate string lengths */
+      if (i > 0)
+         offsets[i] += offsets[i - 1];
+   }
+
+   /* Total length of source string is sum off all strings plus two.
+    * One extra byte for terminating zero, another extra byte to silence
+    * valgrind warnings in the parser/grammer code.
+    */
+   totalLength = offsets[count - 1] + 2;
+   source = (GLcharARB *) malloc(totalLength * sizeof(GLcharARB));
+   if (source == NULL) {
+      free((GLvoid *) offsets);
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glShaderSourceARB");
+      return;
+   }
+
+   for (i = 0; i < count; i++) {
+      GLint start = (i > 0) ? offsets[i - 1] : 0;
+      memcpy(source + start, string[i],
+             (offsets[i] - start) * sizeof(GLcharARB));
+   }
+   source[totalLength - 1] = '\0';
+   source[totalLength - 2] = '\0';
+
+   if (SHADER_SUBST) {
+      /* Compute the shader's source code checksum then try to open a file
+       * named newshader_<CHECKSUM>.  If it exists, use it in place of the
+       * original shader source code.  For debugging.
+       */
+      char filename[100];
+      GLcharARB *newSource;
+
+      checksum = _mesa_str_checksum(source);
+
+      _mesa_snprintf(filename, sizeof(filename), "newshader_%d", checksum);
+
+      newSource = read_shader(filename);
+      if (newSource) {
+         fprintf(stderr, "Mesa: Replacing shader %u chksum=%d with %s\n",
+                       shaderObj, checksum, filename);
+         free(source);
+         source = newSource;
+      }
+   }      
+
+   shader_source(ctx, shaderObj, source);
+
+   if (SHADER_SUBST) {
+      struct gl_shader *sh = _mesa_lookup_shader(ctx, shaderObj);
+      if (sh)
+         sh->SourceChecksum = checksum; /* save original checksum */
+   }
+
+   free(offsets);
+}
+
+
+void GLAPIENTRY
+_mesa_UseProgramObjectARB(GLhandleARB program)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, _NEW_PROGRAM);
+   _mesa_use_program(ctx, program);
+}
+
+
+void GLAPIENTRY
+_mesa_ValidateProgramARB(GLhandleARB program)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   validate_program(ctx, program);
+}
+
+#ifdef FEATURE_ES2
+
+void GLAPIENTRY
+_mesa_GetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype,
+                               GLint* range, GLint* precision)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_error(ctx, GL_INVALID_OPERATION, __FUNCTION__);
+}
+
+
+void GLAPIENTRY
+_mesa_ReleaseShaderCompiler(void)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_error(ctx, GL_INVALID_OPERATION, __FUNCTION__);
+}
+
+
+void GLAPIENTRY
+_mesa_ShaderBinary(GLint n, const GLuint* shaders, GLenum binaryformat,
+                   const void* binary, GLint length)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_error(ctx, GL_INVALID_OPERATION, __FUNCTION__);
+}
+
+#endif /* FEATURE_ES2 */
+
+
+#if FEATURE_ARB_geometry_shader4
+
+void GLAPIENTRY
+_mesa_ProgramParameteriARB(GLuint program, GLenum pname,
+                           GLint value)
+{
+   struct gl_shader_program *shProg;
+   GET_CURRENT_CONTEXT(ctx);
+
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   shProg = _mesa_lookup_shader_program_err(ctx, program,
+                                            "glProgramParameteri");
+   if (!shProg)
+      return;
+
+   switch (pname) {
+   case GL_GEOMETRY_VERTICES_OUT_ARB:
+      if (value < 1 ||
+          value > ctx->Const.GeometryProgram.MaxGeometryOutputVertices) {
+         _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glProgramParameteri(GL_GEOMETRY_VERTICES_OUT_ARB=%d",
+                     value);
+         return;
+      }
+      shProg->Geom.VerticesOut = value;
+      break;
+   case GL_GEOMETRY_INPUT_TYPE_ARB:
+      switch (value) {
+      case GL_POINTS:
+      case GL_LINES:
+      case GL_LINES_ADJACENCY_ARB:
+      case GL_TRIANGLES:
+      case GL_TRIANGLES_ADJACENCY_ARB:
+         shProg->Geom.InputType = value;
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glProgramParameteri(geometry input type = %s",
+                     _mesa_lookup_enum_by_nr(value));
+         return;
+      }
+      break;
+   case GL_GEOMETRY_OUTPUT_TYPE_ARB:
+      switch (value) {
+      case GL_POINTS:
+      case GL_LINE_STRIP:
+      case GL_TRIANGLE_STRIP:
+         shProg->Geom.OutputType = value;
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glProgramParameteri(geometry output type = %s",
+                     _mesa_lookup_enum_by_nr(value));
+         return;
+      }
+      break;
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM, "glProgramParameteriARB(pname=%s)",
+                  _mesa_lookup_enum_by_nr(pname));
+      break;
+   }
+}
+
+#endif
+
+
+/**
+ * Plug in shader-related functions into API dispatch table.
+ */
+void
+_mesa_init_shader_dispatch(struct _glapi_table *exec)
+{
+#if FEATURE_GL
+   /* GL_ARB_vertex/fragment_shader */
+   SET_DeleteObjectARB(exec, _mesa_DeleteObjectARB);
+   SET_GetHandleARB(exec, _mesa_GetHandleARB);
+   SET_DetachObjectARB(exec, _mesa_DetachObjectARB);
+   SET_CreateShaderObjectARB(exec, _mesa_CreateShaderObjectARB);
+   SET_ShaderSourceARB(exec, _mesa_ShaderSourceARB);
+   SET_CompileShaderARB(exec, _mesa_CompileShaderARB);
+   SET_CreateProgramObjectARB(exec, _mesa_CreateProgramObjectARB);
+   SET_AttachObjectARB(exec, _mesa_AttachObjectARB);
+   SET_LinkProgramARB(exec, _mesa_LinkProgramARB);
+   SET_UseProgramObjectARB(exec, _mesa_UseProgramObjectARB);
+   SET_ValidateProgramARB(exec, _mesa_ValidateProgramARB);
+   SET_GetObjectParameterfvARB(exec, _mesa_GetObjectParameterfvARB);
+   SET_GetObjectParameterivARB(exec, _mesa_GetObjectParameterivARB);
+   SET_GetInfoLogARB(exec, _mesa_GetInfoLogARB);
+   SET_GetAttachedObjectsARB(exec, _mesa_GetAttachedObjectsARB);
+   SET_GetShaderSourceARB(exec, _mesa_GetShaderSourceARB);
+
+   /* OpenGL 2.0 */
+   SET_AttachShader(exec, _mesa_AttachShader);
+   SET_CreateProgram(exec, _mesa_CreateProgram);
+   SET_CreateShader(exec, _mesa_CreateShader);
+   SET_DeleteProgram(exec, _mesa_DeleteProgram);
+   SET_DeleteShader(exec, _mesa_DeleteShader);
+   SET_DetachShader(exec, _mesa_DetachShader);
+   SET_GetAttachedShaders(exec, _mesa_GetAttachedShaders);
+   SET_GetProgramiv(exec, _mesa_GetProgramiv);
+   SET_GetProgramInfoLog(exec, _mesa_GetProgramInfoLog);
+   SET_GetShaderiv(exec, _mesa_GetShaderiv);
+   SET_GetShaderInfoLog(exec, _mesa_GetShaderInfoLog);
+   SET_IsProgram(exec, _mesa_IsProgram);
+   SET_IsShader(exec, _mesa_IsShader);
+
+#if FEATURE_ARB_vertex_shader
+   SET_BindAttribLocationARB(exec, _mesa_BindAttribLocationARB);
+   SET_GetActiveAttribARB(exec, _mesa_GetActiveAttribARB);
+   SET_GetAttribLocationARB(exec, _mesa_GetAttribLocationARB);
+#endif
+
+#if FEATURE_ARB_geometry_shader4
+   SET_ProgramParameteriARB(exec, _mesa_ProgramParameteriARB);
+#endif
+#endif /* FEATURE_GL */
+}
+
diff --git a/mesalib/src/mesa/main/shaderapi.h b/mesalib/src/mesa/main/shaderapi.h
new file mode 100644
index 000000000..16e22530d
--- /dev/null
+++ b/mesalib/src/mesa/main/shaderapi.h
@@ -0,0 +1,169 @@
+/*
+ * Mesa 3-D graphics library
+ *
+ * Copyright (C) 2004-2007  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2010  VMware, Inc.  All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef SHADERAPI_H
+#define SHADERAPI_H
+
+
+#include "glheader.h"
+#include "mtypes.h"
+
+
+extern GLint
+_mesa_sizeof_glsl_type(GLenum type);
+
+extern void
+_mesa_copy_string(GLchar *dst, GLsizei maxLength,
+                  GLsizei *length, const GLchar *src);
+
+extern void
+_mesa_use_program(GLcontext *ctx, GLuint program);
+
+
+extern void
+_mesa_init_shader_dispatch(struct _glapi_table *exec);
+
+
+
+extern void GLAPIENTRY
+_mesa_AttachObjectARB(GLhandleARB, GLhandleARB);
+
+extern void  GLAPIENTRY
+_mesa_CompileShaderARB(GLhandleARB);
+
+extern GLhandleARB GLAPIENTRY
+_mesa_CreateProgramObjectARB(void);
+
+extern GLhandleARB GLAPIENTRY
+_mesa_CreateShaderObjectARB(GLenum type);
+
+extern void GLAPIENTRY
+_mesa_DeleteObjectARB(GLhandleARB obj);
+
+extern void GLAPIENTRY
+_mesa_DetachObjectARB(GLhandleARB, GLhandleARB);
+
+extern void GLAPIENTRY
+_mesa_GetAttachedObjectsARB(GLhandleARB, GLsizei, GLsizei *, GLhandleARB *);
+
+extern GLhandleARB GLAPIENTRY
+_mesa_GetHandleARB(GLenum pname);
+
+extern void GLAPIENTRY
+_mesa_GetInfoLogARB(GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
+
+extern void GLAPIENTRY
+_mesa_GetObjectParameterfvARB(GLhandleARB, GLenum, GLfloat *);
+
+extern void GLAPIENTRY
+_mesa_GetObjectParameterivARB(GLhandleARB, GLenum, GLint *);
+
+extern void GLAPIENTRY
+_mesa_GetShaderSourceARB(GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
+
+extern GLboolean GLAPIENTRY
+_mesa_IsProgram(GLuint name);
+
+extern GLboolean GLAPIENTRY
+_mesa_IsShader(GLuint name);
+
+extern void GLAPIENTRY
+_mesa_LinkProgramARB(GLhandleARB programObj);
+
+extern void GLAPIENTRY
+_mesa_ShaderSourceARB(GLhandleARB, GLsizei, const GLcharARB* *, const GLint *);
+
+extern void GLAPIENTRY
+_mesa_UseProgramObjectARB(GLhandleARB);
+
+extern void GLAPIENTRY
+_mesa_ValidateProgramARB(GLhandleARB);
+
+
+extern void GLAPIENTRY
+_mesa_BindAttribLocationARB(GLhandleARB, GLuint, const GLcharARB *);
+
+extern void GLAPIENTRY
+_mesa_GetActiveAttribARB(GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *,
+                         GLenum *, GLcharARB *);
+
+extern GLint GLAPIENTRY
+_mesa_GetAttribLocationARB(GLhandleARB, const GLcharARB *);
+
+
+
+extern void GLAPIENTRY
+_mesa_AttachShader(GLuint program, GLuint shader);
+
+extern GLuint GLAPIENTRY
+_mesa_CreateShader(GLenum);
+
+extern GLuint GLAPIENTRY
+_mesa_CreateProgram(void);
+
+extern void GLAPIENTRY
+_mesa_DeleteProgram(GLuint program);
+
+extern void GLAPIENTRY
+_mesa_DeleteShader(GLuint shader);
+
+extern void GLAPIENTRY
+_mesa_DetachShader(GLuint program, GLuint shader);
+
+extern void GLAPIENTRY
+_mesa_GetAttachedShaders(GLuint program, GLsizei maxCount,
+                         GLsizei *count, GLuint *obj);
+
+extern void GLAPIENTRY
+_mesa_GetProgramiv(GLuint program, GLenum pname, GLint *params);
+
+extern void GLAPIENTRY
+_mesa_GetProgramInfoLog(GLuint program, GLsizei bufSize,
+                        GLsizei *length, GLchar *infoLog);
+
+extern void GLAPIENTRY
+_mesa_GetShaderiv(GLuint shader, GLenum pname, GLint *params);
+
+extern void GLAPIENTRY
+_mesa_GetShaderInfoLog(GLuint shader, GLsizei bufSize,
+                       GLsizei *length, GLchar *infoLog);
+
+
+extern void GLAPIENTRY
+_mesa_GetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype,
+                               GLint *range, GLint *precision);
+
+extern void GLAPIENTRY
+_mesa_ReleaseShaderCompiler(void);
+
+extern void GLAPIENTRY
+_mesa_ShaderBinary(GLint n, const GLuint *shaders, GLenum binaryformat,
+                   const void* binary, GLint length);
+
+extern void GLAPIENTRY
+_mesa_ProgramParameteriARB(GLuint program, GLenum pname,
+                           GLint value);
+
+#endif /* SHADERAPI_H */
diff --git a/mesalib/src/mesa/main/shaderobj.c b/mesalib/src/mesa/main/shaderobj.c
new file mode 100644
index 000000000..2de8f2798
--- /dev/null
+++ b/mesalib/src/mesa/main/shaderobj.c
@@ -0,0 +1,408 @@
+/*
+ * Mesa 3-D graphics library
+ *
+ * Copyright (C) 2004-2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009-2010  VMware, Inc.  All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, 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 shaderobj.c
+ * \author Brian Paul
+ *
+ */
+
+
+#include "main/glheader.h"
+#include "main/context.h"
+#include "main/hash.h"
+#include "main/shaderobj.h"
+#include "program/program.h"
+#include "program/prog_parameter.h"
+#include "program/prog_uniform.h"
+#include "talloc.h"
+
+/**********************************************************************/
+/*** Shader object functions                                        ***/
+/**********************************************************************/
+
+
+/**
+ * Set ptr to point to sh.
+ * If ptr is pointing to another shader, decrement its refcount (and delete
+ * if refcount hits zero).
+ * Then set ptr to point to sh, incrementing its refcount.
+ */
+void
+_mesa_reference_shader(GLcontext *ctx, struct gl_shader **ptr,
+                       struct gl_shader *sh)
+{
+   assert(ptr);
+   if (*ptr == sh) {
+      /* no-op */
+      return;
+   }
+   if (*ptr) {
+      /* Unreference the old shader */
+      GLboolean deleteFlag = GL_FALSE;
+      struct gl_shader *old = *ptr;
+
+      ASSERT(old->RefCount > 0);
+      old->RefCount--;
+      /*printf("SHADER DECR %p (%d) to %d\n",
+        (void*) old, old->Name, old->RefCount);*/
+      deleteFlag = (old->RefCount == 0);
+
+      if (deleteFlag) {
+         _mesa_HashRemove(ctx->Shared->ShaderObjects, old->Name);
+         ctx->Driver.DeleteShader(ctx, old);
+      }
+
+      *ptr = NULL;
+   }
+   assert(!*ptr);
+
+   if (sh) {
+      /* reference new */
+      sh->RefCount++;
+      /*printf("SHADER INCR %p (%d) to %d\n",
+        (void*) sh, sh->Name, sh->RefCount);*/
+      *ptr = sh;
+   }
+}
+
+void
+_mesa_init_shader(GLcontext *ctx, struct gl_shader *shader)
+{
+   shader->RefCount = 1;
+}
+
+/**
+ * Allocate a new gl_shader object, initialize it.
+ * Called via ctx->Driver.NewShader()
+ */
+struct gl_shader *
+_mesa_new_shader(GLcontext *ctx, GLuint name, GLenum type)
+{
+   struct gl_shader *shader;
+   assert(type == GL_FRAGMENT_SHADER || type == GL_VERTEX_SHADER ||
+          type == GL_GEOMETRY_SHADER_ARB);
+   shader = talloc_zero(NULL, struct gl_shader);
+   if (shader) {
+      shader->Type = type;
+      shader->Name = name;
+      _mesa_init_shader(ctx, shader);
+   }
+   return shader;
+}
+
+
+/**
+ * Delete a shader object.
+ * Called via ctx->Driver.DeleteShader().
+ */
+static void
+_mesa_delete_shader(GLcontext *ctx, struct gl_shader *sh)
+{
+   if (sh->Source)
+      free((void *) sh->Source);
+   _mesa_reference_program(ctx, &sh->Program, NULL);
+   talloc_free(sh);
+}
+
+
+/**
+ * Lookup a GLSL shader object.
+ */
+struct gl_shader *
+_mesa_lookup_shader(GLcontext *ctx, GLuint name)
+{
+   if (name) {
+      struct gl_shader *sh = (struct gl_shader *)
+         _mesa_HashLookup(ctx->Shared->ShaderObjects, name);
+      /* Note that both gl_shader and gl_shader_program objects are kept
+       * in the same hash table.  Check the object's type to be sure it's
+       * what we're expecting.
+       */
+      if (sh && sh->Type == GL_SHADER_PROGRAM_MESA) {
+         return NULL;
+      }
+      return sh;
+   }
+   return NULL;
+}
+
+
+/**
+ * As above, but record an error if shader is not found.
+ */
+struct gl_shader *
+_mesa_lookup_shader_err(GLcontext *ctx, GLuint name, const char *caller)
+{
+   if (!name) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "%s", caller);
+      return NULL;
+   }
+   else {
+      struct gl_shader *sh = (struct gl_shader *)
+         _mesa_HashLookup(ctx->Shared->ShaderObjects, name);
+      if (!sh) {
+         _mesa_error(ctx, GL_INVALID_VALUE, "%s", caller);
+         return NULL;
+      }
+      if (sh->Type == GL_SHADER_PROGRAM_MESA) {
+         _mesa_error(ctx, GL_INVALID_OPERATION, "%s", caller);
+         return NULL;
+      }
+      return sh;
+   }
+}
+
+
+
+/**********************************************************************/
+/*** Shader Program object functions                                ***/
+/**********************************************************************/
+
+
+/**
+ * Set ptr to point to shProg.
+ * If ptr is pointing to another object, decrement its refcount (and delete
+ * if refcount hits zero).
+ * Then set ptr to point to shProg, incrementing its refcount.
+ */
+void
+_mesa_reference_shader_program(GLcontext *ctx,
+                               struct gl_shader_program **ptr,
+                               struct gl_shader_program *shProg)
+{
+   assert(ptr);
+   if (*ptr == shProg) {
+      /* no-op */
+      return;
+   }
+   if (*ptr) {
+      /* Unreference the old shader program */
+      GLboolean deleteFlag = GL_FALSE;
+      struct gl_shader_program *old = *ptr;
+
+      ASSERT(old->RefCount > 0);
+      old->RefCount--;
+#if 0
+      printf("ShaderProgram %p ID=%u  RefCount-- to %d\n",
+             (void *) old, old->Name, old->RefCount);
+#endif
+      deleteFlag = (old->RefCount == 0);
+
+      if (deleteFlag) {
+         _mesa_HashRemove(ctx->Shared->ShaderObjects, old->Name);
+         ctx->Driver.DeleteShaderProgram(ctx, old);
+      }
+
+      *ptr = NULL;
+   }
+   assert(!*ptr);
+
+   if (shProg) {
+      shProg->RefCount++;
+#if 0
+      printf("ShaderProgram %p ID=%u  RefCount++ to %d\n",
+             (void *) shProg, shProg->Name, shProg->RefCount);
+#endif
+      *ptr = shProg;
+   }
+}
+
+void
+_mesa_init_shader_program(GLcontext *ctx, struct gl_shader_program *prog)
+{
+   prog->Type = GL_SHADER_PROGRAM_MESA;
+   prog->RefCount = 1;
+   prog->Attributes = _mesa_new_parameter_list();
+#if FEATURE_ARB_geometry_shader4
+   prog->Geom.VerticesOut = 0;
+   prog->Geom.InputType = GL_TRIANGLES;
+   prog->Geom.OutputType = GL_TRIANGLE_STRIP;
+#endif
+}
+
+/**
+ * Allocate a new gl_shader_program object, initialize it.
+ * Called via ctx->Driver.NewShaderProgram()
+ */
+static struct gl_shader_program *
+_mesa_new_shader_program(GLcontext *ctx, GLuint name)
+{
+   struct gl_shader_program *shProg;
+   shProg = talloc_zero(NULL, struct gl_shader_program);
+   if (shProg) {
+      shProg->Name = name;
+      _mesa_init_shader_program(ctx, shProg);
+   }
+   return shProg;
+}
+
+
+/**
+ * Clear (free) the shader program state that gets produced by linking.
+ */
+void
+_mesa_clear_shader_program_data(GLcontext *ctx,
+                                struct gl_shader_program *shProg)
+{
+   _mesa_reference_vertprog(ctx, &shProg->VertexProgram, NULL);
+   _mesa_reference_fragprog(ctx, &shProg->FragmentProgram, NULL);
+   _mesa_reference_geomprog(ctx, &shProg->GeometryProgram, NULL);
+
+   if (shProg->Uniforms) {
+      _mesa_free_uniform_list(shProg->Uniforms);
+      shProg->Uniforms = NULL;
+   }
+
+   if (shProg->Varying) {
+      _mesa_free_parameter_list(shProg->Varying);
+      shProg->Varying = NULL;
+   }
+}
+
+
+/**
+ * Free all the data that hangs off a shader program object, but not the
+ * object itself.
+ */
+void
+_mesa_free_shader_program_data(GLcontext *ctx,
+                               struct gl_shader_program *shProg)
+{
+   GLuint i;
+
+   assert(shProg->Type == GL_SHADER_PROGRAM_MESA);
+
+   _mesa_clear_shader_program_data(ctx, shProg);
+
+   if (shProg->Attributes) {
+      _mesa_free_parameter_list(shProg->Attributes);
+      shProg->Attributes = NULL;
+   }
+
+   /* detach shaders */
+   for (i = 0; i < shProg->NumShaders; i++) {
+      _mesa_reference_shader(ctx, &shProg->Shaders[i], NULL);
+   }
+   shProg->NumShaders = 0;
+
+   if (shProg->Shaders) {
+      free(shProg->Shaders);
+      shProg->Shaders = NULL;
+   }
+
+   if (shProg->InfoLog) {
+      talloc_free(shProg->InfoLog);
+      shProg->InfoLog = NULL;
+   }
+
+   /* Transform feedback varying vars */
+   for (i = 0; i < shProg->TransformFeedback.NumVarying; i++) {
+      free(shProg->TransformFeedback.VaryingNames[i]);
+   }
+   free(shProg->TransformFeedback.VaryingNames);
+   shProg->TransformFeedback.VaryingNames = NULL;
+   shProg->TransformFeedback.NumVarying = 0;
+
+
+   for (i = 0; i < shProg->_NumLinkedShaders; i++) {
+      ctx->Driver.DeleteShader(ctx, shProg->_LinkedShaders[i]);
+   }
+   shProg->_NumLinkedShaders = 0;
+}
+
+
+/**
+ * Free/delete a shader program object.
+ * Called via ctx->Driver.DeleteShaderProgram().
+ */
+static void
+_mesa_delete_shader_program(GLcontext *ctx, struct gl_shader_program *shProg)
+{
+   _mesa_free_shader_program_data(ctx, shProg);
+
+   talloc_free(shProg);
+}
+
+
+/**
+ * Lookup a GLSL program object.
+ */
+struct gl_shader_program *
+_mesa_lookup_shader_program(GLcontext *ctx, GLuint name)
+{
+   struct gl_shader_program *shProg;
+   if (name) {
+      shProg = (struct gl_shader_program *)
+         _mesa_HashLookup(ctx->Shared->ShaderObjects, name);
+      /* Note that both gl_shader and gl_shader_program objects are kept
+       * in the same hash table.  Check the object's type to be sure it's
+       * what we're expecting.
+       */
+      if (shProg && shProg->Type != GL_SHADER_PROGRAM_MESA) {
+         return NULL;
+      }
+      return shProg;
+   }
+   return NULL;
+}
+
+
+/**
+ * As above, but record an error if program is not found.
+ */
+struct gl_shader_program *
+_mesa_lookup_shader_program_err(GLcontext *ctx, GLuint name,
+                                const char *caller)
+{
+   if (!name) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "%s", caller);
+      return NULL;
+   }
+   else {
+      struct gl_shader_program *shProg = (struct gl_shader_program *)
+         _mesa_HashLookup(ctx->Shared->ShaderObjects, name);
+      if (!shProg) {
+         _mesa_error(ctx, GL_INVALID_VALUE, "%s", caller);
+         return NULL;
+      }
+      if (shProg->Type != GL_SHADER_PROGRAM_MESA) {
+         _mesa_error(ctx, GL_INVALID_OPERATION, "%s", caller);
+         return NULL;
+      }
+      return shProg;
+   }
+}
+
+
+void
+_mesa_init_shader_object_functions(struct dd_function_table *driver)
+{
+   driver->NewShader = _mesa_new_shader;
+   driver->DeleteShader = _mesa_delete_shader;
+   driver->NewShaderProgram = _mesa_new_shader_program;
+   driver->DeleteShaderProgram = _mesa_delete_shader_program;
+   driver->CompileShader = _mesa_ir_compile_shader;
+   driver->LinkShader = _mesa_ir_link_shader;
+}
diff --git a/mesalib/src/mesa/shader/shader_api.h b/mesalib/src/mesa/main/shaderobj.h
index d08d47373..cbe7ae7b0 100644
--- a/mesalib/src/mesa/shader/shader_api.h
+++ b/mesalib/src/mesa/main/shaderobj.h
@@ -1,9 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.6
+ * Version:  6.5.3
  *
- * Copyright (C) 2004-2006  Brian Paul   All Rights Reserved.
- * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
+ * Copyright (C) 2004-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"),
@@ -24,14 +23,17 @@
  */
 
 
-#ifndef SHADER_API_H
-#define SHADER_API_H
+#ifndef SHADEROBJ_H
+#define SHADEROBJ_H
 
 
 #include "main/glheader.h"
 #include "main/mtypes.h"
+#include "program/ir_to_mesa.h"
 
-
+#ifdef __cplusplus
+extern "C" {
+#endif
 /**
  * Internal functions
  */
@@ -42,59 +44,91 @@ _mesa_init_shader_state(GLcontext * ctx);
 extern void
 _mesa_free_shader_state(GLcontext *ctx);
 
-/*
-extern struct gl_shader_program *
-_mesa_new_shader_program(GLcontext *ctx, GLuint name);
-*/
-extern void
-_mesa_clear_shader_program_data(GLcontext *ctx,
-                                struct gl_shader_program *shProg);
 
 extern void
-_mesa_free_shader_program_data(GLcontext *ctx,
-                               struct gl_shader_program *shProg);
+_mesa_reference_shader(GLcontext *ctx, struct gl_shader **ptr,
+                       struct gl_shader *sh);
+
+extern struct gl_shader *
+_mesa_lookup_shader(GLcontext *ctx, GLuint name);
+
+extern struct gl_shader *
+_mesa_lookup_shader_err(GLcontext *ctx, GLuint name, const char *caller);
+
 
-extern void
-_mesa_free_shader_program(GLcontext *ctx, struct gl_shader_program *shProg);
 
 extern void
 _mesa_reference_shader_program(GLcontext *ctx,
                                struct gl_shader_program **ptr,
                                struct gl_shader_program *shProg);
-
-extern struct gl_shader_program *
-_mesa_lookup_shader_program(GLcontext *ctx, GLuint name);
-
+extern void
+_mesa_init_shader(GLcontext *ctx, struct gl_shader *shader);
 
 extern struct gl_shader *
 _mesa_new_shader(GLcontext *ctx, GLuint name, GLenum type);
 
 extern void
-_mesa_free_shader(GLcontext *ctx, struct gl_shader *sh);
-
-extern void
-_mesa_reference_shader(GLcontext *ctx, struct gl_shader **ptr,
-                       struct gl_shader *sh);
+_mesa_init_shader_program(GLcontext *ctx, struct gl_shader_program *prog);
 
-extern struct gl_shader *
-_mesa_lookup_shader(GLcontext *ctx, GLuint name);
+extern struct gl_shader_program *
+_mesa_lookup_shader_program(GLcontext *ctx, GLuint name);
 
+extern struct gl_shader_program *
+_mesa_lookup_shader_program_err(GLcontext *ctx, GLuint name,
+                                const char *caller);
 
 extern void
-_mesa_update_shader_textures_used(struct gl_program *prog);
-
+_mesa_clear_shader_program_data(GLcontext *ctx,
+                                struct gl_shader_program *shProg);
 
 extern void
-_mesa_use_program(GLcontext *ctx, GLuint program);
+_mesa_free_shader_program_data(GLcontext *ctx,
+                               struct gl_shader_program *shProg);
+
 
 
-extern GLboolean
-_mesa_validate_shader_program(GLcontext *ctx,
-                              const struct gl_shader_program *shProg,
-                              char *errMsg);
+extern void
+_mesa_init_shader_object_functions(struct dd_function_table *driver);
 
 extern void
-_mesa_init_glsl_driver_functions(struct dd_function_table *driver);
+_mesa_init_shader_state(GLcontext *ctx);
 
+extern void
+_mesa_free_shader_state(GLcontext *ctx);
 
-#endif /* SHADER_API_H */
+static INLINE GLuint
+_mesa_shader_type_to_index(GLenum v)
+{
+   switch(v)
+   {
+   case GL_VERTEX_SHADER:
+      return MESA_SHADER_VERTEX;
+   case GL_FRAGMENT_SHADER:
+      return MESA_SHADER_FRAGMENT;
+   case GL_GEOMETRY_SHADER:
+      return MESA_SHADER_GEOMETRY;
+   default:
+      ASSERT(0);
+      return ~0;
+   }
+}
+
+static INLINE GLenum
+_mesa_shader_index_to_type(GLuint i)
+{
+   GLenum enums[MESA_SHADER_TYPES] = {
+         GL_VERTEX_SHADER,
+         GL_FRAGMENT_SHADER,
+         GL_GEOMETRY_SHADER ,
+   };
+   if(i >= MESA_SHADER_TYPES)
+      return 0;
+   else
+      return enums[i];
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SHADEROBJ_H */
diff --git a/mesalib/src/mesa/main/shaders.c b/mesalib/src/mesa/main/shaders.c
deleted file mode 100644
index f382680b4..000000000
--- a/mesalib/src/mesa/main/shaders.c
+++ /dev/null
@@ -1,741 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.3
- *
- * Copyright (C) 2004-2008  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#include "glheader.h"
-#include "context.h"
-#include "shaders.h"
-#include "shader/shader_api.h"
-
-
-/** Define this to enable shader substitution (see below) */
-#define SHADER_SUBST 0
-
-
-
-/**
- * These are basically just wrappers/adaptors for calling the
- * ctx->Driver.foobar() GLSL-related functions.
- *
- * Things are biased toward the OpenGL 2.0 functions rather than the
- * ARB extensions (i.e. the ARB functions are layered on the 2.0 functions).
- *
- * The general idea here is to allow enough modularity such that a
- * completely different GLSL implemenation can be plugged in and co-exist
- * with Mesa's native GLSL code.
- */
-
-
-
-void GLAPIENTRY
-_mesa_AttachObjectARB(GLhandleARB program, GLhandleARB shader)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.AttachShader(ctx, program, shader);
-}
-
-
-void GLAPIENTRY
-_mesa_AttachShader(GLuint program, GLuint shader)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.AttachShader(ctx, program, shader);
-}
-
-
-void GLAPIENTRY
-_mesa_BindAttribLocationARB(GLhandleARB program, GLuint index,
-                            const GLcharARB *name)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.BindAttribLocation(ctx, program, index, name);
-}
-
-
-void GLAPIENTRY
-_mesa_CompileShaderARB(GLhandleARB shaderObj)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.CompileShader(ctx, shaderObj);
-}
-
-
-GLuint GLAPIENTRY
-_mesa_CreateShader(GLenum type)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   return ctx->Driver.CreateShader(ctx, type);
-}
-
-
-GLhandleARB GLAPIENTRY
-_mesa_CreateShaderObjectARB(GLenum type)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   return ctx->Driver.CreateShader(ctx, type);
-}
-
-
-GLuint GLAPIENTRY
-_mesa_CreateProgram(void)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   return ctx->Driver.CreateProgram(ctx);
-}
-
-
-GLhandleARB GLAPIENTRY
-_mesa_CreateProgramObjectARB(void)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   return ctx->Driver.CreateProgram(ctx);
-}
-
-
-void GLAPIENTRY
-_mesa_DeleteObjectARB(GLhandleARB obj)
-{
-   if (obj) {
-      GET_CURRENT_CONTEXT(ctx);
-      if (ctx->Driver.IsProgram(ctx, obj)) {
-         ctx->Driver.DeleteProgram2(ctx, obj);
-      }
-      else if (ctx->Driver.IsShader(ctx, obj)) {
-         ctx->Driver.DeleteShader(ctx, obj);
-      }
-      else {
-         /* error? */
-      }
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_DeleteProgram(GLuint name)
-{
-   if (name) {
-      GET_CURRENT_CONTEXT(ctx);
-      ctx->Driver.DeleteProgram2(ctx, name);
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_DeleteShader(GLuint name)
-{
-   if (name) {
-      GET_CURRENT_CONTEXT(ctx);
-      ctx->Driver.DeleteShader(ctx, name);
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_DetachObjectARB(GLhandleARB program, GLhandleARB shader)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.DetachShader(ctx, program, shader);
-}
-
-
-void GLAPIENTRY
-_mesa_DetachShader(GLuint program, GLuint shader)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.DetachShader(ctx, program, shader);
-}
-
-
-void GLAPIENTRY
-_mesa_GetActiveAttribARB(GLhandleARB program, GLuint index,
-                         GLsizei maxLength, GLsizei * length, GLint * size,
-                         GLenum * type, GLcharARB * name)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.GetActiveAttrib(ctx, program, index, maxLength, length, size,
-                               type, name);
-}
-
-
-void GLAPIENTRY
-_mesa_GetActiveUniformARB(GLhandleARB program, GLuint index,
-                          GLsizei maxLength, GLsizei * length, GLint * size,
-                          GLenum * type, GLcharARB * name)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.GetActiveUniform(ctx, program, index, maxLength, length, size,
-                                type, name);
-}
-
-
-void GLAPIENTRY
-_mesa_GetAttachedObjectsARB(GLhandleARB container, GLsizei maxCount,
-                            GLsizei * count, GLhandleARB * obj)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.GetAttachedShaders(ctx, container, maxCount, count, obj);
-}
-
-
-void GLAPIENTRY
-_mesa_GetAttachedShaders(GLuint program, GLsizei maxCount,
-                         GLsizei *count, GLuint *obj)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.GetAttachedShaders(ctx, program, maxCount, count, obj);
-}
-
-
-GLint GLAPIENTRY
-_mesa_GetAttribLocationARB(GLhandleARB program, const GLcharARB * name)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   return ctx->Driver.GetAttribLocation(ctx, program, name);
-}
-
-
-void GLAPIENTRY
-_mesa_GetInfoLogARB(GLhandleARB object, GLsizei maxLength, GLsizei * length,
-                    GLcharARB * infoLog)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   /* Implement in terms of GetProgramInfoLog, GetShaderInfoLog */
-   if (ctx->Driver.IsProgram(ctx, object)) {
-      ctx->Driver.GetProgramInfoLog(ctx, object, maxLength, length, infoLog);
-   }
-   else if (ctx->Driver.IsShader(ctx, object)) {
-      ctx->Driver.GetShaderInfoLog(ctx, object, maxLength, length, infoLog);
-   }
-   else {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetInfoLogARB");
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_GetObjectParameterivARB(GLhandleARB object, GLenum pname, GLint *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   /* Implement in terms of GetProgramiv, GetShaderiv */
-   if (ctx->Driver.IsProgram(ctx, object)) {
-      if (pname == GL_OBJECT_TYPE_ARB) {
-	 *params = GL_PROGRAM_OBJECT_ARB;
-      }
-      else {
-	 ctx->Driver.GetProgramiv(ctx, object, pname, params);
-      }
-   }
-   else if (ctx->Driver.IsShader(ctx, object)) {
-      if (pname == GL_OBJECT_TYPE_ARB) {
-	 *params = GL_SHADER_OBJECT_ARB;
-      }
-      else {
-	 ctx->Driver.GetShaderiv(ctx, object, pname, params);
-      }
-   }
-   else {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glGetObjectParameterivARB");
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_GetObjectParameterfvARB(GLhandleARB object, GLenum pname,
-                              GLfloat *params)
-{
-   GLint iparams[1];  /* XXX is one element enough? */
-   _mesa_GetObjectParameterivARB(object, pname, iparams);
-   params[0] = (GLfloat) iparams[0];
-}
-
-
-void GLAPIENTRY
-_mesa_GetProgramiv(GLuint program, GLenum pname, GLint *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.GetProgramiv(ctx, program, pname, params);
-}
-
-
-void GLAPIENTRY
-_mesa_GetShaderiv(GLuint shader, GLenum pname, GLint *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.GetShaderiv(ctx, shader, pname, params);
-}
-
-
-void GLAPIENTRY
-_mesa_GetProgramInfoLog(GLuint program, GLsizei bufSize,
-                        GLsizei *length, GLchar *infoLog)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.GetProgramInfoLog(ctx, program, bufSize, length, infoLog);
-}
-
-
-void GLAPIENTRY
-_mesa_GetShaderInfoLog(GLuint shader, GLsizei bufSize,
-                       GLsizei *length, GLchar *infoLog)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.GetShaderInfoLog(ctx, shader, bufSize, length, infoLog);
-}
-
-
-void GLAPIENTRY
-_mesa_GetShaderSourceARB(GLhandleARB shader, GLsizei maxLength,
-                         GLsizei *length, GLcharARB *sourceOut)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.GetShaderSource(ctx, shader, maxLength, length, sourceOut);
-}
-
-
-void GLAPIENTRY
-_mesa_GetUniformfvARB(GLhandleARB program, GLint location, GLfloat * params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.GetUniformfv(ctx, program, location, params);
-}
-
-
-void GLAPIENTRY
-_mesa_GetUniformivARB(GLhandleARB program, GLint location, GLint * params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.GetUniformiv(ctx, program, location, params);
-}
-
-
-
-#if 0
-GLint GLAPIENTRY
-_mesa_GetUniformLocation(GLuint program, const GLcharARB *name)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   return ctx->Driver.GetUniformLocation(ctx, program, name);
-}
-#endif
-
-
-GLhandleARB GLAPIENTRY
-_mesa_GetHandleARB(GLenum pname)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   return ctx->Driver.GetHandle(ctx, pname);
-}
-
-
-GLint GLAPIENTRY
-_mesa_GetUniformLocationARB(GLhandleARB programObj, const GLcharARB *name)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   return ctx->Driver.GetUniformLocation(ctx, programObj, name);
-}
-
-
-GLboolean GLAPIENTRY
-_mesa_IsProgram(GLuint name)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   return ctx->Driver.IsProgram(ctx, name);
-}
-
-
-GLboolean GLAPIENTRY
-_mesa_IsShader(GLuint name)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   return ctx->Driver.IsShader(ctx, name);
-}
-
-
-void GLAPIENTRY
-_mesa_LinkProgramARB(GLhandleARB programObj)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.LinkProgram(ctx, programObj);
-}
-
-
-
-/**
- * Read shader source code from a file.
- * Useful for debugging to override an app's shader.
- */
-static GLcharARB *
-_mesa_read_shader(const char *fname)
-{
-   const int max = 50*1000;
-   FILE *f = fopen(fname, "r");
-   GLcharARB *buffer, *shader;
-   int len;
-
-   if (!f) {
-      return NULL;
-   }
-
-   buffer = (char *) malloc(max);
-   len = fread(buffer, 1, max, f);
-   buffer[len] = 0;
-
-   fclose(f);
-
-   shader = _mesa_strdup(buffer);
-   free(buffer);
-
-   return shader;
-}
-
-
-/**
- * Called via glShaderSource() and glShaderSourceARB() API functions.
- * Basically, concatenate the source code strings into one long string
- * and pass it to ctx->Driver.ShaderSource().
- */
-void GLAPIENTRY
-_mesa_ShaderSourceARB(GLhandleARB shaderObj, GLsizei count,
-                      const GLcharARB ** string, const GLint * length)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLint *offsets;
-   GLsizei i, totalLength;
-   GLcharARB *source;
-   GLuint checksum;
-
-   if (!shaderObj || string == NULL) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glShaderSourceARB");
-      return;
-   }
-
-   /*
-    * This array holds offsets of where the appropriate string ends, thus the
-    * last element will be set to the total length of the source code.
-    */
-   offsets = (GLint *) malloc(count * sizeof(GLint));
-   if (offsets == NULL) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glShaderSourceARB");
-      return;
-   }
-
-   for (i = 0; i < count; i++) {
-      if (string[i] == NULL) {
-         free((GLvoid *) offsets);
-         _mesa_error(ctx, GL_INVALID_OPERATION, "glShaderSourceARB(null string)");
-         return;
-      }
-      if (length == NULL || length[i] < 0)
-         offsets[i] = strlen(string[i]);
-      else
-         offsets[i] = length[i];
-      /* accumulate string lengths */
-      if (i > 0)
-         offsets[i] += offsets[i - 1];
-   }
-
-   /* Total length of source string is sum off all strings plus two.
-    * One extra byte for terminating zero, another extra byte to silence
-    * valgrind warnings in the parser/grammer code.
-    */
-   totalLength = offsets[count - 1] + 2;
-   source = (GLcharARB *) malloc(totalLength * sizeof(GLcharARB));
-   if (source == NULL) {
-      free((GLvoid *) offsets);
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glShaderSourceARB");
-      return;
-   }
-
-   for (i = 0; i < count; i++) {
-      GLint start = (i > 0) ? offsets[i - 1] : 0;
-      memcpy(source + start, string[i],
-             (offsets[i] - start) * sizeof(GLcharARB));
-   }
-   source[totalLength - 1] = '\0';
-   source[totalLength - 2] = '\0';
-
-   if (SHADER_SUBST) {
-      /* Compute the shader's source code checksum then try to open a file
-       * named newshader_<CHECKSUM>.  If it exists, use it in place of the
-       * original shader source code.  For debugging.
-       */
-      char filename[100];
-      GLcharARB *newSource;
-
-      checksum = _mesa_str_checksum(source);
-
-      sprintf(filename, "newshader_%d", checksum);
-
-      newSource = _mesa_read_shader(filename);
-      if (newSource) {
-         fprintf(stderr, "Mesa: Replacing shader %u chksum=%d with %s\n",
-                       shaderObj, checksum, filename);
-         free(source);
-         source = newSource;
-      }
-   }      
-
-   ctx->Driver.ShaderSource(ctx, shaderObj, source);
-
-   if (SHADER_SUBST) {
-      struct gl_shader *sh = _mesa_lookup_shader(ctx, shaderObj);
-      if (sh)
-         sh->SourceChecksum = checksum; /* save original checksum */
-   }
-
-   free(offsets);
-}
-
-
-void GLAPIENTRY
-_mesa_Uniform1fARB(GLint location, GLfloat v0)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.Uniform(ctx, location, 1, &v0, GL_FLOAT);
-}
-
-void GLAPIENTRY
-_mesa_Uniform2fARB(GLint location, GLfloat v0, GLfloat v1)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLfloat v[2];
-   v[0] = v0;
-   v[1] = v1;
-   ctx->Driver.Uniform(ctx, location, 1, v, GL_FLOAT_VEC2);
-}
-
-void GLAPIENTRY
-_mesa_Uniform3fARB(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLfloat v[3];
-   v[0] = v0;
-   v[1] = v1;
-   v[2] = v2;
-   ctx->Driver.Uniform(ctx, location, 1, v, GL_FLOAT_VEC3);
-}
-
-void GLAPIENTRY
-_mesa_Uniform4fARB(GLint location, GLfloat v0, GLfloat v1, GLfloat v2,
-                   GLfloat v3)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLfloat v[4];
-   v[0] = v0;
-   v[1] = v1;
-   v[2] = v2;
-   v[3] = v3;
-   ctx->Driver.Uniform(ctx, location, 1, v, GL_FLOAT_VEC4);
-}
-
-void GLAPIENTRY
-_mesa_Uniform1iARB(GLint location, GLint v0)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.Uniform(ctx, location, 1, &v0, GL_INT);
-}
-
-void GLAPIENTRY
-_mesa_Uniform2iARB(GLint location, GLint v0, GLint v1)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLint v[2];
-   v[0] = v0;
-   v[1] = v1;
-   ctx->Driver.Uniform(ctx, location, 1, v, GL_INT_VEC2);
-}
-
-void GLAPIENTRY
-_mesa_Uniform3iARB(GLint location, GLint v0, GLint v1, GLint v2)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLint v[3];
-   v[0] = v0;
-   v[1] = v1;
-   v[2] = v2;
-   ctx->Driver.Uniform(ctx, location, 1, v, GL_INT_VEC3);
-}
-
-void GLAPIENTRY
-_mesa_Uniform4iARB(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLint v[4];
-   v[0] = v0;
-   v[1] = v1;
-   v[2] = v2;
-   v[3] = v3;
-   ctx->Driver.Uniform(ctx, location, 1, v, GL_INT_VEC4);
-}
-
-void GLAPIENTRY
-_mesa_Uniform1fvARB(GLint location, GLsizei count, const GLfloat * value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.Uniform(ctx, location, count, value, GL_FLOAT);
-}
-
-void GLAPIENTRY
-_mesa_Uniform2fvARB(GLint location, GLsizei count, const GLfloat * value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.Uniform(ctx, location, count, value, GL_FLOAT_VEC2);
-}
-
-void GLAPIENTRY
-_mesa_Uniform3fvARB(GLint location, GLsizei count, const GLfloat * value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.Uniform(ctx, location, count, value, GL_FLOAT_VEC3);
-}
-
-void GLAPIENTRY
-_mesa_Uniform4fvARB(GLint location, GLsizei count, const GLfloat * value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.Uniform(ctx, location, count, value, GL_FLOAT_VEC4);
-}
-
-void GLAPIENTRY
-_mesa_Uniform1ivARB(GLint location, GLsizei count, const GLint * value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.Uniform(ctx, location, count, value, GL_INT);
-}
-
-void GLAPIENTRY
-_mesa_Uniform2ivARB(GLint location, GLsizei count, const GLint * value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.Uniform(ctx, location, count, value, GL_INT_VEC2);
-}
-
-void GLAPIENTRY
-_mesa_Uniform3ivARB(GLint location, GLsizei count, const GLint * value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.Uniform(ctx, location, count, value, GL_INT_VEC3);
-}
-
-void GLAPIENTRY
-_mesa_Uniform4ivARB(GLint location, GLsizei count, const GLint * value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.Uniform(ctx, location, count, value, GL_INT_VEC4);
-}
-
-
-void GLAPIENTRY
-_mesa_UniformMatrix2fvARB(GLint location, GLsizei count, GLboolean transpose,
-                          const GLfloat * value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.UniformMatrix(ctx, 2, 2, location, count, transpose, value);
-}
-
-void GLAPIENTRY
-_mesa_UniformMatrix3fvARB(GLint location, GLsizei count, GLboolean transpose,
-                          const GLfloat * value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.UniformMatrix(ctx, 3, 3, location, count, transpose, value);
-}
-
-void GLAPIENTRY
-_mesa_UniformMatrix4fvARB(GLint location, GLsizei count, GLboolean transpose,
-                          const GLfloat * value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.UniformMatrix(ctx, 4, 4, location, count, transpose, value);
-}
-
-
-/**
- * Non-square UniformMatrix are OpenGL 2.1
- */
-void GLAPIENTRY
-_mesa_UniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose,
-                         const GLfloat *value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.UniformMatrix(ctx, 2, 3, location, count, transpose, value);
-}
-
-void GLAPIENTRY
-_mesa_UniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose,
-                         const GLfloat *value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.UniformMatrix(ctx, 3, 2, location, count, transpose, value);
-}
-
-void GLAPIENTRY
-_mesa_UniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose,
-                         const GLfloat *value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.UniformMatrix(ctx, 2, 4, location, count, transpose, value);
-}
-
-void GLAPIENTRY
-_mesa_UniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose,
-                         const GLfloat *value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.UniformMatrix(ctx, 4, 2, location, count, transpose, value);
-}
-
-void GLAPIENTRY
-_mesa_UniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose,
-                         const GLfloat *value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.UniformMatrix(ctx, 3, 4, location, count, transpose, value);
-}
-
-void GLAPIENTRY
-_mesa_UniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose,
-                         const GLfloat *value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.UniformMatrix(ctx, 4, 3, location, count, transpose, value);
-}
-
-
-void GLAPIENTRY
-_mesa_UseProgramObjectARB(GLhandleARB program)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, _NEW_PROGRAM);
-   ctx->Driver.UseProgram(ctx, program);
-}
-
-
-void GLAPIENTRY
-_mesa_ValidateProgramARB(GLhandleARB program)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Driver.ValidateProgram(ctx, program);
-}
-
diff --git a/mesalib/src/mesa/main/shaders.h b/mesalib/src/mesa/main/shaders.h
deleted file mode 100644
index 17339ccf6..000000000
--- a/mesalib/src/mesa/main/shaders.h
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.3
- *
- * Copyright (C) 2004-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.
- */
-
-
-#ifndef SHADERS_H
-#define SHADERS_H
-
-
-#include "glheader.h"
-#include "mtypes.h"
-
-
-extern void GLAPIENTRY
-_mesa_DeleteObjectARB(GLhandleARB obj);
-
-extern GLhandleARB GLAPIENTRY
-_mesa_GetHandleARB(GLenum pname);
-
-extern void GLAPIENTRY
-_mesa_DetachObjectARB (GLhandleARB, GLhandleARB);
-
-extern GLhandleARB GLAPIENTRY
-_mesa_CreateShaderObjectARB (GLenum);
-
-extern void GLAPIENTRY
-_mesa_ShaderSourceARB (GLhandleARB, GLsizei, const GLcharARB* *, const GLint *);
-
-extern void  GLAPIENTRY
-_mesa_CompileShaderARB (GLhandleARB);
-
-extern GLhandleARB GLAPIENTRY
-_mesa_CreateProgramObjectARB (void);
-
-extern void GLAPIENTRY
-_mesa_AttachObjectARB (GLhandleARB, GLhandleARB);
-
-extern void GLAPIENTRY
-_mesa_LinkProgramARB (GLhandleARB);
-
-extern void GLAPIENTRY
-_mesa_UseProgramObjectARB (GLhandleARB);
-
-extern void GLAPIENTRY
-_mesa_ValidateProgramARB (GLhandleARB);
-
-extern void GLAPIENTRY
-_mesa_Uniform1fARB (GLint, GLfloat);
-
-extern void GLAPIENTRY
-_mesa_Uniform2fARB (GLint, GLfloat, GLfloat);
-
-extern void GLAPIENTRY
-_mesa_Uniform3fARB (GLint, GLfloat, GLfloat, GLfloat);
-
-extern void GLAPIENTRY
-_mesa_Uniform4fARB (GLint, GLfloat, GLfloat, GLfloat, GLfloat);
-
-extern void GLAPIENTRY
-_mesa_Uniform1iARB (GLint, GLint);
-
-extern void GLAPIENTRY
-_mesa_Uniform2iARB (GLint, GLint, GLint);
-
-extern void GLAPIENTRY
-_mesa_Uniform3iARB (GLint, GLint, GLint, GLint);
-
-extern void GLAPIENTRY
-_mesa_Uniform4iARB (GLint, GLint, GLint, GLint, GLint);
-
-extern void GLAPIENTRY
-_mesa_Uniform1fvARB (GLint, GLsizei, const GLfloat *);
-
-extern void GLAPIENTRY
-_mesa_Uniform2fvARB (GLint, GLsizei, const GLfloat *);
-
-extern void GLAPIENTRY
-_mesa_Uniform3fvARB (GLint, GLsizei, const GLfloat *);
-
-extern void GLAPIENTRY
-_mesa_Uniform4fvARB (GLint, GLsizei, const GLfloat *);
-
-extern void GLAPIENTRY
-_mesa_Uniform1ivARB (GLint, GLsizei, const GLint *);
-
-extern void GLAPIENTRY
-_mesa_Uniform2ivARB (GLint, GLsizei, const GLint *);
-
-extern void GLAPIENTRY
-_mesa_Uniform3ivARB (GLint, GLsizei, const GLint *);
-
-extern void GLAPIENTRY
-_mesa_Uniform4ivARB (GLint, GLsizei, const GLint *);
-
-extern void GLAPIENTRY
-_mesa_UniformMatrix2fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
-
-extern void GLAPIENTRY
-_mesa_UniformMatrix3fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
-
-extern void GLAPIENTRY
-_mesa_UniformMatrix4fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
-
-extern void GLAPIENTRY
-_mesa_GetObjectParameterfvARB (GLhandleARB, GLenum, GLfloat *);
-
-extern void GLAPIENTRY
-_mesa_GetObjectParameterivARB (GLhandleARB, GLenum, GLint *);
-
-extern void GLAPIENTRY
-_mesa_GetInfoLogARB (GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
-
-extern void GLAPIENTRY
-_mesa_GetAttachedObjectsARB (GLhandleARB, GLsizei, GLsizei *, GLhandleARB *);
-
-extern GLint GLAPIENTRY
-_mesa_GetUniformLocationARB (GLhandleARB, const GLcharARB *);
-
-extern void GLAPIENTRY
-_mesa_GetActiveUniformARB (GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *);
-
-extern void GLAPIENTRY
-_mesa_GetUniformfvARB (GLhandleARB, GLint, GLfloat *);
-
-extern void GLAPIENTRY
-_mesa_GetUniformivARB (GLhandleARB, GLint, GLint *);
-
-extern void GLAPIENTRY
-_mesa_GetShaderSourceARB (GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
-
-#if FEATURE_ARB_vertex_shader
-
-extern void GLAPIENTRY
-_mesa_BindAttribLocationARB (GLhandleARB, GLuint, const GLcharARB *);
-
-extern void GLAPIENTRY
-_mesa_GetActiveAttribARB (GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *);
-
-extern GLint GLAPIENTRY
-_mesa_GetAttribLocationARB (GLhandleARB, const GLcharARB *);
-
-#endif /* FEATURE_ARB_vertex_shader */
-
-
-/* 2.0 */
-extern void GLAPIENTRY
-_mesa_AttachShader(GLuint program, GLuint shader);
-
-extern GLuint GLAPIENTRY
-_mesa_CreateShader(GLenum);
-
-extern GLuint GLAPIENTRY
-_mesa_CreateProgram(void);
-
-extern void GLAPIENTRY
-_mesa_DeleteProgram(GLuint program);
-
-extern void GLAPIENTRY
-_mesa_DeleteShader(GLuint shader);
-
-extern void GLAPIENTRY
-_mesa_DetachShader(GLuint program, GLuint shader);
-
-extern void GLAPIENTRY
-_mesa_GetAttachedShaders(GLuint program, GLsizei maxCount,
-                         GLsizei *count, GLuint *obj);
-
-extern void GLAPIENTRY
-_mesa_GetProgramiv(GLuint program, GLenum pname, GLint *params);
-
-extern void GLAPIENTRY
-_mesa_GetProgramInfoLog(GLuint program, GLsizei bufSize,
-                        GLsizei *length, GLchar *infoLog);
-
-extern void GLAPIENTRY
-_mesa_GetShaderiv(GLuint shader, GLenum pname, GLint *params);
-
-extern void GLAPIENTRY
-_mesa_GetShaderInfoLog(GLuint shader, GLsizei bufSize,
-                       GLsizei *length, GLchar *infoLog);
-
-extern GLboolean GLAPIENTRY
-_mesa_IsProgram(GLuint program);
-
-extern GLboolean GLAPIENTRY
-_mesa_IsShader(GLuint shader);
-
-
-
-/* 2.1 */
-extern void GLAPIENTRY
-_mesa_UniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose,
-                         const GLfloat *value);
-
-extern void GLAPIENTRY
-_mesa_UniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose,
-                         const GLfloat *value);
-
-extern void GLAPIENTRY
-_mesa_UniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose,
-                         const GLfloat *value);
-
-extern void GLAPIENTRY
-_mesa_UniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose,
-                         const GLfloat *value);
-
-extern void GLAPIENTRY
-_mesa_UniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose,
-                         const GLfloat *value);
-
-extern void GLAPIENTRY
-_mesa_UniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose,
-                         const GLfloat *value);
-
-
-#endif /* SHADERS_H */
diff --git a/mesalib/src/mesa/main/shared.c b/mesalib/src/mesa/main/shared.c
index e364e2404..a56c70fa7 100644
--- a/mesalib/src/mesa/main/shared.c
+++ b/mesalib/src/mesa/main/shared.c
@@ -32,18 +32,15 @@
 #include "imports.h"
 #include "mtypes.h"
 #include "hash.h"
-#include "arrayobj.h"
+#if FEATURE_ATI_fragment_shader
+#include "atifragshader.h"
+#endif
 #include "bufferobj.h"
 #include "shared.h"
-#include "shader/program.h"
-#include "shader/shader_api.h"
+#include "program/program.h"
 #include "dlist.h"
-#if FEATURE_ATI_fragment_shader
-#include "shader/atifragshader.h"
-#endif
-#if FEATURE_ARB_sync
+#include "shaderobj.h"
 #include "syncobj.h"
-#endif
 
 /**
  * Allocate and initialize a shared context state structure.
@@ -123,9 +120,7 @@ _mesa_alloc_shared_state(GLcontext *ctx)
    shared->RenderBuffers = _mesa_NewHashTable();
 #endif
 
-#if FEATURE_ARB_sync
    make_empty_list(& shared->SyncObjects);
-#endif
 
    return shared;
 }
@@ -228,12 +223,12 @@ delete_shader_cb(GLuint id, void *data, void *userData)
    GLcontext *ctx = (GLcontext *) userData;
    struct gl_shader *sh = (struct gl_shader *) data;
    if (sh->Type == GL_FRAGMENT_SHADER || sh->Type == GL_VERTEX_SHADER) {
-      _mesa_free_shader(ctx, sh);
+      ctx->Driver.DeleteShader(ctx, sh);
    }
    else {
       struct gl_shader_program *shProg = (struct gl_shader_program *) data;
       ASSERT(shProg->Type == GL_SHADER_PROGRAM_MESA);
-      _mesa_free_shader_program(ctx, shProg);
+      ctx->Driver.DeleteShaderProgram(ctx, shProg);
    }
 }
 
@@ -289,6 +284,10 @@ free_shared_state(GLcontext *ctx, struct gl_shared_state *shared)
 {
    GLuint i;
 
+   /* Free the dummy/fallback texture object */
+   if (shared->FallbackTex)
+      ctx->Driver.DeleteTexture(ctx, shared->FallbackTex);
+
    /*
     * Free display lists
     */
@@ -334,7 +333,6 @@ free_shared_state(GLcontext *ctx, struct gl_shared_state *shared)
    _mesa_reference_buffer_object(ctx, &shared->NullBufferObj, NULL);
 #endif
 
-#if FEATURE_ARB_sync
    {
       struct simple_node *node;
       struct simple_node *temp;
@@ -343,7 +341,6 @@ free_shared_state(GLcontext *ctx, struct gl_shared_state *shared)
 	 _mesa_unref_sync_object(ctx, (struct gl_sync_object *) node);
       }
    }
-#endif
 
    /*
     * Free texture objects (after FBOs since some textures might have
diff --git a/mesalib/src/mesa/main/shared.h b/mesalib/src/mesa/main/shared.h
index ef164a145..5166a0ce5 100644
--- a/mesalib/src/mesa/main/shared.h
+++ b/mesalib/src/mesa/main/shared.h
@@ -25,6 +25,7 @@
 #ifndef SHARED_H
 #define SHARED_H
 
+#include "mtypes.h"
 
 struct gl_shared_state *
 _mesa_alloc_shared_state(GLcontext *ctx);
diff --git a/mesalib/src/mesa/main/state.c b/mesalib/src/mesa/main/state.c
index b971cc976..4a3dffe4c 100644
--- a/mesalib/src/mesa/main/state.c
+++ b/mesalib/src/mesa/main/state.c
@@ -41,8 +41,8 @@
 #include "light.h"
 #include "matrix.h"
 #include "pixel.h"
-#include "shader/program.h"
-#include "shader/prog_parameter.h"
+#include "program/program.h"
+#include "program/prog_parameter.h"
 #include "state.h"
 #include "stencil.h"
 #include "texenvprogram.h"
@@ -250,6 +250,7 @@ update_program(GLcontext *ctx)
    const struct gl_shader_program *shProg = ctx->Shader.CurrentProgram;
    const struct gl_vertex_program *prevVP = ctx->VertexProgram._Current;
    const struct gl_fragment_program *prevFP = ctx->FragmentProgram._Current;
+   const struct gl_geometry_program *prevGP = ctx->GeometryProgram._Current;
    GLbitfield new_state = 0x0;
 
    /*
@@ -291,6 +292,15 @@ update_program(GLcontext *ctx)
       _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current, NULL);
    }
 
+   if (shProg && shProg->LinkStatus && shProg->GeometryProgram) {
+      /* Use shader programs */
+      _mesa_reference_geomprog(ctx, &ctx->GeometryProgram._Current,
+                               shProg->GeometryProgram);
+   } else {
+      /* no fragment program */
+      _mesa_reference_geomprog(ctx, &ctx->GeometryProgram._Current, NULL);
+   }
+
    /* Examine vertex program after fragment program as
     * _mesa_get_fixed_func_vertex_program() needs to know active
     * fragprog inputs.
@@ -327,7 +337,15 @@ update_program(GLcontext *ctx)
                           (struct gl_program *) ctx->FragmentProgram._Current);
       }
    }
-   
+
+   if (ctx->GeometryProgram._Current != prevGP) {
+      new_state |= _NEW_PROGRAM;
+      if (ctx->Driver.BindProgram) {
+         ctx->Driver.BindProgram(ctx, MESA_GEOMETRY_PROGRAM,
+                            (struct gl_program *) ctx->GeometryProgram._Current);
+      }
+   }
+
    if (ctx->VertexProgram._Current != prevVP) {
       new_state |= _NEW_PROGRAM;
       if (ctx->Driver.BindProgram) {
@@ -356,6 +374,16 @@ update_program_constants(GLcontext *ctx)
       }
    }
 
+   if (ctx->GeometryProgram._Current) {
+      const struct gl_program_parameter_list *params =
+         ctx->GeometryProgram._Current->Base.Parameters;
+      /*FIXME: StateFlags is always 0 because we have unnamed constant
+       *       not state changes */
+      if (params /*&& params->StateFlags & ctx->NewState*/) {
+         new_state |= _NEW_PROGRAM_CONSTANTS;
+      }
+   }
+
    if (ctx->VertexProgram._Current) {
       const struct gl_program_parameter_list *params =
          ctx->VertexProgram._Current->Base.Parameters;
@@ -537,7 +565,7 @@ _mesa_update_state_locked( GLcontext *ctx )
 
    /* Determine which state flags effect vertex/fragment program state */
    if (ctx->FragmentProgram._MaintainTexEnvProgram) {
-      prog_flags |= (_NEW_TEXTURE | _NEW_FOG |
+      prog_flags |= (_NEW_BUFFERS | _NEW_TEXTURE | _NEW_FOG |
 		     _NEW_ARRAY | _NEW_LIGHT | _NEW_POINT | _NEW_RENDERMODE |
 		     _NEW_PROGRAM);
    }
diff --git a/mesalib/src/mesa/main/syncobj.c b/mesalib/src/mesa/main/syncobj.c
index 1bff30817..ac948cc1e 100644
--- a/mesalib/src/mesa/main/syncobj.c
+++ b/mesalib/src/mesa/main/syncobj.c
@@ -59,6 +59,8 @@
 #include "imports.h"
 #include "context.h"
 #include "macros.h"
+#include "get.h"
+#include "dispatch.h"
 
 #if FEATURE_ARB_sync
 #include "syncobj.h"
@@ -136,6 +138,19 @@ _mesa_init_sync_object_functions(struct dd_function_table *driver)
 }
 
 
+void
+_mesa_init_sync_dispatch(struct _glapi_table *disp)
+{
+   SET_IsSync(disp, _mesa_IsSync);
+   SET_DeleteSync(disp, _mesa_DeleteSync);
+   SET_FenceSync(disp, _mesa_FenceSync);
+   SET_ClientWaitSync(disp, _mesa_ClientWaitSync);
+   SET_WaitSync(disp, _mesa_WaitSync);
+   SET_GetInteger64v(disp, _mesa_GetInteger64v);
+   SET_GetSynciv(disp, _mesa_GetSynciv);
+}
+
+
 /**
  * Allocate/init the context state related to sync objects.
  */
diff --git a/mesalib/src/mesa/main/syncobj.h b/mesalib/src/mesa/main/syncobj.h
index f23fa281e..82e141d40 100644
--- a/mesalib/src/mesa/main/syncobj.h
+++ b/mesalib/src/mesa/main/syncobj.h
@@ -31,12 +31,19 @@
 #ifndef SYNCOBJ_H
 #define SYNCOBJ_H
 
-#include "context.h"
+#include "main/mtypes.h"
+
+struct dd_function_table;
+
+#if FEATURE_ARB_sync
 
 extern void
 _mesa_init_sync_object_functions(struct dd_function_table *driver);
 
 extern void
+_mesa_init_sync_dispatch(struct _glapi_table *disp);
+
+extern void
 _mesa_init_sync(GLcontext *);
 
 extern void
@@ -67,4 +74,42 @@ extern void GLAPIENTRY
 _mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length,
 		GLint *values);
 
+#else /* FEATURE_ARB_sync */
+
+#include "main/compiler.h"
+
+static INLINE void
+_mesa_init_sync_object_functions(struct dd_function_table *driver)
+{
+}
+
+static INLINE void
+_mesa_init_sync_dispatch(struct _glapi_table *disp)
+{
+}
+
+static INLINE void
+_mesa_init_sync(GLcontext *ctx)
+{
+}
+
+static INLINE void
+_mesa_free_sync_data(GLcontext *ctx)
+{
+}
+
+static INLINE void
+_mesa_ref_sync_object(GLcontext *ctx, struct gl_sync_object *syncObj)
+{
+   ASSERT_NO_FEATURE();
+}
+
+static INLINE void
+_mesa_unref_sync_object(GLcontext *ctx, struct gl_sync_object *syncObj)
+{
+   ASSERT_NO_FEATURE();
+}
+
+#endif /* FEATURE_ARB_sync */
+
 #endif /* SYNCOBJ_H */
diff --git a/mesalib/src/mesa/main/texcompress.c b/mesalib/src/mesa/main/texcompress.c
index cff6de89e..e911524cb 100644
--- a/mesalib/src/mesa/main/texcompress.c
+++ b/mesalib/src/mesa/main/texcompress.c
@@ -33,7 +33,6 @@
 #include "glheader.h"
 #include "imports.h"
 #include "colormac.h"
-#include "context.h"
 #include "formats.h"
 #include "texcompress.h"
 
@@ -107,6 +106,24 @@ _mesa_get_compressed_formats(GLcontext *ctx, GLint *formats, GLboolean all)
    }
 #endif /* FEATURE_EXT_texture_sRGB */
    return n;
+
+#if FEATURE_ES1 || FEATURE_ES2
+   if (formats) {
+      formats[n++] = GL_PALETTE4_RGB8_OES;
+      formats[n++] = GL_PALETTE4_RGBA8_OES;
+      formats[n++] = GL_PALETTE4_R5_G6_B5_OES;
+      formats[n++] = GL_PALETTE4_RGBA4_OES;
+      formats[n++] = GL_PALETTE4_RGB5_A1_OES;
+      formats[n++] = GL_PALETTE8_RGB8_OES;
+      formats[n++] = GL_PALETTE8_RGBA8_OES;
+      formats[n++] = GL_PALETTE8_R5_G6_B5_OES;
+      formats[n++] = GL_PALETTE8_RGBA4_OES;
+      formats[n++] = GL_PALETTE8_RGB5_A1_OES;
+   }
+   else {
+      n += 10;
+   }
+#endif
 }
 
 
diff --git a/mesalib/src/mesa/main/texcompress_fxt1.c b/mesalib/src/mesa/main/texcompress_fxt1.c
index 04acf05e5..c8b45bd3a 100644
--- a/mesalib/src/mesa/main/texcompress_fxt1.c
+++ b/mesalib/src/mesa/main/texcompress_fxt1.c
@@ -32,9 +32,9 @@
 #include "glheader.h"
 #include "imports.h"
 #include "colormac.h"
-#include "context.h"
 #include "convolve.h"
 #include "image.h"
+#include "macros.h"
 #include "mipmap.h"
 #include "texcompress.h"
 #include "texcompress_fxt1.h"
diff --git a/mesalib/src/mesa/main/texcompress_fxt1.h b/mesalib/src/mesa/main/texcompress_fxt1.h
index d63ca71e2..38048b26c 100644
--- a/mesalib/src/mesa/main/texcompress_fxt1.h
+++ b/mesalib/src/mesa/main/texcompress_fxt1.h
@@ -25,9 +25,11 @@
 #ifndef TEXCOMPRESS_FXT1_H
 #define TEXCOMPRESS_FXT1_H
 
-#include "main/mtypes.h"
+#include "glheader.h"
 #include "texstore.h"
 
+struct gl_texture_image;
+
 #if FEATURE_texture_fxt1
 
 extern GLboolean
diff --git a/mesalib/src/mesa/main/texcompress_s3tc.c b/mesalib/src/mesa/main/texcompress_s3tc.c
index fcd28a4b4..45a2f9c17 100644
--- a/mesalib/src/mesa/main/texcompress_s3tc.c
+++ b/mesalib/src/mesa/main/texcompress_s3tc.c
@@ -36,10 +36,10 @@
 #include "glheader.h"
 #include "imports.h"
 #include "colormac.h"
-#include "context.h"
 #include "convolve.h"
 #include "dlopen.h"
 #include "image.h"
+#include "macros.h"
 #include "texcompress.h"
 #include "texcompress_s3tc.h"
 #include "texstore.h"
@@ -48,7 +48,7 @@
 #if FEATURE_texture_s3tc
 
 
-#ifdef __MINGW32__
+#if defined(_WIN32) || defined(WIN32)
 #define DXTN_LIBNAME "dxtn.dll"
 #define RTLD_LAZY 0
 #define RTLD_GLOBAL 0
@@ -78,7 +78,7 @@ nonlinear_to_linear(GLubyte cs8)
             table[i] = cs / 12.92f;
          }
          else {
-            table[i] = (GLfloat) _mesa_pow((cs + 0.055) / 1.055, 2.4);
+            table[i] = (GLfloat) pow((cs + 0.055) / 1.055, 2.4);
          }
       }
       tableReady = GL_TRUE;
@@ -149,7 +149,6 @@ _mesa_init_texture_s3tc( GLcontext *ctx )
    }
    if (dxtlibhandle) {
       ctx->Mesa_DXTn = GL_TRUE;
-      _mesa_warning(ctx, "software DXTn compression/decompression available");
    }
 #else
    (void) ctx;
@@ -168,7 +167,8 @@ _mesa_texstore_rgb_dxt1(TEXSTORE_PARAMS)
    const GLint texWidth = dstRowStride * 4 / 8; /* a bit of a hack */
    const GLchan *tempImage = NULL;
 
-   ASSERT(dstFormat == MESA_FORMAT_RGB_DXT1);
+   ASSERT(dstFormat == MESA_FORMAT_RGB_DXT1 ||
+          dstFormat == MESA_FORMAT_SRGB_DXT1);
    ASSERT(dstXoffset % 4 == 0);
    ASSERT(dstYoffset % 4 == 0);
    ASSERT(dstZoffset % 4 == 0);
@@ -231,7 +231,8 @@ _mesa_texstore_rgba_dxt1(TEXSTORE_PARAMS)
    const GLint texWidth = dstRowStride * 4 / 8; /* a bit of a hack */
    const GLchan *tempImage = NULL;
 
-   ASSERT(dstFormat == MESA_FORMAT_RGBA_DXT1);
+   ASSERT(dstFormat == MESA_FORMAT_RGBA_DXT1 ||
+          dstFormat == MESA_FORMAT_SRGBA_DXT1);
    ASSERT(dstXoffset % 4 == 0);
    ASSERT(dstYoffset % 4 == 0);
    ASSERT(dstZoffset % 4 == 0);
@@ -293,7 +294,8 @@ _mesa_texstore_rgba_dxt3(TEXSTORE_PARAMS)
    const GLint texWidth = dstRowStride * 4 / 16; /* a bit of a hack */
    const GLchan *tempImage = NULL;
 
-   ASSERT(dstFormat == MESA_FORMAT_RGBA_DXT3);
+   ASSERT(dstFormat == MESA_FORMAT_RGBA_DXT3 ||
+          dstFormat == MESA_FORMAT_SRGBA_DXT3);
    ASSERT(dstXoffset % 4 == 0);
    ASSERT(dstYoffset % 4 == 0);
    ASSERT(dstZoffset % 4 == 0);
@@ -354,7 +356,8 @@ _mesa_texstore_rgba_dxt5(TEXSTORE_PARAMS)
    const GLint texWidth = dstRowStride * 4 / 16; /* a bit of a hack */
    const GLchan *tempImage = NULL;
 
-   ASSERT(dstFormat == MESA_FORMAT_RGBA_DXT5);
+   ASSERT(dstFormat == MESA_FORMAT_RGBA_DXT5 ||
+          dstFormat == MESA_FORMAT_SRGBA_DXT5);
    ASSERT(dstXoffset % 4 == 0);
    ASSERT(dstYoffset % 4 == 0);
    ASSERT(dstZoffset % 4 == 0);
diff --git a/mesalib/src/mesa/main/texenv.c b/mesalib/src/mesa/main/texenv.c
index 4442fb8cf..3a55128c7 100644
--- a/mesalib/src/mesa/main/texenv.c
+++ b/mesalib/src/mesa/main/texenv.c
@@ -196,57 +196,34 @@ set_combiner_source(GLcontext *ctx,
 
    /*
     * Translate pname to (term, alpha).
+    *
+    * The enums were given sequential values for a reason.
     */
    switch (pname) {
    case GL_SOURCE0_RGB:
-      term = 0;
-      alpha = GL_FALSE;
-      break;
    case GL_SOURCE1_RGB:
-      term = 1;
-      alpha = GL_FALSE;
-      break;
    case GL_SOURCE2_RGB:
-      term = 2;
-      alpha = GL_FALSE;
-      break;
    case GL_SOURCE3_RGB_NV:
-      if (ctx->Extensions.NV_texture_env_combine4) {
-         term = 3;
-         alpha = GL_FALSE;
-      }
-      else {
-         TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
-         return;
-      }
+      term = pname - GL_SOURCE0_RGB;
+      alpha = GL_FALSE;
       break;
    case GL_SOURCE0_ALPHA:
-      term = 0;
-      alpha = GL_TRUE;
-      break;
    case GL_SOURCE1_ALPHA:
-      term = 1;
-      alpha = GL_TRUE;
-      break;
    case GL_SOURCE2_ALPHA:
-      term = 2;
-      alpha = GL_TRUE;
-      break;
    case GL_SOURCE3_ALPHA_NV:
-      if (ctx->Extensions.NV_texture_env_combine4) {
-         term = 3;
-         alpha = GL_TRUE;
-      }
-      else {
-         TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
-         return;
-      }
+      term = pname - GL_SOURCE0_ALPHA;
+      alpha = GL_TRUE;
       break;
    default:
       TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
       return;
    }
 
+   if ((term == 3) && !ctx->Extensions.NV_texture_env_combine4) {
+      TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
+      return;
+   }
+
    assert(term < MAX_COMBINER_TERMS);
 
    /*
@@ -310,68 +287,33 @@ set_combiner_operand(GLcontext *ctx,
       return;
    }
 
+   /* The enums were given sequential values for a reason.
+    */
    switch (pname) {
    case GL_OPERAND0_RGB:
-      term = 0;
-      alpha = GL_FALSE;
-      break;
    case GL_OPERAND1_RGB:
-      term = 1;
-      alpha = GL_FALSE;
-      break;
    case GL_OPERAND2_RGB:
-      if (ctx->Extensions.ARB_texture_env_combine) {
-         term = 2;
-         alpha = GL_FALSE;
-      }
-      else {
-         TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
-         return;
-      }
-      break;
    case GL_OPERAND3_RGB_NV:
-      if (ctx->Extensions.NV_texture_env_combine4) {
-         term = 3;
-         alpha = GL_FALSE;
-      }
-      else {
-         TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
-         return;
-      }
+      term = pname - GL_OPERAND0_RGB;
+      alpha = GL_FALSE;
       break;
    case GL_OPERAND0_ALPHA:
-      term = 0;
-      alpha = GL_TRUE;
-      break;
    case GL_OPERAND1_ALPHA:
-      term = 1;
-      alpha = GL_TRUE;
-      break;
    case GL_OPERAND2_ALPHA:
-      if (ctx->Extensions.ARB_texture_env_combine) {
-         term = 2;
-         alpha = GL_TRUE;
-      }
-      else {
-         TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
-         return;
-      }
-      break;
    case GL_OPERAND3_ALPHA_NV:
-      if (ctx->Extensions.NV_texture_env_combine4) {
-         term = 3;
-         alpha = GL_TRUE;
-      }
-      else {
-         TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
-         return;
-      }
+      term = pname - GL_OPERAND0_ALPHA;
+      alpha = GL_TRUE;
       break;
    default:
       TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
       return;
    }
 
+   if ((term == 3) && !ctx->Extensions.NV_texture_env_combine4) {
+      TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
+      return;
+   }
+
    assert(term < MAX_COMBINER_TERMS);
 
    /*
@@ -380,10 +322,23 @@ set_combiner_operand(GLcontext *ctx,
    switch (param) {
    case GL_SRC_COLOR:
    case GL_ONE_MINUS_SRC_COLOR:
-      legal = !alpha;
+      /* The color input can only be used with GL_OPERAND[01]_RGB in the EXT
+       * version.  In the ARB and NV versions they can be used for any RGB
+       * operand.
+       */
+      legal = !alpha
+	 && ((term < 2) || ctx->Extensions.ARB_texture_env_combine
+	     || ctx->Extensions.NV_texture_env_combine4);
       break;
-   case GL_SRC_ALPHA:
    case GL_ONE_MINUS_SRC_ALPHA:
+      /* GL_ONE_MINUS_SRC_ALPHA can only be used with
+       * GL_OPERAND[01]_(RGB|ALPHA) in the EXT version.  In the ARB and NV
+       * versions it can be used for any operand.
+       */
+      legal = (term < 2) || ctx->Extensions.ARB_texture_env_combine
+	 || ctx->Extensions.NV_texture_env_combine4;
+      break;
+   case GL_SRC_ALPHA:
       legal = GL_TRUE;
       break;
    default:
diff --git a/mesalib/src/mesa/main/texenvprogram.c b/mesalib/src/mesa/main/texenvprogram.c
index 964ba13c7..20f02cefe 100644
--- a/mesalib/src/mesa/main/texenvprogram.c
+++ b/mesalib/src/mesa/main/texenvprogram.c
@@ -28,13 +28,13 @@
 
 #include "glheader.h"
 #include "imports.h"
-#include "shader/program.h"
-#include "shader/prog_parameter.h"
-#include "shader/prog_cache.h"
-#include "shader/prog_instruction.h"
-#include "shader/prog_print.h"
-#include "shader/prog_statevars.h"
-#include "shader/programopt.h"
+#include "program/program.h"
+#include "program/prog_parameter.h"
+#include "program/prog_cache.h"
+#include "program/prog_instruction.h"
+#include "program/prog_print.h"
+#include "program/prog_statevars.h"
+#include "program/programopt.h"
 #include "texenvprogram.h"
 
 
@@ -98,6 +98,7 @@ struct state_key {
    GLuint fog_enabled:1;
    GLuint fog_mode:2;          /**< FOG_x */
    GLuint inputs_available:12;
+   GLuint num_draw_buffers:4;
 
    /* NOTE: This array of structs must be last! (see "keySize" below) */
    struct {
@@ -485,6 +486,9 @@ static GLuint make_state_key( GLcontext *ctx,  struct state_key *key )
       inputs_referenced |= FRAG_BIT_FOGC; /* maybe */
    }
 
+   /* _NEW_BUFFERS */
+   key->num_draw_buffers = ctx->DrawBuffer->_NumColorDrawBuffers;
+
    key->inputs_available = (inputs_available & inputs_referenced);
 
    /* compute size of state key, ignoring unused texture units */
@@ -903,7 +907,7 @@ static struct ureg get_zero( struct texenv_fragment_program *p )
 
 static void program_error( struct texenv_fragment_program *p, const char *msg )
 {
-   _mesa_problem(NULL, msg);
+   _mesa_problem(NULL, "%s", msg);
    p->error = 1;
 }
 
@@ -1199,11 +1203,14 @@ emit_texenv(struct texenv_fragment_program *p, GLuint unit)
    else
       alpha_saturate = GL_FALSE;
 
-   /* If this is the very last calculation, emit direct to output reg:
+   /* If this is the very last calculation (and various other conditions
+    * are met), emit directly to the color output register.  Otherwise,
+    * emit to a temporary register.
     */
    if (key->separate_specular ||
        unit != p->last_tex_stage ||
        alpha_shift ||
+       key->num_draw_buffers != 1 ||
        rgb_shift)
       dest = get_temp( p );
    else
@@ -1438,10 +1445,10 @@ create_new_program(GLcontext *ctx, struct state_key *key,
    p.program->Base.Parameters = _mesa_new_parameter_list();
    p.program->Base.InputsRead = 0x0;
 
-   if (ctx->DrawBuffer->_NumColorDrawBuffers == 1)
+   if (key->num_draw_buffers == 1)
       p.program->Base.OutputsWritten = 1 << FRAG_RESULT_COLOR;
    else {
-      for (i = 0; i < ctx->DrawBuffer->_NumColorDrawBuffers; i++)
+      for (i = 0; i < key->num_draw_buffers; i++)
 	 p.program->Base.OutputsWritten |= (1 << (FRAG_RESULT_DATA0 + i));
    }
 
@@ -1493,8 +1500,8 @@ create_new_program(GLcontext *ctx, struct state_key *key,
 
    cf = get_source( &p, SRC_PREVIOUS, 0 );
 
-   for (i = 0; i < ctx->DrawBuffer->_NumColorDrawBuffers; i++) {
-      if (ctx->DrawBuffer->_NumColorDrawBuffers == 1)
+   for (i = 0; i < key->num_draw_buffers; i++) {
+      if (key->num_draw_buffers == 1)
 	 out = make_ureg( PROGRAM_OUTPUT, FRAG_RESULT_COLOR );
       else {
 	 out = make_ureg( PROGRAM_OUTPUT, FRAG_RESULT_DATA0 + i );
diff --git a/mesalib/src/mesa/main/texfetch.c b/mesalib/src/mesa/main/texfetch.c
index b37039429..c03bc71cd 100644
--- a/mesalib/src/mesa/main/texfetch.c
+++ b/mesalib/src/mesa/main/texfetch.c
@@ -34,7 +34,7 @@
 
 
 #include "colormac.h"
-#include "context.h"
+#include "macros.h"
 #include "texcompress.h"
 #include "texcompress_fxt1.h"
 #include "texcompress_s3tc.h"
@@ -60,7 +60,7 @@ nonlinear_to_linear(GLubyte cs8)
             table[i] = cs / 12.92f;
          }
          else {
-            table[i] = (GLfloat) _mesa_pow((cs + 0.055) / 1.055, 2.4);
+            table[i] = (GLfloat) pow((cs + 0.055) / 1.055, 2.4);
          }
       }
       tableReady = GL_TRUE;
@@ -115,7 +115,7 @@ static void store_null_texel(struct gl_texture_image *texImage,
  * XXX this is somewhat temporary.
  */
 static struct {
-   GLuint Name;
+   gl_format Name;
    FetchTexelFuncF Fetch1D;
    FetchTexelFuncF Fetch2D;
    FetchTexelFuncF Fetch3D;
@@ -124,222 +124,13 @@ static struct {
 texfetch_funcs[MESA_FORMAT_COUNT] =
 {
    {
-      MESA_FORMAT_SRGB8,
-      fetch_texel_1d_srgb8,
-      fetch_texel_2d_srgb8,
-      fetch_texel_3d_srgb8,
-      store_texel_srgb8
-   },
-   {
-      MESA_FORMAT_SRGBA8,
-      fetch_texel_1d_srgba8,
-      fetch_texel_2d_srgba8,
-      fetch_texel_3d_srgba8,
-      store_texel_srgba8
-   },
-   {
-      MESA_FORMAT_SARGB8,
-      fetch_texel_1d_sargb8,
-      fetch_texel_2d_sargb8,
-      fetch_texel_3d_sargb8,
-      store_texel_sargb8
-   },
-   {
-      MESA_FORMAT_SL8,
-      fetch_texel_1d_sl8,
-      fetch_texel_2d_sl8,
-      fetch_texel_3d_sl8,
-      store_texel_sl8
-   },
-   {
-      MESA_FORMAT_SLA8,
-      fetch_texel_1d_sla8,
-      fetch_texel_2d_sla8,
-      fetch_texel_3d_sla8,
-      store_texel_sla8
-   },
-   {
-      MESA_FORMAT_RGB_FXT1,
-      NULL,
-      _mesa_fetch_texel_2d_f_rgb_fxt1,
-      NULL,
-      NULL
-   },
-   {
-      MESA_FORMAT_RGBA_FXT1,
-      NULL,
-      _mesa_fetch_texel_2d_f_rgba_fxt1,
-      NULL,
-      NULL
-   },
-   {
-      MESA_FORMAT_RGB_DXT1,
-      NULL,
-      _mesa_fetch_texel_2d_f_rgb_dxt1,
-      NULL,
-      NULL
-   },
-   {
-      MESA_FORMAT_RGBA_DXT1,
-      NULL,
-      _mesa_fetch_texel_2d_f_rgba_dxt1,
-      NULL,
-      NULL
-   },
-   {
-      MESA_FORMAT_RGBA_DXT3,
-      NULL,
-      _mesa_fetch_texel_2d_f_rgba_dxt3,
-      NULL,
-      NULL
-   },
-   {
-      MESA_FORMAT_RGBA_DXT5,
-      NULL,
-      _mesa_fetch_texel_2d_f_rgba_dxt5,
-      NULL,
-      NULL
-   },
-   {
-      MESA_FORMAT_SRGB_DXT1,
-      NULL,
-      _mesa_fetch_texel_2d_f_srgb_dxt1,
-      NULL,
-      NULL
-   },
-   {
-      MESA_FORMAT_SRGBA_DXT1,
-      NULL,
-      _mesa_fetch_texel_2d_f_srgba_dxt1,
-      NULL,
-      NULL
-   },
-   {
-      MESA_FORMAT_SRGBA_DXT3,
-      NULL,
-      _mesa_fetch_texel_2d_f_srgba_dxt3,
-      NULL,
-      NULL
-   },
-   {
-      MESA_FORMAT_SRGBA_DXT5,
-      NULL,
-      _mesa_fetch_texel_2d_f_srgba_dxt5,
-      NULL,
-      NULL
-   },
-   {
-      MESA_FORMAT_RGBA_FLOAT32,
-      fetch_texel_1d_f_rgba_f32,
-      fetch_texel_2d_f_rgba_f32,
-      fetch_texel_3d_f_rgba_f32,
-      store_texel_rgba_f32
-   },
-   {
-      MESA_FORMAT_RGBA_FLOAT16,
-      fetch_texel_1d_f_rgba_f16,
-      fetch_texel_2d_f_rgba_f16,
-      fetch_texel_3d_f_rgba_f16,
-      store_texel_rgba_f16
-   },
-   {
-      MESA_FORMAT_RGB_FLOAT32,
-      fetch_texel_1d_f_rgb_f32,
-      fetch_texel_2d_f_rgb_f32,
-      fetch_texel_3d_f_rgb_f32,
-      store_texel_rgb_f32
-   },
-   {
-      MESA_FORMAT_RGB_FLOAT16,
-      fetch_texel_1d_f_rgb_f16,
-      fetch_texel_2d_f_rgb_f16,
-      fetch_texel_3d_f_rgb_f16,
-      store_texel_rgb_f16
-   },
-   {
-      MESA_FORMAT_ALPHA_FLOAT32,
-      fetch_texel_1d_f_alpha_f32,
-      fetch_texel_2d_f_alpha_f32,
-      fetch_texel_3d_f_alpha_f32,
-      store_texel_alpha_f32
-   },
-   {
-      MESA_FORMAT_ALPHA_FLOAT16,
-      fetch_texel_1d_f_alpha_f16,
-      fetch_texel_2d_f_alpha_f16,
-      fetch_texel_3d_f_alpha_f16,
-      store_texel_alpha_f16
-   },
-   {
-      MESA_FORMAT_LUMINANCE_FLOAT32,
-      fetch_texel_1d_f_luminance_f32,
-      fetch_texel_2d_f_luminance_f32,
-      fetch_texel_3d_f_luminance_f32,
-      store_texel_luminance_f32
-   },
-   {
-      MESA_FORMAT_LUMINANCE_FLOAT16,
-      fetch_texel_1d_f_luminance_f16,
-      fetch_texel_2d_f_luminance_f16,
-      fetch_texel_3d_f_luminance_f16,
-      store_texel_luminance_f16
-   },
-   {
-      MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32,
-      fetch_texel_1d_f_luminance_alpha_f32,
-      fetch_texel_2d_f_luminance_alpha_f32,
-      fetch_texel_3d_f_luminance_alpha_f32,
-      store_texel_luminance_alpha_f32
-   },
-   {
-      MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16,
-      fetch_texel_1d_f_luminance_alpha_f16,
-      fetch_texel_2d_f_luminance_alpha_f16,
-      fetch_texel_3d_f_luminance_alpha_f16,
-      store_texel_luminance_alpha_f16
-   },
-   {
-      MESA_FORMAT_INTENSITY_FLOAT32,
-      fetch_texel_1d_f_intensity_f32,
-      fetch_texel_2d_f_intensity_f32,
-      fetch_texel_3d_f_intensity_f32,
-      store_texel_intensity_f32
-   },
-   {
-      MESA_FORMAT_INTENSITY_FLOAT16,
-      fetch_texel_1d_f_intensity_f16,
-      fetch_texel_2d_f_intensity_f16,
-      fetch_texel_3d_f_intensity_f16,
-      store_texel_intensity_f16
-   },
-   {
-      MESA_FORMAT_DUDV8,
-      fetch_texel_1d_dudv8,
-      fetch_texel_2d_dudv8,
-      fetch_texel_3d_dudv8,
-      NULL
-   },
-   {
-      MESA_FORMAT_SIGNED_RGBA8888,
-      fetch_texel_1d_signed_rgba8888,
-      fetch_texel_2d_signed_rgba8888,
-      fetch_texel_3d_signed_rgba8888,
-      store_texel_signed_rgba8888
-   },
-   {
-      MESA_FORMAT_SIGNED_RGBA8888_REV,
-      fetch_texel_1d_signed_rgba8888_rev,
-      fetch_texel_2d_signed_rgba8888_rev,
-      fetch_texel_3d_signed_rgba8888_rev,
-      store_texel_signed_rgba8888_rev
-   },
-   {
-      MESA_FORMAT_SIGNED_RGBA_16,
-      NULL, /* XXX to do */
-      NULL,
-      NULL,
-      NULL
+      MESA_FORMAT_NONE,
+      fetch_null_texelf,
+      fetch_null_texelf,
+      fetch_null_texelf,
+      store_null_texel
    },
+
    {
       MESA_FORMAT_RGBA8888,
       fetch_texel_1d_f_rgba8888,
@@ -563,6 +354,330 @@ texfetch_funcs[MESA_FORMAT_COUNT] =
       fetch_texel_2d_f_z32,
       fetch_texel_3d_f_z32,
       store_texel_z32
+   },
+   {
+      MESA_FORMAT_S8,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+   {
+      MESA_FORMAT_SRGB8,
+      fetch_texel_1d_srgb8,
+      fetch_texel_2d_srgb8,
+      fetch_texel_3d_srgb8,
+      store_texel_srgb8
+   },
+   {
+      MESA_FORMAT_SRGBA8,
+      fetch_texel_1d_srgba8,
+      fetch_texel_2d_srgba8,
+      fetch_texel_3d_srgba8,
+      store_texel_srgba8
+   },
+   {
+      MESA_FORMAT_SARGB8,
+      fetch_texel_1d_sargb8,
+      fetch_texel_2d_sargb8,
+      fetch_texel_3d_sargb8,
+      store_texel_sargb8
+   },
+   {
+      MESA_FORMAT_SL8,
+      fetch_texel_1d_sl8,
+      fetch_texel_2d_sl8,
+      fetch_texel_3d_sl8,
+      store_texel_sl8
+   },
+   {
+      MESA_FORMAT_SLA8,
+      fetch_texel_1d_sla8,
+      fetch_texel_2d_sla8,
+      fetch_texel_3d_sla8,
+      store_texel_sla8
+   },
+   {
+      MESA_FORMAT_SRGB_DXT1,
+      NULL,
+      _mesa_fetch_texel_2d_f_srgb_dxt1,
+      NULL,
+      NULL
+   },
+   {
+      MESA_FORMAT_SRGBA_DXT1,
+      NULL,
+      _mesa_fetch_texel_2d_f_srgba_dxt1,
+      NULL,
+      NULL
+   },
+   {
+      MESA_FORMAT_SRGBA_DXT3,
+      NULL,
+      _mesa_fetch_texel_2d_f_srgba_dxt3,
+      NULL,
+      NULL
+   },
+   {
+      MESA_FORMAT_SRGBA_DXT5,
+      NULL,
+      _mesa_fetch_texel_2d_f_srgba_dxt5,
+      NULL,
+      NULL
+   },
+
+   {
+      MESA_FORMAT_RGB_FXT1,
+      NULL,
+      _mesa_fetch_texel_2d_f_rgb_fxt1,
+      NULL,
+      NULL
+   },
+   {
+      MESA_FORMAT_RGBA_FXT1,
+      NULL,
+      _mesa_fetch_texel_2d_f_rgba_fxt1,
+      NULL,
+      NULL
+   },
+   {
+      MESA_FORMAT_RGB_DXT1,
+      NULL,
+      _mesa_fetch_texel_2d_f_rgb_dxt1,
+      NULL,
+      NULL
+   },
+   {
+      MESA_FORMAT_RGBA_DXT1,
+      NULL,
+      _mesa_fetch_texel_2d_f_rgba_dxt1,
+      NULL,
+      NULL
+   },
+   {
+      MESA_FORMAT_RGBA_DXT3,
+      NULL,
+      _mesa_fetch_texel_2d_f_rgba_dxt3,
+      NULL,
+      NULL
+   },
+   {
+      MESA_FORMAT_RGBA_DXT5,
+      NULL,
+      _mesa_fetch_texel_2d_f_rgba_dxt5,
+      NULL,
+      NULL
+   },
+   {
+      MESA_FORMAT_RGBA_FLOAT32,
+      fetch_texel_1d_f_rgba_f32,
+      fetch_texel_2d_f_rgba_f32,
+      fetch_texel_3d_f_rgba_f32,
+      store_texel_rgba_f32
+   },
+   {
+      MESA_FORMAT_RGBA_FLOAT16,
+      fetch_texel_1d_f_rgba_f16,
+      fetch_texel_2d_f_rgba_f16,
+      fetch_texel_3d_f_rgba_f16,
+      store_texel_rgba_f16
+   },
+   {
+      MESA_FORMAT_RGB_FLOAT32,
+      fetch_texel_1d_f_rgb_f32,
+      fetch_texel_2d_f_rgb_f32,
+      fetch_texel_3d_f_rgb_f32,
+      store_texel_rgb_f32
+   },
+   {
+      MESA_FORMAT_RGB_FLOAT16,
+      fetch_texel_1d_f_rgb_f16,
+      fetch_texel_2d_f_rgb_f16,
+      fetch_texel_3d_f_rgb_f16,
+      store_texel_rgb_f16
+   },
+   {
+      MESA_FORMAT_ALPHA_FLOAT32,
+      fetch_texel_1d_f_alpha_f32,
+      fetch_texel_2d_f_alpha_f32,
+      fetch_texel_3d_f_alpha_f32,
+      store_texel_alpha_f32
+   },
+   {
+      MESA_FORMAT_ALPHA_FLOAT16,
+      fetch_texel_1d_f_alpha_f16,
+      fetch_texel_2d_f_alpha_f16,
+      fetch_texel_3d_f_alpha_f16,
+      store_texel_alpha_f16
+   },
+   {
+      MESA_FORMAT_LUMINANCE_FLOAT32,
+      fetch_texel_1d_f_luminance_f32,
+      fetch_texel_2d_f_luminance_f32,
+      fetch_texel_3d_f_luminance_f32,
+      store_texel_luminance_f32
+   },
+   {
+      MESA_FORMAT_LUMINANCE_FLOAT16,
+      fetch_texel_1d_f_luminance_f16,
+      fetch_texel_2d_f_luminance_f16,
+      fetch_texel_3d_f_luminance_f16,
+      store_texel_luminance_f16
+   },
+   {
+      MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32,
+      fetch_texel_1d_f_luminance_alpha_f32,
+      fetch_texel_2d_f_luminance_alpha_f32,
+      fetch_texel_3d_f_luminance_alpha_f32,
+      store_texel_luminance_alpha_f32
+   },
+   {
+      MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16,
+      fetch_texel_1d_f_luminance_alpha_f16,
+      fetch_texel_2d_f_luminance_alpha_f16,
+      fetch_texel_3d_f_luminance_alpha_f16,
+      store_texel_luminance_alpha_f16
+   },
+   {
+      MESA_FORMAT_INTENSITY_FLOAT32,
+      fetch_texel_1d_f_intensity_f32,
+      fetch_texel_2d_f_intensity_f32,
+      fetch_texel_3d_f_intensity_f32,
+      store_texel_intensity_f32
+   },
+   {
+      MESA_FORMAT_INTENSITY_FLOAT16,
+      fetch_texel_1d_f_intensity_f16,
+      fetch_texel_2d_f_intensity_f16,
+      fetch_texel_3d_f_intensity_f16,
+      store_texel_intensity_f16
+   },
+
+   /* non-normalized, signed int */
+   {
+      MESA_FORMAT_RGBA_INT8,
+      fetch_texel_1d_rgba_int8,
+      fetch_texel_2d_rgba_int8,
+      fetch_texel_3d_rgba_int8,
+      store_texel_rgba_int8
+   },
+   {
+      MESA_FORMAT_RGBA_INT16,
+      fetch_texel_1d_rgba_int16,
+      fetch_texel_2d_rgba_int16,
+      fetch_texel_3d_rgba_int16,
+      store_texel_rgba_int16
+   },
+   {
+      MESA_FORMAT_RGBA_INT32,
+      fetch_texel_1d_rgba_int32,
+      fetch_texel_2d_rgba_int32,
+      fetch_texel_3d_rgba_int32,
+      store_texel_rgba_int32
+   },
+
+   /* non-normalized, unsigned int */
+   {
+      MESA_FORMAT_RGBA_UINT8,
+      fetch_texel_1d_rgba_uint8,
+      fetch_texel_2d_rgba_uint8,
+      fetch_texel_3d_rgba_uint8,
+      store_texel_rgba_uint8
+   },
+   {
+      MESA_FORMAT_RGBA_UINT16,
+      fetch_texel_1d_rgba_uint16,
+      fetch_texel_2d_rgba_uint16,
+      fetch_texel_3d_rgba_uint16,
+      store_texel_rgba_uint16
+   },
+   {
+      MESA_FORMAT_RGBA_UINT32,
+      fetch_texel_1d_rgba_uint32,
+      fetch_texel_2d_rgba_uint32,
+      fetch_texel_3d_rgba_uint32,
+      store_texel_rgba_uint32
+   },
+
+   /* dudv */
+   {
+      MESA_FORMAT_DUDV8,
+      fetch_texel_1d_dudv8,
+      fetch_texel_2d_dudv8,
+      fetch_texel_3d_dudv8,
+      NULL
+   },
+
+   /* signed, normalized */
+   {
+      MESA_FORMAT_SIGNED_R8,
+      fetch_texel_1d_signed_r8,
+      fetch_texel_2d_signed_r8,
+      fetch_texel_3d_signed_r8,
+      store_texel_signed_r8
+   },
+   {
+      MESA_FORMAT_SIGNED_RG88,
+      fetch_texel_1d_signed_rg88,
+      fetch_texel_2d_signed_rg88,
+      fetch_texel_3d_signed_rg88,
+      store_texel_signed_rg88
+   },
+   {
+      MESA_FORMAT_SIGNED_RGBX8888,
+      fetch_texel_1d_signed_rgbx8888,
+      fetch_texel_2d_signed_rgbx8888,
+      fetch_texel_3d_signed_rgbx8888,
+      store_texel_signed_rgbx8888
+   },
+   {
+      MESA_FORMAT_SIGNED_RGBA8888,
+      fetch_texel_1d_signed_rgba8888,
+      fetch_texel_2d_signed_rgba8888,
+      fetch_texel_3d_signed_rgba8888,
+      store_texel_signed_rgba8888
+   },
+   {
+      MESA_FORMAT_SIGNED_RGBA8888_REV,
+      fetch_texel_1d_signed_rgba8888_rev,
+      fetch_texel_2d_signed_rgba8888_rev,
+      fetch_texel_3d_signed_rgba8888_rev,
+      store_texel_signed_rgba8888_rev
+   },
+   {
+      MESA_FORMAT_SIGNED_R_16,
+      fetch_texel_1d_signed_r_16,
+      fetch_texel_2d_signed_r_16,
+      fetch_texel_3d_signed_r_16,
+      store_texel_signed_r_16
+   },
+   {
+      MESA_FORMAT_SIGNED_RG_16,
+      fetch_texel_1d_signed_rg_16,
+      fetch_texel_2d_signed_rg_16,
+      fetch_texel_3d_signed_rg_16,
+      store_texel_signed_rg_16
+   },
+   {
+      MESA_FORMAT_SIGNED_RGB_16,
+      fetch_texel_1d_signed_rgb_16,
+      fetch_texel_2d_signed_rgb_16,
+      fetch_texel_3d_signed_rgb_16,
+      store_texel_signed_rgb_16
+   },
+   {
+      MESA_FORMAT_SIGNED_RGBA_16,
+      fetch_texel_1d_signed_rgba_16,
+      fetch_texel_2d_signed_rgba_16,
+      fetch_texel_3d_signed_rgba_16,
+      store_texel_signed_rgba_16
+   },
+   {
+      MESA_FORMAT_RGBA_16,
+      fetch_texel_1d_rgba_16,
+      fetch_texel_2d_rgba_16,
+      fetch_texel_3d_rgba_16,
+      store_texel_rgba_16
    }
 };
 
@@ -570,49 +685,39 @@ texfetch_funcs[MESA_FORMAT_COUNT] =
 static FetchTexelFuncF
 _mesa_get_texel_fetch_func(gl_format format, GLuint dims)
 {
-   FetchTexelFuncF f = NULL;
-   GLuint i;
-   /* XXX replace loop with direct table lookup */
-   for (i = 0; i < MESA_FORMAT_COUNT; i++) {
-      if (texfetch_funcs[i].Name == format) {
-         switch (dims) {
-         case 1:
-            f = texfetch_funcs[i].Fetch1D;
-            break;
-         case 2:
-            f = texfetch_funcs[i].Fetch2D;
-            break;
-         case 3:
-            f = texfetch_funcs[i].Fetch3D;
-            break;
-         }
-         if (!f)
-            f = fetch_null_texelf;
-         return f;
-      }
+#ifdef DEBUG
+   /* check that the table entries are sorted by format name */
+   gl_format fmt;
+   for (fmt = 0; fmt < MESA_FORMAT_COUNT; fmt++) {
+      assert(texfetch_funcs[fmt].Name == fmt);
+   }
+#endif
+
+   assert(Elements(texfetch_funcs) == MESA_FORMAT_COUNT);
+   assert(format < MESA_FORMAT_COUNT);
+
+   switch (dims) {
+   case 1:
+      return texfetch_funcs[format].Fetch1D;
+   case 2:
+      return texfetch_funcs[format].Fetch2D;
+   case 3:
+      return texfetch_funcs[format].Fetch3D;
+   default:
+      assert(0 && "bad dims in _mesa_get_texel_fetch_func");
+      return NULL;
    }
-   return NULL;
 }
 
 
 StoreTexelFunc
 _mesa_get_texel_store_func(gl_format format)
 {
-   GLuint i;
-   /* XXX replace loop with direct table lookup */
-   for (i = 0; i < MESA_FORMAT_COUNT; i++) {
-      if (texfetch_funcs[i].Name == format) {
-         if (texfetch_funcs[i].StoreTexel)
-            return texfetch_funcs[i].StoreTexel;
-         else
-            return store_null_texel;
-      }
-   }
-   return NULL;
+   assert(format < MESA_FORMAT_COUNT);
+   return texfetch_funcs[format].StoreTexel;
 }
 
 
-
 /**
  * Adaptor for fetching a GLchan texel from a float-valued texture.
  */
diff --git a/mesalib/src/mesa/main/texfetch_tmp.h b/mesalib/src/mesa/main/texfetch_tmp.h
index b11ed5c39..f94355437 100644
--- a/mesalib/src/mesa/main/texfetch_tmp.h
+++ b/mesalib/src/mesa/main/texfetch_tmp.h
@@ -1195,6 +1195,174 @@ static void store_texel_sla8(struct gl_texture_image *texImage,
 #endif
 
 
+/* MESA_FORMAT_RGBA_INT8 **************************************************/
+
+static void
+FETCH(rgba_int8)(const struct gl_texture_image *texImage,
+                 GLint i, GLint j, GLint k, GLfloat *texel )
+{
+   const GLbyte *src = TEXEL_ADDR(GLbyte, texImage, i, j, k, 4);
+   texel[RCOMP] = (GLfloat) src[0];
+   texel[GCOMP] = (GLfloat) src[1];
+   texel[BCOMP] = (GLfloat) src[2];
+   texel[ACOMP] = (GLfloat) src[3];
+}
+
+#if DIM == 3
+static void
+store_texel_rgba_int8(struct gl_texture_image *texImage,
+                      GLint i, GLint j, GLint k, const void *texel)
+{
+   const GLbyte *rgba = (const GLbyte *) texel;
+   GLbyte *dst = TEXEL_ADDR(GLbyte, texImage, i, j, k, 4);
+   dst[0] = rgba[RCOMP];
+   dst[1] = rgba[GCOMP];
+   dst[2] = rgba[BCOMP];
+   dst[3] = rgba[ACOMP];
+}
+#endif
+
+
+/* MESA_FORMAT_RGBA_INT16 **************************************************/
+
+static void
+FETCH(rgba_int16)(const struct gl_texture_image *texImage,
+                  GLint i, GLint j, GLint k, GLfloat *texel )
+{
+   const GLshort *src = TEXEL_ADDR(GLshort, texImage, i, j, k, 4);
+   texel[RCOMP] = (GLfloat) src[0];
+   texel[GCOMP] = (GLfloat) src[1];
+   texel[BCOMP] = (GLfloat) src[2];
+   texel[ACOMP] = (GLfloat) src[3];
+}
+
+#if DIM == 3
+static void
+store_texel_rgba_int16(struct gl_texture_image *texImage,
+                       GLint i, GLint j, GLint k, const void *texel)
+{
+   const GLshort *rgba = (const GLshort *) texel;
+   GLshort *dst = TEXEL_ADDR(GLshort, texImage, i, j, k, 4);
+   dst[0] = rgba[RCOMP];
+   dst[1] = rgba[GCOMP];
+   dst[2] = rgba[BCOMP];
+   dst[3] = rgba[ACOMP];
+}
+#endif
+
+
+/* MESA_FORMAT_RGBA_INT32 **************************************************/
+
+static void
+FETCH(rgba_int32)(const struct gl_texture_image *texImage,
+                  GLint i, GLint j, GLint k, GLfloat *texel )
+{
+   const GLint *src = TEXEL_ADDR(GLint, texImage, i, j, k, 4);
+   texel[RCOMP] = (GLfloat) src[0];
+   texel[GCOMP] = (GLfloat) src[1];
+   texel[BCOMP] = (GLfloat) src[2];
+   texel[ACOMP] = (GLfloat) src[3];
+}
+
+#if DIM == 3
+static void
+store_texel_rgba_int32(struct gl_texture_image *texImage,
+                       GLint i, GLint j, GLint k, const void *texel)
+{
+   const GLint *rgba = (const GLint *) texel;
+   GLint *dst = TEXEL_ADDR(GLint, texImage, i, j, k, 4);
+   dst[0] = rgba[RCOMP];
+   dst[1] = rgba[GCOMP];
+   dst[2] = rgba[BCOMP];
+   dst[3] = rgba[ACOMP];
+}
+#endif
+
+
+/* MESA_FORMAT_RGBA_UINT8 **************************************************/
+
+static void
+FETCH(rgba_uint8)(const struct gl_texture_image *texImage,
+                 GLint i, GLint j, GLint k, GLfloat *texel )
+{
+   const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 4);
+   texel[RCOMP] = (GLfloat) src[0];
+   texel[GCOMP] = (GLfloat) src[1];
+   texel[BCOMP] = (GLfloat) src[2];
+   texel[ACOMP] = (GLfloat) src[3];
+}
+
+#if DIM == 3
+static void
+store_texel_rgba_uint8(struct gl_texture_image *texImage,
+                      GLint i, GLint j, GLint k, const void *texel)
+{
+   const GLubyte *rgba = (const GLubyte *) texel;
+   GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 4);
+   dst[0] = rgba[RCOMP];
+   dst[1] = rgba[GCOMP];
+   dst[2] = rgba[BCOMP];
+   dst[3] = rgba[ACOMP];
+}
+#endif
+
+
+/* MESA_FORMAT_RGBA_UINT16 **************************************************/
+
+static void
+FETCH(rgba_uint16)(const struct gl_texture_image *texImage,
+                  GLint i, GLint j, GLint k, GLfloat *texel )
+{
+   const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 4);
+   texel[RCOMP] = (GLfloat) src[0];
+   texel[GCOMP] = (GLfloat) src[1];
+   texel[BCOMP] = (GLfloat) src[2];
+   texel[ACOMP] = (GLfloat) src[3];
+}
+
+#if DIM == 3
+static void
+store_texel_rgba_uint16(struct gl_texture_image *texImage,
+                       GLint i, GLint j, GLint k, const void *texel)
+{
+   const GLushort *rgba = (const GLushort *) texel;
+   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 4);
+   dst[0] = rgba[RCOMP];
+   dst[1] = rgba[GCOMP];
+   dst[2] = rgba[BCOMP];
+   dst[3] = rgba[ACOMP];
+}
+#endif
+
+
+/* MESA_FORMAT_RGBA_UINT32 **************************************************/
+
+static void
+FETCH(rgba_uint32)(const struct gl_texture_image *texImage,
+                  GLint i, GLint j, GLint k, GLfloat *texel )
+{
+   const GLuint *src = TEXEL_ADDR(GLuint, texImage, i, j, k, 4);
+   texel[RCOMP] = (GLfloat) src[0];
+   texel[GCOMP] = (GLfloat) src[1];
+   texel[BCOMP] = (GLfloat) src[2];
+   texel[ACOMP] = (GLfloat) src[3];
+}
+
+#if DIM == 3
+static void
+store_texel_rgba_uint32(struct gl_texture_image *texImage,
+                       GLint i, GLint j, GLint k, const void *texel)
+{
+   const GLuint *rgba = (const GLuint *) texel;
+   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 4);
+   dst[0] = rgba[RCOMP];
+   dst[1] = rgba[GCOMP];
+   dst[2] = rgba[BCOMP];
+   dst[3] = rgba[ACOMP];
+}
+#endif
+
+
 /* MESA_FORMAT_DUDV8 ********************************************************/
 
 /* this format by definition produces 0,0,0,1 as rgba values,
@@ -1209,6 +1377,76 @@ static void FETCH(dudv8)(const struct gl_texture_image *texImage,
    texel[ACOMP] = 0;
 }
 
+
+/* MESA_FORMAT_SIGNED_R8 ***********************************************/
+
+static void FETCH(signed_r8)( const struct gl_texture_image *texImage,
+                              GLint i, GLint j, GLint k, GLfloat *texel )
+{
+   const GLbyte s = *TEXEL_ADDR(GLbyte, texImage, i, j, k, 1);
+   texel[RCOMP] = BYTE_TO_FLOAT_TEX( s );
+   texel[GCOMP] = 0.0F;
+   texel[BCOMP] = 0.0F;
+   texel[ACOMP] = 1.0F;
+}
+
+#if DIM == 3
+static void store_texel_signed_r8(struct gl_texture_image *texImage,
+                                  GLint i, GLint j, GLint k, const void *texel)
+{
+   const GLbyte *rgba = (const GLbyte *) texel;
+   GLbyte *dst = TEXEL_ADDR(GLbyte, texImage, i, j, k, 1);
+   *dst = rgba[RCOMP];
+}
+#endif
+
+
+/* MESA_FORMAT_SIGNED_RG88 ***********************************************/
+
+static void FETCH(signed_rg88)( const struct gl_texture_image *texImage,
+                                GLint i, GLint j, GLint k, GLfloat *texel )
+{
+   const GLushort s = *TEXEL_ADDR(GLshort, texImage, i, j, k, 1);
+   texel[RCOMP] = BYTE_TO_FLOAT_TEX( (GLbyte) (s >> 8) );
+   texel[GCOMP] = BYTE_TO_FLOAT_TEX( (GLbyte) (s & 0xff) );
+   texel[BCOMP] = 0.0F;
+   texel[ACOMP] = 1.0F;
+}
+
+#if DIM == 3
+static void store_texel_signed_rg88(struct gl_texture_image *texImage,
+                                    GLint i, GLint j, GLint k, const void *texel)
+{
+   const GLbyte *rg = (const GLbyte *) texel;
+   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 2);
+   *dst = PACK_COLOR_88(rg[RCOMP], rg[GCOMP]);
+}
+#endif
+
+
+/* MESA_FORMAT_SIGNED_RGBX8888 ***********************************************/
+
+static void FETCH(signed_rgbx8888)( const struct gl_texture_image *texImage,
+			            GLint i, GLint j, GLint k, GLfloat *texel )
+{
+   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
+   texel[RCOMP] = BYTE_TO_FLOAT_TEX( (GLbyte) (s >> 24) );
+   texel[GCOMP] = BYTE_TO_FLOAT_TEX( (GLbyte) (s >> 16) );
+   texel[BCOMP] = BYTE_TO_FLOAT_TEX( (GLbyte) (s >>  8) );
+   texel[ACOMP] = 1.0f;
+}
+
+#if DIM == 3
+static void store_texel_signed_rgbx8888(struct gl_texture_image *texImage,
+                                        GLint i, GLint j, GLint k, const void *texel)
+{
+   const GLbyte *rgba = (const GLbyte *) texel;
+   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
+   *dst = PACK_COLOR_8888(rgba[RCOMP], rgba[GCOMP], rgba[BCOMP], 255);
+}
+#endif
+
+
 /* MESA_FORMAT_SIGNED_RGBA8888 ***********************************************/
 
 static void FETCH(signed_rgba8888)( const struct gl_texture_image *texImage,
@@ -1253,6 +1491,142 @@ static void store_texel_signed_rgba8888_rev(struct gl_texture_image *texImage,
 
 
 
+/* MESA_FORMAT_SIGNED_R_16 ***********************************************/
+
+static void
+FETCH(signed_r_16)(const struct gl_texture_image *texImage,
+                   GLint i, GLint j, GLint k, GLfloat *texel)
+{
+   const GLshort s = *TEXEL_ADDR(GLshort, texImage, i, j, k, 1);
+   texel[RCOMP] = SHORT_TO_FLOAT_TEX( s );
+   texel[GCOMP] = 0.0F;
+   texel[BCOMP] = 0.0F;
+   texel[ACOMP] = 1.0F;
+}
+
+#if DIM == 3
+static void
+store_texel_signed_r_16(struct gl_texture_image *texImage,
+                        GLint i, GLint j, GLint k, const void *texel)
+{
+   const GLshort *rgba = (const GLshort *) texel;
+   GLshort *dst = TEXEL_ADDR(GLshort, texImage, i, j, k, 1);
+   *dst = rgba[0];
+}
+#endif
+
+
+/* MESA_FORMAT_SIGNED_RG_16 ***********************************************/
+
+static void
+FETCH(signed_rg_16)(const struct gl_texture_image *texImage,
+                    GLint i, GLint j, GLint k, GLfloat *texel)
+{
+   const GLshort *s = TEXEL_ADDR(GLshort, texImage, i, j, k, 2);
+   texel[RCOMP] = SHORT_TO_FLOAT_TEX( s[0] );
+   texel[GCOMP] = SHORT_TO_FLOAT_TEX( s[1] );
+   texel[BCOMP] = 0.0F;
+   texel[ACOMP] = 1.0F;
+}
+
+#if DIM == 3
+static void
+store_texel_signed_rg_16(struct gl_texture_image *texImage,
+                         GLint i, GLint j, GLint k, const void *texel)
+{
+   const GLshort *rgba = (const GLshort *) texel;
+   GLshort *dst = TEXEL_ADDR(GLshort, texImage, i, j, k, 2);
+   dst[0] = rgba[RCOMP];
+   dst[1] = rgba[GCOMP];
+}
+#endif
+
+
+/* MESA_FORMAT_SIGNED_RGBA_16 ***********************************************/
+
+static void 
+FETCH(signed_rgb_16)(const struct gl_texture_image *texImage,
+                     GLint i, GLint j, GLint k, GLfloat *texel)
+{
+   const GLshort *s = TEXEL_ADDR(GLshort, texImage, i, j, k, 3);
+   texel[RCOMP] = SHORT_TO_FLOAT_TEX( s[0] );
+   texel[GCOMP] = SHORT_TO_FLOAT_TEX( s[1] );
+   texel[BCOMP] = SHORT_TO_FLOAT_TEX( s[2] );
+   texel[ACOMP] = 1.0F;
+}
+
+#if DIM == 3
+static void
+store_texel_signed_rgb_16(struct gl_texture_image *texImage,
+                          GLint i, GLint j, GLint k, const void *texel)
+{
+   const GLshort *rgba = (const GLshort *) texel;
+   GLshort *dst = TEXEL_ADDR(GLshort, texImage, i, j, k, 3);
+   dst[0] = rgba[RCOMP];
+   dst[1] = rgba[GCOMP];
+   dst[2] = rgba[BCOMP];
+}
+#endif
+
+
+/* MESA_FORMAT_SIGNED_RGBA_16 ***********************************************/
+
+static void
+FETCH(signed_rgba_16)(const struct gl_texture_image *texImage,
+                      GLint i, GLint j, GLint k, GLfloat *texel)
+{
+   const GLshort *s = TEXEL_ADDR(GLshort, texImage, i, j, k, 4);
+   texel[RCOMP] = SHORT_TO_FLOAT_TEX( s[0] );
+   texel[GCOMP] = SHORT_TO_FLOAT_TEX( s[1] );
+   texel[BCOMP] = SHORT_TO_FLOAT_TEX( s[2] );
+   texel[ACOMP] = SHORT_TO_FLOAT_TEX( s[3] );
+}
+
+#if DIM == 3
+static void
+store_texel_signed_rgba_16(struct gl_texture_image *texImage,
+                           GLint i, GLint j, GLint k, const void *texel)
+{
+   const GLshort *rgba = (const GLshort *) texel;
+   GLshort *dst = TEXEL_ADDR(GLshort, texImage, i, j, k, 4);
+   dst[0] = rgba[RCOMP];
+   dst[1] = rgba[GCOMP];
+   dst[2] = rgba[BCOMP];
+   dst[3] = rgba[ACOMP];
+}
+#endif
+
+
+
+/* MESA_FORMAT_RGBA_16 ***********************************************/
+
+static void
+FETCH(rgba_16)(const struct gl_texture_image *texImage,
+               GLint i, GLint j, GLint k, GLfloat *texel)
+{
+   const GLushort *s = TEXEL_ADDR(GLushort, texImage, i, j, k, 4);
+   texel[RCOMP] = USHORT_TO_FLOAT( s[0] );
+   texel[GCOMP] = USHORT_TO_FLOAT( s[1] );
+   texel[BCOMP] = USHORT_TO_FLOAT( s[2] );
+   texel[ACOMP] = USHORT_TO_FLOAT( s[3] );
+}
+
+#if DIM == 3
+static void
+store_texel_rgba_16(struct gl_texture_image *texImage,
+                    GLint i, GLint j, GLint k, const void *texel)
+{
+   const GLushort *rgba = (const GLushort *) texel;
+   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 4);
+   dst[0] = rgba[RCOMP];
+   dst[1] = rgba[GCOMP];
+   dst[2] = rgba[BCOMP];
+   dst[3] = rgba[ACOMP];
+}
+#endif
+
+
+
 /* MESA_FORMAT_YCBCR *********************************************************/
 
 /* Fetch texel from 1D, 2D or 3D ycbcr texture, return 4 GLfloats.
diff --git a/mesalib/src/mesa/main/texformat.c b/mesalib/src/mesa/main/texformat.c
index 096945a64..b9271ef58 100644
--- a/mesalib/src/mesa/main/texformat.c
+++ b/mesalib/src/mesa/main/texformat.c
@@ -61,12 +61,9 @@ _mesa_choose_tex_format( GLcontext *ctx, GLint internalFormat,
    (void) type;
 
    switch (internalFormat) {
-      /* RGBA formats */
+      /* shallow RGBA formats */
       case 4:
       case GL_RGBA:
-      case GL_RGB10_A2:
-      case GL_RGBA12:
-      case GL_RGBA16:
       case GL_RGBA8:
          return MESA_FORMAT_RGBA8888;
       case GL_RGB5_A1:
@@ -76,12 +73,15 @@ _mesa_choose_tex_format( GLcontext *ctx, GLint internalFormat,
       case GL_RGBA4:
          return MESA_FORMAT_ARGB4444;
 
-      /* RGB formats */
+      /* deep RGBA formats */
+      case GL_RGB10_A2:
+      case GL_RGBA12:
+      case GL_RGBA16:
+         return MESA_FORMAT_RGBA_16;
+
+      /* shallow RGB formats */
       case 3:
       case GL_RGB:
-      case GL_RGB10:
-      case GL_RGB12:
-      case GL_RGB16:
       case GL_RGB8:
          return MESA_FORMAT_RGB888;
       case GL_R3_G3_B2:
@@ -91,6 +91,12 @@ _mesa_choose_tex_format( GLcontext *ctx, GLint internalFormat,
       case GL_RGB5:
          return MESA_FORMAT_RGB565;
 
+      /* deep RGB formats */
+      case GL_RGB10:
+      case GL_RGB12:
+      case GL_RGB16:
+         return MESA_FORMAT_RGBA_16;
+
       /* Alpha formats */
       case GL_ALPHA:
       case GL_ALPHA4:
@@ -294,6 +300,32 @@ _mesa_choose_tex_format( GLcontext *ctx, GLint internalFormat,
       }
    }
 
+   if (ctx->VersionMajor * 10 + ctx->VersionMinor >= 31) {
+      switch (internalFormat) {
+         case GL_RED_SNORM:
+         case GL_R8_SNORM:
+            return MESA_FORMAT_SIGNED_R8;
+         case GL_RG_SNORM:
+         case GL_RG8_SNORM:
+            return MESA_FORMAT_SIGNED_RG88;
+         case GL_RGB_SNORM:
+         case GL_RGB8_SNORM:
+            return MESA_FORMAT_SIGNED_RGBX8888;
+         case GL_RGBA_SNORM:
+         case GL_RGBA8_SNORM:
+            return MESA_FORMAT_SIGNED_RGBA8888;
+         case GL_R16_SNORM:
+            return MESA_FORMAT_SIGNED_R_16;
+         case GL_RG16_SNORM:
+            return MESA_FORMAT_SIGNED_RG_16;
+         case GL_RGB16_SNORM:
+            return MESA_FORMAT_SIGNED_RGB_16;
+         case GL_RGBA16_SNORM:
+            return MESA_FORMAT_SIGNED_RGBA_16;
+         default:
+            ; /* fall-through */
+      }
+   }
 
 #if FEATURE_EXT_texture_sRGB
    if (ctx->Extensions.EXT_texture_sRGB) {
@@ -350,6 +382,53 @@ _mesa_choose_tex_format( GLcontext *ctx, GLint internalFormat,
    }
 #endif /* FEATURE_EXT_texture_sRGB */
 
+   if (ctx->Extensions.EXT_texture_integer) {
+      switch (internalFormat) {
+      case GL_RGBA32UI_EXT:
+      case GL_RGB32UI_EXT:
+      case GL_ALPHA32UI_EXT:
+      case GL_INTENSITY32UI_EXT:
+      case GL_LUMINANCE32UI_EXT:
+      case GL_LUMINANCE_ALPHA32UI_EXT:
+         return MESA_FORMAT_RGBA_UINT32;
+      case GL_RGBA16UI_EXT:
+      case GL_RGB16UI_EXT:
+      case GL_ALPHA16UI_EXT:
+      case GL_INTENSITY16UI_EXT:
+      case GL_LUMINANCE16UI_EXT:
+      case GL_LUMINANCE_ALPHA16UI_EXT:
+         return MESA_FORMAT_RGBA_UINT16;
+      case GL_RGBA8UI_EXT:
+      case GL_RGB8UI_EXT:
+      case GL_ALPHA8UI_EXT:
+      case GL_INTENSITY8UI_EXT:
+      case GL_LUMINANCE8UI_EXT:
+      case GL_LUMINANCE_ALPHA8UI_EXT:
+         return MESA_FORMAT_RGBA_UINT8;
+      case GL_RGBA32I_EXT:
+      case GL_RGB32I_EXT:
+      case GL_ALPHA32I_EXT:
+      case GL_INTENSITY32I_EXT:
+      case GL_LUMINANCE32I_EXT:
+      case GL_LUMINANCE_ALPHA32I_EXT:
+         return MESA_FORMAT_RGBA_INT32;
+      case GL_RGBA16I_EXT:
+      case GL_RGB16I_EXT:
+      case GL_ALPHA16I_EXT:
+      case GL_INTENSITY16I_EXT:
+      case GL_LUMINANCE16I_EXT:
+      case GL_LUMINANCE_ALPHA16I_EXT:
+         return MESA_FORMAT_RGBA_INT16;
+      case GL_RGBA8I_EXT:
+      case GL_RGB8I_EXT:
+      case GL_ALPHA8I_EXT:
+      case GL_INTENSITY8I_EXT:
+      case GL_LUMINANCE8I_EXT:
+      case GL_LUMINANCE_ALPHA8I_EXT:
+         return MESA_FORMAT_RGBA_INT8;
+      }
+   }
+
    _mesa_problem(ctx, "unexpected format in _mesa_choose_tex_format()");
    return MESA_FORMAT_NONE;
 }
diff --git a/mesalib/src/mesa/main/texgen.c b/mesalib/src/mesa/main/texgen.c
index e70ea3029..108ea4cd4 100644
--- a/mesalib/src/mesa/main/texgen.c
+++ b/mesalib/src/mesa/main/texgen.c
@@ -192,6 +192,38 @@ _mesa_TexGend(GLenum coord, GLenum pname, GLdouble param )
    _mesa_TexGenfv( coord, pname, p );
 }
 
+#if FEATURE_ES1
+
+void GLAPIENTRY
+_es_GetTexGenfv(GLenum coord, GLenum pname, GLfloat *params)
+{
+   ASSERT(coord == GL_TEXTURE_GEN_STR_OES);
+   _mesa_GetTexGenfv(GL_S, pname, params);
+}
+
+
+void GLAPIENTRY
+_es_TexGenf(GLenum coord, GLenum pname, GLfloat param)
+{
+   ASSERT(coord == GL_TEXTURE_GEN_STR_OES);
+   /* set S, T, and R at the same time */
+   _mesa_TexGenf(GL_S, pname, param);
+   _mesa_TexGenf(GL_T, pname, param);
+   _mesa_TexGenf(GL_R, pname, param);
+}
+
+
+void GLAPIENTRY
+_es_TexGenfv(GLenum coord, GLenum pname, const GLfloat *params)
+{
+   ASSERT(coord == GL_TEXTURE_GEN_STR_OES);
+   /* set S, T, and R at the same time */
+   _mesa_TexGenfv(GL_S, pname, params);
+   _mesa_TexGenfv(GL_T, pname, params);
+   _mesa_TexGenfv(GL_R, pname, params);
+}
+
+#endif
 
 static void GLAPIENTRY
 _mesa_TexGendv(GLenum coord, GLenum pname, const GLdouble *params )
diff --git a/mesalib/src/mesa/main/texgen.h b/mesalib/src/mesa/main/texgen.h
index eb4626033..9ed802383 100644
--- a/mesalib/src/mesa/main/texgen.h
+++ b/mesalib/src/mesa/main/texgen.h
@@ -27,15 +27,13 @@
 #define TEXGEN_H
 
 
-#include "main/mtypes.h"
+#include "compiler.h"
+#include "glheader.h"
 
+struct _glapi_table;
 
-#if FEATURE_texgen
 
-#define _MESA_INIT_TEXGEN_FUNCTIONS(driver, impl) \
-   do {                                           \
-      (driver)->TexGen = impl ## TexGen;          \
-   } while (0)
+#if FEATURE_texgen
 
 extern void GLAPIENTRY
 _mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params );
@@ -52,9 +50,18 @@ _mesa_GetTexGenfv( GLenum coord, GLenum pname, GLfloat *params );
 extern void
 _mesa_init_texgen_dispatch(struct _glapi_table *disp);
 
-#else /* FEATURE_texgen */
 
-#define _MESA_INIT_TEXGEN_FUNCTIONS(driver, impl) do { } while (0)
+extern void GLAPIENTRY
+_es_GetTexGenfv(GLenum coord, GLenum pname, GLfloat *params);
+
+extern void GLAPIENTRY
+_es_TexGenf(GLenum coord, GLenum pname, GLfloat param);
+
+extern void GLAPIENTRY
+_es_TexGenfv(GLenum coord, GLenum pname, const GLfloat *params);
+
+
+#else /* FEATURE_texgen */
 
 static void
 _mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params )
diff --git a/mesalib/src/mesa/main/texgetimage.c b/mesalib/src/mesa/main/texgetimage.c
index 7ad91805b..00134ea9f 100644
--- a/mesalib/src/mesa/main/texgetimage.c
+++ b/mesalib/src/mesa/main/texgetimage.c
@@ -224,7 +224,7 @@ linear_to_nonlinear(GLfloat cl)
       cs = 12.92f * cl;
    }
    else {
-      cs = (GLfloat)(1.055 * _mesa_pow(cl, 0.41666) - 0.055);
+      cs = (GLfloat)(1.055 * pow(cl, 0.41666) - 0.055);
    }
    return cs;
 }
diff --git a/mesalib/src/mesa/main/texgetimage.h b/mesalib/src/mesa/main/texgetimage.h
index 088d27c7e..866ab7049 100644
--- a/mesalib/src/mesa/main/texgetimage.h
+++ b/mesalib/src/mesa/main/texgetimage.h
@@ -27,6 +27,7 @@
 #ifndef TEXGETIMAGE_H
 #define TEXGETIMAGE_H
 
+#include "mtypes.h"
 
 extern void
 _mesa_get_teximage(GLcontext *ctx, GLenum target, GLint level,
diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c
index d72e91b3a..ca1bd6096 100644
--- a/mesalib/src/mesa/main/teximage.c
+++ b/mesalib/src/mesa/main/teximage.c
@@ -46,6 +46,7 @@
 #include "texfetch.h"
 #include "teximage.h"
 #include "texstate.h"
+#include "texpal.h"
 #include "mtypes.h"
 
 
@@ -347,41 +348,136 @@ _mesa_base_tex_format( GLcontext *ctx, GLint internalFormat )
       case GL_SLUMINANCE8_EXT:
          return GL_LUMINANCE;
       default:
-            ; /* fallthrough */
+         ; /* fallthrough */
       }
    }
-
 #endif /* FEATURE_EXT_texture_sRGB */
 
-   return -1; /* error */
-}
+   if (ctx->Extensions.EXT_texture_integer) {
+      switch (internalFormat) {
+      case GL_RGBA8UI_EXT:
+      case GL_RGBA16UI_EXT:
+      case GL_RGBA32UI_EXT:
+      case GL_RGBA8I_EXT:
+      case GL_RGBA16I_EXT:
+      case GL_RGBA32I_EXT:
+         return GL_RGBA;
+      case GL_RGB8UI_EXT:
+      case GL_RGB16UI_EXT:
+      case GL_RGB32UI_EXT:
+      case GL_RGB8I_EXT:
+      case GL_RGB16I_EXT:
+      case GL_RGB32I_EXT:
+         return GL_RGB;
+      case GL_ALPHA8UI_EXT:
+      case GL_ALPHA16UI_EXT:
+      case GL_ALPHA32UI_EXT:
+      case GL_ALPHA8I_EXT:
+      case GL_ALPHA16I_EXT:
+      case GL_ALPHA32I_EXT:
+         return GL_ALPHA;
+      case GL_INTENSITY8UI_EXT:
+      case GL_INTENSITY16UI_EXT:
+      case GL_INTENSITY32UI_EXT:
+      case GL_INTENSITY8I_EXT:
+      case GL_INTENSITY16I_EXT:
+      case GL_INTENSITY32I_EXT:
+         return GL_INTENSITY;
+      case GL_LUMINANCE8UI_EXT:
+      case GL_LUMINANCE16UI_EXT:
+      case GL_LUMINANCE32UI_EXT:
+      case GL_LUMINANCE8I_EXT:
+      case GL_LUMINANCE16I_EXT:
+      case GL_LUMINANCE32I_EXT:
+         return GL_LUMINANCE;
+      case GL_LUMINANCE_ALPHA8UI_EXT:
+      case GL_LUMINANCE_ALPHA16UI_EXT:
+      case GL_LUMINANCE_ALPHA32UI_EXT:
+      case GL_LUMINANCE_ALPHA8I_EXT:
+      case GL_LUMINANCE_ALPHA16I_EXT:
+      case GL_LUMINANCE_ALPHA32I_EXT:
+         return GL_LUMINANCE_ALPHA;
+      default:
+         ; /* fallthrough */
+      }
+   }
 
+   if (ctx->Extensions.ARB_texture_rg) {
+      switch (internalFormat) {
+      case GL_R8:
+      case GL_R16:
+      case GL_R16F:
+      case GL_R32F:
+      case GL_R8I:
+      case GL_R8UI:
+      case GL_R16I:
+      case GL_R16UI:
+      case GL_R32I:
+      case GL_R32UI:
+         return GL_R;
+      case GL_RG:
+      case GL_RG_INTEGER:
+      case GL_RG8:
+      case GL_RG16:
+      case GL_RG16F:
+      case GL_RG32F:
+      case GL_RG8I:
+      case GL_RG8UI:
+      case GL_RG16I:
+      case GL_RG16UI:
+      case GL_RG32I:
+      case GL_RG32UI:
+         return GL_RG;
+      default:
+         ; /* fallthrough */
+      }
+   }
 
-/**
- * Test if it is a supported compressed format.
- * 
- * \param internalFormat the internal format token provided by the user.
- * 
- * \ret GL_TRUE if \p internalFormat is a supported compressed format, or
- * GL_FALSE otherwise.
- *
- * Currently only GL_COMPRESSED_RGB_FXT1_3DFX and GL_COMPRESSED_RGBA_FXT1_3DFX
- * are supported.
- */
-static GLboolean
-is_compressed_format(GLcontext *ctx, GLenum internalFormat)
-{
-   GLint supported[100]; /* 100 should be plenty */
-   GLuint i, n;
+   if (ctx->Extensions.EXT_texture_shared_exponent) {
+      switch (internalFormat) {
+      case GL_RGB9_E5_EXT:
+         return GL_RGB;
+      default:
+         ; /* fallthrough */
+      }
+   }
 
-   n = _mesa_get_compressed_formats(ctx, supported, GL_TRUE);
-   ASSERT(n < 100);
-   for (i = 0; i < n; i++) {
-      if ((GLint) internalFormat == supported[i]) {
-         return GL_TRUE;
+   if (ctx->Extensions.EXT_packed_float) {
+      switch (internalFormat) {
+      case GL_R11F_G11F_B10F_EXT:
+         return GL_RGB;
+      default:
+         ; /* fallthrough */
       }
    }
-   return GL_FALSE;
+
+   if (ctx->Extensions.ARB_depth_buffer_float) {
+      switch (internalFormat) {
+      case GL_DEPTH_COMPONENT32F:
+         return GL_DEPTH_COMPONENT;
+      case GL_DEPTH32F_STENCIL8:
+         return GL_DEPTH_STENCIL;
+      default:
+         ; /* fallthrough */
+      }
+   }
+
+   if (ctx->Extensions.EXT_texture_compression_rgtc) {
+      switch (internalFormat) {
+      case GL_COMPRESSED_RED:
+      case GL_COMPRESSED_RED_RGTC1_EXT:
+      case GL_COMPRESSED_SIGNED_RED_RGTC1_EXT:
+         return GL_RED;
+      case GL_COMPRESSED_RG:
+      case GL_COMPRESSED_RED_GREEN_RGTC2_EXT:
+      case GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT:
+         return GL_RG;
+      default:
+         ; /* fallthrough */
+      }
+   }
+
+   return -1; /* error */
 }
 
 
@@ -1307,9 +1403,9 @@ texture_error_check( GLcontext *ctx, GLenum target,
       if (type != GL_UNSIGNED_SHORT_8_8_MESA &&
           type != GL_UNSIGNED_SHORT_8_8_REV_MESA) {
          char message[100];
-         sprintf(message,
-                 "glTexImage%d(format/type YCBCR mismatch", dimensions);
-         _mesa_error(ctx, GL_INVALID_ENUM, message);
+         _mesa_snprintf(message, sizeof(message),
+                        "glTexImage%dD(format/type YCBCR mismatch", dimensions);
+         _mesa_error(ctx, GL_INVALID_ENUM, "%s", message);
          return GL_TRUE; /* error */
       }
       if (target != GL_TEXTURE_2D &&
@@ -1323,10 +1419,10 @@ texture_error_check( GLcontext *ctx, GLenum target,
       if (border != 0) {
          if (!isProxy) {
             char message[100];
-            sprintf(message,
-                    "glTexImage%d(format=GL_YCBCR_MESA and border=%d)",
-                    dimensions, border);
-            _mesa_error(ctx, GL_INVALID_VALUE, message);
+            _mesa_snprintf(message, sizeof(message),
+                           "glTexImage%dD(format=GL_YCBCR_MESA and border=%d)",
+                           dimensions, border);
+            _mesa_error(ctx, GL_INVALID_VALUE, "%s", message);
          }
          return GL_TRUE;
       }
@@ -1349,16 +1445,16 @@ texture_error_check( GLcontext *ctx, GLenum target,
    }
 
    /* additional checks for compressed textures */
-   if (is_compressed_format(ctx, internalFormat)) {
+   if (_mesa_is_compressed_format(ctx, internalFormat)) {
       if (!target_can_be_compressed(ctx, target) && !isProxy) {
          _mesa_error(ctx, GL_INVALID_ENUM,
-                     "glTexImage%d(target)", dimensions);
+                     "glTexImage%dD(target)", dimensions);
          return GL_TRUE;
       }
       if (border != 0) {
          if (!isProxy) {
             _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glTexImage%D(border!=0)", dimensions);
+                        "glTexImage%dD(border!=0)", dimensions);
          }
          return GL_TRUE;
       }
@@ -1536,7 +1632,7 @@ subtexture_error_check2( GLcontext *ctx, GLuint dimensions,
 
       if (!target_can_be_compressed(ctx, target)) {
          _mesa_error(ctx, GL_INVALID_ENUM,
-                     "glTexSubImage%D(target=%s)", dimensions,
+                     "glTexSubImage%dD(target=%s)", dimensions,
                      _mesa_lookup_enum_by_nr(target));
          return GL_TRUE;
       }
@@ -1547,19 +1643,19 @@ subtexture_error_check2( GLcontext *ctx, GLuint dimensions,
       /* offset must be multiple of block size */
       if ((xoffset % bw != 0) || (yoffset % bh != 0)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glTexSubImage%D(xoffset = %d, yoffset = %d)",
+                     "glTexSubImage%dD(xoffset = %d, yoffset = %d)",
                      dimensions, xoffset, yoffset);
          return GL_TRUE;
       }
       /* size must be multiple of bw by bh or equal to whole texture size */
       if ((width % bw != 0) && (GLuint) width != destTex->Width) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glTexSubImage%D(width = %d)", dimensions, width);
+                     "glTexSubImage%dD(width = %d)", dimensions, width);
          return GL_TRUE;
       }         
       if ((height % bh != 0) && (GLuint) height != destTex->Height) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glTexSubImage%D(height = %d)", dimensions, height);
+                     "glTexSubImage%dD(height = %d)", dimensions, height);
          return GL_TRUE;
       }         
    }
@@ -1715,15 +1811,15 @@ copytexture_error_check( GLcontext *ctx, GLuint dimensions,
       return GL_TRUE;
    }
 
-   if (is_compressed_format(ctx, internalFormat)) {
+   if (_mesa_is_compressed_format(ctx, internalFormat)) {
       if (!target_can_be_compressed(ctx, target)) {
          _mesa_error(ctx, GL_INVALID_ENUM,
-                     "glCopyTexImage%d(target)", dimensions);
+                     "glCopyTexImage%dD(target)", dimensions);
          return GL_TRUE;
       }
       if (border != 0) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glCopyTexImage%D(border!=0)", dimensions);
+                     "glCopyTexImage%dD(border!=0)", dimensions);
          return GL_TRUE;
       }
    }
@@ -1731,7 +1827,7 @@ copytexture_error_check( GLcontext *ctx, GLuint dimensions,
       /* make sure we have depth/stencil buffers */
       if (!ctx->ReadBuffer->_DepthBuffer) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glCopyTexImage%D(no depth)", dimensions);
+                     "glCopyTexImage%dD(no depth)", dimensions);
          return GL_TRUE;
       }
    }
@@ -1739,7 +1835,7 @@ copytexture_error_check( GLcontext *ctx, GLuint dimensions,
       /* make sure we have depth/stencil buffers */
       if (!ctx->ReadBuffer->_DepthBuffer || !ctx->ReadBuffer->_StencilBuffer) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glCopyTexImage%D(no depth/stencil buffer)", dimensions);
+                     "glCopyTexImage%dD(no depth/stencil buffer)", dimensions);
          return GL_TRUE;
       }
    }
@@ -1904,24 +2000,24 @@ copytexsubimage_error_check2( GLcontext *ctx, GLuint dimensions,
    if (_mesa_is_format_compressed(teximage->TexFormat)) {
       if (!target_can_be_compressed(ctx, target)) {
          _mesa_error(ctx, GL_INVALID_ENUM,
-                     "glCopyTexSubImage%d(target)", dimensions);
+                     "glCopyTexSubImage%dD(target)", dimensions);
          return GL_TRUE;
       }
       /* offset must be multiple of 4 */
       if ((xoffset & 3) || (yoffset & 3)) {
          _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glCopyTexSubImage%D(xoffset or yoffset)", dimensions);
+                     "glCopyTexSubImage%dD(xoffset or yoffset)", dimensions);
          return GL_TRUE;
       }
       /* size must be multiple of 4 */
       if ((width & 3) != 0 && (GLuint) width != teximage->Width) {
          _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glCopyTexSubImage%D(width)", dimensions);
+                     "glCopyTexSubImage%dD(width)", dimensions);
          return GL_TRUE;
       }         
       if ((height & 3) != 0 && (GLuint) height != teximage->Height) {
          _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glCopyTexSubImage%D(height)", dimensions);
+                     "glCopyTexSubImage%dD(height)", dimensions);
          return GL_TRUE;
       }         
    }
@@ -1941,7 +2037,7 @@ copytexsubimage_error_check2( GLcontext *ctx, GLuint dimensions,
    if (teximage->_BaseFormat == GL_DEPTH_COMPONENT) {
       if (!ctx->ReadBuffer->_DepthBuffer) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glCopyTexSubImage%D(no depth buffer)",
+                     "glCopyTexSubImage%dD(no depth buffer)",
                      dimensions);
          return GL_TRUE;
       }
@@ -1949,7 +2045,7 @@ copytexsubimage_error_check2( GLcontext *ctx, GLuint dimensions,
    else if (teximage->_BaseFormat == GL_DEPTH_STENCIL_EXT) {
       if (!ctx->ReadBuffer->_DepthBuffer || !ctx->ReadBuffer->_StencilBuffer) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glCopyTexSubImage%D(no depth/stencil buffer)",
+                     "glCopyTexSubImage%dD(no depth/stencil buffer)",
                      dimensions);
          return GL_TRUE;
       }
@@ -2087,6 +2183,45 @@ override_internal_format(GLenum internalFormat, GLint width, GLint height)
 }
 
 
+/**
+ * Choose the actual hardware format for a texture image.
+ * Try to use the same format as the previous image level when possible.
+ * Otherwise, ask the driver for the best format.
+ * It's important to try to choose a consistant format for all levels
+ * for efficient texture memory layout/allocation.  In particular, this
+ * comes up during automatic mipmap generation.
+ */
+void
+_mesa_choose_texture_format(GLcontext *ctx,
+                            struct gl_texture_object *texObj,
+                            struct gl_texture_image *texImage,
+                            GLenum target, GLint level,
+                            GLenum internalFormat, GLenum format, GLenum type)
+{
+   /* see if we've already chosen a format for the previous level */
+   if (level > 0) {
+      struct gl_texture_image *prevImage =
+	 _mesa_select_tex_image(ctx, texObj, target, level - 1);
+      /* See if the prev level is defined and has an internal format which
+       * matches the new internal format.
+       */
+      if (prevImage &&
+          prevImage->Width > 0 &&
+          prevImage->InternalFormat == internalFormat) {
+         /* use the same format */
+         texImage->TexFormat = prevImage->TexFormat;
+         return;
+      }
+   }
+
+   /* choose format from scratch */
+   texImage->TexFormat = ctx->Driver.ChooseTextureFormat(ctx, internalFormat,
+                                                         format, type);
+   ASSERT(texImage->TexFormat != MESA_FORMAT_NONE);
+}
+
+
+
 /*
  * Called from the API.  Note that width includes the border.
  */
@@ -2147,11 +2282,8 @@ _mesa_TexImage1D( GLenum target, GLint level, GLint internalFormat,
                                        postConvWidth, 1, 1,
                                        border, internalFormat);
 
-            /* Choose actual texture format */
-            texImage->TexFormat =
-               ctx->Driver.ChooseTextureFormat(ctx, internalFormat,
-                                               format, type);
-            ASSERT(texImage->TexFormat != MESA_FORMAT_NONE);
+            _mesa_choose_texture_format(ctx, texObj, texImage, target, level,
+                                        internalFormat, format, type);
 
             /* Give the texture to the driver.  <pixels> may be null. */
             ASSERT(ctx->Driver.TexImage1D);
@@ -2186,12 +2318,14 @@ _mesa_TexImage1D( GLenum target, GLint level, GLint internalFormat,
       }
       else {
          /* no error, set the tex image parameters */
+         struct gl_texture_object *texObj =
+            _mesa_get_current_tex_object(ctx, target);
          ASSERT(texImage);
          _mesa_init_teximage_fields(ctx, target, texImage,
                                     postConvWidth, 1, 1,
                                     border, internalFormat);
-         texImage->TexFormat =
-            ctx->Driver.ChooseTextureFormat(ctx, internalFormat, format, type);
+         _mesa_choose_texture_format(ctx, texObj, texImage, target, level,
+                                     internalFormat, format, type);
       }
    }
    else {
@@ -2267,11 +2401,8 @@ _mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat,
                                        postConvWidth, postConvHeight, 1,
                                        border, internalFormat);
 
-            /* Choose actual texture format */
-            texImage->TexFormat =
-               ctx->Driver.ChooseTextureFormat(ctx, internalFormat,
-                                               format, type);
-            ASSERT(texImage->TexFormat != MESA_FORMAT_NONE);
+            _mesa_choose_texture_format(ctx, texObj, texImage, target, level,
+                                        internalFormat, format, type);
 
             /* Give the texture to the driver.  <pixels> may be null. */
             ASSERT(ctx->Driver.TexImage2D);
@@ -2313,11 +2444,13 @@ _mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat,
       }
       else {
          /* no error, set the tex image parameters */
+         struct gl_texture_object *texObj =
+            _mesa_get_current_tex_object(ctx, target);
          _mesa_init_teximage_fields(ctx, target, texImage,
                                     postConvWidth, postConvHeight, 1,
                                     border, internalFormat);
-         texImage->TexFormat =
-            ctx->Driver.ChooseTextureFormat(ctx, internalFormat, format, type);
+         _mesa_choose_texture_format(ctx, texObj, texImage, target, level,
+                                     internalFormat, format, type);
       }
    }
    else {
@@ -2383,11 +2516,8 @@ _mesa_TexImage3D( GLenum target, GLint level, GLint internalFormat,
                                        width, height, depth,
                                        border, internalFormat);
 
-            /* Choose actual texture format */
-            texImage->TexFormat =
-               ctx->Driver.ChooseTextureFormat(ctx, internalFormat,
-                                               format, type);
-            ASSERT(texImage->TexFormat != MESA_FORMAT_NONE);
+            _mesa_choose_texture_format(ctx, texObj, texImage, target, level,
+                                        internalFormat, format, type);
 
             /* Give the texture to the driver.  <pixels> may be null. */
             ASSERT(ctx->Driver.TexImage3D);
@@ -2424,10 +2554,12 @@ _mesa_TexImage3D( GLenum target, GLint level, GLint internalFormat,
       }
       else {
          /* no error, set the tex image parameters */
+         struct gl_texture_object *texObj =
+            _mesa_get_current_tex_object(ctx, target);
          _mesa_init_teximage_fields(ctx, target, texImage, width, height,
                                     depth, border, internalFormat);
-         texImage->TexFormat =
-            ctx->Driver.ChooseTextureFormat(ctx, internalFormat, format, type);
+         _mesa_choose_texture_format(ctx, texObj, texImage, target, level,
+                                     internalFormat, format, type);
       }
    }
    else {
@@ -2457,6 +2589,12 @@ _mesa_EGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image)
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
+   if (!ctx->Extensions.OES_EGL_image) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glEGLImageTargetTexture2DOES(unsupported)");
+      return;
+   }
+
    if (target != GL_TEXTURE_2D) {
       _mesa_error(ctx, GL_INVALID_ENUM,
 		  "glEGLImageTargetTexture2D(target=%d)", target);
@@ -2734,11 +2872,8 @@ _mesa_CopyTexImage1D( GLenum target, GLint level,
          _mesa_init_teximage_fields(ctx, target, texImage, postConvWidth, 1, 1,
                                     border, internalFormat);
 
-         /* Choose actual texture format */
-         texImage->TexFormat =
-            ctx->Driver.ChooseTextureFormat(ctx, internalFormat,
-                                            GL_NONE, GL_NONE);
-         ASSERT(texImage->TexFormat != MESA_FORMAT_NONE);
+         _mesa_choose_texture_format(ctx, texObj, texImage, target, level,
+                                     internalFormat, GL_NONE, GL_NONE);
 
          ASSERT(ctx->Driver.CopyTexImage1D);
          ctx->Driver.CopyTexImage1D(ctx, target, level, internalFormat,
@@ -2815,11 +2950,8 @@ _mesa_CopyTexImage2D( GLenum target, GLint level, GLenum internalFormat,
                                     postConvWidth, postConvHeight, 1,
                                     border, internalFormat);
 
-         /* Choose actual texture format */
-         texImage->TexFormat =
-            ctx->Driver.ChooseTextureFormat(ctx, internalFormat,
-                                            GL_NONE, GL_NONE);
-         ASSERT(texImage->TexFormat != MESA_FORMAT_NONE);
+         _mesa_choose_texture_format(ctx, texObj, texImage, target, level,
+                                     internalFormat, GL_NONE, GL_NONE);
 
          ASSERT(ctx->Driver.CopyTexImage2D);
          ctx->Driver.CopyTexImage2D(ctx, target, level, internalFormat,
@@ -3103,11 +3235,15 @@ compressed_texture_error_check(GLcontext *ctx, GLint dimensions,
       /* 3D compressed textures not allowed */
       return GL_INVALID_ENUM;
    }
+   else {
+      assert(0);
+      return GL_INVALID_ENUM;
+   }
 
    maxTextureSize = 1 << (maxLevels - 1);
 
    /* This will detect any invalid internalFormat value */
-   if (!is_compressed_format(ctx, internalFormat))
+   if (!_mesa_is_compressed_format(ctx, internalFormat))
       return GL_INVALID_ENUM;
 
    /* This should really never fail */
@@ -3212,7 +3348,7 @@ compressed_subtexture_error_check(GLcontext *ctx, GLint dimensions,
    maxTextureSize = 1 << (maxLevels - 1);
 
    /* this will catch any invalid compressed format token */
-   if (!is_compressed_format(ctx, format))
+   if (!_mesa_is_compressed_format(ctx, format))
       return GL_INVALID_ENUM;
 
    if (width < 1 || width > maxTextureSize)
@@ -3340,11 +3476,8 @@ _mesa_CompressedTexImage1DARB(GLenum target, GLint level,
             _mesa_init_teximage_fields(ctx, target, texImage, width, 1, 1,
                                        border, internalFormat);
 
-            /* Choose actual texture format */
-            texImage->TexFormat =
-               ctx->Driver.ChooseTextureFormat(ctx, internalFormat,
-                                               GL_NONE, GL_NONE);
-            ASSERT(texImage->TexFormat != MESA_FORMAT_NONE);
+            _mesa_choose_texture_format(ctx, texObj, texImage, target, level,
+                                        internalFormat, GL_NONE, GL_NONE);
 
             ASSERT(ctx->Driver.CompressedTexImage1D);
             ctx->Driver.CompressedTexImage1D(ctx, target, level,
@@ -3392,6 +3525,8 @@ _mesa_CompressedTexImage1DARB(GLenum target, GLint level,
 	    texImage = _mesa_select_tex_image(ctx, texObj, target, level);
 	    _mesa_init_teximage_fields(ctx, target, texImage, width, 1, 1,
 				       border, internalFormat);
+            _mesa_choose_texture_format(ctx, texObj, texImage, target, level,
+                                        internalFormat, GL_NONE, GL_NONE);
 	 }
 	 _mesa_unlock_texture(ctx, texObj);
       }
@@ -3402,7 +3537,6 @@ _mesa_CompressedTexImage1DARB(GLenum target, GLint level,
    }
 }
 
-
 void GLAPIENTRY
 _mesa_CompressedTexImage2DARB(GLenum target, GLint level,
                               GLenum internalFormat, GLsizei width,
@@ -3418,6 +3552,24 @@ _mesa_CompressedTexImage2DARB(GLenum target, GLint level,
                   _mesa_lookup_enum_by_nr(internalFormat),
                   width, height, border, imageSize, data);
 
+#if FEATURE_ES
+   switch (internalFormat) {
+   case GL_PALETTE4_RGB8_OES:
+   case GL_PALETTE4_RGBA8_OES:
+   case GL_PALETTE4_R5_G6_B5_OES:
+   case GL_PALETTE4_RGBA4_OES:
+   case GL_PALETTE4_RGB5_A1_OES:
+   case GL_PALETTE8_RGB8_OES:
+   case GL_PALETTE8_RGBA8_OES:
+   case GL_PALETTE8_R5_G6_B5_OES:
+   case GL_PALETTE8_RGBA4_OES:
+   case GL_PALETTE8_RGB5_A1_OES:
+      _mesa_cpal_compressed_teximage2d(target, level, internalFormat,
+				       width, height, imageSize, data);
+      return;
+   }
+#endif
+
    if (target == GL_TEXTURE_2D ||
        (ctx->Extensions.ARB_texture_cube_map &&
         target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB &&
@@ -3450,11 +3602,8 @@ _mesa_CompressedTexImage2DARB(GLenum target, GLint level,
             _mesa_init_teximage_fields(ctx, target, texImage, width, height, 1,
                                        border, internalFormat);
 
-            /* Choose actual texture format */
-            texImage->TexFormat =
-               ctx->Driver.ChooseTextureFormat(ctx, internalFormat,
-                                               GL_NONE, GL_NONE);
-            ASSERT(texImage->TexFormat != MESA_FORMAT_NONE);
+            _mesa_choose_texture_format(ctx, texObj, texImage, target, level,
+                                        internalFormat, GL_NONE, GL_NONE);
 
             ASSERT(ctx->Driver.CompressedTexImage2D);
             ctx->Driver.CompressedTexImage2D(ctx, target, level,
@@ -3504,6 +3653,8 @@ _mesa_CompressedTexImage2DARB(GLenum target, GLint level,
 	    texImage = _mesa_select_tex_image(ctx, texObj, target, level);
 	    _mesa_init_teximage_fields(ctx, target, texImage, width, height, 1,
 				       border, internalFormat);
+            _mesa_choose_texture_format(ctx, texObj, texImage, target, level,
+                                        internalFormat, GL_NONE, GL_NONE);
 	 }
 	 _mesa_unlock_texture(ctx, texObj);
       }
@@ -3560,10 +3711,8 @@ _mesa_CompressedTexImage3DARB(GLenum target, GLint level,
                                        border, internalFormat);
 
             /* Choose actual texture format */
-            texImage->TexFormat =
-               ctx->Driver.ChooseTextureFormat(ctx, internalFormat,
-                                               GL_NONE, GL_NONE);
-            ASSERT(texImage->TexFormat != MESA_FORMAT_NONE);
+            _mesa_choose_texture_format(ctx, texObj, texImage, target, level,
+                                        internalFormat, GL_NONE, GL_NONE);
 
             ASSERT(ctx->Driver.CompressedTexImage3D);
             ctx->Driver.CompressedTexImage3D(ctx, target, level,
@@ -3612,6 +3761,8 @@ _mesa_CompressedTexImage3DARB(GLenum target, GLint level,
 	    texImage = _mesa_select_tex_image(ctx, texObj, target, level);
 	    _mesa_init_teximage_fields(ctx, target, texImage, width, height,
 				       depth, border, internalFormat);
+            _mesa_choose_texture_format(ctx, texObj, texImage, target, level,
+                                        internalFormat, GL_NONE, GL_NONE);
 	 }
 	 _mesa_unlock_texture(ctx, texObj);
       }
diff --git a/mesalib/src/mesa/main/teximage.h b/mesalib/src/mesa/main/teximage.h
index d82cc9852..0dcacab3c 100644
--- a/mesalib/src/mesa/main/teximage.h
+++ b/mesalib/src/mesa/main/teximage.h
@@ -73,6 +73,14 @@ _mesa_init_teximage_fields(GLcontext *ctx, GLenum target,
 
 
 extern void
+_mesa_choose_texture_format(GLcontext *ctx,
+                            struct gl_texture_object *texObj,
+                            struct gl_texture_image *texImage,
+                            GLenum target, GLint level,
+                            GLenum internalFormat, GLenum format, GLenum type);
+
+
+extern void
 _mesa_clear_texture_image(GLcontext *ctx, struct gl_texture_image *texImage);
 
 
diff --git a/mesalib/src/mesa/main/texobj.c b/mesalib/src/mesa/main/texobj.c
index 2753b55c3..1df165cf6 100644
--- a/mesalib/src/mesa/main/texobj.c
+++ b/mesalib/src/mesa/main/texobj.c
@@ -40,7 +40,7 @@
 #include "teximage.h"
 #include "texobj.h"
 #include "mtypes.h"
-#include "shader/prog_instruction.h"
+#include "program/prog_instruction.h"
 
 
 
@@ -416,7 +416,7 @@ _mesa_test_texobj_completeness( const GLcontext *ctx,
     */
    if ((baseLevel < 0) || (baseLevel >= MAX_TEXTURE_LEVELS)) {
       char s[100];
-      sprintf(s, "base level = %d is invalid", baseLevel);
+      _mesa_snprintf(s, sizeof(s), "base level = %d is invalid", baseLevel);
       incomplete(t, s);
       t->_Complete = GL_FALSE;
       return;
@@ -425,7 +425,7 @@ _mesa_test_texobj_completeness( const GLcontext *ctx,
    /* Always need the base level image */
    if (!t->Image[0][baseLevel]) {
       char s[100];
-      sprintf(s, "Image[baseLevel=%d] == NULL", baseLevel);
+      _mesa_snprintf(s, sizeof(s), "Image[baseLevel=%d] == NULL", baseLevel);
       incomplete(t, s);
       t->_Complete = GL_FALSE;
       return;
diff --git a/mesalib/src/mesa/main/texpal.c b/mesalib/src/mesa/main/texpal.c
new file mode 100644
index 000000000..a25e7aa4f
--- /dev/null
+++ b/mesalib/src/mesa/main/texpal.c
@@ -0,0 +1,204 @@
+/**************************************************************************
+ *
+ * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ *
+ **************************************************************************/
+
+
+/**
+ * Code to convert compressed/paletted texture images to ordinary images.
+ * See the GL_OES_compressed_paletted_texture spec at
+ * http://khronos.org/registry/gles/extensions/OES/OES_compressed_paletted_texture.txt
+ *
+ * XXX this makes it impossible to add hardware support...
+ */
+
+
+#include "glheader.h"
+#include "compiler.h" /* for ASSERT */
+#include "context.h"
+#include "mtypes.h"
+#include "imports.h"
+#include "pixelstore.h"
+#include "teximage.h"
+#include "texpal.h"
+
+#if FEATURE_ES
+
+
+static const struct cpal_format_info {
+   GLenum cpal_format;
+   GLenum format;
+   GLenum type;
+   GLuint palette_size;
+   GLuint size;
+} formats[] = {
+   { GL_PALETTE4_RGB8_OES,     GL_RGB,  GL_UNSIGNED_BYTE,           16, 3 },
+   { GL_PALETTE4_RGBA8_OES,    GL_RGBA, GL_UNSIGNED_BYTE,           16, 4 },
+   { GL_PALETTE4_R5_G6_B5_OES, GL_RGB,  GL_UNSIGNED_SHORT_5_6_5,    16, 2 },
+   { GL_PALETTE4_RGBA4_OES,    GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4,  16, 2 },
+   { GL_PALETTE4_RGB5_A1_OES,  GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1,  16, 2 },
+   { GL_PALETTE8_RGB8_OES,     GL_RGB,  GL_UNSIGNED_BYTE,          256, 3 },
+   { GL_PALETTE8_RGBA8_OES,    GL_RGBA, GL_UNSIGNED_BYTE,          256, 4 },
+   { GL_PALETTE8_R5_G6_B5_OES, GL_RGB,  GL_UNSIGNED_SHORT_5_6_5,   256, 2 },
+   { GL_PALETTE8_RGBA4_OES,    GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4, 256, 2 },
+   { GL_PALETTE8_RGB5_A1_OES,  GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1, 256, 2 }
+};
+
+
+/**
+ * Get a color/entry from the palette.
+ */
+static GLuint
+get_palette_entry(const struct cpal_format_info *info, const GLubyte *palette,
+                  GLuint index, GLubyte *pixel)
+{
+   memcpy(pixel, palette + info->size * index, info->size);
+   return info->size;
+}
+
+
+/**
+ * Convert paletted texture to color texture.
+ */
+static void
+paletted_to_color(const struct cpal_format_info *info, const GLubyte *palette,
+                  const void *indices, GLuint num_pixels, GLubyte *image)
+{
+   GLubyte *pix = image;
+   GLuint remain, i;
+
+   if (info->palette_size == 16) {
+      /* 4 bits per index */
+      const GLubyte *ind = (const GLubyte *) indices;
+
+      /* two pixels per iteration */
+      remain = num_pixels % 2;
+      for (i = 0; i < num_pixels / 2; i++) {
+         pix += get_palette_entry(info, palette, (ind[i] >> 4) & 0xf, pix);
+         pix += get_palette_entry(info, palette, ind[i] & 0xf, pix);
+      }
+      if (remain) {
+         get_palette_entry(info, palette, (ind[i] >> 4) & 0xf, pix);
+      }
+   }
+   else {
+      /* 8 bits per index */
+      const GLubyte *ind = (const GLubyte *) indices;
+      for (i = 0; i < num_pixels; i++)
+         pix += get_palette_entry(info, palette, ind[i], pix);
+   }
+}
+
+
+static const struct cpal_format_info *
+cpal_get_info(GLint level, GLenum internalFormat,
+              GLsizei width, GLsizei height, GLsizei imageSize)
+{
+   const struct cpal_format_info *info;
+   GLint lvl, num_levels;
+   GLsizei w, h, expect_size;
+
+   info = &formats[internalFormat - GL_PALETTE4_RGB8_OES];
+   ASSERT(info->cpal_format == internalFormat);
+
+   if (level > 0) {
+      _mesa_error(_mesa_get_current_context(), GL_INVALID_VALUE,
+            "glCompressedTexImage2D(level=%d)", level);
+      return NULL;
+   }
+
+   num_levels = -level + 1;
+   expect_size = info->palette_size * info->size;
+   for (lvl = 0; lvl < num_levels; lvl++) {
+      w = width >> lvl;
+      if (!w)
+         w = 1;
+      h = height >> lvl;
+      if (!h)
+         h = 1;
+
+      if (info->palette_size == 16)
+         expect_size += (w * h  + 1) / 2;
+      else
+         expect_size += w * h;
+   }
+   if (expect_size > imageSize) {
+      _mesa_error(_mesa_get_current_context(), GL_INVALID_VALUE,
+            "glCompressedTexImage2D(imageSize=%d)", imageSize);
+      return NULL;
+   }
+   return info;
+}
+
+/**
+ * Convert a call to glCompressedTexImage2D() where internalFormat is a
+ *  compressed palette format into a regular GLubyte/RGBA glTexImage2D() call.
+ */
+void
+_mesa_cpal_compressed_teximage2d(GLenum target, GLint level,
+				 GLenum internalFormat,
+				 GLsizei width, GLsizei height,
+				 GLsizei imageSize, const void *palette)
+{
+   const struct cpal_format_info *info;
+   GLint lvl, num_levels;
+   const GLubyte *indices;
+   GLint saved_align, align;
+   GET_CURRENT_CONTEXT(ctx);
+
+   info = cpal_get_info(level, internalFormat, width, height, imageSize);
+   if (!info)
+      return;
+
+   info = &formats[internalFormat - GL_PALETTE4_RGB8_OES];
+   ASSERT(info->cpal_format == internalFormat);
+   num_levels = -level + 1;
+
+   /* first image follows the palette */
+   indices = (const GLubyte *) palette + info->palette_size * info->size;
+
+   saved_align = ctx->Unpack.Alignment;
+   align = saved_align;
+
+   for (lvl = 0; lvl < num_levels; lvl++) {
+      GLsizei w, h;
+      GLuint num_texels;
+      GLubyte *image = NULL;
+
+      w = width >> lvl;
+      if (!w)
+         w = 1;
+      h = height >> lvl;
+      if (!h)
+         h = 1;
+      num_texels = w * h;
+      if (w * info->size % align) {
+         _mesa_PixelStorei(GL_UNPACK_ALIGNMENT, 1);
+         align = 1;
+      }
+
+      /* allocate and fill dest image buffer */
+      if (palette) {
+         image = (GLubyte *) malloc(num_texels * info->size);
+         paletted_to_color(info, palette, indices, num_texels, image);
+      }
+
+      _mesa_TexImage2D(target, lvl, info->format, w, h, 0,
+                       info->format, info->type, image);
+      if (image)
+         free(image);
+
+      /* advance index pointer to point to next src mipmap */
+      if (info->palette_size == 16)
+         indices += (num_texels + 1) / 2;
+      else
+         indices += num_texels;
+   }
+
+   if (saved_align != align)
+      _mesa_PixelStorei(GL_UNPACK_ALIGNMENT, saved_align);
+}
+
+#endif
diff --git a/mesalib/src/mesa/shader/slang/slang_link.h b/mesalib/src/mesa/main/texpal.h
index 2b44d2078..eeff5a9e2 100644
--- a/mesalib/src/mesa/shader/slang/slang_link.h
+++ b/mesalib/src/mesa/main/texpal.h
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.2
+ * Version:  7.8
  *
- * Copyright (C) 2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2010  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,16 +22,17 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef SLANG_LINK_H
-#define SLANG_LINK_H 1
 
-#include "slang_compile.h"
+#ifndef TEXPAL_H
+#define TEXPAL_H
 
 
+#include "main/glheader.h"
 extern void
-_slang_link(GLcontext *ctx, GLhandleARB h,
-            struct gl_shader_program *shProg);
+_mesa_cpal_compressed_teximage2d(GLenum target, GLint level,
+				 GLenum internalFormat,
+				 GLsizei width, GLsizei height,
+				 GLsizei imageSize, const void *palette);
 
 
-#endif
-
+#endif /* TEXPAL_H */
diff --git a/mesalib/src/mesa/main/texparam.c b/mesalib/src/mesa/main/texparam.c
index 0fde89b50..745a0aeec 100644
--- a/mesalib/src/mesa/main/texparam.c
+++ b/mesalib/src/mesa/main/texparam.c
@@ -39,7 +39,7 @@
 #include "main/texparam.h"
 #include "main/teximage.h"
 #include "main/texstate.h"
-#include "shader/prog_instruction.h"
+#include "program/prog_instruction.h"
 
 
 /**
@@ -371,7 +371,7 @@ set_tex_parameteri(GLcontext *ctx,
       }
       return GL_FALSE;
 
-#ifdef FEATURE_OES_draw_texture
+#if FEATURE_OES_draw_texture
    case GL_TEXTURE_CROP_RECT_OES:
       texObj->CropRect[0] = params[0];
       texObj->CropRect[1] = params[1];
@@ -604,7 +604,7 @@ _mesa_TexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
       }
       break;
 
-#ifdef FEATURE_OES_draw_texture
+#if FEATURE_OES_draw_texture
    case GL_TEXTURE_CROP_RECT_OES:
       {
          /* convert float params to int */
@@ -940,6 +940,18 @@ _mesa_GetTexLevelParameteriv( GLenum target, GLint level,
                         "glGetTexLevelParameter[if]v(pname)");
          }
          break;
+      case GL_TEXTURE_SHARED_SIZE:
+         if (ctx->VersionMajor >= 3) {
+            /* XXX return number of exponent bits for shared exponent texture
+             * formats, like GL_RGB9_E5.
+             */
+            *params = 0;
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glGetTexLevelParameter[if]v(pname)");
+         }
+         break;
 
       /* GL_ARB_texture_compression */
       case GL_TEXTURE_COMPRESSED_IMAGE_SIZE:
@@ -1148,7 +1160,7 @@ _mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params )
 	 else 
 	    error = GL_TRUE;
          break;
-#ifdef FEATURE_OES_draw_texture
+#if FEATURE_OES_draw_texture
       case GL_TEXTURE_CROP_RECT_OES:
          params[0] = obj->CropRect[0];
          params[1] = obj->CropRect[1];
@@ -1318,7 +1330,7 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
             error = GL_TRUE;
          }
          break;
-#ifdef FEATURE_OES_draw_texture
+#if FEATURE_OES_draw_texture
       case GL_TEXTURE_CROP_RECT_OES:
          params[0] = obj->CropRect[0];
          params[1] = obj->CropRect[1];
diff --git a/mesalib/src/mesa/main/texrender.c b/mesalib/src/mesa/main/texrender.c
index d29af5a5b..c68105b39 100644
--- a/mesalib/src/mesa/main/texrender.c
+++ b/mesalib/src/mesa/main/texrender.c
@@ -1,6 +1,7 @@
 
 #include "context.h"
 #include "colormac.h"
+#include "macros.h"
 #include "texfetch.h"
 #include "texrender.h"
 #include "renderbuffer.h"
diff --git a/mesalib/src/mesa/main/texrender.h b/mesalib/src/mesa/main/texrender.h
index 7c3fb0871..1e87d594a 100644
--- a/mesalib/src/mesa/main/texrender.h
+++ b/mesalib/src/mesa/main/texrender.h
@@ -1,6 +1,7 @@
 #ifndef TEXRENDER_H
 #define TEXRENDER_H
 
+#include "mtypes.h"
 
 extern void
 _mesa_render_texture(GLcontext *ctx,
diff --git a/mesalib/src/mesa/main/texstate.c b/mesalib/src/mesa/main/texstate.c
index fce17c2b6..dae173d1b 100644
--- a/mesalib/src/mesa/main/texstate.c
+++ b/mesalib/src/mesa/main/texstate.c
@@ -528,7 +528,7 @@ update_texture_state( GLcontext *ctx )
       /* Get the bitmask of texture target enables.
        * enableBits will be a mask of the TEXTURE_*_BIT flags indicating
        * which texture targets are enabled (fixed function) or referenced
-       * by a fragment shader/program.  When multiple flags are set, we'll
+       * by a fragment program/program.  When multiple flags are set, we'll
        * settle on the one with highest priority (see below).
        */
       if (vprog) {
diff --git a/mesalib/src/mesa/main/texstate.h b/mesalib/src/mesa/main/texstate.h
index 17ac68000..912cb6779 100644
--- a/mesalib/src/mesa/main/texstate.h
+++ b/mesalib/src/mesa/main/texstate.h
@@ -32,6 +32,7 @@
 #define TEXSTATE_H
 
 
+#include "compiler.h"
 #include "mtypes.h"
 
 
diff --git a/mesalib/src/mesa/main/texstore.c b/mesalib/src/mesa/main/texstore.c
index 65e3fcaa9..2989fdb72 100644
--- a/mesalib/src/mesa/main/texstore.c
+++ b/mesalib/src/mesa/main/texstore.c
@@ -55,7 +55,6 @@
 #include "glheader.h"
 #include "bufferobj.h"
 #include "colormac.h"
-#include "context.h"
 #include "convolve.h"
 #include "image.h"
 #include "macros.h"
@@ -2225,6 +2224,140 @@ _mesa_texstore_al1616(TEXSTORE_PARAMS)
 
 
 static GLboolean
+_mesa_texstore_rgba_16(TEXSTORE_PARAMS)
+{
+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
+
+   ASSERT(dstFormat == MESA_FORMAT_RGBA_16);
+   ASSERT(texelBytes == 8);
+
+   if (!ctx->_ImageTransferState &&
+       !srcPacking->SwapBytes &&
+       baseInternalFormat == GL_RGBA &&
+       srcFormat == GL_RGBA &&
+       srcType == GL_UNSIGNED_SHORT) {
+      /* simple memcpy path */
+      memcpy_texture(ctx, dims,
+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
+                     dstRowStride,
+                     dstImageOffsets,
+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
+                     srcAddr, srcPacking);
+   }
+   else {
+      /* general path */
+      const GLfloat *tempImage = make_temp_float_image(ctx, dims,
+                                                 baseInternalFormat,
+                                                 baseFormat,
+                                                 srcWidth, srcHeight, srcDepth,
+                                                 srcFormat, srcType, srcAddr,
+                                                 srcPacking);
+      const GLfloat *src = tempImage;
+      GLint img, row, col;
+      if (!tempImage)
+         return GL_FALSE;
+      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
+      for (img = 0; img < srcDepth; img++) {
+         GLubyte *dstRow = (GLubyte *) dstAddr
+            + dstImageOffsets[dstZoffset + img] * texelBytes
+            + dstYoffset * dstRowStride
+            + dstXoffset * texelBytes;
+         for (row = 0; row < srcHeight; row++) {
+            GLushort *dstUS = (GLushort *) dstRow;
+            for (col = 0; col < srcWidth; col++) {
+               GLushort r, g, b, a;
+
+               UNCLAMPED_FLOAT_TO_USHORT(r, src[0]);
+               UNCLAMPED_FLOAT_TO_USHORT(g, src[1]);
+               UNCLAMPED_FLOAT_TO_USHORT(b, src[2]);
+               UNCLAMPED_FLOAT_TO_USHORT(a, src[3]);
+               dstUS[col*4+0] = r;
+               dstUS[col*4+1] = g;
+               dstUS[col*4+2] = b;
+               dstUS[col*4+3] = a;
+               src += 4;
+            }
+            dstRow += dstRowStride;
+         }
+      }
+      free((void *) tempImage);
+   }
+   return GL_TRUE;
+}
+
+
+static GLboolean
+_mesa_texstore_signed_rgba_16(TEXSTORE_PARAMS)
+{
+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
+
+   ASSERT(dstFormat == MESA_FORMAT_SIGNED_R_16 ||
+          dstFormat == MESA_FORMAT_SIGNED_RG_16 ||
+          dstFormat == MESA_FORMAT_SIGNED_RGB_16 ||
+          dstFormat == MESA_FORMAT_SIGNED_RGBA_16);
+
+   if (!ctx->_ImageTransferState &&
+       !srcPacking->SwapBytes &&
+       baseInternalFormat == GL_RGBA &&
+       dstFormat == MESA_FORMAT_SIGNED_RGBA_16 &&
+       srcFormat == GL_RGBA &&
+       srcType == GL_SHORT) {
+      /* simple memcpy path */
+      memcpy_texture(ctx, dims,
+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
+                     dstRowStride,
+                     dstImageOffsets,
+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
+                     srcAddr, srcPacking);
+   }
+   else {
+      /* general path */
+      const GLfloat *tempImage = make_temp_float_image(ctx, dims,
+                                                 baseInternalFormat,
+                                                 baseFormat,
+                                                 srcWidth, srcHeight, srcDepth,
+                                                 srcFormat, srcType, srcAddr,
+                                                 srcPacking);
+      const GLfloat *src = tempImage;
+      const GLuint comps = _mesa_get_format_bytes(dstFormat) / 2;
+      GLint img, row, col;
+
+      if (!tempImage)
+         return GL_FALSE;
+
+      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
+
+      /* Note: tempImage is always float[4] / RGBA.  We convert to 1, 2,
+       * 3 or 4 components/pixel here.
+       */
+      for (img = 0; img < srcDepth; img++) {
+         GLubyte *dstRow = (GLubyte *) dstAddr
+            + dstImageOffsets[dstZoffset + img] * texelBytes
+            + dstYoffset * dstRowStride
+            + dstXoffset * texelBytes;
+         for (row = 0; row < srcHeight; row++) {
+            GLshort *dstRowS = (GLshort *) dstRow;
+            for (col = 0; col < srcWidth; col++) {
+               GLuint c;
+               for (c = 0; c < comps; c++) {
+                  GLshort p;
+                  UNCLAMPED_FLOAT_TO_SHORT(p, src[col * 4 + c]);
+                  dstRowS[col * comps + c] = p;
+               }
+            }
+            dstRow += dstRowStride;
+            src += 4 * srcWidth;
+         }
+      }
+      free((void *) tempImage);
+   }
+   return GL_TRUE;
+}
+
+
+static GLboolean
 _mesa_texstore_rgb332(TEXSTORE_PARAMS)
 {
    const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
@@ -2551,6 +2684,147 @@ _mesa_texstore_dudv8(TEXSTORE_PARAMS)
    return GL_TRUE;
 }
 
+
+/**
+ * Store a texture in MESA_FORMAT_SIGNED_R8 format.
+ */
+static GLboolean
+_mesa_texstore_signed_r8(TEXSTORE_PARAMS)
+{
+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
+
+   ASSERT(dstFormat == MESA_FORMAT_SIGNED_R8);
+   ASSERT(texelBytes == 1);
+
+   /* XXX look at adding optimized paths */
+   {
+      /* general path */
+      const GLfloat *tempImage = make_temp_float_image(ctx, dims,
+                                                 baseInternalFormat,
+                                                 baseFormat,
+                                                 srcWidth, srcHeight, srcDepth,
+                                                 srcFormat, srcType, srcAddr,
+                                                 srcPacking);
+      const GLfloat *srcRow = tempImage;
+      GLint img, row, col;
+      if (!tempImage)
+         return GL_FALSE;
+      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
+      for (img = 0; img < srcDepth; img++) {
+         GLubyte *dstRow = (GLubyte *) dstAddr
+            + dstImageOffsets[dstZoffset + img] * texelBytes
+            + dstYoffset * dstRowStride
+            + dstXoffset * texelBytes;
+         for (row = 0; row < srcHeight; row++) {
+            GLubyte *dstB = (GLubyte *) dstRow;
+            for (col = 0; col < srcWidth; col++) {
+               dstB[col] = FLOAT_TO_BYTE_TEX(srcRow[RCOMP]);
+            }
+            dstRow += dstRowStride;
+         }
+      }
+      free((void *) tempImage);
+   }
+   return GL_TRUE;
+}
+
+
+/**
+ * Store a texture in MESA_FORMAT_SIGNED_RG88 format.
+ */
+static GLboolean
+_mesa_texstore_signed_rg88(TEXSTORE_PARAMS)
+{
+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
+
+   ASSERT(dstFormat == MESA_FORMAT_SIGNED_RG88);
+   ASSERT(texelBytes == 1);
+
+   /* XXX look at adding optimized paths */
+   {
+      /* general path */
+      const GLfloat *tempImage = make_temp_float_image(ctx, dims,
+                                                 baseInternalFormat,
+                                                 baseFormat,
+                                                 srcWidth, srcHeight, srcDepth,
+                                                 srcFormat, srcType, srcAddr,
+                                                 srcPacking);
+      const GLfloat *srcRow = tempImage;
+      GLint img, row, col;
+      if (!tempImage)
+         return GL_FALSE;
+      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
+      for (img = 0; img < srcDepth; img++) {
+         GLubyte *dstRow = (GLubyte *) dstAddr
+            + dstImageOffsets[dstZoffset + img] * texelBytes
+            + dstYoffset * dstRowStride
+            + dstXoffset * texelBytes;
+         for (row = 0; row < srcHeight; row++) {
+            GLushort *dstUS = (GLushort *) dstRow;
+            for (col = 0; col < srcWidth; col++) {
+               dstUS[col] = PACK_COLOR_88(FLOAT_TO_BYTE_TEX(srcRow[RCOMP]),
+                                          FLOAT_TO_BYTE_TEX(srcRow[GCOMP]));
+            }
+            dstRow += dstRowStride;
+         }
+      }
+      free((void *) tempImage);
+   }
+   return GL_TRUE;
+}
+
+
+/**
+ * Store a texture in MESA_FORMAT_SIGNED_RGBX8888.
+ */
+static GLboolean
+_mesa_texstore_signed_rgbx8888(TEXSTORE_PARAMS)
+{
+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
+
+   ASSERT(dstFormat == MESA_FORMAT_SIGNED_RGBX8888);
+   ASSERT(texelBytes == 4);
+
+   {
+      /* general path */
+      const GLfloat *tempImage = make_temp_float_image(ctx, dims,
+                                                 baseInternalFormat,
+                                                 baseFormat,
+                                                 srcWidth, srcHeight, srcDepth,
+                                                 srcFormat, srcType, srcAddr,
+                                                 srcPacking);
+      const GLfloat *srcRow = tempImage;
+      GLint img, row, col;
+      if (!tempImage)
+         return GL_FALSE;
+      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
+      for (img = 0; img < srcDepth; img++) {
+         GLubyte *dstRow = (GLubyte *) dstAddr
+            + dstImageOffsets[dstZoffset + img] * texelBytes
+            + dstYoffset * dstRowStride
+            + dstXoffset * texelBytes;
+         for (row = 0; row < srcHeight; row++) {
+            GLuint *dstUI = (GLuint *) dstRow;
+            for (col = 0; col < srcWidth; col++) {
+               dstUI[col] = PACK_COLOR_8888( FLOAT_TO_BYTE_TEX(srcRow[RCOMP]),
+                                             FLOAT_TO_BYTE_TEX(srcRow[GCOMP]),
+                                             FLOAT_TO_BYTE_TEX(srcRow[BCOMP]),
+                                             0xff );
+               srcRow += 4;
+            }
+            dstRow += dstRowStride;
+         }
+      }
+      free((void *) tempImage);
+   }
+   return GL_TRUE;
+}
+
+
+
 /**
  * Store a texture in MESA_FORMAT_SIGNED_RGBA8888 or MESA_FORMAT_SIGNED_RGBA8888_REV
  */
@@ -2672,6 +2946,7 @@ _mesa_texstore_signed_rgba8888(TEXSTORE_PARAMS)
    return GL_TRUE;
 }
 
+
 /**
  * Store a combined depth/stencil texture image.
  */
@@ -3002,6 +3277,392 @@ _mesa_texstore_rgba_float16(TEXSTORE_PARAMS)
 }
 
 
+/* non-normalized, signed int8 */
+static GLboolean
+_mesa_texstore_rgba_int8(TEXSTORE_PARAMS)
+{
+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
+   const GLint components = _mesa_components_in_format(baseFormat);
+
+   ASSERT(dstFormat == MESA_FORMAT_RGBA_INT8);
+   ASSERT(baseInternalFormat == GL_RGBA ||
+          baseInternalFormat == GL_RGB ||
+          baseInternalFormat == GL_ALPHA ||
+          baseInternalFormat == GL_LUMINANCE ||
+          baseInternalFormat == GL_LUMINANCE_ALPHA ||
+          baseInternalFormat == GL_INTENSITY);
+   ASSERT(texelBytes == components * sizeof(GLbyte));
+
+   if (!ctx->_ImageTransferState &&
+       !srcPacking->SwapBytes &&
+       baseInternalFormat == srcFormat &&
+       srcType == GL_BYTE) {
+      /* simple memcpy path */
+      memcpy_texture(ctx, dims,
+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
+                     dstRowStride,
+                     dstImageOffsets,
+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
+                     srcAddr, srcPacking);
+   }
+   else {
+      /* general path */
+      const GLfloat *tempImage = make_temp_float_image(ctx, dims,
+                                                 baseInternalFormat,
+                                                 baseFormat,
+                                                 srcWidth, srcHeight, srcDepth,
+                                                 srcFormat, srcType, srcAddr,
+                                                 srcPacking);
+      const GLfloat *src = tempImage;
+      GLint img, row;
+      if (!tempImage)
+         return GL_FALSE;
+      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
+      for (img = 0; img < srcDepth; img++) {
+         GLubyte *dstRow = (GLubyte *) dstAddr
+            + dstImageOffsets[dstZoffset + img] * texelBytes
+            + dstYoffset * dstRowStride
+            + dstXoffset * texelBytes;
+         for (row = 0; row < srcHeight; row++) {
+            GLbyte *dstTexel = (GLbyte *) dstRow;
+            GLint i;
+            for (i = 0; i < srcWidth * components; i++) {
+               dstTexel[i] = (GLbyte) src[i];
+            }
+            dstRow += dstRowStride;
+            src += srcWidth * components;
+         }
+      }
+
+      free((void *) tempImage);
+   }
+   return GL_TRUE;
+}
+
+
+/* non-normalized, signed int16 */
+static GLboolean
+_mesa_texstore_rgba_int16(TEXSTORE_PARAMS)
+{
+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
+   const GLint components = _mesa_components_in_format(baseFormat);
+
+   ASSERT(dstFormat == MESA_FORMAT_RGBA_INT16);
+   ASSERT(baseInternalFormat == GL_RGBA ||
+          baseInternalFormat == GL_RGB ||
+          baseInternalFormat == GL_ALPHA ||
+          baseInternalFormat == GL_LUMINANCE ||
+          baseInternalFormat == GL_LUMINANCE_ALPHA ||
+          baseInternalFormat == GL_INTENSITY);
+   ASSERT(texelBytes == components * sizeof(GLshort));
+
+   if (!ctx->_ImageTransferState &&
+       !srcPacking->SwapBytes &&
+       baseInternalFormat == srcFormat &&
+       srcType == GL_INT) {
+      /* simple memcpy path */
+      memcpy_texture(ctx, dims,
+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
+                     dstRowStride,
+                     dstImageOffsets,
+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
+                     srcAddr, srcPacking);
+   }
+   else {
+      /* general path */
+      const GLfloat *tempImage = make_temp_float_image(ctx, dims,
+                                                 baseInternalFormat,
+                                                 baseFormat,
+                                                 srcWidth, srcHeight, srcDepth,
+                                                 srcFormat, srcType, srcAddr,
+                                                 srcPacking);
+      const GLfloat *src = tempImage;
+      GLint img, row;
+      if (!tempImage)
+         return GL_FALSE;
+      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
+      for (img = 0; img < srcDepth; img++) {
+         GLubyte *dstRow = (GLubyte *) dstAddr
+            + dstImageOffsets[dstZoffset + img] * texelBytes
+            + dstYoffset * dstRowStride
+            + dstXoffset * texelBytes;
+         for (row = 0; row < srcHeight; row++) {
+            GLshort *dstTexel = (GLshort *) dstRow;
+            GLint i;
+            for (i = 0; i < srcWidth * components; i++) {
+               dstTexel[i] = (GLint) src[i];
+            }
+            dstRow += dstRowStride;
+            src += srcWidth * components;
+         }
+      }
+
+      free((void *) tempImage);
+   }
+   return GL_TRUE;
+}
+
+
+/* non-normalized, signed int32 */
+static GLboolean
+_mesa_texstore_rgba_int32(TEXSTORE_PARAMS)
+{
+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
+   const GLint components = _mesa_components_in_format(baseFormat);
+
+   ASSERT(dstFormat == MESA_FORMAT_RGBA_INT32);
+   ASSERT(baseInternalFormat == GL_RGBA ||
+          baseInternalFormat == GL_RGB ||
+          baseInternalFormat == GL_ALPHA ||
+          baseInternalFormat == GL_LUMINANCE ||
+          baseInternalFormat == GL_LUMINANCE_ALPHA ||
+          baseInternalFormat == GL_INTENSITY);
+   ASSERT(texelBytes == components * sizeof(GLint));
+
+   if (!ctx->_ImageTransferState &&
+       !srcPacking->SwapBytes &&
+       baseInternalFormat == srcFormat &&
+       srcType == GL_INT) {
+      /* simple memcpy path */
+      memcpy_texture(ctx, dims,
+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
+                     dstRowStride,
+                     dstImageOffsets,
+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
+                     srcAddr, srcPacking);
+   }
+   else {
+      /* general path */
+      const GLfloat *tempImage = make_temp_float_image(ctx, dims,
+                                                 baseInternalFormat,
+                                                 baseFormat,
+                                                 srcWidth, srcHeight, srcDepth,
+                                                 srcFormat, srcType, srcAddr,
+                                                 srcPacking);
+      const GLfloat *src = tempImage;
+      GLint img, row;
+      if (!tempImage)
+         return GL_FALSE;
+      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
+      for (img = 0; img < srcDepth; img++) {
+         GLubyte *dstRow = (GLubyte *) dstAddr
+            + dstImageOffsets[dstZoffset + img] * texelBytes
+            + dstYoffset * dstRowStride
+            + dstXoffset * texelBytes;
+         for (row = 0; row < srcHeight; row++) {
+            GLint *dstTexel = (GLint *) dstRow;
+            GLint i;
+            for (i = 0; i < srcWidth * components; i++) {
+               dstTexel[i] = (GLint) src[i];
+            }
+            dstRow += dstRowStride;
+            src += srcWidth * components;
+         }
+      }
+
+      free((void *) tempImage);
+   }
+   return GL_TRUE;
+}
+
+
+/* non-normalized, unsigned int8 */
+static GLboolean
+_mesa_texstore_rgba_uint8(TEXSTORE_PARAMS)
+{
+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
+   const GLint components = _mesa_components_in_format(baseFormat);
+
+   ASSERT(dstFormat == MESA_FORMAT_RGBA_UINT8);
+   ASSERT(baseInternalFormat == GL_RGBA ||
+          baseInternalFormat == GL_RGB ||
+          baseInternalFormat == GL_ALPHA ||
+          baseInternalFormat == GL_LUMINANCE ||
+          baseInternalFormat == GL_LUMINANCE_ALPHA ||
+          baseInternalFormat == GL_INTENSITY);
+   ASSERT(texelBytes == components * sizeof(GLubyte));
+
+   if (!ctx->_ImageTransferState &&
+       !srcPacking->SwapBytes &&
+       baseInternalFormat == srcFormat &&
+       srcType == GL_UNSIGNED_BYTE) {
+      /* simple memcpy path */
+      memcpy_texture(ctx, dims,
+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
+                     dstRowStride,
+                     dstImageOffsets,
+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
+                     srcAddr, srcPacking);
+   }
+   else {
+      /* general path */
+      const GLfloat *tempImage = make_temp_float_image(ctx, dims,
+                                                 baseInternalFormat,
+                                                 baseFormat,
+                                                 srcWidth, srcHeight, srcDepth,
+                                                 srcFormat, srcType, srcAddr,
+                                                 srcPacking);
+      const GLfloat *src = tempImage;
+      GLint img, row;
+      if (!tempImage)
+         return GL_FALSE;
+      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
+      for (img = 0; img < srcDepth; img++) {
+         GLubyte *dstRow = (GLubyte *) dstAddr
+            + dstImageOffsets[dstZoffset + img] * texelBytes
+            + dstYoffset * dstRowStride
+            + dstXoffset * texelBytes;
+         for (row = 0; row < srcHeight; row++) {
+            GLubyte *dstTexel = (GLubyte *) dstRow;
+            GLint i;
+            for (i = 0; i < srcWidth * components; i++) {
+               dstTexel[i] = (GLubyte) src[i];
+            }
+            dstRow += dstRowStride;
+            src += srcWidth * components;
+         }
+      }
+
+      free((void *) tempImage);
+   }
+   return GL_TRUE;
+}
+
+
+/* non-normalized, unsigned int16 */
+static GLboolean
+_mesa_texstore_rgba_uint16(TEXSTORE_PARAMS)
+{
+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
+   const GLint components = _mesa_components_in_format(baseFormat);
+
+   ASSERT(dstFormat == MESA_FORMAT_RGBA_UINT16);
+   ASSERT(baseInternalFormat == GL_RGBA ||
+          baseInternalFormat == GL_RGB ||
+          baseInternalFormat == GL_ALPHA ||
+          baseInternalFormat == GL_LUMINANCE ||
+          baseInternalFormat == GL_LUMINANCE_ALPHA ||
+          baseInternalFormat == GL_INTENSITY);
+   ASSERT(texelBytes == components * sizeof(GLushort));
+
+   if (!ctx->_ImageTransferState &&
+       !srcPacking->SwapBytes &&
+       baseInternalFormat == srcFormat &&
+       srcType == GL_UNSIGNED_SHORT) {
+      /* simple memcpy path */
+      memcpy_texture(ctx, dims,
+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
+                     dstRowStride,
+                     dstImageOffsets,
+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
+                     srcAddr, srcPacking);
+   }
+   else {
+      /* general path */
+      const GLfloat *tempImage = make_temp_float_image(ctx, dims,
+                                                 baseInternalFormat,
+                                                 baseFormat,
+                                                 srcWidth, srcHeight, srcDepth,
+                                                 srcFormat, srcType, srcAddr,
+                                                 srcPacking);
+      const GLfloat *src = tempImage;
+      GLint img, row;
+      if (!tempImage)
+         return GL_FALSE;
+      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
+      for (img = 0; img < srcDepth; img++) {
+         GLubyte *dstRow = (GLubyte *) dstAddr
+            + dstImageOffsets[dstZoffset + img] * texelBytes
+            + dstYoffset * dstRowStride
+            + dstXoffset * texelBytes;
+         for (row = 0; row < srcHeight; row++) {
+            GLushort *dstTexel = (GLushort *) dstRow;
+            GLint i;
+            for (i = 0; i < srcWidth * components; i++) {
+               dstTexel[i] = (GLushort) src[i];
+            }
+            dstRow += dstRowStride;
+            src += srcWidth * components;
+         }
+      }
+
+      free((void *) tempImage);
+   }
+   return GL_TRUE;
+}
+
+
+/* non-normalized, unsigned int32 */
+static GLboolean
+_mesa_texstore_rgba_uint32(TEXSTORE_PARAMS)
+{
+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
+   const GLint components = _mesa_components_in_format(baseFormat);
+
+   ASSERT(dstFormat == MESA_FORMAT_RGBA_UINT32);
+   ASSERT(baseInternalFormat == GL_RGBA ||
+          baseInternalFormat == GL_RGB ||
+          baseInternalFormat == GL_ALPHA ||
+          baseInternalFormat == GL_LUMINANCE ||
+          baseInternalFormat == GL_LUMINANCE_ALPHA ||
+          baseInternalFormat == GL_INTENSITY);
+   ASSERT(texelBytes == components * sizeof(GLuint));
+
+   if (!ctx->_ImageTransferState &&
+       !srcPacking->SwapBytes &&
+       baseInternalFormat == srcFormat &&
+       srcType == GL_UNSIGNED_INT) {
+      /* simple memcpy path */
+      memcpy_texture(ctx, dims,
+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
+                     dstRowStride,
+                     dstImageOffsets,
+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
+                     srcAddr, srcPacking);
+   }
+   else {
+      /* general path */
+      const GLfloat *tempImage = make_temp_float_image(ctx, dims,
+                                                 baseInternalFormat,
+                                                 baseFormat,
+                                                 srcWidth, srcHeight, srcDepth,
+                                                 srcFormat, srcType, srcAddr,
+                                                 srcPacking);
+      const GLfloat *src = tempImage;
+      GLint img, row;
+      if (!tempImage)
+         return GL_FALSE;
+      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
+      for (img = 0; img < srcDepth; img++) {
+         GLubyte *dstRow = (GLubyte *) dstAddr
+            + dstImageOffsets[dstZoffset + img] * texelBytes
+            + dstYoffset * dstRowStride
+            + dstXoffset * texelBytes;
+         for (row = 0; row < srcHeight; row++) {
+            GLuint *dstTexel = (GLuint *) dstRow;
+            GLint i;
+            for (i = 0; i < srcWidth * components; i++) {
+               dstTexel[i] = (GLuint) src[i];
+            }
+            dstRow += dstRowStride;
+            src += srcWidth * components;
+         }
+      }
+
+      free((void *) tempImage);
+   }
+   return GL_TRUE;
+}
+
+
+
+
 #if FEATURE_EXT_texture_sRGB
 static GLboolean
 _mesa_texstore_srgb8(TEXSTORE_PARAMS)
@@ -3196,10 +3857,28 @@ texstore_funcs[MESA_FORMAT_COUNT] =
    { MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16, _mesa_texstore_rgba_float16 },
    { MESA_FORMAT_INTENSITY_FLOAT32, _mesa_texstore_rgba_float32 },
    { MESA_FORMAT_INTENSITY_FLOAT16, _mesa_texstore_rgba_float16 },
+
+   { MESA_FORMAT_RGBA_INT8, _mesa_texstore_rgba_int8 },
+   { MESA_FORMAT_RGBA_INT16, _mesa_texstore_rgba_int16 },
+   { MESA_FORMAT_RGBA_INT32, _mesa_texstore_rgba_int32 },
+   { MESA_FORMAT_RGBA_UINT8, _mesa_texstore_rgba_uint8 },
+   { MESA_FORMAT_RGBA_UINT16, _mesa_texstore_rgba_uint16 },
+   { MESA_FORMAT_RGBA_UINT32, _mesa_texstore_rgba_uint32 },
+
    { MESA_FORMAT_DUDV8, _mesa_texstore_dudv8 },
+
+   { MESA_FORMAT_SIGNED_R8, _mesa_texstore_signed_r8 },
+   { MESA_FORMAT_SIGNED_RG88, _mesa_texstore_signed_rg88 },
+   { MESA_FORMAT_SIGNED_RGBX8888, _mesa_texstore_signed_rgbx8888 },
+
    { MESA_FORMAT_SIGNED_RGBA8888, _mesa_texstore_signed_rgba8888 },
    { MESA_FORMAT_SIGNED_RGBA8888_REV, _mesa_texstore_signed_rgba8888 },
-   { MESA_FORMAT_SIGNED_RGBA_16, NULL },
+
+   { MESA_FORMAT_SIGNED_R_16, _mesa_texstore_signed_rgba_16 },
+   { MESA_FORMAT_SIGNED_RG_16, _mesa_texstore_signed_rgba_16 },
+   { MESA_FORMAT_SIGNED_RGB_16, _mesa_texstore_signed_rgba_16 },
+   { MESA_FORMAT_SIGNED_RGBA_16, _mesa_texstore_signed_rgba_16 },
+   { MESA_FORMAT_RGBA_16, _mesa_texstore_rgba_16 }
 };
 
 
diff --git a/mesalib/src/mesa/main/transformfeedback.c b/mesalib/src/mesa/main/transformfeedback.c
new file mode 100644
index 000000000..5c8c1fd22
--- /dev/null
+++ b/mesalib/src/mesa/main/transformfeedback.c
@@ -0,0 +1,944 @@
+/*
+ * Mesa 3-D graphics library
+ *
+ * Copyright (C) 2010  VMware, Inc.  All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/*
+ * Vertex transform feedback support.
+ *
+ * Authors:
+ *   Brian Paul
+ */
+
+
+#include "buffers.h"
+#include "bufferobj.h"
+#include "context.h"
+#include "hash.h"
+#include "transformfeedback.h"
+#include "shaderapi.h"
+#include "shaderobj.h"
+#include "main/dispatch.h"
+
+#include "program/prog_parameter.h"
+//#include "program/shader_api.h"
+
+
+#if FEATURE_EXT_transform_feedback
+
+
+/**
+ * Do reference counting of transform feedback buffers.
+ */
+static void
+reference_transform_feedback_object(struct gl_transform_feedback_object **ptr,
+                                    struct gl_transform_feedback_object *obj)
+{
+   if (*ptr == obj)
+      return;
+
+   if (*ptr) {
+      /* Unreference the old object */
+      struct gl_transform_feedback_object *oldObj = *ptr;
+
+      ASSERT(oldObj->RefCount > 0);
+      oldObj->RefCount--;
+
+      if (oldObj->RefCount == 0) {
+         GET_CURRENT_CONTEXT(ctx);
+         if (ctx)
+            ctx->Driver.DeleteTransformFeedback(ctx, oldObj);
+      }
+
+      *ptr = NULL;
+   }
+   ASSERT(!*ptr);
+
+   if (obj) {
+      /* reference new object */
+      if (obj->RefCount == 0) {
+         _mesa_problem(NULL, "referencing deleted transform feedback object");
+         *ptr = NULL;
+      }
+      else {
+         obj->RefCount++;
+         *ptr = obj;
+      }
+   }
+}
+
+
+/**
+ * Check if the given primitive mode (as in glBegin(mode)) is compatible
+ * with the current transform feedback mode (if it's enabled).
+ * This is to be called from glBegin(), glDrawArrays(), glDrawElements(), etc.
+ *
+ * \return GL_TRUE if the mode is OK, GL_FALSE otherwise.
+ */
+GLboolean
+_mesa_validate_primitive_mode(GLcontext *ctx, GLenum mode)
+{
+   if (ctx->TransformFeedback.CurrentObject->Active) {
+      switch (mode) {
+      case GL_POINTS:
+         return ctx->TransformFeedback.Mode == GL_POINTS;
+      case GL_LINES:
+      case GL_LINE_STRIP:
+      case GL_LINE_LOOP:
+         return ctx->TransformFeedback.Mode == GL_LINES;
+      default:
+         return ctx->TransformFeedback.Mode == GL_TRIANGLES;
+      }
+   }
+   return GL_TRUE;
+}
+
+
+/**
+ * Check that all the buffer objects currently bound for transform
+ * feedback actually exist.  Raise a GL_INVALID_OPERATION error if
+ * any buffers are missing.
+ * \return GL_TRUE for success, GL_FALSE if error
+ */
+GLboolean
+_mesa_validate_transform_feedback_buffers(GLcontext *ctx)
+{
+   /* XXX to do */
+   return GL_TRUE;
+}
+
+
+
+/**
+ * Per-context init for transform feedback.
+ */
+void
+_mesa_init_transform_feedback(GLcontext *ctx)
+{
+   /* core mesa expects this, even a dummy one, to be available */
+   ASSERT(ctx->Driver.NewTransformFeedback);
+
+   ctx->TransformFeedback.DefaultObject =
+      ctx->Driver.NewTransformFeedback(ctx, 0);
+
+   assert(ctx->TransformFeedback.DefaultObject->RefCount == 1);
+
+   reference_transform_feedback_object(&ctx->TransformFeedback.CurrentObject,
+                                       ctx->TransformFeedback.DefaultObject);
+
+   assert(ctx->TransformFeedback.DefaultObject->RefCount == 2);
+
+   ctx->TransformFeedback.Objects = _mesa_NewHashTable();
+
+   _mesa_reference_buffer_object(ctx,
+                                 &ctx->TransformFeedback.CurrentBuffer,
+                                 ctx->Shared->NullBufferObj);
+}
+
+
+
+/**
+ * Callback for _mesa_HashDeleteAll().
+ */
+static void
+delete_cb(GLuint key, void *data, void *userData)
+{
+   GLcontext *ctx = (GLcontext *) userData;
+   struct gl_transform_feedback_object *obj =
+      (struct gl_transform_feedback_object *) data;
+
+   ctx->Driver.DeleteTransformFeedback(ctx, obj);
+}
+
+
+/**
+ * Per-context free/clean-up for transform feedback.
+ */
+void
+_mesa_free_transform_feedback(GLcontext *ctx)
+{
+   /* core mesa expects this, even a dummy one, to be available */
+   ASSERT(ctx->Driver.NewTransformFeedback);
+
+   _mesa_reference_buffer_object(ctx,
+                                 &ctx->TransformFeedback.CurrentBuffer,
+                                 NULL);
+
+   /* Delete all feedback objects */
+   _mesa_HashDeleteAll(ctx->TransformFeedback.Objects, delete_cb, ctx);
+   _mesa_DeleteHashTable(ctx->TransformFeedback.Objects);
+
+   /* Delete the default feedback object */
+   assert(ctx->Driver.DeleteTransformFeedback);
+   ctx->Driver.DeleteTransformFeedback(ctx,
+                                       ctx->TransformFeedback.DefaultObject);
+
+   ctx->TransformFeedback.CurrentObject = NULL;
+}
+
+
+#else /* FEATURE_EXT_transform_feedback */
+
+/* forward declarations */
+static struct gl_transform_feedback_object *
+new_transform_feedback(GLcontext *ctx, GLuint name);
+
+static void
+delete_transform_feedback(GLcontext *ctx,
+                          struct gl_transform_feedback_object *obj);
+
+/* dummy per-context init/clean-up for transform feedback */
+void
+_mesa_init_transform_feedback(GLcontext *ctx)
+{
+   ctx->TransformFeedback.DefaultObject = new_transform_feedback(ctx, 0);
+   ctx->TransformFeedback.CurrentObject = ctx->TransformFeedback.DefaultObject;
+   _mesa_reference_buffer_object(ctx,
+                                 &ctx->TransformFeedback.CurrentBuffer,
+                                 ctx->Shared->NullBufferObj);
+}
+
+void
+_mesa_free_transform_feedback(GLcontext *ctx)
+{
+   _mesa_reference_buffer_object(ctx,
+                                 &ctx->TransformFeedback.CurrentBuffer,
+                                 NULL);
+   ctx->TransformFeedback.CurrentObject = NULL;
+   delete_transform_feedback(ctx, ctx->TransformFeedback.DefaultObject);
+}
+
+#endif /* FEATURE_EXT_transform_feedback */
+
+
+/** Default fallback for ctx->Driver.NewTransformFeedback() */
+static struct gl_transform_feedback_object *
+new_transform_feedback(GLcontext *ctx, GLuint name)
+{
+   struct gl_transform_feedback_object *obj;
+   obj = CALLOC_STRUCT(gl_transform_feedback_object);
+   if (obj) {
+      obj->Name = name;
+      obj->RefCount = 1;
+   }
+   return obj;
+}
+
+/** Default fallback for ctx->Driver.DeleteTransformFeedback() */
+static void
+delete_transform_feedback(GLcontext *ctx,
+                          struct gl_transform_feedback_object *obj)
+{
+   GLuint i;
+
+   for (i = 0; i < Elements(obj->Buffers); i++) {
+      _mesa_reference_buffer_object(ctx, &obj->Buffers[i], NULL);
+   }
+
+   free(obj);
+}
+
+
+#if FEATURE_EXT_transform_feedback
+
+
+/** Default fallback for ctx->Driver.BeginTransformFeedback() */
+static void
+begin_transform_feedback(GLcontext *ctx, GLenum mode,
+                         struct gl_transform_feedback_object *obj)
+{
+   /* nop */
+}
+
+/** Default fallback for ctx->Driver.EndTransformFeedback() */
+static void
+end_transform_feedback(GLcontext *ctx,
+                       struct gl_transform_feedback_object *obj)
+{
+   /* nop */
+}
+
+/** Default fallback for ctx->Driver.PauseTransformFeedback() */
+static void
+pause_transform_feedback(GLcontext *ctx,
+                         struct gl_transform_feedback_object *obj)
+{
+   /* nop */
+}
+
+/** Default fallback for ctx->Driver.ResumeTransformFeedback() */
+static void
+resume_transform_feedback(GLcontext *ctx,
+                          struct gl_transform_feedback_object *obj)
+{
+   /* nop */
+}
+
+/** Default fallback for ctx->Driver.DrawTransformFeedback() */
+static void
+draw_transform_feedback(GLcontext *ctx, GLenum mode,
+                        struct gl_transform_feedback_object *obj)
+{
+   /* XXX to do */
+   /*
+    * Get number of vertices in obj's feedback buffer.
+    * Call ctx->Exec.DrawArrays(mode, 0, count);
+    */
+}
+
+
+/**
+ * Plug in default device driver functions for transform feedback.
+ * Most drivers will override some/all of these.
+ */
+void
+_mesa_init_transform_feedback_functions(struct dd_function_table *driver)
+{
+   driver->NewTransformFeedback = new_transform_feedback;
+   driver->DeleteTransformFeedback = delete_transform_feedback;
+   driver->BeginTransformFeedback = begin_transform_feedback;
+   driver->EndTransformFeedback = end_transform_feedback;
+   driver->PauseTransformFeedback = pause_transform_feedback;
+   driver->ResumeTransformFeedback = resume_transform_feedback;
+   driver->DrawTransformFeedback = draw_transform_feedback;
+}
+
+
+void
+_mesa_init_transform_feedback_dispatch(struct _glapi_table *disp)
+{
+   SET_BeginTransformFeedbackEXT(disp, _mesa_BeginTransformFeedback);
+   SET_EndTransformFeedbackEXT(disp, _mesa_EndTransformFeedback);
+   SET_BindBufferRangeEXT(disp, _mesa_BindBufferRange);
+   SET_BindBufferBaseEXT(disp, _mesa_BindBufferBase);
+   SET_BindBufferOffsetEXT(disp, _mesa_BindBufferOffsetEXT);
+   SET_TransformFeedbackVaryingsEXT(disp, _mesa_TransformFeedbackVaryings);
+   SET_GetTransformFeedbackVaryingEXT(disp, _mesa_GetTransformFeedbackVarying);
+}
+
+
+/**
+ ** Begin API functions
+ **/
+
+
+void GLAPIENTRY
+_mesa_BeginTransformFeedback(GLenum mode)
+{
+   struct gl_transform_feedback_object *obj;
+   GET_CURRENT_CONTEXT(ctx);
+
+   obj = ctx->TransformFeedback.CurrentObject;
+
+   switch (mode) {
+   case GL_POINTS:
+   case GL_LINES:
+   case GL_TRIANGLES:
+      /* legal */
+      break;
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM, "glBeginTransformFeedback(mode)");
+      return;
+   }
+
+   if (obj->Active) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glBeginTransformFeedback(already active)");
+      return;
+   }
+
+   obj->Active = GL_TRUE;
+   ctx->TransformFeedback.Mode = mode;
+
+   assert(ctx->Driver.BeginTransformFeedback);
+   ctx->Driver.BeginTransformFeedback(ctx, mode, obj);
+}
+
+
+void GLAPIENTRY
+_mesa_EndTransformFeedback(void)
+{
+   struct gl_transform_feedback_object *obj;
+   GET_CURRENT_CONTEXT(ctx);
+
+   obj = ctx->TransformFeedback.CurrentObject;
+
+   if (!obj->Active) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glEndTransformFeedback(not active)");
+      return;
+   }
+
+   ctx->TransformFeedback.CurrentObject->Active = GL_FALSE;
+
+   assert(ctx->Driver.EndTransformFeedback);
+   ctx->Driver.EndTransformFeedback(ctx, obj);
+}
+
+
+/**
+ * Helper used by BindBufferRange() and BindBufferBase().
+ */
+static void
+bind_buffer_range(GLcontext *ctx, GLuint index,
+                  struct gl_buffer_object *bufObj,
+                  GLintptr offset, GLsizeiptr size)
+{
+   struct gl_transform_feedback_object *obj =
+      ctx->TransformFeedback.CurrentObject;
+
+   /* The general binding point */
+   _mesa_reference_buffer_object(ctx,
+                                 &ctx->TransformFeedback.CurrentBuffer,
+                                 bufObj);
+
+   /* The per-attribute binding point */
+   _mesa_reference_buffer_object(ctx,
+                                 &obj->Buffers[index],
+                                 bufObj);
+
+   obj->BufferNames[index] = bufObj->Name;
+
+   obj->Offset[index] = offset;
+   obj->Size[index] = size;
+}
+
+
+/**
+ * Specify a buffer object to receive vertex shader results.  Plus,
+ * specify the starting offset to place the results, and max size.
+ */
+void GLAPIENTRY
+_mesa_BindBufferRange(GLenum target, GLuint index,
+                      GLuint buffer, GLintptr offset, GLsizeiptr size)
+{
+   struct gl_transform_feedback_object *obj;
+   struct gl_buffer_object *bufObj;
+   GET_CURRENT_CONTEXT(ctx);
+
+   if (target != GL_TRANSFORM_FEEDBACK_BUFFER) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glBindBufferRange(target)");
+      return;
+   }
+
+   obj = ctx->TransformFeedback.CurrentObject;
+
+   if (obj->Active) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glBindBufferRange(transform feedback active)");
+      return;
+   }
+
+   if (index >= ctx->Const.MaxTransformFeedbackSeparateAttribs) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glBindBufferRange(index=%d)", index);
+      return;
+   }
+
+   if ((size <= 0) || (size & 0x3)) {
+      /* must be positive and multiple of four */
+      _mesa_error(ctx, GL_INVALID_VALUE, "glBindBufferRange(size%d)", (int) size);
+      return;
+   }  
+
+   if (offset & 0x3) {
+      /* must be multiple of four */
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glBindBufferRange(offset=%d)", (int) offset);
+      return;
+   }  
+
+   bufObj = _mesa_lookup_bufferobj(ctx, buffer);
+   if (!bufObj) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glBindBufferRange(invalid buffer=%u)", buffer);
+      return;
+   }
+
+   if (offset + size >= bufObj->Size) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glBindBufferRange(offset + size %d > buffer size %d)",
+		  (int) (offset + size), (int) (bufObj->Size));
+      return;
+   }  
+
+   bind_buffer_range(ctx, index, bufObj, offset, size);
+}
+
+
+/**
+ * Specify a buffer object to receive vertex shader results.
+ * As above, but start at offset = 0.
+ */
+void GLAPIENTRY
+_mesa_BindBufferBase(GLenum target, GLuint index, GLuint buffer)
+{
+   struct gl_transform_feedback_object *obj;
+   struct gl_buffer_object *bufObj;
+   GLsizeiptr size;
+   GET_CURRENT_CONTEXT(ctx);
+
+   if (target != GL_TRANSFORM_FEEDBACK_BUFFER) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glBindBufferBase(target)");
+      return;
+   }
+
+   obj = ctx->TransformFeedback.CurrentObject;
+
+   if (obj->Active) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glBindBufferRange(transform feedback active)");
+      return;
+   }
+
+   if (index >= ctx->Const.MaxTransformFeedbackSeparateAttribs) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glBindBufferBase(index=%d)", index);
+      return;
+   }
+
+   bufObj = _mesa_lookup_bufferobj(ctx, buffer);
+   if (!bufObj) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glBindBufferBase(invalid buffer=%u)", buffer);
+      return;
+   }
+
+   /* default size is the buffer size rounded down to nearest
+    * multiple of four.
+    */
+   size = bufObj->Size & ~0x3;
+
+   bind_buffer_range(ctx, index, bufObj, 0, size);
+}
+
+
+/**
+ * Specify a buffer object to receive vertex shader results, plus the
+ * offset in the buffer to start placing results.
+ * This function is part of GL_EXT_transform_feedback, but not GL3.
+ */
+void GLAPIENTRY
+_mesa_BindBufferOffsetEXT(GLenum target, GLuint index, GLuint buffer,
+                          GLintptr offset)
+{
+   struct gl_transform_feedback_object *obj;
+   struct gl_buffer_object *bufObj;
+   GET_CURRENT_CONTEXT(ctx);
+   GLsizeiptr size;
+
+   if (target != GL_TRANSFORM_FEEDBACK_BUFFER) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glBindBufferOffsetEXT(target)");
+      return;
+   }
+
+   obj = ctx->TransformFeedback.CurrentObject;
+
+   if (obj->Active) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glBindBufferRange(transform feedback active)");
+      return;
+   }
+
+   if (index >= ctx->Const.MaxTransformFeedbackSeparateAttribs) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glBindBufferOffsetEXT(index=%d)", index);
+      return;
+   }
+
+   bufObj = _mesa_lookup_bufferobj(ctx, buffer);
+   if (!bufObj) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glBindBufferOffsetEXT(invalid buffer=%u)", buffer);
+      return;
+   }
+
+   /* default size is the buffer size rounded down to nearest
+    * multiple of four.
+    */
+   size = (bufObj->Size - offset) & ~0x3;
+
+   bind_buffer_range(ctx, index, bufObj, offset, size);
+}
+
+
+/**
+ * This function specifies the vertex shader outputs to be written
+ * to the feedback buffer(s), and in what order.
+ */
+void GLAPIENTRY
+_mesa_TransformFeedbackVaryings(GLuint program, GLsizei count,
+                                const GLchar **varyings, GLenum bufferMode)
+{
+   struct gl_shader_program *shProg;
+   GLuint i;
+   GET_CURRENT_CONTEXT(ctx);
+
+   switch (bufferMode) {
+   case GL_INTERLEAVED_ATTRIBS:
+      break;
+   case GL_SEPARATE_ATTRIBS:
+      break;
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glTransformFeedbackVaryings(bufferMode)");
+      return;
+   }
+
+   if (count < 0 || count > ctx->Const.MaxTransformFeedbackSeparateAttribs) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glTransformFeedbackVaryings(count=%d)", count);
+      return;
+   }
+
+   shProg = _mesa_lookup_shader_program(ctx, program);
+   if (!shProg) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glTransformFeedbackVaryings(program=%u)", program);
+      return;
+   }
+
+   /* free existing varyings, if any */
+   for (i = 0; i < shProg->TransformFeedback.NumVarying; i++) {
+      free(shProg->TransformFeedback.VaryingNames[i]);
+   }
+   free(shProg->TransformFeedback.VaryingNames);
+
+   /* allocate new memory for varying names */
+   shProg->TransformFeedback.VaryingNames =
+      (GLchar **) malloc(count * sizeof(GLchar *));
+
+   if (!shProg->TransformFeedback.VaryingNames) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTransformFeedbackVaryings()");
+      return;
+   }
+
+   /* Save the new names and the count */
+   for (i = 0; i < (GLuint) count; i++) {
+      shProg->TransformFeedback.VaryingNames[i] = _mesa_strdup(varyings[i]);
+   }
+   shProg->TransformFeedback.NumVarying = count;
+
+   shProg->TransformFeedback.BufferMode = bufferMode;
+
+   /* The varyings won't be used until shader link time */
+}
+
+
+/**
+ * Get info about the vertex shader's outputs which are to be written
+ * to the feedback buffer(s).
+ */
+void GLAPIENTRY
+_mesa_GetTransformFeedbackVarying(GLuint program, GLuint index,
+                                  GLsizei bufSize, GLsizei *length,
+                                  GLsizei *size, GLenum *type, GLchar *name)
+{
+   const struct gl_shader_program *shProg;
+   const GLchar *varyingName;
+   GLint v;
+   GET_CURRENT_CONTEXT(ctx);
+
+   shProg = _mesa_lookup_shader_program(ctx, program);
+   if (!shProg) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glGetTransformFeedbackVaryings(program=%u)", program);
+      return;
+   }
+
+   if (index >= shProg->TransformFeedback.NumVarying) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glGetTransformFeedbackVaryings(index=%u)", index);
+      return;
+   }
+
+   varyingName = shProg->TransformFeedback.VaryingNames[index];
+
+   v = _mesa_lookup_parameter_index(shProg->Varying, -1, varyingName);
+   if (v >= 0) {
+      struct gl_program_parameter *param = &shProg->Varying->Parameters[v];
+
+      /* return the varying's name and length */
+      _mesa_copy_string(name, bufSize, length, varyingName);
+
+      /* return the datatype and value's size (in datatype units) */
+      if (type)
+         *type = param->DataType;
+      if (size)
+         *size = param->Size;
+   }
+   else {
+      name[0] = 0;
+      if (length)
+         *length = 0;
+      if (type)
+         *type = 0;
+      if (size)
+         *size = 0;
+   }
+}
+
+
+
+static struct gl_transform_feedback_object *
+lookup_transform_feedback_object(GLcontext *ctx, GLuint name)
+{
+   if (name == 0) {
+      return ctx->TransformFeedback.DefaultObject;
+   }
+   else
+      return (struct gl_transform_feedback_object *)
+         _mesa_HashLookup(ctx->TransformFeedback.Objects, name);
+}
+
+
+/**
+ * Create new transform feedback objects.   Transform feedback objects
+ * encapsulate the state related to transform feedback to allow quickly
+ * switching state (and drawing the results, below).
+ * Part of GL_ARB_transform_feedback2.
+ */
+void GLAPIENTRY
+_mesa_GenTransformFeedbacks(GLsizei n, GLuint *names)
+{
+   GLuint first;
+   GET_CURRENT_CONTEXT(ctx);
+
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (n < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glGenTransformFeedbacks(n < 0)");
+      return;
+   }
+
+   if (!names)
+      return;
+
+   /* we don't need contiguous IDs, but this might be faster */
+   first = _mesa_HashFindFreeKeyBlock(ctx->TransformFeedback.Objects, n);
+   if (first) {
+      GLsizei i;
+      for (i = 0; i < n; i++) {
+         struct gl_transform_feedback_object *obj
+            = ctx->Driver.NewTransformFeedback(ctx, first + i);
+         if (!obj) {
+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGenTransformFeedbacks");
+            return;
+         }
+         names[i] = first + i;
+         _mesa_HashInsert(ctx->TransformFeedback.Objects, first + i, obj);
+      }
+   }
+   else {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGenTransformFeedbacks");
+   }
+}
+
+
+/**
+ * Is the given ID a transform feedback object?
+ * Part of GL_ARB_transform_feedback2.
+ */
+GLboolean GLAPIENTRY
+_mesa_IsTransformFeedback(GLuint name)
+{
+   GET_CURRENT_CONTEXT(ctx);
+
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
+
+   if (name && lookup_transform_feedback_object(ctx, name))
+      return GL_TRUE;
+   else
+      return GL_FALSE;
+}
+
+
+/**
+ * Bind the given transform feedback object.
+ * Part of GL_ARB_transform_feedback2.
+ */
+void GLAPIENTRY
+_mesa_BindTransformFeedback(GLenum target, GLuint name)
+{
+   struct gl_transform_feedback_object *obj;
+   GET_CURRENT_CONTEXT(ctx);
+
+   if (target != GL_TRANSFORM_FEEDBACK) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glBindTransformFeedback(target)");
+      return;
+   }
+
+   if (ctx->TransformFeedback.CurrentObject->Active &&
+       !ctx->TransformFeedback.CurrentObject->Paused) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+              "glBindTransformFeedback(transform is active, or not paused)");
+      return;
+   }
+
+   obj = lookup_transform_feedback_object(ctx, name);
+   if (!obj) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glBindTransformFeedback(name=%u)", name);
+      return;
+   }
+
+   reference_transform_feedback_object(&ctx->TransformFeedback.CurrentObject,
+                                       obj);
+}
+
+
+/**
+ * Delete the given transform feedback objects.
+ * Part of GL_ARB_transform_feedback2.
+ */
+void GLAPIENTRY
+_mesa_DeleteTransformFeedbacks(GLsizei n, const GLuint *names)
+{
+   GLint i;
+   GET_CURRENT_CONTEXT(ctx);
+
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (n < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glDeleteTransformFeedbacks(n < 0)");
+      return;
+   }
+
+   if (!names)
+      return;
+
+   for (i = 0; i < n; i++) {
+      if (names[i] > 0) {
+         struct gl_transform_feedback_object *obj
+            = lookup_transform_feedback_object(ctx, names[i]);
+         if (obj) {
+            if (obj->Active) {
+               _mesa_error(ctx, GL_INVALID_OPERATION,
+                           "glDeleteTransformFeedbacks(object %u is active)",
+                           names[i]);
+               return;
+            }
+            _mesa_HashRemove(ctx->TransformFeedback.Objects, names[i]);
+            /* unref, but object may not be deleted until later */
+            reference_transform_feedback_object(&obj, NULL);
+         }
+      }
+   }
+}
+
+
+/**
+ * Pause transform feedback.
+ * Part of GL_ARB_transform_feedback2.
+ */
+void GLAPIENTRY
+_mesa_PauseTransformFeedback(void)
+{
+   struct gl_transform_feedback_object *obj;
+   GET_CURRENT_CONTEXT(ctx);
+
+   obj = ctx->TransformFeedback.CurrentObject;
+
+   if (!obj->Active || obj->Paused) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+           "glPauseTransformFeedback(feedback not active or already paused)");
+      return;
+   }
+
+   obj->Paused = GL_TRUE;
+
+   assert(ctx->Driver.PauseTransformFeedback);
+   ctx->Driver.PauseTransformFeedback(ctx, obj);
+}
+
+
+/**
+ * Resume transform feedback.
+ * Part of GL_ARB_transform_feedback2.
+ */
+void GLAPIENTRY
+_mesa_ResumeTransformFeedback(void)
+{
+   struct gl_transform_feedback_object *obj;
+   GET_CURRENT_CONTEXT(ctx);
+
+   obj = ctx->TransformFeedback.CurrentObject;
+
+   if (!obj->Active || !obj->Paused) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+               "glPauseTransformFeedback(feedback not active or not paused)");
+      return;
+   }
+
+   obj->Paused = GL_FALSE;
+
+   assert(ctx->Driver.ResumeTransformFeedback);
+   ctx->Driver.ResumeTransformFeedback(ctx, obj);
+}
+
+
+/**
+ * Draw the vertex data in a transform feedback object.
+ * \param mode  GL_POINTS, GL_LINES, GL_TRIANGLE_STRIP, etc.
+ * \param name  the transform feedback object
+ * The number of vertices comes from the transform feedback object.
+ * User still has to setup of the vertex attribute info with
+ * glVertexPointer, glColorPointer, etc.
+ * Part of GL_ARB_transform_feedback2.
+ */
+void GLAPIENTRY
+_mesa_DrawTransformFeedback(GLenum mode, GLuint name)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_transform_feedback_object *obj =
+      lookup_transform_feedback_object(ctx, name);
+
+   if (mode > GL_POLYGON) {
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glDrawTransformFeedback(mode=0x%x)", mode);
+      return;
+   }
+   if (!obj) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glDrawTransformFeedback(name = %u)", name);
+      return;
+   }
+
+   /* XXX check if EndTransformFeedback has never been called while
+    * the object was bound
+    */
+
+   assert(ctx->Driver.DrawTransformFeedback);
+   ctx->Driver.DrawTransformFeedback(ctx, mode, obj);
+}
+
+
+/*
+XXX misc to do:
+
+glGet*() for
+
+GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED
+GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE
+GL_TRANSFORM_FEEDBACK_BINDING
+*/
+
+
+#endif /* FEATURE_EXT_transform_feedback */
diff --git a/mesalib/src/mesa/main/transformfeedback.h b/mesalib/src/mesa/main/transformfeedback.h
new file mode 100644
index 000000000..4d38522d6
--- /dev/null
+++ b/mesalib/src/mesa/main/transformfeedback.h
@@ -0,0 +1,132 @@
+/*
+ * Mesa 3-D graphics library
+ *
+ * Copyright (C) 2010  VMware, Inc.  All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef TRANSFORM_FEEDBACK_H
+#define TRANSFORM_FEEDBACK_H
+
+#include "main/mtypes.h"
+
+
+extern void
+_mesa_init_transform_feedback(GLcontext *ctx);
+
+extern void
+_mesa_free_transform_feedback(GLcontext *ctx);
+
+#if FEATURE_EXT_transform_feedback
+
+extern GLboolean
+_mesa_validate_primitive_mode(GLcontext *ctx, GLenum mode);
+
+extern GLboolean
+_mesa_validate_transform_feedback_buffers(GLcontext *ctx);
+
+
+extern void
+_mesa_init_transform_feedback_functions(struct dd_function_table *driver);
+
+extern void
+_mesa_init_transform_feedback_dispatch(struct _glapi_table *disp);
+
+
+/*** GL_EXT_transform_feedback ***/
+
+extern void GLAPIENTRY
+_mesa_BeginTransformFeedback(GLenum mode);
+
+extern void GLAPIENTRY
+_mesa_EndTransformFeedback(void);
+
+extern void GLAPIENTRY
+_mesa_BindBufferRange(GLenum target, GLuint index,
+                      GLuint buffer, GLintptr offset, GLsizeiptr size);
+
+extern void GLAPIENTRY
+_mesa_BindBufferBase(GLenum target, GLuint index, GLuint buffer);
+
+extern void GLAPIENTRY
+_mesa_BindBufferOffsetEXT(GLenum target, GLuint index, GLuint buffer,
+                          GLintptr offset);
+
+extern void GLAPIENTRY
+_mesa_TransformFeedbackVaryings(GLuint program, GLsizei count,
+                                const GLchar **varyings, GLenum bufferMode);
+
+extern void GLAPIENTRY
+_mesa_GetTransformFeedbackVarying(GLuint program, GLuint index,
+                                  GLsizei bufSize, GLsizei *length,
+                                  GLsizei *size, GLenum *type, GLchar *name);
+
+
+
+/*** GL_ARB_transform_feedback2 ***/
+
+extern void GLAPIENTRY
+_mesa_GenTransformFeedbacks(GLsizei n, GLuint *names);
+
+extern GLboolean GLAPIENTRY
+_mesa_IsTransformFeedback(GLuint name);
+
+extern void GLAPIENTRY
+_mesa_BindTransformFeedback(GLenum target, GLuint name);
+
+extern void GLAPIENTRY
+_mesa_DeleteTransformFeedbacks(GLsizei n, const GLuint *names);
+
+extern void GLAPIENTRY
+_mesa_PauseTransformFeedback(void);
+
+extern void GLAPIENTRY
+_mesa_ResumeTransformFeedback(void);
+
+extern void GLAPIENTRY
+_mesa_DrawTransformFeedback(GLenum mode, GLuint name);
+
+#else /* FEATURE_EXT_transform_feedback */
+
+static INLINE GLboolean
+_mesa_validate_primitive_mode(GLcontext *ctx, GLenum mode)
+{
+   return GL_TRUE;
+}
+
+static INLINE GLboolean
+_mesa_validate_transform_feedback_buffers(GLcontext *ctx)
+{
+   return GL_TRUE;
+}
+
+static INLINE void
+_mesa_init_transform_feedback_functions(struct dd_function_table *driver)
+{
+}
+
+static INLINE void
+_mesa_init_transform_feedback_dispatch(struct _glapi_table *disp)
+{
+}
+
+#endif /* FEATURE_EXT_transform_feedback */
+
+#endif /* TRANSFORM_FEEDBACK_H */
diff --git a/mesalib/src/mesa/main/uniforms.c b/mesalib/src/mesa/main/uniforms.c
new file mode 100644
index 000000000..a5d7da51f
--- /dev/null
+++ b/mesalib/src/mesa/main/uniforms.c
@@ -0,0 +1,1382 @@
+/*
+ * Mesa 3-D graphics library
+ *
+ * Copyright (C) 2004-2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009-2010  VMware, Inc.  All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, 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 uniforms.c
+ * Functions related to GLSL uniform variables.
+ * \author Brian Paul
+ */
+
+/**
+ * XXX things to do:
+ * 1. Check that the right error code is generated for all _mesa_error() calls.
+ * 2. Insert FLUSH_VERTICES calls in various places
+ */
+
+
+#include "main/glheader.h"
+#include "main/context.h"
+#include "main/dispatch.h"
+#include "main/shaderapi.h"
+#include "main/shaderobj.h"
+#include "main/uniforms.h"
+#include "program/prog_parameter.h"
+#include "program/prog_statevars.h"
+#include "program/prog_uniform.h"
+
+
+
+static GLenum
+base_uniform_type(GLenum type)
+{
+   switch (type) {
+#if 0 /* not needed, for now */
+   case GL_BOOL:
+   case GL_BOOL_VEC2:
+   case GL_BOOL_VEC3:
+   case GL_BOOL_VEC4:
+      return GL_BOOL;
+#endif
+   case GL_FLOAT:
+   case GL_FLOAT_VEC2:
+   case GL_FLOAT_VEC3:
+   case GL_FLOAT_VEC4:
+      return GL_FLOAT;
+   case GL_UNSIGNED_INT:
+   case GL_UNSIGNED_INT_VEC2:
+   case GL_UNSIGNED_INT_VEC3:
+   case GL_UNSIGNED_INT_VEC4:
+      return GL_UNSIGNED_INT;
+   case GL_INT:
+   case GL_INT_VEC2:
+   case GL_INT_VEC3:
+   case GL_INT_VEC4:
+      return GL_INT;
+   default:
+      _mesa_problem(NULL, "Invalid type in base_uniform_type()");
+      return GL_FLOAT;
+   }
+}
+
+
+static GLboolean
+is_boolean_type(GLenum type)
+{
+   switch (type) {
+   case GL_BOOL:
+   case GL_BOOL_VEC2:
+   case GL_BOOL_VEC3:
+   case GL_BOOL_VEC4:
+      return GL_TRUE;
+   default:
+      return GL_FALSE;
+   }
+}
+
+
+static GLboolean
+is_sampler_type(GLenum type)
+{
+   switch (type) {
+   case GL_SAMPLER_1D:
+   case GL_SAMPLER_2D:
+   case GL_SAMPLER_3D:
+   case GL_SAMPLER_CUBE:
+   case GL_SAMPLER_1D_SHADOW:
+   case GL_SAMPLER_2D_SHADOW:
+   case GL_SAMPLER_2D_RECT_ARB:
+   case GL_SAMPLER_2D_RECT_SHADOW_ARB:
+   case GL_SAMPLER_1D_ARRAY_EXT:
+   case GL_SAMPLER_2D_ARRAY_EXT:
+   case GL_SAMPLER_1D_ARRAY_SHADOW_EXT:
+   case GL_SAMPLER_2D_ARRAY_SHADOW_EXT:
+      return GL_TRUE;
+   default:
+      return GL_FALSE;
+   }
+}
+
+
+static struct gl_program_parameter *
+get_uniform_parameter(const struct gl_shader_program *shProg, GLuint index)
+{
+   const struct gl_program *prog = NULL;
+   GLint progPos;
+
+   progPos = shProg->Uniforms->Uniforms[index].VertPos;
+   if (progPos >= 0) {
+      prog = &shProg->VertexProgram->Base;
+   }
+   else {
+      progPos = shProg->Uniforms->Uniforms[index].FragPos;
+      if (progPos >= 0) {
+         prog = &shProg->FragmentProgram->Base;
+      } else {
+         progPos = shProg->Uniforms->Uniforms[index].GeomPos;
+         if (progPos >= 0) {
+            prog = &shProg->GeometryProgram->Base;
+         }
+      }
+   }
+
+   if (!prog || progPos < 0)
+      return NULL; /* should never happen */
+
+   return &prog->Parameters->Parameters[progPos];
+}
+
+
+/**
+ * Called by glGetActiveUniform().
+ */
+static void
+_mesa_get_active_uniform(GLcontext *ctx, GLuint program, GLuint index,
+                         GLsizei maxLength, GLsizei *length, GLint *size,
+                         GLenum *type, GLchar *nameOut)
+{
+   const struct gl_shader_program *shProg;
+   const struct gl_program *prog = NULL;
+   const struct gl_program_parameter *param;
+   GLint progPos;
+
+   shProg = _mesa_lookup_shader_program_err(ctx, program, "glGetActiveUniform");
+   if (!shProg)
+      return;
+
+   if (!shProg->Uniforms || index >= shProg->Uniforms->NumUniforms) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glGetActiveUniform(index)");
+      return;
+   }
+
+   progPos = shProg->Uniforms->Uniforms[index].VertPos;
+   if (progPos >= 0) {
+      prog = &shProg->VertexProgram->Base;
+   }
+   else {
+      progPos = shProg->Uniforms->Uniforms[index].FragPos;
+      if (progPos >= 0) {
+         prog = &shProg->FragmentProgram->Base;
+      } else {
+         progPos = shProg->Uniforms->Uniforms[index].GeomPos;
+         if (progPos >= 0) {
+            prog = &shProg->GeometryProgram->Base;
+         }
+      }
+   }
+
+   if (!prog || progPos < 0)
+      return; /* should never happen */
+
+   ASSERT(progPos < prog->Parameters->NumParameters);
+   param = &prog->Parameters->Parameters[progPos];
+
+   if (nameOut) {
+      _mesa_copy_string(nameOut, maxLength, length, param->Name);
+   }
+
+   if (size) {
+      GLint typeSize = _mesa_sizeof_glsl_type(param->DataType);
+      if ((GLint) param->Size > typeSize) {
+         /* This is an array.
+          * Array elements are placed on vector[4] boundaries so they're
+          * a multiple of four floats.  We round typeSize up to next multiple
+          * of four to get the right size below.
+          */
+         typeSize = (typeSize + 3) & ~3;
+      }
+      /* Note that the returned size is in units of the <type>, not bytes */
+      *size = param->Size / typeSize;
+   }
+
+   if (type) {
+      *type = param->DataType;
+   }
+}
+
+
+
+static void
+get_matrix_dims(GLenum type, GLint *rows, GLint *cols)
+{
+   switch (type) {
+   case GL_FLOAT_MAT2:
+      *rows = *cols = 2;
+      break;
+   case GL_FLOAT_MAT2x3:
+      *rows = 3;
+      *cols = 2;
+      break;
+   case GL_FLOAT_MAT2x4:
+      *rows = 4;
+      *cols = 2;
+      break;
+   case GL_FLOAT_MAT3:
+      *rows = 3;
+      *cols = 3;
+      break;
+   case GL_FLOAT_MAT3x2:
+      *rows = 2;
+      *cols = 3;
+      break;
+   case GL_FLOAT_MAT3x4:
+      *rows = 4;
+      *cols = 3;
+      break;
+   case GL_FLOAT_MAT4:
+      *rows = 4;
+      *cols = 4;
+      break;
+   case GL_FLOAT_MAT4x2:
+      *rows = 2;
+      *cols = 4;
+      break;
+   case GL_FLOAT_MAT4x3:
+      *rows = 3;
+      *cols = 4;
+      break;
+   default:
+      *rows = *cols = 0;
+   }
+}
+
+
+/**
+ * Determine the number of rows and columns occupied by a uniform
+ * according to its datatype.  For non-matrix types (such as GL_FLOAT_VEC4),
+ * the number of rows = 1 and cols = number of elements in the vector.
+ */
+static void
+get_uniform_rows_cols(const struct gl_program_parameter *p,
+                      GLint *rows, GLint *cols)
+{
+   get_matrix_dims(p->DataType, rows, cols);
+   if (*rows == 0 && *cols == 0) {
+      /* not a matrix type, probably a float or vector */
+      if (p->Size <= 4) {
+         *rows = 1;
+         *cols = p->Size;
+      }
+      else {
+         *rows = p->Size / 4 + 1;
+         if (p->Size % 4 == 0)
+            *cols = 4;
+         else
+            *cols = p->Size % 4;
+      }
+   }
+}
+
+
+/**
+ * Helper for get_uniform[fi]v() functions.
+ * Given a shader program name and uniform location, return a pointer
+ * to the shader program and return the program parameter position.
+ */
+static void
+lookup_uniform_parameter(GLcontext *ctx, GLuint program, GLint location,
+                         struct gl_program **progOut, GLint *paramPosOut)
+{
+   struct gl_shader_program *shProg
+      = _mesa_lookup_shader_program_err(ctx, program, "glGetUniform[if]v");
+   struct gl_program *prog = NULL;
+   GLint progPos = -1;
+
+   /* if shProg is NULL, we'll have already recorded an error */
+
+   if (shProg) {
+      if (!shProg->Uniforms ||
+          location < 0 ||
+          location >= (GLint) shProg->Uniforms->NumUniforms) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,  "glGetUniformfv(location)");
+      }
+      else {
+         /* OK, find the gl_program and program parameter location */
+         progPos = shProg->Uniforms->Uniforms[location].VertPos;
+         if (progPos >= 0) {
+            prog = &shProg->VertexProgram->Base;
+         }
+         else {
+            progPos = shProg->Uniforms->Uniforms[location].FragPos;
+            if (progPos >= 0) {
+               prog = &shProg->FragmentProgram->Base;
+            } else {
+               progPos = shProg->Uniforms->Uniforms[location].GeomPos;
+               if (progPos >= 0) {
+                  prog = &shProg->GeometryProgram->Base;
+               }
+            }
+         }
+      }
+   }
+
+   *progOut = prog;
+   *paramPosOut = progPos;
+}
+
+
+/**
+ * GLGL uniform arrays and structs require special handling.
+ *
+ * The GL_ARB_shader_objects spec says that if you use
+ * glGetUniformLocation to get the location of an array, you CANNOT
+ * access other elements of the array by adding an offset to the
+ * returned location.  For example, you must call
+ * glGetUniformLocation("foo[16]") if you want to set the 16th element
+ * of the array with glUniform().
+ *
+ * HOWEVER, some other OpenGL drivers allow accessing array elements
+ * by adding an offset to the returned array location.  And some apps
+ * seem to depend on that behaviour.
+ *
+ * Mesa's gl_uniform_list doesn't directly support this since each
+ * entry in the list describes one uniform variable, not one uniform
+ * element.  We could insert dummy entries in the list for each array
+ * element after [0] but that causes complications elsewhere.
+ *
+ * We solve this problem by encoding two values in the location that's
+ * returned by glGetUniformLocation():
+ *  a) index into gl_uniform_list::Uniforms[] for the uniform
+ *  b) an array/field offset (0 for simple types)
+ *
+ * These two values are encoded in the high and low halves of a GLint.
+ * By putting the uniform number in the high part and the offset in the
+ * low part, we can support the unofficial ability to index into arrays
+ * by adding offsets to the location value.
+ */
+static void
+merge_location_offset(GLint *location, GLint offset)
+{
+   *location = (*location << 16) | offset;
+}
+
+
+/**
+ * Separate the uniform location and parameter offset.  See above.
+ */
+static void
+split_location_offset(GLint *location, GLint *offset)
+{
+   *offset = *location & 0xffff;
+   *location = *location >> 16;
+}
+
+
+
+/**
+ * Called via glGetUniformfv().
+ */
+static void
+_mesa_get_uniformfv(GLcontext *ctx, GLuint program, GLint location,
+                    GLfloat *params)
+{
+   struct gl_program *prog;
+   GLint paramPos;
+   GLint offset;
+
+   split_location_offset(&location, &offset);
+
+   lookup_uniform_parameter(ctx, program, location, &prog, &paramPos);
+
+   if (prog) {
+      const struct gl_program_parameter *p =
+         &prog->Parameters->Parameters[paramPos];
+      GLint rows, cols, i, j, k;
+
+      get_uniform_rows_cols(p, &rows, &cols);
+
+      k = 0;
+      for (i = 0; i < rows; i++) {
+         for (j = 0; j < cols; j++ ) {
+            params[k++] = prog->Parameters->ParameterValues[paramPos+i][j];
+         }
+      }
+   }
+}
+
+
+/**
+ * Called via glGetUniformiv().
+ * \sa _mesa_get_uniformfv, only difference is a cast.
+ */
+static void
+_mesa_get_uniformiv(GLcontext *ctx, GLuint program, GLint location,
+                    GLint *params)
+{
+   struct gl_program *prog;
+   GLint paramPos;
+   GLint offset;
+
+   split_location_offset(&location, &offset);
+
+   lookup_uniform_parameter(ctx, program, location, &prog, &paramPos);
+
+   if (prog) {
+      const struct gl_program_parameter *p =
+         &prog->Parameters->Parameters[paramPos];
+      GLint rows, cols, i, j, k;
+
+      get_uniform_rows_cols(p, &rows, &cols);
+
+      k = 0;
+      for (i = 0; i < rows; i++) {
+         for (j = 0; j < cols; j++ ) {
+            params[k++] = (GLint) prog->Parameters->ParameterValues[paramPos+i][j];
+         }
+      }
+   }
+}
+
+
+/**
+ * Called via glGetUniformLocation().
+ *
+ * The return value will encode two values, the uniform location and an
+ * offset (used for arrays, structs).
+ */
+GLint
+_mesa_get_uniform_location(GLcontext *ctx, struct gl_shader_program *shProg,
+			   const GLchar *name)
+{
+   GLint offset = 0, location = -1;
+
+   if (shProg->LinkStatus == GL_FALSE) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetUniformfv(program)");
+      return -1;
+   }
+
+   /* XXX we should return -1 if the uniform was declared, but not
+    * actually used.
+    */
+
+   /* XXX we need to be able to parse uniform names for structs and arrays
+    * such as:
+    *   mymatrix[1]
+    *   mystruct.field1
+    */
+
+   {
+      /* handle 1-dimension arrays here... */
+      char *c = strchr(name, '[');
+      if (c) {
+         /* truncate name at [ */
+         const GLint len = c - name;
+         GLchar *newName = malloc(len + 1);
+         if (!newName)
+            return -1; /* out of mem */
+         memcpy(newName, name, len);
+         newName[len] = 0;
+
+         location = _mesa_lookup_uniform(shProg->Uniforms, newName);
+         if (location >= 0) {
+            const GLint element = atoi(c + 1);
+            if (element > 0) {
+               /* get type of the uniform array element */
+               struct gl_program_parameter *p;
+               p = get_uniform_parameter(shProg, location);
+               if (p) {
+                  GLint rows, cols;
+                  get_matrix_dims(p->DataType, &rows, &cols);
+                  if (rows < 1)
+                     rows = 1;
+                  offset = element * rows;
+               }
+            }
+         }
+
+         free(newName);
+      }
+   }
+
+   if (location < 0) {
+      location = _mesa_lookup_uniform(shProg->Uniforms, name);
+   }
+
+   if (location >= 0) {
+      merge_location_offset(&location, offset);
+   }
+
+   return location;
+}
+
+
+
+/**
+ * Update the vertex/fragment program's TexturesUsed array.
+ *
+ * This needs to be called after glUniform(set sampler var) is called.
+ * A call to glUniform(samplerVar, value) causes a sampler to point to a
+ * particular texture unit.  We know the sampler's texture target
+ * (1D/2D/3D/etc) from compile time but the sampler's texture unit is
+ * set by glUniform() calls.
+ *
+ * So, scan the program->SamplerUnits[] and program->SamplerTargets[]
+ * information to update the prog->TexturesUsed[] values.
+ * Each value of TexturesUsed[unit] is one of zero, TEXTURE_1D_INDEX,
+ * TEXTURE_2D_INDEX, TEXTURE_3D_INDEX, etc.
+ * We'll use that info for state validation before rendering.
+ */
+void
+_mesa_update_shader_textures_used(struct gl_program *prog)
+{
+   GLuint s;
+
+   memset(prog->TexturesUsed, 0, sizeof(prog->TexturesUsed));
+
+   for (s = 0; s < MAX_SAMPLERS; s++) {
+      if (prog->SamplersUsed & (1 << s)) {
+         GLuint unit = prog->SamplerUnits[s];
+         GLuint tgt = prog->SamplerTargets[s];
+         assert(unit < MAX_TEXTURE_IMAGE_UNITS);
+         assert(tgt < NUM_TEXTURE_TARGETS);
+         prog->TexturesUsed[unit] |= (1 << tgt);
+      }
+   }
+}
+
+
+/**
+ * Check if the type given by userType is allowed to set a uniform of the
+ * target type.  Generally, equivalence is required, but setting Boolean
+ * uniforms can be done with glUniformiv or glUniformfv.
+ */
+static GLboolean
+compatible_types(GLenum userType, GLenum targetType)
+{
+   if (userType == targetType)
+      return GL_TRUE;
+
+   if (targetType == GL_BOOL && (userType == GL_FLOAT ||
+                                 userType == GL_UNSIGNED_INT ||
+                                 userType == GL_INT))
+      return GL_TRUE;
+
+   if (targetType == GL_BOOL_VEC2 && (userType == GL_FLOAT_VEC2 ||
+                                      userType == GL_UNSIGNED_INT_VEC2 ||
+                                      userType == GL_INT_VEC2))
+      return GL_TRUE;
+
+   if (targetType == GL_BOOL_VEC3 && (userType == GL_FLOAT_VEC3 ||
+                                      userType == GL_UNSIGNED_INT_VEC3 ||
+                                      userType == GL_INT_VEC3))
+      return GL_TRUE;
+
+   if (targetType == GL_BOOL_VEC4 && (userType == GL_FLOAT_VEC4 ||
+                                      userType == GL_UNSIGNED_INT_VEC4 ||
+                                      userType == GL_INT_VEC4))
+      return GL_TRUE;
+
+   if (is_sampler_type(targetType) && userType == GL_INT)
+      return GL_TRUE;
+
+   return GL_FALSE;
+}
+
+
+/**
+ * Set the value of a program's uniform variable.
+ * \param program  the program whose uniform to update
+ * \param index  the index of the program parameter for the uniform
+ * \param offset  additional parameter slot offset (for arrays)
+ * \param type  the incoming datatype of 'values'
+ * \param count  the number of uniforms to set
+ * \param elems  number of elements per uniform (1, 2, 3 or 4)
+ * \param values  the new values, of datatype 'type'
+ */
+static void
+set_program_uniform(GLcontext *ctx, struct gl_program *program,
+                    GLint index, GLint offset,
+                    GLenum type, GLsizei count, GLint elems,
+                    const void *values)
+{
+   const struct gl_program_parameter *param =
+      &program->Parameters->Parameters[index];
+
+   assert(offset >= 0);
+   assert(elems >= 1);
+   assert(elems <= 4);
+
+   if (!compatible_types(type, param->DataType)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glUniform(type mismatch)");
+      return;
+   }
+
+   if (index + offset > (GLint) program->Parameters->Size) {
+      /* out of bounds! */
+      return;
+   }
+
+   if (param->Type == PROGRAM_SAMPLER) {
+      /* This controls which texture unit which is used by a sampler */
+      GLboolean changed = GL_FALSE;
+      GLint i;
+
+      /* this should have been caught by the compatible_types() check */
+      ASSERT(type == GL_INT);
+
+      /* loop over number of samplers to change */
+      for (i = 0; i < count; i++) {
+         GLuint sampler =
+            (GLuint) program->Parameters->ParameterValues[index + offset + i][0];
+         GLuint texUnit = ((GLuint *) values)[i];
+
+         /* check that the sampler (tex unit index) is legal */
+         if (texUnit >= ctx->Const.MaxTextureImageUnits) {
+            _mesa_error(ctx, GL_INVALID_VALUE,
+                        "glUniform1(invalid sampler/tex unit index for '%s')",
+                        param->Name);
+            return;
+         }
+
+         /* This maps a sampler to a texture unit: */
+         if (sampler < MAX_SAMPLERS) {
+#if 0
+            printf("Set program %p sampler %d '%s' to unit %u\n",
+		   program, sampler, param->Name, texUnit);
+#endif
+            if (program->SamplerUnits[sampler] != texUnit) {
+               program->SamplerUnits[sampler] = texUnit;
+               changed = GL_TRUE;
+            }
+         }
+      }
+
+      if (changed) {
+         /* When a sampler's value changes it usually requires rewriting
+          * a GPU program's TEX instructions since there may not be a
+          * sampler->texture lookup table.  We signal this with the
+          * ProgramStringNotify() callback.
+          */
+         FLUSH_VERTICES(ctx, _NEW_TEXTURE | _NEW_PROGRAM);
+         _mesa_update_shader_textures_used(program);
+         /* Do we need to care about the return value here?
+          * This should not be the first time the driver was notified of
+          * this program.
+          */
+         (void) ctx->Driver.ProgramStringNotify(ctx, program->Target, program);
+      }
+   }
+   else {
+      /* ordinary uniform variable */
+      const GLboolean isUniformBool = is_boolean_type(param->DataType);
+      const GLenum basicType = base_uniform_type(type);
+      const GLint slots = (param->Size + 3) / 4;
+      const GLint typeSize = _mesa_sizeof_glsl_type(param->DataType);
+      GLsizei k, i;
+
+      if ((GLint) param->Size > typeSize) {
+         /* an array */
+         /* we'll ignore extra data below */
+      }
+      else {
+         /* non-array: count must be at most one; count == 0 is handled by the loop below */
+         if (count > 1) {
+            _mesa_error(ctx, GL_INVALID_OPERATION,
+                        "glUniform(uniform '%s' is not an array)",
+                        param->Name);
+            return;
+         }
+      }
+
+      /* loop over number of array elements */
+      for (k = 0; k < count; k++) {
+         GLfloat *uniformVal;
+
+         if (offset + k >= slots) {
+            /* Extra array data is ignored */
+            break;
+         }
+
+         /* uniformVal (the destination) is always float[4] */
+         uniformVal = program->Parameters->ParameterValues[index + offset + k];
+
+         if (basicType == GL_INT) {
+            /* convert user's ints to floats */
+            const GLint *iValues = ((const GLint *) values) + k * elems;
+            for (i = 0; i < elems; i++) {
+               uniformVal[i] = (GLfloat) iValues[i];
+            }
+         }
+         else if (basicType == GL_UNSIGNED_INT) {
+            /* convert user's uints to floats */
+            const GLuint *iValues = ((const GLuint *) values) + k * elems;
+            for (i = 0; i < elems; i++) {
+               uniformVal[i] = (GLfloat) iValues[i];
+            }
+         }
+         else {
+            const GLfloat *fValues = ((const GLfloat *) values) + k * elems;
+            assert(basicType == GL_FLOAT);
+            for (i = 0; i < elems; i++) {
+               uniformVal[i] = fValues[i];
+            }
+         }
+
+         /* if the uniform is bool-valued, convert to 1.0 or 0.0 */
+         if (isUniformBool) {
+            for (i = 0; i < elems; i++) {
+               uniformVal[i] = uniformVal[i] ? 1.0f : 0.0f;
+            }
+         }
+      }
+   }
+}
+
+
+/**
+ * Called via glUniform*() functions.
+ */
+void
+_mesa_uniform(GLcontext *ctx, struct gl_shader_program *shProg,
+	      GLint location, GLsizei count,
+              const GLvoid *values, GLenum type)
+{
+   struct gl_uniform *uniform;
+   GLint elems, offset;
+
+   if (!shProg || !shProg->LinkStatus) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glUniform(program not linked)");
+      return;
+   }
+
+   if (location == -1)
+      return;   /* The standard specifies this as a no-op */
+
+   if (location < -1) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glUniform(location=%d)",
+                  location);
+      return;
+   }
+
+   split_location_offset(&location, &offset);
+
+   if (location < 0 || location >= (GLint) shProg->Uniforms->NumUniforms) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glUniform(location=%d)", location);
+      return;
+   }
+
+   if (count < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glUniform(count < 0)");
+      return;
+   }
+
+   elems = _mesa_sizeof_glsl_type(type);
+
+   FLUSH_VERTICES(ctx, _NEW_PROGRAM_CONSTANTS);
+
+   uniform = &shProg->Uniforms->Uniforms[location];
+
+   if (ctx->Shader.Flags & GLSL_UNIFORMS) {
+      const GLenum basicType = base_uniform_type(type);
+      GLint i;
+      printf("Mesa: set program %u uniform %s (loc %d) to: ",
+	     shProg->Name, uniform->Name, location);
+      if (basicType == GL_INT) {
+         const GLint *v = (const GLint *) values;
+         for (i = 0; i < count * elems; i++) {
+            printf("%d ", v[i]);
+         }
+      }
+      else if (basicType == GL_UNSIGNED_INT) {
+         const GLuint *v = (const GLuint *) values;
+         for (i = 0; i < count * elems; i++) {
+            printf("%u ", v[i]);
+         }
+      }
+      else {
+         const GLfloat *v = (const GLfloat *) values;
+         assert(basicType == GL_FLOAT);
+         for (i = 0; i < count * elems; i++) {
+            printf("%g ", v[i]);
+         }
+      }
+      printf("\n");
+   }
+
+   /* A uniform var may be used by both a vertex shader and a fragment
+    * shader.  We may need to update one or both shader's uniform here:
+    */
+   if (shProg->VertexProgram) {
+      /* convert uniform location to program parameter index */
+      GLint index = uniform->VertPos;
+      if (index >= 0) {
+         set_program_uniform(ctx, &shProg->VertexProgram->Base,
+                             index, offset, type, count, elems, values);
+      }
+   }
+
+   if (shProg->FragmentProgram) {
+      /* convert uniform location to program parameter index */
+      GLint index = uniform->FragPos;
+      if (index >= 0) {
+         set_program_uniform(ctx, &shProg->FragmentProgram->Base,
+                             index, offset, type, count, elems, values);
+      }
+   }
+
+   if (shProg->GeometryProgram) {
+      /* convert uniform location to program parameter index */
+      GLint index = uniform->GeomPos;
+      if (index >= 0) {
+         set_program_uniform(ctx, &shProg->GeometryProgram->Base,
+                             index, offset, type, count, elems, values);
+      }
+   }
+
+   uniform->Initialized = GL_TRUE;
+}
+
+
+/**
+ * Set a matrix-valued program parameter.
+ */
+static void
+set_program_uniform_matrix(GLcontext *ctx, struct gl_program *program,
+                           GLuint index, GLuint offset,
+                           GLuint count, GLuint rows, GLuint cols,
+                           GLboolean transpose, const GLfloat *values)
+{
+   GLuint mat, row, col;
+   GLuint src = 0;
+   const struct gl_program_parameter * param = &program->Parameters->Parameters[index];
+   const GLuint slots = (param->Size + 3) / 4;
+   const GLint typeSize = _mesa_sizeof_glsl_type(param->DataType);
+   GLint nr, nc;
+
+   /* check that the number of rows, columns is correct */
+   get_matrix_dims(param->DataType, &nr, &nc);
+   if (rows != nr || cols != nc) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glUniformMatrix(matrix size mismatch)");
+      return;
+   }
+
+   if ((GLint) param->Size <= typeSize) {
+      /* non-array: count must be at most one; count == 0 is handled by the loop below */
+      if (count > 1) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glUniformMatrix(uniform is not an array)");
+         return;
+      }
+   }
+
+   /*
+    * Note: the _columns_ of a matrix are stored in program registers, not
+    * the rows.  So, the loops below look a little funny.
+    * XXX could optimize this a bit...
+    */
+
+   /* loop over matrices */
+   for (mat = 0; mat < count; mat++) {
+
+      /* each matrix: */
+      for (col = 0; col < cols; col++) {
+         GLfloat *v;
+         if (offset >= slots) {
+            /* Ignore writes beyond the end of (the used part of) an array */
+            return;
+         }
+         v = program->Parameters->ParameterValues[index + offset];
+         for (row = 0; row < rows; row++) {
+            if (transpose) {
+               v[row] = values[src + row * cols + col];
+            }
+            else {
+               v[row] = values[src + col * rows + row];
+            }
+         }
+
+         offset++;
+      }
+
+      src += rows * cols;  /* next matrix */
+   }
+}
+
+
+/**
+ * Called by glUniformMatrix*() functions.
+ * Note: cols=2, rows=4  ==>  array[2] of vec4
+ */
+void
+_mesa_uniform_matrix(GLcontext *ctx, struct gl_shader_program *shProg,
+		     GLint cols, GLint rows,
+                     GLint location, GLsizei count,
+                     GLboolean transpose, const GLfloat *values)
+{
+   struct gl_uniform *uniform;
+   GLint offset;
+
+   if (!shProg || !shProg->LinkStatus) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+         "glUniformMatrix(program not linked)");
+      return;
+   }
+
+   if (location == -1)
+      return;   /* The standard specifies this as a no-op */
+
+   if (location < -1) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glUniformMatrix(location)");
+      return;
+   }
+
+   split_location_offset(&location, &offset);
+
+   if (location < 0 || location >= (GLint) shProg->Uniforms->NumUniforms) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glUniformMatrix(location)");
+      return;
+   }
+   if (values == NULL) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glUniformMatrix");
+      return;
+   }
+
+   FLUSH_VERTICES(ctx, _NEW_PROGRAM_CONSTANTS);
+
+   uniform = &shProg->Uniforms->Uniforms[location];
+
+   if (shProg->VertexProgram) {
+      /* convert uniform location to program parameter index */
+      GLint index = uniform->VertPos;
+      if (index >= 0) {
+         set_program_uniform_matrix(ctx, &shProg->VertexProgram->Base,
+                                    index, offset,
+                                    count, rows, cols, transpose, values);
+      }
+   }
+
+   if (shProg->FragmentProgram) {
+      /* convert uniform location to program parameter index */
+      GLint index = uniform->FragPos;
+      if (index >= 0) {
+         set_program_uniform_matrix(ctx, &shProg->FragmentProgram->Base,
+                                    index, offset,
+                                    count, rows, cols, transpose, values);
+      }
+   }
+
+   if (shProg->GeometryProgram) {
+      /* convert uniform location to program parameter index */
+      GLint index = uniform->GeomPos;
+      if (index >= 0) {
+         set_program_uniform_matrix(ctx, &shProg->GeometryProgram->Base,
+                                    index, offset,
+                                    count, rows, cols, transpose, values);
+      }
+   }
+
+   uniform->Initialized = GL_TRUE;
+}
+
+
+void GLAPIENTRY
+_mesa_Uniform1fARB(GLint location, GLfloat v0)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_uniform(ctx, ctx->Shader.CurrentProgram, location, 1, &v0, GL_FLOAT);
+}
+
+void GLAPIENTRY
+_mesa_Uniform2fARB(GLint location, GLfloat v0, GLfloat v1)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLfloat v[2];
+   v[0] = v0;
+   v[1] = v1;
+   _mesa_uniform(ctx, ctx->Shader.CurrentProgram, location, 1, v, GL_FLOAT_VEC2);
+}
+
+void GLAPIENTRY
+_mesa_Uniform3fARB(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLfloat v[3];
+   v[0] = v0;
+   v[1] = v1;
+   v[2] = v2;
+   _mesa_uniform(ctx, ctx->Shader.CurrentProgram, location, 1, v, GL_FLOAT_VEC3);
+}
+
+void GLAPIENTRY
+_mesa_Uniform4fARB(GLint location, GLfloat v0, GLfloat v1, GLfloat v2,
+                   GLfloat v3)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLfloat v[4];
+   v[0] = v0;
+   v[1] = v1;
+   v[2] = v2;
+   v[3] = v3;
+   _mesa_uniform(ctx, ctx->Shader.CurrentProgram, location, 1, v, GL_FLOAT_VEC4);
+}
+
+void GLAPIENTRY
+_mesa_Uniform1iARB(GLint location, GLint v0)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_uniform(ctx, ctx->Shader.CurrentProgram, location, 1, &v0, GL_INT);
+}
+
+void GLAPIENTRY
+_mesa_Uniform2iARB(GLint location, GLint v0, GLint v1)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint v[2];
+   v[0] = v0;
+   v[1] = v1;
+   _mesa_uniform(ctx, ctx->Shader.CurrentProgram, location, 1, v, GL_INT_VEC2);
+}
+
+void GLAPIENTRY
+_mesa_Uniform3iARB(GLint location, GLint v0, GLint v1, GLint v2)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint v[3];
+   v[0] = v0;
+   v[1] = v1;
+   v[2] = v2;
+   _mesa_uniform(ctx, ctx->Shader.CurrentProgram, location, 1, v, GL_INT_VEC3);
+}
+
+void GLAPIENTRY
+_mesa_Uniform4iARB(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint v[4];
+   v[0] = v0;
+   v[1] = v1;
+   v[2] = v2;
+   v[3] = v3;
+   _mesa_uniform(ctx, ctx->Shader.CurrentProgram, location, 1, v, GL_INT_VEC4);
+}
+
+void GLAPIENTRY
+_mesa_Uniform1fvARB(GLint location, GLsizei count, const GLfloat * value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_uniform(ctx, ctx->Shader.CurrentProgram, location, count, value, GL_FLOAT);
+}
+
+void GLAPIENTRY
+_mesa_Uniform2fvARB(GLint location, GLsizei count, const GLfloat * value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_uniform(ctx, ctx->Shader.CurrentProgram, location, count, value, GL_FLOAT_VEC2);
+}
+
+void GLAPIENTRY
+_mesa_Uniform3fvARB(GLint location, GLsizei count, const GLfloat * value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_uniform(ctx, ctx->Shader.CurrentProgram, location, count, value, GL_FLOAT_VEC3);
+}
+
+void GLAPIENTRY
+_mesa_Uniform4fvARB(GLint location, GLsizei count, const GLfloat * value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_uniform(ctx, ctx->Shader.CurrentProgram, location, count, value, GL_FLOAT_VEC4);
+}
+
+void GLAPIENTRY
+_mesa_Uniform1ivARB(GLint location, GLsizei count, const GLint * value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_uniform(ctx, ctx->Shader.CurrentProgram, location, count, value, GL_INT);
+}
+
+void GLAPIENTRY
+_mesa_Uniform2ivARB(GLint location, GLsizei count, const GLint * value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_uniform(ctx, ctx->Shader.CurrentProgram, location, count, value, GL_INT_VEC2);
+}
+
+void GLAPIENTRY
+_mesa_Uniform3ivARB(GLint location, GLsizei count, const GLint * value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_uniform(ctx, ctx->Shader.CurrentProgram, location, count, value, GL_INT_VEC3);
+}
+
+void GLAPIENTRY
+_mesa_Uniform4ivARB(GLint location, GLsizei count, const GLint * value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_uniform(ctx, ctx->Shader.CurrentProgram, location, count, value, GL_INT_VEC4);
+}
+
+
+/** OpenGL 3.0 GLuint-valued functions **/
+void GLAPIENTRY
+_mesa_Uniform1ui(GLint location, GLuint v0)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_uniform(ctx, ctx->Shader.CurrentProgram, location, 1, &v0, GL_UNSIGNED_INT);
+}
+
+void GLAPIENTRY
+_mesa_Uniform2ui(GLint location, GLuint v0, GLuint v1)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint v[2];
+   v[0] = v0;
+   v[1] = v1;
+   _mesa_uniform(ctx, ctx->Shader.CurrentProgram, location, 1, v, GL_UNSIGNED_INT_VEC2);
+}
+
+void GLAPIENTRY
+_mesa_Uniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint v[3];
+   v[0] = v0;
+   v[1] = v1;
+   v[2] = v2;
+   _mesa_uniform(ctx, ctx->Shader.CurrentProgram, location, 1, v, GL_UNSIGNED_INT_VEC3);
+}
+
+void GLAPIENTRY
+_mesa_Uniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint v[4];
+   v[0] = v0;
+   v[1] = v1;
+   v[2] = v2;
+   v[3] = v3;
+   _mesa_uniform(ctx, ctx->Shader.CurrentProgram, location, 1, v, GL_UNSIGNED_INT_VEC4);
+}
+
+void GLAPIENTRY
+_mesa_Uniform1uiv(GLint location, GLsizei count, const GLuint *value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_uniform(ctx, ctx->Shader.CurrentProgram, location, count, value, GL_UNSIGNED_INT);
+}
+
+void GLAPIENTRY
+_mesa_Uniform2uiv(GLint location, GLsizei count, const GLuint *value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_uniform(ctx, ctx->Shader.CurrentProgram, location, count, value, GL_UNSIGNED_INT_VEC2);
+}
+
+void GLAPIENTRY
+_mesa_Uniform3uiv(GLint location, GLsizei count, const GLuint *value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_uniform(ctx, ctx->Shader.CurrentProgram, location, count, value, GL_UNSIGNED_INT_VEC3);
+}
+
+void GLAPIENTRY
+_mesa_Uniform4uiv(GLint location, GLsizei count, const GLuint *value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_uniform(ctx, ctx->Shader.CurrentProgram, location, count, value, GL_UNSIGNED_INT_VEC4);
+}
+
+
+
+void GLAPIENTRY
+_mesa_UniformMatrix2fvARB(GLint location, GLsizei count, GLboolean transpose,
+                          const GLfloat * value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_uniform_matrix(ctx, ctx->Shader.CurrentProgram,
+			2, 2, location, count, transpose, value);
+}
+
+void GLAPIENTRY
+_mesa_UniformMatrix3fvARB(GLint location, GLsizei count, GLboolean transpose,
+                          const GLfloat * value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_uniform_matrix(ctx, ctx->Shader.CurrentProgram,
+			3, 3, location, count, transpose, value);
+}
+
+void GLAPIENTRY
+_mesa_UniformMatrix4fvARB(GLint location, GLsizei count, GLboolean transpose,
+                          const GLfloat * value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_uniform_matrix(ctx, ctx->Shader.CurrentProgram,
+			4, 4, location, count, transpose, value);
+}
+
+
+/**
+ * Non-square UniformMatrix are OpenGL 2.1
+ */
+void GLAPIENTRY
+_mesa_UniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose,
+                         const GLfloat *value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_uniform_matrix(ctx, ctx->Shader.CurrentProgram,
+			2, 3, location, count, transpose, value);
+}
+
+void GLAPIENTRY
+_mesa_UniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose,
+                         const GLfloat *value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_uniform_matrix(ctx, ctx->Shader.CurrentProgram,
+			3, 2, location, count, transpose, value);
+}
+
+void GLAPIENTRY
+_mesa_UniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose,
+                         const GLfloat *value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_uniform_matrix(ctx, ctx->Shader.CurrentProgram,
+			2, 4, location, count, transpose, value);
+}
+
+void GLAPIENTRY
+_mesa_UniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose,
+                         const GLfloat *value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_uniform_matrix(ctx, ctx->Shader.CurrentProgram,
+			4, 2, location, count, transpose, value);
+}
+
+void GLAPIENTRY
+_mesa_UniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose,
+                         const GLfloat *value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_uniform_matrix(ctx, ctx->Shader.CurrentProgram,
+			3, 4, location, count, transpose, value);
+}
+
+void GLAPIENTRY
+_mesa_UniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose,
+                         const GLfloat *value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_uniform_matrix(ctx, ctx->Shader.CurrentProgram,
+			4, 3, location, count, transpose, value);
+}
+
+
+void GLAPIENTRY
+_mesa_GetUniformfvARB(GLhandleARB program, GLint location, GLfloat *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_get_uniformfv(ctx, program, location, params);
+}
+
+
+void GLAPIENTRY
+_mesa_GetUniformivARB(GLhandleARB program, GLint location, GLint *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_get_uniformiv(ctx, program, location, params);
+}
+
+
+GLint GLAPIENTRY
+_mesa_GetUniformLocationARB(GLhandleARB programObj, const GLcharARB *name)
+{
+   struct gl_shader_program *shProg;
+
+   GET_CURRENT_CONTEXT(ctx);
+
+   shProg = _mesa_lookup_shader_program_err(ctx, programObj,
+					    "glGetUniformLocation");
+   if (!shProg)
+      return -1;
+
+   return _mesa_get_uniform_location(ctx, shProg, name);
+}
+
+
+void GLAPIENTRY
+_mesa_GetActiveUniformARB(GLhandleARB program, GLuint index,
+                          GLsizei maxLength, GLsizei * length, GLint * size,
+                          GLenum * type, GLcharARB * name)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_get_active_uniform(ctx, program, index, maxLength, length, size,
+                            type, name);
+}
+
+
+/**
+ * Plug in shader uniform-related functions into API dispatch table.
+ */
+void
+_mesa_init_shader_uniform_dispatch(struct _glapi_table *exec)
+{
+#if FEATURE_GL
+   SET_Uniform1fARB(exec, _mesa_Uniform1fARB);
+   SET_Uniform2fARB(exec, _mesa_Uniform2fARB);
+   SET_Uniform3fARB(exec, _mesa_Uniform3fARB);
+   SET_Uniform4fARB(exec, _mesa_Uniform4fARB);
+   SET_Uniform1iARB(exec, _mesa_Uniform1iARB);
+   SET_Uniform2iARB(exec, _mesa_Uniform2iARB);
+   SET_Uniform3iARB(exec, _mesa_Uniform3iARB);
+   SET_Uniform4iARB(exec, _mesa_Uniform4iARB);
+   SET_Uniform1fvARB(exec, _mesa_Uniform1fvARB);
+   SET_Uniform2fvARB(exec, _mesa_Uniform2fvARB);
+   SET_Uniform3fvARB(exec, _mesa_Uniform3fvARB);
+   SET_Uniform4fvARB(exec, _mesa_Uniform4fvARB);
+   SET_Uniform1ivARB(exec, _mesa_Uniform1ivARB);
+   SET_Uniform2ivARB(exec, _mesa_Uniform2ivARB);
+   SET_Uniform3ivARB(exec, _mesa_Uniform3ivARB);
+   SET_Uniform4ivARB(exec, _mesa_Uniform4ivARB);
+   SET_UniformMatrix2fvARB(exec, _mesa_UniformMatrix2fvARB);
+   SET_UniformMatrix3fvARB(exec, _mesa_UniformMatrix3fvARB);
+   SET_UniformMatrix4fvARB(exec, _mesa_UniformMatrix4fvARB);
+
+   SET_GetActiveUniformARB(exec, _mesa_GetActiveUniformARB);
+   SET_GetUniformLocationARB(exec, _mesa_GetUniformLocationARB);
+   SET_GetUniformfvARB(exec, _mesa_GetUniformfvARB);
+   SET_GetUniformivARB(exec, _mesa_GetUniformivARB);
+
+   /* OpenGL 2.1 */
+   SET_UniformMatrix2x3fv(exec, _mesa_UniformMatrix2x3fv);
+   SET_UniformMatrix3x2fv(exec, _mesa_UniformMatrix3x2fv);
+   SET_UniformMatrix2x4fv(exec, _mesa_UniformMatrix2x4fv);
+   SET_UniformMatrix4x2fv(exec, _mesa_UniformMatrix4x2fv);
+   SET_UniformMatrix3x4fv(exec, _mesa_UniformMatrix3x4fv);
+   SET_UniformMatrix4x3fv(exec, _mesa_UniformMatrix4x3fv);
+
+   /* OpenGL 3.0 */
+   /* XXX finish dispatch */
+   (void) _mesa_Uniform1ui;
+   (void) _mesa_Uniform2ui;
+   (void) _mesa_Uniform3ui;
+   (void) _mesa_Uniform4ui;
+   (void) _mesa_Uniform1uiv;
+   (void) _mesa_Uniform2uiv;
+   (void) _mesa_Uniform3uiv;
+   (void) _mesa_Uniform4uiv;
+#endif /* FEATURE_GL */
+}
diff --git a/mesalib/src/mesa/main/uniforms.h b/mesalib/src/mesa/main/uniforms.h
new file mode 100644
index 000000000..f823c6144
--- /dev/null
+++ b/mesalib/src/mesa/main/uniforms.h
@@ -0,0 +1,175 @@
+/*
+ * Mesa 3-D graphics library
+ *
+ * Copyright (C) 2010  VMware, Inc.  All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef UNIFORMS_H
+#define UNIFORMS_H
+
+#include "glheader.h"
+
+struct gl_program;
+struct _glapi_table;
+
+extern void GLAPIENTRY
+_mesa_Uniform1fARB(GLint, GLfloat);
+
+extern void GLAPIENTRY
+_mesa_Uniform2fARB(GLint, GLfloat, GLfloat);
+
+extern void GLAPIENTRY
+_mesa_Uniform3fARB(GLint, GLfloat, GLfloat, GLfloat);
+
+extern void GLAPIENTRY
+_mesa_Uniform4fARB(GLint, GLfloat, GLfloat, GLfloat, GLfloat);
+
+extern void GLAPIENTRY
+_mesa_Uniform1iARB(GLint, GLint);
+
+extern void GLAPIENTRY
+_mesa_Uniform2iARB(GLint, GLint, GLint);
+
+extern void GLAPIENTRY
+_mesa_Uniform3iARB(GLint, GLint, GLint, GLint);
+
+extern void GLAPIENTRY
+_mesa_Uniform4iARB(GLint, GLint, GLint, GLint, GLint);
+
+extern void GLAPIENTRY
+_mesa_Uniform1fvARB(GLint, GLsizei, const GLfloat *);
+
+extern void GLAPIENTRY
+_mesa_Uniform2fvARB(GLint, GLsizei, const GLfloat *);
+
+extern void GLAPIENTRY
+_mesa_Uniform3fvARB(GLint, GLsizei, const GLfloat *);
+
+extern void GLAPIENTRY
+_mesa_Uniform4fvARB(GLint, GLsizei, const GLfloat *);
+
+extern void GLAPIENTRY
+_mesa_Uniform1ivARB(GLint, GLsizei, const GLint *);
+
+extern void GLAPIENTRY
+_mesa_Uniform2ivARB(GLint, GLsizei, const GLint *);
+
+extern void GLAPIENTRY
+_mesa_Uniform3ivARB(GLint, GLsizei, const GLint *);
+
+extern void GLAPIENTRY
+_mesa_Uniform4ivARB(GLint, GLsizei, const GLint *);
+
+extern void GLAPIENTRY
+_mesa_Uniform1ui(GLint location, GLuint v0);
+
+extern void GLAPIENTRY
+_mesa_Uniform2ui(GLint location, GLuint v0, GLuint v1);
+
+extern void GLAPIENTRY
+_mesa_Uniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2);
+
+extern void GLAPIENTRY
+_mesa_Uniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+
+extern void GLAPIENTRY
+_mesa_Uniform1uiv(GLint location, GLsizei count, const GLuint *value);
+
+extern void GLAPIENTRY
+_mesa_Uniform2uiv(GLint location, GLsizei count, const GLuint *value);
+
+extern void GLAPIENTRY
+_mesa_Uniform3uiv(GLint location, GLsizei count, const GLuint *value);
+
+extern void GLAPIENTRY
+_mesa_Uniform4uiv(GLint location, GLsizei count, const GLuint *value);
+
+
+extern void GLAPIENTRY
+_mesa_UniformMatrix2fvARB(GLint, GLsizei, GLboolean, const GLfloat *);
+
+extern void GLAPIENTRY
+_mesa_UniformMatrix3fvARB(GLint, GLsizei, GLboolean, const GLfloat *);
+
+extern void GLAPIENTRY
+_mesa_UniformMatrix4fvARB(GLint, GLsizei, GLboolean, const GLfloat *);
+
+extern void GLAPIENTRY
+_mesa_UniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose,
+                         const GLfloat *value);
+
+extern void GLAPIENTRY
+_mesa_UniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose,
+                         const GLfloat *value);
+
+extern void GLAPIENTRY
+_mesa_UniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose,
+                         const GLfloat *value);
+
+extern void GLAPIENTRY
+_mesa_UniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose,
+                         const GLfloat *value);
+
+extern void GLAPIENTRY
+_mesa_UniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose,
+                         const GLfloat *value);
+
+extern void GLAPIENTRY
+_mesa_UniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose,
+                         const GLfloat *value);
+
+
+extern void GLAPIENTRY
+_mesa_GetActiveUniformARB(GLhandleARB, GLuint, GLsizei, GLsizei *,
+                          GLint *, GLenum *, GLcharARB *);
+
+extern void GLAPIENTRY
+_mesa_GetUniformfvARB(GLhandleARB, GLint, GLfloat *);
+
+extern void GLAPIENTRY
+_mesa_GetUniformivARB(GLhandleARB, GLint, GLint *);
+
+extern GLint GLAPIENTRY
+_mesa_GetUniformLocationARB(GLhandleARB, const GLcharARB *);
+
+GLint
+_mesa_get_uniform_location(GLcontext *ctx, struct gl_shader_program *shProg,
+			   const GLchar *name);
+
+void
+_mesa_uniform(GLcontext *ctx, struct gl_shader_program *shader_program,
+	      GLint location, GLsizei count,
+              const GLvoid *values, GLenum type);
+
+void
+_mesa_uniform_matrix(GLcontext *ctx, struct gl_shader_program *shProg,
+		     GLint cols, GLint rows,
+                     GLint location, GLsizei count,
+                     GLboolean transpose, const GLfloat *values);
+
+extern void
+_mesa_update_shader_textures_used(struct gl_program *prog);
+
+
+extern void
+_mesa_init_shader_uniform_dispatch(struct _glapi_table *exec);
+
+#endif /* UNIFORMS_H */
diff --git a/mesalib/src/mesa/main/varray.c b/mesalib/src/mesa/main/varray.c
index b4128f84d..d19de7ff6 100644
--- a/mesalib/src/mesa/main/varray.c
+++ b/mesalib/src/mesa/main/varray.c
@@ -31,6 +31,7 @@
 #include "enable.h"
 #include "enums.h"
 #include "hash.h"
+#include "macros.h"
 #include "mtypes.h"
 #include "varray.h"
 #include "arrayobj.h"
@@ -710,6 +711,266 @@ _mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type,
 #endif
 
 
+/**
+ * New in GL3:
+ * Set an integer-valued vertex attribute array.
+ * Note that these arrays DO NOT alias the conventional GL vertex arrays
+ * (position, normal, color, fog, texcoord, etc).
+ */
+void GLAPIENTRY
+_mesa_VertexAttribIPointer(GLuint index, GLint size, GLenum type,
+                           GLboolean normalized,
+                           GLsizei stride, const GLvoid *ptr)
+{
+   /* NOTE: until we have integer-valued vertex attributes, just
+    * route this through the regular glVertexAttribPointer() function.
+    */
+   _mesa_VertexAttribPointerARB(index, size, type, normalized, stride, ptr);
+}
+
+
+
+void GLAPIENTRY
+_mesa_EnableVertexAttribArrayARB(GLuint index)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (index >= ctx->Const.VertexProgram.MaxAttribs) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glEnableVertexAttribArrayARB(index)");
+      return;
+   }
+
+   ASSERT(index < Elements(ctx->Array.ArrayObj->VertexAttrib));
+
+   FLUSH_VERTICES(ctx, _NEW_ARRAY);
+   ctx->Array.ArrayObj->VertexAttrib[index].Enabled = GL_TRUE;
+   ctx->Array.ArrayObj->_Enabled |= _NEW_ARRAY_ATTRIB(index);
+   ctx->Array.NewState |= _NEW_ARRAY_ATTRIB(index);
+}
+
+
+void GLAPIENTRY
+_mesa_DisableVertexAttribArrayARB(GLuint index)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (index >= ctx->Const.VertexProgram.MaxAttribs) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glEnableVertexAttribArrayARB(index)");
+      return;
+   }
+
+   ASSERT(index < Elements(ctx->Array.ArrayObj->VertexAttrib));
+
+   FLUSH_VERTICES(ctx, _NEW_ARRAY);
+   ctx->Array.ArrayObj->VertexAttrib[index].Enabled = GL_FALSE;
+   ctx->Array.ArrayObj->_Enabled &= ~_NEW_ARRAY_ATTRIB(index);
+   ctx->Array.NewState |= _NEW_ARRAY_ATTRIB(index);
+}
+
+
+/**
+ * Return info for a vertex attribute array (no alias with legacy
+ * vertex attributes (pos, normal, color, etc)).  This function does
+ * not handle the 4-element GL_CURRENT_VERTEX_ATTRIB_ARB query.
+ */
+static GLuint
+get_vertex_array_attrib(GLcontext *ctx, GLuint index, GLenum pname,
+                  const char *caller)
+{
+   const struct gl_client_array *array;
+
+   if (index >= MAX_VERTEX_GENERIC_ATTRIBS) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "%s(index=%u)", caller, index);
+      return 0;
+   }
+
+   ASSERT(index < Elements(ctx->Array.ArrayObj->VertexAttrib));
+
+   array = &ctx->Array.ArrayObj->VertexAttrib[index];
+
+   switch (pname) {
+   case GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB:
+      return array->Enabled;
+   case GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB:
+      return array->Size;
+   case GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB:
+      return array->Stride;
+   case GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB:
+      return array->Type;
+   case GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB:
+      return array->Normalized;
+   case GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB:
+      return array->BufferObj->Name;
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM, "%s(pname=0x%x)", caller, pname);
+      return 0;
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_GetVertexAttribfvARB(GLuint index, GLenum pname, GLfloat *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (pname == GL_CURRENT_VERTEX_ATTRIB_ARB) {
+      if (index == 0) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glGetVertexAttribfv(index==0)");
+      }
+      else {
+         const GLfloat *v = ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index];
+         FLUSH_CURRENT(ctx, 0);
+         COPY_4V(params, v);
+      }
+   }
+   else {
+      params[0] = (GLfloat) get_vertex_array_attrib(ctx, index, pname,
+                                                    "glGetVertexAttribfv");
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_GetVertexAttribdvARB(GLuint index, GLenum pname, GLdouble *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (pname == GL_CURRENT_VERTEX_ATTRIB_ARB) {
+      if (index == 0) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glGetVertexAttribdv(index==0)");
+      }
+      else {
+         const GLfloat *v = ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index];
+         FLUSH_CURRENT(ctx, 0);
+         params[0] = (GLdouble) v[0];
+         params[1] = (GLdouble) v[1];
+         params[2] = (GLdouble) v[2];
+         params[3] = (GLdouble) v[3];
+      }
+   }
+   else {
+      params[0] = (GLdouble) get_vertex_array_attrib(ctx, index, pname,
+                                                     "glGetVertexAttribdv");
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_GetVertexAttribivARB(GLuint index, GLenum pname, GLint *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (pname == GL_CURRENT_VERTEX_ATTRIB_ARB) {
+      if (index == 0) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glGetVertexAttribiv(index==0)");
+      }
+      else {
+         const GLfloat *v = ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index];
+         FLUSH_CURRENT(ctx, 0);
+         /* XXX should floats in[0,1] be scaled to full int range? */
+         params[0] = (GLint) v[0];
+         params[1] = (GLint) v[1];
+         params[2] = (GLint) v[2];
+         params[3] = (GLint) v[3];
+      }
+   }
+   else {
+      params[0] = (GLint) get_vertex_array_attrib(ctx, index, pname,
+                                                  "glGetVertexAttribiv");
+   }
+}
+
+
+/** GL 3.0 */
+void GLAPIENTRY
+_mesa_GetVertexAttribIiv(GLuint index, GLenum pname, GLint *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (pname == GL_CURRENT_VERTEX_ATTRIB_ARB) {
+      if (index == 0) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glGetVertexAttribIiv(index==0)");
+      }
+      else {
+         const GLfloat *v = ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index];
+         FLUSH_CURRENT(ctx, 0);
+         /* XXX we don't have true integer-valued vertex attribs yet */
+         params[0] = (GLint) v[0];
+         params[1] = (GLint) v[1];
+         params[2] = (GLint) v[2];
+         params[3] = (GLint) v[3];
+      }
+   }
+   else {
+      params[0] = (GLint) get_vertex_array_attrib(ctx, index, pname,
+                                                  "glGetVertexAttribIiv");
+   }
+}
+
+
+/** GL 3.0 */
+void GLAPIENTRY
+_mesa_GetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (pname == GL_CURRENT_VERTEX_ATTRIB_ARB) {
+      if (index == 0) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glGetVertexAttribIuiv(index==0)");
+      }
+      else {
+         const GLfloat *v = ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index];
+         FLUSH_CURRENT(ctx, 0);
+         /* XXX we don't have true integer-valued vertex attribs yet */
+         params[0] = (GLuint) v[0];
+         params[1] = (GLuint) v[1];
+         params[2] = (GLuint) v[2];
+         params[3] = (GLuint) v[3];
+      }
+   }
+   else {
+      params[0] = get_vertex_array_attrib(ctx, index, pname,
+                                          "glGetVertexAttribIuiv");
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_GetVertexAttribPointervARB(GLuint index, GLenum pname, GLvoid **pointer)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (index >= ctx->Const.VertexProgram.MaxAttribs) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glGetVertexAttribPointerARB(index)");
+      return;
+   }
+
+   if (pname != GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetVertexAttribPointerARB(pname)");
+      return;
+   }
+
+   ASSERT(index < Elements(ctx->Array.ArrayObj->VertexAttrib));
+
+   *pointer = (GLvoid *) ctx->Array.ArrayObj->VertexAttrib[index].Ptr;
+}
+
+
 void GLAPIENTRY
 _mesa_VertexPointerEXT(GLint size, GLenum type, GLsizei stride,
                        GLsizei count, const GLvoid *ptr)
@@ -995,8 +1256,8 @@ _mesa_UnlockArraysEXT( void )
 /* GL_EXT_multi_draw_arrays */
 /* Somebody forgot to spec the first and count parameters as const! <sigh> */
 void GLAPIENTRY
-_mesa_MultiDrawArraysEXT( GLenum mode, GLint *first,
-                          GLsizei *count, GLsizei primcount )
+_mesa_MultiDrawArraysEXT( GLenum mode, const GLint *first,
+                          const GLsizei *count, GLsizei primcount )
 {
    GET_CURRENT_CONTEXT(ctx);
    GLint i;
@@ -1054,6 +1315,27 @@ _mesa_MultiModeDrawElementsIBM( const GLenum * mode, const GLsizei * count,
 
 
 /**
+ * GL 3.1 glPrimitiveRestartIndex().
+ */
+void GLAPIENTRY
+_mesa_PrimitiveRestartIndex(GLuint index)
+{
+   GET_CURRENT_CONTEXT(ctx);
+
+   if (ctx->VersionMajor * 10 + ctx->VersionMinor < 31) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glPrimitiveRestartIndex()");
+      return;
+   }
+
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   FLUSH_VERTICES(ctx, _NEW_TRANSFORM);
+
+   ctx->Array.RestartIndex = index;
+}
+
+
+/**
  * Copy one client vertex array to another.
  */
 void
@@ -1086,10 +1368,10 @@ print_array(const char *name, GLint index, const struct gl_client_array *array)
       printf("  %s[%d]: ", name, index);
    else
       printf("  %s: ", name);
-   printf("Ptr=%p, Type=0x%x, Size=%d, ElemSize=%u, Stride=%d, Buffer=%u(Size %u), MaxElem=%u\n",
+   printf("Ptr=%p, Type=0x%x, Size=%d, ElemSize=%u, Stride=%d, Buffer=%u(Size %lu), MaxElem=%u\n",
 	  array->Ptr, array->Type, array->Size,
 	  array->_ElementSize, array->StrideB,
-	  array->BufferObj->Name, array->BufferObj->Size,
+	  array->BufferObj->Name, (unsigned long) array->BufferObj->Size,
 	  array->_MaxElement);
 }
 
diff --git a/mesalib/src/mesa/main/varray.h b/mesalib/src/mesa/main/varray.h
index ef790c504..c7c3e3ec7 100644
--- a/mesalib/src/mesa/main/varray.h
+++ b/mesalib/src/mesa/main/varray.h
@@ -116,14 +116,51 @@ _mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type,
                              GLboolean normalized, GLsizei stride,
                              const GLvoid *pointer);
 
+void GLAPIENTRY
+_mesa_VertexAttribIPointer(GLuint index, GLint size, GLenum type,
+                           GLboolean normalized,
+                           GLsizei stride, const GLvoid *ptr);
+
+
+extern void GLAPIENTRY
+_mesa_EnableVertexAttribArrayARB(GLuint index);
+
+
+extern void GLAPIENTRY
+_mesa_DisableVertexAttribArrayARB(GLuint index);
+
+
+extern void GLAPIENTRY
+_mesa_GetVertexAttribdvARB(GLuint index, GLenum pname, GLdouble *params);
+
+
+extern void GLAPIENTRY
+_mesa_GetVertexAttribfvARB(GLuint index, GLenum pname, GLfloat *params);
+
+
+extern void GLAPIENTRY
+_mesa_GetVertexAttribivARB(GLuint index, GLenum pname, GLint *params);
+
+
+extern void GLAPIENTRY
+_mesa_GetVertexAttribIiv(GLuint index, GLenum pname, GLint *params);
+
+
+extern void GLAPIENTRY
+_mesa_GetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params);
+
+
+extern void GLAPIENTRY
+_mesa_GetVertexAttribPointervARB(GLuint index, GLenum pname, GLvoid **pointer);
+
 
 extern void GLAPIENTRY
 _mesa_InterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer);
 
 
 extern void GLAPIENTRY
-_mesa_MultiDrawArraysEXT( GLenum mode, GLint *first,
-                          GLsizei *count, GLsizei primcount );
+_mesa_MultiDrawArraysEXT( GLenum mode, const GLint *first,
+                          const GLsizei *count, GLsizei primcount );
 
 extern void GLAPIENTRY
 _mesa_MultiDrawElementsEXT( GLenum mode, const GLsizei *count, GLenum type,
@@ -174,6 +211,9 @@ _mesa_DrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end,
 				  const GLvoid *indices,
 				  GLint basevertex);
 
+extern void GLAPIENTRY
+_mesa_PrimitiveRestartIndex(GLuint index);
+
 
 extern void
 _mesa_copy_client_array(GLcontext *ctx,
diff --git a/mesalib/src/mesa/main/version.c b/mesalib/src/mesa/main/version.c
index a39b68065..5997ca00f 100644
--- a/mesalib/src/mesa/main/version.c
+++ b/mesalib/src/mesa/main/version.c
@@ -32,8 +32,11 @@
  * Return major and minor version numbers.
  */
 static void
-compute_version(const GLcontext *ctx, GLuint *major, GLuint *minor)
+compute_version(GLcontext *ctx)
 {
+   GLuint major, minor;
+   static const int max = 100;
+
    const GLboolean ver_1_3 = (ctx->Extensions.ARB_multisample &&
                               ctx->Extensions.ARB_multitexture &&
                               ctx->Extensions.ARB_texture_border_clamp &&
@@ -81,50 +84,201 @@ compute_version(const GLcontext *ctx, GLuint *major, GLuint *minor)
 			      (ctx->Extensions.EXT_stencil_two_side
 			       || ctx->Extensions.ATI_separate_stencil));
    const GLboolean ver_2_1 = (ver_2_0 &&
-                              ctx->Extensions.ARB_shading_language_120 &&
+                              ctx->Const.GLSLVersion >= 120 &&
                               ctx->Extensions.EXT_pixel_buffer_object &&
                               ctx->Extensions.EXT_texture_sRGB);
-   if (ver_2_1) {
-      *major = 2;
-      *minor = 1;
+   const GLboolean ver_3_0 = (ver_2_1 &&
+                              ctx->Extensions.ARB_half_float_pixel &&
+                              ctx->Extensions.ARB_map_buffer_range &&
+                              ctx->Extensions.ARB_texture_float &&
+                              ctx->Extensions.ARB_texture_rg &&
+                              ctx->Extensions.APPLE_vertex_array_object &&
+                              ctx->Extensions.EXT_draw_buffers2 &&
+                              ctx->Extensions.EXT_framebuffer_blit &&
+                              ctx->Extensions.EXT_framebuffer_multisample &&
+                              ctx->Extensions.EXT_framebuffer_object &&
+                              ctx->Extensions.EXT_framebuffer_sRGB &&
+                              ctx->Extensions.EXT_packed_depth_stencil &&
+                              ctx->Extensions.EXT_packed_float &&
+                              ctx->Extensions.EXT_texture_array &&
+                              ctx->Extensions.EXT_texture_compression_rgtc &&
+                              ctx->Extensions.EXT_texture_integer &&
+                              ctx->Extensions.EXT_texture_shared_exponent &&
+                              ctx->Extensions.EXT_transform_feedback &&
+                              ctx->Extensions.NV_conditional_render);
+   const GLboolean ver_3_1 = (ver_3_0 &&
+                              ctx->Extensions.ARB_copy_buffer &&
+                              ctx->Extensions.ARB_draw_instanced &&
+                              ctx->Extensions.ARB_texture_buffer_object &&
+                              ctx->Extensions.ARB_uniform_buffer_object &&
+                              ctx->Extensions.NV_primitive_restart &&
+                              ctx->Extensions.NV_texture_rectangle &&
+                              ctx->Const.MaxVertexTextureImageUnits >= 16);
+   const GLboolean ver_3_2 = (ver_3_1 &&
+                              ctx->Extensions.ARB_depth_clamp &&
+                              ctx->Extensions.ARB_draw_elements_base_vertex &&
+                              ctx->Extensions.ARB_fragment_coord_conventions &&
+                              ctx->Extensions.ARB_geometry_shader4 &&
+                              ctx->Extensions.EXT_provoking_vertex &&
+                              ctx->Extensions.ARB_seamless_cube_map &&
+                              ctx->Extensions.ARB_sync &&
+                              ctx->Extensions.ARB_texture_multisample &&
+                              ctx->Extensions.EXT_vertex_array_bgra);
+   const GLboolean ver_3_3 = (ver_3_2 &&
+                              ctx->Extensions.ARB_blend_func_extended &&
+                              ctx->Extensions.ARB_explicit_attrib_location &&
+                              ctx->Extensions.ARB_instanced_arrays &&
+                              ctx->Extensions.ARB_occlusion_query2 &&
+                              ctx->Extensions.ARB_sampler_objects &&
+                              ctx->Extensions.ARB_texture_rgb10_a2ui &&
+                              ctx->Extensions.ARB_timer_query &&
+                              ctx->Extensions.ARB_vertex_type_2_10_10_10_rev &&
+                              ctx->Extensions.EXT_texture_swizzle);
+
+   if (ver_3_3) {
+      major = 3;
+      minor = 3;
+   }
+   else if (ver_3_2) {
+      major = 3;
+      minor = 2;
+   }
+   else if (ver_3_1) {
+      major = 3;
+      minor = 1;
+   }
+   else if (ver_3_0) {
+      major = 3;
+      minor = 0;
+   }
+   else if (ver_2_1) {
+      major = 2;
+      minor = 1;
    }
    else if (ver_2_0) {
-      *major = 2;
-      *minor = 0;
+      major = 2;
+      minor = 0;
    }
    else if (ver_1_5) {
-      *major = 1;
-      *minor = 5;
+      major = 1;
+      minor = 5;
    }
    else if (ver_1_4) {
-      *major = 1;
-      *minor = 4;
+      major = 1;
+      minor = 4;
    }
    else if (ver_1_3) {
-      *major = 1;
-      *minor = 3;
+      major = 1;
+      minor = 3;
    }
    else {
-      *major = 1;
-      *minor = 2;
+      major = 1;
+      minor = 2;
+   }
+
+   ctx->VersionMajor = major;
+   ctx->VersionMinor = minor;
+   ctx->VersionString = (char *) malloc(max);
+   if (ctx->VersionString) {
+      _mesa_snprintf(ctx->VersionString, max,
+		     "%u.%u Mesa " MESA_VERSION_STRING,
+		     ctx->VersionMajor, ctx->VersionMinor);
    }
 }
 
+static void
+compute_version_es1(GLcontext *ctx)
+{
+   static const int max = 100;
+
+   /* OpenGL ES 1.0 is derived from OpenGL 1.3 */
+   const GLboolean ver_1_0 = (ctx->Extensions.ARB_multisample &&
+                              ctx->Extensions.ARB_multitexture &&
+                              ctx->Extensions.ARB_texture_compression &&
+                              ctx->Extensions.EXT_texture_env_add &&
+                              ctx->Extensions.ARB_texture_env_combine &&
+                              ctx->Extensions.ARB_texture_env_dot3);
+   /* OpenGL ES 1.1 is derived from OpenGL 1.5 */
+   const GLboolean ver_1_1 = (ver_1_0 &&
+                              ctx->Extensions.EXT_point_parameters &&
+                              ctx->Extensions.SGIS_generate_mipmap &&
+                              ctx->Extensions.ARB_vertex_buffer_object);
+
+   if (ver_1_1) {
+      ctx->VersionMajor = 1;
+      ctx->VersionMinor = 1;
+   } else if (ver_1_0) {
+      ctx->VersionMajor = 1;
+      ctx->VersionMinor = 0;
+   } else {
+      _mesa_problem(ctx, "Incomplete OpenGL ES 1.0 support.");
+   }
+
+   ctx->VersionString = (char *) malloc(max);
+   if (ctx->VersionString) {
+      _mesa_snprintf(ctx->VersionString, max,
+		     "OpenGL ES-CM 1.%d Mesa " MESA_VERSION_STRING,
+		     ctx->VersionMinor);
+   }
+}
+
+static void
+compute_version_es2(GLcontext *ctx)
+{
+   static const int max = 100;
+
+   /* OpenGL ES 2.0 is derived from OpenGL 2.0 */
+   const GLboolean ver_2_0 = (ctx->Extensions.ARB_multisample &&
+                              ctx->Extensions.ARB_multitexture &&
+                              ctx->Extensions.ARB_texture_compression &&
+                              ctx->Extensions.ARB_texture_cube_map &&
+                              ctx->Extensions.ARB_texture_mirrored_repeat &&
+                              ctx->Extensions.EXT_blend_color &&
+                              ctx->Extensions.EXT_blend_func_separate &&
+                              ctx->Extensions.EXT_blend_minmax &&
+                              ctx->Extensions.EXT_blend_subtract &&
+                              ctx->Extensions.EXT_stencil_wrap &&
+                              ctx->Extensions.ARB_vertex_buffer_object &&
+                              ctx->Extensions.ARB_shader_objects &&
+                              ctx->Extensions.ARB_vertex_shader &&
+                              ctx->Extensions.ARB_fragment_shader &&
+                              ctx->Extensions.ARB_texture_non_power_of_two &&
+                              ctx->Extensions.EXT_blend_equation_separate);
+   if (ver_2_0) {
+      ctx->VersionMajor = 2;
+      ctx->VersionMinor = 0;
+   } else {
+      _mesa_problem(ctx, "Incomplete OpenGL ES 2.0 support.");
+   }
+
+   ctx->VersionString = (char *) malloc(max);
+   if (ctx->VersionString) {
+      _mesa_snprintf(ctx->VersionString, max,
+		     "OpenGL ES 2.0 Mesa " MESA_VERSION_STRING);
+   }
+}
 
 /**
  * Set the context's VersionMajor, VersionMinor, VersionString fields.
- * This should only be called once as part of context initialization.
+ * This should only be called once as part of context initialization
+ * or to perform version check for GLX_ARB_create_context_profile.
  */
 void
 _mesa_compute_version(GLcontext *ctx)
 {
-   static const int max = 100;
+   if (ctx->VersionMajor)
+      return;
 
-   compute_version(ctx, &ctx->VersionMajor, &ctx->VersionMinor);
-   
-   ctx->VersionString = (char *) malloc(max);
-   if (ctx->VersionString) {
-      _mesa_snprintf(ctx->VersionString, max, "%u.%u Mesa " MESA_VERSION_STRING,
-	       ctx->VersionMajor, ctx->VersionMinor);
+   switch (ctx->API) {
+   case API_OPENGL:
+      compute_version(ctx);
+      break;
+   case API_OPENGLES:
+      compute_version_es1(ctx);
+      break;
+   case API_OPENGLES2:
+      compute_version_es2(ctx);
+      break;
    }
+
 }
diff --git a/mesalib/src/mesa/main/version.h b/mesalib/src/mesa/main/version.h
index 9955be24a..1289ca985 100644
--- a/mesalib/src/mesa/main/version.h
+++ b/mesalib/src/mesa/main/version.h
@@ -1,6 +1,6 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.8
+ * Version:  7.9
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
@@ -33,9 +33,9 @@
 
 /* Mesa version */
 #define MESA_MAJOR 7
-#define MESA_MINOR 8
-#define MESA_PATCH 2
-#define MESA_VERSION_STRING "7.8.2"
+#define MESA_MINOR 9
+#define MESA_PATCH 0
+#define MESA_VERSION_STRING "7.9"
 
 /* To make version comparison easy */
 #define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
diff --git a/mesalib/src/mesa/main/viewport.h b/mesalib/src/mesa/main/viewport.h
index f08fef279..ec054a7c5 100644
--- a/mesalib/src/mesa/main/viewport.h
+++ b/mesalib/src/mesa/main/viewport.h
@@ -27,6 +27,8 @@
 #ifndef VIEWPORT_H
 #define VIEWPORT_H
 
+#include "glheader.h"
+#include "mtypes.h"
 
 extern void GLAPIENTRY
 _mesa_Viewport(GLint x, GLint y, GLsizei width, GLsizei height);
diff --git a/mesalib/src/mesa/main/vtxfmt.c b/mesalib/src/mesa/main/vtxfmt.c
index 0dd3e5e52..ca352e88e 100644
--- a/mesalib/src/mesa/main/vtxfmt.c
+++ b/mesalib/src/mesa/main/vtxfmt.c
@@ -140,6 +140,8 @@ install_vtxfmt( struct _glapi_table *tab, const GLvertexformat *vfmt )
    SET_DrawElementsBaseVertex(tab, vfmt->DrawElementsBaseVertex);
    SET_DrawRangeElementsBaseVertex(tab, vfmt->DrawRangeElementsBaseVertex);
    SET_MultiDrawElementsBaseVertex(tab, vfmt->MultiDrawElementsBaseVertex);
+   SET_DrawArraysInstanced(tab, vfmt->DrawArraysInstanced);
+   SET_DrawElementsInstanced(tab, vfmt->DrawElementsInstanced);
 
    /* GL_NV_vertex_program */
    SET_VertexAttrib1fNV(tab, vfmt->VertexAttrib1fNV);
diff --git a/mesalib/src/mesa/main/vtxfmt.h b/mesalib/src/mesa/main/vtxfmt.h
index fb6c23abe..aad38b87c 100644
--- a/mesalib/src/mesa/main/vtxfmt.h
+++ b/mesalib/src/mesa/main/vtxfmt.h
@@ -33,6 +33,9 @@
 #ifndef _VTXFMT_H_
 #define _VTXFMT_H_
 
+#include "compiler.h"
+#include "mtypes.h"
+
 #if FEATURE_beginend
 
 extern void _mesa_init_exec_vtxfmt( GLcontext *ctx );
diff --git a/mesalib/src/mesa/main/vtxfmt_tmp.h b/mesalib/src/mesa/main/vtxfmt_tmp.h
index 037c4b188..9ec6ea49a 100644
--- a/mesalib/src/mesa/main/vtxfmt_tmp.h
+++ b/mesalib/src/mesa/main/vtxfmt_tmp.h
@@ -391,6 +391,25 @@ static void GLAPIENTRY TAG(MultiDrawElementsBaseVertex)( GLenum mode,
 						      primcount, basevertex ));
 }
 
+static void GLAPIENTRY
+TAG(DrawArraysInstanced)(GLenum mode, GLint first,
+                         GLsizei count, GLsizei primcount)
+{
+   PRE_LOOPBACK( DrawArraysInstanced );
+   CALL_DrawArraysInstanced(GET_DISPATCH(), (mode, first, count, primcount));
+}
+
+static void GLAPIENTRY
+TAG(DrawElementsInstanced)(GLenum mode, GLsizei count,
+                           GLenum type, const GLvoid *indices,
+                           GLsizei primcount)
+{
+   PRE_LOOPBACK( DrawElementsInstanced );
+   CALL_DrawElementsInstanced(GET_DISPATCH(),
+                              (mode, count, type, indices, primcount));
+}
+
+
 static void GLAPIENTRY TAG(EvalMesh1)( GLenum mode, GLint i1, GLint i2 )
 {
    PRE_LOOPBACK( EvalMesh1 );
@@ -574,6 +593,8 @@ static GLvertexformat TAG(vtxfmt) = {
    TAG(DrawElementsBaseVertex),
    TAG(DrawRangeElementsBaseVertex),
    TAG(MultiDrawElementsBaseVertex),
+   TAG(DrawArraysInstanced),
+   TAG(DrawElementsInstanced),
    TAG(EvalMesh1),
    TAG(EvalMesh2)
 };
diff --git a/mesalib/src/mesa/math/m_matrix.c b/mesalib/src/mesa/math/m_matrix.c
index 4b33d0bbb..048b231c4 100644
--- a/mesalib/src/mesa/math/m_matrix.c
+++ b/mesalib/src/mesa/math/m_matrix.c
@@ -804,8 +804,8 @@ _math_matrix_rotate( GLmatrix *mat,
    GLfloat m[16];
    GLboolean optimized;
 
-   s = (GLfloat) _mesa_sin( angle * DEG2RAD );
-   c = (GLfloat) _mesa_cos( angle * DEG2RAD );
+   s = (GLfloat) sin( angle * DEG2RAD );
+   c = (GLfloat) cos( angle * DEG2RAD );
 
    memcpy(m, Identity, sizeof(GLfloat)*16);
    optimized = GL_FALSE;
diff --git a/mesalib/src/mesa/math/m_matrix.h b/mesalib/src/mesa/math/m_matrix.h
index 3bc5de6cd..a69afb858 100644
--- a/mesalib/src/mesa/math/m_matrix.h
+++ b/mesalib/src/mesa/math/m_matrix.h
@@ -32,6 +32,8 @@
 #define _M_MATRIX_H
 
 
+#include "main/glheader.h"
+
 
 /**
  * \name Symbolic names to some of the entries in the matrix
diff --git a/mesalib/src/mesa/math/m_translate.c b/mesalib/src/mesa/math/m_translate.c
index b12b07957..51daf7bfd 100644
--- a/mesalib/src/mesa/math/m_translate.c
+++ b/mesalib/src/mesa/math/m_translate.c
@@ -29,8 +29,8 @@
 
 
 #include "main/glheader.h"
+#include "main/macros.h"
 #include "main/mtypes.h"		/* GLchan hack */
-#include "main/colormac.h"
 
 #include "m_translate.h"
 
diff --git a/mesalib/src/mesa/math/m_translate.h b/mesalib/src/mesa/math/m_translate.h
index c677682d5..580410311 100644
--- a/mesalib/src/mesa/math/m_translate.h
+++ b/mesalib/src/mesa/math/m_translate.h
@@ -26,7 +26,8 @@
 #ifndef _M_TRANSLATE_H_
 #define _M_TRANSLATE_H_
 
-#include "main/config.h"
+#include "main/compiler.h"
+#include "main/glheader.h"
 #include "main/mtypes.h"		/* hack for GLchan */
 
 
diff --git a/mesalib/src/mesa/math/m_xform.h b/mesalib/src/mesa/math/m_xform.h
index 33421ad1c..14ac956a7 100644
--- a/mesalib/src/mesa/math/m_xform.h
+++ b/mesalib/src/mesa/math/m_xform.h
@@ -27,10 +27,10 @@
 #define _M_XFORM_H
 
 
+#include "main/compiler.h"
 #include "main/glheader.h"
-#include "main/config.h"
-#include "math/m_vector.h"
 #include "math/m_matrix.h"
+#include "math/m_vector.h"
 
 #ifdef USE_X86_ASM
 #define _XFORMAPI _ASMAPI
diff --git a/mesalib/src/mesa/shader/Makefile b/mesalib/src/mesa/shader/Makefile
deleted file mode 100644
index 400a543bd..000000000
--- a/mesalib/src/mesa/shader/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/shader/arbprogparse.c b/mesalib/src/mesa/shader/arbprogparse.c
deleted file mode 100644
index 6373529e4..000000000
--- a/mesalib/src/mesa/shader/arbprogparse.c
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.1
- *
- * Copyright (C) 1999-2008  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.
- */
-
-#define DEBUG_PARSING 0
-
-/**
- * \file arbprogparse.c
- * ARB_*_program parser core
- * \author Karl Rasche
- */
-
-/**
-Notes on program parameters, etc.
-
-The instructions we emit will use six kinds of source registers:
-
-  PROGRAM_INPUT      - input registers
-  PROGRAM_TEMPORARY  - temp registers
-  PROGRAM_ADDRESS    - address/indirect register
-  PROGRAM_SAMPLER    - texture sampler
-  PROGRAM_CONSTANT   - indexes into program->Parameters, a known constant/literal
-  PROGRAM_STATE_VAR  - indexes into program->Parameters, and may actually be:
-                       + a state variable, like "state.fog.color", or
-                       + a pointer to a "program.local[k]" parameter, or
-                       + a pointer to a "program.env[k]" parameter
-
-Basically, all the program.local[] and program.env[] values will get mapped
-into the unified gl_program->Parameters array.  This solves the problem of
-having three separate program parameter arrays.
-*/
-
-
-#include "main/glheader.h"
-#include "main/imports.h"
-#include "main/context.h"
-#include "main/mtypes.h"
-#include "arbprogparse.h"
-#include "programopt.h"
-#include "prog_parameter.h"
-#include "prog_statevars.h"
-#include "prog_instruction.h"
-#include "program_parser.h"
-
-
-void
-_mesa_parse_arb_fragment_program(GLcontext* ctx, GLenum target,
-                                 const GLvoid *str, GLsizei len,
-                                 struct gl_fragment_program *program)
-{
-   struct gl_program prog;
-   struct asm_parser_state state;
-   GLuint i;
-
-   ASSERT(target == GL_FRAGMENT_PROGRAM_ARB);
-
-   memset(&prog, 0, sizeof(prog));
-   memset(&state, 0, sizeof(state));
-   state.prog = &prog;
-
-   if (!_mesa_parse_arb_program(ctx, target, (const GLubyte*) str, len,
-				&state)) {
-      /* Error in the program. Just return. */
-      return;
-   }
-
-   if (program->Base.String != NULL)
-      free(program->Base.String);
-
-   /* Copy the relevant contents of the arb_program struct into the
-    * fragment_program struct.
-    */
-   program->Base.String          = prog.String;
-   program->Base.NumInstructions = prog.NumInstructions;
-   program->Base.NumTemporaries  = prog.NumTemporaries;
-   program->Base.NumParameters   = prog.NumParameters;
-   program->Base.NumAttributes   = prog.NumAttributes;
-   program->Base.NumAddressRegs  = prog.NumAddressRegs;
-   program->Base.NumNativeInstructions = prog.NumNativeInstructions;
-   program->Base.NumNativeTemporaries = prog.NumNativeTemporaries;
-   program->Base.NumNativeParameters = prog.NumNativeParameters;
-   program->Base.NumNativeAttributes = prog.NumNativeAttributes;
-   program->Base.NumNativeAddressRegs = prog.NumNativeAddressRegs;
-   program->Base.NumAluInstructions   = prog.NumAluInstructions;
-   program->Base.NumTexInstructions   = prog.NumTexInstructions;
-   program->Base.NumTexIndirections   = prog.NumTexIndirections;
-   program->Base.NumNativeAluInstructions = prog.NumAluInstructions;
-   program->Base.NumNativeTexInstructions = prog.NumTexInstructions;
-   program->Base.NumNativeTexIndirections = prog.NumTexIndirections;
-   program->Base.InputsRead      = prog.InputsRead;
-   program->Base.OutputsWritten  = prog.OutputsWritten;
-   for (i = 0; i < MAX_TEXTURE_IMAGE_UNITS; i++) {
-      program->Base.TexturesUsed[i] = prog.TexturesUsed[i];
-      if (prog.TexturesUsed[i])
-         program->Base.SamplersUsed |= (1 << i);
-   }
-   program->Base.ShadowSamplers = prog.ShadowSamplers;
-   switch (state.option.Fog) {
-   case OPTION_FOG_EXP:    program->FogOption = GL_EXP;    break;
-   case OPTION_FOG_EXP2:   program->FogOption = GL_EXP2;   break;
-   case OPTION_FOG_LINEAR: program->FogOption = GL_LINEAR; break;
-   default:                program->FogOption = GL_NONE;   break;
-   }
-   program->OriginUpperLeft = state.option.OriginUpperLeft;
-   program->PixelCenterInteger = state.option.PixelCenterInteger;
-
-   program->UsesKill            = state.fragment.UsesKill;
-
-   if (program->FogOption)
-      program->Base.InputsRead |= FRAG_BIT_FOGC;
-
-   if (program->Base.Instructions)
-      free(program->Base.Instructions);
-   program->Base.Instructions = prog.Instructions;
-
-   if (program->Base.Parameters)
-      _mesa_free_parameter_list(program->Base.Parameters);
-   program->Base.Parameters    = prog.Parameters;
-
-   /* Append fog instructions now if the program has "OPTION ARB_fog_exp"
-    * or similar.  We used to leave this up to drivers, but it appears
-    * there's no hardware that wants to do fog in a discrete stage separate
-    * from the fragment shader.
-    */
-   if (program->FogOption != GL_NONE) {
-      _mesa_append_fog_code(ctx, program);
-      program->FogOption = GL_NONE;
-   }
-
-#if DEBUG_FP
-   printf("____________Fragment program %u ________\n", program->Base.Id);
-   _mesa_print_program(&program->Base);
-#endif
-}
-
-
-
-/**
- * Parse the vertex program string.  If success, update the given
- * vertex_program object with the new program.  Else, leave the vertex_program
- * object unchanged.
- */
-void
-_mesa_parse_arb_vertex_program(GLcontext *ctx, GLenum target,
-			       const GLvoid *str, GLsizei len,
-			       struct gl_vertex_program *program)
-{
-   struct gl_program prog;
-   struct asm_parser_state state;
-
-   ASSERT(target == GL_VERTEX_PROGRAM_ARB);
-
-   memset(&prog, 0, sizeof(prog));
-   memset(&state, 0, sizeof(state));
-   state.prog = &prog;
-
-   if (!_mesa_parse_arb_program(ctx, target, (const GLubyte*) str, len,
-				&state)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glProgramString(bad program)");
-      return;
-   }
-
-   if (program->Base.String != NULL)
-      free(program->Base.String);
-
-   /* Copy the relevant contents of the arb_program struct into the 
-    * vertex_program struct.
-    */
-   program->Base.String          = prog.String;
-   program->Base.NumInstructions = prog.NumInstructions;
-   program->Base.NumTemporaries  = prog.NumTemporaries;
-   program->Base.NumParameters   = prog.NumParameters;
-   program->Base.NumAttributes   = prog.NumAttributes;
-   program->Base.NumAddressRegs  = prog.NumAddressRegs;
-   program->Base.NumNativeInstructions = prog.NumNativeInstructions;
-   program->Base.NumNativeTemporaries = prog.NumNativeTemporaries;
-   program->Base.NumNativeParameters = prog.NumNativeParameters;
-   program->Base.NumNativeAttributes = prog.NumNativeAttributes;
-   program->Base.NumNativeAddressRegs = prog.NumNativeAddressRegs;
-   program->Base.InputsRead     = prog.InputsRead;
-   program->Base.OutputsWritten = prog.OutputsWritten;
-   program->IsPositionInvariant = (state.option.PositionInvariant)
-      ? GL_TRUE : GL_FALSE;
-
-   if (program->Base.Instructions)
-      free(program->Base.Instructions);
-   program->Base.Instructions = prog.Instructions;
-
-   if (program->Base.Parameters)
-      _mesa_free_parameter_list(program->Base.Parameters);
-   program->Base.Parameters = prog.Parameters; 
-
-#if DEBUG_VP
-   printf("____________Vertex program %u __________\n", program->Base.Id);
-   _mesa_print_program(&program->Base);
-#endif
-}
diff --git a/mesalib/src/mesa/shader/arbprogparse.h b/mesalib/src/mesa/shader/arbprogparse.h
deleted file mode 100644
index 980d39fb9..000000000
--- a/mesalib/src/mesa/shader/arbprogparse.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5
- *
- * Copyright (C) 1999-2005  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#ifndef ARBPROGPARSE_H
-#define ARBPROGPARSE_H
-
-#include "main/mtypes.h"
-
-extern void
-_mesa_parse_arb_vertex_program(GLcontext *ctx, GLenum target,
-			       const GLvoid *str, GLsizei len,
-			       struct gl_vertex_program *program);
-
-extern void
-_mesa_parse_arb_fragment_program(GLcontext *ctx, GLenum target,
-                                 const GLvoid *str, GLsizei len,
-                                 struct gl_fragment_program *program);
-
-#endif
diff --git a/mesalib/src/mesa/shader/descrip.mms b/mesalib/src/mesa/shader/descrip.mms
deleted file mode 100644
index 59730020d..000000000
--- a/mesalib/src/mesa/shader/descrip.mms
+++ /dev/null
@@ -1,93 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen  joukj@hrem.nano.tudelft.nl
-# Last revision : 29 September 2008
-.first
-	define gl [---.include.gl]
-	define math [-.math]
-	define swrast [-.swrast]
-	define array_cache [-.array_cache]
-	define glapi [-.glapi]
-	define main [-.main]
-	define shader [-.shader]
-
-.include [---]mms-config.
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [---.include],[-.main],[-.glapi],[.slang]
-LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1,"__extension__=")/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = \
-	atifragshader.c \
-	arbprogparse.c \
-	arbprogram.c \
-	nvfragparse.c \
-	nvprogram.c \
-	nvvertparse.c \
-	program.c \
-	programopt.c \
-	prog_debug.c \
-	prog_execute.c \
-	prog_instruction.c \
-	prog_parameter.c \
-	prog_print.c \
-	prog_cache.c \
-	prog_statevars.c \
-	shader_api.c prog_uniform.c
-
-OBJECTS = \
-	atifragshader.obj,\
-	arbprogparse.obj,\
-	arbprogram.obj,\
-	nvfragparse.obj,\
-	nvprogram.obj,\
-	nvvertparse.obj,\
-	program.obj,\
-	programopt.obj,\
-	prog_debug.obj,\
-	prog_execute.obj,\
-	prog_instruction.obj,\
-	prog_parameter.obj,\
-	prog_print.obj,\
-	prog_statevars.obj,\
-	shader_api.obj,prog_uniform.obj,prog_cache.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-all : 
-	$(MMS)$(MMSQUALIFIERS) $(LIBDIR)$(GL_LIB)
-	set def [.slang]
-	$(MMS)$(MMSQUALIFIERS)
-	set def [-]
-
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
-  @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
-	purge
-	delete *.obj;*
-
-atifragshader.obj : atifragshader.c
-arbprogparse.obj : arbprogparse.c
-arbprogram.obj : arbprogram.c
-nvfragparse.obj : nvfragparse.c
-nvprogram.obj : nvprogram.c
-nvvertparse.obj : nvvertparse.c
-program.obj : program.c
-programopt. obj : programopt.c
-prog_debug.obj : prog_debug.c
-prog_execute.obj : prog_execute.c
-prog_instruction.obj : prog_instruction.c
-prog_parameter.obj : prog_parameter.c
-prog_print.obj : prog_print.c
-prog_statevars.obj : prog_statevars.c
-shader_api.obj : shader_api.c
-prog_uniform.obj : prog_uniform.c
-prog_cache.obj : prog_cache.c
diff --git a/mesalib/src/mesa/shader/hash_table.c b/mesalib/src/mesa/shader/hash_table.c
deleted file mode 100644
index fa6ba2bfd..000000000
--- a/mesalib/src/mesa/shader/hash_table.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright © 2008 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.
- */
-
-/**
- * \file hash_table.c
- * \brief Implementation of a generic, opaque hash table data type.
- *
- * \author Ian Romanick <ian.d.romanick@intel.com>
- */
-
-#include "main/imports.h"
-#include "main/simple_list.h"
-#include "hash_table.h"
-
-struct node {
-   struct node *next;
-   struct node *prev;
-};
-
-struct hash_table {
-    hash_func_t    hash;
-    hash_compare_func_t  compare;
-
-    unsigned num_buckets;
-    struct node buckets[1];
-};
-
-
-struct hash_node {
-    struct node link;
-    const void *key;
-    void *data;
-};
-
-
-struct hash_table *
-hash_table_ctor(unsigned num_buckets, hash_func_t hash,
-                hash_compare_func_t compare)
-{
-    struct hash_table *ht;
-    unsigned i;
-
-
-    if (num_buckets < 16) {
-        num_buckets = 16;
-    }
-
-    ht = malloc(sizeof(*ht) + ((num_buckets - 1) 
-				     * sizeof(ht->buckets[0])));
-    if (ht != NULL) {
-        ht->hash = hash;
-        ht->compare = compare;
-        ht->num_buckets = num_buckets;
-
-        for (i = 0; i < num_buckets; i++) {
-            make_empty_list(& ht->buckets[i]);
-        }
-    }
-
-    return ht;
-}
-
-
-void
-hash_table_dtor(struct hash_table *ht)
-{
-   hash_table_clear(ht);
-   free(ht);
-}
-
-
-void
-hash_table_clear(struct hash_table *ht)
-{
-   struct node *node;
-   struct node *temp;
-   unsigned i;
-
-
-   for (i = 0; i < ht->num_buckets; i++) {
-      foreach_s(node, temp, & ht->buckets[i]) {
-	 remove_from_list(node);
-	 free(node);
-      }
-
-      assert(is_empty_list(& ht->buckets[i]));
-   }
-}
-
-
-void *
-hash_table_find(struct hash_table *ht, const void *key)
-{
-    const unsigned hash_value = (*ht->hash)(key);
-    const unsigned bucket = hash_value % ht->num_buckets;
-    struct node *node;
-
-    foreach(node, & ht->buckets[bucket]) {
-       struct hash_node *hn = (struct hash_node *) node;
-
-       if ((*ht->compare)(hn->key, key) == 0) {
-	  return hn->data;
-       }
-    }
-
-    return NULL;
-}
-
-
-void
-hash_table_insert(struct hash_table *ht, void *data, const void *key)
-{
-    const unsigned hash_value = (*ht->hash)(key);
-    const unsigned bucket = hash_value % ht->num_buckets;
-    struct hash_node *node;
-
-    node = calloc(1, sizeof(*node));
-
-    node->data = data;
-    node->key = key;
-
-    insert_at_head(& ht->buckets[bucket], & node->link);
-}
-
-
-unsigned
-hash_table_string_hash(const void *key)
-{
-    const char *str = (const char *) key;
-    unsigned hash = 5381;
-
-
-    while (*str != '\0') {
-        hash = (hash * 33) + *str;
-        str++;
-    }
-
-    return hash;
-}
diff --git a/mesalib/src/mesa/shader/hash_table.h b/mesalib/src/mesa/shader/hash_table.h
deleted file mode 100644
index 7b302f5db..000000000
--- a/mesalib/src/mesa/shader/hash_table.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright © 2008 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.
- */
-
-/**
- * \file hash_table.h
- * \brief Implementation of a generic, opaque hash table data type.
- *
- * \author Ian Romanick <ian.d.romanick@intel.com>
- */
-
-#ifndef HASH_TABLE_H
-#define HASH_TABLE_H
-
-#include <string.h>
-
-struct hash_table;
-
-typedef unsigned (*hash_func_t)(const void *key);
-typedef int (*hash_compare_func_t)(const void *key1, const void *key2);
-
-/**
- * Hash table constructor
- *
- * Creates a hash table with the specified number of buckets.  The supplied
- * \c hash and \c compare routines are used when adding elements to the table
- * and when searching for elements in the table.
- *
- * \param num_buckets  Number of buckets (bins) in the hash table.
- * \param hash         Function used to compute hash value of input keys.
- * \param compare      Function used to compare keys.
- */
-extern struct hash_table *hash_table_ctor(unsigned num_buckets,
-    hash_func_t hash, hash_compare_func_t compare);
-
-
-/**
- * Release all memory associated with a hash table
- *
- * \warning
- * This function cannot release memory occupied either by keys or data.
- */
-extern void hash_table_dtor(struct hash_table *ht);
-
-
-/**
- * Flush all entries from a hash table
- *
- * \param ht  Table to be cleared of its entries.
- */
-extern void hash_table_clear(struct hash_table *ht);
-
-
-/**
- * Search a hash table for a specific element
- *
- * \param ht   Table to be searched
- * \param key  Key of the desired element
- *
- * \return
- * The \c data value supplied to \c hash_table_insert when the element with
- * the matching key was added.  If no matching key exists in the table,
- * \c NULL is returned.
- */
-extern void *hash_table_find(struct hash_table *ht, const void *key);
-
-
-/**
- * Add an element to a hash table
- */
-extern void hash_table_insert(struct hash_table *ht, void *data,
-    const void *key);
-
-
-/**
- * Compute hash value of a string
- *
- * Computes the hash value of a string using the DJB2 algorithm developed by
- * Professor Daniel J. Bernstein.  It was published on comp.lang.c once upon
- * a time.  I was unable to find the original posting in the archives.
- *
- * \param key  Pointer to a NUL terminated string to be hashed.
- *
- * \sa hash_table_string_compare
- */
-extern unsigned hash_table_string_hash(const void *key);
-
-
-/**
- * Compare two strings used as keys
- *
- * This is just a macro wrapper around \c strcmp.
- *
- * \sa hash_table_string_hash
- */
-#define hash_table_string_compare ((hash_compare_func_t) strcmp)
-
-#endif /* HASH_TABLE_H */
diff --git a/mesalib/src/mesa/shader/lex.yy.c b/mesalib/src/mesa/shader/lex.yy.c
deleted file mode 100644
index 4c5c644a6..000000000
--- a/mesalib/src/mesa/shader/lex.yy.c
+++ /dev/null
@@ -1,3655 +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;
-#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 yyrestart(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 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 "shader/prog_instruction.h"
-#include "shader/prog_statevars.h"
-
-#include "shader/symbol_table.h"
-#include "shader/program_parser.h"
-#include "shader/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_EXTRA_TYPE struct asm_parser_state *
-#line 1156 "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
-#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 fwrite( yytext, yyleng, 1, yyout )
-#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 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 157 "program_lexer.l"
-
-
-#line 1400 "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 159 "program_lexer.l"
-{ return ARBvp_10; }
-	YY_BREAK
-case 2:
-YY_RULE_SETUP
-#line 160 "program_lexer.l"
-{ return ARBfp_10; }
-	YY_BREAK
-case 3:
-YY_RULE_SETUP
-#line 161 "program_lexer.l"
-{
-   yylval->integer = at_address;
-   return_token_or_IDENTIFIER(require_ARB_vp, ADDRESS);
-}
-	YY_BREAK
-case 4:
-YY_RULE_SETUP
-#line 165 "program_lexer.l"
-{ return ALIAS; }
-	YY_BREAK
-case 5:
-YY_RULE_SETUP
-#line 166 "program_lexer.l"
-{ return ATTRIB; }
-	YY_BREAK
-case 6:
-YY_RULE_SETUP
-#line 167 "program_lexer.l"
-{ return END; }
-	YY_BREAK
-case 7:
-YY_RULE_SETUP
-#line 168 "program_lexer.l"
-{ return OPTION; }
-	YY_BREAK
-case 8:
-YY_RULE_SETUP
-#line 169 "program_lexer.l"
-{ return OUTPUT; }
-	YY_BREAK
-case 9:
-YY_RULE_SETUP
-#line 170 "program_lexer.l"
-{ return PARAM; }
-	YY_BREAK
-case 10:
-YY_RULE_SETUP
-#line 171 "program_lexer.l"
-{ yylval->integer = at_temp; return TEMP; }
-	YY_BREAK
-case 11:
-YY_RULE_SETUP
-#line 173 "program_lexer.l"
-{ return_opcode(             1, VECTOR_OP, ABS, 3); }
-	YY_BREAK
-case 12:
-YY_RULE_SETUP
-#line 174 "program_lexer.l"
-{ return_opcode(             1, BIN_OP, ADD, 3); }
-	YY_BREAK
-case 13:
-YY_RULE_SETUP
-#line 175 "program_lexer.l"
-{ return_opcode(require_ARB_vp, ARL, ARL, 3); }
-	YY_BREAK
-case 14:
-YY_RULE_SETUP
-#line 177 "program_lexer.l"
-{ return_opcode(require_ARB_fp, TRI_OP, CMP, 3); }
-	YY_BREAK
-case 15:
-YY_RULE_SETUP
-#line 178 "program_lexer.l"
-{ return_opcode(require_ARB_fp, SCALAR_OP, COS, 3); }
-	YY_BREAK
-case 16:
-YY_RULE_SETUP
-#line 180 "program_lexer.l"
-{ return_opcode(require_NV_fp,  VECTOR_OP, DDX, 3); }
-	YY_BREAK
-case 17:
-YY_RULE_SETUP
-#line 181 "program_lexer.l"
-{ return_opcode(require_NV_fp,  VECTOR_OP, DDY, 3); }
-	YY_BREAK
-case 18:
-YY_RULE_SETUP
-#line 182 "program_lexer.l"
-{ return_opcode(             1, BIN_OP, DP3, 3); }
-	YY_BREAK
-case 19:
-YY_RULE_SETUP
-#line 183 "program_lexer.l"
-{ return_opcode(             1, BIN_OP, DP4, 3); }
-	YY_BREAK
-case 20:
-YY_RULE_SETUP
-#line 184 "program_lexer.l"
-{ return_opcode(             1, BIN_OP, DPH, 3); }
-	YY_BREAK
-case 21:
-YY_RULE_SETUP
-#line 185 "program_lexer.l"
-{ return_opcode(             1, BIN_OP, DST, 3); }
-	YY_BREAK
-case 22:
-YY_RULE_SETUP
-#line 187 "program_lexer.l"
-{ return_opcode(             1, SCALAR_OP, EX2, 3); }
-	YY_BREAK
-case 23:
-YY_RULE_SETUP
-#line 188 "program_lexer.l"
-{ return_opcode(require_ARB_vp, SCALAR_OP, EXP, 3); }
-	YY_BREAK
-case 24:
-YY_RULE_SETUP
-#line 190 "program_lexer.l"
-{ return_opcode(             1, VECTOR_OP, FLR, 3); }
-	YY_BREAK
-case 25:
-YY_RULE_SETUP
-#line 191 "program_lexer.l"
-{ return_opcode(             1, VECTOR_OP, FRC, 3); }
-	YY_BREAK
-case 26:
-YY_RULE_SETUP
-#line 193 "program_lexer.l"
-{ return_opcode(require_ARB_fp, KIL, KIL, 3); }
-	YY_BREAK
-case 27:
-YY_RULE_SETUP
-#line 195 "program_lexer.l"
-{ return_opcode(             1, VECTOR_OP, LIT, 3); }
-	YY_BREAK
-case 28:
-YY_RULE_SETUP
-#line 196 "program_lexer.l"
-{ return_opcode(             1, SCALAR_OP, LG2, 3); }
-	YY_BREAK
-case 29:
-YY_RULE_SETUP
-#line 197 "program_lexer.l"
-{ return_opcode(require_ARB_vp, SCALAR_OP, LOG, 3); }
-	YY_BREAK
-case 30:
-YY_RULE_SETUP
-#line 198 "program_lexer.l"
-{ return_opcode(require_ARB_fp, TRI_OP, LRP, 3); }
-	YY_BREAK
-case 31:
-YY_RULE_SETUP
-#line 200 "program_lexer.l"
-{ return_opcode(             1, TRI_OP, MAD, 3); }
-	YY_BREAK
-case 32:
-YY_RULE_SETUP
-#line 201 "program_lexer.l"
-{ return_opcode(             1, BIN_OP, MAX, 3); }
-	YY_BREAK
-case 33:
-YY_RULE_SETUP
-#line 202 "program_lexer.l"
-{ return_opcode(             1, BIN_OP, MIN, 3); }
-	YY_BREAK
-case 34:
-YY_RULE_SETUP
-#line 203 "program_lexer.l"
-{ return_opcode(             1, VECTOR_OP, MOV, 3); }
-	YY_BREAK
-case 35:
-YY_RULE_SETUP
-#line 204 "program_lexer.l"
-{ return_opcode(             1, BIN_OP, MUL, 3); }
-	YY_BREAK
-case 36:
-YY_RULE_SETUP
-#line 206 "program_lexer.l"
-{ return_opcode(require_NV_fp,  VECTOR_OP, PK2H, 4); }
-	YY_BREAK
-case 37:
-YY_RULE_SETUP
-#line 207 "program_lexer.l"
-{ return_opcode(require_NV_fp,  VECTOR_OP, PK2US, 5); }
-	YY_BREAK
-case 38:
-YY_RULE_SETUP
-#line 208 "program_lexer.l"
-{ return_opcode(require_NV_fp,  VECTOR_OP, PK4B, 4); }
-	YY_BREAK
-case 39:
-YY_RULE_SETUP
-#line 209 "program_lexer.l"
-{ return_opcode(require_NV_fp,  VECTOR_OP, PK4UB, 5); }
-	YY_BREAK
-case 40:
-YY_RULE_SETUP
-#line 210 "program_lexer.l"
-{ return_opcode(             1, BINSC_OP, POW, 3); }
-	YY_BREAK
-case 41:
-YY_RULE_SETUP
-#line 212 "program_lexer.l"
-{ return_opcode(             1, SCALAR_OP, RCP, 3); }
-	YY_BREAK
-case 42:
-YY_RULE_SETUP
-#line 213 "program_lexer.l"
-{ return_opcode(require_NV_fp,  BIN_OP,    RFL, 3); }
-	YY_BREAK
-case 43:
-YY_RULE_SETUP
-#line 214 "program_lexer.l"
-{ return_opcode(             1, SCALAR_OP, RSQ, 3); }
-	YY_BREAK
-case 44:
-YY_RULE_SETUP
-#line 216 "program_lexer.l"
-{ return_opcode(require_ARB_fp, SCALAR_OP, SCS, 3); }
-	YY_BREAK
-case 45:
-YY_RULE_SETUP
-#line 217 "program_lexer.l"
-{ return_opcode(require_NV_fp,  BIN_OP, SEQ, 3); }
-	YY_BREAK
-case 46:
-YY_RULE_SETUP
-#line 218 "program_lexer.l"
-{ return_opcode(require_NV_fp,  BIN_OP, SFL, 3); }
-	YY_BREAK
-case 47:
-YY_RULE_SETUP
-#line 219 "program_lexer.l"
-{ return_opcode(             1, BIN_OP, SGE, 3); }
-	YY_BREAK
-case 48:
-YY_RULE_SETUP
-#line 220 "program_lexer.l"
-{ return_opcode(require_NV_fp,  BIN_OP, SGT, 3); }
-	YY_BREAK
-case 49:
-YY_RULE_SETUP
-#line 221 "program_lexer.l"
-{ return_opcode(require_ARB_fp, SCALAR_OP, SIN, 3); }
-	YY_BREAK
-case 50:
-YY_RULE_SETUP
-#line 222 "program_lexer.l"
-{ return_opcode(require_NV_fp,  BIN_OP, SLE, 3); }
-	YY_BREAK
-case 51:
-YY_RULE_SETUP
-#line 223 "program_lexer.l"
-{ return_opcode(             1, BIN_OP, SLT, 3); }
-	YY_BREAK
-case 52:
-YY_RULE_SETUP
-#line 224 "program_lexer.l"
-{ return_opcode(require_NV_fp,  BIN_OP, SNE, 3); }
-	YY_BREAK
-case 53:
-YY_RULE_SETUP
-#line 225 "program_lexer.l"
-{ return_opcode(require_NV_fp,  BIN_OP, STR, 3); }
-	YY_BREAK
-case 54:
-YY_RULE_SETUP
-#line 226 "program_lexer.l"
-{ return_opcode(             1, BIN_OP, SUB, 3); }
-	YY_BREAK
-case 55:
-YY_RULE_SETUP
-#line 227 "program_lexer.l"
-{ return_opcode(             1, SWZ, SWZ, 3); }
-	YY_BREAK
-case 56:
-YY_RULE_SETUP
-#line 229 "program_lexer.l"
-{ return_opcode(require_ARB_fp, SAMPLE_OP, TEX, 3); }
-	YY_BREAK
-case 57:
-YY_RULE_SETUP
-#line 230 "program_lexer.l"
-{ return_opcode(require_ARB_fp, SAMPLE_OP, TXB, 3); }
-	YY_BREAK
-case 58:
-YY_RULE_SETUP
-#line 231 "program_lexer.l"
-{ return_opcode(require_NV_fp,  TXD_OP, TXD, 3); }
-	YY_BREAK
-case 59:
-YY_RULE_SETUP
-#line 232 "program_lexer.l"
-{ return_opcode(require_ARB_fp, SAMPLE_OP, TXP, 3); }
-	YY_BREAK
-case 60:
-YY_RULE_SETUP
-#line 234 "program_lexer.l"
-{ return_opcode(require_NV_fp,  SCALAR_OP, UP2H, 4); }
-	YY_BREAK
-case 61:
-YY_RULE_SETUP
-#line 235 "program_lexer.l"
-{ return_opcode(require_NV_fp,  SCALAR_OP, UP2US, 5); }
-	YY_BREAK
-case 62:
-YY_RULE_SETUP
-#line 236 "program_lexer.l"
-{ return_opcode(require_NV_fp,  SCALAR_OP, UP4B, 4); }
-	YY_BREAK
-case 63:
-YY_RULE_SETUP
-#line 237 "program_lexer.l"
-{ return_opcode(require_NV_fp,  SCALAR_OP, UP4UB, 5); }
-	YY_BREAK
-case 64:
-YY_RULE_SETUP
-#line 239 "program_lexer.l"
-{ return_opcode(require_NV_fp,  TRI_OP, X2D, 3); }
-	YY_BREAK
-case 65:
-YY_RULE_SETUP
-#line 240 "program_lexer.l"
-{ return_opcode(             1, BIN_OP, XPD, 3); }
-	YY_BREAK
-case 66:
-YY_RULE_SETUP
-#line 242 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_vp, VERTEX); }
-	YY_BREAK
-case 67:
-YY_RULE_SETUP
-#line 243 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp, FRAGMENT); }
-	YY_BREAK
-case 68:
-YY_RULE_SETUP
-#line 244 "program_lexer.l"
-{ return PROGRAM; }
-	YY_BREAK
-case 69:
-YY_RULE_SETUP
-#line 245 "program_lexer.l"
-{ return STATE; }
-	YY_BREAK
-case 70:
-YY_RULE_SETUP
-#line 246 "program_lexer.l"
-{ return RESULT; }
-	YY_BREAK
-case 71:
-YY_RULE_SETUP
-#line 248 "program_lexer.l"
-{ return AMBIENT; }
-	YY_BREAK
-case 72:
-YY_RULE_SETUP
-#line 249 "program_lexer.l"
-{ return ATTENUATION; }
-	YY_BREAK
-case 73:
-YY_RULE_SETUP
-#line 250 "program_lexer.l"
-{ return BACK; }
-	YY_BREAK
-case 74:
-YY_RULE_SETUP
-#line 251 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, CLIP); }
-	YY_BREAK
-case 75:
-YY_RULE_SETUP
-#line 252 "program_lexer.l"
-{ return COLOR; }
-	YY_BREAK
-case 76:
-YY_RULE_SETUP
-#line 253 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_fp, DEPTH); }
-	YY_BREAK
-case 77:
-YY_RULE_SETUP
-#line 254 "program_lexer.l"
-{ return DIFFUSE; }
-	YY_BREAK
-case 78:
-YY_RULE_SETUP
-#line 255 "program_lexer.l"
-{ return DIRECTION; }
-	YY_BREAK
-case 79:
-YY_RULE_SETUP
-#line 256 "program_lexer.l"
-{ return EMISSION; }
-	YY_BREAK
-case 80:
-YY_RULE_SETUP
-#line 257 "program_lexer.l"
-{ return ENV; }
-	YY_BREAK
-case 81:
-YY_RULE_SETUP
-#line 258 "program_lexer.l"
-{ return EYE; }
-	YY_BREAK
-case 82:
-YY_RULE_SETUP
-#line 259 "program_lexer.l"
-{ return FOGCOORD; }
-	YY_BREAK
-case 83:
-YY_RULE_SETUP
-#line 260 "program_lexer.l"
-{ return FOG; }
-	YY_BREAK
-case 84:
-YY_RULE_SETUP
-#line 261 "program_lexer.l"
-{ return FRONT; }
-	YY_BREAK
-case 85:
-YY_RULE_SETUP
-#line 262 "program_lexer.l"
-{ return HALF; }
-	YY_BREAK
-case 86:
-YY_RULE_SETUP
-#line 263 "program_lexer.l"
-{ return INVERSE; }
-	YY_BREAK
-case 87:
-YY_RULE_SETUP
-#line 264 "program_lexer.l"
-{ return INVTRANS; }
-	YY_BREAK
-case 88:
-YY_RULE_SETUP
-#line 265 "program_lexer.l"
-{ return LIGHT; }
-	YY_BREAK
-case 89:
-YY_RULE_SETUP
-#line 266 "program_lexer.l"
-{ return LIGHTMODEL; }
-	YY_BREAK
-case 90:
-YY_RULE_SETUP
-#line 267 "program_lexer.l"
-{ return LIGHTPROD; }
-	YY_BREAK
-case 91:
-YY_RULE_SETUP
-#line 268 "program_lexer.l"
-{ return LOCAL; }
-	YY_BREAK
-case 92:
-YY_RULE_SETUP
-#line 269 "program_lexer.l"
-{ return MATERIAL; }
-	YY_BREAK
-case 93:
-YY_RULE_SETUP
-#line 270 "program_lexer.l"
-{ return MAT_PROGRAM; }
-	YY_BREAK
-case 94:
-YY_RULE_SETUP
-#line 271 "program_lexer.l"
-{ return MATRIX; }
-	YY_BREAK
-case 95:
-YY_RULE_SETUP
-#line 272 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, MATRIXINDEX); }
-	YY_BREAK
-case 96:
-YY_RULE_SETUP
-#line 273 "program_lexer.l"
-{ return MODELVIEW; }
-	YY_BREAK
-case 97:
-YY_RULE_SETUP
-#line 274 "program_lexer.l"
-{ return MVP; }
-	YY_BREAK
-case 98:
-YY_RULE_SETUP
-#line 275 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, NORMAL); }
-	YY_BREAK
-case 99:
-YY_RULE_SETUP
-#line 276 "program_lexer.l"
-{ return OBJECT; }
-	YY_BREAK
-case 100:
-YY_RULE_SETUP
-#line 277 "program_lexer.l"
-{ return PALETTE; }
-	YY_BREAK
-case 101:
-YY_RULE_SETUP
-#line 278 "program_lexer.l"
-{ return PARAMS; }
-	YY_BREAK
-case 102:
-YY_RULE_SETUP
-#line 279 "program_lexer.l"
-{ return PLANE; }
-	YY_BREAK
-case 103:
-YY_RULE_SETUP
-#line 280 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, POINT_TOK); }
-	YY_BREAK
-case 104:
-YY_RULE_SETUP
-#line 281 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, POINTSIZE); }
-	YY_BREAK
-case 105:
-YY_RULE_SETUP
-#line 282 "program_lexer.l"
-{ return POSITION; }
-	YY_BREAK
-case 106:
-YY_RULE_SETUP
-#line 283 "program_lexer.l"
-{ return PRIMARY; }
-	YY_BREAK
-case 107:
-YY_RULE_SETUP
-#line 284 "program_lexer.l"
-{ return PROJECTION; }
-	YY_BREAK
-case 108:
-YY_RULE_SETUP
-#line 285 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_fp, RANGE); }
-	YY_BREAK
-case 109:
-YY_RULE_SETUP
-#line 286 "program_lexer.l"
-{ return ROW; }
-	YY_BREAK
-case 110:
-YY_RULE_SETUP
-#line 287 "program_lexer.l"
-{ return SCENECOLOR; }
-	YY_BREAK
-case 111:
-YY_RULE_SETUP
-#line 288 "program_lexer.l"
-{ return SECONDARY; }
-	YY_BREAK
-case 112:
-YY_RULE_SETUP
-#line 289 "program_lexer.l"
-{ return SHININESS; }
-	YY_BREAK
-case 113:
-YY_RULE_SETUP
-#line 290 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, SIZE_TOK); }
-	YY_BREAK
-case 114:
-YY_RULE_SETUP
-#line 291 "program_lexer.l"
-{ return SPECULAR; }
-	YY_BREAK
-case 115:
-YY_RULE_SETUP
-#line 292 "program_lexer.l"
-{ return SPOT; }
-	YY_BREAK
-case 116:
-YY_RULE_SETUP
-#line 293 "program_lexer.l"
-{ return TEXCOORD; }
-	YY_BREAK
-case 117:
-YY_RULE_SETUP
-#line 294 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_fp, TEXENV); }
-	YY_BREAK
-case 118:
-YY_RULE_SETUP
-#line 295 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, TEXGEN); }
-	YY_BREAK
-case 119:
-YY_RULE_SETUP
-#line 296 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, TEXGEN_Q); }
-	YY_BREAK
-case 120:
-YY_RULE_SETUP
-#line 297 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, TEXGEN_S); }
-	YY_BREAK
-case 121:
-YY_RULE_SETUP
-#line 298 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, TEXGEN_T); }
-	YY_BREAK
-case 122:
-YY_RULE_SETUP
-#line 299 "program_lexer.l"
-{ return TEXTURE; }
-	YY_BREAK
-case 123:
-YY_RULE_SETUP
-#line 300 "program_lexer.l"
-{ return TRANSPOSE; }
-	YY_BREAK
-case 124:
-YY_RULE_SETUP
-#line 301 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, VTXATTRIB); }
-	YY_BREAK
-case 125:
-YY_RULE_SETUP
-#line 302 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, WEIGHT); }
-	YY_BREAK
-case 126:
-YY_RULE_SETUP
-#line 304 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp, TEXTURE_UNIT); }
-	YY_BREAK
-case 127:
-YY_RULE_SETUP
-#line 305 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp, TEX_1D); }
-	YY_BREAK
-case 128:
-YY_RULE_SETUP
-#line 306 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp, TEX_2D); }
-	YY_BREAK
-case 129:
-YY_RULE_SETUP
-#line 307 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp, TEX_3D); }
-	YY_BREAK
-case 130:
-YY_RULE_SETUP
-#line 308 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp, TEX_CUBE); }
-	YY_BREAK
-case 131:
-YY_RULE_SETUP
-#line 309 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp && require_rect, TEX_RECT); }
-	YY_BREAK
-case 132:
-YY_RULE_SETUP
-#line 310 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow, TEX_SHADOW1D); }
-	YY_BREAK
-case 133:
-YY_RULE_SETUP
-#line 311 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow, TEX_SHADOW2D); }
-	YY_BREAK
-case 134:
-YY_RULE_SETUP
-#line 312 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow && require_rect, TEX_SHADOWRECT); }
-	YY_BREAK
-case 135:
-YY_RULE_SETUP
-#line 313 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp && require_texarray, TEX_ARRAY1D); }
-	YY_BREAK
-case 136:
-YY_RULE_SETUP
-#line 314 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp && require_texarray, TEX_ARRAY2D); }
-	YY_BREAK
-case 137:
-YY_RULE_SETUP
-#line 315 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow && require_texarray, TEX_ARRAYSHADOW1D); }
-	YY_BREAK
-case 138:
-YY_RULE_SETUP
-#line 316 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow && require_texarray, TEX_ARRAYSHADOW2D); }
-	YY_BREAK
-case 139:
-YY_RULE_SETUP
-#line 318 "program_lexer.l"
-{ return handle_ident(yyextra, yytext, yylval); }
-	YY_BREAK
-case 140:
-YY_RULE_SETUP
-#line 320 "program_lexer.l"
-{ return DOT_DOT; }
-	YY_BREAK
-case 141:
-YY_RULE_SETUP
-#line 322 "program_lexer.l"
-{
-   yylval->integer = strtol(yytext, NULL, 10);
-   return INTEGER;
-}
-	YY_BREAK
-case 142:
-YY_RULE_SETUP
-#line 326 "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 330 "program_lexer.l"
-{
-   yylval->real = _mesa_strtof(yytext, NULL);
-   return REAL;
-}
-	YY_BREAK
-case 144:
-YY_RULE_SETUP
-#line 334 "program_lexer.l"
-{
-   yylval->real = _mesa_strtof(yytext, NULL);
-   return REAL;
-}
-	YY_BREAK
-case 145:
-YY_RULE_SETUP
-#line 338 "program_lexer.l"
-{
-   yylval->real = _mesa_strtof(yytext, NULL);
-   return REAL;
-}
-	YY_BREAK
-case 146:
-YY_RULE_SETUP
-#line 343 "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 349 "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 355 "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 360 "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 366 "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 372 "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 378 "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 384 "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 391 "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 400 "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 406 "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 412 "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 417 "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 423 "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 429 "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 435 "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 441 "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 449 "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 460 "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 469 "program_lexer.l"
-{ return DOT; }
-	YY_BREAK
-case 166:
-/* rule 166 can match eol */
-YY_RULE_SETUP
-#line 471 "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 478 "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 479 "program_lexer.l"
-/* eat comments */ ;
-	YY_BREAK
-case 169:
-YY_RULE_SETUP
-#line 480 "program_lexer.l"
-{ return yytext[0]; }
-	YY_BREAK
-case 170:
-YY_RULE_SETUP
-#line 481 "program_lexer.l"
-ECHO;
-	YY_BREAK
-#line 2464 "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 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 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 481 "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/shader/nvfragparse.c b/mesalib/src/mesa/shader/nvfragparse.c
deleted file mode 100644
index 0de3c5804..000000000
--- a/mesalib/src/mesa/shader/nvfragparse.c
+++ /dev/null
@@ -1,1588 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5
- *
- * Copyright (C) 1999-2005  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 nvfragparse.c
- * NVIDIA fragment program parser.
- * \author Brian Paul
- */
-
-/*
- * Regarding GL_NV_fragment_program:
- *
- * Portions of this software may use or implement intellectual
- * property owned and licensed by NVIDIA Corporation. NVIDIA disclaims
- * any and all warranties with respect to such intellectual property,
- * including any use thereof or modifications thereto.
- */
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/imports.h"
-#include "main/macros.h"
-#include "program.h"
-#include "prog_parameter.h"
-#include "prog_print.h"
-#include "prog_instruction.h"
-#include "nvfragparse.h"
-
-
-#define INPUT_1V     1
-#define INPUT_2V     2
-#define INPUT_3V     3
-#define INPUT_1S     4
-#define INPUT_2S     5
-#define INPUT_CC     6
-#define INPUT_1V_T   7  /* one source vector, plus textureId */
-#define INPUT_3V_T   8  /* one source vector, plus textureId */
-#define INPUT_NONE   9
-#define INPUT_1V_S  10  /* a string and a vector register */
-#define OUTPUT_V    20
-#define OUTPUT_S    21
-#define OUTPUT_NONE 22
-
-/* IRIX defines some of these */
-#undef _R
-#undef _H
-#undef _X
-#undef _C
-#undef _S
-
-/* Optional suffixes */
-#define _R  FLOAT32  /* float */
-#define _H  FLOAT16  /* half-float */
-#define _X  FIXED12  /* fixed */
-#define _C  0x08     /* set cond codes */
-#define _S  0x10     /* saturate, clamp result to [0,1] */
-
-struct instruction_pattern {
-   const char *name;
-   enum prog_opcode opcode;
-   GLuint inputs;
-   GLuint outputs;
-   GLuint suffixes;
-};
-
-static const struct instruction_pattern Instructions[] = {
-   { "ADD", OPCODE_ADD, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
-   { "COS", OPCODE_COS, INPUT_1S, OUTPUT_S, _R | _H |      _C | _S },
-   { "DDX", OPCODE_DDX, INPUT_1V, OUTPUT_V, _R | _H |      _C | _S },
-   { "DDY", OPCODE_DDY, INPUT_1V, OUTPUT_V, _R | _H |      _C | _S },
-   { "DP3", OPCODE_DP3, INPUT_2V, OUTPUT_S, _R | _H | _X | _C | _S },
-   { "DP4", OPCODE_DP4, INPUT_2V, OUTPUT_S, _R | _H | _X | _C | _S },
-   { "DST", OPCODE_DP4, INPUT_2V, OUTPUT_V, _R | _H |      _C | _S },
-   { "EX2", OPCODE_DP4, INPUT_1S, OUTPUT_S, _R | _H |      _C | _S },
-   { "FLR", OPCODE_FLR, INPUT_1V, OUTPUT_V, _R | _H | _X | _C | _S },
-   { "FRC", OPCODE_FRC, INPUT_1V, OUTPUT_V, _R | _H | _X | _C | _S },
-   { "KIL", OPCODE_KIL_NV, INPUT_CC, OUTPUT_NONE, 0                },
-   { "LG2", OPCODE_LG2, INPUT_1S, OUTPUT_S, _R | _H |      _C | _S },
-   { "LIT", OPCODE_LIT, INPUT_1V, OUTPUT_V, _R | _H |      _C | _S },
-   { "LRP", OPCODE_LRP, INPUT_3V, OUTPUT_V, _R | _H | _X | _C | _S },
-   { "MAD", OPCODE_MAD, INPUT_3V, OUTPUT_V, _R | _H | _X | _C | _S },
-   { "MAX", OPCODE_MAX, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
-   { "MIN", OPCODE_MIN, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
-   { "MOV", OPCODE_MOV, INPUT_1V, OUTPUT_V, _R | _H | _X | _C | _S },
-   { "MUL", OPCODE_MUL, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
-   { "PK2H",  OPCODE_PK2H,  INPUT_1V, OUTPUT_S, 0                  },
-   { "PK2US", OPCODE_PK2US, INPUT_1V, OUTPUT_S, 0                  },
-   { "PK4B",  OPCODE_PK4B,  INPUT_1V, OUTPUT_S, 0                  },
-   { "PK4UB", OPCODE_PK4UB, INPUT_1V, OUTPUT_S, 0                  },
-   { "POW", OPCODE_POW, INPUT_2S, OUTPUT_S, _R | _H |      _C | _S },
-   { "RCP", OPCODE_RCP, INPUT_1S, OUTPUT_S, _R | _H |      _C | _S },
-   { "RFL", OPCODE_RFL, INPUT_2V, OUTPUT_V, _R | _H |      _C | _S },
-   { "RSQ", OPCODE_RSQ, INPUT_1S, OUTPUT_S, _R | _H |      _C | _S },
-   { "SEQ", OPCODE_SEQ, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
-   { "SFL", OPCODE_SFL, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
-   { "SGE", OPCODE_SGE, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
-   { "SGT", OPCODE_SGT, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
-   { "SIN", OPCODE_SIN, INPUT_1S, OUTPUT_S, _R | _H |      _C | _S },
-   { "SLE", OPCODE_SLE, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
-   { "SLT", OPCODE_SLT, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
-   { "SNE", OPCODE_SNE, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
-   { "STR", OPCODE_STR, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
-   { "SUB", OPCODE_SUB, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
-   { "TEX", OPCODE_TEX, INPUT_1V_T, OUTPUT_V,              _C | _S },
-   { "TXD", OPCODE_TXD, INPUT_3V_T, OUTPUT_V,              _C | _S },
-   { "TXP", OPCODE_TXP_NV, INPUT_1V_T, OUTPUT_V,           _C | _S },
-   { "UP2H",  OPCODE_UP2H,  INPUT_1S, OUTPUT_V,            _C | _S },
-   { "UP2US", OPCODE_UP2US, INPUT_1S, OUTPUT_V,            _C | _S },
-   { "UP4B",  OPCODE_UP4B,  INPUT_1S, OUTPUT_V,            _C | _S },
-   { "UP4UB", OPCODE_UP4UB, INPUT_1S, OUTPUT_V,            _C | _S },
-   { "X2D", OPCODE_X2D, INPUT_3V, OUTPUT_V, _R | _H |      _C | _S },
-   { "PRINT", OPCODE_PRINT, INPUT_1V_S, OUTPUT_NONE, 0               },
-   { NULL, (enum prog_opcode) -1, 0, 0, 0 }
-};
-
-
-/*
- * Information needed or computed during parsing.
- * Remember, we can't modify the target program object until we've
- * _successfully_ parsed the program text.
- */
-struct parse_state {
-   GLcontext *ctx;
-   const GLubyte *start;              /* start of program string */
-   const GLubyte *pos;                /* current position */
-   const GLubyte *curLine;
-   struct gl_fragment_program *program;  /* current program */
-
-   struct gl_program_parameter_list *parameters;
-
-   GLuint numInst;                    /* number of instructions parsed */
-   GLuint inputsRead;                 /* bitmask of input registers used */
-   GLuint outputsWritten;             /* bitmask of 1 << FRAG_OUTPUT_* bits */
-   GLuint texturesUsed[MAX_TEXTURE_IMAGE_UNITS];
-};
-
-
-
-/*
- * Called whenever we find an error during parsing.
- */
-static void
-record_error(struct parse_state *parseState, const char *msg, int lineNo)
-{
-#ifdef DEBUG
-   GLint line, column;
-   const GLubyte *lineStr;
-   lineStr = _mesa_find_line_column(parseState->start,
-                                    parseState->pos, &line, &column);
-   _mesa_debug(parseState->ctx,
-               "nvfragparse.c(%d): line %d, column %d:%s (%s)\n",
-               lineNo, line, column, (char *) lineStr, msg);
-   free((void *) lineStr);
-#else
-   (void) lineNo;
-#endif
-
-   /* Check that no error was already recorded.  Only record the first one. */
-   if (parseState->ctx->Program.ErrorString[0] == 0) {
-      _mesa_set_program_error(parseState->ctx,
-                              parseState->pos - parseState->start,
-                              msg);
-   }
-}
-
-
-#define RETURN_ERROR							\
-do {									\
-   record_error(parseState, "Unexpected end of input.", __LINE__);	\
-   return GL_FALSE;							\
-} while(0)
-
-#define RETURN_ERROR1(msg)						\
-do {									\
-   record_error(parseState, msg, __LINE__);				\
-   return GL_FALSE;							\
-} while(0)
-
-#define RETURN_ERROR2(msg1, msg2)					\
-do {									\
-   char err[1000];							\
-   sprintf(err, "%s %s", msg1, msg2);				\
-   record_error(parseState, err, __LINE__);				\
-   return GL_FALSE;							\
-} while(0)
-
-
-
-
-/*
- * Search a list of instruction structures for a match.
- */
-static struct instruction_pattern
-MatchInstruction(const GLubyte *token)
-{
-   const struct instruction_pattern *inst;
-   struct instruction_pattern result;
-
-   result.name = NULL;
-   result.opcode = MAX_OPCODE; /* i.e. invalid instruction */
-   result.inputs = 0;
-   result.outputs = 0;
-   result.suffixes = 0;
-
-   for (inst = Instructions; inst->name; inst++) {
-      if (strncmp((const char *) token, inst->name, 3) == 0) {
-         /* matched! */
-         int i = 3;
-         result = *inst;
-         result.suffixes = 0;
-         /* look at suffix */
-         if (token[i] == 'R') {
-            result.suffixes |= _R;
-            i++;
-         }
-         else if (token[i] == 'H') {
-            result.suffixes |= _H;
-            i++;
-         }
-         else if (token[i] == 'X') {
-            result.suffixes |= _X;
-            i++;
-         }
-         if (token[i] == 'C') {
-            result.suffixes |= _C;
-            i++;
-         }
-         if (token[i] == '_' && token[i+1] == 'S' &&
-             token[i+2] == 'A' && token[i+3] == 'T') {
-            result.suffixes |= _S;
-         }
-         return result;
-      }
-   }
-
-   return result;
-}
-
-
-
-
-/**********************************************************************/
-
-
-static GLboolean IsLetter(GLubyte b)
-{
-   return (b >= 'a' && b <= 'z') ||
-          (b >= 'A' && b <= 'Z') ||
-          (b == '_') ||
-          (b == '$');
-}
-
-
-static GLboolean IsDigit(GLubyte b)
-{
-   return b >= '0' && b <= '9';
-}
-
-
-static GLboolean IsWhitespace(GLubyte b)
-{
-   return b == ' ' || b == '\t' || b == '\n' || b == '\r';
-}
-
-
-/**
- * Starting at 'str' find the next token.  A token can be an integer,
- * an identifier or punctuation symbol.
- * \return <= 0 we found an error, else, return number of characters parsed.
- */
-static GLint
-GetToken(struct parse_state *parseState, GLubyte *token)
-{
-   const GLubyte *str = parseState->pos;
-   GLint i = 0, j = 0;
-
-   token[0] = 0;
-
-   /* skip whitespace and comments */
-   while (str[i] && (IsWhitespace(str[i]) || str[i] == '#')) {
-      if (str[i] == '#') {
-         /* skip comment */
-         while (str[i] && (str[i] != '\n' && str[i] != '\r')) {
-            i++;
-         }
-         if (str[i] == '\n' || str[i] == '\r')
-            parseState->curLine = str + i + 1;
-      }
-      else {
-         /* skip whitespace */
-         if (str[i] == '\n' || str[i] == '\r')
-            parseState->curLine = str + i + 1;
-         i++;
-      }
-   }
-
-   if (str[i] == 0)
-      return -i;
-
-   /* try matching an integer */
-   while (str[i] && IsDigit(str[i])) {
-      token[j++] = str[i++];
-   }
-   if (j > 0 || !str[i]) {
-      token[j] = 0;
-      return i;
-   }
-
-   /* try matching an identifier */
-   if (IsLetter(str[i])) {
-      while (str[i] && (IsLetter(str[i]) || IsDigit(str[i]))) {
-         token[j++] = str[i++];
-      }
-      token[j] = 0;
-      return i;
-   }
-
-   /* punctuation character */
-   if (str[i]) {
-      token[0] = str[i++];
-      token[1] = 0;
-      return i;
-   }
-
-   /* end of input */
-   token[0] = 0;
-   return i;
-}
-
-
-/**
- * Get next token from input stream and increment stream pointer past token.
- */
-static GLboolean
-Parse_Token(struct parse_state *parseState, GLubyte *token)
-{
-   GLint i;
-   i = GetToken(parseState, token);
-   if (i <= 0) {
-      parseState->pos += (-i);
-      return GL_FALSE;
-   }
-   parseState->pos += i;
-   return GL_TRUE;
-}
-
-
-/**
- * Get next token from input stream but don't increment stream pointer.
- */
-static GLboolean
-Peek_Token(struct parse_state *parseState, GLubyte *token)
-{
-   GLint i, len;
-   i = GetToken(parseState, token);
-   if (i <= 0) {
-      parseState->pos += (-i);
-      return GL_FALSE;
-   }
-   len = (GLint) strlen((const char *) token);
-   parseState->pos += (i - len);
-   return GL_TRUE;
-}
-
-
-/**********************************************************************/
-
-static const char *InputRegisters[MAX_NV_FRAGMENT_PROGRAM_INPUTS + 1] = {
-   "WPOS", "COL0", "COL1", "FOGC",
-   "TEX0", "TEX1", "TEX2", "TEX3", "TEX4", "TEX5", "TEX6", "TEX7", NULL
-};
-
-
-
-/**********************************************************************/
-
-/**
- * Try to match 'pattern' as the next token after any whitespace/comments.
- */
-static GLboolean
-Parse_String(struct parse_state *parseState, const char *pattern)
-{
-   const GLubyte *m;
-   GLint i;
-
-   /* skip whitespace and comments */
-   while (IsWhitespace(*parseState->pos) || *parseState->pos == '#') {
-      if (*parseState->pos == '#') {
-         while (*parseState->pos && (*parseState->pos != '\n' && *parseState->pos != '\r')) {
-            parseState->pos += 1;
-         }
-         if (*parseState->pos == '\n' || *parseState->pos == '\r')
-            parseState->curLine = parseState->pos + 1;
-      }
-      else {
-         /* skip whitespace */
-         if (*parseState->pos == '\n' || *parseState->pos == '\r')
-            parseState->curLine = parseState->pos + 1;
-         parseState->pos += 1;
-      }
-   }
-
-   /* Try to match the pattern */
-   m = parseState->pos;
-   for (i = 0; pattern[i]; i++) {
-      if (*m != (GLubyte) pattern[i])
-         return GL_FALSE;
-      m += 1;
-   }
-   parseState->pos = m;
-
-   return GL_TRUE; /* success */
-}
-
-
-static GLboolean
-Parse_Identifier(struct parse_state *parseState, GLubyte *ident)
-{
-   if (!Parse_Token(parseState, ident))
-      RETURN_ERROR;
-   if (IsLetter(ident[0]))
-      return GL_TRUE;
-   else
-      RETURN_ERROR1("Expected an identfier");
-}
-
-
-/**
- * Parse a floating point constant, or a defined symbol name.
- * [+/-]N[.N[eN]]
- * Output:  number[0 .. 3] will get the value.
- */
-static GLboolean
-Parse_ScalarConstant(struct parse_state *parseState, GLfloat *number)
-{
-   char *end = NULL;
-
-   *number = (GLfloat) _mesa_strtof((const char *) parseState->pos, &end);
-
-   if (end && end > (char *) parseState->pos) {
-      /* got a number */
-      parseState->pos = (GLubyte *) end;
-      number[1] = *number;
-      number[2] = *number;
-      number[3] = *number;
-      return GL_TRUE;
-   }
-   else {
-      /* should be an identifier */
-      GLubyte ident[100];
-      const GLfloat *constant;
-      if (!Parse_Identifier(parseState, ident))
-         RETURN_ERROR1("Expected an identifier");
-      constant = _mesa_lookup_parameter_value(parseState->parameters,
-                                              -1, (const char *) ident);
-      /* XXX Check that it's a constant and not a parameter */
-      if (!constant) {
-         RETURN_ERROR1("Undefined symbol");
-      }
-      else {
-         COPY_4V(number, constant);
-         return GL_TRUE;
-      }
-   }
-}
-
-
-
-/**
- * Parse a vector constant, one of:
- *   { float }
- *   { float, float }
- *   { float, float, float }
- *   { float, float, float, float }
- */
-static GLboolean
-Parse_VectorConstant(struct parse_state *parseState, GLfloat *vec)
-{
-   /* "{" was already consumed */
-
-   ASSIGN_4V(vec, 0.0, 0.0, 0.0, 1.0);
-
-   if (!Parse_ScalarConstant(parseState, vec+0))  /* X */
-      return GL_FALSE;
-
-   if (Parse_String(parseState, "}")) {
-      return GL_TRUE;
-   }
-
-   if (!Parse_String(parseState, ","))
-      RETURN_ERROR1("Expected comma in vector constant");
-
-   if (!Parse_ScalarConstant(parseState, vec+1))  /* Y */
-      return GL_FALSE;
-
-   if (Parse_String(parseState, "}")) {
-      return GL_TRUE;
-   }
-
-   if (!Parse_String(parseState, ","))
-      RETURN_ERROR1("Expected comma in vector constant");
-
-   if (!Parse_ScalarConstant(parseState, vec+2))  /* Z */
-      return GL_FALSE;
-
-   if (Parse_String(parseState, "}")) {
-      return GL_TRUE;
-   }
-
-   if (!Parse_String(parseState, ","))
-      RETURN_ERROR1("Expected comma in vector constant");
-
-   if (!Parse_ScalarConstant(parseState, vec+3))  /* W */
-      return GL_FALSE;
-
-   if (!Parse_String(parseState, "}"))
-      RETURN_ERROR1("Expected closing brace in vector constant");
-
-   return GL_TRUE;
-}
-
-
-/**
- * Parse <number>, <varname> or {a, b, c, d}.
- * Return number of values in the vector or scalar, or zero if parse error.
- */
-static GLuint
-Parse_VectorOrScalarConstant(struct parse_state *parseState, GLfloat *vec)
-{
-   if (Parse_String(parseState, "{")) {
-      return Parse_VectorConstant(parseState, vec);
-   }
-   else {
-      GLboolean b = Parse_ScalarConstant(parseState, vec);
-      if (b) {
-         vec[1] = vec[2] = vec[3] = vec[0];
-      }
-      return b;
-   }
-}
-
-
-/**
- * Parse a texture image source:
- *    [TEX0 | TEX1 | .. | TEX15] , [1D | 2D | 3D | CUBE | RECT]
- */
-static GLboolean
-Parse_TextureImageId(struct parse_state *parseState,
-                     GLubyte *texUnit, GLubyte *texTargetBit)
-{
-   GLubyte imageSrc[100];
-   GLint unit;
-
-   if (!Parse_Token(parseState, imageSrc))
-      RETURN_ERROR;
-   
-   if (imageSrc[0] != 'T' ||
-       imageSrc[1] != 'E' ||
-       imageSrc[2] != 'X') {
-      RETURN_ERROR1("Expected TEX# source");
-   }
-   unit = atoi((const char *) imageSrc + 3);
-   if ((unit < 0 || unit > MAX_TEXTURE_IMAGE_UNITS) ||
-       (unit == 0 && (imageSrc[3] != '0' || imageSrc[4] != 0))) {
-      RETURN_ERROR1("Invalied TEX# source index");
-   }
-   *texUnit = unit;
-
-   if (!Parse_String(parseState, ","))
-      RETURN_ERROR1("Expected ,");
-
-   if (Parse_String(parseState, "1D")) {
-      *texTargetBit = TEXTURE_1D_BIT;
-   }
-   else if (Parse_String(parseState, "2D")) {
-      *texTargetBit = TEXTURE_2D_BIT;
-   }
-   else if (Parse_String(parseState, "3D")) {
-      *texTargetBit = TEXTURE_3D_BIT;
-   }
-   else if (Parse_String(parseState, "CUBE")) {
-      *texTargetBit = TEXTURE_CUBE_BIT;
-   }
-   else if (Parse_String(parseState, "RECT")) {
-      *texTargetBit = TEXTURE_RECT_BIT;
-   }
-   else {
-      RETURN_ERROR1("Invalid texture target token");
-   }
-
-   /* update record of referenced texture units */
-   parseState->texturesUsed[*texUnit] |= *texTargetBit;
-   if (_mesa_bitcount(parseState->texturesUsed[*texUnit]) > 1) {
-      RETURN_ERROR1("Only one texture target can be used per texture unit.");
-   }
-
-   return GL_TRUE;
-}
-
-
-/**
- * Parse a scalar suffix like .x, .y, .z or .w or parse a swizzle suffix
- * like .wxyz, .xxyy, etc and return the swizzle indexes.
- */
-static GLboolean
-Parse_SwizzleSuffix(const GLubyte *token, GLuint swizzle[4])
-{
-   if (token[1] == 0) {
-      /* single letter swizzle (scalar) */
-      if (token[0] == 'x')
-         ASSIGN_4V(swizzle, 0, 0, 0, 0);
-      else if (token[0] == 'y')
-         ASSIGN_4V(swizzle, 1, 1, 1, 1);
-      else if (token[0] == 'z')
-         ASSIGN_4V(swizzle, 2, 2, 2, 2);
-      else if (token[0] == 'w')
-         ASSIGN_4V(swizzle, 3, 3, 3, 3);
-      else
-         return GL_FALSE;
-   }
-   else {
-      /* 4-component swizzle (vector) */
-      GLint k;
-      for (k = 0; k < 4 && token[k]; k++) {
-         if (token[k] == 'x')
-            swizzle[k] = 0;
-         else if (token[k] == 'y')
-            swizzle[k] = 1;
-         else if (token[k] == 'z')
-            swizzle[k] = 2;
-         else if (token[k] == 'w')
-            swizzle[k] = 3;
-         else
-            return GL_FALSE;
-      }
-      if (k != 4)
-         return GL_FALSE;
-   }
-   return GL_TRUE;
-}
-
-
-static GLboolean
-Parse_CondCodeMask(struct parse_state *parseState,
-                   struct prog_dst_register *dstReg)
-{
-   if (Parse_String(parseState, "EQ"))
-      dstReg->CondMask = COND_EQ;
-   else if (Parse_String(parseState, "GE"))
-      dstReg->CondMask = COND_GE;
-   else if (Parse_String(parseState, "GT"))
-      dstReg->CondMask = COND_GT;
-   else if (Parse_String(parseState, "LE"))
-      dstReg->CondMask = COND_LE;
-   else if (Parse_String(parseState, "LT"))
-      dstReg->CondMask = COND_LT;
-   else if (Parse_String(parseState, "NE"))
-      dstReg->CondMask = COND_NE;
-   else if (Parse_String(parseState, "TR"))
-      dstReg->CondMask = COND_TR;
-   else if (Parse_String(parseState, "FL"))
-      dstReg->CondMask = COND_FL;
-   else
-      RETURN_ERROR1("Invalid condition code mask");
-
-   /* look for optional .xyzw swizzle */
-   if (Parse_String(parseState, ".")) {
-      GLubyte token[100];
-      GLuint swz[4];
-
-      if (!Parse_Token(parseState, token))  /* get xyzw suffix */
-         RETURN_ERROR;
-
-      if (!Parse_SwizzleSuffix(token, swz))
-         RETURN_ERROR1("Invalid swizzle suffix");
-
-      dstReg->CondSwizzle = MAKE_SWIZZLE4(swz[0], swz[1], swz[2], swz[3]);
-   }
-
-   return GL_TRUE;
-}
-
-
-/**
- * Parse a temporary register: Rnn or Hnn
- */
-static GLboolean
-Parse_TempReg(struct parse_state *parseState, GLint *tempRegNum)
-{
-   GLubyte token[100];
-
-   /* Should be 'R##' or 'H##' */
-   if (!Parse_Token(parseState, token))
-      RETURN_ERROR;
-   if (token[0] != 'R' && token[0] != 'H')
-      RETURN_ERROR1("Expected R## or H##");
-
-   if (IsDigit(token[1])) {
-      GLint reg = atoi((const char *) (token + 1));
-      if (token[0] == 'H')
-         reg += 32;
-      if (reg >= MAX_NV_FRAGMENT_PROGRAM_TEMPS)
-         RETURN_ERROR1("Invalid temporary register name");
-      *tempRegNum = reg;
-   }
-   else {
-      RETURN_ERROR1("Invalid temporary register name");
-   }
-
-   return GL_TRUE;
-}
-
-
-/**
- * Parse a write-only dummy register: RC or HC.
- */
-static GLboolean
-Parse_DummyReg(struct parse_state *parseState, GLint *regNum)
-{
-   if (Parse_String(parseState, "RC")) {
-       *regNum = 0;
-   }
-   else if (Parse_String(parseState, "HC")) {
-       *regNum = 1;
-   }
-   else {
-      RETURN_ERROR1("Invalid write-only register name");
-   }
-
-   return GL_TRUE;
-}
-
-
-/**
- * Parse a program local parameter register "p[##]"
- */
-static GLboolean
-Parse_ProgramParamReg(struct parse_state *parseState, GLint *regNum)
-{
-   GLubyte token[100];
-
-   if (!Parse_String(parseState, "p["))
-      RETURN_ERROR1("Expected p[");
-
-   if (!Parse_Token(parseState, token))
-      RETURN_ERROR;
-
-   if (IsDigit(token[0])) {
-      /* a numbered program parameter register */
-      GLint reg = atoi((const char *) token);
-      if (reg >= MAX_NV_FRAGMENT_PROGRAM_PARAMS)
-         RETURN_ERROR1("Invalid constant program number");
-      *regNum = reg;
-   }
-   else {
-      RETURN_ERROR;
-   }
-
-   if (!Parse_String(parseState, "]"))
-      RETURN_ERROR1("Expected ]");
-
-   return GL_TRUE;
-}
-
-
-/**
- * Parse f[name]  - fragment input register
- */
-static GLboolean
-Parse_FragReg(struct parse_state *parseState, GLint *tempRegNum)
-{
-   GLubyte token[100];
-   GLint j;
-
-   /* Match 'f[' */
-   if (!Parse_String(parseState, "f["))
-      RETURN_ERROR1("Expected f[");
-
-   /* get <name> and look for match */
-   if (!Parse_Token(parseState, token)) {
-      RETURN_ERROR;
-   }
-   for (j = 0; InputRegisters[j]; j++) {
-      if (strcmp((const char *) token, InputRegisters[j]) == 0) {
-         *tempRegNum = j;
-         parseState->inputsRead |= (1 << j);
-         break;
-      }
-   }
-   if (!InputRegisters[j]) {
-      /* unknown input register label */
-      RETURN_ERROR2("Invalid register name", token);
-   }
-
-   /* Match '[' */
-   if (!Parse_String(parseState, "]"))
-      RETURN_ERROR1("Expected ]");
-
-   return GL_TRUE;
-}
-
-
-static GLboolean
-Parse_OutputReg(struct parse_state *parseState, GLint *outputRegNum)
-{
-   GLubyte token[100];
-
-   /* Match "o[" */
-   if (!Parse_String(parseState, "o["))
-      RETURN_ERROR1("Expected o[");
-
-   /* Get output reg name */
-   if (!Parse_Token(parseState, token))
-      RETURN_ERROR;
-
-   /* try to match an output register name */
-   if (strcmp((char *) token, "COLR") == 0 ||
-       strcmp((char *) token, "COLH") == 0) {
-      /* note that we don't distinguish between COLR and COLH */
-      *outputRegNum = FRAG_RESULT_COLOR;
-      parseState->outputsWritten |= (1 << FRAG_RESULT_COLOR);
-   }
-   else if (strcmp((char *) token, "DEPR") == 0) {
-      *outputRegNum = FRAG_RESULT_DEPTH;
-      parseState->outputsWritten |= (1 << FRAG_RESULT_DEPTH);
-   }
-   else {
-      RETURN_ERROR1("Invalid output register name");
-   }
-
-   /* Match ']' */
-   if (!Parse_String(parseState, "]"))
-      RETURN_ERROR1("Expected ]");
-
-   return GL_TRUE;
-}
-
-
-static GLboolean
-Parse_MaskedDstReg(struct parse_state *parseState,
-                   struct prog_dst_register *dstReg)
-{
-   GLubyte token[100];
-   GLint idx;
-
-   /* Dst reg can be R<n>, H<n>, o[n], RC or HC */
-   if (!Peek_Token(parseState, token))
-      RETURN_ERROR;
-
-   if (strcmp((const char *) token, "RC") == 0 ||
-       strcmp((const char *) token, "HC") == 0) {
-      /* a write-only register */
-      dstReg->File = PROGRAM_WRITE_ONLY;
-      if (!Parse_DummyReg(parseState, &idx))
-         RETURN_ERROR;
-      dstReg->Index = idx;
-   }
-   else if (token[0] == 'R' || token[0] == 'H') {
-      /* a temporary register */
-      dstReg->File = PROGRAM_TEMPORARY;
-      if (!Parse_TempReg(parseState, &idx))
-         RETURN_ERROR;
-      dstReg->Index = idx;
-   }
-   else if (token[0] == 'o') {
-      /* an output register */
-      dstReg->File = PROGRAM_OUTPUT;
-      if (!Parse_OutputReg(parseState, &idx))
-         RETURN_ERROR;
-      dstReg->Index = idx;
-   }
-   else {
-      RETURN_ERROR1("Invalid destination register name");
-   }
-
-   /* Parse optional write mask */
-   if (Parse_String(parseState, ".")) {
-      /* got a mask */
-      GLint k = 0;
-
-      if (!Parse_Token(parseState, token))  /* get xyzw writemask */
-         RETURN_ERROR;
-
-      dstReg->WriteMask = 0;
-
-      if (token[k] == 'x') {
-         dstReg->WriteMask |= WRITEMASK_X;
-         k++;
-      }
-      if (token[k] == 'y') {
-         dstReg->WriteMask |= WRITEMASK_Y;
-         k++;
-      }
-      if (token[k] == 'z') {
-         dstReg->WriteMask |= WRITEMASK_Z;
-         k++;
-      }
-      if (token[k] == 'w') {
-         dstReg->WriteMask |= WRITEMASK_W;
-         k++;
-      }
-      if (k == 0) {
-         RETURN_ERROR1("Invalid writemask character");
-      }
-
-   }
-   else {
-      dstReg->WriteMask = WRITEMASK_XYZW;
-   }
-
-   /* optional condition code mask */
-   if (Parse_String(parseState, "(")) {
-      /* ("EQ" | "GE" | "GT" | "LE" | "LT" | "NE" | "TR" | "FL".x|y|z|w) */
-      /* ("EQ" | "GE" | "GT" | "LE" | "LT" | "NE" | "TR" | "FL".[xyzw]) */
-      if (!Parse_CondCodeMask(parseState, dstReg))
-         RETURN_ERROR;
-
-      if (!Parse_String(parseState, ")"))  /* consume ")" */
-         RETURN_ERROR1("Expected )");
-
-      return GL_TRUE;
-   }
-   else {
-      /* no cond code mask */
-      dstReg->CondMask = COND_TR;
-      dstReg->CondSwizzle = SWIZZLE_NOOP;
-      return GL_TRUE;
-   }
-}
-
-
-/**
- * Parse a vector source (register, constant, etc):
- *   <vectorSrc>    ::= <absVectorSrc>
- *                    | <baseVectorSrc>
- *   <absVectorSrc> ::= <negate> "|" <baseVectorSrc> "|"
- */
-static GLboolean
-Parse_VectorSrc(struct parse_state *parseState,
-                struct prog_src_register *srcReg)
-{
-   GLfloat sign = 1.0F;
-   GLubyte token[100];
-   GLint idx;
-   GLuint negateBase, negateAbs;
-
-   /*
-    * First, take care of +/- and absolute value stuff.
-    */
-   if (Parse_String(parseState, "-"))
-      sign = -1.0F;
-   else if (Parse_String(parseState, "+"))
-      sign = +1.0F;
-
-   if (Parse_String(parseState, "|")) {
-      srcReg->Abs = GL_TRUE;
-      negateAbs = (sign < 0.0F) ? NEGATE_XYZW : NEGATE_NONE;
-
-      if (Parse_String(parseState, "-"))
-         negateBase = NEGATE_XYZW;
-      else if (Parse_String(parseState, "+"))
-         negateBase = NEGATE_NONE;
-      else
-         negateBase = NEGATE_NONE;
-   }
-   else {
-      srcReg->Abs = GL_FALSE;
-      negateAbs = NEGATE_NONE;
-      negateBase = (sign < 0.0F) ? NEGATE_XYZW : NEGATE_NONE;
-   }
-
-   srcReg->Negate = srcReg->Abs ? negateAbs : negateBase;
-
-   /* This should be the real src vector/register name */
-   if (!Peek_Token(parseState, token))
-      RETURN_ERROR;
-
-   /* Src reg can be Rn, Hn, f[n], p[n], a named parameter, a scalar
-    * literal or vector literal.
-    */
-   if (token[0] == 'R' || token[0] == 'H') {
-      srcReg->File = PROGRAM_TEMPORARY;
-      if (!Parse_TempReg(parseState, &idx))
-         RETURN_ERROR;
-      srcReg->Index = idx;
-   }
-   else if (token[0] == 'f') {
-      /* XXX this might be an identifier! */
-      srcReg->File = PROGRAM_INPUT;
-      if (!Parse_FragReg(parseState, &idx))
-         RETURN_ERROR;
-      srcReg->Index = idx;
-   }
-   else if (token[0] == 'p') {
-      /* XXX this might be an identifier! */
-      srcReg->File = PROGRAM_LOCAL_PARAM;
-      if (!Parse_ProgramParamReg(parseState, &idx))
-         RETURN_ERROR;
-      srcReg->Index = idx;
-   }
-   else if (IsLetter(token[0])){
-      GLubyte ident[100];
-      GLint paramIndex;
-      if (!Parse_Identifier(parseState, ident))
-         RETURN_ERROR;
-      paramIndex = _mesa_lookup_parameter_index(parseState->parameters,
-                                                -1, (const char *) ident);
-      if (paramIndex < 0) {
-         RETURN_ERROR2("Undefined constant or parameter: ", ident);
-      }
-      srcReg->File = PROGRAM_NAMED_PARAM;
-      srcReg->Index = paramIndex;      
-   }
-   else if (IsDigit(token[0]) || token[0] == '-' || token[0] == '+' || token[0] == '.'){
-      /* literal scalar constant */
-      GLfloat values[4];
-      GLuint paramIndex;
-      if (!Parse_ScalarConstant(parseState, values))
-         RETURN_ERROR;
-      paramIndex = _mesa_add_unnamed_constant(parseState->parameters,
-                                              values, 4, NULL);
-      srcReg->File = PROGRAM_NAMED_PARAM;
-      srcReg->Index = paramIndex;
-   }
-   else if (token[0] == '{'){
-      /* literal vector constant */
-      GLfloat values[4];
-      GLuint paramIndex;
-      (void) Parse_String(parseState, "{");
-      if (!Parse_VectorConstant(parseState, values))
-         RETURN_ERROR;
-      paramIndex = _mesa_add_unnamed_constant(parseState->parameters,
-                                              values, 4, NULL);
-      srcReg->File = PROGRAM_NAMED_PARAM;
-      srcReg->Index = paramIndex;      
-   }
-   else {
-      RETURN_ERROR2("Invalid source register name", token);
-   }
-
-   /* init swizzle fields */
-   srcReg->Swizzle = SWIZZLE_NOOP;
-
-   /* Look for optional swizzle suffix */
-   if (Parse_String(parseState, ".")) {
-      GLuint swz[4];
-
-      if (!Parse_Token(parseState, token))
-         RETURN_ERROR;
-
-      if (!Parse_SwizzleSuffix(token, swz))
-         RETURN_ERROR1("Invalid swizzle suffix");
-
-      srcReg->Swizzle = MAKE_SWIZZLE4(swz[0], swz[1], swz[2], swz[3]);
-   }
-
-   /* Finish absolute value */
-   if (srcReg->Abs && !Parse_String(parseState, "|")) {
-      RETURN_ERROR1("Expected |");
-   }
-
-   return GL_TRUE;
-}
-
-
-static GLboolean
-Parse_ScalarSrcReg(struct parse_state *parseState,
-                   struct prog_src_register *srcReg)
-{
-   GLubyte token[100];
-   GLfloat sign = 1.0F;
-   GLboolean needSuffix = GL_TRUE;
-   GLint idx;
-   GLuint negateBase, negateAbs;
-
-   /*
-    * First, take care of +/- and absolute value stuff.
-    */
-   if (Parse_String(parseState, "-"))
-      sign = -1.0F;
-   else if (Parse_String(parseState, "+"))
-      sign = +1.0F;
-
-   if (Parse_String(parseState, "|")) {
-      srcReg->Abs = GL_TRUE;
-      negateAbs = (sign < 0.0F) ? NEGATE_XYZW : NEGATE_NONE;
-
-      if (Parse_String(parseState, "-"))
-         negateBase = NEGATE_XYZW;
-      else if (Parse_String(parseState, "+"))
-         negateBase = NEGATE_NONE;
-      else
-         negateBase = NEGATE_NONE;
-   }
-   else {
-      srcReg->Abs = GL_FALSE;
-      negateAbs = NEGATE_NONE;
-      negateBase = (sign < 0.0F) ? NEGATE_XYZW : NEGATE_NONE;
-   }
-
-   srcReg->Negate = srcReg->Abs ? negateAbs : negateBase;
-
-   if (!Peek_Token(parseState, token))
-      RETURN_ERROR;
-
-   /* Src reg can be R<n>, H<n> or a named fragment attrib */
-   if (token[0] == 'R' || token[0] == 'H') {
-      srcReg->File = PROGRAM_TEMPORARY;
-      if (!Parse_TempReg(parseState, &idx))
-         RETURN_ERROR;
-      srcReg->Index = idx;
-   }
-   else if (token[0] == 'f') {
-      srcReg->File = PROGRAM_INPUT;
-      if (!Parse_FragReg(parseState, &idx))
-         RETURN_ERROR;
-      srcReg->Index = idx;
-   }
-   else if (token[0] == '{') {
-      /* vector literal */
-      GLfloat values[4];
-      GLuint paramIndex;
-      (void) Parse_String(parseState, "{");
-      if (!Parse_VectorConstant(parseState, values))
-         RETURN_ERROR;
-      paramIndex = _mesa_add_unnamed_constant(parseState->parameters,
-                                              values, 4, NULL);
-      srcReg->File = PROGRAM_NAMED_PARAM;
-      srcReg->Index = paramIndex;      
-   }
-   else if (IsLetter(token[0])){
-      /* named param/constant */
-      GLubyte ident[100];
-      GLint paramIndex;
-      if (!Parse_Identifier(parseState, ident))
-         RETURN_ERROR;
-      paramIndex = _mesa_lookup_parameter_index(parseState->parameters,
-                                                -1, (const char *) ident);
-      if (paramIndex < 0) {
-         RETURN_ERROR2("Undefined constant or parameter: ", ident);
-      }
-      srcReg->File = PROGRAM_NAMED_PARAM;
-      srcReg->Index = paramIndex;      
-   }
-   else if (IsDigit(token[0])) {
-      /* scalar literal */
-      GLfloat values[4];
-      GLuint paramIndex;
-      if (!Parse_ScalarConstant(parseState, values))
-         RETURN_ERROR;
-      paramIndex = _mesa_add_unnamed_constant(parseState->parameters,
-                                              values, 4, NULL);
-      srcReg->Index = paramIndex;      
-      srcReg->File = PROGRAM_NAMED_PARAM;
-      needSuffix = GL_FALSE;
-   }
-   else {
-      RETURN_ERROR2("Invalid scalar source argument", token);
-   }
-
-   srcReg->Swizzle = 0;
-   if (needSuffix) {
-      /* parse .[xyzw] suffix */
-      if (!Parse_String(parseState, "."))
-         RETURN_ERROR1("Expected .");
-
-      if (!Parse_Token(parseState, token))
-         RETURN_ERROR;
-
-      if (token[0] == 'x' && token[1] == 0) {
-         srcReg->Swizzle = 0;
-      }
-      else if (token[0] == 'y' && token[1] == 0) {
-         srcReg->Swizzle = 1;
-      }
-      else if (token[0] == 'z' && token[1] == 0) {
-         srcReg->Swizzle = 2;
-      }
-      else if (token[0] == 'w' && token[1] == 0) {
-         srcReg->Swizzle = 3;
-      }
-      else {
-         RETURN_ERROR1("Invalid scalar source suffix");
-      }
-   }
-
-   /* Finish absolute value */
-   if (srcReg->Abs && !Parse_String(parseState, "|")) {
-      RETURN_ERROR1("Expected |");
-   }
-
-   return GL_TRUE;
-}
-
-
-static GLboolean
-Parse_PrintInstruction(struct parse_state *parseState,
-                       struct prog_instruction *inst)
-{
-   const GLubyte *str;
-   GLubyte *msg;
-   GLuint len;
-   GLint idx;
-
-   /* The first argument is a literal string 'just like this' */
-   if (!Parse_String(parseState, "'"))
-      RETURN_ERROR1("Expected '");
-
-   str = parseState->pos;
-   for (len = 0; str[len] != '\''; len++) /* find closing quote */
-      ;
-   parseState->pos += len + 1;
-   msg = (GLubyte*) malloc(len + 1);
-
-   memcpy(msg, str, len);
-   msg[len] = 0;
-   inst->Data = msg;
-
-   if (Parse_String(parseState, ",")) {
-      /* got an optional register to print */
-      GLubyte token[100];
-      GetToken(parseState, token);
-      if (token[0] == 'o') {
-         /* dst reg */
-         if (!Parse_OutputReg(parseState, &idx))
-            RETURN_ERROR;
-	 inst->SrcReg[0].Index = idx;
-         inst->SrcReg[0].File = PROGRAM_OUTPUT;
-      }
-      else {
-         /* src reg */
-         if (!Parse_VectorSrc(parseState, &inst->SrcReg[0]))
-            RETURN_ERROR;
-      }
-   }
-   else {
-      inst->SrcReg[0].File = PROGRAM_UNDEFINED;
-   }
-
-   inst->SrcReg[0].Swizzle = SWIZZLE_NOOP;
-   inst->SrcReg[0].Abs = GL_FALSE;
-   inst->SrcReg[0].Negate = NEGATE_NONE;
-
-   return GL_TRUE;
-}
-
-
-static GLboolean
-Parse_InstructionSequence(struct parse_state *parseState,
-                          struct prog_instruction program[])
-{
-   while (1) {
-      struct prog_instruction *inst = program + parseState->numInst;
-      struct instruction_pattern instMatch;
-      GLubyte token[100];
-
-      /* Initialize the instruction */
-      _mesa_init_instructions(inst, 1);
-
-      /* special instructions */
-      if (Parse_String(parseState, "DEFINE")) {
-         GLubyte id[100];
-         GLfloat value[7];  /* yes, 7 to be safe */
-         if (!Parse_Identifier(parseState, id))
-            RETURN_ERROR;
-         /* XXX make sure id is not a reserved identifer, like R9 */
-         if (!Parse_String(parseState, "="))
-            RETURN_ERROR1("Expected =");
-         if (!Parse_VectorOrScalarConstant(parseState, value))
-            RETURN_ERROR;
-         if (!Parse_String(parseState, ";"))
-            RETURN_ERROR1("Expected ;");
-         if (_mesa_lookup_parameter_index(parseState->parameters,
-                                          -1, (const char *) id) >= 0) {
-            RETURN_ERROR2(id, "already defined");
-         }
-         _mesa_add_named_parameter(parseState->parameters,
-                                   (const char *) id, value);
-      }
-      else if (Parse_String(parseState, "DECLARE")) {
-         GLubyte id[100];
-         GLfloat value[7] = {0, 0, 0, 0, 0, 0, 0};  /* yes, to be safe */
-         if (!Parse_Identifier(parseState, id))
-            RETURN_ERROR;
-         /* XXX make sure id is not a reserved identifer, like R9 */
-         if (Parse_String(parseState, "=")) {
-            if (!Parse_VectorOrScalarConstant(parseState, value))
-               RETURN_ERROR;
-         }
-         if (!Parse_String(parseState, ";"))
-            RETURN_ERROR1("Expected ;");
-         if (_mesa_lookup_parameter_index(parseState->parameters,
-                                          -1, (const char *) id) >= 0) {
-            RETURN_ERROR2(id, "already declared");
-         }
-         _mesa_add_named_parameter(parseState->parameters,
-                                   (const char *) id, value);
-      }
-      else if (Parse_String(parseState, "END")) {
-         inst->Opcode = OPCODE_END;
-         parseState->numInst++;
-         if (Parse_Token(parseState, token)) {
-            RETURN_ERROR1("Code after END opcode.");
-         }
-         break;
-      }
-      else {
-         /* general/arithmetic instruction */
-
-         /* get token */
-         if (!Parse_Token(parseState, token)) {
-            RETURN_ERROR1("Missing END instruction.");
-         }
-
-         /* try to find matching instuction */
-         instMatch = MatchInstruction(token);
-         if (instMatch.opcode >= MAX_OPCODE) {
-            /* bad instruction name */
-            RETURN_ERROR2("Unexpected token: ", token);
-         }
-
-         inst->Opcode = instMatch.opcode;
-         inst->Precision = instMatch.suffixes & (_R | _H | _X);
-         inst->SaturateMode = (instMatch.suffixes & (_S))
-            ? SATURATE_ZERO_ONE : SATURATE_OFF;
-         inst->CondUpdate = (instMatch.suffixes & (_C)) ? GL_TRUE : GL_FALSE;
-
-         /*
-          * parse the input and output operands
-          */
-         if (instMatch.outputs == OUTPUT_S || instMatch.outputs == OUTPUT_V) {
-            if (!Parse_MaskedDstReg(parseState, &inst->DstReg))
-               RETURN_ERROR;
-            if (!Parse_String(parseState, ","))
-               RETURN_ERROR1("Expected ,");
-         }
-         else if (instMatch.outputs == OUTPUT_NONE) {
-            if (instMatch.opcode == OPCODE_KIL_NV) {
-               /* This is a little weird, the cond code info is in
-                * the dest register.
-                */
-               if (!Parse_CondCodeMask(parseState, &inst->DstReg))
-                  RETURN_ERROR;
-            }
-            else {
-               ASSERT(instMatch.opcode == OPCODE_PRINT);
-            }
-         }
-
-         if (instMatch.inputs == INPUT_1V) {
-            if (!Parse_VectorSrc(parseState, &inst->SrcReg[0]))
-               RETURN_ERROR;
-         }
-         else if (instMatch.inputs == INPUT_2V) {
-            if (!Parse_VectorSrc(parseState, &inst->SrcReg[0]))
-               RETURN_ERROR;
-            if (!Parse_String(parseState, ","))
-               RETURN_ERROR1("Expected ,");
-            if (!Parse_VectorSrc(parseState, &inst->SrcReg[1]))
-               RETURN_ERROR;
-         }
-         else if (instMatch.inputs == INPUT_3V) {
-            if (!Parse_VectorSrc(parseState, &inst->SrcReg[0]))
-               RETURN_ERROR;
-            if (!Parse_String(parseState, ","))
-               RETURN_ERROR1("Expected ,");
-            if (!Parse_VectorSrc(parseState, &inst->SrcReg[1]))
-               RETURN_ERROR;
-            if (!Parse_String(parseState, ","))
-               RETURN_ERROR1("Expected ,");
-            if (!Parse_VectorSrc(parseState, &inst->SrcReg[2]))
-               RETURN_ERROR;
-         }
-         else if (instMatch.inputs == INPUT_1S) {
-            if (!Parse_ScalarSrcReg(parseState, &inst->SrcReg[0]))
-               RETURN_ERROR;
-         }
-         else if (instMatch.inputs == INPUT_2S) {
-            if (!Parse_ScalarSrcReg(parseState, &inst->SrcReg[0]))
-               RETURN_ERROR;
-            if (!Parse_String(parseState, ","))
-               RETURN_ERROR1("Expected ,");
-            if (!Parse_ScalarSrcReg(parseState, &inst->SrcReg[1]))
-               RETURN_ERROR;
-         }
-         else if (instMatch.inputs == INPUT_CC) {
-            /* XXX to-do */
-         }
-         else if (instMatch.inputs == INPUT_1V_T) {
-	    GLubyte unit, idx;
-            if (!Parse_VectorSrc(parseState, &inst->SrcReg[0]))
-               RETURN_ERROR;
-            if (!Parse_String(parseState, ","))
-               RETURN_ERROR1("Expected ,");
-            if (!Parse_TextureImageId(parseState, &unit, &idx))
-               RETURN_ERROR;
-	    inst->TexSrcUnit = unit;
-	    inst->TexSrcTarget = idx;
-         }
-         else if (instMatch.inputs == INPUT_3V_T) {
-	    GLubyte unit, idx;
-            if (!Parse_VectorSrc(parseState, &inst->SrcReg[0]))
-               RETURN_ERROR;
-            if (!Parse_String(parseState, ","))
-               RETURN_ERROR1("Expected ,");
-            if (!Parse_VectorSrc(parseState, &inst->SrcReg[1]))
-               RETURN_ERROR;
-            if (!Parse_String(parseState, ","))
-               RETURN_ERROR1("Expected ,");
-            if (!Parse_VectorSrc(parseState, &inst->SrcReg[2]))
-               RETURN_ERROR;
-            if (!Parse_String(parseState, ","))
-               RETURN_ERROR1("Expected ,");
-            if (!Parse_TextureImageId(parseState, &unit, &idx))
-               RETURN_ERROR;
-	    inst->TexSrcUnit = unit;
-	    inst->TexSrcTarget = idx;
-         }
-         else if (instMatch.inputs == INPUT_1V_S) {
-            if (!Parse_PrintInstruction(parseState, inst))
-               RETURN_ERROR;
-         }
-
-         /* end of statement semicolon */
-         if (!Parse_String(parseState, ";"))
-            RETURN_ERROR1("Expected ;");
-
-         parseState->numInst++;
-
-         if (parseState->numInst >= MAX_NV_FRAGMENT_PROGRAM_INSTRUCTIONS)
-            RETURN_ERROR1("Program too long");
-      }
-   }
-   return GL_TRUE;
-}
-
-
-
-/**
- * Parse/compile the 'str' returning the compiled 'program'.
- * ctx->Program.ErrorPos will be -1 if successful.  Otherwise, ErrorPos
- * indicates the position of the error in 'str'.
- */
-void
-_mesa_parse_nv_fragment_program(GLcontext *ctx, GLenum dstTarget,
-                                const GLubyte *str, GLsizei len,
-                                struct gl_fragment_program *program)
-{
-   struct parse_state parseState;
-   struct prog_instruction instBuffer[MAX_NV_FRAGMENT_PROGRAM_INSTRUCTIONS];
-   struct prog_instruction *newInst;
-   GLenum target;
-   GLubyte *programString;
-
-   /* Make a null-terminated copy of the program string */
-   programString = (GLubyte *) MALLOC(len + 1);
-   if (!programString) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glLoadProgramNV");
-      return;
-   }
-   memcpy(programString, str, len);
-   programString[len] = 0;
-
-   /* Get ready to parse */
-   memset(&parseState, 0, sizeof(struct parse_state));
-   parseState.ctx = ctx;
-   parseState.start = programString;
-   parseState.program = program;
-   parseState.numInst = 0;
-   parseState.curLine = programString;
-   parseState.parameters = _mesa_new_parameter_list();
-
-   /* Reset error state */
-   _mesa_set_program_error(ctx, -1, NULL);
-
-   /* check the program header */
-   if (strncmp((const char *) programString, "!!FP1.0", 7) == 0) {
-      target = GL_FRAGMENT_PROGRAM_NV;
-      parseState.pos = programString + 7;
-   }
-   else if (strncmp((const char *) programString, "!!FCP1.0", 8) == 0) {
-      /* fragment / register combiner program - not supported */
-      _mesa_set_program_error(ctx, 0, "Invalid fragment program header");
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glLoadProgramNV(bad header)");
-      return;
-   }
-   else {
-      /* invalid header */
-      _mesa_set_program_error(ctx, 0, "Invalid fragment program header");
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glLoadProgramNV(bad header)");
-      return;
-   }
-
-   /* make sure target and header match */
-   if (target != dstTarget) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glLoadProgramNV(target mismatch 0x%x != 0x%x)",
-                  target, dstTarget);
-      return;
-   }
-
-   if (Parse_InstructionSequence(&parseState, instBuffer)) {
-      GLuint u;
-      /* successful parse! */
-
-      if (parseState.outputsWritten == 0) {
-         /* must write at least one output! */
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "Invalid fragment program - no outputs written.");
-         return;
-      }
-
-      /* copy the compiled instructions */
-      assert(parseState.numInst <= MAX_NV_FRAGMENT_PROGRAM_INSTRUCTIONS);
-      newInst = _mesa_alloc_instructions(parseState.numInst);
-      if (!newInst) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glLoadProgramNV");
-         return;  /* out of memory */
-      }
-      _mesa_copy_instructions(newInst, instBuffer, parseState.numInst);
-
-      /* install the program */
-      program->Base.Target = target;
-      if (program->Base.String) {
-         FREE(program->Base.String);
-      }
-      program->Base.String = programString;
-      program->Base.Format = GL_PROGRAM_FORMAT_ASCII_ARB;
-      if (program->Base.Instructions) {
-         free(program->Base.Instructions);
-      }
-      program->Base.Instructions = newInst;
-      program->Base.NumInstructions = parseState.numInst;
-      program->Base.InputsRead = parseState.inputsRead;
-      program->Base.OutputsWritten = parseState.outputsWritten;
-      for (u = 0; u < ctx->Const.MaxTextureImageUnits; u++)
-         program->Base.TexturesUsed[u] = parseState.texturesUsed[u];
-
-      /* save program parameters */
-      program->Base.Parameters = parseState.parameters;
-
-      /* allocate registers for declared program parameters */
-#if 00
-      _mesa_assign_program_registers(&(program->SymbolTable));
-#endif
-
-#ifdef DEBUG_foo
-      printf("--- glLoadProgramNV(%d) result ---\n", program->Base.Id);
-      _mesa_fprint_program_opt(stdout, &program->Base, PROG_PRINT_NV, 0);
-      printf("----------------------------------\n");
-#endif
-   }
-   else {
-      /* Error! */
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glLoadProgramNV");
-      /* NOTE: _mesa_set_program_error would have been called already */
-   }
-}
-
-
-const char *
-_mesa_nv_fragment_input_register_name(GLuint i)
-{
-   ASSERT(i < MAX_NV_FRAGMENT_PROGRAM_INPUTS);
-   return InputRegisters[i];
-}
-
diff --git a/mesalib/src/mesa/shader/nvfragparse.h b/mesalib/src/mesa/shader/nvfragparse.h
deleted file mode 100644
index 544ab80c5..000000000
--- a/mesalib/src/mesa/shader/nvfragparse.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-/*
- * Mesa 3-D graphics library
- * Version:  5.1
- *
- * Copyright (C) 1999-2002  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.
- *
- * Authors:
- *    Brian Paul
- */
-
-
-#ifndef NVFRAGPARSE_H
-#define NVFRAGPARSE_H
-
-
-extern void
-_mesa_parse_nv_fragment_program(GLcontext *ctx, GLenum target,
-                                const GLubyte *str, GLsizei len,
-                                struct gl_fragment_program *program);
-
-
-extern const char *
-_mesa_nv_fragment_input_register_name(GLuint i);
-
-#endif
diff --git a/mesalib/src/mesa/shader/nvvertparse.c b/mesalib/src/mesa/shader/nvvertparse.c
deleted file mode 100644
index 631b315af..000000000
--- a/mesalib/src/mesa/shader/nvvertparse.c
+++ /dev/null
@@ -1,1454 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.2
- *
- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * \file nvvertparse.c
- * NVIDIA vertex program parser.
- * \author Brian Paul
- */
-
-/*
- * Regarding GL_NV_vertex_program, GL_NV_vertex_program1_1:
- *
- * Portions of this software may use or implement intellectual
- * property owned and licensed by NVIDIA Corporation. NVIDIA disclaims
- * any and all warranties with respect to such intellectual property,
- * including any use thereof or modifications thereto.
- */
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/imports.h"
-#include "nvprogram.h"
-#include "nvvertparse.h"
-#include "prog_instruction.h"
-#include "prog_parameter.h"
-#include "prog_print.h"
-#include "program.h"
-
-
-/**
- * Current parsing state.  This structure is passed among the parsing
- * functions and keeps track of the current parser position and various
- * program attributes.
- */
-struct parse_state {
-   GLcontext *ctx;
-   const GLubyte *start;
-   const GLubyte *pos;
-   const GLubyte *curLine;
-   GLboolean isStateProgram;
-   GLboolean isPositionInvariant;
-   GLboolean isVersion1_1;
-   GLbitfield inputsRead;
-   GLbitfield outputsWritten;
-   GLboolean anyProgRegsWritten;
-   GLuint numInst;                 /* number of instructions parsed */
-};
-
-
-/*
- * Called whenever we find an error during parsing.
- */
-static void
-record_error(struct parse_state *parseState, const char *msg, int lineNo)
-{
-#ifdef DEBUG
-   GLint line, column;
-   const GLubyte *lineStr;
-   lineStr = _mesa_find_line_column(parseState->start,
-                                    parseState->pos, &line, &column);
-   _mesa_debug(parseState->ctx,
-               "nvfragparse.c(%d): line %d, column %d:%s (%s)\n",
-               lineNo, line, column, (char *) lineStr, msg);
-   free((void *) lineStr);
-#else
-   (void) lineNo;
-#endif
-
-   /* Check that no error was already recorded.  Only record the first one. */
-   if (parseState->ctx->Program.ErrorString[0] == 0) {
-      _mesa_set_program_error(parseState->ctx,
-                              parseState->pos - parseState->start,
-                              msg);
-   }
-}
-
-
-#define RETURN_ERROR							\
-do {									\
-   record_error(parseState, "Unexpected end of input.", __LINE__);	\
-   return GL_FALSE;							\
-} while(0)
-
-#define RETURN_ERROR1(msg)						\
-do {									\
-   record_error(parseState, msg, __LINE__);				\
-   return GL_FALSE;							\
-} while(0)
-
-#define RETURN_ERROR2(msg1, msg2)					\
-do {									\
-   char err[1000];							\
-   sprintf(err, "%s %s", msg1, msg2);				\
-   record_error(parseState, err, __LINE__);				\
-   return GL_FALSE;							\
-} while(0)
-
-
-
-
-
-static GLboolean IsLetter(GLubyte b)
-{
-   return (b >= 'a' && b <= 'z') || (b >= 'A' && b <= 'Z');
-}
-
-
-static GLboolean IsDigit(GLubyte b)
-{
-   return b >= '0' && b <= '9';
-}
-
-
-static GLboolean IsWhitespace(GLubyte b)
-{
-   return b == ' ' || b == '\t' || b == '\n' || b == '\r';
-}
-
-
-/**
- * Starting at 'str' find the next token.  A token can be an integer,
- * an identifier or punctuation symbol.
- * \return <= 0 we found an error, else, return number of characters parsed.
- */
-static GLint
-GetToken(struct parse_state *parseState, GLubyte *token)
-{
-   const GLubyte *str = parseState->pos;
-   GLint i = 0, j = 0;
-
-   token[0] = 0;
-
-   /* skip whitespace and comments */
-   while (str[i] && (IsWhitespace(str[i]) || str[i] == '#')) {
-      if (str[i] == '#') {
-         /* skip comment */
-         while (str[i] && (str[i] != '\n' && str[i] != '\r')) {
-            i++;
-         }
-         if (str[i] == '\n' || str[i] == '\r')
-            parseState->curLine = str + i + 1;
-      }
-      else {
-         /* skip whitespace */
-         if (str[i] == '\n' || str[i] == '\r')
-            parseState->curLine = str + i + 1;
-         i++;
-      }
-   }
-
-   if (str[i] == 0)
-      return -i;
-
-   /* try matching an integer */
-   while (str[i] && IsDigit(str[i])) {
-      token[j++] = str[i++];
-   }
-   if (j > 0 || !str[i]) {
-      token[j] = 0;
-      return i;
-   }
-
-   /* try matching an identifier */
-   if (IsLetter(str[i])) {
-      while (str[i] && (IsLetter(str[i]) || IsDigit(str[i]))) {
-         token[j++] = str[i++];
-      }
-      token[j] = 0;
-      return i;
-   }
-
-   /* punctuation character */
-   if (str[i]) {
-      token[0] = str[i++];
-      token[1] = 0;
-      return i;
-   }
-
-   /* end of input */
-   token[0] = 0;
-   return i;
-}
-
-
-/**
- * Get next token from input stream and increment stream pointer past token.
- */
-static GLboolean
-Parse_Token(struct parse_state *parseState, GLubyte *token)
-{
-   GLint i;
-   i = GetToken(parseState, token);
-   if (i <= 0) {
-      parseState->pos += (-i);
-      return GL_FALSE;
-   }
-   parseState->pos += i;
-   return GL_TRUE;
-}
-
-
-/**
- * Get next token from input stream but don't increment stream pointer.
- */
-static GLboolean
-Peek_Token(struct parse_state *parseState, GLubyte *token)
-{
-   GLint i, len;
-   i = GetToken(parseState, token);
-   if (i <= 0) {
-      parseState->pos += (-i);
-      return GL_FALSE;
-   }
-   len = (GLint) strlen((const char *) token);
-   parseState->pos += (i - len);
-   return GL_TRUE;
-}
-
-
-/**
- * Try to match 'pattern' as the next token after any whitespace/comments.
- * Advance the current parsing position only if we match the pattern.
- * \return GL_TRUE if pattern is matched, GL_FALSE otherwise.
- */
-static GLboolean
-Parse_String(struct parse_state *parseState, const char *pattern)
-{
-   const GLubyte *m;
-   GLint i;
-
-   /* skip whitespace and comments */
-   while (IsWhitespace(*parseState->pos) || *parseState->pos == '#') {
-      if (*parseState->pos == '#') {
-         while (*parseState->pos && (*parseState->pos != '\n' && *parseState->pos != '\r')) {
-            parseState->pos += 1;
-         }
-         if (*parseState->pos == '\n' || *parseState->pos == '\r')
-            parseState->curLine = parseState->pos + 1;
-      }
-      else {
-         /* skip whitespace */
-         if (*parseState->pos == '\n' || *parseState->pos == '\r')
-            parseState->curLine = parseState->pos + 1;
-         parseState->pos += 1;
-      }
-   }
-
-   /* Try to match the pattern */
-   m = parseState->pos;
-   for (i = 0; pattern[i]; i++) {
-      if (*m != (GLubyte) pattern[i])
-         return GL_FALSE;
-      m += 1;
-   }
-   parseState->pos = m;
-
-   return GL_TRUE; /* success */
-}
-
-
-/**********************************************************************/
-
-static const char *InputRegisters[MAX_NV_VERTEX_PROGRAM_INPUTS + 1] = {
-   "OPOS", "WGHT", "NRML", "COL0", "COL1", "FOGC", "6", "7",
-   "TEX0", "TEX1", "TEX2", "TEX3", "TEX4", "TEX5", "TEX6", "TEX7", NULL
-};
-
-static const char *OutputRegisters[MAX_NV_VERTEX_PROGRAM_OUTPUTS + 1] = {
-   "HPOS", "COL0", "COL1", "FOGC", 
-   "TEX0", "TEX1", "TEX2", "TEX3", "TEX4", "TEX5", "TEX6", "TEX7", 
-   "PSIZ", "BFC0", "BFC1", NULL
-};
-
-
-
-/**
- * Parse a temporary register: Rnn
- */
-static GLboolean
-Parse_TempReg(struct parse_state *parseState, GLint *tempRegNum)
-{
-   GLubyte token[100];
-
-   /* Should be 'R##' */
-   if (!Parse_Token(parseState, token))
-      RETURN_ERROR;
-   if (token[0] != 'R')
-      RETURN_ERROR1("Expected R##");
-
-   if (IsDigit(token[1])) {
-      GLint reg = atoi((char *) (token + 1));
-      if (reg >= MAX_NV_VERTEX_PROGRAM_TEMPS)
-         RETURN_ERROR1("Bad temporary register name");
-      *tempRegNum = reg;
-   }
-   else {
-      RETURN_ERROR1("Bad temporary register name");
-   }
-
-   return GL_TRUE;
-}
-
-
-/**
- * Parse address register "A0.x"
- */
-static GLboolean
-Parse_AddrReg(struct parse_state *parseState)
-{
-   /* match 'A0' */
-   if (!Parse_String(parseState, "A0"))
-      RETURN_ERROR;
-
-   /* match '.' */
-   if (!Parse_String(parseState, "."))
-      RETURN_ERROR;
-
-   /* match 'x' */
-   if (!Parse_String(parseState, "x"))
-      RETURN_ERROR;
-
-   return GL_TRUE;
-}
-
-
-/**
- * Parse absolute program parameter register "c[##]"
- */
-static GLboolean
-Parse_AbsParamReg(struct parse_state *parseState, GLint *regNum)
-{
-   GLubyte token[100];
-
-   if (!Parse_String(parseState, "c"))
-      RETURN_ERROR;
-
-   if (!Parse_String(parseState, "["))
-      RETURN_ERROR;
-
-   if (!Parse_Token(parseState, token))
-      RETURN_ERROR;
-
-   if (IsDigit(token[0])) {
-      /* a numbered program parameter register */
-      GLint reg = atoi((char *) token);
-      if (reg >= MAX_NV_VERTEX_PROGRAM_PARAMS)
-         RETURN_ERROR1("Bad program parameter number");
-      *regNum = reg;
-   }
-   else {
-      RETURN_ERROR;
-   }
-
-   if (!Parse_String(parseState, "]"))
-      RETURN_ERROR;
-
-   return GL_TRUE;
-}
-
-
-static GLboolean
-Parse_ParamReg(struct parse_state *parseState, struct prog_src_register *srcReg)
-{
-   GLubyte token[100];
-
-   if (!Parse_String(parseState, "c"))
-      RETURN_ERROR;
-
-   if (!Parse_String(parseState, "["))
-      RETURN_ERROR;
-
-   if (!Peek_Token(parseState, token))
-      RETURN_ERROR;
-
-   if (IsDigit(token[0])) {
-      /* a numbered program parameter register */
-      GLint reg;
-      (void) Parse_Token(parseState, token);
-      reg = atoi((char *) token);
-      if (reg >= MAX_NV_VERTEX_PROGRAM_PARAMS)
-         RETURN_ERROR1("Bad program parameter number");
-      srcReg->File = PROGRAM_ENV_PARAM;
-      srcReg->Index = reg;
-   }
-   else if (strcmp((const char *) token, "A0") == 0) {
-      /* address register "A0.x" */
-      if (!Parse_AddrReg(parseState))
-         RETURN_ERROR;
-
-      srcReg->RelAddr = GL_TRUE;
-      srcReg->File = PROGRAM_ENV_PARAM;
-      /* Look for +/-N offset */
-      if (!Peek_Token(parseState, token))
-         RETURN_ERROR;
-
-      if (token[0] == '-' || token[0] == '+') {
-         const GLubyte sign = token[0];
-         (void) Parse_Token(parseState, token); /* consume +/- */
-
-         /* an integer should be next */
-         if (!Parse_Token(parseState, token))
-            RETURN_ERROR;
-
-         if (IsDigit(token[0])) {
-            const GLint k = atoi((char *) token);
-            if (sign == '-') {
-               if (k > 64)
-                  RETURN_ERROR1("Bad address offset");
-               srcReg->Index = -k;
-            }
-            else {
-               if (k > 63)
-                  RETURN_ERROR1("Bad address offset");
-               srcReg->Index = k;
-            }
-         }
-         else {
-            RETURN_ERROR;
-         }
-      }
-      else {
-         /* probably got a ']', catch it below */
-      }
-   }
-   else {
-      RETURN_ERROR;
-   }
-
-   /* Match closing ']' */
-   if (!Parse_String(parseState, "]"))
-      RETURN_ERROR;
-
-   return GL_TRUE;
-}
-
-
-/**
- * Parse v[#] or v[<name>]
- */
-static GLboolean
-Parse_AttribReg(struct parse_state *parseState, GLint *tempRegNum)
-{
-   GLubyte token[100];
-   GLint j;
-
-   /* Match 'v' */
-   if (!Parse_String(parseState, "v"))
-      RETURN_ERROR;
-
-   /* Match '[' */
-   if (!Parse_String(parseState, "["))
-      RETURN_ERROR;
-
-   /* match number or named register */
-   if (!Parse_Token(parseState, token))
-      RETURN_ERROR;
-
-   if (parseState->isStateProgram && token[0] != '0')
-      RETURN_ERROR1("Only v[0] accessible in vertex state programs");
-
-   if (IsDigit(token[0])) {
-      GLint reg = atoi((char *) token);
-      if (reg >= MAX_NV_VERTEX_PROGRAM_INPUTS)
-         RETURN_ERROR1("Bad vertex attribute register name");
-      *tempRegNum = reg;
-   }
-   else {
-      for (j = 0; InputRegisters[j]; j++) {
-         if (strcmp((const char *) token, InputRegisters[j]) == 0) {
-            *tempRegNum = j;
-            break;
-         }
-      }
-      if (!InputRegisters[j]) {
-         /* unknown input register label */
-         RETURN_ERROR2("Bad register name", token);
-      }
-   }
-
-   /* Match '[' */
-   if (!Parse_String(parseState, "]"))
-      RETURN_ERROR;
-
-   return GL_TRUE;
-}
-
-
-static GLboolean
-Parse_OutputReg(struct parse_state *parseState, GLint *outputRegNum)
-{
-   GLubyte token[100];
-   GLint start, j;
-
-   /* Match 'o' */
-   if (!Parse_String(parseState, "o"))
-      RETURN_ERROR;
-
-   /* Match '[' */
-   if (!Parse_String(parseState, "["))
-      RETURN_ERROR;
-
-   /* Get output reg name */
-   if (!Parse_Token(parseState, token))
-      RETURN_ERROR;
-
-   if (parseState->isPositionInvariant)
-      start = 1; /* skip HPOS register name */
-   else
-      start = 0;
-
-   /* try to match an output register name */
-   for (j = start; OutputRegisters[j]; j++) {
-      if (strcmp((const char *) token, OutputRegisters[j]) == 0) {
-         *outputRegNum = j;
-         break;
-      }
-   }
-   if (!OutputRegisters[j])
-      RETURN_ERROR1("Unrecognized output register name");
-
-   /* Match ']' */
-   if (!Parse_String(parseState, "]"))
-      RETURN_ERROR1("Expected ]");
-
-   return GL_TRUE;
-}
-
-
-static GLboolean
-Parse_MaskedDstReg(struct parse_state *parseState, struct prog_dst_register *dstReg)
-{
-   GLubyte token[100];
-   GLint idx;
-
-   /* Dst reg can be R<n> or o[n] */
-   if (!Peek_Token(parseState, token))
-      RETURN_ERROR;
-
-   if (token[0] == 'R') {
-      /* a temporary register */
-      dstReg->File = PROGRAM_TEMPORARY;
-      if (!Parse_TempReg(parseState, &idx))
-         RETURN_ERROR;
-      dstReg->Index = idx;
-   }
-   else if (!parseState->isStateProgram && token[0] == 'o') {
-      /* an output register */
-      dstReg->File = PROGRAM_OUTPUT;
-      if (!Parse_OutputReg(parseState, &idx))
-         RETURN_ERROR;
-      dstReg->Index = idx;
-   }
-   else if (parseState->isStateProgram && token[0] == 'c' &&
-            parseState->isStateProgram) {
-      /* absolute program parameter register */
-      /* Only valid for vertex state programs */
-      dstReg->File = PROGRAM_ENV_PARAM;
-      if (!Parse_AbsParamReg(parseState, &idx))
-         RETURN_ERROR;
-      dstReg->Index = idx;
-   }
-   else {
-      RETURN_ERROR1("Bad destination register name");
-   }
-
-   /* Parse optional write mask */
-   if (!Peek_Token(parseState, token))
-      RETURN_ERROR;
-
-   if (token[0] == '.') {
-      /* got a mask */
-      GLint k = 0;
-
-      if (!Parse_String(parseState, "."))
-         RETURN_ERROR;
-
-      if (!Parse_Token(parseState, token))
-         RETURN_ERROR;
-
-      dstReg->WriteMask = 0;
-
-      if (token[k] == 'x') {
-         dstReg->WriteMask |= WRITEMASK_X;
-         k++;
-      }
-      if (token[k] == 'y') {
-         dstReg->WriteMask |= WRITEMASK_Y;
-         k++;
-      }
-      if (token[k] == 'z') {
-         dstReg->WriteMask |= WRITEMASK_Z;
-         k++;
-      }
-      if (token[k] == 'w') {
-         dstReg->WriteMask |= WRITEMASK_W;
-         k++;
-      }
-      if (k == 0) {
-         RETURN_ERROR1("Bad writemask character");
-      }
-      return GL_TRUE;
-   }
-   else {
-      dstReg->WriteMask = WRITEMASK_XYZW;
-      return GL_TRUE;
-   }
-}
-
-
-static GLboolean
-Parse_SwizzleSrcReg(struct parse_state *parseState, struct prog_src_register *srcReg)
-{
-   GLubyte token[100];
-   GLint idx;
-
-   srcReg->RelAddr = GL_FALSE;
-
-   /* check for '-' */
-   if (!Peek_Token(parseState, token))
-      RETURN_ERROR;
-   if (token[0] == '-') {
-      (void) Parse_String(parseState, "-");
-      srcReg->Negate = NEGATE_XYZW;
-      if (!Peek_Token(parseState, token))
-         RETURN_ERROR;
-   }
-   else {
-      srcReg->Negate = NEGATE_NONE;
-   }
-
-   /* Src reg can be R<n>, c[n], c[n +/- offset], or a named vertex attrib */
-   if (token[0] == 'R') {
-      srcReg->File = PROGRAM_TEMPORARY;
-      if (!Parse_TempReg(parseState, &idx))
-         RETURN_ERROR;
-      srcReg->Index = idx;
-   }
-   else if (token[0] == 'c') {
-      if (!Parse_ParamReg(parseState, srcReg))
-         RETURN_ERROR;
-   }
-   else if (token[0] == 'v') {
-      srcReg->File = PROGRAM_INPUT;
-      if (!Parse_AttribReg(parseState, &idx))
-         RETURN_ERROR;
-      srcReg->Index = idx;
-   }
-   else {
-      RETURN_ERROR2("Bad source register name", token);
-   }
-
-   /* init swizzle fields */
-   srcReg->Swizzle = SWIZZLE_NOOP;
-
-   /* Look for optional swizzle suffix */
-   if (!Peek_Token(parseState, token))
-      RETURN_ERROR;
-   if (token[0] == '.') {
-      (void) Parse_String(parseState, ".");  /* consume . */
-
-      if (!Parse_Token(parseState, token))
-         RETURN_ERROR;
-
-      if (token[1] == 0) {
-         /* single letter swizzle */
-         if (token[0] == 'x')
-            srcReg->Swizzle = SWIZZLE_XXXX;
-         else if (token[0] == 'y')
-            srcReg->Swizzle = SWIZZLE_YYYY;
-         else if (token[0] == 'z')
-            srcReg->Swizzle = SWIZZLE_ZZZZ;
-         else if (token[0] == 'w')
-            srcReg->Swizzle = SWIZZLE_WWWW;
-         else
-            RETURN_ERROR1("Expected x, y, z, or w");
-      }
-      else {
-         /* 2, 3 or 4-component swizzle */
-         GLint k;
-
-         srcReg->Swizzle = 0;
-
-         for (k = 0; token[k] && k < 5; k++) {
-            if (token[k] == 'x')
-               srcReg->Swizzle |= 0 << (k*3);
-            else if (token[k] == 'y')
-               srcReg->Swizzle |= 1 << (k*3);
-            else if (token[k] == 'z')
-               srcReg->Swizzle |= 2 << (k*3);
-            else if (token[k] == 'w')
-               srcReg->Swizzle |= 3 << (k*3);
-            else
-               RETURN_ERROR;
-         }
-         if (k >= 5)
-            RETURN_ERROR;
-      }
-   }
-
-   return GL_TRUE;
-}
-
-
-static GLboolean
-Parse_ScalarSrcReg(struct parse_state *parseState, struct prog_src_register *srcReg)
-{
-   GLubyte token[100];
-   GLint idx;
-
-   srcReg->RelAddr = GL_FALSE;
-
-   /* check for '-' */
-   if (!Peek_Token(parseState, token))
-      RETURN_ERROR;
-   if (token[0] == '-') {
-      srcReg->Negate = NEGATE_XYZW;
-      (void) Parse_String(parseState, "-"); /* consume '-' */
-      if (!Peek_Token(parseState, token))
-         RETURN_ERROR;
-   }
-   else {
-      srcReg->Negate = NEGATE_NONE;
-   }
-
-   /* Src reg can be R<n>, c[n], c[n +/- offset], or a named vertex attrib */
-   if (token[0] == 'R') {
-      srcReg->File = PROGRAM_TEMPORARY;
-      if (!Parse_TempReg(parseState, &idx))
-         RETURN_ERROR;
-      srcReg->Index = idx;
-   }
-   else if (token[0] == 'c') {
-      if (!Parse_ParamReg(parseState, srcReg))
-         RETURN_ERROR;
-   }
-   else if (token[0] == 'v') {
-      srcReg->File = PROGRAM_INPUT;
-      if (!Parse_AttribReg(parseState, &idx))
-         RETURN_ERROR;
-      srcReg->Index = idx;
-   }
-   else {
-      RETURN_ERROR2("Bad source register name", token);
-   }
-
-   /* Look for .[xyzw] suffix */
-   if (!Parse_String(parseState, "."))
-      RETURN_ERROR;
-
-   if (!Parse_Token(parseState, token))
-      RETURN_ERROR;
-
-   if (token[0] == 'x' && token[1] == 0) {
-      srcReg->Swizzle = 0;
-   }
-   else if (token[0] == 'y' && token[1] == 0) {
-      srcReg->Swizzle = 1;
-   }
-   else if (token[0] == 'z' && token[1] == 0) {
-      srcReg->Swizzle = 2;
-   }
-   else if (token[0] == 'w' && token[1] == 0) {
-      srcReg->Swizzle = 3;
-   }
-   else {
-      RETURN_ERROR1("Bad scalar source suffix");
-   }
-
-   return GL_TRUE;
-}
-
-
-static GLint
-Parse_UnaryOpInstruction(struct parse_state *parseState,
-                         struct prog_instruction *inst,
-                         enum prog_opcode opcode)
-{
-   if (opcode == OPCODE_ABS && !parseState->isVersion1_1)
-      RETURN_ERROR1("ABS illegal for vertex program 1.0");
-
-   inst->Opcode = opcode;
-
-   /* dest reg */
-   if (!Parse_MaskedDstReg(parseState, &inst->DstReg))
-      RETURN_ERROR;
-
-   /* comma */
-   if (!Parse_String(parseState, ","))
-      RETURN_ERROR;
-
-   /* src arg */
-   if (!Parse_SwizzleSrcReg(parseState, &inst->SrcReg[0]))
-      RETURN_ERROR;
-
-   /* semicolon */
-   if (!Parse_String(parseState, ";"))
-      RETURN_ERROR;
-
-   return GL_TRUE;
-}
-
-
-static GLboolean
-Parse_BiOpInstruction(struct parse_state *parseState,
-                      struct prog_instruction *inst,
-                      enum prog_opcode opcode)
-{
-   if (opcode == OPCODE_DPH && !parseState->isVersion1_1)
-      RETURN_ERROR1("DPH illegal for vertex program 1.0");
-   if (opcode == OPCODE_SUB && !parseState->isVersion1_1)
-      RETURN_ERROR1("SUB illegal for vertex program 1.0");
-
-   inst->Opcode = opcode;
-
-   /* dest reg */
-   if (!Parse_MaskedDstReg(parseState, &inst->DstReg))
-      RETURN_ERROR;
-
-   /* comma */
-   if (!Parse_String(parseState, ","))
-      RETURN_ERROR;
-
-   /* first src arg */
-   if (!Parse_SwizzleSrcReg(parseState, &inst->SrcReg[0]))
-      RETURN_ERROR;
-
-   /* comma */
-   if (!Parse_String(parseState, ","))
-      RETURN_ERROR;
-
-   /* second src arg */
-   if (!Parse_SwizzleSrcReg(parseState, &inst->SrcReg[1]))
-      RETURN_ERROR;
-
-   /* semicolon */
-   if (!Parse_String(parseState, ";"))
-      RETURN_ERROR;
-
-   /* make sure we don't reference more than one program parameter register */
-   if (inst->SrcReg[0].File == PROGRAM_ENV_PARAM &&
-       inst->SrcReg[1].File == PROGRAM_ENV_PARAM &&
-       inst->SrcReg[0].Index != inst->SrcReg[1].Index)
-      RETURN_ERROR1("Can't reference two program parameter registers");
-
-   /* make sure we don't reference more than one vertex attribute register */
-   if (inst->SrcReg[0].File == PROGRAM_INPUT &&
-       inst->SrcReg[1].File == PROGRAM_INPUT &&
-       inst->SrcReg[0].Index != inst->SrcReg[1].Index)
-      RETURN_ERROR1("Can't reference two vertex attribute registers");
-
-   return GL_TRUE;
-}
-
-
-static GLboolean
-Parse_TriOpInstruction(struct parse_state *parseState,
-                       struct prog_instruction *inst,
-                       enum prog_opcode opcode)
-{
-   inst->Opcode = opcode;
-
-   /* dest reg */
-   if (!Parse_MaskedDstReg(parseState, &inst->DstReg))
-      RETURN_ERROR;
-
-   /* comma */
-   if (!Parse_String(parseState, ","))
-      RETURN_ERROR;
-
-   /* first src arg */
-   if (!Parse_SwizzleSrcReg(parseState, &inst->SrcReg[0]))
-      RETURN_ERROR;
-
-   /* comma */
-   if (!Parse_String(parseState, ","))
-      RETURN_ERROR;
-
-   /* second src arg */
-   if (!Parse_SwizzleSrcReg(parseState, &inst->SrcReg[1]))
-      RETURN_ERROR;
-
-   /* comma */
-   if (!Parse_String(parseState, ","))
-      RETURN_ERROR;
-
-   /* third src arg */
-   if (!Parse_SwizzleSrcReg(parseState, &inst->SrcReg[2]))
-      RETURN_ERROR;
-
-   /* semicolon */
-   if (!Parse_String(parseState, ";"))
-      RETURN_ERROR;
-
-   /* make sure we don't reference more than one program parameter register */
-   if ((inst->SrcReg[0].File == PROGRAM_ENV_PARAM &&
-        inst->SrcReg[1].File == PROGRAM_ENV_PARAM &&
-        inst->SrcReg[0].Index != inst->SrcReg[1].Index) ||
-       (inst->SrcReg[0].File == PROGRAM_ENV_PARAM &&
-        inst->SrcReg[2].File == PROGRAM_ENV_PARAM &&
-        inst->SrcReg[0].Index != inst->SrcReg[2].Index) ||
-       (inst->SrcReg[1].File == PROGRAM_ENV_PARAM &&
-        inst->SrcReg[2].File == PROGRAM_ENV_PARAM &&
-        inst->SrcReg[1].Index != inst->SrcReg[2].Index))
-      RETURN_ERROR1("Can only reference one program register");
-
-   /* make sure we don't reference more than one vertex attribute register */
-   if ((inst->SrcReg[0].File == PROGRAM_INPUT &&
-        inst->SrcReg[1].File == PROGRAM_INPUT &&
-        inst->SrcReg[0].Index != inst->SrcReg[1].Index) ||
-       (inst->SrcReg[0].File == PROGRAM_INPUT &&
-        inst->SrcReg[2].File == PROGRAM_INPUT &&
-        inst->SrcReg[0].Index != inst->SrcReg[2].Index) ||
-       (inst->SrcReg[1].File == PROGRAM_INPUT &&
-        inst->SrcReg[2].File == PROGRAM_INPUT &&
-        inst->SrcReg[1].Index != inst->SrcReg[2].Index))
-      RETURN_ERROR1("Can only reference one input register");
-
-   return GL_TRUE;
-}
-
-
-static GLboolean
-Parse_ScalarInstruction(struct parse_state *parseState,
-                        struct prog_instruction *inst,
-                        enum prog_opcode opcode)
-{
-   if (opcode == OPCODE_RCC && !parseState->isVersion1_1)
-      RETURN_ERROR1("RCC illegal for vertex program 1.0");
-
-   inst->Opcode = opcode;
-
-   /* dest reg */
-   if (!Parse_MaskedDstReg(parseState, &inst->DstReg))
-      RETURN_ERROR;
-
-   /* comma */
-   if (!Parse_String(parseState, ","))
-      RETURN_ERROR;
-
-   /* first src arg */
-   if (!Parse_ScalarSrcReg(parseState, &inst->SrcReg[0]))
-      RETURN_ERROR;
-
-   /* semicolon */
-   if (!Parse_String(parseState, ";"))
-      RETURN_ERROR;
-
-   return GL_TRUE;
-}
-
-
-static GLboolean
-Parse_AddressInstruction(struct parse_state *parseState, struct prog_instruction *inst)
-{
-   inst->Opcode = OPCODE_ARL;
-
-   /* Make ARB_vp backends happy */
-   inst->DstReg.File = PROGRAM_ADDRESS;
-   inst->DstReg.WriteMask = WRITEMASK_X;
-   inst->DstReg.Index = 0;
-
-   /* dest A0 reg */
-   if (!Parse_AddrReg(parseState))
-      RETURN_ERROR;
-
-   /* comma */
-   if (!Parse_String(parseState, ","))
-      RETURN_ERROR;
-
-   /* parse src reg */
-   if (!Parse_ScalarSrcReg(parseState, &inst->SrcReg[0]))
-      RETURN_ERROR;
-
-   /* semicolon */
-   if (!Parse_String(parseState, ";"))
-      RETURN_ERROR;
-
-   return GL_TRUE;
-}
-
-
-static GLboolean
-Parse_EndInstruction(struct parse_state *parseState, struct prog_instruction *inst)
-{
-   GLubyte token[100];
-
-   inst->Opcode = OPCODE_END;
-
-   /* this should fail! */
-   if (Parse_Token(parseState, token))
-      RETURN_ERROR2("Unexpected token after END:", token);
-   else
-      return GL_TRUE;
-}
-
-
-/**
- * The PRINT instruction is Mesa-specific and is meant as a debugging aid for
- * the vertex program developer.
- * The NV_vertex_program extension grammar is modified as follows:
- *
- *  <instruction>        ::= <ARL-instruction>
- *                         | ...
- *                         | <PRINT-instruction>
- *
- *  <PRINT-instruction>  ::= "PRINT" <string literal>
- *                         | "PRINT" <string literal> "," <srcReg>
- *                         | "PRINT" <string literal> "," <dstReg>
- */
-static GLboolean
-Parse_PrintInstruction(struct parse_state *parseState, struct prog_instruction *inst)
-{
-   const GLubyte *str;
-   GLubyte *msg;
-   GLuint len;
-   GLubyte token[100];
-   struct prog_src_register *srcReg = &inst->SrcReg[0];
-   GLint idx;
-
-   inst->Opcode = OPCODE_PRINT;
-
-   /* The first argument is a literal string 'just like this' */
-   if (!Parse_String(parseState, "'"))
-      RETURN_ERROR;
-
-   str = parseState->pos;
-   for (len = 0; str[len] != '\''; len++) /* find closing quote */
-      ;
-   parseState->pos += len + 1;
-   msg = (GLubyte*) malloc(len + 1);
-
-   memcpy(msg, str, len);
-   msg[len] = 0;
-   inst->Data = msg;
-
-   /* comma */
-   if (Parse_String(parseState, ",")) {
-
-      /* The second argument is a register name */
-      if (!Peek_Token(parseState, token))
-         RETURN_ERROR;
-
-      srcReg->RelAddr = GL_FALSE;
-      srcReg->Negate = NEGATE_NONE;
-      srcReg->Swizzle = SWIZZLE_NOOP;
-
-      /* Register can be R<n>, c[n], c[n +/- offset], a named vertex attrib,
-       * or an o[n] output register.
-       */
-      if (token[0] == 'R') {
-         srcReg->File = PROGRAM_TEMPORARY;
-         if (!Parse_TempReg(parseState, &idx))
-            RETURN_ERROR;
-	 srcReg->Index = idx;
-      }
-      else if (token[0] == 'c') {
-         srcReg->File = PROGRAM_ENV_PARAM;
-         if (!Parse_ParamReg(parseState, srcReg))
-            RETURN_ERROR;
-      }
-      else if (token[0] == 'v') {
-         srcReg->File = PROGRAM_INPUT;
-         if (!Parse_AttribReg(parseState, &idx))
-            RETURN_ERROR;
-	 srcReg->Index = idx;
-      }
-      else if (token[0] == 'o') {
-         srcReg->File = PROGRAM_OUTPUT;
-         if (!Parse_OutputReg(parseState, &idx))
-            RETURN_ERROR;
-	 srcReg->Index = idx;
-      }
-      else {
-         RETURN_ERROR2("Bad source register name", token);
-      }
-   }
-   else {
-      srcReg->File = 0;
-   }
-
-   /* semicolon */
-   if (!Parse_String(parseState, ";"))
-      RETURN_ERROR;
-
-   return GL_TRUE;
-}
-
-
-static GLboolean
-Parse_OptionSequence(struct parse_state *parseState,
-                     struct prog_instruction program[])
-{
-   (void) program;
-   while (1) {
-      if (!Parse_String(parseState, "OPTION"))
-         return GL_TRUE;  /* ok, not an OPTION statement */
-      if (Parse_String(parseState, "NV_position_invariant")) {
-         parseState->isPositionInvariant = GL_TRUE;
-      }
-      else {
-         RETURN_ERROR1("unexpected OPTION statement");
-      }
-      if (!Parse_String(parseState, ";"))
-         return GL_FALSE;
-   }
-}
-
-
-static GLboolean
-Parse_InstructionSequence(struct parse_state *parseState,
-                          struct prog_instruction program[])
-{
-   while (1) {
-      struct prog_instruction *inst = program + parseState->numInst;
-
-      /* Initialize the instruction */
-      _mesa_init_instructions(inst, 1);
-
-      if (Parse_String(parseState, "MOV")) {
-         if (!Parse_UnaryOpInstruction(parseState, inst, OPCODE_MOV))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "LIT")) {
-         if (!Parse_UnaryOpInstruction(parseState, inst, OPCODE_LIT))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "ABS")) {
-         if (!Parse_UnaryOpInstruction(parseState, inst, OPCODE_ABS))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "MUL")) {
-         if (!Parse_BiOpInstruction(parseState, inst, OPCODE_MUL))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "ADD")) {
-         if (!Parse_BiOpInstruction(parseState, inst, OPCODE_ADD))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "DP3")) {
-         if (!Parse_BiOpInstruction(parseState, inst, OPCODE_DP3))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "DP4")) {
-         if (!Parse_BiOpInstruction(parseState, inst, OPCODE_DP4))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "DST")) {
-         if (!Parse_BiOpInstruction(parseState, inst, OPCODE_DST))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "MIN")) {
-         if (!Parse_BiOpInstruction(parseState, inst, OPCODE_MIN))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "MAX")) {
-         if (!Parse_BiOpInstruction(parseState, inst, OPCODE_MAX))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "SLT")) {
-         if (!Parse_BiOpInstruction(parseState, inst, OPCODE_SLT))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "SGE")) {
-         if (!Parse_BiOpInstruction(parseState, inst, OPCODE_SGE))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "DPH")) {
-         if (!Parse_BiOpInstruction(parseState, inst, OPCODE_DPH))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "SUB")) {
-         if (!Parse_BiOpInstruction(parseState, inst, OPCODE_SUB))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "MAD")) {
-         if (!Parse_TriOpInstruction(parseState, inst, OPCODE_MAD))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "RCP")) {
-         if (!Parse_ScalarInstruction(parseState, inst, OPCODE_RCP))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "RSQ")) {
-         if (!Parse_ScalarInstruction(parseState, inst, OPCODE_RSQ))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "EXP")) {
-         if (!Parse_ScalarInstruction(parseState, inst, OPCODE_EXP))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "LOG")) {
-         if (!Parse_ScalarInstruction(parseState, inst, OPCODE_LOG))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "RCC")) {
-         if (!Parse_ScalarInstruction(parseState, inst, OPCODE_RCC))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "ARL")) {
-         if (!Parse_AddressInstruction(parseState, inst))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "PRINT")) {
-         if (!Parse_PrintInstruction(parseState, inst))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "END")) {
-         if (!Parse_EndInstruction(parseState, inst))
-            RETURN_ERROR;
-         else {
-            parseState->numInst++;
-            return GL_TRUE;  /* all done */
-         }
-      }
-      else {
-         /* bad instruction name */
-         RETURN_ERROR1("Unexpected token");
-      }
-
-      /* examine input/output registers */
-      if (inst->DstReg.File == PROGRAM_OUTPUT)
-         parseState->outputsWritten |= (1 << inst->DstReg.Index);
-      else if (inst->DstReg.File == PROGRAM_ENV_PARAM)
-         parseState->anyProgRegsWritten = GL_TRUE;
-
-      if (inst->SrcReg[0].File == PROGRAM_INPUT)
-         parseState->inputsRead |= (1 << inst->SrcReg[0].Index);
-      if (inst->SrcReg[1].File == PROGRAM_INPUT)
-         parseState->inputsRead |= (1 << inst->SrcReg[1].Index);
-      if (inst->SrcReg[2].File == PROGRAM_INPUT)
-         parseState->inputsRead |= (1 << inst->SrcReg[2].Index);
-
-      parseState->numInst++;
-
-      if (parseState->numInst >= MAX_NV_VERTEX_PROGRAM_INSTRUCTIONS)
-         RETURN_ERROR1("Program too long");
-   }
-
-   RETURN_ERROR;
-}
-
-
-static GLboolean
-Parse_Program(struct parse_state *parseState,
-              struct prog_instruction instBuffer[])
-{
-   if (parseState->isVersion1_1) {
-      if (!Parse_OptionSequence(parseState, instBuffer)) {
-         return GL_FALSE;
-      }
-   }
-   return Parse_InstructionSequence(parseState, instBuffer);
-}
-
-
-/**
- * Parse/compile the 'str' returning the compiled 'program'.
- * ctx->Program.ErrorPos will be -1 if successful.  Otherwise, ErrorPos
- * indicates the position of the error in 'str'.
- */
-void
-_mesa_parse_nv_vertex_program(GLcontext *ctx, GLenum dstTarget,
-                              const GLubyte *str, GLsizei len,
-                              struct gl_vertex_program *program)
-{
-   struct parse_state parseState;
-   struct prog_instruction instBuffer[MAX_NV_VERTEX_PROGRAM_INSTRUCTIONS];
-   struct prog_instruction *newInst;
-   GLenum target;
-   GLubyte *programString;
-
-   /* Make a null-terminated copy of the program string */
-   programString = (GLubyte *) MALLOC(len + 1);
-   if (!programString) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glLoadProgramNV");
-      return;
-   }
-   memcpy(programString, str, len);
-   programString[len] = 0;
-
-   /* Get ready to parse */
-   parseState.ctx = ctx;
-   parseState.start = programString;
-   parseState.isPositionInvariant = GL_FALSE;
-   parseState.isVersion1_1 = GL_FALSE;
-   parseState.numInst = 0;
-   parseState.inputsRead = 0;
-   parseState.outputsWritten = 0;
-   parseState.anyProgRegsWritten = GL_FALSE;
-
-   /* Reset error state */
-   _mesa_set_program_error(ctx, -1, NULL);
-
-   /* check the program header */
-   if (strncmp((const char *) programString, "!!VP1.0", 7) == 0) {
-      target = GL_VERTEX_PROGRAM_NV;
-      parseState.pos = programString + 7;
-      parseState.isStateProgram = GL_FALSE;
-   }
-   else if (strncmp((const char *) programString, "!!VP1.1", 7) == 0) {
-      target = GL_VERTEX_PROGRAM_NV;
-      parseState.pos = programString + 7;
-      parseState.isStateProgram = GL_FALSE;
-      parseState.isVersion1_1 = GL_TRUE;
-   }
-   else if (strncmp((const char *) programString, "!!VSP1.0", 8) == 0) {
-      target = GL_VERTEX_STATE_PROGRAM_NV;
-      parseState.pos = programString + 8;
-      parseState.isStateProgram = GL_TRUE;
-   }
-   else {
-      /* invalid header */
-      ctx->Program.ErrorPos = 0;
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glLoadProgramNV(bad header)");
-      return;
-   }
-
-   /* make sure target and header match */
-   if (target != dstTarget) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glLoadProgramNV(target mismatch)");
-      return;
-   }
-
-
-   if (Parse_Program(&parseState, instBuffer)) {
-      gl_state_index state_tokens[STATE_LENGTH] = {0, 0, 0, 0, 0};
-      int i;
-
-      /* successful parse! */
-
-      if (parseState.isStateProgram) {
-         if (!parseState.anyProgRegsWritten) {
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glLoadProgramNV(c[#] not written)");
-            return;
-         }
-      }
-      else {
-         if (!parseState.isPositionInvariant &&
-             !(parseState.outputsWritten & (1 << VERT_RESULT_HPOS))) {
-            /* bit 1 = HPOS register */
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glLoadProgramNV(HPOS not written)");
-            return;
-         }
-      }
-
-      /* copy the compiled instructions */
-      assert(parseState.numInst <= MAX_NV_VERTEX_PROGRAM_INSTRUCTIONS);
-      newInst = _mesa_alloc_instructions(parseState.numInst);
-      if (!newInst) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glLoadProgramNV");
-         free(programString);
-         return;  /* out of memory */
-      }
-      _mesa_copy_instructions(newInst, instBuffer, parseState.numInst);
-
-      /* install the program */
-      program->Base.Target = target;
-      if (program->Base.String) {
-         free(program->Base.String);
-      }
-      program->Base.String = programString;
-      program->Base.Format = GL_PROGRAM_FORMAT_ASCII_ARB;
-      if (program->Base.Instructions) {
-         free(program->Base.Instructions);
-      }
-      program->Base.Instructions = newInst;
-      program->Base.InputsRead = parseState.inputsRead;
-      if (parseState.isPositionInvariant)
-         program->Base.InputsRead |= VERT_BIT_POS;
-      program->Base.NumInstructions = parseState.numInst;
-      program->Base.OutputsWritten = parseState.outputsWritten;
-      program->IsPositionInvariant = parseState.isPositionInvariant;
-      program->IsNVProgram = GL_TRUE;
-
-#ifdef DEBUG_foo
-      printf("--- glLoadProgramNV result ---\n");
-      _mesa_fprint_program_opt(stdout, &program->Base, PROG_PRINT_NV, 0);
-      printf("------------------------------\n");
-#endif
-
-      if (program->Base.Parameters)
-	 _mesa_free_parameter_list(program->Base.Parameters);
-
-      program->Base.Parameters = _mesa_new_parameter_list ();
-      program->Base.NumParameters = 0;
-
-      state_tokens[0] = STATE_VERTEX_PROGRAM;
-      state_tokens[1] = STATE_ENV;
-      /* Add refs to all of the potential params, in order.  If we want to not
-       * upload everything, _mesa_layout_parameters is the answer.
-       */
-      for (i = 0; i < MAX_NV_VERTEX_PROGRAM_PARAMS; i++) {
-	 GLint index;
-	 state_tokens[2] = i;
-	 index = _mesa_add_state_reference(program->Base.Parameters,
-					   state_tokens);
-	 assert(index == i);
-      }
-      program->Base.NumParameters = program->Base.Parameters->NumParameters;
-
-      _mesa_setup_nv_temporary_count(ctx, &program->Base);
-      _mesa_emit_nv_temp_initialization(ctx, &program->Base);
-   }
-   else {
-      /* Error! */
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glLoadProgramNV");
-      /* NOTE: _mesa_set_program_error would have been called already */
-      /* GL_NV_vertex_program isn't supposed to set the error string
-       * so we reset it here.
-       */
-      _mesa_set_program_error(ctx, ctx->Program.ErrorPos, NULL);
-   }
-}
-
-
-const char *
-_mesa_nv_vertex_input_register_name(GLuint i)
-{
-   ASSERT(i < MAX_NV_VERTEX_PROGRAM_INPUTS);
-   return InputRegisters[i];
-}
-
-
-const char *
-_mesa_nv_vertex_output_register_name(GLuint i)
-{
-   ASSERT(i < MAX_NV_VERTEX_PROGRAM_OUTPUTS);
-   return OutputRegisters[i];
-}
-
diff --git a/mesalib/src/mesa/shader/nvvertparse.h b/mesalib/src/mesa/shader/nvvertparse.h
deleted file mode 100644
index 9919e2238..000000000
--- a/mesalib/src/mesa/shader/nvvertparse.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  5.1
- *
- * Copyright (C) 1999-2003  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.
- *
- * Authors:
- *    Brian Paul
- */
-
-
-#ifndef NVVERTPARSE_H
-#define NVVERTPARSE_H
-
-
-extern void
-_mesa_parse_nv_vertex_program(GLcontext *ctx, GLenum target,
-                              const GLubyte *str, GLsizei len,
-                              struct gl_vertex_program *program);
-
-
-extern const char *
-_mesa_nv_vertex_input_register_name(GLuint i);
-
-extern const char *
-_mesa_nv_vertex_output_register_name(GLuint i);
-
-#endif
diff --git a/mesalib/src/mesa/shader/prog_cache.c b/mesalib/src/mesa/shader/prog_cache.c
deleted file mode 100644
index e5b602fc0..000000000
--- a/mesalib/src/mesa/shader/prog_cache.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/**************************************************************************
- * 
- * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- * 
- **************************************************************************/
-
-
-#include "main/glheader.h"
-#include "main/mtypes.h"
-#include "main/imports.h"
-#include "shader/prog_cache.h"
-#include "shader/program.h"
-
-
-struct cache_item
-{
-   GLuint hash;
-   void *key;
-   struct gl_program *program;
-   struct cache_item *next;
-};
-
-struct gl_program_cache
-{
-   struct cache_item **items;
-   struct cache_item *last;
-   GLuint size, n_items;
-};
-
-
-
-/**
- * Compute hash index from state key.
- */
-static GLuint
-hash_key(const void *key, GLuint key_size)
-{
-   const GLuint *ikey = (const GLuint *) key;
-   GLuint hash = 0, i;
-
-   assert(key_size >= 4);
-
-   /* Make a slightly better attempt at a hash function:
-    */
-   for (i = 0; i < key_size / sizeof(*ikey); i++)
-   {
-      hash += ikey[i];
-      hash += (hash << 10);
-      hash ^= (hash >> 6);
-   }
-
-   return hash;
-}
-
-
-/**
- * Rebuild/expand the hash table to accomodate more entries
- */
-static void
-rehash(struct gl_program_cache *cache)
-{
-   struct cache_item **items;
-   struct cache_item *c, *next;
-   GLuint size, i;
-
-   cache->last = NULL;
-
-   size = cache->size * 3;
-   items = (struct cache_item**) malloc(size * sizeof(*items));
-   memset(items, 0, size * sizeof(*items));
-
-   for (i = 0; i < cache->size; i++)
-      for (c = cache->items[i]; c; c = next) {
-	 next = c->next;
-	 c->next = items[c->hash % size];
-	 items[c->hash % size] = c;
-      }
-
-   free(cache->items);
-   cache->items = items;
-   cache->size = size;
-}
-
-
-static void
-clear_cache(GLcontext *ctx, struct gl_program_cache *cache)
-{
-   struct cache_item *c, *next;
-   GLuint i;
-   
-   cache->last = NULL;
-
-   for (i = 0; i < cache->size; i++) {
-      for (c = cache->items[i]; c; c = next) {
-	 next = c->next;
-	 free(c->key);
-         _mesa_reference_program(ctx, &c->program, NULL);
-	 free(c);
-      }
-      cache->items[i] = NULL;
-   }
-
-
-   cache->n_items = 0;
-}
-
-
-
-struct gl_program_cache *
-_mesa_new_program_cache(void)
-{
-   struct gl_program_cache *cache = CALLOC_STRUCT(gl_program_cache);
-   if (cache) {
-      cache->size = 17;
-      cache->items = (struct cache_item **)
-         calloc(1, cache->size * sizeof(struct cache_item));
-      if (!cache->items) {
-         free(cache);
-         return NULL;
-      }
-   }
-   return cache;
-}
-
-
-void
-_mesa_delete_program_cache(GLcontext *ctx, struct gl_program_cache *cache)
-{
-   clear_cache(ctx, cache);
-   free(cache->items);
-   free(cache);
-}
-
-
-struct gl_program *
-_mesa_search_program_cache(struct gl_program_cache *cache,
-                           const void *key, GLuint keysize)
-{
-   if (cache->last && 
-       memcmp(cache->last->key, key, keysize) == 0) {
-      return cache->last->program;
-   }
-   else {
-      const GLuint hash = hash_key(key, keysize);
-      struct cache_item *c;
-
-      for (c = cache->items[hash % cache->size]; c; c = c->next) {
-         if (c->hash == hash && memcmp(c->key, key, keysize) == 0) {
-            cache->last = c;
-            return c->program;
-         }
-      }
-
-      return NULL;
-   }
-}
-
-
-void
-_mesa_program_cache_insert(GLcontext *ctx,
-                           struct gl_program_cache *cache,
-                           const void *key, GLuint keysize,
-                           struct gl_program *program)
-{
-   const GLuint hash = hash_key(key, keysize);
-   struct cache_item *c = CALLOC_STRUCT(cache_item);
-
-   c->hash = hash;
-
-   c->key = malloc(keysize);
-   memcpy(c->key, key, keysize);
-
-   c->program = program;  /* no refcount change */
-
-   if (cache->n_items > cache->size * 1.5) {
-      if (cache->size < 1000)
-	 rehash(cache);
-      else 
-	 clear_cache(ctx, cache);
-   }
-
-   cache->n_items++;
-   c->next = cache->items[hash % cache->size];
-   cache->items[hash % cache->size] = c;
-}
diff --git a/mesalib/src/mesa/shader/prog_cache.h b/mesalib/src/mesa/shader/prog_cache.h
deleted file mode 100644
index 4e1ccac03..000000000
--- a/mesalib/src/mesa/shader/prog_cache.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/**************************************************************************
- * 
- * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- * 
- **************************************************************************/
-
-
-#ifndef PROG_CACHE_H
-#define PROG_CACHE_H
-
-
-/** Opaque type */
-struct gl_program_cache;
-
-
-extern struct gl_program_cache *
-_mesa_new_program_cache(void);
-
-extern void
-_mesa_delete_program_cache(GLcontext *ctx, struct gl_program_cache *pc);
-
-
-extern struct gl_program *
-_mesa_search_program_cache(struct gl_program_cache *cache,
-                           const void *key, GLuint keysize);
-
-extern void
-_mesa_program_cache_insert(GLcontext *ctx,
-                           struct gl_program_cache *cache,
-                           const void *key, GLuint keysize,
-                           struct gl_program *program);
-
-
-#endif /* PROG_CACHE_H */
diff --git a/mesalib/src/mesa/shader/prog_execute.c b/mesalib/src/mesa/shader/prog_execute.c
deleted file mode 100644
index 37750cc33..000000000
--- a/mesalib/src/mesa/shader/prog_execute.c
+++ /dev/null
@@ -1,1798 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.3
- *
- * Copyright (C) 1999-2008  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 prog_execute.c
- * Software interpreter for vertex/fragment programs.
- * \author Brian Paul
- */
-
-/*
- * NOTE: we do everything in single-precision floating point; we don't
- * currently observe the single/half/fixed-precision qualifiers.
- *
- */
-
-
-#include "main/glheader.h"
-#include "main/colormac.h"
-#include "main/context.h"
-#include "prog_execute.h"
-#include "prog_instruction.h"
-#include "prog_parameter.h"
-#include "prog_print.h"
-#include "prog_noise.h"
-
-
-/* debug predicate */
-#define DEBUG_PROG 0
-
-
-/**
- * Set x to positive or negative infinity.
- */
-#if defined(USE_IEEE) || defined(_WIN32)
-#define SET_POS_INFINITY(x)                  \
-   do {                                      \
-         fi_type fi;                         \
-         fi.i = 0x7F800000;                  \
-         x = fi.f;                           \
-   } while (0)
-#define SET_NEG_INFINITY(x)                  \
-   do {                                      \
-         fi_type fi;                         \
-         fi.i = 0xFF800000;                  \
-         x = fi.f;                           \
-   } while (0)
-#elif defined(VMS)
-#define SET_POS_INFINITY(x)  x = __MAXFLOAT
-#define SET_NEG_INFINITY(x)  x = -__MAXFLOAT
-#else
-#define SET_POS_INFINITY(x)  x = (GLfloat) HUGE_VAL
-#define SET_NEG_INFINITY(x)  x = (GLfloat) -HUGE_VAL
-#endif
-
-#define SET_FLOAT_BITS(x, bits) ((fi_type *) (void *) &(x))->i = bits
-
-
-static const GLfloat ZeroVec[4] = { 0.0F, 0.0F, 0.0F, 0.0F };
-
-
-
-/**
- * Return a pointer to the 4-element float vector specified by the given
- * source register.
- */
-static INLINE const GLfloat *
-get_src_register_pointer(const struct prog_src_register *source,
-                         const struct gl_program_machine *machine)
-{
-   const struct gl_program *prog = machine->CurProgram;
-   GLint reg = source->Index;
-
-   if (source->RelAddr) {
-      /* add address register value to src index/offset */
-      reg += machine->AddressReg[0][0];
-      if (reg < 0) {
-         return ZeroVec;
-      }
-   }
-
-   switch (source->File) {
-   case PROGRAM_TEMPORARY:
-      if (reg >= MAX_PROGRAM_TEMPS)
-         return ZeroVec;
-      return machine->Temporaries[reg];
-
-   case PROGRAM_INPUT:
-      if (prog->Target == GL_VERTEX_PROGRAM_ARB) {
-         if (reg >= VERT_ATTRIB_MAX)
-            return ZeroVec;
-         return machine->VertAttribs[reg];
-      }
-      else {
-         if (reg >= FRAG_ATTRIB_MAX)
-            return ZeroVec;
-         return machine->Attribs[reg][machine->CurElement];
-      }
-
-   case PROGRAM_OUTPUT:
-      if (reg >= MAX_PROGRAM_OUTPUTS)
-         return ZeroVec;
-      return machine->Outputs[reg];
-
-   case PROGRAM_LOCAL_PARAM:
-      if (reg >= MAX_PROGRAM_LOCAL_PARAMS)
-         return ZeroVec;
-      return machine->CurProgram->LocalParams[reg];
-
-   case PROGRAM_ENV_PARAM:
-      if (reg >= MAX_PROGRAM_ENV_PARAMS)
-         return ZeroVec;
-      return machine->EnvParams[reg];
-
-   case PROGRAM_STATE_VAR:
-      /* Fallthrough */
-   case PROGRAM_CONSTANT:
-      /* Fallthrough */
-   case PROGRAM_UNIFORM:
-      /* Fallthrough */
-   case PROGRAM_NAMED_PARAM:
-      if (reg >= (GLint) prog->Parameters->NumParameters)
-         return ZeroVec;
-      return prog->Parameters->ParameterValues[reg];
-
-   default:
-      _mesa_problem(NULL,
-         "Invalid src register file %d in get_src_register_pointer()",
-         source->File);
-      return NULL;
-   }
-}
-
-
-/**
- * Return a pointer to the 4-element float vector specified by the given
- * destination register.
- */
-static INLINE GLfloat *
-get_dst_register_pointer(const struct prog_dst_register *dest,
-                         struct gl_program_machine *machine)
-{
-   static GLfloat dummyReg[4];
-   GLint reg = dest->Index;
-
-   if (dest->RelAddr) {
-      /* add address register value to src index/offset */
-      reg += machine->AddressReg[0][0];
-      if (reg < 0) {
-         return dummyReg;
-      }
-   }
-
-   switch (dest->File) {
-   case PROGRAM_TEMPORARY:
-      if (reg >= MAX_PROGRAM_TEMPS)
-         return dummyReg;
-      return machine->Temporaries[reg];
-
-   case PROGRAM_OUTPUT:
-      if (reg >= MAX_PROGRAM_OUTPUTS)
-         return dummyReg;
-      return machine->Outputs[reg];
-
-   case PROGRAM_WRITE_ONLY:
-      return dummyReg;
-
-   default:
-      _mesa_problem(NULL,
-         "Invalid dest register file %d in get_dst_register_pointer()",
-         dest->File);
-      return NULL;
-   }
-}
-
-
-
-/**
- * Fetch a 4-element float vector from the given source register.
- * Apply swizzling and negating as needed.
- */
-static void
-fetch_vector4(const struct prog_src_register *source,
-              const struct gl_program_machine *machine, GLfloat result[4])
-{
-   const GLfloat *src = get_src_register_pointer(source, machine);
-   ASSERT(src);
-
-   if (source->Swizzle == SWIZZLE_NOOP) {
-      /* no swizzling */
-      COPY_4V(result, src);
-   }
-   else {
-      ASSERT(GET_SWZ(source->Swizzle, 0) <= 3);
-      ASSERT(GET_SWZ(source->Swizzle, 1) <= 3);
-      ASSERT(GET_SWZ(source->Swizzle, 2) <= 3);
-      ASSERT(GET_SWZ(source->Swizzle, 3) <= 3);
-      result[0] = src[GET_SWZ(source->Swizzle, 0)];
-      result[1] = src[GET_SWZ(source->Swizzle, 1)];
-      result[2] = src[GET_SWZ(source->Swizzle, 2)];
-      result[3] = src[GET_SWZ(source->Swizzle, 3)];
-   }
-
-   if (source->Abs) {
-      result[0] = FABSF(result[0]);
-      result[1] = FABSF(result[1]);
-      result[2] = FABSF(result[2]);
-      result[3] = FABSF(result[3]);
-   }
-   if (source->Negate) {
-      ASSERT(source->Negate == NEGATE_XYZW);
-      result[0] = -result[0];
-      result[1] = -result[1];
-      result[2] = -result[2];
-      result[3] = -result[3];
-   }
-
-#ifdef NAN_CHECK
-   assert(!IS_INF_OR_NAN(result[0]));
-   assert(!IS_INF_OR_NAN(result[0]));
-   assert(!IS_INF_OR_NAN(result[0]));
-   assert(!IS_INF_OR_NAN(result[0]));
-#endif
-}
-
-
-/**
- * Fetch a 4-element uint vector from the given source register.
- * Apply swizzling but not negation/abs.
- */
-static void
-fetch_vector4ui(const struct prog_src_register *source,
-                const struct gl_program_machine *machine, GLuint result[4])
-{
-   const GLuint *src = (GLuint *) get_src_register_pointer(source, machine);
-   ASSERT(src);
-
-   if (source->Swizzle == SWIZZLE_NOOP) {
-      /* no swizzling */
-      COPY_4V(result, src);
-   }
-   else {
-      ASSERT(GET_SWZ(source->Swizzle, 0) <= 3);
-      ASSERT(GET_SWZ(source->Swizzle, 1) <= 3);
-      ASSERT(GET_SWZ(source->Swizzle, 2) <= 3);
-      ASSERT(GET_SWZ(source->Swizzle, 3) <= 3);
-      result[0] = src[GET_SWZ(source->Swizzle, 0)];
-      result[1] = src[GET_SWZ(source->Swizzle, 1)];
-      result[2] = src[GET_SWZ(source->Swizzle, 2)];
-      result[3] = src[GET_SWZ(source->Swizzle, 3)];
-   }
-
-   /* Note: no Negate or Abs here */
-}
-
-
-
-/**
- * Fetch the derivative with respect to X or Y for the given register.
- * XXX this currently only works for fragment program input attribs.
- */
-static void
-fetch_vector4_deriv(GLcontext * ctx,
-                    const struct prog_src_register *source,
-                    const struct gl_program_machine *machine,
-                    char xOrY, GLfloat result[4])
-{
-   if (source->File == PROGRAM_INPUT &&
-       source->Index < (GLint) machine->NumDeriv) {
-      const GLint col = machine->CurElement;
-      const GLfloat w = machine->Attribs[FRAG_ATTRIB_WPOS][col][3];
-      const GLfloat invQ = 1.0f / w;
-      GLfloat deriv[4];
-
-      if (xOrY == 'X') {
-         deriv[0] = machine->DerivX[source->Index][0] * invQ;
-         deriv[1] = machine->DerivX[source->Index][1] * invQ;
-         deriv[2] = machine->DerivX[source->Index][2] * invQ;
-         deriv[3] = machine->DerivX[source->Index][3] * invQ;
-      }
-      else {
-         deriv[0] = machine->DerivY[source->Index][0] * invQ;
-         deriv[1] = machine->DerivY[source->Index][1] * invQ;
-         deriv[2] = machine->DerivY[source->Index][2] * invQ;
-         deriv[3] = machine->DerivY[source->Index][3] * invQ;
-      }
-
-      result[0] = deriv[GET_SWZ(source->Swizzle, 0)];
-      result[1] = deriv[GET_SWZ(source->Swizzle, 1)];
-      result[2] = deriv[GET_SWZ(source->Swizzle, 2)];
-      result[3] = deriv[GET_SWZ(source->Swizzle, 3)];
-      
-      if (source->Abs) {
-         result[0] = FABSF(result[0]);
-         result[1] = FABSF(result[1]);
-         result[2] = FABSF(result[2]);
-         result[3] = FABSF(result[3]);
-      }
-      if (source->Negate) {
-         ASSERT(source->Negate == NEGATE_XYZW);
-         result[0] = -result[0];
-         result[1] = -result[1];
-         result[2] = -result[2];
-         result[3] = -result[3];
-      }
-   }
-   else {
-      ASSIGN_4V(result, 0.0, 0.0, 0.0, 0.0);
-   }
-}
-
-
-/**
- * As above, but only return result[0] element.
- */
-static void
-fetch_vector1(const struct prog_src_register *source,
-              const struct gl_program_machine *machine, GLfloat result[4])
-{
-   const GLfloat *src = get_src_register_pointer(source, machine);
-   ASSERT(src);
-
-   result[0] = src[GET_SWZ(source->Swizzle, 0)];
-
-   if (source->Abs) {
-      result[0] = FABSF(result[0]);
-   }
-   if (source->Negate) {
-      result[0] = -result[0];
-   }
-}
-
-
-static GLuint
-fetch_vector1ui(const struct prog_src_register *source,
-                const struct gl_program_machine *machine)
-{
-   const GLuint *src = (GLuint *) get_src_register_pointer(source, machine);
-   return src[GET_SWZ(source->Swizzle, 0)];
-}
-
-
-/**
- * Fetch texel from texture.  Use partial derivatives when possible.
- */
-static INLINE void
-fetch_texel(GLcontext *ctx,
-            const struct gl_program_machine *machine,
-            const struct prog_instruction *inst,
-            const GLfloat texcoord[4], GLfloat lodBias,
-            GLfloat color[4])
-{
-   const GLuint unit = machine->Samplers[inst->TexSrcUnit];
-
-   /* Note: we only have the right derivatives for fragment input attribs.
-    */
-   if (machine->NumDeriv > 0 &&
-       inst->SrcReg[0].File == PROGRAM_INPUT &&
-       inst->SrcReg[0].Index == FRAG_ATTRIB_TEX0 + inst->TexSrcUnit) {
-      /* simple texture fetch for which we should have derivatives */
-      GLuint attr = inst->SrcReg[0].Index;
-      machine->FetchTexelDeriv(ctx, texcoord,
-                               machine->DerivX[attr],
-                               machine->DerivY[attr],
-                               lodBias, unit, color);
-   }
-   else {
-      machine->FetchTexelLod(ctx, texcoord, lodBias, unit, color);
-   }
-}
-
-
-/**
- * Test value against zero and return GT, LT, EQ or UN if NaN.
- */
-static INLINE GLuint
-generate_cc(float value)
-{
-   if (value != value)
-      return COND_UN;           /* NaN */
-   if (value > 0.0F)
-      return COND_GT;
-   if (value < 0.0F)
-      return COND_LT;
-   return COND_EQ;
-}
-
-
-/**
- * Test if the ccMaskRule is satisfied by the given condition code.
- * Used to mask destination writes according to the current condition code.
- */
-static INLINE GLboolean
-test_cc(GLuint condCode, GLuint ccMaskRule)
-{
-   switch (ccMaskRule) {
-   case COND_EQ: return (condCode == COND_EQ);
-   case COND_NE: return (condCode != COND_EQ);
-   case COND_LT: return (condCode == COND_LT);
-   case COND_GE: return (condCode == COND_GT || condCode == COND_EQ);
-   case COND_LE: return (condCode == COND_LT || condCode == COND_EQ);
-   case COND_GT: return (condCode == COND_GT);
-   case COND_TR: return GL_TRUE;
-   case COND_FL: return GL_FALSE;
-   default:      return GL_TRUE;
-   }
-}
-
-
-/**
- * Evaluate the 4 condition codes against a predicate and return GL_TRUE
- * or GL_FALSE to indicate result.
- */
-static INLINE GLboolean
-eval_condition(const struct gl_program_machine *machine,
-               const struct prog_instruction *inst)
-{
-   const GLuint swizzle = inst->DstReg.CondSwizzle;
-   const GLuint condMask = inst->DstReg.CondMask;
-   if (test_cc(machine->CondCodes[GET_SWZ(swizzle, 0)], condMask) ||
-       test_cc(machine->CondCodes[GET_SWZ(swizzle, 1)], condMask) ||
-       test_cc(machine->CondCodes[GET_SWZ(swizzle, 2)], condMask) ||
-       test_cc(machine->CondCodes[GET_SWZ(swizzle, 3)], condMask)) {
-      return GL_TRUE;
-   }
-   else {
-      return GL_FALSE;
-   }
-}
-
-
-
-/**
- * Store 4 floats into a register.  Observe the instructions saturate and
- * set-condition-code flags.
- */
-static void
-store_vector4(const struct prog_instruction *inst,
-              struct gl_program_machine *machine, const GLfloat value[4])
-{
-   const struct prog_dst_register *dstReg = &(inst->DstReg);
-   const GLboolean clamp = inst->SaturateMode == SATURATE_ZERO_ONE;
-   GLuint writeMask = dstReg->WriteMask;
-   GLfloat clampedValue[4];
-   GLfloat *dst = get_dst_register_pointer(dstReg, machine);
-
-#if 0
-   if (value[0] > 1.0e10 ||
-       IS_INF_OR_NAN(value[0]) ||
-       IS_INF_OR_NAN(value[1]) ||
-       IS_INF_OR_NAN(value[2]) || IS_INF_OR_NAN(value[3]))
-      printf("store %g %g %g %g\n", value[0], value[1], value[2], value[3]);
-#endif
-
-   if (clamp) {
-      clampedValue[0] = CLAMP(value[0], 0.0F, 1.0F);
-      clampedValue[1] = CLAMP(value[1], 0.0F, 1.0F);
-      clampedValue[2] = CLAMP(value[2], 0.0F, 1.0F);
-      clampedValue[3] = CLAMP(value[3], 0.0F, 1.0F);
-      value = clampedValue;
-   }
-
-   if (dstReg->CondMask != COND_TR) {
-      /* condition codes may turn off some writes */
-      if (writeMask & WRITEMASK_X) {
-         if (!test_cc(machine->CondCodes[GET_SWZ(dstReg->CondSwizzle, 0)],
-                      dstReg->CondMask))
-            writeMask &= ~WRITEMASK_X;
-      }
-      if (writeMask & WRITEMASK_Y) {
-         if (!test_cc(machine->CondCodes[GET_SWZ(dstReg->CondSwizzle, 1)],
-                      dstReg->CondMask))
-            writeMask &= ~WRITEMASK_Y;
-      }
-      if (writeMask & WRITEMASK_Z) {
-         if (!test_cc(machine->CondCodes[GET_SWZ(dstReg->CondSwizzle, 2)],
-                      dstReg->CondMask))
-            writeMask &= ~WRITEMASK_Z;
-      }
-      if (writeMask & WRITEMASK_W) {
-         if (!test_cc(machine->CondCodes[GET_SWZ(dstReg->CondSwizzle, 3)],
-                      dstReg->CondMask))
-            writeMask &= ~WRITEMASK_W;
-      }
-   }
-
-#ifdef NAN_CHECK
-   assert(!IS_INF_OR_NAN(value[0]));
-   assert(!IS_INF_OR_NAN(value[0]));
-   assert(!IS_INF_OR_NAN(value[0]));
-   assert(!IS_INF_OR_NAN(value[0]));
-#endif
-
-   if (writeMask & WRITEMASK_X)
-      dst[0] = value[0];
-   if (writeMask & WRITEMASK_Y)
-      dst[1] = value[1];
-   if (writeMask & WRITEMASK_Z)
-      dst[2] = value[2];
-   if (writeMask & WRITEMASK_W)
-      dst[3] = value[3];
-
-   if (inst->CondUpdate) {
-      if (writeMask & WRITEMASK_X)
-         machine->CondCodes[0] = generate_cc(value[0]);
-      if (writeMask & WRITEMASK_Y)
-         machine->CondCodes[1] = generate_cc(value[1]);
-      if (writeMask & WRITEMASK_Z)
-         machine->CondCodes[2] = generate_cc(value[2]);
-      if (writeMask & WRITEMASK_W)
-         machine->CondCodes[3] = generate_cc(value[3]);
-#if DEBUG_PROG
-      printf("CondCodes=(%s,%s,%s,%s) for:\n",
-             _mesa_condcode_string(machine->CondCodes[0]),
-             _mesa_condcode_string(machine->CondCodes[1]),
-             _mesa_condcode_string(machine->CondCodes[2]),
-             _mesa_condcode_string(machine->CondCodes[3]));
-#endif
-   }
-}
-
-
-/**
- * Store 4 uints into a register.  Observe the set-condition-code flags.
- */
-static void
-store_vector4ui(const struct prog_instruction *inst,
-                struct gl_program_machine *machine, const GLuint value[4])
-{
-   const struct prog_dst_register *dstReg = &(inst->DstReg);
-   GLuint writeMask = dstReg->WriteMask;
-   GLuint *dst = (GLuint *) get_dst_register_pointer(dstReg, machine);
-
-   if (dstReg->CondMask != COND_TR) {
-      /* condition codes may turn off some writes */
-      if (writeMask & WRITEMASK_X) {
-         if (!test_cc(machine->CondCodes[GET_SWZ(dstReg->CondSwizzle, 0)],
-                      dstReg->CondMask))
-            writeMask &= ~WRITEMASK_X;
-      }
-      if (writeMask & WRITEMASK_Y) {
-         if (!test_cc(machine->CondCodes[GET_SWZ(dstReg->CondSwizzle, 1)],
-                      dstReg->CondMask))
-            writeMask &= ~WRITEMASK_Y;
-      }
-      if (writeMask & WRITEMASK_Z) {
-         if (!test_cc(machine->CondCodes[GET_SWZ(dstReg->CondSwizzle, 2)],
-                      dstReg->CondMask))
-            writeMask &= ~WRITEMASK_Z;
-      }
-      if (writeMask & WRITEMASK_W) {
-         if (!test_cc(machine->CondCodes[GET_SWZ(dstReg->CondSwizzle, 3)],
-                      dstReg->CondMask))
-            writeMask &= ~WRITEMASK_W;
-      }
-   }
-
-   if (writeMask & WRITEMASK_X)
-      dst[0] = value[0];
-   if (writeMask & WRITEMASK_Y)
-      dst[1] = value[1];
-   if (writeMask & WRITEMASK_Z)
-      dst[2] = value[2];
-   if (writeMask & WRITEMASK_W)
-      dst[3] = value[3];
-
-   if (inst->CondUpdate) {
-      if (writeMask & WRITEMASK_X)
-         machine->CondCodes[0] = generate_cc((float)value[0]);
-      if (writeMask & WRITEMASK_Y)
-         machine->CondCodes[1] = generate_cc((float)value[1]);
-      if (writeMask & WRITEMASK_Z)
-         machine->CondCodes[2] = generate_cc((float)value[2]);
-      if (writeMask & WRITEMASK_W)
-         machine->CondCodes[3] = generate_cc((float)value[3]);
-#if DEBUG_PROG
-      printf("CondCodes=(%s,%s,%s,%s) for:\n",
-             _mesa_condcode_string(machine->CondCodes[0]),
-             _mesa_condcode_string(machine->CondCodes[1]),
-             _mesa_condcode_string(machine->CondCodes[2]),
-             _mesa_condcode_string(machine->CondCodes[3]));
-#endif
-   }
-}
-
-
-
-/**
- * Execute the given vertex/fragment program.
- *
- * \param ctx  rendering context
- * \param program  the program to execute
- * \param machine  machine state (must be initialized)
- * \return GL_TRUE if program completed or GL_FALSE if program executed KIL.
- */
-GLboolean
-_mesa_execute_program(GLcontext * ctx,
-                      const struct gl_program *program,
-                      struct gl_program_machine *machine)
-{
-   const GLuint numInst = program->NumInstructions;
-   const GLuint maxExec = 10000;
-   GLuint pc, numExec = 0;
-
-   machine->CurProgram = program;
-
-   if (DEBUG_PROG) {
-      printf("execute program %u --------------------\n", program->Id);
-   }
-
-   if (program->Target == GL_VERTEX_PROGRAM_ARB) {
-      machine->EnvParams = ctx->VertexProgram.Parameters;
-   }
-   else {
-      machine->EnvParams = ctx->FragmentProgram.Parameters;
-   }
-
-   for (pc = 0; pc < numInst; pc++) {
-      const struct prog_instruction *inst = program->Instructions + pc;
-
-      if (DEBUG_PROG) {
-         _mesa_print_instruction(inst);
-      }
-
-      switch (inst->Opcode) {
-      case OPCODE_ABS:
-         {
-            GLfloat a[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            result[0] = FABSF(a[0]);
-            result[1] = FABSF(a[1]);
-            result[2] = FABSF(a[2]);
-            result[3] = FABSF(a[3]);
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_ADD:
-         {
-            GLfloat a[4], b[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            result[0] = a[0] + b[0];
-            result[1] = a[1] + b[1];
-            result[2] = a[2] + b[2];
-            result[3] = a[3] + b[3];
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("ADD (%g %g %g %g) = (%g %g %g %g) + (%g %g %g %g)\n",
-                      result[0], result[1], result[2], result[3],
-                      a[0], a[1], a[2], a[3], b[0], b[1], b[2], b[3]);
-            }
-         }
-         break;
-      case OPCODE_AND:     /* bitwise AND */
-         {
-            GLuint a[4], b[4], result[4];
-            fetch_vector4ui(&inst->SrcReg[0], machine, a);
-            fetch_vector4ui(&inst->SrcReg[1], machine, b);
-            result[0] = a[0] & b[0];
-            result[1] = a[1] & b[1];
-            result[2] = a[2] & b[2];
-            result[3] = a[3] & b[3];
-            store_vector4ui(inst, machine, result);
-         }
-         break;
-      case OPCODE_ARL:
-         {
-            GLfloat t[4];
-            fetch_vector4(&inst->SrcReg[0], machine, t);
-            machine->AddressReg[0][0] = IFLOOR(t[0]);
-            if (DEBUG_PROG) {
-               printf("ARL %d\n", machine->AddressReg[0][0]);
-            }
-         }
-         break;
-      case OPCODE_BGNLOOP:
-         /* no-op */
-         ASSERT(program->Instructions[inst->BranchTarget].Opcode
-                == OPCODE_ENDLOOP);
-         break;
-      case OPCODE_ENDLOOP:
-         /* subtract 1 here since pc is incremented by for(pc) loop */
-         ASSERT(program->Instructions[inst->BranchTarget].Opcode
-                == OPCODE_BGNLOOP);
-         pc = inst->BranchTarget - 1;   /* go to matching BNGLOOP */
-         break;
-      case OPCODE_BGNSUB:      /* begin subroutine */
-         break;
-      case OPCODE_ENDSUB:      /* end subroutine */
-         break;
-      case OPCODE_BRA:         /* branch (conditional) */
-         if (eval_condition(machine, inst)) {
-            /* take branch */
-            /* Subtract 1 here since we'll do pc++ below */
-            pc = inst->BranchTarget - 1;
-         }
-         break;
-      case OPCODE_BRK:         /* break out of loop (conditional) */
-         ASSERT(program->Instructions[inst->BranchTarget].Opcode
-                == OPCODE_ENDLOOP);
-         if (eval_condition(machine, inst)) {
-            /* break out of loop */
-            /* pc++ at end of for-loop will put us after the ENDLOOP inst */
-            pc = inst->BranchTarget;
-         }
-         break;
-      case OPCODE_CONT:        /* continue loop (conditional) */
-         ASSERT(program->Instructions[inst->BranchTarget].Opcode
-                == OPCODE_ENDLOOP);
-         if (eval_condition(machine, inst)) {
-            /* continue at ENDLOOP */
-            /* Subtract 1 here since we'll do pc++ at end of for-loop */
-            pc = inst->BranchTarget - 1;
-         }
-         break;
-      case OPCODE_CAL:         /* Call subroutine (conditional) */
-         if (eval_condition(machine, inst)) {
-            /* call the subroutine */
-            if (machine->StackDepth >= MAX_PROGRAM_CALL_DEPTH) {
-               return GL_TRUE;  /* Per GL_NV_vertex_program2 spec */
-            }
-            machine->CallStack[machine->StackDepth++] = pc + 1; /* next inst */
-            /* Subtract 1 here since we'll do pc++ at end of for-loop */
-            pc = inst->BranchTarget - 1;
-         }
-         break;
-      case OPCODE_CMP:
-         {
-            GLfloat a[4], b[4], c[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            fetch_vector4(&inst->SrcReg[2], machine, c);
-            result[0] = a[0] < 0.0F ? b[0] : c[0];
-            result[1] = a[1] < 0.0F ? b[1] : c[1];
-            result[2] = a[2] < 0.0F ? b[2] : c[2];
-            result[3] = a[3] < 0.0F ? b[3] : c[3];
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_COS:
-         {
-            GLfloat a[4], result[4];
-            fetch_vector1(&inst->SrcReg[0], machine, a);
-            result[0] = result[1] = result[2] = result[3]
-               = (GLfloat) _mesa_cos(a[0]);
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_DDX:         /* Partial derivative with respect to X */
-         {
-            GLfloat result[4];
-            fetch_vector4_deriv(ctx, &inst->SrcReg[0], machine,
-                                'X', result);
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_DDY:         /* Partial derivative with respect to Y */
-         {
-            GLfloat result[4];
-            fetch_vector4_deriv(ctx, &inst->SrcReg[0], machine,
-                                'Y', result);
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_DP2:
-         {
-            GLfloat a[4], b[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            result[0] = result[1] = result[2] = result[3] = DOT2(a, b);
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("DP2 %g = (%g %g) . (%g %g)\n",
-                      result[0], a[0], a[1], b[0], b[1]);
-            }
-         }
-         break;
-      case OPCODE_DP2A:
-         {
-            GLfloat a[4], b[4], c, result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            fetch_vector1(&inst->SrcReg[1], machine, &c);
-            result[0] = result[1] = result[2] = result[3] = DOT2(a, b) + c;
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("DP2A %g = (%g %g) . (%g %g) + %g\n",
-                      result[0], a[0], a[1], b[0], b[1], c);
-            }
-         }
-         break;
-      case OPCODE_DP3:
-         {
-            GLfloat a[4], b[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            result[0] = result[1] = result[2] = result[3] = DOT3(a, b);
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("DP3 %g = (%g %g %g) . (%g %g %g)\n",
-                      result[0], a[0], a[1], a[2], b[0], b[1], b[2]);
-            }
-         }
-         break;
-      case OPCODE_DP4:
-         {
-            GLfloat a[4], b[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            result[0] = result[1] = result[2] = result[3] = DOT4(a, b);
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("DP4 %g = (%g, %g %g %g) . (%g, %g %g %g)\n",
-                      result[0], a[0], a[1], a[2], a[3],
-                      b[0], b[1], b[2], b[3]);
-            }
-         }
-         break;
-      case OPCODE_DPH:
-         {
-            GLfloat a[4], b[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            result[0] = result[1] = result[2] = result[3] = DOT3(a, b) + b[3];
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_DST:         /* Distance vector */
-         {
-            GLfloat a[4], b[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            result[0] = 1.0F;
-            result[1] = a[1] * b[1];
-            result[2] = a[2];
-            result[3] = b[3];
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_EXP:
-         {
-            GLfloat t[4], q[4], floor_t0;
-            fetch_vector1(&inst->SrcReg[0], machine, t);
-            floor_t0 = FLOORF(t[0]);
-            if (floor_t0 > FLT_MAX_EXP) {
-               SET_POS_INFINITY(q[0]);
-               SET_POS_INFINITY(q[2]);
-            }
-            else if (floor_t0 < FLT_MIN_EXP) {
-               q[0] = 0.0F;
-               q[2] = 0.0F;
-            }
-            else {
-               q[0] = LDEXPF(1.0, (int) floor_t0);
-               /* Note: GL_NV_vertex_program expects 
-                * result.z = result.x * APPX(result.y)
-                * We do what the ARB extension says.
-                */
-               q[2] = (GLfloat) _mesa_pow(2.0, t[0]);
-            }
-            q[1] = t[0] - floor_t0;
-            q[3] = 1.0F;
-            store_vector4( inst, machine, q );
-         }
-         break;
-      case OPCODE_EX2:         /* Exponential base 2 */
-         {
-            GLfloat a[4], result[4], val;
-            fetch_vector1(&inst->SrcReg[0], machine, a);
-            val = (GLfloat) _mesa_pow(2.0, a[0]);
-            /*
-            if (IS_INF_OR_NAN(val))
-               val = 1.0e10;
-            */
-            result[0] = result[1] = result[2] = result[3] = val;
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_FLR:
-         {
-            GLfloat a[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            result[0] = FLOORF(a[0]);
-            result[1] = FLOORF(a[1]);
-            result[2] = FLOORF(a[2]);
-            result[3] = FLOORF(a[3]);
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_FRC:
-         {
-            GLfloat a[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            result[0] = a[0] - FLOORF(a[0]);
-            result[1] = a[1] - FLOORF(a[1]);
-            result[2] = a[2] - FLOORF(a[2]);
-            result[3] = a[3] - FLOORF(a[3]);
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_IF:
-         {
-            GLboolean cond;
-            ASSERT(program->Instructions[inst->BranchTarget].Opcode
-                   == OPCODE_ELSE ||
-                   program->Instructions[inst->BranchTarget].Opcode
-                   == OPCODE_ENDIF);
-            /* eval condition */
-            if (inst->SrcReg[0].File != PROGRAM_UNDEFINED) {
-               GLfloat a[4];
-               fetch_vector1(&inst->SrcReg[0], machine, a);
-               cond = (a[0] != 0.0);
-            }
-            else {
-               cond = eval_condition(machine, inst);
-            }
-            if (DEBUG_PROG) {
-               printf("IF: %d\n", cond);
-            }
-            /* do if/else */
-            if (cond) {
-               /* do if-clause (just continue execution) */
-            }
-            else {
-               /* go to the instruction after ELSE or ENDIF */
-               assert(inst->BranchTarget >= 0);
-               pc = inst->BranchTarget;
-            }
-         }
-         break;
-      case OPCODE_ELSE:
-         /* goto ENDIF */
-         ASSERT(program->Instructions[inst->BranchTarget].Opcode
-                == OPCODE_ENDIF);
-         assert(inst->BranchTarget >= 0);
-         pc = inst->BranchTarget;
-         break;
-      case OPCODE_ENDIF:
-         /* nothing */
-         break;
-      case OPCODE_KIL_NV:      /* NV_f_p only (conditional) */
-         if (eval_condition(machine, inst)) {
-            return GL_FALSE;
-         }
-         break;
-      case OPCODE_KIL:         /* ARB_f_p only */
-         {
-            GLfloat a[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            if (DEBUG_PROG) {
-               printf("KIL if (%g %g %g %g) <= 0.0\n",
-                      a[0], a[1], a[2], a[3]);
-            }
-
-            if (a[0] < 0.0F || a[1] < 0.0F || a[2] < 0.0F || a[3] < 0.0F) {
-               return GL_FALSE;
-            }
-         }
-         break;
-      case OPCODE_LG2:         /* log base 2 */
-         {
-            GLfloat a[4], result[4], val;
-            fetch_vector1(&inst->SrcReg[0], machine, a);
-	    /* The fast LOG2 macro doesn't meet the precision requirements.
-	     */
-            if (a[0] == 0.0F) {
-               val = -FLT_MAX;
-            }
-            else {
-               val = (float)(log(a[0]) * 1.442695F);
-            }
-            result[0] = result[1] = result[2] = result[3] = val;
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_LIT:
-         {
-            const GLfloat epsilon = 1.0F / 256.0F;      /* from NV VP spec */
-            GLfloat a[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            a[0] = MAX2(a[0], 0.0F);
-            a[1] = MAX2(a[1], 0.0F);
-            /* XXX ARB version clamps a[3], NV version doesn't */
-            a[3] = CLAMP(a[3], -(128.0F - epsilon), (128.0F - epsilon));
-            result[0] = 1.0F;
-            result[1] = a[0];
-            /* XXX we could probably just use pow() here */
-            if (a[0] > 0.0F) {
-               if (a[1] == 0.0 && a[3] == 0.0)
-                  result[2] = 1.0F;
-               else
-                  result[2] = (GLfloat) _mesa_pow(a[1], a[3]);
-            }
-            else {
-               result[2] = 0.0F;
-            }
-            result[3] = 1.0F;
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("LIT (%g %g %g %g) : (%g %g %g %g)\n",
-                      result[0], result[1], result[2], result[3],
-                      a[0], a[1], a[2], a[3]);
-            }
-         }
-         break;
-      case OPCODE_LOG:
-         {
-            GLfloat t[4], q[4], abs_t0;
-            fetch_vector1(&inst->SrcReg[0], machine, t);
-            abs_t0 = FABSF(t[0]);
-            if (abs_t0 != 0.0F) {
-               /* Since we really can't handle infinite values on VMS
-                * like other OSes we'll use __MAXFLOAT to represent
-                * infinity.  This may need some tweaking.
-                */
-#ifdef VMS
-               if (abs_t0 == __MAXFLOAT)
-#else
-               if (IS_INF_OR_NAN(abs_t0))
-#endif
-               {
-                  SET_POS_INFINITY(q[0]);
-                  q[1] = 1.0F;
-                  SET_POS_INFINITY(q[2]);
-               }
-               else {
-                  int exponent;
-                  GLfloat mantissa = FREXPF(t[0], &exponent);
-                  q[0] = (GLfloat) (exponent - 1);
-                  q[1] = (GLfloat) (2.0 * mantissa); /* map [.5, 1) -> [1, 2) */
-
-		  /* The fast LOG2 macro doesn't meet the precision
-		   * requirements.
-		   */
-                  q[2] = (float)(log(t[0]) * 1.442695F);
-               }
-            }
-            else {
-               SET_NEG_INFINITY(q[0]);
-               q[1] = 1.0F;
-               SET_NEG_INFINITY(q[2]);
-            }
-            q[3] = 1.0;
-            store_vector4(inst, machine, q);
-         }
-         break;
-      case OPCODE_LRP:
-         {
-            GLfloat a[4], b[4], c[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            fetch_vector4(&inst->SrcReg[2], machine, c);
-            result[0] = a[0] * b[0] + (1.0F - a[0]) * c[0];
-            result[1] = a[1] * b[1] + (1.0F - a[1]) * c[1];
-            result[2] = a[2] * b[2] + (1.0F - a[2]) * c[2];
-            result[3] = a[3] * b[3] + (1.0F - a[3]) * c[3];
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("LRP (%g %g %g %g) = (%g %g %g %g), "
-                      "(%g %g %g %g), (%g %g %g %g)\n",
-                      result[0], result[1], result[2], result[3],
-                      a[0], a[1], a[2], a[3],
-                      b[0], b[1], b[2], b[3], c[0], c[1], c[2], c[3]);
-            }
-         }
-         break;
-      case OPCODE_MAD:
-         {
-            GLfloat a[4], b[4], c[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            fetch_vector4(&inst->SrcReg[2], machine, c);
-            result[0] = a[0] * b[0] + c[0];
-            result[1] = a[1] * b[1] + c[1];
-            result[2] = a[2] * b[2] + c[2];
-            result[3] = a[3] * b[3] + c[3];
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("MAD (%g %g %g %g) = (%g %g %g %g) * "
-                      "(%g %g %g %g) + (%g %g %g %g)\n",
-                      result[0], result[1], result[2], result[3],
-                      a[0], a[1], a[2], a[3],
-                      b[0], b[1], b[2], b[3], c[0], c[1], c[2], c[3]);
-            }
-         }
-         break;
-      case OPCODE_MAX:
-         {
-            GLfloat a[4], b[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            result[0] = MAX2(a[0], b[0]);
-            result[1] = MAX2(a[1], b[1]);
-            result[2] = MAX2(a[2], b[2]);
-            result[3] = MAX2(a[3], b[3]);
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("MAX (%g %g %g %g) = (%g %g %g %g), (%g %g %g %g)\n",
-                      result[0], result[1], result[2], result[3],
-                      a[0], a[1], a[2], a[3], b[0], b[1], b[2], b[3]);
-            }
-         }
-         break;
-      case OPCODE_MIN:
-         {
-            GLfloat a[4], b[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            result[0] = MIN2(a[0], b[0]);
-            result[1] = MIN2(a[1], b[1]);
-            result[2] = MIN2(a[2], b[2]);
-            result[3] = MIN2(a[3], b[3]);
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_MOV:
-         {
-            GLfloat result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, result);
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("MOV (%g %g %g %g)\n",
-                      result[0], result[1], result[2], result[3]);
-            }
-         }
-         break;
-      case OPCODE_MUL:
-         {
-            GLfloat a[4], b[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            result[0] = a[0] * b[0];
-            result[1] = a[1] * b[1];
-            result[2] = a[2] * b[2];
-            result[3] = a[3] * b[3];
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("MUL (%g %g %g %g) = (%g %g %g %g) * (%g %g %g %g)\n",
-                      result[0], result[1], result[2], result[3],
-                      a[0], a[1], a[2], a[3], b[0], b[1], b[2], b[3]);
-            }
-         }
-         break;
-      case OPCODE_NOISE1:
-         {
-            GLfloat a[4], result[4];
-            fetch_vector1(&inst->SrcReg[0], machine, a);
-            result[0] =
-               result[1] =
-               result[2] =
-               result[3] = _mesa_noise1(a[0]);
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_NOISE2:
-         {
-            GLfloat a[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            result[0] =
-               result[1] =
-               result[2] = result[3] = _mesa_noise2(a[0], a[1]);
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_NOISE3:
-         {
-            GLfloat a[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            result[0] =
-               result[1] =
-               result[2] =
-               result[3] = _mesa_noise3(a[0], a[1], a[2]);
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_NOISE4:
-         {
-            GLfloat a[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            result[0] =
-               result[1] =
-               result[2] =
-               result[3] = _mesa_noise4(a[0], a[1], a[2], a[3]);
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_NOP:
-         break;
-      case OPCODE_NOT:         /* bitwise NOT */
-         {
-            GLuint a[4], result[4];
-            fetch_vector4ui(&inst->SrcReg[0], machine, a);
-            result[0] = ~a[0];
-            result[1] = ~a[1];
-            result[2] = ~a[2];
-            result[3] = ~a[3];
-            store_vector4ui(inst, machine, result);
-         }
-         break;
-      case OPCODE_NRM3:        /* 3-component normalization */
-         {
-            GLfloat a[4], result[4];
-            GLfloat tmp;
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            tmp = a[0] * a[0] + a[1] * a[1] + a[2] * a[2];
-            if (tmp != 0.0F)
-               tmp = INV_SQRTF(tmp);
-            result[0] = tmp * a[0];
-            result[1] = tmp * a[1];
-            result[2] = tmp * a[2];
-            result[3] = 0.0;  /* undefined, but prevent valgrind warnings */
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_NRM4:        /* 4-component normalization */
-         {
-            GLfloat a[4], result[4];
-            GLfloat tmp;
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            tmp = a[0] * a[0] + a[1] * a[1] + a[2] * a[2] + a[3] * a[3];
-            if (tmp != 0.0F)
-               tmp = INV_SQRTF(tmp);
-            result[0] = tmp * a[0];
-            result[1] = tmp * a[1];
-            result[2] = tmp * a[2];
-            result[3] = tmp * a[3];
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_OR:          /* bitwise OR */
-         {
-            GLuint a[4], b[4], result[4];
-            fetch_vector4ui(&inst->SrcReg[0], machine, a);
-            fetch_vector4ui(&inst->SrcReg[1], machine, b);
-            result[0] = a[0] | b[0];
-            result[1] = a[1] | b[1];
-            result[2] = a[2] | b[2];
-            result[3] = a[3] | b[3];
-            store_vector4ui(inst, machine, result);
-         }
-         break;
-      case OPCODE_PK2H:        /* pack two 16-bit floats in one 32-bit float */
-         {
-            GLfloat a[4];
-            GLuint result[4];
-            GLhalfNV hx, hy;
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            hx = _mesa_float_to_half(a[0]);
-            hy = _mesa_float_to_half(a[1]);
-            result[0] =
-            result[1] =
-            result[2] =
-            result[3] = hx | (hy << 16);
-            store_vector4ui(inst, machine, result);
-         }
-         break;
-      case OPCODE_PK2US:       /* pack two GLushorts into one 32-bit float */
-         {
-            GLfloat a[4];
-            GLuint result[4], usx, usy;
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            a[0] = CLAMP(a[0], 0.0F, 1.0F);
-            a[1] = CLAMP(a[1], 0.0F, 1.0F);
-            usx = IROUND(a[0] * 65535.0F);
-            usy = IROUND(a[1] * 65535.0F);
-            result[0] =
-            result[1] =
-            result[2] =
-            result[3] = usx | (usy << 16);
-            store_vector4ui(inst, machine, result);
-         }
-         break;
-      case OPCODE_PK4B:        /* pack four GLbytes into one 32-bit float */
-         {
-            GLfloat a[4];
-            GLuint result[4], ubx, uby, ubz, ubw;
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            a[0] = CLAMP(a[0], -128.0F / 127.0F, 1.0F);
-            a[1] = CLAMP(a[1], -128.0F / 127.0F, 1.0F);
-            a[2] = CLAMP(a[2], -128.0F / 127.0F, 1.0F);
-            a[3] = CLAMP(a[3], -128.0F / 127.0F, 1.0F);
-            ubx = IROUND(127.0F * a[0] + 128.0F);
-            uby = IROUND(127.0F * a[1] + 128.0F);
-            ubz = IROUND(127.0F * a[2] + 128.0F);
-            ubw = IROUND(127.0F * a[3] + 128.0F);
-            result[0] =
-            result[1] =
-            result[2] =
-            result[3] = ubx | (uby << 8) | (ubz << 16) | (ubw << 24);
-            store_vector4ui(inst, machine, result);
-         }
-         break;
-      case OPCODE_PK4UB:       /* pack four GLubytes into one 32-bit float */
-         {
-            GLfloat a[4];
-            GLuint result[4], ubx, uby, ubz, ubw;
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            a[0] = CLAMP(a[0], 0.0F, 1.0F);
-            a[1] = CLAMP(a[1], 0.0F, 1.0F);
-            a[2] = CLAMP(a[2], 0.0F, 1.0F);
-            a[3] = CLAMP(a[3], 0.0F, 1.0F);
-            ubx = IROUND(255.0F * a[0]);
-            uby = IROUND(255.0F * a[1]);
-            ubz = IROUND(255.0F * a[2]);
-            ubw = IROUND(255.0F * a[3]);
-            result[0] =
-            result[1] =
-            result[2] =
-            result[3] = ubx | (uby << 8) | (ubz << 16) | (ubw << 24);
-            store_vector4ui(inst, machine, result);
-         }
-         break;
-      case OPCODE_POW:
-         {
-            GLfloat a[4], b[4], result[4];
-            fetch_vector1(&inst->SrcReg[0], machine, a);
-            fetch_vector1(&inst->SrcReg[1], machine, b);
-            result[0] = result[1] = result[2] = result[3]
-               = (GLfloat) _mesa_pow(a[0], b[0]);
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_RCP:
-         {
-            GLfloat a[4], result[4];
-            fetch_vector1(&inst->SrcReg[0], machine, a);
-            if (DEBUG_PROG) {
-               if (a[0] == 0)
-                  printf("RCP(0)\n");
-               else if (IS_INF_OR_NAN(a[0]))
-                  printf("RCP(inf)\n");
-            }
-            result[0] = result[1] = result[2] = result[3] = 1.0F / a[0];
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_RET:         /* return from subroutine (conditional) */
-         if (eval_condition(machine, inst)) {
-            if (machine->StackDepth == 0) {
-               return GL_TRUE;  /* Per GL_NV_vertex_program2 spec */
-            }
-            /* subtract one because of pc++ in the for loop */
-            pc = machine->CallStack[--machine->StackDepth] - 1;
-         }
-         break;
-      case OPCODE_RFL:         /* reflection vector */
-         {
-            GLfloat axis[4], dir[4], result[4], tmpX, tmpW;
-            fetch_vector4(&inst->SrcReg[0], machine, axis);
-            fetch_vector4(&inst->SrcReg[1], machine, dir);
-            tmpW = DOT3(axis, axis);
-            tmpX = (2.0F * DOT3(axis, dir)) / tmpW;
-            result[0] = tmpX * axis[0] - dir[0];
-            result[1] = tmpX * axis[1] - dir[1];
-            result[2] = tmpX * axis[2] - dir[2];
-            /* result[3] is never written! XXX enforce in parser! */
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_RSQ:         /* 1 / sqrt() */
-         {
-            GLfloat a[4], result[4];
-            fetch_vector1(&inst->SrcReg[0], machine, a);
-            a[0] = FABSF(a[0]);
-            result[0] = result[1] = result[2] = result[3] = INV_SQRTF(a[0]);
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("RSQ %g = 1/sqrt(|%g|)\n", result[0], a[0]);
-            }
-         }
-         break;
-      case OPCODE_SCS:         /* sine and cos */
-         {
-            GLfloat a[4], result[4];
-            fetch_vector1(&inst->SrcReg[0], machine, a);
-            result[0] = (GLfloat) _mesa_cos(a[0]);
-            result[1] = (GLfloat) _mesa_sin(a[0]);
-            result[2] = 0.0;    /* undefined! */
-            result[3] = 0.0;    /* undefined! */
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_SEQ:         /* set on equal */
-         {
-            GLfloat a[4], b[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            result[0] = (a[0] == b[0]) ? 1.0F : 0.0F;
-            result[1] = (a[1] == b[1]) ? 1.0F : 0.0F;
-            result[2] = (a[2] == b[2]) ? 1.0F : 0.0F;
-            result[3] = (a[3] == b[3]) ? 1.0F : 0.0F;
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("SEQ (%g %g %g %g) = (%g %g %g %g) == (%g %g %g %g)\n",
-                      result[0], result[1], result[2], result[3],
-                      a[0], a[1], a[2], a[3],
-                      b[0], b[1], b[2], b[3]);
-            }
-         }
-         break;
-      case OPCODE_SFL:         /* set false, operands ignored */
-         {
-            static const GLfloat result[4] = { 0.0F, 0.0F, 0.0F, 0.0F };
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_SGE:         /* set on greater or equal */
-         {
-            GLfloat a[4], b[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            result[0] = (a[0] >= b[0]) ? 1.0F : 0.0F;
-            result[1] = (a[1] >= b[1]) ? 1.0F : 0.0F;
-            result[2] = (a[2] >= b[2]) ? 1.0F : 0.0F;
-            result[3] = (a[3] >= b[3]) ? 1.0F : 0.0F;
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("SGE (%g %g %g %g) = (%g %g %g %g) >= (%g %g %g %g)\n",
-                      result[0], result[1], result[2], result[3],
-                      a[0], a[1], a[2], a[3],
-                      b[0], b[1], b[2], b[3]);
-            }
-         }
-         break;
-      case OPCODE_SGT:         /* set on greater */
-         {
-            GLfloat a[4], b[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            result[0] = (a[0] > b[0]) ? 1.0F : 0.0F;
-            result[1] = (a[1] > b[1]) ? 1.0F : 0.0F;
-            result[2] = (a[2] > b[2]) ? 1.0F : 0.0F;
-            result[3] = (a[3] > b[3]) ? 1.0F : 0.0F;
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("SGT (%g %g %g %g) = (%g %g %g %g) > (%g %g %g %g)\n",
-                      result[0], result[1], result[2], result[3],
-                      a[0], a[1], a[2], a[3],
-                      b[0], b[1], b[2], b[3]);
-            }
-         }
-         break;
-      case OPCODE_SIN:
-         {
-            GLfloat a[4], result[4];
-            fetch_vector1(&inst->SrcReg[0], machine, a);
-            result[0] = result[1] = result[2] = result[3]
-               = (GLfloat) _mesa_sin(a[0]);
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_SLE:         /* set on less or equal */
-         {
-            GLfloat a[4], b[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            result[0] = (a[0] <= b[0]) ? 1.0F : 0.0F;
-            result[1] = (a[1] <= b[1]) ? 1.0F : 0.0F;
-            result[2] = (a[2] <= b[2]) ? 1.0F : 0.0F;
-            result[3] = (a[3] <= b[3]) ? 1.0F : 0.0F;
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("SLE (%g %g %g %g) = (%g %g %g %g) <= (%g %g %g %g)\n",
-                      result[0], result[1], result[2], result[3],
-                      a[0], a[1], a[2], a[3],
-                      b[0], b[1], b[2], b[3]);
-            }
-         }
-         break;
-      case OPCODE_SLT:         /* set on less */
-         {
-            GLfloat a[4], b[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            result[0] = (a[0] < b[0]) ? 1.0F : 0.0F;
-            result[1] = (a[1] < b[1]) ? 1.0F : 0.0F;
-            result[2] = (a[2] < b[2]) ? 1.0F : 0.0F;
-            result[3] = (a[3] < b[3]) ? 1.0F : 0.0F;
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("SLT (%g %g %g %g) = (%g %g %g %g) < (%g %g %g %g)\n",
-                      result[0], result[1], result[2], result[3],
-                      a[0], a[1], a[2], a[3],
-                      b[0], b[1], b[2], b[3]);
-            }
-         }
-         break;
-      case OPCODE_SNE:         /* set on not equal */
-         {
-            GLfloat a[4], b[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            result[0] = (a[0] != b[0]) ? 1.0F : 0.0F;
-            result[1] = (a[1] != b[1]) ? 1.0F : 0.0F;
-            result[2] = (a[2] != b[2]) ? 1.0F : 0.0F;
-            result[3] = (a[3] != b[3]) ? 1.0F : 0.0F;
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("SNE (%g %g %g %g) = (%g %g %g %g) != (%g %g %g %g)\n",
-                      result[0], result[1], result[2], result[3],
-                      a[0], a[1], a[2], a[3],
-                      b[0], b[1], b[2], b[3]);
-            }
-         }
-         break;
-      case OPCODE_SSG:         /* set sign (-1, 0 or +1) */
-         {
-            GLfloat a[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            result[0] = (GLfloat) ((a[0] > 0.0F) - (a[0] < 0.0F));
-            result[1] = (GLfloat) ((a[1] > 0.0F) - (a[1] < 0.0F));
-            result[2] = (GLfloat) ((a[2] > 0.0F) - (a[2] < 0.0F));
-            result[3] = (GLfloat) ((a[3] > 0.0F) - (a[3] < 0.0F));
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_STR:         /* set true, operands ignored */
-         {
-            static const GLfloat result[4] = { 1.0F, 1.0F, 1.0F, 1.0F };
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_SUB:
-         {
-            GLfloat a[4], b[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            result[0] = a[0] - b[0];
-            result[1] = a[1] - b[1];
-            result[2] = a[2] - b[2];
-            result[3] = a[3] - b[3];
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("SUB (%g %g %g %g) = (%g %g %g %g) - (%g %g %g %g)\n",
-                      result[0], result[1], result[2], result[3],
-                      a[0], a[1], a[2], a[3], b[0], b[1], b[2], b[3]);
-            }
-         }
-         break;
-      case OPCODE_SWZ:         /* extended swizzle */
-         {
-            const struct prog_src_register *source = &inst->SrcReg[0];
-            const GLfloat *src = get_src_register_pointer(source, machine);
-            GLfloat result[4];
-            GLuint i;
-            for (i = 0; i < 4; i++) {
-               const GLuint swz = GET_SWZ(source->Swizzle, i);
-               if (swz == SWIZZLE_ZERO)
-                  result[i] = 0.0;
-               else if (swz == SWIZZLE_ONE)
-                  result[i] = 1.0;
-               else {
-                  ASSERT(swz >= 0);
-                  ASSERT(swz <= 3);
-                  result[i] = src[swz];
-               }
-               if (source->Negate & (1 << i))
-                  result[i] = -result[i];
-            }
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_TEX:         /* Both ARB and NV frag prog */
-         /* Simple texel lookup */
-         {
-            GLfloat texcoord[4], color[4];
-            fetch_vector4(&inst->SrcReg[0], machine, texcoord);
-
-            fetch_texel(ctx, machine, inst, texcoord, 0.0, color);
-
-            if (DEBUG_PROG) {
-               printf("TEX (%g, %g, %g, %g) = texture[%d][%g, %g, %g, %g]\n",
-                      color[0], color[1], color[2], color[3],
-                      inst->TexSrcUnit,
-                      texcoord[0], texcoord[1], texcoord[2], texcoord[3]);
-            }
-            store_vector4(inst, machine, color);
-         }
-         break;
-      case OPCODE_TXB:         /* GL_ARB_fragment_program only */
-         /* Texel lookup with LOD bias */
-         {
-            GLfloat texcoord[4], color[4], lodBias;
-
-            fetch_vector4(&inst->SrcReg[0], machine, texcoord);
-
-            /* texcoord[3] is the bias to add to lambda */
-            lodBias = texcoord[3];
-
-            fetch_texel(ctx, machine, inst, texcoord, lodBias, color);
-
-            store_vector4(inst, machine, color);
-         }
-         break;
-      case OPCODE_TXD:         /* GL_NV_fragment_program only */
-         /* Texture lookup w/ partial derivatives for LOD */
-         {
-            GLfloat texcoord[4], dtdx[4], dtdy[4], color[4];
-            fetch_vector4(&inst->SrcReg[0], machine, texcoord);
-            fetch_vector4(&inst->SrcReg[1], machine, dtdx);
-            fetch_vector4(&inst->SrcReg[2], machine, dtdy);
-            machine->FetchTexelDeriv(ctx, texcoord, dtdx, dtdy,
-                                     0.0, /* lodBias */
-                                     inst->TexSrcUnit, color);
-            store_vector4(inst, machine, color);
-         }
-         break;
-      case OPCODE_TXP:         /* GL_ARB_fragment_program only */
-         /* Texture lookup w/ projective divide */
-         {
-            GLfloat texcoord[4], color[4];
-
-            fetch_vector4(&inst->SrcReg[0], machine, texcoord);
-            /* Not so sure about this test - if texcoord[3] is
-             * zero, we'd probably be fine except for an ASSERT in
-             * IROUND_POS() which gets triggered by the inf values created.
-             */
-            if (texcoord[3] != 0.0) {
-               texcoord[0] /= texcoord[3];
-               texcoord[1] /= texcoord[3];
-               texcoord[2] /= texcoord[3];
-            }
-
-            fetch_texel(ctx, machine, inst, texcoord, 0.0, color);
-
-            store_vector4(inst, machine, color);
-         }
-         break;
-      case OPCODE_TXP_NV:      /* GL_NV_fragment_program only */
-         /* Texture lookup w/ projective divide, as above, but do not
-          * do the divide by w if sampling from a cube map.
-          */
-         {
-            GLfloat texcoord[4], color[4];
-
-            fetch_vector4(&inst->SrcReg[0], machine, texcoord);
-            if (inst->TexSrcTarget != TEXTURE_CUBE_INDEX &&
-                texcoord[3] != 0.0) {
-               texcoord[0] /= texcoord[3];
-               texcoord[1] /= texcoord[3];
-               texcoord[2] /= texcoord[3];
-            }
-
-            fetch_texel(ctx, machine, inst, texcoord, 0.0, color);
-
-            store_vector4(inst, machine, color);
-         }
-         break;
-      case OPCODE_TRUNC:       /* truncate toward zero */
-         {
-            GLfloat a[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            result[0] = (GLfloat) (GLint) a[0];
-            result[1] = (GLfloat) (GLint) a[1];
-            result[2] = (GLfloat) (GLint) a[2];
-            result[3] = (GLfloat) (GLint) a[3];
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_UP2H:        /* unpack two 16-bit floats */
-         {
-            const GLuint raw = fetch_vector1ui(&inst->SrcReg[0], machine);
-            GLfloat result[4];
-            GLushort hx, hy;
-            hx = raw & 0xffff;
-            hy = raw >> 16;
-            result[0] = result[2] = _mesa_half_to_float(hx);
-            result[1] = result[3] = _mesa_half_to_float(hy);
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_UP2US:       /* unpack two GLushorts */
-         {
-            const GLuint raw = fetch_vector1ui(&inst->SrcReg[0], machine);
-            GLfloat result[4];
-            GLushort usx, usy;
-            usx = raw & 0xffff;
-            usy = raw >> 16;
-            result[0] = result[2] = usx * (1.0f / 65535.0f);
-            result[1] = result[3] = usy * (1.0f / 65535.0f);
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_UP4B:        /* unpack four GLbytes */
-         {
-            const GLuint raw = fetch_vector1ui(&inst->SrcReg[0], machine);
-            GLfloat result[4];
-            result[0] = (((raw >> 0) & 0xff) - 128) / 127.0F;
-            result[1] = (((raw >> 8) & 0xff) - 128) / 127.0F;
-            result[2] = (((raw >> 16) & 0xff) - 128) / 127.0F;
-            result[3] = (((raw >> 24) & 0xff) - 128) / 127.0F;
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_UP4UB:       /* unpack four GLubytes */
-         {
-            const GLuint raw = fetch_vector1ui(&inst->SrcReg[0], machine);
-            GLfloat result[4];
-            result[0] = ((raw >> 0) & 0xff) / 255.0F;
-            result[1] = ((raw >> 8) & 0xff) / 255.0F;
-            result[2] = ((raw >> 16) & 0xff) / 255.0F;
-            result[3] = ((raw >> 24) & 0xff) / 255.0F;
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_XOR:         /* bitwise XOR */
-         {
-            GLuint a[4], b[4], result[4];
-            fetch_vector4ui(&inst->SrcReg[0], machine, a);
-            fetch_vector4ui(&inst->SrcReg[1], machine, b);
-            result[0] = a[0] ^ b[0];
-            result[1] = a[1] ^ b[1];
-            result[2] = a[2] ^ b[2];
-            result[3] = a[3] ^ b[3];
-            store_vector4ui(inst, machine, result);
-         }
-         break;
-      case OPCODE_XPD:         /* cross product */
-         {
-            GLfloat a[4], b[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            result[0] = a[1] * b[2] - a[2] * b[1];
-            result[1] = a[2] * b[0] - a[0] * b[2];
-            result[2] = a[0] * b[1] - a[1] * b[0];
-            result[3] = 1.0;
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("XPD (%g %g %g %g) = (%g %g %g) X (%g %g %g)\n",
-                      result[0], result[1], result[2], result[3],
-                      a[0], a[1], a[2], b[0], b[1], b[2]);
-            }
-         }
-         break;
-      case OPCODE_X2D:         /* 2-D matrix transform */
-         {
-            GLfloat a[4], b[4], c[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            fetch_vector4(&inst->SrcReg[2], machine, c);
-            result[0] = a[0] + b[0] * c[0] + b[1] * c[1];
-            result[1] = a[1] + b[0] * c[2] + b[1] * c[3];
-            result[2] = a[2] + b[0] * c[0] + b[1] * c[1];
-            result[3] = a[3] + b[0] * c[2] + b[1] * c[3];
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_PRINT:
-         {
-            if (inst->SrcReg[0].File != -1) {
-               GLfloat a[4];
-               fetch_vector4(&inst->SrcReg[0], machine, a);
-               printf("%s%g, %g, %g, %g\n", (const char *) inst->Data,
-                            a[0], a[1], a[2], a[3]);
-            }
-            else {
-               printf("%s\n", (const char *) inst->Data);
-            }
-         }
-         break;
-      case OPCODE_END:
-         return GL_TRUE;
-      default:
-         _mesa_problem(ctx, "Bad opcode %d in _mesa_execute_program",
-                       inst->Opcode);
-         return GL_TRUE;        /* return value doesn't matter */
-      }
-
-      numExec++;
-      if (numExec > maxExec) {
-         _mesa_problem(ctx, "Infinite loop detected in fragment program");
-         return GL_TRUE;
-      }
-
-   } /* for pc */
-
-   return GL_TRUE;
-}
diff --git a/mesalib/src/mesa/shader/prog_execute.h b/mesalib/src/mesa/shader/prog_execute.h
deleted file mode 100644
index adefc5439..000000000
--- a/mesalib/src/mesa/shader/prog_execute.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.0.3
- *
- * 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.
- */
-
-#ifndef PROG_EXECUTE_H
-#define PROG_EXECUTE_H
-
-#include "main/config.h"
-
-
-typedef void (*FetchTexelLodFunc)(GLcontext *ctx, const GLfloat texcoord[4],
-                                  GLfloat lambda, GLuint unit, GLfloat color[4]);
-
-typedef void (*FetchTexelDerivFunc)(GLcontext *ctx, const GLfloat texcoord[4],
-                                    const GLfloat texdx[4],
-                                    const GLfloat texdy[4],
-                                    GLfloat lodBias,
-                                    GLuint unit, GLfloat color[4]);
-
-
-/**
- * Virtual machine state used during execution of vertex/fragment programs.
- */
-struct gl_program_machine
-{
-   const struct gl_program *CurProgram;
-
-   /** Fragment Input attributes */
-   GLfloat (*Attribs)[MAX_WIDTH][4];
-   GLfloat (*DerivX)[4];
-   GLfloat (*DerivY)[4];
-   GLuint NumDeriv; /**< Max index into DerivX/Y arrays */
-   GLuint CurElement; /**< Index into Attribs arrays */
-
-   /** Vertex Input attribs */
-   GLfloat VertAttribs[VERT_ATTRIB_MAX][4];
-
-   GLfloat Temporaries[MAX_PROGRAM_TEMPS][4];
-   GLfloat Outputs[MAX_PROGRAM_OUTPUTS][4];
-   GLfloat (*EnvParams)[4]; /**< Vertex or Fragment env parameters */
-   GLuint CondCodes[4];  /**< COND_* value for x/y/z/w */
-   GLint AddressReg[MAX_PROGRAM_ADDRESS_REGS][4];
-
-   const GLubyte *Samplers;  /** Array mapping sampler var to tex unit */
-
-   GLuint CallStack[MAX_PROGRAM_CALL_DEPTH]; /**< For CAL/RET instructions */
-   GLuint StackDepth; /**< Index/ptr to top of CallStack[] */
-
-   /** Texture fetch functions */
-   FetchTexelLodFunc FetchTexelLod;
-   FetchTexelDerivFunc FetchTexelDeriv;
-};
-
-
-extern void
-_mesa_get_program_register(GLcontext *ctx, gl_register_file file,
-                           GLuint index, GLfloat val[4]);
-
-extern GLboolean
-_mesa_execute_program(GLcontext *ctx,
-                      const struct gl_program *program,
-                      struct gl_program_machine *machine);
-
-
-#endif /* PROG_EXECUTE_H */
diff --git a/mesalib/src/mesa/shader/prog_instruction.c b/mesalib/src/mesa/shader/prog_instruction.c
deleted file mode 100644
index 81099cb99..000000000
--- a/mesalib/src/mesa/shader/prog_instruction.c
+++ /dev/null
@@ -1,352 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.3
- *
- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- * Copyright (C) 1999-2009  VMware, Inc.  All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#include "main/glheader.h"
-#include "main/imports.h"
-#include "main/mtypes.h"
-#include "prog_instruction.h"
-
-
-/**
- * Initialize program instruction fields to defaults.
- * \param inst  first instruction to initialize
- * \param count  number of instructions to initialize
- */
-void
-_mesa_init_instructions(struct prog_instruction *inst, GLuint count)
-{
-   GLuint i;
-
-   memset(inst, 0, count * sizeof(struct prog_instruction));
-
-   for (i = 0; i < count; i++) {
-      inst[i].SrcReg[0].File = PROGRAM_UNDEFINED;
-      inst[i].SrcReg[0].Swizzle = SWIZZLE_NOOP;
-      inst[i].SrcReg[1].File = PROGRAM_UNDEFINED;
-      inst[i].SrcReg[1].Swizzle = SWIZZLE_NOOP;
-      inst[i].SrcReg[2].File = PROGRAM_UNDEFINED;
-      inst[i].SrcReg[2].Swizzle = SWIZZLE_NOOP;
-
-      inst[i].DstReg.File = PROGRAM_UNDEFINED;
-      inst[i].DstReg.WriteMask = WRITEMASK_XYZW;
-      inst[i].DstReg.CondMask = COND_TR;
-      inst[i].DstReg.CondSwizzle = SWIZZLE_NOOP;
-
-      inst[i].SaturateMode = SATURATE_OFF;
-      inst[i].Precision = FLOAT32;
-   }
-}
-
-
-/**
- * Allocate an array of program instructions.
- * \param numInst  number of instructions
- * \return pointer to instruction memory
- */
-struct prog_instruction *
-_mesa_alloc_instructions(GLuint numInst)
-{
-   return (struct prog_instruction *)
-      calloc(1, numInst * sizeof(struct prog_instruction));
-}
-
-
-/**
- * Reallocate memory storing an array of program instructions.
- * This is used when we need to append additional instructions onto an
- * program.
- * \param oldInst  pointer to first of old/src instructions
- * \param numOldInst  number of instructions at <oldInst>
- * \param numNewInst  desired size of new instruction array.
- * \return  pointer to start of new instruction array.
- */
-struct prog_instruction *
-_mesa_realloc_instructions(struct prog_instruction *oldInst,
-                           GLuint numOldInst, GLuint numNewInst)
-{
-   struct prog_instruction *newInst;
-
-   newInst = (struct prog_instruction *)
-      _mesa_realloc(oldInst,
-                    numOldInst * sizeof(struct prog_instruction),
-                    numNewInst * sizeof(struct prog_instruction));
-
-   return newInst;
-}
-
-
-/**
- * Copy an array of program instructions.
- * \param dest  pointer to destination.
- * \param src  pointer to source.
- * \param n  number of instructions to copy.
- * \return pointer to destination.
- */
-struct prog_instruction *
-_mesa_copy_instructions(struct prog_instruction *dest,
-                        const struct prog_instruction *src, GLuint n)
-{
-   GLuint i;
-   memcpy(dest, src, n * sizeof(struct prog_instruction));
-   for (i = 0; i < n; i++) {
-      if (src[i].Comment)
-         dest[i].Comment = _mesa_strdup(src[i].Comment);
-   }
-   return dest;
-}
-
-
-/**
- * Free an array of instructions
- */
-void
-_mesa_free_instructions(struct prog_instruction *inst, GLuint count)
-{
-   GLuint i;
-   for (i = 0; i < count; i++) {
-      if (inst[i].Data)
-         free(inst[i].Data);
-      if (inst[i].Comment)
-         free((char *) inst[i].Comment);
-   }
-   free(inst);
-}
-
-
-/**
- * Basic info about each instruction
- */
-struct instruction_info
-{
-   gl_inst_opcode Opcode;
-   const char *Name;
-   GLuint NumSrcRegs;
-   GLuint NumDstRegs;
-};
-
-/**
- * Instruction info
- * \note Opcode should equal array index!
- */
-static const struct instruction_info InstInfo[MAX_OPCODE] = {
-   { OPCODE_NOP,    "NOP",     0, 0 },
-   { OPCODE_ABS,    "ABS",     1, 1 },
-   { OPCODE_ADD,    "ADD",     2, 1 },
-   { OPCODE_AND,    "AND",     2, 1 },
-   { OPCODE_ARA,    "ARA",     1, 1 },
-   { OPCODE_ARL,    "ARL",     1, 1 },
-   { OPCODE_ARL_NV, "ARL_NV",  1, 1 },
-   { OPCODE_ARR,    "ARL",     1, 1 },
-   { OPCODE_BGNLOOP,"BGNLOOP", 0, 0 },
-   { OPCODE_BGNSUB, "BGNSUB",  0, 0 },
-   { OPCODE_BRA,    "BRA",     0, 0 },
-   { OPCODE_BRK,    "BRK",     0, 0 },
-   { OPCODE_CAL,    "CAL",     0, 0 },
-   { OPCODE_CMP,    "CMP",     3, 1 },
-   { OPCODE_CONT,   "CONT",    0, 0 },
-   { OPCODE_COS,    "COS",     1, 1 },
-   { OPCODE_DDX,    "DDX",     1, 1 },
-   { OPCODE_DDY,    "DDY",     1, 1 },
-   { OPCODE_DP2,    "DP2",     2, 1 },
-   { OPCODE_DP2A,   "DP2A",    3, 1 },
-   { OPCODE_DP3,    "DP3",     2, 1 },
-   { OPCODE_DP4,    "DP4",     2, 1 },
-   { OPCODE_DPH,    "DPH",     2, 1 },
-   { OPCODE_DST,    "DST",     2, 1 },
-   { OPCODE_ELSE,   "ELSE",    0, 0 },
-   { OPCODE_END,    "END",     0, 0 },
-   { OPCODE_ENDIF,  "ENDIF",   0, 0 },
-   { OPCODE_ENDLOOP,"ENDLOOP", 0, 0 },
-   { OPCODE_ENDSUB, "ENDSUB",  0, 0 },
-   { OPCODE_EX2,    "EX2",     1, 1 },
-   { OPCODE_EXP,    "EXP",     1, 1 },
-   { OPCODE_FLR,    "FLR",     1, 1 },
-   { OPCODE_FRC,    "FRC",     1, 1 },
-   { OPCODE_IF,     "IF",      1, 0 },
-   { OPCODE_KIL,    "KIL",     1, 0 },
-   { OPCODE_KIL_NV, "KIL_NV",  0, 0 },
-   { OPCODE_LG2,    "LG2",     1, 1 },
-   { OPCODE_LIT,    "LIT",     1, 1 },
-   { OPCODE_LOG,    "LOG",     1, 1 },
-   { OPCODE_LRP,    "LRP",     3, 1 },
-   { OPCODE_MAD,    "MAD",     3, 1 },
-   { OPCODE_MAX,    "MAX",     2, 1 },
-   { OPCODE_MIN,    "MIN",     2, 1 },
-   { OPCODE_MOV,    "MOV",     1, 1 },
-   { OPCODE_MUL,    "MUL",     2, 1 },
-   { OPCODE_NOISE1, "NOISE1",  1, 1 },
-   { OPCODE_NOISE2, "NOISE2",  1, 1 },
-   { OPCODE_NOISE3, "NOISE3",  1, 1 },
-   { OPCODE_NOISE4, "NOISE4",  1, 1 },
-   { OPCODE_NOT,    "NOT",     1, 1 },
-   { OPCODE_NRM3,   "NRM3",    1, 1 },
-   { OPCODE_NRM4,   "NRM4",    1, 1 },
-   { OPCODE_OR,     "OR",      2, 1 },
-   { OPCODE_PK2H,   "PK2H",    1, 1 },
-   { OPCODE_PK2US,  "PK2US",   1, 1 },
-   { OPCODE_PK4B,   "PK4B",    1, 1 },
-   { OPCODE_PK4UB,  "PK4UB",   1, 1 },
-   { OPCODE_POW,    "POW",     2, 1 },
-   { OPCODE_POPA,   "POPA",    0, 0 },
-   { OPCODE_PRINT,  "PRINT",   1, 0 },
-   { OPCODE_PUSHA,  "PUSHA",   0, 0 },
-   { OPCODE_RCC,    "RCC",     1, 1 },
-   { OPCODE_RCP,    "RCP",     1, 1 },
-   { OPCODE_RET,    "RET",     0, 0 },
-   { OPCODE_RFL,    "RFL",     1, 1 },
-   { OPCODE_RSQ,    "RSQ",     1, 1 },
-   { OPCODE_SCS,    "SCS",     1, 1 },
-   { OPCODE_SEQ,    "SEQ",     2, 1 },
-   { OPCODE_SFL,    "SFL",     0, 1 },
-   { OPCODE_SGE,    "SGE",     2, 1 },
-   { OPCODE_SGT,    "SGT",     2, 1 },
-   { OPCODE_SIN,    "SIN",     1, 1 },
-   { OPCODE_SLE,    "SLE",     2, 1 },
-   { OPCODE_SLT,    "SLT",     2, 1 },
-   { OPCODE_SNE,    "SNE",     2, 1 },
-   { OPCODE_SSG,    "SSG",     1, 1 },
-   { OPCODE_STR,    "STR",     0, 1 },
-   { OPCODE_SUB,    "SUB",     2, 1 },
-   { OPCODE_SWZ,    "SWZ",     1, 1 },
-   { OPCODE_TEX,    "TEX",     1, 1 },
-   { OPCODE_TXB,    "TXB",     1, 1 },
-   { OPCODE_TXD,    "TXD",     3, 1 },
-   { OPCODE_TXL,    "TXL",     1, 1 },
-   { OPCODE_TXP,    "TXP",     1, 1 },
-   { OPCODE_TXP_NV, "TXP_NV",  1, 1 },
-   { OPCODE_TRUNC,  "TRUNC",   1, 1 },
-   { OPCODE_UP2H,   "UP2H",    1, 1 },
-   { OPCODE_UP2US,  "UP2US",   1, 1 },
-   { OPCODE_UP4B,   "UP4B",    1, 1 },
-   { OPCODE_UP4UB,  "UP4UB",   1, 1 },
-   { OPCODE_X2D,    "X2D",     3, 1 },
-   { OPCODE_XOR,    "XOR",     2, 1 },
-   { OPCODE_XPD,    "XPD",     2, 1 }
-};
-
-
-/**
- * Return the number of src registers for the given instruction/opcode.
- */
-GLuint
-_mesa_num_inst_src_regs(gl_inst_opcode opcode)
-{
-   ASSERT(opcode < MAX_OPCODE);
-   ASSERT(opcode == InstInfo[opcode].Opcode);
-   ASSERT(OPCODE_XPD == InstInfo[OPCODE_XPD].Opcode);
-   return InstInfo[opcode].NumSrcRegs;
-}
-
-
-/**
- * Return the number of dst registers for the given instruction/opcode.
- */
-GLuint
-_mesa_num_inst_dst_regs(gl_inst_opcode opcode)
-{
-   ASSERT(opcode < MAX_OPCODE);
-   ASSERT(opcode == InstInfo[opcode].Opcode);
-   ASSERT(OPCODE_XPD == InstInfo[OPCODE_XPD].Opcode);
-   return InstInfo[opcode].NumDstRegs;
-}
-
-
-GLboolean
-_mesa_is_tex_instruction(gl_inst_opcode opcode)
-{
-   return (opcode == OPCODE_TEX ||
-           opcode == OPCODE_TXB ||
-           opcode == OPCODE_TXD ||
-           opcode == OPCODE_TXL ||
-           opcode == OPCODE_TXP);
-}
-
-
-/**
- * Check if there's a potential src/dst register data dependency when
- * using SOA execution.
- * Example:
- *   MOV T, T.yxwz;
- * This would expand into:
- *   MOV t0, t1;
- *   MOV t1, t0;
- *   MOV t2, t3;
- *   MOV t3, t2;
- * The second instruction will have the wrong value for t0 if executed as-is.
- */
-GLboolean
-_mesa_check_soa_dependencies(const struct prog_instruction *inst)
-{
-   GLuint i, chan;
-
-   if (inst->DstReg.WriteMask == WRITEMASK_X ||
-       inst->DstReg.WriteMask == WRITEMASK_Y ||
-       inst->DstReg.WriteMask == WRITEMASK_Z ||
-       inst->DstReg.WriteMask == WRITEMASK_W ||
-       inst->DstReg.WriteMask == 0x0) {
-      /* no chance of data dependency */
-      return GL_FALSE;
-   }
-
-   /* loop over src regs */
-   for (i = 0; i < 3; i++) {
-      if (inst->SrcReg[i].File == inst->DstReg.File &&
-          inst->SrcReg[i].Index == inst->DstReg.Index) {
-         /* loop over dest channels */
-         GLuint channelsWritten = 0x0;
-         for (chan = 0; chan < 4; chan++) {
-            if (inst->DstReg.WriteMask & (1 << chan)) {
-               /* check if we're reading a channel that's been written */
-               GLuint swizzle = GET_SWZ(inst->SrcReg[i].Swizzle, chan);
-               if (swizzle <= SWIZZLE_W &&
-                   (channelsWritten & (1 << swizzle))) {
-                  return GL_TRUE;
-               }
-
-               channelsWritten |= (1 << chan);
-            }
-         }
-      }
-   }
-   return GL_FALSE;
-}
-
-
-/**
- * Return string name for given program opcode.
- */
-const char *
-_mesa_opcode_string(gl_inst_opcode opcode)
-{
-   if (opcode < MAX_OPCODE)
-      return InstInfo[opcode].Name;
-   else {
-      static char s[20];
-      _mesa_snprintf(s, sizeof(s), "OP%u", opcode);
-      return s;
-   }
-}
-
diff --git a/mesalib/src/mesa/shader/prog_instruction.h b/mesalib/src/mesa/shader/prog_instruction.h
deleted file mode 100644
index 28c797a4b..000000000
--- a/mesalib/src/mesa/shader/prog_instruction.h
+++ /dev/null
@@ -1,437 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.3
- *
- * Copyright (C) 1999-2008  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 prog_instruction.h
- *
- * Vertex/fragment program instruction datatypes and constants.
- *
- * \author Brian Paul
- * \author Keith Whitwell
- * \author Ian Romanick <idr@us.ibm.com>
- */
-
-
-#ifndef PROG_INSTRUCTION_H
-#define PROG_INSTRUCTION_H
-
-
-#include "main/mfeatures.h"
-
-
-/**
- * Swizzle indexes.
- * Do not change!
- */
-/*@{*/
-#define SWIZZLE_X    0
-#define SWIZZLE_Y    1
-#define SWIZZLE_Z    2
-#define SWIZZLE_W    3
-#define SWIZZLE_ZERO 4   /**< For SWZ instruction only */
-#define SWIZZLE_ONE  5   /**< For SWZ instruction only */
-#define SWIZZLE_NIL  7   /**< used during shader code gen (undefined value) */
-/*@}*/
-
-#define MAKE_SWIZZLE4(a,b,c,d) (((a)<<0) | ((b)<<3) | ((c)<<6) | ((d)<<9))
-#define SWIZZLE_NOOP           MAKE_SWIZZLE4(0,1,2,3)
-#define GET_SWZ(swz, idx)      (((swz) >> ((idx)*3)) & 0x7)
-#define GET_BIT(msk, idx)      (((msk) >> (idx)) & 0x1)
-
-#define SWIZZLE_XYZW MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_Y, SWIZZLE_Z, SWIZZLE_W)
-#define SWIZZLE_XXXX MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_X, SWIZZLE_X, SWIZZLE_X)
-#define SWIZZLE_YYYY MAKE_SWIZZLE4(SWIZZLE_Y, SWIZZLE_Y, SWIZZLE_Y, SWIZZLE_Y)
-#define SWIZZLE_ZZZZ MAKE_SWIZZLE4(SWIZZLE_Z, SWIZZLE_Z, SWIZZLE_Z, SWIZZLE_Z)
-#define SWIZZLE_WWWW MAKE_SWIZZLE4(SWIZZLE_W, SWIZZLE_W, SWIZZLE_W, SWIZZLE_W)
-
-
-/**
- * Writemask values, 1 bit per component.
- */
-/*@{*/
-#define WRITEMASK_X     0x1
-#define WRITEMASK_Y     0x2
-#define WRITEMASK_XY    0x3
-#define WRITEMASK_Z     0x4
-#define WRITEMASK_XZ    0x5
-#define WRITEMASK_YZ    0x6
-#define WRITEMASK_XYZ   0x7
-#define WRITEMASK_W     0x8
-#define WRITEMASK_XW    0x9
-#define WRITEMASK_YW    0xa
-#define WRITEMASK_XYW   0xb
-#define WRITEMASK_ZW    0xc
-#define WRITEMASK_XZW   0xd
-#define WRITEMASK_YZW   0xe
-#define WRITEMASK_XYZW  0xf
-/*@}*/
-
-
-/**
- * Condition codes
- */
-/*@{*/
-#define COND_GT  1  /**< greater than zero */
-#define COND_EQ  2  /**< equal to zero */
-#define COND_LT  3  /**< less than zero */
-#define COND_UN  4  /**< unordered (NaN) */
-#define COND_GE  5  /**< greater than or equal to zero */
-#define COND_LE  6  /**< less than or equal to zero */
-#define COND_NE  7  /**< not equal to zero */
-#define COND_TR  8  /**< always true */
-#define COND_FL  9  /**< always false */
-/*@}*/
-
-
-/**
- * Instruction precision for GL_NV_fragment_program
- */
-/*@{*/
-#define FLOAT32  0x1
-#define FLOAT16  0x2
-#define FIXED12  0x4
-/*@}*/
-
-
-/**
- * Saturation modes when storing values.
- */
-/*@{*/
-#define SATURATE_OFF            0
-#define SATURATE_ZERO_ONE       1
-/*@}*/
-
-
-/**
- * Per-component negation masks
- */
-/*@{*/
-#define NEGATE_X    0x1
-#define NEGATE_Y    0x2
-#define NEGATE_Z    0x4
-#define NEGATE_W    0x8
-#define NEGATE_XYZ  0x7
-#define NEGATE_XYZW 0xf
-#define NEGATE_NONE 0x0
-/*@}*/
-
-
-/**
- * Program instruction opcodes, for both vertex and fragment programs.
- * \note changes to this opcode list must be reflected in t_vb_arbprogram.c
- */
-typedef enum prog_opcode {
-                     /* ARB_vp   ARB_fp   NV_vp   NV_fp     GLSL */
-                     /*------------------------------------------*/
-   OPCODE_NOP = 0,   /*                                      X   */
-   OPCODE_ABS,       /*   X        X       1.1               X   */
-   OPCODE_ADD,       /*   X        X       X       X         X   */
-   OPCODE_AND,       /*                                          */
-   OPCODE_ARA,       /*                    2                     */
-   OPCODE_ARL,       /*   X                X                     */
-   OPCODE_ARL_NV,    /*                    2                     */
-   OPCODE_ARR,       /*                    2                     */
-   OPCODE_BGNLOOP,   /*                                     opt  */
-   OPCODE_BGNSUB,    /*                                     opt  */
-   OPCODE_BRA,       /*                    2                 X   */
-   OPCODE_BRK,       /*                    2                opt  */
-   OPCODE_CAL,       /*                    2       2             */
-   OPCODE_CMP,       /*            X                             */
-   OPCODE_CONT,      /*                                     opt  */
-   OPCODE_COS,       /*            X       2       X         X   */
-   OPCODE_DDX,       /*                            X         X   */
-   OPCODE_DDY,       /*                            X         X   */
-   OPCODE_DP2,       /*                            2             */
-   OPCODE_DP2A,      /*                            2             */
-   OPCODE_DP3,       /*   X        X       X       X         X   */
-   OPCODE_DP4,       /*   X        X       X       X         X   */
-   OPCODE_DPH,       /*   X        X       1.1                   */
-   OPCODE_DST,       /*   X        X       X       X             */
-   OPCODE_ELSE,      /*                                      X   */
-   OPCODE_END,       /*   X        X       X       X        opt  */
-   OPCODE_ENDIF,     /*                                     opt  */
-   OPCODE_ENDLOOP,   /*                                     opt  */
-   OPCODE_ENDSUB,    /*                                     opt  */
-   OPCODE_EX2,       /*   X        X       2       X         X   */
-   OPCODE_EXP,       /*   X                X                 X   */
-   OPCODE_FLR,       /*   X        X       2       X         X   */
-   OPCODE_FRC,       /*   X        X       2       X         X   */
-   OPCODE_IF,        /*                                     opt  */
-   OPCODE_KIL,       /*            X                             */
-   OPCODE_KIL_NV,    /*                            X         X   */
-   OPCODE_LG2,       /*   X        X       2       X         X   */
-   OPCODE_LIT,       /*   X        X       X       X             */
-   OPCODE_LOG,       /*   X                X                 X   */
-   OPCODE_LRP,       /*            X               X             */
-   OPCODE_MAD,       /*   X        X       X       X         X   */
-   OPCODE_MAX,       /*   X        X       X       X         X   */
-   OPCODE_MIN,       /*   X        X       X       X         X   */
-   OPCODE_MOV,       /*   X        X       X       X         X   */
-   OPCODE_MUL,       /*   X        X       X       X         X   */
-   OPCODE_NOISE1,    /*                                      X   */
-   OPCODE_NOISE2,    /*                                      X   */
-   OPCODE_NOISE3,    /*                                      X   */
-   OPCODE_NOISE4,    /*                                      X   */
-   OPCODE_NOT,       /*                                          */
-   OPCODE_NRM3,      /*                                          */
-   OPCODE_NRM4,      /*                                          */
-   OPCODE_OR,        /*                                          */
-   OPCODE_PK2H,      /*                            X             */
-   OPCODE_PK2US,     /*                            X             */
-   OPCODE_PK4B,      /*                            X             */
-   OPCODE_PK4UB,     /*                            X             */
-   OPCODE_POW,       /*   X        X               X         X   */
-   OPCODE_POPA,      /*                    3                     */
-   OPCODE_PRINT,     /*                    X       X             */
-   OPCODE_PUSHA,     /*                    3                     */
-   OPCODE_RCC,       /*                    1.1                   */
-   OPCODE_RCP,       /*   X        X       X       X         X   */
-   OPCODE_RET,       /*                    2       2             */
-   OPCODE_RFL,       /*            X               X             */
-   OPCODE_RSQ,       /*   X        X       X       X         X   */
-   OPCODE_SCS,       /*            X                             */
-   OPCODE_SEQ,       /*                    2       X         X   */
-   OPCODE_SFL,       /*                    2       X             */
-   OPCODE_SGE,       /*   X        X       X       X         X   */
-   OPCODE_SGT,       /*                    2       X         X   */
-   OPCODE_SIN,       /*            X       2       X         X   */
-   OPCODE_SLE,       /*                    2       X         X   */
-   OPCODE_SLT,       /*   X        X       X       X         X   */
-   OPCODE_SNE,       /*                    2       X         X   */
-   OPCODE_SSG,       /*                    2                     */
-   OPCODE_STR,       /*                    2       X             */
-   OPCODE_SUB,       /*   X        X       1.1     X         X   */
-   OPCODE_SWZ,       /*   X        X                             */
-   OPCODE_TEX,       /*            X       3       X         X   */
-   OPCODE_TXB,       /*            X       3                 X   */
-   OPCODE_TXD,       /*                            X         X   */
-   OPCODE_TXL,       /*                    3       2         X   */
-   OPCODE_TXP,       /*            X                         X   */
-   OPCODE_TXP_NV,    /*                    3       X             */
-   OPCODE_TRUNC,     /*                                      X   */
-   OPCODE_UP2H,      /*                            X             */
-   OPCODE_UP2US,     /*                            X             */
-   OPCODE_UP4B,      /*                            X             */
-   OPCODE_UP4UB,     /*                            X             */
-   OPCODE_X2D,       /*                            X             */
-   OPCODE_XOR,       /*                                          */
-   OPCODE_XPD,       /*   X        X                         X   */
-   MAX_OPCODE
-} gl_inst_opcode;
-
-
-/**
- * Number of bits for the src/dst register Index field.
- * This limits the size of temp/uniform register files.
- */
-#define INST_INDEX_BITS 10
-
-
-/**
- * Instruction source register.
- */
-struct prog_src_register
-{
-   GLuint File:4;	/**< One of the PROGRAM_* register file values. */
-   GLint Index:(INST_INDEX_BITS+1); /**< Extra bit here for sign bit.
-                                     * May be negative for relative addressing.
-                                     */
-   GLuint Swizzle:12;
-   GLuint RelAddr:1;
-
-   /** Take the component-wise absolute value */
-   GLuint Abs:1;
-
-   /**
-    * Post-Abs negation.
-    * This will either be NEGATE_NONE or NEGATE_XYZW, except for the SWZ
-    * instruction which allows per-component negation.
-    */
-   GLuint Negate:4;
-};
-
-
-/**
- * Instruction destination register.
- */
-struct prog_dst_register
-{
-   GLuint File:4;      /**< One of the PROGRAM_* register file values */
-   GLuint Index:INST_INDEX_BITS;  /**< Unsigned, never negative */
-   GLuint WriteMask:4;
-   GLuint RelAddr:1;
-
-   /**
-    * \name Conditional destination update control.
-    *
-    * \since
-    * NV_fragment_program, NV_fragment_program_option, NV_vertex_program2,
-    * NV_vertex_program2_option.
-    */
-   /*@{*/
-   /**
-    * Takes one of the 9 possible condition values (EQ, FL, GT, GE, LE, LT,
-    * NE, TR, or UN).  Dest reg is only written to if the matching
-    * (swizzled) condition code value passes.  When a conditional update mask
-    * is not specified, this will be \c COND_TR.
-    */
-   GLuint CondMask:4;
-
-   /**
-    * Condition code swizzle value.
-    */
-   GLuint CondSwizzle:12;
-
-   /**
-    * Selects the condition code register to use for conditional destination
-    * update masking.  In NV_fragmnet_program or NV_vertex_program2 mode, only
-    * condition code register 0 is available.  In NV_vertex_program3 mode,
-    * condition code registers 0 and 1 are available.
-    */
-   GLuint CondSrc:1;
-   /*@}*/
-};
-
-
-/**
- * Vertex/fragment program instruction.
- */
-struct prog_instruction
-{
-   gl_inst_opcode Opcode;
-   struct prog_src_register SrcReg[3];
-   struct prog_dst_register DstReg;
-
-   /**
-    * Indicates that the instruction should update the condition code
-    * register.
-    *
-    * \since
-    * NV_fragment_program, NV_fragment_program_option, NV_vertex_program2,
-    * NV_vertex_program2_option.
-    */
-   GLuint CondUpdate:1;
-
-   /**
-    * If prog_instruction::CondUpdate is \c GL_TRUE, this value selects the
-    * condition code register that is to be updated.
-    *
-    * In GL_NV_fragment_program or GL_NV_vertex_program2 mode, only condition
-    * code register 0 is available.  In GL_NV_vertex_program3 mode, condition
-    * code registers 0 and 1 are available.
-    *
-    * \since
-    * NV_fragment_program, NV_fragment_program_option, NV_vertex_program2,
-    * NV_vertex_program2_option.
-    */
-   GLuint CondDst:1;
-
-   /**
-    * Saturate each value of the vectored result to the range [0,1] or the
-    * range [-1,1].  \c SSAT mode (i.e., saturation to the range [-1,1]) is
-    * only available in NV_fragment_program2 mode.
-    * Value is one of the SATURATE_* tokens.
-    *
-    * \since
-    * NV_fragment_program, NV_fragment_program_option, NV_vertex_program3.
-    */
-   GLuint SaturateMode:2;
-
-   /**
-    * Per-instruction selectable precision: FLOAT32, FLOAT16, FIXED12.
-    *
-    * \since
-    * NV_fragment_program, NV_fragment_program_option.
-    */
-   GLuint Precision:3;
-
-   /**
-    * \name Extra fields for TEX, TXB, TXD, TXL, TXP instructions.
-    */
-   /*@{*/
-   /** Source texture unit. */
-   GLuint TexSrcUnit:5;
-
-   /** Source texture target, one of TEXTURE_{1D,2D,3D,CUBE,RECT}_INDEX */
-   GLuint TexSrcTarget:3;
-
-   /** True if tex instruction should do shadow comparison */
-   GLuint TexShadow:1;
-   /*@}*/
-
-   /**
-    * For BRA and CAL instructions, the location to jump to.
-    * For BGNLOOP, points to ENDLOOP (and vice-versa).
-    * For BRK, points to BGNLOOP (which points to ENDLOOP).
-    * For IF, points to ELSE or ENDIF.
-    * For ELSE, points to ENDIF.
-    */
-   GLint BranchTarget;
-
-   /** for debugging purposes */
-   const char *Comment;
-
-   /** Arbitrary data.  Used for OPCODE_PRINT and some drivers */
-   void *Data;
-
-   /** for driver use (try to remove someday) */
-   GLint Aux;
-};
-
-
-extern void
-_mesa_init_instructions(struct prog_instruction *inst, GLuint count);
-
-extern struct prog_instruction *
-_mesa_alloc_instructions(GLuint numInst);
-
-extern struct prog_instruction *
-_mesa_realloc_instructions(struct prog_instruction *oldInst,
-                           GLuint numOldInst, GLuint numNewInst);
-
-extern struct prog_instruction *
-_mesa_copy_instructions(struct prog_instruction *dest,
-                        const struct prog_instruction *src, GLuint n);
-
-extern void
-_mesa_free_instructions(struct prog_instruction *inst, GLuint count);
-
-extern GLuint
-_mesa_num_inst_src_regs(gl_inst_opcode opcode);
-
-extern GLuint
-_mesa_num_inst_dst_regs(gl_inst_opcode opcode);
-
-extern GLboolean
-_mesa_is_tex_instruction(gl_inst_opcode opcode);
-
-extern GLboolean
-_mesa_check_soa_dependencies(const struct prog_instruction *inst);
-
-extern const char *
-_mesa_opcode_string(gl_inst_opcode opcode);
-
-
-#endif /* PROG_INSTRUCTION_H */
diff --git a/mesalib/src/mesa/shader/prog_noise.c b/mesalib/src/mesa/shader/prog_noise.c
deleted file mode 100644
index 1713ddb5f..000000000
--- a/mesalib/src/mesa/shader/prog_noise.c
+++ /dev/null
@@ -1,638 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5
- *
- * Copyright (C) 2006  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * SimplexNoise1234
- * Copyright (c) 2003-2005, Stefan Gustavson
- *
- * Contact: stegu@itn.liu.se
- */
-
-/**
- * \file
- * \brief C implementation of Perlin Simplex Noise over 1, 2, 3 and 4 dims.
- * \author Stefan Gustavson (stegu@itn.liu.se)
- *
- *
- * This implementation is "Simplex Noise" as presented by
- * Ken Perlin at a relatively obscure and not often cited course
- * session "Real-Time Shading" at Siggraph 2001 (before real
- * time shading actually took on), under the title "hardware noise".
- * The 3D function is numerically equivalent to his Java reference
- * code available in the PDF course notes, although I re-implemented
- * it from scratch to get more readable code. The 1D, 2D and 4D cases
- * were implemented from scratch by me from Ken Perlin's text.
- *
- * This file has no dependencies on any other file, not even its own
- * header file. The header file is made for use by external code only.
- */
-
-
-#include "main/imports.h"
-#include "prog_noise.h"
-
-#define FASTFLOOR(x) ( ((x)>0) ? ((int)x) : (((int)x)-1) )
-
-/*
- * ---------------------------------------------------------------------
- * Static data
- */
-
-/**
- * Permutation table. This is just a random jumble of all numbers 0-255,
- * repeated twice to avoid wrapping the index at 255 for each lookup.
- * This needs to be exactly the same for all instances on all platforms,
- * so it's easiest to just keep it as static explicit data.
- * This also removes the need for any initialisation of this class.
- *
- * Note that making this an int[] instead of a char[] might make the
- * code run faster on platforms with a high penalty for unaligned single
- * byte addressing. Intel x86 is generally single-byte-friendly, but
- * some other CPUs are faster with 4-aligned reads.
- * However, a char[] is smaller, which avoids cache trashing, and that
- * is probably the most important aspect on most architectures.
- * This array is accessed a *lot* by the noise functions.
- * A vector-valued noise over 3D accesses it 96 times, and a
- * float-valued 4D noise 64 times. We want this to fit in the cache!
- */
-unsigned char perm[512] = { 151, 160, 137, 91, 90, 15,
-   131, 13, 201, 95, 96, 53, 194, 233, 7, 225, 140, 36, 103, 30, 69, 142, 8,
-      99, 37, 240, 21, 10, 23,
-   190, 6, 148, 247, 120, 234, 75, 0, 26, 197, 62, 94, 252, 219, 203, 117, 35,
-      11, 32, 57, 177, 33,
-   88, 237, 149, 56, 87, 174, 20, 125, 136, 171, 168, 68, 175, 74, 165, 71,
-      134, 139, 48, 27, 166,
-   77, 146, 158, 231, 83, 111, 229, 122, 60, 211, 133, 230, 220, 105, 92, 41,
-      55, 46, 245, 40, 244,
-   102, 143, 54, 65, 25, 63, 161, 1, 216, 80, 73, 209, 76, 132, 187, 208, 89,
-      18, 169, 200, 196,
-   135, 130, 116, 188, 159, 86, 164, 100, 109, 198, 173, 186, 3, 64, 52, 217,
-      226, 250, 124, 123,
-   5, 202, 38, 147, 118, 126, 255, 82, 85, 212, 207, 206, 59, 227, 47, 16, 58,
-      17, 182, 189, 28, 42,
-   223, 183, 170, 213, 119, 248, 152, 2, 44, 154, 163, 70, 221, 153, 101, 155,
-      167, 43, 172, 9,
-   129, 22, 39, 253, 19, 98, 108, 110, 79, 113, 224, 232, 178, 185, 112, 104,
-      218, 246, 97, 228,
-   251, 34, 242, 193, 238, 210, 144, 12, 191, 179, 162, 241, 81, 51, 145, 235,
-      249, 14, 239, 107,
-   49, 192, 214, 31, 181, 199, 106, 157, 184, 84, 204, 176, 115, 121, 50, 45,
-      127, 4, 150, 254,
-   138, 236, 205, 93, 222, 114, 67, 29, 24, 72, 243, 141, 128, 195, 78, 66,
-      215, 61, 156, 180,
-   151, 160, 137, 91, 90, 15,
-   131, 13, 201, 95, 96, 53, 194, 233, 7, 225, 140, 36, 103, 30, 69, 142, 8,
-      99, 37, 240, 21, 10, 23,
-   190, 6, 148, 247, 120, 234, 75, 0, 26, 197, 62, 94, 252, 219, 203, 117, 35,
-      11, 32, 57, 177, 33,
-   88, 237, 149, 56, 87, 174, 20, 125, 136, 171, 168, 68, 175, 74, 165, 71,
-      134, 139, 48, 27, 166,
-   77, 146, 158, 231, 83, 111, 229, 122, 60, 211, 133, 230, 220, 105, 92, 41,
-      55, 46, 245, 40, 244,
-   102, 143, 54, 65, 25, 63, 161, 1, 216, 80, 73, 209, 76, 132, 187, 208, 89,
-      18, 169, 200, 196,
-   135, 130, 116, 188, 159, 86, 164, 100, 109, 198, 173, 186, 3, 64, 52, 217,
-      226, 250, 124, 123,
-   5, 202, 38, 147, 118, 126, 255, 82, 85, 212, 207, 206, 59, 227, 47, 16, 58,
-      17, 182, 189, 28, 42,
-   223, 183, 170, 213, 119, 248, 152, 2, 44, 154, 163, 70, 221, 153, 101, 155,
-      167, 43, 172, 9,
-   129, 22, 39, 253, 19, 98, 108, 110, 79, 113, 224, 232, 178, 185, 112, 104,
-      218, 246, 97, 228,
-   251, 34, 242, 193, 238, 210, 144, 12, 191, 179, 162, 241, 81, 51, 145, 235,
-      249, 14, 239, 107,
-   49, 192, 214, 31, 181, 199, 106, 157, 184, 84, 204, 176, 115, 121, 50, 45,
-      127, 4, 150, 254,
-   138, 236, 205, 93, 222, 114, 67, 29, 24, 72, 243, 141, 128, 195, 78, 66,
-      215, 61, 156, 180
-};
-
-/*
- * ---------------------------------------------------------------------
- */
-
-/*
- * Helper functions to compute gradients-dot-residualvectors (1D to 4D)
- * Note that these generate gradients of more than unit length. To make
- * a close match with the value range of classic Perlin noise, the final
- * noise values need to be rescaled to fit nicely within [-1,1].
- * (The simplex noise functions as such also have different scaling.)
- * Note also that these noise functions are the most practical and useful
- * signed version of Perlin noise. To return values according to the
- * RenderMan specification from the SL noise() and pnoise() functions,
- * the noise values need to be scaled and offset to [0,1], like this:
- * float SLnoise = (SimplexNoise1234::noise(x,y,z) + 1.0) * 0.5;
- */
-
-static float
-grad1(int hash, float x)
-{
-   int h = hash & 15;
-   float grad = 1.0f + (h & 7); /* Gradient value 1.0, 2.0, ..., 8.0 */
-   if (h & 8)
-      grad = -grad;             /* Set a random sign for the gradient */
-   return (grad * x);           /* Multiply the gradient with the distance */
-}
-
-static float
-grad2(int hash, float x, float y)
-{
-   int h = hash & 7;            /* Convert low 3 bits of hash code */
-   float u = h < 4 ? x : y;     /* into 8 simple gradient directions, */
-   float v = h < 4 ? y : x;     /* and compute the dot product with (x,y). */
-   return ((h & 1) ? -u : u) + ((h & 2) ? -2.0f * v : 2.0f * v);
-}
-
-static float
-grad3(int hash, float x, float y, float z)
-{
-   int h = hash & 15;           /* Convert low 4 bits of hash code into 12 simple */
-   float u = h < 8 ? x : y;     /* gradient directions, and compute dot product. */
-   float v = h < 4 ? y : h == 12 || h == 14 ? x : z;    /* Fix repeats at h = 12 to 15 */
-   return ((h & 1) ? -u : u) + ((h & 2) ? -v : v);
-}
-
-static float
-grad4(int hash, float x, float y, float z, float t)
-{
-   int h = hash & 31;           /* Convert low 5 bits of hash code into 32 simple */
-   float u = h < 24 ? x : y;    /* gradient directions, and compute dot product. */
-   float v = h < 16 ? y : z;
-   float w = h < 8 ? z : t;
-   return ((h & 1) ? -u : u) + ((h & 2) ? -v : v) + ((h & 4) ? -w : w);
-}
-
-/**
- * A lookup table to traverse the simplex around a given point in 4D.
- * Details can be found where this table is used, in the 4D noise method.
- * TODO: This should not be required, backport it from Bill's GLSL code!
- */
-static unsigned char simplex[64][4] = {
-   {0, 1, 2, 3}, {0, 1, 3, 2}, {0, 0, 0, 0}, {0, 2, 3, 1},
-   {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {1, 2, 3, 0},
-   {0, 2, 1, 3}, {0, 0, 0, 0}, {0, 3, 1, 2}, {0, 3, 2, 1},
-   {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {1, 3, 2, 0},
-   {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0},
-   {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0},
-   {1, 2, 0, 3}, {0, 0, 0, 0}, {1, 3, 0, 2}, {0, 0, 0, 0},
-   {0, 0, 0, 0}, {0, 0, 0, 0}, {2, 3, 0, 1}, {2, 3, 1, 0},
-   {1, 0, 2, 3}, {1, 0, 3, 2}, {0, 0, 0, 0}, {0, 0, 0, 0},
-   {0, 0, 0, 0}, {2, 0, 3, 1}, {0, 0, 0, 0}, {2, 1, 3, 0},
-   {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0},
-   {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0},
-   {2, 0, 1, 3}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0},
-   {3, 0, 1, 2}, {3, 0, 2, 1}, {0, 0, 0, 0}, {3, 1, 2, 0},
-   {2, 1, 0, 3}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0},
-   {3, 1, 0, 2}, {0, 0, 0, 0}, {3, 2, 0, 1}, {3, 2, 1, 0}
-};
-
-
-/** 1D simplex noise */
-GLfloat
-_mesa_noise1(GLfloat x)
-{
-   int i0 = FASTFLOOR(x);
-   int i1 = i0 + 1;
-   float x0 = x - i0;
-   float x1 = x0 - 1.0f;
-   float t1 = 1.0f - x1 * x1;
-   float n0, n1;
-
-   float t0 = 1.0f - x0 * x0;
-/*  if(t0 < 0.0f) t0 = 0.0f; // this never happens for the 1D case */
-   t0 *= t0;
-   n0 = t0 * t0 * grad1(perm[i0 & 0xff], x0);
-
-/*  if(t1 < 0.0f) t1 = 0.0f; // this never happens for the 1D case */
-   t1 *= t1;
-   n1 = t1 * t1 * grad1(perm[i1 & 0xff], x1);
-   /* The maximum value of this noise is 8*(3/4)^4 = 2.53125 */
-   /* A factor of 0.395 would scale to fit exactly within [-1,1], but */
-   /* we want to match PRMan's 1D noise, so we scale it down some more. */
-   return 0.25f * (n0 + n1);
-}
-
-
-/** 2D simplex noise */
-GLfloat
-_mesa_noise2(GLfloat x, GLfloat y)
-{
-#define F2 0.366025403f         /* F2 = 0.5*(sqrt(3.0)-1.0) */
-#define G2 0.211324865f         /* G2 = (3.0-Math.sqrt(3.0))/6.0 */
-
-   float n0, n1, n2;            /* Noise contributions from the three corners */
-
-   /* Skew the input space to determine which simplex cell we're in */
-   float s = (x + y) * F2;      /* Hairy factor for 2D */
-   float xs = x + s;
-   float ys = y + s;
-   int i = FASTFLOOR(xs);
-   int j = FASTFLOOR(ys);
-
-   float t = (float) (i + j) * G2;
-   float X0 = i - t;            /* Unskew the cell origin back to (x,y) space */
-   float Y0 = j - t;
-   float x0 = x - X0;           /* The x,y distances from the cell origin */
-   float y0 = y - Y0;
-
-   float x1, y1, x2, y2;
-   int ii, jj;
-   float t0, t1, t2;
-
-   /* For the 2D case, the simplex shape is an equilateral triangle. */
-   /* Determine which simplex we are in. */
-   int i1, j1;                  /* Offsets for second (middle) corner of simplex in (i,j) coords */
-   if (x0 > y0) {
-      i1 = 1;
-      j1 = 0;
-   }                            /* lower triangle, XY order: (0,0)->(1,0)->(1,1) */
-   else {
-      i1 = 0;
-      j1 = 1;
-   }                            /* upper triangle, YX order: (0,0)->(0,1)->(1,1) */
-
-   /* A step of (1,0) in (i,j) means a step of (1-c,-c) in (x,y), and */
-   /* a step of (0,1) in (i,j) means a step of (-c,1-c) in (x,y), where */
-   /* c = (3-sqrt(3))/6 */
-
-   x1 = x0 - i1 + G2;           /* Offsets for middle corner in (x,y) unskewed coords */
-   y1 = y0 - j1 + G2;
-   x2 = x0 - 1.0f + 2.0f * G2;  /* Offsets for last corner in (x,y) unskewed coords */
-   y2 = y0 - 1.0f + 2.0f * G2;
-
-   /* Wrap the integer indices at 256, to avoid indexing perm[] out of bounds */
-   ii = i % 256;
-   jj = j % 256;
-
-   /* Calculate the contribution from the three corners */
-   t0 = 0.5f - x0 * x0 - y0 * y0;
-   if (t0 < 0.0f)
-      n0 = 0.0f;
-   else {
-      t0 *= t0;
-      n0 = t0 * t0 * grad2(perm[ii + perm[jj]], x0, y0);
-   }
-
-   t1 = 0.5f - x1 * x1 - y1 * y1;
-   if (t1 < 0.0f)
-      n1 = 0.0f;
-   else {
-      t1 *= t1;
-      n1 = t1 * t1 * grad2(perm[ii + i1 + perm[jj + j1]], x1, y1);
-   }
-
-   t2 = 0.5f - x2 * x2 - y2 * y2;
-   if (t2 < 0.0f)
-      n2 = 0.0f;
-   else {
-      t2 *= t2;
-      n2 = t2 * t2 * grad2(perm[ii + 1 + perm[jj + 1]], x2, y2);
-   }
-
-   /* Add contributions from each corner to get the final noise value. */
-   /* The result is scaled to return values in the interval [-1,1]. */
-   return 40.0f * (n0 + n1 + n2);       /* TODO: The scale factor is preliminary! */
-}
-
-
-/** 3D simplex noise */
-GLfloat
-_mesa_noise3(GLfloat x, GLfloat y, GLfloat z)
-{
-/* Simple skewing factors for the 3D case */
-#define F3 0.333333333f
-#define G3 0.166666667f
-
-   float n0, n1, n2, n3;        /* Noise contributions from the four corners */
-
-   /* Skew the input space to determine which simplex cell we're in */
-   float s = (x + y + z) * F3;  /* Very nice and simple skew factor for 3D */
-   float xs = x + s;
-   float ys = y + s;
-   float zs = z + s;
-   int i = FASTFLOOR(xs);
-   int j = FASTFLOOR(ys);
-   int k = FASTFLOOR(zs);
-
-   float t = (float) (i + j + k) * G3;
-   float X0 = i - t;            /* Unskew the cell origin back to (x,y,z) space */
-   float Y0 = j - t;
-   float Z0 = k - t;
-   float x0 = x - X0;           /* The x,y,z distances from the cell origin */
-   float y0 = y - Y0;
-   float z0 = z - Z0;
-
-   float x1, y1, z1, x2, y2, z2, x3, y3, z3;
-   int ii, jj, kk;
-   float t0, t1, t2, t3;
-
-   /* For the 3D case, the simplex shape is a slightly irregular tetrahedron. */
-   /* Determine which simplex we are in. */
-   int i1, j1, k1;              /* Offsets for second corner of simplex in (i,j,k) coords */
-   int i2, j2, k2;              /* Offsets for third corner of simplex in (i,j,k) coords */
-
-/* This code would benefit from a backport from the GLSL version! */
-   if (x0 >= y0) {
-      if (y0 >= z0) {
-         i1 = 1;
-         j1 = 0;
-         k1 = 0;
-         i2 = 1;
-         j2 = 1;
-         k2 = 0;
-      }                         /* X Y Z order */
-      else if (x0 >= z0) {
-         i1 = 1;
-         j1 = 0;
-         k1 = 0;
-         i2 = 1;
-         j2 = 0;
-         k2 = 1;
-      }                         /* X Z Y order */
-      else {
-         i1 = 0;
-         j1 = 0;
-         k1 = 1;
-         i2 = 1;
-         j2 = 0;
-         k2 = 1;
-      }                         /* Z X Y order */
-   }
-   else {                       /* x0<y0 */
-      if (y0 < z0) {
-         i1 = 0;
-         j1 = 0;
-         k1 = 1;
-         i2 = 0;
-         j2 = 1;
-         k2 = 1;
-      }                         /* Z Y X order */
-      else if (x0 < z0) {
-         i1 = 0;
-         j1 = 1;
-         k1 = 0;
-         i2 = 0;
-         j2 = 1;
-         k2 = 1;
-      }                         /* Y Z X order */
-      else {
-         i1 = 0;
-         j1 = 1;
-         k1 = 0;
-         i2 = 1;
-         j2 = 1;
-         k2 = 0;
-      }                         /* Y X Z order */
-   }
-
-   /* A step of (1,0,0) in (i,j,k) means a step of (1-c,-c,-c) in
-    * (x,y,z), a step of (0,1,0) in (i,j,k) means a step of
-    * (-c,1-c,-c) in (x,y,z), and a step of (0,0,1) in (i,j,k) means a
-    * step of (-c,-c,1-c) in (x,y,z), where c = 1/6.
-    */
-
-   x1 = x0 - i1 + G3;         /* Offsets for second corner in (x,y,z) coords */
-   y1 = y0 - j1 + G3;
-   z1 = z0 - k1 + G3;
-   x2 = x0 - i2 + 2.0f * G3;  /* Offsets for third corner in (x,y,z) coords */
-   y2 = y0 - j2 + 2.0f * G3;
-   z2 = z0 - k2 + 2.0f * G3;
-   x3 = x0 - 1.0f + 3.0f * G3;/* Offsets for last corner in (x,y,z) coords */
-   y3 = y0 - 1.0f + 3.0f * G3;
-   z3 = z0 - 1.0f + 3.0f * G3;
-
-   /* Wrap the integer indices at 256 to avoid indexing perm[] out of bounds */
-   ii = i % 256;
-   jj = j % 256;
-   kk = k % 256;
-
-   /* Calculate the contribution from the four corners */
-   t0 = 0.6f - x0 * x0 - y0 * y0 - z0 * z0;
-   if (t0 < 0.0f)
-      n0 = 0.0f;
-   else {
-      t0 *= t0;
-      n0 = t0 * t0 * grad3(perm[ii + perm[jj + perm[kk]]], x0, y0, z0);
-   }
-
-   t1 = 0.6f - x1 * x1 - y1 * y1 - z1 * z1;
-   if (t1 < 0.0f)
-      n1 = 0.0f;
-   else {
-      t1 *= t1;
-      n1 =
-         t1 * t1 * grad3(perm[ii + i1 + perm[jj + j1 + perm[kk + k1]]], x1,
-                         y1, z1);
-   }
-
-   t2 = 0.6f - x2 * x2 - y2 * y2 - z2 * z2;
-   if (t2 < 0.0f)
-      n2 = 0.0f;
-   else {
-      t2 *= t2;
-      n2 =
-         t2 * t2 * grad3(perm[ii + i2 + perm[jj + j2 + perm[kk + k2]]], x2,
-                         y2, z2);
-   }
-
-   t3 = 0.6f - x3 * x3 - y3 * y3 - z3 * z3;
-   if (t3 < 0.0f)
-      n3 = 0.0f;
-   else {
-      t3 *= t3;
-      n3 =
-         t3 * t3 * grad3(perm[ii + 1 + perm[jj + 1 + perm[kk + 1]]], x3, y3,
-                         z3);
-   }
-
-   /* Add contributions from each corner to get the final noise value.
-    * The result is scaled to stay just inside [-1,1]
-    */
-   return 32.0f * (n0 + n1 + n2 + n3);  /* TODO: The scale factor is preliminary! */
-}
-
-
-/** 4D simplex noise */
-GLfloat
-_mesa_noise4(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-   /* The skewing and unskewing factors are hairy again for the 4D case */
-#define F4 0.309016994f         /* F4 = (Math.sqrt(5.0)-1.0)/4.0 */
-#define G4 0.138196601f         /* G4 = (5.0-Math.sqrt(5.0))/20.0 */
-
-   float n0, n1, n2, n3, n4;    /* Noise contributions from the five corners */
-
-   /* Skew the (x,y,z,w) space to determine which cell of 24 simplices we're in */
-   float s = (x + y + z + w) * F4;      /* Factor for 4D skewing */
-   float xs = x + s;
-   float ys = y + s;
-   float zs = z + s;
-   float ws = w + s;
-   int i = FASTFLOOR(xs);
-   int j = FASTFLOOR(ys);
-   int k = FASTFLOOR(zs);
-   int l = FASTFLOOR(ws);
-
-   float t = (i + j + k + l) * G4;      /* Factor for 4D unskewing */
-   float X0 = i - t;            /* Unskew the cell origin back to (x,y,z,w) space */
-   float Y0 = j - t;
-   float Z0 = k - t;
-   float W0 = l - t;
-
-   float x0 = x - X0;           /* The x,y,z,w distances from the cell origin */
-   float y0 = y - Y0;
-   float z0 = z - Z0;
-   float w0 = w - W0;
-
-   /* For the 4D case, the simplex is a 4D shape I won't even try to describe.
-    * To find out which of the 24 possible simplices we're in, we need to
-    * determine the magnitude ordering of x0, y0, z0 and w0.
-    * The method below is a good way of finding the ordering of x,y,z,w and
-    * then find the correct traversal order for the simplex we're in.
-    * First, six pair-wise comparisons are performed between each possible pair
-    * of the four coordinates, and the results are used to add up binary bits
-    * for an integer index.
-    */
-   int c1 = (x0 > y0) ? 32 : 0;
-   int c2 = (x0 > z0) ? 16 : 0;
-   int c3 = (y0 > z0) ? 8 : 0;
-   int c4 = (x0 > w0) ? 4 : 0;
-   int c5 = (y0 > w0) ? 2 : 0;
-   int c6 = (z0 > w0) ? 1 : 0;
-   int c = c1 + c2 + c3 + c4 + c5 + c6;
-
-   int i1, j1, k1, l1;  /* The integer offsets for the second simplex corner */
-   int i2, j2, k2, l2;  /* The integer offsets for the third simplex corner */
-   int i3, j3, k3, l3;  /* The integer offsets for the fourth simplex corner */
-
-   float x1, y1, z1, w1, x2, y2, z2, w2, x3, y3, z3, w3, x4, y4, z4, w4;
-   int ii, jj, kk, ll;
-   float t0, t1, t2, t3, t4;
-
-   /*
-    * simplex[c] is a 4-vector with the numbers 0, 1, 2 and 3 in some
-    * order.  Many values of c will never occur, since e.g. x>y>z>w
-    * makes x<z, y<w and x<w impossible. Only the 24 indices which
-    * have non-zero entries make any sense.  We use a thresholding to
-    * set the coordinates in turn from the largest magnitude.  The
-    * number 3 in the "simplex" array is at the position of the
-    * largest coordinate.
-    */
-   i1 = simplex[c][0] >= 3 ? 1 : 0;
-   j1 = simplex[c][1] >= 3 ? 1 : 0;
-   k1 = simplex[c][2] >= 3 ? 1 : 0;
-   l1 = simplex[c][3] >= 3 ? 1 : 0;
-   /* The number 2 in the "simplex" array is at the second largest coordinate. */
-   i2 = simplex[c][0] >= 2 ? 1 : 0;
-   j2 = simplex[c][1] >= 2 ? 1 : 0;
-   k2 = simplex[c][2] >= 2 ? 1 : 0;
-   l2 = simplex[c][3] >= 2 ? 1 : 0;
-   /* The number 1 in the "simplex" array is at the second smallest coordinate. */
-   i3 = simplex[c][0] >= 1 ? 1 : 0;
-   j3 = simplex[c][1] >= 1 ? 1 : 0;
-   k3 = simplex[c][2] >= 1 ? 1 : 0;
-   l3 = simplex[c][3] >= 1 ? 1 : 0;
-   /* The fifth corner has all coordinate offsets = 1, so no need to look that up. */
-
-   x1 = x0 - i1 + G4;           /* Offsets for second corner in (x,y,z,w) coords */
-   y1 = y0 - j1 + G4;
-   z1 = z0 - k1 + G4;
-   w1 = w0 - l1 + G4;
-   x2 = x0 - i2 + 2.0f * G4;    /* Offsets for third corner in (x,y,z,w) coords */
-   y2 = y0 - j2 + 2.0f * G4;
-   z2 = z0 - k2 + 2.0f * G4;
-   w2 = w0 - l2 + 2.0f * G4;
-   x3 = x0 - i3 + 3.0f * G4;    /* Offsets for fourth corner in (x,y,z,w) coords */
-   y3 = y0 - j3 + 3.0f * G4;
-   z3 = z0 - k3 + 3.0f * G4;
-   w3 = w0 - l3 + 3.0f * G4;
-   x4 = x0 - 1.0f + 4.0f * G4;  /* Offsets for last corner in (x,y,z,w) coords */
-   y4 = y0 - 1.0f + 4.0f * G4;
-   z4 = z0 - 1.0f + 4.0f * G4;
-   w4 = w0 - 1.0f + 4.0f * G4;
-
-   /* Wrap the integer indices at 256, to avoid indexing perm[] out of bounds */
-   ii = i % 256;
-   jj = j % 256;
-   kk = k % 256;
-   ll = l % 256;
-
-   /* Calculate the contribution from the five corners */
-   t0 = 0.6f - x0 * x0 - y0 * y0 - z0 * z0 - w0 * w0;
-   if (t0 < 0.0f)
-      n0 = 0.0f;
-   else {
-      t0 *= t0;
-      n0 =
-         t0 * t0 * grad4(perm[ii + perm[jj + perm[kk + perm[ll]]]], x0, y0,
-                         z0, w0);
-   }
-
-   t1 = 0.6f - x1 * x1 - y1 * y1 - z1 * z1 - w1 * w1;
-   if (t1 < 0.0f)
-      n1 = 0.0f;
-   else {
-      t1 *= t1;
-      n1 =
-         t1 * t1 *
-         grad4(perm[ii + i1 + perm[jj + j1 + perm[kk + k1 + perm[ll + l1]]]],
-               x1, y1, z1, w1);
-   }
-
-   t2 = 0.6f - x2 * x2 - y2 * y2 - z2 * z2 - w2 * w2;
-   if (t2 < 0.0f)
-      n2 = 0.0f;
-   else {
-      t2 *= t2;
-      n2 =
-         t2 * t2 *
-         grad4(perm[ii + i2 + perm[jj + j2 + perm[kk + k2 + perm[ll + l2]]]],
-               x2, y2, z2, w2);
-   }
-
-   t3 = 0.6f - x3 * x3 - y3 * y3 - z3 * z3 - w3 * w3;
-   if (t3 < 0.0f)
-      n3 = 0.0f;
-   else {
-      t3 *= t3;
-      n3 =
-         t3 * t3 *
-         grad4(perm[ii + i3 + perm[jj + j3 + perm[kk + k3 + perm[ll + l3]]]],
-               x3, y3, z3, w3);
-   }
-
-   t4 = 0.6f - x4 * x4 - y4 * y4 - z4 * z4 - w4 * w4;
-   if (t4 < 0.0f)
-      n4 = 0.0f;
-   else {
-      t4 *= t4;
-      n4 =
-         t4 * t4 *
-         grad4(perm[ii + 1 + perm[jj + 1 + perm[kk + 1 + perm[ll + 1]]]], x4,
-               y4, z4, w4);
-   }
-
-   /* Sum up and scale the result to cover the range [-1,1] */
-   return 27.0f * (n0 + n1 + n2 + n3 + n4);     /* TODO: The scale factor is preliminary! */
-}
diff --git a/mesalib/src/mesa/shader/prog_noise.h b/mesalib/src/mesa/shader/prog_noise.h
deleted file mode 100644
index c4779479f..000000000
--- a/mesalib/src/mesa/shader/prog_noise.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5
- *
- * Copyright (C) 2006  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef PROG_NOISE
-#define PROG_NOISE
-
-extern GLfloat _mesa_noise1(GLfloat);
-extern GLfloat _mesa_noise2(GLfloat, GLfloat);
-extern GLfloat _mesa_noise3(GLfloat, GLfloat, GLfloat);
-extern GLfloat _mesa_noise4(GLfloat, GLfloat, GLfloat, GLfloat);
-
-#endif
-
diff --git a/mesalib/src/mesa/shader/prog_optimize.c b/mesalib/src/mesa/shader/prog_optimize.c
deleted file mode 100644
index 2941a17da..000000000
--- a/mesalib/src/mesa/shader/prog_optimize.c
+++ /dev/null
@@ -1,1035 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.5
- *
- * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, 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
- * VMWARE BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION 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/context.h"
-#include "main/macros.h"
-#include "program.h"
-#include "prog_instruction.h"
-#include "prog_optimize.h"
-#include "prog_print.h"
-
-
-#define MAX_LOOP_NESTING 50
-
-
-static GLboolean dbg = GL_FALSE;
-
-/* Returns the mask of channels read from the given srcreg in this instruction.
- */
-static GLuint
-get_src_arg_mask(const struct prog_instruction *inst, int arg)
-{
-   int writemask = inst->DstReg.WriteMask;
-
-   if (inst->CondUpdate)
-      writemask = WRITEMASK_XYZW;
-
-   switch (inst->Opcode) {
-   case OPCODE_MOV:
-   case OPCODE_ABS:
-   case OPCODE_ADD:
-   case OPCODE_MUL:
-   case OPCODE_SUB:
-      return writemask;
-   case OPCODE_RCP:
-   case OPCODE_SIN:
-   case OPCODE_COS:
-   case OPCODE_RSQ:
-   case OPCODE_POW:
-   case OPCODE_EX2:
-      return WRITEMASK_X;
-   case OPCODE_DP2:
-      return WRITEMASK_XY;
-   case OPCODE_DP3:
-   case OPCODE_XPD:
-      return WRITEMASK_XYZ;
-   default:
-      return WRITEMASK_XYZW;
-   }
-}
-
-/**
- * In 'prog' remove instruction[i] if removeFlags[i] == TRUE.
- * \return number of instructions removed
- */
-static GLuint
-remove_instructions(struct gl_program *prog, const GLboolean *removeFlags)
-{
-   GLint i, removeEnd = 0, removeCount = 0;
-   GLuint totalRemoved = 0;
-
-   /* go backward */
-   for (i = prog->NumInstructions - 1; i >= 0; i--) {
-      if (removeFlags[i]) {
-         totalRemoved++;
-         if (removeCount == 0) {
-            /* begin a run of instructions to remove */
-            removeEnd = i;
-            removeCount = 1;
-         }
-         else {
-            /* extend the run of instructions to remove */
-            removeCount++;
-         }
-      }
-      else {
-         /* don't remove this instruction, but check if the preceeding
-          * instructions are to be removed.
-          */
-         if (removeCount > 0) {
-            GLint removeStart = removeEnd - removeCount + 1;
-            _mesa_delete_instructions(prog, removeStart, removeCount);
-            removeStart = removeCount = 0; /* reset removal info */
-         }
-      }
-   }
-   /* Finish removing if the first instruction was to be removed. */
-   if (removeCount > 0) {
-      GLint removeStart = removeEnd - removeCount + 1;
-      _mesa_delete_instructions(prog, removeStart, removeCount);
-   }
-   return totalRemoved;
-}
-
-
-/**
- * Remap register indexes according to map.
- * \param prog  the program to search/replace
- * \param file  the type of register file to search/replace
- * \param map  maps old register indexes to new indexes
- */
-static void
-replace_regs(struct gl_program *prog, gl_register_file file, const GLint map[])
-{
-   GLuint i;
-
-   for (i = 0; i < prog->NumInstructions; i++) {
-      struct prog_instruction *inst = prog->Instructions + i;
-      const GLuint numSrc = _mesa_num_inst_src_regs(inst->Opcode);
-      GLuint j;
-      for (j = 0; j < numSrc; j++) {
-         if (inst->SrcReg[j].File == file) {
-            GLuint index = inst->SrcReg[j].Index;
-            ASSERT(map[index] >= 0);
-            inst->SrcReg[j].Index = map[index];
-         }
-      }
-      if (inst->DstReg.File == file) {
-         const GLuint index = inst->DstReg.Index;
-         ASSERT(map[index] >= 0);
-         inst->DstReg.Index = map[index];
-      }
-   }
-}
-
-
-/**
- * Consolidate temporary registers to use low numbers.  For example, if the
- * shader only uses temps 4, 5, 8, replace them with 0, 1, 2.
- */
-static void
-_mesa_consolidate_registers(struct gl_program *prog)
-{
-   GLboolean tempUsed[MAX_PROGRAM_TEMPS];
-   GLint tempMap[MAX_PROGRAM_TEMPS];
-   GLuint tempMax = 0, i;
-
-   if (dbg) {
-      printf("Optimize: Begin register consolidation\n");
-   }
-
-   memset(tempUsed, 0, sizeof(tempUsed));
-
-   for (i = 0; i < MAX_PROGRAM_TEMPS; i++) {
-      tempMap[i] = -1;
-   }
-
-   /* set tempUsed[i] if temporary [i] is referenced */
-   for (i = 0; i < prog->NumInstructions; i++) {
-      const struct prog_instruction *inst = prog->Instructions + i;
-      const GLuint numSrc = _mesa_num_inst_src_regs(inst->Opcode);
-      GLuint j;
-      for (j = 0; j < numSrc; j++) {
-         if (inst->SrcReg[j].File == PROGRAM_TEMPORARY) {
-            const GLuint index = inst->SrcReg[j].Index;
-            ASSERT(index < MAX_PROGRAM_TEMPS);
-            tempUsed[index] = GL_TRUE;
-            tempMax = MAX2(tempMax, index);
-            break;
-         }
-      }
-      if (inst->DstReg.File == PROGRAM_TEMPORARY) {
-         const GLuint index = inst->DstReg.Index;
-         ASSERT(index < MAX_PROGRAM_TEMPS);
-         tempUsed[index] = GL_TRUE;
-         tempMax = MAX2(tempMax, index);
-      }
-   }
-
-   /* allocate a new index for each temp that's used */
-   {
-      GLuint freeTemp = 0;
-      for (i = 0; i <= tempMax; i++) {
-         if (tempUsed[i]) {
-            tempMap[i] = freeTemp++;
-            /*printf("replace %u with %u\n", i, tempMap[i]);*/
-         }
-      }
-      if (freeTemp == tempMax + 1) {
-         /* no consolidation possible */
-         return;
-      }         
-      if (dbg) {
-         printf("Replace regs 0..%u with 0..%u\n", tempMax, freeTemp-1);
-      }
-   }
-
-   replace_regs(prog, PROGRAM_TEMPORARY, tempMap);
-
-   if (dbg) {
-      printf("Optimize: End register consolidation\n");
-   }
-}
-
-
-/**
- * Remove dead instructions from the given program.
- * This is very primitive for now.  Basically look for temp registers
- * that are written to but never read.  Remove any instructions that
- * write to such registers.  Be careful with condition code setters.
- */
-static void
-_mesa_remove_dead_code(struct gl_program *prog)
-{
-   GLboolean tempRead[MAX_PROGRAM_TEMPS][4];
-   GLboolean *removeInst; /* per-instruction removal flag */
-   GLuint i, rem = 0, comp;
-
-   memset(tempRead, 0, sizeof(tempRead));
-
-   if (dbg) {
-      printf("Optimize: Begin dead code removal\n");
-      /*_mesa_print_program(prog);*/
-   }
-
-   removeInst = (GLboolean *)
-      calloc(1, prog->NumInstructions * sizeof(GLboolean));
-
-   /* Determine which temps are read and written */
-   for (i = 0; i < prog->NumInstructions; i++) {
-      const struct prog_instruction *inst = prog->Instructions + i;
-      const GLuint numSrc = _mesa_num_inst_src_regs(inst->Opcode);
-      GLuint j;
-
-      /* check src regs */
-      for (j = 0; j < numSrc; j++) {
-         if (inst->SrcReg[j].File == PROGRAM_TEMPORARY) {
-            const GLuint index = inst->SrcReg[j].Index;
-            GLuint read_mask;
-            ASSERT(index < MAX_PROGRAM_TEMPS);
-	    read_mask = get_src_arg_mask(inst, j);
-
-            if (inst->SrcReg[j].RelAddr) {
-               if (dbg)
-                  printf("abort remove dead code (indirect temp)\n");
-               goto done;
-            }
-
-	    for (comp = 0; comp < 4; comp++) {
-	       GLuint swz = (inst->SrcReg[j].Swizzle >> (3 * comp)) & 0x7;
-
-	       if ((read_mask & (1 << comp)) == 0)
-		  continue;
-
-	       switch (swz) {
-	       case SWIZZLE_X:
-		  tempRead[index][0] = GL_TRUE;
-		  break;
-	       case SWIZZLE_Y:
-		  tempRead[index][1] = GL_TRUE;
-		  break;
-	       case SWIZZLE_Z:
-		  tempRead[index][2] = GL_TRUE;
-		  break;
-	       case SWIZZLE_W:
-		  tempRead[index][3] = GL_TRUE;
-		  break;
-	       }
-	    }
-         }
-      }
-
-      /* check dst reg */
-      if (inst->DstReg.File == PROGRAM_TEMPORARY) {
-         const GLuint index = inst->DstReg.Index;
-         ASSERT(index < MAX_PROGRAM_TEMPS);
-
-         if (inst->DstReg.RelAddr) {
-            if (dbg)
-               printf("abort remove dead code (indirect temp)\n");
-            goto done;
-         }
-
-         if (inst->CondUpdate) {
-            /* If we're writing to this register and setting condition
-             * codes we cannot remove the instruction.  Prevent removal
-             * by setting the 'read' flag.
-             */
-            tempRead[index][0] = GL_TRUE;
-            tempRead[index][1] = GL_TRUE;
-            tempRead[index][2] = GL_TRUE;
-            tempRead[index][3] = GL_TRUE;
-         }
-      }
-   }
-
-   /* find instructions that write to dead registers, flag for removal */
-   for (i = 0; i < prog->NumInstructions; i++) {
-      struct prog_instruction *inst = prog->Instructions + i;
-      const GLuint numDst = _mesa_num_inst_dst_regs(inst->Opcode);
-
-      if (numDst != 0 && inst->DstReg.File == PROGRAM_TEMPORARY) {
-         GLint chan, index = inst->DstReg.Index;
-
-	 for (chan = 0; chan < 4; chan++) {
-	    if (!tempRead[index][chan] &&
-		inst->DstReg.WriteMask & (1 << chan)) {
-	       if (dbg) {
-		  printf("Remove writemask on %u.%c\n", i,
-			       chan == 3 ? 'w' : 'x' + chan);
-	       }
-	       inst->DstReg.WriteMask &= ~(1 << chan);
-	       rem++;
-	    }
-	 }
-
-	 if (inst->DstReg.WriteMask == 0) {
-	    /* If we cleared all writes, the instruction can be removed. */
-	    if (dbg)
-	       printf("Remove instruction %u: \n", i);
-	    removeInst[i] = GL_TRUE;
-	 }
-      }
-   }
-
-   /* now remove the instructions which aren't needed */
-   rem = remove_instructions(prog, removeInst);
-
-   if (dbg) {
-      printf("Optimize: End dead code removal.\n");
-      printf("  %u channel writes removed\n", rem);
-      printf("  %u instructions removed\n", rem);
-      /*_mesa_print_program(prog);*/
-   }
-
-done:
-   free(removeInst);
-}
-
-
-enum temp_use
-{
-   READ,
-   WRITE,
-   FLOW,
-   END
-};
-
-/**
- * Scan forward in program from 'start' for the next occurance of TEMP[index].
- * Return READ, WRITE, FLOW or END to indicate the next usage or an indicator
- * that we can't look further.
- */
-static enum temp_use
-find_next_temp_use(const struct gl_program *prog, GLuint start, GLuint index)
-{
-   GLuint i;
-
-   for (i = start; i < prog->NumInstructions; i++) {
-      const struct prog_instruction *inst = prog->Instructions + i;
-      switch (inst->Opcode) {
-      case OPCODE_BGNLOOP:
-      case OPCODE_ENDLOOP:
-      case OPCODE_BGNSUB:
-      case OPCODE_ENDSUB:
-         return FLOW;
-      default:
-         {
-            const GLuint numSrc = _mesa_num_inst_src_regs(inst->Opcode);
-            GLuint j;
-            for (j = 0; j < numSrc; j++) {
-               if (inst->SrcReg[j].File == PROGRAM_TEMPORARY &&
-                   inst->SrcReg[j].Index == index)
-                  return READ;
-            }
-            if (inst->DstReg.File == PROGRAM_TEMPORARY &&
-                inst->DstReg.Index == index)
-               return WRITE;
-         }
-      }
-   }
-
-   return END;
-}
-
-static GLboolean _mesa_is_flow_control_opcode(enum prog_opcode opcode)
-{
-   switch (opcode) {
-   case OPCODE_BGNLOOP:
-   case OPCODE_BGNSUB:
-   case OPCODE_BRA:
-   case OPCODE_CAL:
-   case OPCODE_CONT:
-   case OPCODE_IF:
-   case OPCODE_ELSE:
-   case OPCODE_END:
-   case OPCODE_ENDIF:
-   case OPCODE_ENDLOOP:
-   case OPCODE_ENDSUB:
-   case OPCODE_RET:
-      return GL_TRUE;
-   default:
-      return GL_FALSE;
-   }
-}
-
-/**
- * Try to remove use of extraneous MOV instructions, to free them up for dead
- * code removal.
- */
-static void
-_mesa_remove_extra_move_use(struct gl_program *prog)
-{
-   GLuint i, j;
-
-   if (dbg) {
-      printf("Optimize: Begin remove extra move use\n");
-      _mesa_print_program(prog);
-   }
-
-   /*
-    * Look for sequences such as this:
-    *    MOV tmpX, arg0;
-    *    ...
-    *    FOO tmpY, tmpX, arg1;
-    * and convert into:
-    *    MOV tmpX, arg0;
-    *    ...
-    *    FOO tmpY, arg0, arg1;
-    */
-
-   for (i = 0; i + 1 < prog->NumInstructions; i++) {
-      const struct prog_instruction *mov = prog->Instructions + i;
-
-      if (mov->Opcode != OPCODE_MOV ||
-	  mov->DstReg.File != PROGRAM_TEMPORARY ||
-	  mov->DstReg.RelAddr ||
-	  mov->DstReg.CondMask != COND_TR ||
-	  mov->SaturateMode != SATURATE_OFF ||
-	  mov->SrcReg[0].RelAddr)
-	 continue;
-
-      /* Walk through remaining instructions until the or src reg gets
-       * rewritten or we get into some flow-control, eliminating the use of
-       * this MOV.
-       */
-      for (j = i + 1; j < prog->NumInstructions; j++) {
-	 struct prog_instruction *inst2 = prog->Instructions + j;
-	 GLuint arg;
-
-	 if (_mesa_is_flow_control_opcode(inst2->Opcode))
-	     break;
-
-	 /* First rewrite this instruction's args if appropriate. */
-	 for (arg = 0; arg < _mesa_num_inst_src_regs(inst2->Opcode); arg++) {
-	    int comp;
-	    int read_mask = get_src_arg_mask(inst2, arg);
-
-	    if (inst2->SrcReg[arg].File != mov->DstReg.File ||
-		inst2->SrcReg[arg].Index != mov->DstReg.Index ||
-		inst2->SrcReg[arg].RelAddr ||
-		inst2->SrcReg[arg].Abs)
-	       continue;
-
-	    /* Check that all the sources for this arg of inst2 come from inst1
-	     * or constants.
-	     */
-	    for (comp = 0; comp < 4; comp++) {
-	       int src_swz = GET_SWZ(inst2->SrcReg[arg].Swizzle, comp);
-
-	       /* If the MOV didn't write that channel, can't use it. */
-	       if ((read_mask & (1 << comp)) &&
-		   src_swz <= SWIZZLE_W &&
-		   (mov->DstReg.WriteMask & (1 << src_swz)) == 0)
-		  break;
-	    }
-	    if (comp != 4)
-	       continue;
-
-	    /* Adjust the swizzles of inst2 to point at MOV's source */
-	    for (comp = 0; comp < 4; comp++) {
-	       int inst2_swz = GET_SWZ(inst2->SrcReg[arg].Swizzle, comp);
-
-	       if (inst2_swz <= SWIZZLE_W) {
-		  GLuint s = GET_SWZ(mov->SrcReg[0].Swizzle, inst2_swz);
-		  inst2->SrcReg[arg].Swizzle &= ~(7 << (3 * comp));
-		  inst2->SrcReg[arg].Swizzle |= s << (3 * comp);
-		  inst2->SrcReg[arg].Negate ^= (((mov->SrcReg[0].Negate >>
-						  inst2_swz) & 0x1) << comp);
-	       }
-	    }
-	    inst2->SrcReg[arg].File = mov->SrcReg[0].File;
-	    inst2->SrcReg[arg].Index = mov->SrcReg[0].Index;
-	 }
-
-	 /* If this instruction overwrote part of the move, our time is up. */
-	 if ((inst2->DstReg.File == mov->DstReg.File &&
-	      (inst2->DstReg.RelAddr ||
-	       inst2->DstReg.Index == mov->DstReg.Index)) ||
-	     (inst2->DstReg.File == mov->SrcReg[0].File &&
-	      (inst2->DstReg.RelAddr ||
-	       inst2->DstReg.Index == mov->SrcReg[0].Index)))
-	    break;
-      }
-   }
-
-   if (dbg) {
-      printf("Optimize: End remove extra move use.\n");
-      /*_mesa_print_program(prog);*/
-   }
-}
-
-/**
- * Try to remove extraneous MOV instructions from the given program.
- */
-static void
-_mesa_remove_extra_moves(struct gl_program *prog)
-{
-   GLboolean *removeInst; /* per-instruction removal flag */
-   GLuint i, rem, loopNesting = 0, subroutineNesting = 0;
-
-   if (dbg) {
-      printf("Optimize: Begin remove extra moves\n");
-      _mesa_print_program(prog);
-   }
-
-   removeInst = (GLboolean *)
-      calloc(1, prog->NumInstructions * sizeof(GLboolean));
-
-   /*
-    * Look for sequences such as this:
-    *    FOO tmpX, arg0, arg1;
-    *    MOV tmpY, tmpX;
-    * and convert into:
-    *    FOO tmpY, arg0, arg1;
-    */
-
-   for (i = 0; i < prog->NumInstructions; i++) {
-      const struct prog_instruction *inst = prog->Instructions + i;
-
-      switch (inst->Opcode) {
-      case OPCODE_BGNLOOP:
-         loopNesting++;
-         break;
-      case OPCODE_ENDLOOP:
-         loopNesting--;
-         break;
-      case OPCODE_BGNSUB:
-         subroutineNesting++;
-         break;
-      case OPCODE_ENDSUB:
-         subroutineNesting--;
-         break;
-      case OPCODE_MOV:
-         if (i > 0 &&
-             loopNesting == 0 &&
-             subroutineNesting == 0 &&
-             inst->SrcReg[0].File == PROGRAM_TEMPORARY &&
-             inst->SrcReg[0].Swizzle == SWIZZLE_XYZW) {
-            /* see if this MOV can be removed */
-            const GLuint tempIndex = inst->SrcReg[0].Index;
-            struct prog_instruction *prevInst;
-            GLuint prevI;
-
-            /* get pointer to previous instruction */
-            prevI = i - 1;
-            while (prevI > 0 && removeInst[prevI])
-               prevI--;
-            prevInst = prog->Instructions + prevI;
-
-            if (prevInst->DstReg.File == PROGRAM_TEMPORARY &&
-                prevInst->DstReg.Index == tempIndex &&
-                prevInst->DstReg.WriteMask == WRITEMASK_XYZW) {
-
-               enum temp_use next_use =
-                  find_next_temp_use(prog, i + 1, tempIndex);
-
-               if (next_use == WRITE || next_use == END) {
-                  /* OK, we can safely remove this MOV instruction.
-                   * Transform:
-                   *   prevI: FOO tempIndex, x, y;
-                   *       i: MOV z, tempIndex;
-                   * Into:
-                   *   prevI: FOO z, x, y;
-                   */
-
-                  /* patch up prev inst */
-                  prevInst->DstReg.File = inst->DstReg.File;
-                  prevInst->DstReg.Index = inst->DstReg.Index;
-
-                  /* flag this instruction for removal */
-                  removeInst[i] = GL_TRUE;
-
-                  if (dbg) {
-                     printf("Remove MOV at %u\n", i);
-                     printf("new prev inst %u: ", prevI);
-                     _mesa_print_instruction(prevInst);
-                  }
-               }
-            }
-         }
-         break;
-      default:
-         ; /* nothing */
-      }
-   }
-
-   /* now remove the instructions which aren't needed */
-   rem = remove_instructions(prog, removeInst);
-
-   free(removeInst);
-
-   if (dbg) {
-      printf("Optimize: End remove extra moves.  %u instructions removed\n", rem);
-      /*_mesa_print_program(prog);*/
-   }
-}
-
-
-/** A live register interval */
-struct interval
-{
-   GLuint Reg;         /** The temporary register index */
-   GLuint Start, End;  /** Start/end instruction numbers */
-};
-
-
-/** A list of register intervals */
-struct interval_list
-{
-   GLuint Num;
-   struct interval Intervals[MAX_PROGRAM_TEMPS];
-};
-
-
-static void
-append_interval(struct interval_list *list, const struct interval *inv)
-{
-   list->Intervals[list->Num++] = *inv;
-}
-
-
-/** Insert interval inv into list, sorted by interval end */
-static void
-insert_interval_by_end(struct interval_list *list, const struct interval *inv)
-{
-   /* XXX we could do a binary search insertion here since list is sorted */
-   GLint i = list->Num - 1;
-   while (i >= 0 && list->Intervals[i].End > inv->End) {
-      list->Intervals[i + 1] = list->Intervals[i];
-      i--;
-   }
-   list->Intervals[i + 1] = *inv;
-   list->Num++;
-
-#ifdef DEBUG
-   {
-      GLuint i;
-      for (i = 0; i + 1 < list->Num; i++) {
-         ASSERT(list->Intervals[i].End <= list->Intervals[i + 1].End);
-      }
-   }
-#endif
-}
-
-
-/** Remove the given interval from the interval list */
-static void
-remove_interval(struct interval_list *list, const struct interval *inv)
-{
-   /* XXX we could binary search since list is sorted */
-   GLuint k;
-   for (k = 0; k < list->Num; k++) {
-      if (list->Intervals[k].Reg == inv->Reg) {
-         /* found, remove it */
-         ASSERT(list->Intervals[k].Start == inv->Start);
-         ASSERT(list->Intervals[k].End == inv->End);
-         while (k < list->Num - 1) {
-            list->Intervals[k] = list->Intervals[k + 1];
-            k++;
-         }
-         list->Num--;
-         return;
-      }
-   }
-}
-
-
-/** called by qsort() */
-static int
-compare_start(const void *a, const void *b)
-{
-   const struct interval *ia = (const struct interval *) a;
-   const struct interval *ib = (const struct interval *) b;
-   if (ia->Start < ib->Start)
-      return -1;
-   else if (ia->Start > ib->Start)
-      return +1;
-   else
-      return 0;
-}
-
-/** sort the interval list according to interval starts */
-static void
-sort_interval_list_by_start(struct interval_list *list)
-{
-   qsort(list->Intervals, list->Num, sizeof(struct interval), compare_start);
-#ifdef DEBUG
-   {
-      GLuint i;
-      for (i = 0; i + 1 < list->Num; i++) {
-         ASSERT(list->Intervals[i].Start <= list->Intervals[i + 1].Start);
-      }
-   }
-#endif
-}
-
-
-/**
- * Update the intermediate interval info for register 'index' and
- * instruction 'ic'.
- */
-static void
-update_interval(GLint intBegin[], GLint intEnd[], GLuint index, GLuint ic)
-{
-   ASSERT(index < MAX_PROGRAM_TEMPS);
-   if (intBegin[index] == -1) {
-      ASSERT(intEnd[index] == -1);
-      intBegin[index] = intEnd[index] = ic;
-   }
-   else {
-      intEnd[index] = ic;
-   }
-}
-
-
-/**
- * Find first/last instruction that references each temporary register.
- */
-GLboolean
-_mesa_find_temp_intervals(const struct prog_instruction *instructions,
-                          GLuint numInstructions,
-                          GLint intBegin[MAX_PROGRAM_TEMPS],
-                          GLint intEnd[MAX_PROGRAM_TEMPS])
-{
-   struct loop_info
-   {
-      GLuint Start, End;  /**< Start, end instructions of loop */
-   };
-   struct loop_info loopStack[MAX_LOOP_NESTING];
-   GLuint loopStackDepth = 0;
-   GLuint i;
-
-   for (i = 0; i < MAX_PROGRAM_TEMPS; i++){
-      intBegin[i] = intEnd[i] = -1;
-   }
-
-   /* Scan instructions looking for temporary registers */
-   for (i = 0; i < numInstructions; i++) {
-      const struct prog_instruction *inst = instructions + i;
-      if (inst->Opcode == OPCODE_BGNLOOP) {
-         loopStack[loopStackDepth].Start = i;
-         loopStack[loopStackDepth].End = inst->BranchTarget;
-         loopStackDepth++;
-      }
-      else if (inst->Opcode == OPCODE_ENDLOOP) {
-         loopStackDepth--;
-      }
-      else if (inst->Opcode == OPCODE_CAL) {
-         return GL_FALSE;
-      }
-      else {
-         const GLuint numSrc = 3;/*_mesa_num_inst_src_regs(inst->Opcode);*/
-         GLuint j;
-         for (j = 0; j < numSrc; j++) {
-            if (inst->SrcReg[j].File == PROGRAM_TEMPORARY) {
-               const GLuint index = inst->SrcReg[j].Index;
-               if (inst->SrcReg[j].RelAddr)
-                  return GL_FALSE;
-               update_interval(intBegin, intEnd, index, i);
-               if (loopStackDepth > 0) {
-                  /* extend temp register's interval to end of loop */
-                  GLuint loopEnd = loopStack[loopStackDepth - 1].End;
-                  update_interval(intBegin, intEnd, index, loopEnd);
-               }
-            }
-         }
-         if (inst->DstReg.File == PROGRAM_TEMPORARY) {
-            const GLuint index = inst->DstReg.Index;
-            if (inst->DstReg.RelAddr)
-               return GL_FALSE;
-            update_interval(intBegin, intEnd, index, i);
-            if (loopStackDepth > 0) {
-               /* extend temp register's interval to end of loop */
-               GLuint loopEnd = loopStack[loopStackDepth - 1].End;
-               update_interval(intBegin, intEnd, index, loopEnd);
-            }
-         }
-      }
-   }
-
-   return GL_TRUE;
-}
-
-
-/**
- * Find the live intervals for each temporary register in the program.
- * For register R, the interval [A,B] indicates that R is referenced
- * from instruction A through instruction B.
- * Special consideration is needed for loops and subroutines.
- * \return GL_TRUE if success, GL_FALSE if we cannot proceed for some reason
- */
-static GLboolean
-find_live_intervals(struct gl_program *prog,
-                    struct interval_list *liveIntervals)
-{
-   GLint intBegin[MAX_PROGRAM_TEMPS], intEnd[MAX_PROGRAM_TEMPS];
-   GLuint i;
-
-   /*
-    * Note: we'll return GL_FALSE below if we find relative indexing
-    * into the TEMP register file.  We can't handle that yet.
-    * We also give up on subroutines for now.
-    */
-
-   if (dbg) {
-      printf("Optimize: Begin find intervals\n");
-   }
-
-   /* build intermediate arrays */
-   if (!_mesa_find_temp_intervals(prog->Instructions, prog->NumInstructions,
-                                  intBegin, intEnd))
-      return GL_FALSE;
-
-   /* Build live intervals list from intermediate arrays */
-   liveIntervals->Num = 0;
-   for (i = 0; i < MAX_PROGRAM_TEMPS; i++) {
-      if (intBegin[i] >= 0) {
-         struct interval inv;
-         inv.Reg = i;
-         inv.Start = intBegin[i];
-         inv.End = intEnd[i];
-         append_interval(liveIntervals, &inv);
-      }
-   }
-
-   /* Sort the list according to interval starts */
-   sort_interval_list_by_start(liveIntervals);
-
-   if (dbg) {
-      /* print interval info */
-      for (i = 0; i < liveIntervals->Num; i++) {
-         const struct interval *inv = liveIntervals->Intervals + i;
-         printf("Reg[%d] live [%d, %d]:",
-                      inv->Reg, inv->Start, inv->End);
-         if (1) {
-            GLuint j;
-            for (j = 0; j < inv->Start; j++)
-               printf(" ");
-            for (j = inv->Start; j <= inv->End; j++)
-               printf("x");
-         }
-         printf("\n");
-      }
-   }
-
-   return GL_TRUE;
-}
-
-
-/** Scan the array of used register flags to find free entry */
-static GLint
-alloc_register(GLboolean usedRegs[MAX_PROGRAM_TEMPS])
-{
-   GLuint k;
-   for (k = 0; k < MAX_PROGRAM_TEMPS; k++) {
-      if (!usedRegs[k]) {
-         usedRegs[k] = GL_TRUE;
-         return k;
-      }
-   }
-   return -1;
-}
-
-
-/**
- * This function implements "Linear Scan Register Allocation" to reduce
- * the number of temporary registers used by the program.
- *
- * We compute the "live interval" for all temporary registers then
- * examine the overlap of the intervals to allocate new registers.
- * Basically, if two intervals do not overlap, they can use the same register.
- */
-static void
-_mesa_reallocate_registers(struct gl_program *prog)
-{
-   struct interval_list liveIntervals;
-   GLint registerMap[MAX_PROGRAM_TEMPS];
-   GLboolean usedRegs[MAX_PROGRAM_TEMPS];
-   GLuint i;
-   GLint maxTemp = -1;
-
-   if (dbg) {
-      printf("Optimize: Begin live-interval register reallocation\n");
-      _mesa_print_program(prog);
-   }
-
-   for (i = 0; i < MAX_PROGRAM_TEMPS; i++){
-      registerMap[i] = -1;
-      usedRegs[i] = GL_FALSE;
-   }
-
-   if (!find_live_intervals(prog, &liveIntervals)) {
-      if (dbg)
-         printf("Aborting register reallocation\n");
-      return;
-   }
-
-   {
-      struct interval_list activeIntervals;
-      activeIntervals.Num = 0;
-
-      /* loop over live intervals, allocating a new register for each */
-      for (i = 0; i < liveIntervals.Num; i++) {
-         const struct interval *live = liveIntervals.Intervals + i;
-
-         if (dbg)
-            printf("Consider register %u\n", live->Reg);
-
-         /* Expire old intervals.  Intervals which have ended with respect
-          * to the live interval can have their remapped registers freed.
-          */
-         {
-            GLint j;
-            for (j = 0; j < (GLint) activeIntervals.Num; j++) {
-               const struct interval *inv = activeIntervals.Intervals + j;
-               if (inv->End >= live->Start) {
-                  /* Stop now.  Since the activeInterval list is sorted
-                   * we know we don't have to go further.
-                   */
-                  break;
-               }
-               else {
-                  /* Interval 'inv' has expired */
-                  const GLint regNew = registerMap[inv->Reg];
-                  ASSERT(regNew >= 0);
-
-                  if (dbg)
-                     printf("  expire interval for reg %u\n", inv->Reg);
-
-                  /* remove interval j from active list */
-                  remove_interval(&activeIntervals, inv);
-                  j--;  /* counter-act j++ in for-loop above */
-
-                  /* return register regNew to the free pool */
-                  if (dbg)
-                     printf("  free reg %d\n", regNew);
-                  ASSERT(usedRegs[regNew] == GL_TRUE);
-                  usedRegs[regNew] = GL_FALSE;
-               }
-            }
-         }
-
-         /* find a free register for this live interval */
-         {
-            const GLint k = alloc_register(usedRegs);
-            if (k < 0) {
-               /* out of registers, give up */
-               return;
-            }
-            registerMap[live->Reg] = k;
-            maxTemp = MAX2(maxTemp, k);
-            if (dbg)
-               printf("  remap register %u -> %d\n", live->Reg, k);
-         }
-
-         /* Insert this live interval into the active list which is sorted
-          * by increasing end points.
-          */
-         insert_interval_by_end(&activeIntervals, live);
-      }
-   }
-
-   if (maxTemp + 1 < (GLint) liveIntervals.Num) {
-      /* OK, we've reduced the number of registers needed.
-       * Scan the program and replace all the old temporary register
-       * indexes with the new indexes.
-       */
-      replace_regs(prog, PROGRAM_TEMPORARY, registerMap);
-
-      prog->NumTemporaries = maxTemp + 1;
-   }
-
-   if (dbg) {
-      printf("Optimize: End live-interval register reallocation\n");
-      printf("Num temp regs before: %u  after: %u\n",
-                   liveIntervals.Num, maxTemp + 1);
-      _mesa_print_program(prog);
-   }
-}
-
-
-/**
- * Apply optimizations to the given program to eliminate unnecessary
- * instructions, temp regs, etc.
- */
-void
-_mesa_optimize_program(GLcontext *ctx, struct gl_program *program)
-{
-   _mesa_remove_extra_move_use(program);
-
-   if (1)
-      _mesa_remove_dead_code(program);
-
-   if (0) /* not tested much yet */
-      _mesa_remove_extra_moves(program);
-
-   if (0)
-      _mesa_consolidate_registers(program);
-   else
-      _mesa_reallocate_registers(program);
-}
diff --git a/mesalib/src/mesa/shader/prog_optimize.h b/mesalib/src/mesa/shader/prog_optimize.h
deleted file mode 100644
index 43894a272..000000000
--- a/mesalib/src/mesa/shader/prog_optimize.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.5
- *
- * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, 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
- * VMWARE BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef PROG_OPT_H
-#define PROG_OPT_H
-
-
-#include "main/config.h"
-
-
-struct gl_program;
-struct prog_instruction;
-
-
-extern GLboolean
-_mesa_find_temp_intervals(const struct prog_instruction *instructions,
-                          GLuint numInstructions,
-                          GLint intBegin[MAX_PROGRAM_TEMPS],
-                          GLint intEnd[MAX_PROGRAM_TEMPS]);
-
-extern void
-_mesa_optimize_program(GLcontext *ctx, struct gl_program *program);
-
-#endif
diff --git a/mesalib/src/mesa/shader/prog_parameter.c b/mesalib/src/mesa/shader/prog_parameter.c
deleted file mode 100644
index 25bb4f3d4..000000000
--- a/mesalib/src/mesa/shader/prog_parameter.c
+++ /dev/null
@@ -1,750 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.3
- *
- * Copyright (C) 1999-2008  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 prog_parameter.c
- * Program parameter lists and functions.
- * \author Brian Paul
- */
-
-
-#include "main/glheader.h"
-#include "main/imports.h"
-#include "main/macros.h"
-#include "prog_instruction.h"
-#include "prog_parameter.h"
-#include "prog_statevars.h"
-
-
-struct gl_program_parameter_list *
-_mesa_new_parameter_list(void)
-{
-   return CALLOC_STRUCT(gl_program_parameter_list);
-}
-
-
-struct gl_program_parameter_list *
-_mesa_new_parameter_list_sized(unsigned size)
-{
-   struct gl_program_parameter_list *p = _mesa_new_parameter_list();
-
-   if ((p != NULL) && (size != 0)) {
-      p->Size = size;
-
-      /* alloc arrays */
-      p->Parameters = (struct gl_program_parameter *)
-	 calloc(1, size * sizeof(struct gl_program_parameter));
-
-      p->ParameterValues = (GLfloat (*)[4])
-         _mesa_align_malloc(size * 4 *sizeof(GLfloat), 16);
-
-
-      if ((p->Parameters == NULL) || (p->ParameterValues == NULL)) {
-	 free(p->Parameters);
-	 _mesa_align_free(p->ParameterValues);
-	 free(p);
-	 p = NULL;
-      }
-   }
-
-   return p;
-}
-
-
-/**
- * Free a parameter list and all its parameters
- */
-void
-_mesa_free_parameter_list(struct gl_program_parameter_list *paramList)
-{
-   GLuint i;
-   for (i = 0; i < paramList->NumParameters; i++) {
-      if (paramList->Parameters[i].Name)
-	 free((void *) paramList->Parameters[i].Name);
-   }
-   free(paramList->Parameters);
-   if (paramList->ParameterValues)
-      _mesa_align_free(paramList->ParameterValues);
-   free(paramList);
-}
-
-
-/**
- * Add a new parameter to a parameter list.
- * Note that parameter values are usually 4-element GLfloat vectors.
- * When size > 4 we'll allocate a sequential block of parameters to
- * store all the values (in blocks of 4).
- *
- * \param paramList  the list to add the parameter to
- * \param type  type of parameter, such as 
- * \param name  the parameter name, will be duplicated/copied!
- * \param size  number of elements in 'values' vector (1..4, or more)
- * \param datatype  GL_FLOAT, GL_FLOAT_VECx, GL_INT, GL_INT_VECx or GL_NONE.
- * \param values  initial parameter value, up to 4 GLfloats, or NULL
- * \param state  state indexes, or NULL
- * \return  index of new parameter in the list, or -1 if error (out of mem)
- */
-GLint
-_mesa_add_parameter(struct gl_program_parameter_list *paramList,
-                    gl_register_file type, const char *name,
-                    GLuint size, GLenum datatype, const GLfloat *values,
-                    const gl_state_index state[STATE_LENGTH],
-                    GLbitfield flags)
-{
-   const GLuint oldNum = paramList->NumParameters;
-   const GLuint sz4 = (size + 3) / 4; /* no. of new param slots needed */
-
-   assert(size > 0);
-
-   if (oldNum + sz4 > paramList->Size) {
-      /* Need to grow the parameter list array (alloc some extra) */
-      paramList->Size = paramList->Size + 4 * sz4;
-
-      /* realloc arrays */
-      paramList->Parameters = (struct gl_program_parameter *)
-	 _mesa_realloc(paramList->Parameters,
-		       oldNum * sizeof(struct gl_program_parameter),
-		       paramList->Size * sizeof(struct gl_program_parameter));
-
-      paramList->ParameterValues = (GLfloat (*)[4])
-         _mesa_align_realloc(paramList->ParameterValues,         /* old buf */
-                             oldNum * 4 * sizeof(GLfloat),      /* old size */
-                             paramList->Size * 4 *sizeof(GLfloat), /* new sz */
-                             16);
-   }
-
-   if (!paramList->Parameters ||
-       !paramList->ParameterValues) {
-      /* out of memory */
-      paramList->NumParameters = 0;
-      paramList->Size = 0;
-      return -1;
-   }
-   else {
-      GLuint i;
-
-      paramList->NumParameters = oldNum + sz4;
-
-      memset(&paramList->Parameters[oldNum], 0,
-             sz4 * sizeof(struct gl_program_parameter));
-
-      for (i = 0; i < sz4; i++) {
-         struct gl_program_parameter *p = paramList->Parameters + oldNum + i;
-         p->Name = name ? _mesa_strdup(name) : NULL;
-         p->Type = type;
-         p->Size = size;
-         p->DataType = datatype;
-         p->Flags = flags;
-         if (values) {
-            COPY_4V(paramList->ParameterValues[oldNum + i], values);
-            values += 4;
-            p->Initialized = GL_TRUE;
-         }
-         else {
-            /* silence valgrind */
-            ASSIGN_4V(paramList->ParameterValues[oldNum + i], 0, 0, 0, 0);
-         }
-         size -= 4;
-      }
-
-      if (state) {
-         for (i = 0; i < STATE_LENGTH; i++)
-            paramList->Parameters[oldNum].StateIndexes[i] = state[i];
-      }
-
-      return (GLint) oldNum;
-   }
-}
-
-
-/**
- * Add a new named program parameter (Ex: NV_fragment_program DEFINE statement)
- * \return index of the new entry in the parameter list
- */
-GLint
-_mesa_add_named_parameter(struct gl_program_parameter_list *paramList,
-                          const char *name, const GLfloat values[4])
-{
-   return _mesa_add_parameter(paramList, PROGRAM_NAMED_PARAM, name,
-                              4, GL_NONE, values, NULL, 0x0);
-                              
-}
-
-
-/**
- * Add a new named constant to the parameter list.
- * This will be used when the program contains something like this:
- *    PARAM myVals = { 0, 1, 2, 3 };
- *
- * \param paramList  the parameter list
- * \param name  the name for the constant
- * \param values  four float values
- * \return index/position of the new parameter in the parameter list
- */
-GLint
-_mesa_add_named_constant(struct gl_program_parameter_list *paramList,
-                         const char *name, const GLfloat values[4],
-                         GLuint size)
-{
-   /* first check if this is a duplicate constant */
-   GLint pos;
-   for (pos = 0; pos < (GLint)paramList->NumParameters; pos++) {
-      const GLfloat *pvals = paramList->ParameterValues[pos];
-      if (pvals[0] == values[0] &&
-          pvals[1] == values[1] &&
-          pvals[2] == values[2] &&
-          pvals[3] == values[3] &&
-          strcmp(paramList->Parameters[pos].Name, name) == 0) {
-         /* Same name and value is already in the param list - reuse it */
-         return pos;
-      }
-   }
-   /* not found, add new parameter */
-   return _mesa_add_parameter(paramList, PROGRAM_CONSTANT, name,
-                              size, GL_NONE, values, NULL, 0x0);
-}
-
-
-/**
- * Add a new unnamed constant to the parameter list.  This will be used
- * when a fragment/vertex program contains something like this:
- *    MOV r, { 0, 1, 2, 3 };
- * If swizzleOut is non-null we'll search the parameter list for an
- * existing instance of the constant which matches with a swizzle.
- *
- * \param paramList  the parameter list
- * \param values  four float values
- * \param swizzleOut  returns swizzle mask for accessing the constant
- * \return index/position of the new parameter in the parameter list.
- */
-GLint
-_mesa_add_unnamed_constant(struct gl_program_parameter_list *paramList,
-                           const GLfloat values[4], GLuint size,
-                           GLuint *swizzleOut)
-{
-   GLint pos;
-   ASSERT(size >= 1);
-   ASSERT(size <= 4);
-
-   if (swizzleOut &&
-       _mesa_lookup_parameter_constant(paramList, values,
-                                       size, &pos, swizzleOut)) {
-      return pos;
-   }
-
-   /* Look for empty space in an already unnamed constant parameter
-    * to add this constant.  This will only work for single-element
-    * constants because we rely on smearing (i.e. .yyyy or .zzzz).
-    */
-   if (size == 1 && swizzleOut) {
-      for (pos = 0; pos < (GLint) paramList->NumParameters; pos++) {
-         struct gl_program_parameter *p = paramList->Parameters + pos;
-         if (p->Type == PROGRAM_CONSTANT && p->Size + size <= 4) {
-            /* ok, found room */
-            GLfloat *pVal = paramList->ParameterValues[pos];
-            GLuint swz = p->Size; /* 1, 2 or 3 for Y, Z, W */
-            pVal[p->Size] = values[0];
-            p->Size++;
-            *swizzleOut = MAKE_SWIZZLE4(swz, swz, swz, swz);
-            return pos;
-         }
-      }
-   }
-
-   /* add a new parameter to store this constant */
-   pos = _mesa_add_parameter(paramList, PROGRAM_CONSTANT, NULL,
-                             size, GL_NONE, values, NULL, 0x0);
-   if (pos >= 0 && swizzleOut) {
-      if (size == 1)
-         *swizzleOut = SWIZZLE_XXXX;
-      else
-         *swizzleOut = SWIZZLE_NOOP;
-   }
-   return pos;
-}
-
-
-/**
- * Add a uniform to the parameter list.
- * Note that if the uniform is an array, size may be greater than
- * what's implied by the datatype.
- * \param name  uniform's name
- * \param size  number of floats to allocate
- * \param datatype  GL_FLOAT_VEC3, GL_FLOAT_MAT4, etc.
- */
-GLint
-_mesa_add_uniform(struct gl_program_parameter_list *paramList,
-                  const char *name, GLuint size, GLenum datatype,
-                  const GLfloat *values)
-{
-   GLint i = _mesa_lookup_parameter_index(paramList, -1, name);
-   ASSERT(datatype != GL_NONE);
-   if (i >= 0 && paramList->Parameters[i].Type == PROGRAM_UNIFORM) {
-      ASSERT(paramList->Parameters[i].Size == size);
-      ASSERT(paramList->Parameters[i].DataType == datatype);
-      /* already in list */
-      return i;
-   }
-   else {
-      i = _mesa_add_parameter(paramList, PROGRAM_UNIFORM, name,
-                              size, datatype, values, NULL, 0x0);
-      return i;
-   }
-}
-
-
-/**
- * Mark the named uniform as 'used'.
- */
-void
-_mesa_use_uniform(struct gl_program_parameter_list *paramList,
-                  const char *name)
-{
-   GLuint i;
-   for (i = 0; i < paramList->NumParameters; i++) {
-      struct gl_program_parameter *p = paramList->Parameters + i;
-      if ((p->Type == PROGRAM_UNIFORM || p->Type == PROGRAM_SAMPLER) &&
-          strcmp(p->Name, name) == 0) {
-         p->Used = GL_TRUE;
-         /* Note that large uniforms may occupy several slots so we're
-          * not done searching yet.
-          */
-      }
-   }
-}
-
-
-/**
- * Add a sampler to the parameter list.
- * \param name  uniform's name
- * \param datatype  GL_SAMPLER_2D, GL_SAMPLER_2D_RECT_ARB, etc.
- * \param index  the sampler number (as seen in TEX instructions)
- * \return  sampler index (starting at zero) or -1 if error
- */
-GLint
-_mesa_add_sampler(struct gl_program_parameter_list *paramList,
-                  const char *name, GLenum datatype)
-{
-   GLint i = _mesa_lookup_parameter_index(paramList, -1, name);
-   if (i >= 0 && paramList->Parameters[i].Type == PROGRAM_SAMPLER) {
-      ASSERT(paramList->Parameters[i].Size == 1);
-      ASSERT(paramList->Parameters[i].DataType == datatype);
-      /* already in list */
-      return (GLint) paramList->ParameterValues[i][0];
-   }
-   else {
-      GLuint i;
-      const GLint size = 1; /* a sampler is basically a texture unit number */
-      GLfloat value[4];
-      GLint numSamplers = 0;
-      for (i = 0; i < paramList->NumParameters; i++) {
-         if (paramList->Parameters[i].Type == PROGRAM_SAMPLER)
-            numSamplers++;
-      }
-      value[0] = (GLfloat) numSamplers;
-      value[1] = value[2] = value[3] = 0.0F;
-      (void) _mesa_add_parameter(paramList, PROGRAM_SAMPLER, name,
-                                 size, datatype, value, NULL, 0x0);
-      return numSamplers;
-   }
-}
-
-
-/**
- * Add parameter representing a varying variable.
- */
-GLint
-_mesa_add_varying(struct gl_program_parameter_list *paramList,
-                  const char *name, GLuint size, GLbitfield flags)
-{
-   GLint i = _mesa_lookup_parameter_index(paramList, -1, name);
-   if (i >= 0 && paramList->Parameters[i].Type == PROGRAM_VARYING) {
-      /* already in list */
-      return i;
-   }
-   else {
-      /*assert(size == 4);*/
-      i = _mesa_add_parameter(paramList, PROGRAM_VARYING, name,
-                              size, GL_NONE, NULL, NULL, flags);
-      return i;
-   }
-}
-
-
-/**
- * Add parameter representing a vertex program attribute.
- * \param size  size of attribute (in floats), may be -1 if unknown
- * \param attrib  the attribute index, or -1 if unknown
- */
-GLint
-_mesa_add_attribute(struct gl_program_parameter_list *paramList,
-                    const char *name, GLint size, GLenum datatype, GLint attrib)
-{
-   GLint i = _mesa_lookup_parameter_index(paramList, -1, name);
-   if (i >= 0) {
-      /* replace */
-      if (attrib < 0)
-         attrib = i;
-      paramList->Parameters[i].StateIndexes[0] = attrib;
-   }
-   else {
-      /* add */
-      gl_state_index state[STATE_LENGTH];
-      state[0] = (gl_state_index) attrib;
-      if (size < 0)
-         size = 4;
-      i = _mesa_add_parameter(paramList, PROGRAM_INPUT, name,
-                              size, datatype, NULL, state, 0x0);
-   }
-   return i;
-}
-
-
-
-#if 0 /* not used yet */
-/**
- * Returns the number of 4-component registers needed to store a piece
- * of GL state.  For matrices this may be as many as 4 registers,
- * everything else needs
- * just 1 register.
- */
-static GLuint
-sizeof_state_reference(const GLint *stateTokens)
-{
-   if (stateTokens[0] == STATE_MATRIX) {
-      GLuint rows = stateTokens[4] - stateTokens[3] + 1;
-      assert(rows >= 1);
-      assert(rows <= 4);
-      return rows;
-   }
-   else {
-      return 1;
-   }
-}
-#endif
-
-
-/**
- * Add a new state reference to the parameter list.
- * This will be used when the program contains something like this:
- *    PARAM ambient = state.material.front.ambient;
- *
- * \param paramList  the parameter list
- * \param stateTokens  an array of 5 (STATE_LENGTH) state tokens
- * \return index of the new parameter.
- */
-GLint
-_mesa_add_state_reference(struct gl_program_parameter_list *paramList,
-                          const gl_state_index stateTokens[STATE_LENGTH])
-{
-   const GLuint size = 4; /* XXX fix */
-   char *name;
-   GLint index;
-
-   /* Check if the state reference is already in the list */
-   for (index = 0; index < (GLint) paramList->NumParameters; index++) {
-      GLuint i, match = 0;
-      for (i = 0; i < STATE_LENGTH; i++) {
-         if (paramList->Parameters[index].StateIndexes[i] == stateTokens[i]) {
-            match++;
-         }
-         else {
-            break;
-         }
-      }
-      if (match == STATE_LENGTH) {
-         /* this state reference is already in the parameter list */
-         return index;
-      }
-   }
-
-   name = _mesa_program_state_string(stateTokens);
-   index = _mesa_add_parameter(paramList, PROGRAM_STATE_VAR, name,
-                               size, GL_NONE,
-                               NULL, (gl_state_index *) stateTokens, 0x0);
-   paramList->StateFlags |= _mesa_program_state_flags(stateTokens);
-
-   /* free name string here since we duplicated it in add_parameter() */
-   free(name);
-
-   return index;
-}
-
-
-/**
- * Lookup a parameter value by name in the given parameter list.
- * \return pointer to the float[4] values.
- */
-GLfloat *
-_mesa_lookup_parameter_value(const struct gl_program_parameter_list *paramList,
-                             GLsizei nameLen, const char *name)
-{
-   GLint i = _mesa_lookup_parameter_index(paramList, nameLen, name);
-   if (i < 0)
-      return NULL;
-   else
-      return paramList->ParameterValues[i];
-}
-
-
-/**
- * Given a program parameter name, find its position in the list of parameters.
- * \param paramList  the parameter list to search
- * \param nameLen  length of name (in chars).
- *                 If length is negative, assume that name is null-terminated.
- * \param name  the name to search for
- * \return index of parameter in the list.
- */
-GLint
-_mesa_lookup_parameter_index(const struct gl_program_parameter_list *paramList,
-                             GLsizei nameLen, const char *name)
-{
-   GLint i;
-
-   if (!paramList)
-      return -1;
-
-   if (nameLen == -1) {
-      /* name is null-terminated */
-      for (i = 0; i < (GLint) paramList->NumParameters; i++) {
-         if (paramList->Parameters[i].Name &&
-	     strcmp(paramList->Parameters[i].Name, name) == 0)
-            return i;
-      }
-   }
-   else {
-      /* name is not null-terminated, use nameLen */
-      for (i = 0; i < (GLint) paramList->NumParameters; i++) {
-         if (paramList->Parameters[i].Name &&
-	     strncmp(paramList->Parameters[i].Name, name, nameLen) == 0
-             && strlen(paramList->Parameters[i].Name) == (size_t)nameLen)
-            return i;
-      }
-   }
-   return -1;
-}
-
-
-/**
- * Look for a float vector in the given parameter list.  The float vector
- * may be of length 1, 2, 3 or 4.  If swizzleOut is non-null, we'll try
- * swizzling to find a match.
- * \param list  the parameter list to search
- * \param v  the float vector to search for
- * \param vSize  number of element in v
- * \param posOut  returns the position of the constant, if found
- * \param swizzleOut  returns a swizzle mask describing location of the
- *                    vector elements if found.
- * \return GL_TRUE if found, GL_FALSE if not found
- */
-GLboolean
-_mesa_lookup_parameter_constant(const struct gl_program_parameter_list *list,
-                                const GLfloat v[], GLuint vSize,
-                                GLint *posOut, GLuint *swizzleOut)
-{
-   GLuint i;
-
-   assert(vSize >= 1);
-   assert(vSize <= 4);
-
-   if (!list)
-      return -1;
-
-   for (i = 0; i < list->NumParameters; i++) {
-      if (list->Parameters[i].Type == PROGRAM_CONSTANT) {
-         if (!swizzleOut) {
-            /* swizzle not allowed */
-            GLuint j, match = 0;
-            for (j = 0; j < vSize; j++) {
-               if (v[j] == list->ParameterValues[i][j])
-                  match++;
-            }
-            if (match == vSize) {
-               *posOut = i;
-               return GL_TRUE;
-            }
-         }
-         else {
-            /* try matching w/ swizzle */
-             if (vSize == 1) {
-                /* look for v[0] anywhere within float[4] value */
-                GLuint j;
-                for (j = 0; j < 4; j++) {
-                   if (list->ParameterValues[i][j] == v[0]) {
-                      /* found it */
-                      *posOut = i;
-                      *swizzleOut = MAKE_SWIZZLE4(j, j, j, j);
-                      return GL_TRUE;
-                   }
-                }
-             }
-             else if (vSize <= list->Parameters[i].Size) {
-                /* see if we can match this constant (with a swizzle) */
-                GLuint swz[4];
-                GLuint match = 0, j, k;
-                for (j = 0; j < vSize; j++) {
-                   if (v[j] == list->ParameterValues[i][j]) {
-                      swz[j] = j;
-                      match++;
-                   }
-                   else {
-                      for (k = 0; k < list->Parameters[i].Size; k++) {
-                         if (v[j] == list->ParameterValues[i][k]) {
-                            swz[j] = k;
-                            match++;
-                            break;
-                         }
-                      }
-                   }
-                }
-                /* smear last value to remaining positions */
-                for (; j < 4; j++)
-                   swz[j] = swz[j-1];
-
-                if (match == vSize) {
-                   *posOut = i;
-                   *swizzleOut = MAKE_SWIZZLE4(swz[0], swz[1], swz[2], swz[3]);
-                   return GL_TRUE;
-                }
-             }
-         }
-      }
-   }
-
-   *posOut = -1;
-   return GL_FALSE;
-}
-
-
-struct gl_program_parameter_list *
-_mesa_clone_parameter_list(const struct gl_program_parameter_list *list)
-{
-   struct gl_program_parameter_list *clone;
-   GLuint i;
-
-   clone = _mesa_new_parameter_list();
-   if (!clone)
-      return NULL;
-
-   /** Not too efficient, but correct */
-   for (i = 0; i < list->NumParameters; i++) {
-      struct gl_program_parameter *p = list->Parameters + i;
-      struct gl_program_parameter *pCopy;
-      GLuint size = MIN2(p->Size, 4);
-      GLint j = _mesa_add_parameter(clone, p->Type, p->Name, size, p->DataType,
-                                    list->ParameterValues[i], NULL, 0x0);
-      ASSERT(j >= 0);
-      pCopy = clone->Parameters + j;
-      pCopy->Used = p->Used;
-      pCopy->Flags = p->Flags;
-      /* copy state indexes */
-      if (p->Type == PROGRAM_STATE_VAR) {
-         GLint k;
-         for (k = 0; k < STATE_LENGTH; k++) {
-            pCopy->StateIndexes[k] = p->StateIndexes[k];
-         }
-      }
-      else {
-         clone->Parameters[j].Size = p->Size;
-      }
-      
-   }
-
-   clone->StateFlags = list->StateFlags;
-
-   return clone;
-}
-
-
-/**
- * Return a new parameter list which is listA + listB.
- */
-struct gl_program_parameter_list *
-_mesa_combine_parameter_lists(const struct gl_program_parameter_list *listA,
-                              const struct gl_program_parameter_list *listB)
-{
-   struct gl_program_parameter_list *list;
-
-   if (listA) {
-      list = _mesa_clone_parameter_list(listA);
-      if (list && listB) {
-         GLuint i;
-         for (i = 0; i < listB->NumParameters; i++) {
-            struct gl_program_parameter *param = listB->Parameters + i;
-            _mesa_add_parameter(list, param->Type, param->Name, param->Size,
-                                param->DataType,
-                                listB->ParameterValues[i],
-                                param->StateIndexes,
-                                param->Flags);
-         }
-      }
-   }
-   else if (listB) {
-      list = _mesa_clone_parameter_list(listB);
-   }
-   else {
-      list = NULL;
-   }
-   return list;
-}
-
-
-
-/**
- * Find longest name of all uniform parameters in list.
- */
-GLuint
-_mesa_longest_parameter_name(const struct gl_program_parameter_list *list,
-                             gl_register_file type)
-{
-   GLuint i, maxLen = 0;
-   if (!list)
-      return 0;
-   for (i = 0; i < list->NumParameters; i++) {
-      if (list->Parameters[i].Type == type) {
-         GLuint len = strlen(list->Parameters[i].Name);
-         if (len > maxLen)
-            maxLen = len;
-      }
-   }
-   return maxLen;
-}
-
-
-/**
- * Count the number of parameters in the last that match the given type.
- */
-GLuint
-_mesa_num_parameters_of_type(const struct gl_program_parameter_list *list,
-                             gl_register_file type)
-{
-   GLuint i, count = 0;
-   if (list) {
-      for (i = 0; i < list->NumParameters; i++) {
-         if (list->Parameters[i].Type == type)
-            count++;
-      }
-   }
-   return count;
-}
diff --git a/mesalib/src/mesa/shader/prog_parameter.h b/mesalib/src/mesa/shader/prog_parameter.h
deleted file mode 100644
index 1111c8597..000000000
--- a/mesalib/src/mesa/shader/prog_parameter.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.3
- *
- * Copyright (C) 1999-2008  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 prog_parameter.c
- * Program parameter lists and functions.
- * \author Brian Paul
- */
-
-#ifndef PROG_PARAMETER_H
-#define PROG_PARAMETER_H
-
-#include "main/mtypes.h"
-#include "prog_statevars.h"
-
-
-/**
- * Program parameter flags
- */
-/*@{*/
-#define PROG_PARAM_BIT_CENTROID   0x1  /**< for varying vars (GLSL 1.20) */
-#define PROG_PARAM_BIT_INVARIANT  0x2  /**< for varying vars (GLSL 1.20) */
-#define PROG_PARAM_BIT_FLAT       0x4  /**< for varying vars (GLSL 1.30) */
-#define PROG_PARAM_BIT_LINEAR     0x8  /**< for varying vars (GLSL 1.30) */
-#define PROG_PARAM_BIT_CYL_WRAP  0x10  /**< XXX gallium debug */
-/*@}*/
-
-
-
-/**
- * Program parameter.
- * Used by shaders/programs for uniforms, constants, varying vars, etc.
- */
-struct gl_program_parameter
-{
-   const char *Name;        /**< Null-terminated string */
-   gl_register_file Type;   /**< PROGRAM_NAMED_PARAM, CONSTANT or STATE_VAR */
-   GLenum DataType;         /**< GL_FLOAT, GL_FLOAT_VEC2, etc */
-   /**
-    * Number of components (1..4), or more.
-    * If the number of components is greater than 4,
-    * this parameter is part of a larger uniform like a GLSL matrix or array.
-    * The next program parameter's Size will be Size-4 of this parameter.
-    */
-   GLuint Size;
-   GLboolean Used;          /**< Helper flag for GLSL uniform tracking */
-   GLboolean Initialized;   /**< Has the ParameterValue[] been set? */
-   GLbitfield Flags;        /**< Bitmask of PROG_PARAM_*_BIT */
-   /**
-    * A sequence of STATE_* tokens and integers to identify GL state.
-    */
-   gl_state_index StateIndexes[STATE_LENGTH];
-};
-
-
-/**
- * List of gl_program_parameter instances.
- */
-struct gl_program_parameter_list
-{
-   GLuint Size;           /**< allocated size of Parameters, ParameterValues */
-   GLuint NumParameters;  /**< number of parameters in arrays */
-   struct gl_program_parameter *Parameters; /**< Array [Size] */
-   GLfloat (*ParameterValues)[4];        /**< Array [Size] of GLfloat[4] */
-   GLbitfield StateFlags; /**< _NEW_* flags indicating which state changes
-                               might invalidate ParameterValues[] */
-};
-
-
-extern struct gl_program_parameter_list *
-_mesa_new_parameter_list(void);
-
-extern struct gl_program_parameter_list *
-_mesa_new_parameter_list_sized(unsigned size);
-
-extern void
-_mesa_free_parameter_list(struct gl_program_parameter_list *paramList);
-
-extern struct gl_program_parameter_list *
-_mesa_clone_parameter_list(const struct gl_program_parameter_list *list);
-
-extern struct gl_program_parameter_list *
-_mesa_combine_parameter_lists(const struct gl_program_parameter_list *a,
-                              const struct gl_program_parameter_list *b);
-
-static INLINE GLuint
-_mesa_num_parameters(const struct gl_program_parameter_list *list)
-{
-   return list ? list->NumParameters : 0;
-}
-
-extern GLint
-_mesa_add_parameter(struct gl_program_parameter_list *paramList,
-                    gl_register_file type, const char *name,
-                    GLuint size, GLenum datatype, const GLfloat *values,
-                    const gl_state_index state[STATE_LENGTH],
-                    GLbitfield flags);
-
-extern GLint
-_mesa_add_named_parameter(struct gl_program_parameter_list *paramList,
-                          const char *name, const GLfloat values[4]);
-
-extern GLint
-_mesa_add_named_constant(struct gl_program_parameter_list *paramList,
-                         const char *name, const GLfloat values[4],
-                         GLuint size);
-
-extern GLint
-_mesa_add_unnamed_constant(struct gl_program_parameter_list *paramList,
-                           const GLfloat values[4], GLuint size,
-                           GLuint *swizzleOut);
-
-extern GLint
-_mesa_add_uniform(struct gl_program_parameter_list *paramList,
-                  const char *name, GLuint size, GLenum datatype,
-                  const GLfloat *values);
-
-extern void
-_mesa_use_uniform(struct gl_program_parameter_list *paramList,
-                  const char *name);
-
-extern GLint
-_mesa_add_sampler(struct gl_program_parameter_list *paramList,
-                  const char *name, GLenum datatype);
-
-extern GLint
-_mesa_add_varying(struct gl_program_parameter_list *paramList,
-                  const char *name, GLuint size, GLbitfield flags);
-
-extern GLint
-_mesa_add_attribute(struct gl_program_parameter_list *paramList,
-                    const char *name, GLint size, GLenum datatype, GLint attrib);
-
-extern GLint
-_mesa_add_state_reference(struct gl_program_parameter_list *paramList,
-                          const gl_state_index stateTokens[STATE_LENGTH]);
-
-extern GLfloat *
-_mesa_lookup_parameter_value(const struct gl_program_parameter_list *paramList,
-                             GLsizei nameLen, const char *name);
-
-extern GLint
-_mesa_lookup_parameter_index(const struct gl_program_parameter_list *paramList,
-                             GLsizei nameLen, const char *name);
-
-extern GLboolean
-_mesa_lookup_parameter_constant(const struct gl_program_parameter_list *list,
-                                const GLfloat v[], GLuint vSize,
-                                GLint *posOut, GLuint *swizzleOut);
-
-extern GLuint
-_mesa_longest_parameter_name(const struct gl_program_parameter_list *list,
-                             gl_register_file type);
-
-extern GLuint
-_mesa_num_parameters_of_type(const struct gl_program_parameter_list *list,
-                             gl_register_file type);
-
-
-#endif /* PROG_PARAMETER_H */
diff --git a/mesalib/src/mesa/shader/prog_parameter_layout.c b/mesalib/src/mesa/shader/prog_parameter_layout.c
deleted file mode 100644
index a88857383..000000000
--- a/mesalib/src/mesa/shader/prog_parameter_layout.c
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * 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.
- */
-
-/**
- * \file prog_parameter_layout.c
- * \brief Helper functions to layout storage for program parameters
- *
- * \author Ian Romanick <ian.d.romanick@intel.com>
- */
-
-#include "main/mtypes.h"
-#include "prog_parameter.h"
-#include "prog_parameter_layout.h"
-#include "prog_instruction.h"
-#include "program_parser.h"
-
-unsigned
-_mesa_combine_swizzles(unsigned base, unsigned applied)
-{
-   unsigned swiz = 0;
-   unsigned i;
-
-   for (i = 0; i < 4; i++) {
-      const unsigned s = GET_SWZ(applied, i);
-
-      swiz |= ((s <= SWIZZLE_W) ? GET_SWZ(base, s) : s) << (i * 3);
-   }
-
-   return swiz;
-}
-
-
-/**
- * Copy indirect access array from one parameter list to another
- *
- * \param src   Parameter array copied from
- * \param dst   Parameter array copied to
- * \param first Index of first element in \c src to copy
- * \param count Number of elements to copy
- *
- * \return
- * The location in \c dst of the first element copied from \c src on
- * success.  -1 on failure.
- *
- * \warning
- * This function assumes that there is already enough space available in
- * \c dst to hold all of the elements that will be copied over.
- */
-static int
-copy_indirect_accessed_array(struct gl_program_parameter_list *src,
-			     struct gl_program_parameter_list *dst,
-			     unsigned first, unsigned count)
-{
-   const int base = dst->NumParameters;
-   unsigned i, j;
-
-   for (i = first; i < (first + count); i++) {
-      struct gl_program_parameter *curr = & src->Parameters[i];
-
-      if (curr->Type == PROGRAM_CONSTANT) {
-	 j = dst->NumParameters;
-      } else {
-	 for (j = 0; j < dst->NumParameters; j++) {
-	    if (memcmp(dst->Parameters[j].StateIndexes, curr->StateIndexes, 
-		       sizeof(curr->StateIndexes)) == 0) {
-	       return -1;
-	    }
-	 }
-      }
-
-      assert(j == dst->NumParameters);
-
-      /* copy src parameter [i] to dest parameter [j] */
-      memcpy(& dst->Parameters[j], curr,
-	     sizeof(dst->Parameters[j]));
-      memcpy(dst->ParameterValues[j], src->ParameterValues[i],
-	     sizeof(GLfloat) * 4);
-
-      /* Pointer to the string name was copied.  Null-out src param name
-       * to prevent double free later.
-       */
-      curr->Name = NULL;
-
-      dst->NumParameters++;
-   }
-
-   return base;
-}
-
-
-/**
- * XXX description???
- * \return GL_TRUE for success, GL_FALSE for failure
- */
-GLboolean
-_mesa_layout_parameters(struct asm_parser_state *state)
-{
-   struct gl_program_parameter_list *layout;
-   struct asm_instruction *inst;
-   unsigned i;
-
-   layout =
-      _mesa_new_parameter_list_sized(state->prog->Parameters->NumParameters);
-
-   /* PASS 1:  Move any parameters that are accessed indirectly from the
-    * original parameter list to the new parameter list.
-    */
-   for (inst = state->inst_head; inst != NULL; inst = inst->next) {
-      for (i = 0; i < 3; i++) {
-	 if (inst->SrcReg[i].Base.RelAddr) {
-	    /* Only attempt to add the to the new parameter list once.
-	     */
-	    if (!inst->SrcReg[i].Symbol->pass1_done) {
-	       const int new_begin =
-		  copy_indirect_accessed_array(state->prog->Parameters, layout,
-		      inst->SrcReg[i].Symbol->param_binding_begin,
-		      inst->SrcReg[i].Symbol->param_binding_length);
-
-	       if (new_begin < 0) {
-		  return GL_FALSE;
-	       }
-
-	       inst->SrcReg[i].Symbol->param_binding_begin = new_begin;
-	       inst->SrcReg[i].Symbol->pass1_done = 1;
-	    }
-
-	    /* Previously the Index was just the offset from the parameter
-	     * array.  Now that the base of the parameter array is known, the
-	     * index can be updated to its actual value.
-	     */
-	    inst->Base.SrcReg[i] = inst->SrcReg[i].Base;
-	    inst->Base.SrcReg[i].Index +=
-	       inst->SrcReg[i].Symbol->param_binding_begin;
-	 }
-      }
-   }
-
-   /* PASS 2:  Move any parameters that are not accessed indirectly from the
-    * original parameter list to the new parameter list.
-    */
-   for (inst = state->inst_head; inst != NULL; inst = inst->next) {
-      for (i = 0; i < 3; i++) {
-	 const struct gl_program_parameter *p;
-	 const int idx = inst->SrcReg[i].Base.Index;
-	 unsigned swizzle = SWIZZLE_NOOP;
-
-	 /* All relative addressed operands were processed on the first
-	  * pass.  Just skip them here.
-	  */
-	 if (inst->SrcReg[i].Base.RelAddr) {
-	    continue;
-	 }
-
-	 if ((inst->SrcReg[i].Base.File <= PROGRAM_VARYING )
-	     || (inst->SrcReg[i].Base.File >= PROGRAM_WRITE_ONLY)) {
-	    continue;
-	 }
-
-	 inst->Base.SrcReg[i] = inst->SrcReg[i].Base;
-	 p = & state->prog->Parameters->Parameters[idx];
-
-	 switch (p->Type) {
-	 case PROGRAM_CONSTANT: {
-	    const float *const v =
-	       state->prog->Parameters->ParameterValues[idx];
-
-	    inst->Base.SrcReg[i].Index =
-	       _mesa_add_unnamed_constant(layout, v, p->Size, & swizzle);
-
-	    inst->Base.SrcReg[i].Swizzle = 
-	       _mesa_combine_swizzles(swizzle, inst->Base.SrcReg[i].Swizzle);
-	    break;
-	 }
-
-	 case PROGRAM_STATE_VAR:
-	    inst->Base.SrcReg[i].Index =
-	       _mesa_add_state_reference(layout, p->StateIndexes);
-	    break;
-
-	 default:
-	    break;
-	 }
-
-	 inst->SrcReg[i].Base.File = p->Type;
-	 inst->Base.SrcReg[i].File = p->Type;
-      }
-   }
-
-   _mesa_free_parameter_list(state->prog->Parameters);
-   state->prog->Parameters = layout;
-
-   return GL_TRUE;
-}
diff --git a/mesalib/src/mesa/shader/prog_print.c b/mesalib/src/mesa/shader/prog_print.c
deleted file mode 100644
index f66c240ce..000000000
--- a/mesalib/src/mesa/shader/prog_print.c
+++ /dev/null
@@ -1,1065 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.3
- *
- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, 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 prog_print.c
- * Print vertex/fragment programs - for debugging.
- * \author Brian Paul
- */
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/imports.h"
-#include "prog_instruction.h"
-#include "prog_parameter.h"
-#include "prog_print.h"
-#include "prog_statevars.h"
-
-
-
-/**
- * Return string name for given program/register file.
- */
-static const char *
-file_string(gl_register_file f, gl_prog_print_mode mode)
-{
-   switch (f) {
-   case PROGRAM_TEMPORARY:
-      return "TEMP";
-   case PROGRAM_LOCAL_PARAM:
-      return "LOCAL";
-   case PROGRAM_ENV_PARAM:
-      return "ENV";
-   case PROGRAM_STATE_VAR:
-      return "STATE";
-   case PROGRAM_INPUT:
-      return "INPUT";
-   case PROGRAM_OUTPUT:
-      return "OUTPUT";
-   case PROGRAM_NAMED_PARAM:
-      return "NAMED";
-   case PROGRAM_CONSTANT:
-      return "CONST";
-   case PROGRAM_UNIFORM:
-      return "UNIFORM";
-   case PROGRAM_VARYING:
-      return "VARYING";
-   case PROGRAM_WRITE_ONLY:
-      return "WRITE_ONLY";
-   case PROGRAM_ADDRESS:
-      return "ADDR";
-   case PROGRAM_SAMPLER:
-      return "SAMPLER";
-   case PROGRAM_UNDEFINED:
-      return "UNDEFINED";
-   default:
-      {
-         static char s[20];
-         _mesa_snprintf(s, sizeof(s), "FILE%u", f);
-         return s;
-      }
-   }
-}
-
-
-/**
- * Return ARB_v/f_prog-style input attrib string.
- */
-static const char *
-arb_input_attrib_string(GLint index, GLenum progType)
-{
-   /*
-    * These strings should match the VERT_ATTRIB_x and FRAG_ATTRIB_x tokens.
-    */
-   const char *vertAttribs[] = {
-      "vertex.position",
-      "vertex.weight",
-      "vertex.normal",
-      "vertex.color.primary",
-      "vertex.color.secondary",
-      "vertex.fogcoord",
-      "vertex.(six)",
-      "vertex.(seven)",
-      "vertex.texcoord[0]",
-      "vertex.texcoord[1]",
-      "vertex.texcoord[2]",
-      "vertex.texcoord[3]",
-      "vertex.texcoord[4]",
-      "vertex.texcoord[5]",
-      "vertex.texcoord[6]",
-      "vertex.texcoord[7]",
-      "vertex.attrib[0]",
-      "vertex.attrib[1]",
-      "vertex.attrib[2]",
-      "vertex.attrib[3]",
-      "vertex.attrib[4]",
-      "vertex.attrib[5]",
-      "vertex.attrib[6]",
-      "vertex.attrib[7]",
-      "vertex.attrib[8]",
-      "vertex.attrib[9]",
-      "vertex.attrib[10]",
-      "vertex.attrib[11]",
-      "vertex.attrib[12]",
-      "vertex.attrib[13]",
-      "vertex.attrib[14]",
-      "vertex.attrib[15]"
-   };
-   const char *fragAttribs[] = {
-      "fragment.position",
-      "fragment.color.primary",
-      "fragment.color.secondary",
-      "fragment.fogcoord",
-      "fragment.texcoord[0]",
-      "fragment.texcoord[1]",
-      "fragment.texcoord[2]",
-      "fragment.texcoord[3]",
-      "fragment.texcoord[4]",
-      "fragment.texcoord[5]",
-      "fragment.texcoord[6]",
-      "fragment.texcoord[7]",
-      "fragment.varying[0]",
-      "fragment.varying[1]",
-      "fragment.varying[2]",
-      "fragment.varying[3]",
-      "fragment.varying[4]",
-      "fragment.varying[5]",
-      "fragment.varying[6]",
-      "fragment.varying[7]"
-   };
-
-   /* sanity checks */
-   assert(strcmp(vertAttribs[VERT_ATTRIB_TEX0], "vertex.texcoord[0]") == 0);
-   assert(strcmp(vertAttribs[VERT_ATTRIB_GENERIC15], "vertex.attrib[15]") == 0);
-
-   if (progType == GL_VERTEX_PROGRAM_ARB) {
-      assert(index < sizeof(vertAttribs) / sizeof(vertAttribs[0]));
-      return vertAttribs[index];
-   }
-   else {
-      assert(index < sizeof(fragAttribs) / sizeof(fragAttribs[0]));
-      return fragAttribs[index];
-   }
-}
-
-
-/**
- * Print a vertex program's InputsRead field in human-readable format.
- * For debugging.
- */
-void
-_mesa_print_vp_inputs(GLbitfield inputs)
-{
-   printf("VP Inputs 0x%x: \n", inputs);
-   while (inputs) {
-      GLint attr = _mesa_ffs(inputs) - 1;
-      const char *name = arb_input_attrib_string(attr,
-                                                 GL_VERTEX_PROGRAM_ARB);
-      printf("  %d: %s\n", attr, name);
-      inputs &= ~(1 << attr);
-   }
-}
-
-
-/**
- * Print a fragment program's InputsRead field in human-readable format.
- * For debugging.
- */
-void
-_mesa_print_fp_inputs(GLbitfield inputs)
-{
-   printf("FP Inputs 0x%x: \n", inputs);
-   while (inputs) {
-      GLint attr = _mesa_ffs(inputs) - 1;
-      const char *name = arb_input_attrib_string(attr,
-                                                 GL_FRAGMENT_PROGRAM_ARB);
-      printf("  %d: %s\n", attr, name);
-      inputs &= ~(1 << attr);
-   }
-}
-
-
-
-/**
- * Return ARB_v/f_prog-style output attrib string.
- */
-static const char *
-arb_output_attrib_string(GLint index, GLenum progType)
-{
-   /*
-    * These strings should match the VERT_RESULT_x and FRAG_RESULT_x tokens.
-    */
-   const char *vertResults[] = {
-      "result.position",
-      "result.color.primary",
-      "result.color.secondary",
-      "result.fogcoord",
-      "result.texcoord[0]",
-      "result.texcoord[1]",
-      "result.texcoord[2]",
-      "result.texcoord[3]",
-      "result.texcoord[4]",
-      "result.texcoord[5]",
-      "result.texcoord[6]",
-      "result.texcoord[7]",
-      "result.varying[0]",
-      "result.varying[1]",
-      "result.varying[2]",
-      "result.varying[3]",
-      "result.varying[4]",
-      "result.varying[5]",
-      "result.varying[6]",
-      "result.varying[7]"
-   };
-   const char *fragResults[] = {
-      "result.color",
-      "result.color(half)",
-      "result.depth",
-      "result.color[0]",
-      "result.color[1]",
-      "result.color[2]",
-      "result.color[3]"
-   };
-
-   if (progType == GL_VERTEX_PROGRAM_ARB) {
-      assert(index < sizeof(vertResults) / sizeof(vertResults[0]));
-      return vertResults[index];
-   }
-   else {
-      assert(index < sizeof(fragResults) / sizeof(fragResults[0]));
-      return fragResults[index];
-   }
-}
-
-
-/**
- * Return string representation of the given register.
- * Note that some types of registers (like PROGRAM_UNIFORM) aren't defined
- * by the ARB/NV program languages so we've taken some liberties here.
- * \param f  the register file (PROGRAM_INPUT, PROGRAM_TEMPORARY, etc)
- * \param index  number of the register in the register file
- * \param mode  the output format/mode/style
- * \param prog  pointer to containing program
- */
-static const char *
-reg_string(gl_register_file f, GLint index, gl_prog_print_mode mode,
-           GLboolean relAddr, const struct gl_program *prog)
-{
-   static char str[100];
-   const char *addr = relAddr ? "ADDR+" : "";
-
-   str[0] = 0;
-
-   switch (mode) {
-   case PROG_PRINT_DEBUG:
-      sprintf(str, "%s[%s%d]", file_string(f, mode), addr, index);
-      break;
-
-   case PROG_PRINT_ARB:
-      switch (f) {
-      case PROGRAM_INPUT:
-         sprintf(str, "%s", arb_input_attrib_string(index, prog->Target));
-         break;
-      case PROGRAM_OUTPUT:
-         sprintf(str, "%s", arb_output_attrib_string(index, prog->Target));
-         break;
-      case PROGRAM_TEMPORARY:
-         sprintf(str, "temp%d", index);
-         break;
-      case PROGRAM_ENV_PARAM:
-         sprintf(str, "program.env[%s%d]", addr, index);
-         break;
-      case PROGRAM_LOCAL_PARAM:
-         sprintf(str, "program.local[%s%d]", addr, index);
-         break;
-      case PROGRAM_VARYING: /* extension */
-         sprintf(str, "varying[%s%d]", addr, index);
-         break;
-      case PROGRAM_CONSTANT: /* extension */
-         sprintf(str, "constant[%s%d]", addr, index);
-         break;
-      case PROGRAM_UNIFORM: /* extension */
-         sprintf(str, "uniform[%s%d]", addr, index);
-         break;
-      case PROGRAM_STATE_VAR:
-         {
-            struct gl_program_parameter *param
-               = prog->Parameters->Parameters + index;
-            char *state = _mesa_program_state_string(param->StateIndexes);
-            sprintf(str, "%s", state);
-            free(state);
-         }
-         break;
-      case PROGRAM_ADDRESS:
-         sprintf(str, "A%d", index);
-         break;
-      default:
-         _mesa_problem(NULL, "bad file in reg_string()");
-      }
-      break;
-
-   case PROG_PRINT_NV:
-      switch (f) {
-      case PROGRAM_INPUT:
-         if (prog->Target == GL_VERTEX_PROGRAM_ARB)
-            sprintf(str, "v[%d]", index);
-         else
-            sprintf(str, "f[%d]", index);
-         break;
-      case PROGRAM_OUTPUT:
-         sprintf(str, "o[%d]", index);
-         break;
-      case PROGRAM_TEMPORARY:
-         sprintf(str, "R%d", index);
-         break;
-      case PROGRAM_ENV_PARAM:
-         sprintf(str, "c[%d]", index);
-         break;
-      case PROGRAM_VARYING: /* extension */
-         sprintf(str, "varying[%s%d]", addr, index);
-         break;
-      case PROGRAM_UNIFORM: /* extension */
-         sprintf(str, "uniform[%s%d]", addr, index);
-         break;
-      case PROGRAM_CONSTANT: /* extension */
-         sprintf(str, "constant[%s%d]", addr, index);
-         break;
-      case PROGRAM_STATE_VAR: /* extension */
-         sprintf(str, "state[%s%d]", addr, index);
-         break;
-      default:
-         _mesa_problem(NULL, "bad file in reg_string()");
-      }
-      break;
-
-   default:
-      _mesa_problem(NULL, "bad mode in reg_string()");
-   }
-
-   return str;
-}
-
-
-/**
- * Return a string representation of the given swizzle word.
- * If extended is true, use extended (comma-separated) format.
- * \param swizzle  the swizzle field
- * \param negateBase  4-bit negation vector
- * \param extended  if true, also allow 0, 1 values
- */
-const char *
-_mesa_swizzle_string(GLuint swizzle, GLuint negateMask, GLboolean extended)
-{
-   static const char swz[] = "xyzw01!?";  /* See SWIZZLE_x definitions */
-   static char s[20];
-   GLuint i = 0;
-
-   if (!extended && swizzle == SWIZZLE_NOOP && negateMask == 0)
-      return ""; /* no swizzle/negation */
-
-   if (!extended)
-      s[i++] = '.';
-
-   if (negateMask & NEGATE_X)
-      s[i++] = '-';
-   s[i++] = swz[GET_SWZ(swizzle, 0)];
-
-   if (extended) {
-      s[i++] = ',';
-   }
-
-   if (negateMask & NEGATE_Y)
-      s[i++] = '-';
-   s[i++] = swz[GET_SWZ(swizzle, 1)];
-
-   if (extended) {
-      s[i++] = ',';
-   }
-
-   if (negateMask & NEGATE_Z)
-      s[i++] = '-';
-   s[i++] = swz[GET_SWZ(swizzle, 2)];
-
-   if (extended) {
-      s[i++] = ',';
-   }
-
-   if (negateMask & NEGATE_W)
-      s[i++] = '-';
-   s[i++] = swz[GET_SWZ(swizzle, 3)];
-
-   s[i] = 0;
-   return s;
-}
-
-
-void
-_mesa_print_swizzle(GLuint swizzle)
-{
-   if (swizzle == SWIZZLE_XYZW) {
-      printf(".xyzw\n");
-   }
-   else {
-      const char *s = _mesa_swizzle_string(swizzle, 0, 0);
-      printf("%s\n", s);
-   }
-}
-
-
-const char *
-_mesa_writemask_string(GLuint writeMask)
-{
-   static char s[10];
-   GLuint i = 0;
-
-   if (writeMask == WRITEMASK_XYZW)
-      return "";
-
-   s[i++] = '.';
-   if (writeMask & WRITEMASK_X)
-      s[i++] = 'x';
-   if (writeMask & WRITEMASK_Y)
-      s[i++] = 'y';
-   if (writeMask & WRITEMASK_Z)
-      s[i++] = 'z';
-   if (writeMask & WRITEMASK_W)
-      s[i++] = 'w';
-
-   s[i] = 0;
-   return s;
-}
-
-
-const char *
-_mesa_condcode_string(GLuint condcode)
-{
-   switch (condcode) {
-   case COND_GT:  return "GT";
-   case COND_EQ:  return "EQ";
-   case COND_LT:  return "LT";
-   case COND_UN:  return "UN";
-   case COND_GE:  return "GE";
-   case COND_LE:  return "LE";
-   case COND_NE:  return "NE";
-   case COND_TR:  return "TR";
-   case COND_FL:  return "FL";
-   default: return "cond???";
-   }
-}
-
-
-static void
-fprint_dst_reg(FILE * f,
-               const struct prog_dst_register *dstReg,
-               gl_prog_print_mode mode,
-               const struct gl_program *prog)
-{
-   fprintf(f, "%s%s",
-	   reg_string((gl_register_file) dstReg->File,
-		      dstReg->Index, mode, dstReg->RelAddr, prog),
-	   _mesa_writemask_string(dstReg->WriteMask));
-   
-   if (dstReg->CondMask != COND_TR) {
-      fprintf(f, " (%s.%s)",
-	      _mesa_condcode_string(dstReg->CondMask),
-	      _mesa_swizzle_string(dstReg->CondSwizzle,
-				   GL_FALSE, GL_FALSE));
-   }
-
-#if 0
-   fprintf(f, "%s[%d]%s",
-	   file_string((gl_register_file) dstReg->File, mode),
-	   dstReg->Index,
-	   _mesa_writemask_string(dstReg->WriteMask));
-#endif
-}
-
-
-static void
-fprint_src_reg(FILE *f,
-               const struct prog_src_register *srcReg, 
-               gl_prog_print_mode mode,
-               const struct gl_program *prog)
-{
-   const char *abs = srcReg->Abs ? "|" : "";
-
-   fprintf(f, "%s%s%s%s",
-	   abs,
-	   reg_string((gl_register_file) srcReg->File,
-		      srcReg->Index, mode, srcReg->RelAddr, prog),
-	   _mesa_swizzle_string(srcReg->Swizzle,
-				srcReg->Negate, GL_FALSE),
-	   abs);
-#if 0
-   fprintf(f, "%s[%d]%s",
-	   file_string((gl_register_file) srcReg->File, mode),
-	   srcReg->Index,
-	   _mesa_swizzle_string(srcReg->Swizzle,
-				srcReg->Negate, GL_FALSE));
-#endif
-}
-
-
-static void
-fprint_comment(FILE *f, const struct prog_instruction *inst)
-{
-   if (inst->Comment)
-      fprintf(f, ";  # %s\n", inst->Comment);
-   else
-      fprintf(f, ";\n");
-}
-
-
-static void
-fprint_alu_instruction(FILE *f,
-                       const struct prog_instruction *inst,
-                       const char *opcode_string, GLuint numRegs,
-                       gl_prog_print_mode mode,
-                       const struct gl_program *prog)
-{
-   GLuint j;
-
-   fprintf(f, "%s", opcode_string);
-   if (inst->CondUpdate)
-      fprintf(f, ".C");
-
-   /* frag prog only */
-   if (inst->SaturateMode == SATURATE_ZERO_ONE)
-      fprintf(f, "_SAT");
-
-   fprintf(f, " ");
-   if (inst->DstReg.File != PROGRAM_UNDEFINED) {
-      fprint_dst_reg(f, &inst->DstReg, mode, prog);
-   }
-   else {
-      fprintf(f, " ???");
-   }
-
-   if (numRegs > 0)
-      fprintf(f, ", ");
-
-   for (j = 0; j < numRegs; j++) {
-      fprint_src_reg(f, inst->SrcReg + j, mode, prog);
-      if (j + 1 < numRegs)
-	 fprintf(f, ", ");
-   }
-
-   fprint_comment(f, inst);
-}
-
-
-void
-_mesa_print_alu_instruction(const struct prog_instruction *inst,
-                            const char *opcode_string, GLuint numRegs)
-{
-   fprint_alu_instruction(stderr, inst, opcode_string,
-                          numRegs, PROG_PRINT_DEBUG, NULL);
-}
-
-
-/**
- * Print a single vertex/fragment program instruction.
- */
-GLint
-_mesa_fprint_instruction_opt(FILE *f,
-                            const struct prog_instruction *inst,
-                            GLint indent,
-                            gl_prog_print_mode mode,
-                            const struct gl_program *prog)
-{
-   GLint i;
-
-   if (inst->Opcode == OPCODE_ELSE ||
-       inst->Opcode == OPCODE_ENDIF ||
-       inst->Opcode == OPCODE_ENDLOOP ||
-       inst->Opcode == OPCODE_ENDSUB) {
-      indent -= 3;
-   }
-   for (i = 0; i < indent; i++) {
-      fprintf(f, " ");
-   }
-
-   switch (inst->Opcode) {
-   case OPCODE_PRINT:
-      fprintf(f, "PRINT '%s'", (char *) inst->Data);
-      if (inst->SrcReg[0].File != PROGRAM_UNDEFINED) {
-         fprintf(f, ", ");
-         fprintf(f, "%s[%d]%s",
-		 file_string((gl_register_file) inst->SrcReg[0].File,
-			     mode),
-		 inst->SrcReg[0].Index,
-		 _mesa_swizzle_string(inst->SrcReg[0].Swizzle,
-				      inst->SrcReg[0].Negate, GL_FALSE));
-      }
-      if (inst->Comment)
-         fprintf(f, "  # %s", inst->Comment);
-      fprint_comment(f, inst);
-      break;
-   case OPCODE_SWZ:
-      fprintf(f, "SWZ");
-      if (inst->SaturateMode == SATURATE_ZERO_ONE)
-         fprintf(f, "_SAT");
-      fprintf(f, " ");
-      fprint_dst_reg(f, &inst->DstReg, mode, prog);
-      fprintf(f, ", %s[%d], %s",
-	      file_string((gl_register_file) inst->SrcReg[0].File,
-			  mode),
-	      inst->SrcReg[0].Index,
-	      _mesa_swizzle_string(inst->SrcReg[0].Swizzle,
-				   inst->SrcReg[0].Negate, GL_TRUE));
-      fprint_comment(f, inst);
-      break;
-   case OPCODE_TEX:
-   case OPCODE_TXP:
-   case OPCODE_TXL:
-   case OPCODE_TXB:
-      fprintf(f, "%s", _mesa_opcode_string(inst->Opcode));
-      if (inst->SaturateMode == SATURATE_ZERO_ONE)
-         fprintf(f, "_SAT");
-      fprintf(f, " ");
-      fprint_dst_reg(f, &inst->DstReg, mode, prog);
-      fprintf(f, ", ");
-      fprint_src_reg(f, &inst->SrcReg[0], mode, prog);
-      fprintf(f, ", texture[%d], ", inst->TexSrcUnit);
-      switch (inst->TexSrcTarget) {
-      case TEXTURE_1D_INDEX:   fprintf(f, "1D");    break;
-      case TEXTURE_2D_INDEX:   fprintf(f, "2D");    break;
-      case TEXTURE_3D_INDEX:   fprintf(f, "3D");    break;
-      case TEXTURE_CUBE_INDEX: fprintf(f, "CUBE");  break;
-      case TEXTURE_RECT_INDEX: fprintf(f, "RECT");  break;
-      case TEXTURE_1D_ARRAY_INDEX: fprintf(f, "1D_ARRAY"); break;
-      case TEXTURE_2D_ARRAY_INDEX: fprintf(f, "2D_ARRAY"); break;
-      default:
-         ;
-      }
-      if (inst->TexShadow)
-         fprintf(f, " SHADOW");
-      fprint_comment(f, inst);
-      break;
-
-   case OPCODE_KIL:
-      fprintf(f, "%s", _mesa_opcode_string(inst->Opcode));
-      fprintf(f, " ");
-      fprint_src_reg(f, &inst->SrcReg[0], mode, prog);
-      fprint_comment(f, inst);
-      break;
-   case OPCODE_KIL_NV:
-      fprintf(f, "%s", _mesa_opcode_string(inst->Opcode));
-      fprintf(f, " ");
-      fprintf(f, "%s.%s",
-	      _mesa_condcode_string(inst->DstReg.CondMask),
-	      _mesa_swizzle_string(inst->DstReg.CondSwizzle,
-				   GL_FALSE, GL_FALSE));
-      fprint_comment(f, inst);
-      break;
-
-   case OPCODE_ARL:
-      fprintf(f, "ARL ");
-      fprint_dst_reg(f, &inst->DstReg, mode, prog);
-      fprintf(f, ", ");
-      fprint_src_reg(f, &inst->SrcReg[0], mode, prog);
-      fprint_comment(f, inst);
-      break;
-   case OPCODE_BRA:
-      fprintf(f, "BRA %d (%s%s)",
-	      inst->BranchTarget,
-	      _mesa_condcode_string(inst->DstReg.CondMask),
-	      _mesa_swizzle_string(inst->DstReg.CondSwizzle, 0, GL_FALSE));
-      fprint_comment(f, inst);
-      break;
-   case OPCODE_IF:
-      if (inst->SrcReg[0].File != PROGRAM_UNDEFINED) {
-         /* Use ordinary register */
-         fprintf(f, "IF ");
-         fprint_src_reg(f, &inst->SrcReg[0], mode, prog);
-         fprintf(f, "; ");
-      }
-      else {
-         /* Use cond codes */
-         fprintf(f, "IF (%s%s);",
-		 _mesa_condcode_string(inst->DstReg.CondMask),
-		 _mesa_swizzle_string(inst->DstReg.CondSwizzle,
-				      0, GL_FALSE));
-      }
-      fprintf(f, " # (if false, goto %d)", inst->BranchTarget);
-      fprint_comment(f, inst);
-      return indent + 3;
-   case OPCODE_ELSE:
-      fprintf(f, "ELSE; # (goto %d)\n", inst->BranchTarget);
-      return indent + 3;
-   case OPCODE_ENDIF:
-      fprintf(f, "ENDIF;\n");
-      break;
-   case OPCODE_BGNLOOP:
-      fprintf(f, "BGNLOOP; # (end at %d)\n", inst->BranchTarget);
-      return indent + 3;
-   case OPCODE_ENDLOOP:
-      fprintf(f, "ENDLOOP; # (goto %d)\n", inst->BranchTarget);
-      break;
-   case OPCODE_BRK:
-   case OPCODE_CONT:
-      fprintf(f, "%s (%s%s); # (goto %d)",
-	      _mesa_opcode_string(inst->Opcode),
-	      _mesa_condcode_string(inst->DstReg.CondMask),
-	      _mesa_swizzle_string(inst->DstReg.CondSwizzle, 0, GL_FALSE),
-	      inst->BranchTarget);
-      fprint_comment(f, inst);
-      break;
-
-   case OPCODE_BGNSUB:
-      if (mode == PROG_PRINT_NV) {
-         fprintf(f, "%s:\n", inst->Comment); /* comment is label */
-         return indent;
-      }
-      else {
-         fprintf(f, "BGNSUB");
-         fprint_comment(f, inst);
-         return indent + 3;
-      }
-   case OPCODE_ENDSUB:
-      if (mode == PROG_PRINT_DEBUG) {
-         fprintf(f, "ENDSUB");
-         fprint_comment(f, inst);
-      }
-      break;
-   case OPCODE_CAL:
-      if (mode == PROG_PRINT_NV) {
-         fprintf(f, "CAL %s;  # (goto %d)\n", inst->Comment, inst->BranchTarget);
-      }
-      else {
-         fprintf(f, "CAL %u", inst->BranchTarget);
-         fprint_comment(f, inst);
-      }
-      break;
-   case OPCODE_RET:
-      fprintf(f, "RET (%s%s)",
-	      _mesa_condcode_string(inst->DstReg.CondMask),
-	      _mesa_swizzle_string(inst->DstReg.CondSwizzle, 0, GL_FALSE));
-      fprint_comment(f, inst);
-      break;
-
-   case OPCODE_END:
-      fprintf(f, "END\n");
-      break;
-   case OPCODE_NOP:
-      if (mode == PROG_PRINT_DEBUG) {
-         fprintf(f, "NOP");
-         fprint_comment(f, inst);
-      }
-      else if (inst->Comment) {
-         /* ARB/NV extensions don't have NOP instruction */
-         fprintf(f, "# %s\n", inst->Comment);
-      }
-      break;
-   /* XXX may need other special-case instructions */
-   default:
-      if (inst->Opcode < MAX_OPCODE) {
-         /* typical alu instruction */
-         fprint_alu_instruction(f, inst,
-                                _mesa_opcode_string(inst->Opcode),
-                                _mesa_num_inst_src_regs(inst->Opcode),
-                                mode, prog);
-      }
-      else {
-         fprint_alu_instruction(f, inst,
-                                _mesa_opcode_string(inst->Opcode),
-                                3/*_mesa_num_inst_src_regs(inst->Opcode)*/,
-                                mode, prog);
-      }
-      break;
-   }
-   return indent;
-}
-
-
-GLint
-_mesa_print_instruction_opt(const struct prog_instruction *inst,
-                            GLint indent,
-                            gl_prog_print_mode mode,
-                            const struct gl_program *prog)
-{
-   return _mesa_fprint_instruction_opt(stderr, inst, indent, mode, prog);
-}
-
-
-void
-_mesa_print_instruction(const struct prog_instruction *inst)
-{
-   /* note: 4th param should be ignored for PROG_PRINT_DEBUG */
-   _mesa_fprint_instruction_opt(stderr, inst, 0, PROG_PRINT_DEBUG, NULL);
-}
-
-
-
-/**
- * Print program, with options.
- */
-void
-_mesa_fprint_program_opt(FILE *f,
-                         const struct gl_program *prog,
-                         gl_prog_print_mode mode,
-                         GLboolean lineNumbers)
-{
-   GLuint i, indent = 0;
-
-   switch (prog->Target) {
-   case GL_VERTEX_PROGRAM_ARB:
-      if (mode == PROG_PRINT_ARB)
-         fprintf(f, "!!ARBvp1.0\n");
-      else if (mode == PROG_PRINT_NV)
-         fprintf(f, "!!VP1.0\n");
-      else
-         fprintf(f, "# Vertex Program/Shader %u\n", prog->Id);
-      break;
-   case GL_FRAGMENT_PROGRAM_ARB:
-   case GL_FRAGMENT_PROGRAM_NV:
-      if (mode == PROG_PRINT_ARB)
-         fprintf(f, "!!ARBfp1.0\n");
-      else if (mode == PROG_PRINT_NV)
-         fprintf(f, "!!FP1.0\n");
-      else
-         fprintf(f, "# Fragment Program/Shader %u\n", prog->Id);
-      break;
-   }
-
-   for (i = 0; i < prog->NumInstructions; i++) {
-      if (lineNumbers)
-         fprintf(f, "%3d: ", i);
-      indent = _mesa_fprint_instruction_opt(f, prog->Instructions + i,
-                                           indent, mode, prog);
-   }
-}
-
-
-/**
- * Print program to stderr, default options.
- */
-void
-_mesa_print_program(const struct gl_program *prog)
-{
-   _mesa_fprint_program_opt(stderr, prog, PROG_PRINT_DEBUG, GL_TRUE);
-}
-
-
-/**
- * Return binary representation of 64-bit value (as a string).
- * Insert a comma to separate each group of 8 bits.
- * Note we return a pointer to local static storage so this is not
- * re-entrant, etc.
- * XXX move to imports.[ch] if useful elsewhere.
- */
-static const char *
-binary(GLbitfield64 val)
-{
-   static char buf[80];
-   GLint i, len = 0;
-   for (i = 63; i >= 0; --i) {
-      if (val & (1ULL << i))
-         buf[len++] = '1';
-      else if (len > 0 || i == 0)
-         buf[len++] = '0';
-      if (len > 0 && ((i-1) % 8) == 7)
-         buf[len++] = ',';
-   }
-   buf[len] = '\0';
-   return buf;
-}
-
-
-/**
- * Print all of a program's parameters/fields to given file.
- */
-static void
-_mesa_fprint_program_parameters(FILE *f,
-                                GLcontext *ctx,
-                                const struct gl_program *prog)
-{
-   GLuint i;
-
-   fprintf(f, "InputsRead: 0x%x (0b%s)\n",
-                 prog->InputsRead, binary(prog->InputsRead));
-   fprintf(f, "OutputsWritten: 0x%llx (0b%s)\n",
-                 prog->OutputsWritten, binary(prog->OutputsWritten));
-   fprintf(f, "NumInstructions=%d\n", prog->NumInstructions);
-   fprintf(f, "NumTemporaries=%d\n", prog->NumTemporaries);
-   fprintf(f, "NumParameters=%d\n", prog->NumParameters);
-   fprintf(f, "NumAttributes=%d\n", prog->NumAttributes);
-   fprintf(f, "NumAddressRegs=%d\n", prog->NumAddressRegs);
-   fprintf(f, "SamplersUsed: 0x%x (0b%s)\n",
-                 prog->SamplersUsed, binary(prog->SamplersUsed));
-   fprintf(f, "Samplers=[ ");
-   for (i = 0; i < MAX_SAMPLERS; i++) {
-      fprintf(f, "%d ", prog->SamplerUnits[i]);
-   }
-   fprintf(f, "]\n");
-
-   _mesa_load_state_parameters(ctx, prog->Parameters);
-
-#if 0
-   fprintf(f, "Local Params:\n");
-   for (i = 0; i < MAX_PROGRAM_LOCAL_PARAMS; i++){
-      const GLfloat *p = prog->LocalParams[i];
-      fprintf(f, "%2d: %f, %f, %f, %f\n", i, p[0], p[1], p[2], p[3]);
-   }
-#endif	
-   _mesa_print_parameter_list(prog->Parameters);
-}
-
-
-/**
- * Print all of a program's parameters/fields to stderr.
- */
-void
-_mesa_print_program_parameters(GLcontext *ctx, const struct gl_program *prog)
-{
-   _mesa_fprint_program_parameters(stderr, ctx, prog);
-}
-
-
-/**
- * Print a program parameter list to given file.
- */
-static void
-_mesa_fprint_parameter_list(FILE *f,
-                            const struct gl_program_parameter_list *list)
-{
-   const gl_prog_print_mode mode = PROG_PRINT_DEBUG;
-   GLuint i;
-
-   if (!list)
-      return;
-
-   if (0)
-      fprintf(f, "param list %p\n", (void *) list);
-   fprintf(f, "dirty state flags: 0x%x\n", list->StateFlags);
-   for (i = 0; i < list->NumParameters; i++){
-      struct gl_program_parameter *param = list->Parameters + i;
-      const GLfloat *v = list->ParameterValues[i];
-      fprintf(f, "param[%d] sz=%d %s %s = {%.3g, %.3g, %.3g, %.3g}",
-	      i, param->Size,
-	      file_string(list->Parameters[i].Type, mode),
-	      param->Name, v[0], v[1], v[2], v[3]);
-      if (param->Flags & PROG_PARAM_BIT_CENTROID)
-         fprintf(f, " Centroid");
-      if (param->Flags & PROG_PARAM_BIT_INVARIANT)
-         fprintf(f, " Invariant");
-      if (param->Flags & PROG_PARAM_BIT_FLAT)
-         fprintf(f, " Flat");
-      if (param->Flags & PROG_PARAM_BIT_LINEAR)
-         fprintf(f, " Linear");
-      fprintf(f, "\n");
-   }
-}
-
-
-/**
- * Print a program parameter list to stderr.
- */
-void
-_mesa_print_parameter_list(const struct gl_program_parameter_list *list)
-{
-   _mesa_fprint_parameter_list(stderr, list);
-}
-
-
-/**
- * Write shader and associated info to a file.
- */
-void
-_mesa_write_shader_to_file(const struct gl_shader *shader)
-{
-   const char *type;
-   char filename[100];
-   FILE *f;
-
-   if (shader->Type == GL_FRAGMENT_SHADER)
-      type = "frag";
-   else
-      type = "vert";
-
-   _mesa_snprintf(filename, sizeof(filename), "shader_%u.%s", shader->Name, type);
-   f = fopen(filename, "w");
-   if (!f) {
-      fprintf(stderr, "Unable to open %s for writing\n", filename);
-      return;
-   }
-
-   fprintf(f, "/* Shader %u source, checksum %u */\n", shader->Name, shader->SourceChecksum);
-   fputs(shader->Source, f);
-   fprintf(f, "\n");
-
-   fprintf(f, "/* Compile status: %s */\n",
-           shader->CompileStatus ? "ok" : "fail");
-   if (!shader->CompileStatus) {
-      fprintf(f, "/* Log Info: */\n");
-      fputs(shader->InfoLog, f);
-   }
-   else {
-      fprintf(f, "/* GPU code */\n");
-      fprintf(f, "/*\n");
-      _mesa_fprint_program_opt(f, shader->Program, PROG_PRINT_DEBUG, GL_TRUE);
-      fprintf(f, "*/\n");
-      fprintf(f, "/* Parameters / constants */\n");
-      fprintf(f, "/*\n");
-      _mesa_fprint_parameter_list(f, shader->Program->Parameters);
-      fprintf(f, "*/\n");
-   }
-
-   fclose(f);
-}
-
-
-/**
- * Append the shader's uniform info/values to the shader log file.
- * The log file will typically have been created by the
- * _mesa_write_shader_to_file function.
- */
-void
-_mesa_append_uniforms_to_file(const struct gl_shader *shader,
-                              const struct gl_program *prog)
-{
-   const char *type;
-   char filename[100];
-   FILE *f;
-
-   if (shader->Type == GL_FRAGMENT_SHADER)
-      type = "frag";
-   else
-      type = "vert";
-
-   _mesa_snprintf(filename, sizeof(filename), "shader_%u.%s", shader->Name, type);
-   f = fopen(filename, "a"); /* append */
-   if (!f) {
-      fprintf(stderr, "Unable to open %s for appending\n", filename);
-      return;
-   }
-
-   fprintf(f, "/* First-draw parameters / constants */\n");
-   fprintf(f, "/*\n");
-   _mesa_fprint_parameter_list(f, prog->Parameters);
-   fprintf(f, "*/\n");
-
-   fclose(f);
-}
diff --git a/mesalib/src/mesa/shader/prog_print.h b/mesalib/src/mesa/shader/prog_print.h
deleted file mode 100644
index 9ab745601..000000000
--- a/mesalib/src/mesa/shader/prog_print.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.3
- *
- * 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.
- */
-
-
-#ifndef PROG_PRINT_H
-#define PROG_PRINT_H
-
-
-/**
- * The output style to use when printing programs.
- */
-typedef enum {
-   PROG_PRINT_ARB,
-   PROG_PRINT_NV,
-   PROG_PRINT_DEBUG
-} gl_prog_print_mode;
-
-
-extern void
-_mesa_print_vp_inputs(GLbitfield inputs);
-
-extern void
-_mesa_print_fp_inputs(GLbitfield inputs);
-
-extern const char *
-_mesa_condcode_string(GLuint condcode);
-
-extern const char *
-_mesa_swizzle_string(GLuint swizzle, GLuint negateBase, GLboolean extended);
-
-const char *
-_mesa_writemask_string(GLuint writeMask);
-
-extern void
-_mesa_print_swizzle(GLuint swizzle);
-
-extern void
-_mesa_print_alu_instruction(const struct prog_instruction *inst,
-                            const char *opcode_string, GLuint numRegs);
-
-extern void
-_mesa_print_instruction(const struct prog_instruction *inst);
-
-extern GLint
-_mesa_fprint_instruction_opt(FILE *f,
-                            const struct prog_instruction *inst,
-                            GLint indent,
-                            gl_prog_print_mode mode,
-                            const struct gl_program *prog);
-
-extern GLint
-_mesa_print_instruction_opt(const struct prog_instruction *inst, GLint indent,
-                            gl_prog_print_mode mode,
-                            const struct gl_program *prog);
-
-extern void
-_mesa_print_program(const struct gl_program *prog);
-
-extern void
-_mesa_fprint_program_opt(FILE *f,
-                         const struct gl_program *prog, gl_prog_print_mode mode,
-                         GLboolean lineNumbers);
-
-extern void
-_mesa_print_program_parameters(GLcontext *ctx, const struct gl_program *prog);
-
-extern void
-_mesa_print_parameter_list(const struct gl_program_parameter_list *list);
-
-
-extern void
-_mesa_write_shader_to_file(const struct gl_shader *shader);
-
-extern void
-_mesa_append_uniforms_to_file(const struct gl_shader *shader,
-                              const struct gl_program *prog);
-
-
-#endif /* PROG_PRINT_H */
diff --git a/mesalib/src/mesa/shader/prog_statevars.c b/mesalib/src/mesa/shader/prog_statevars.c
deleted file mode 100644
index ead3ece95..000000000
--- a/mesalib/src/mesa/shader/prog_statevars.c
+++ /dev/null
@@ -1,1187 +0,0 @@
-/*
- * 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 prog_statevars.c
- * Program state variable management.
- * \author Brian Paul
- */
-
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/imports.h"
-#include "main/macros.h"
-#include "main/mtypes.h"
-#include "prog_statevars.h"
-#include "prog_parameter.h"
-
-
-/**
- * Use the list of tokens in the state[] array to find global GL state
- * and return it in <value>.  Usually, four values are returned in <value>
- * but matrix queries may return as many as 16 values.
- * This function is used for ARB vertex/fragment programs.
- * The program parser will produce the state[] values.
- */
-static void
-_mesa_fetch_state(GLcontext *ctx, const gl_state_index state[],
-                  GLfloat *value)
-{
-   switch (state[0]) {
-   case STATE_MATERIAL:
-      {
-         /* state[1] is either 0=front or 1=back side */
-         const GLuint face = (GLuint) state[1];
-         const struct gl_material *mat = &ctx->Light.Material;
-         ASSERT(face == 0 || face == 1);
-         /* we rely on tokens numbered so that _BACK_ == _FRONT_+ 1 */
-         ASSERT(MAT_ATTRIB_FRONT_AMBIENT + 1 == MAT_ATTRIB_BACK_AMBIENT);
-         /* XXX we could get rid of this switch entirely with a little
-          * work in arbprogparse.c's parse_state_single_item().
-          */
-         /* state[2] is the material attribute */
-         switch (state[2]) {
-         case STATE_AMBIENT:
-            COPY_4V(value, mat->Attrib[MAT_ATTRIB_FRONT_AMBIENT + face]);
-            return;
-         case STATE_DIFFUSE:
-            COPY_4V(value, mat->Attrib[MAT_ATTRIB_FRONT_DIFFUSE + face]);
-            return;
-         case STATE_SPECULAR:
-            COPY_4V(value, mat->Attrib[MAT_ATTRIB_FRONT_SPECULAR + face]);
-            return;
-         case STATE_EMISSION:
-            COPY_4V(value, mat->Attrib[MAT_ATTRIB_FRONT_EMISSION + face]);
-            return;
-         case STATE_SHININESS:
-            value[0] = mat->Attrib[MAT_ATTRIB_FRONT_SHININESS + face][0];
-            value[1] = 0.0F;
-            value[2] = 0.0F;
-            value[3] = 1.0F;
-            return;
-         default:
-            _mesa_problem(ctx, "Invalid material state in fetch_state");
-            return;
-         }
-      }
-   case STATE_LIGHT:
-      {
-         /* state[1] is the light number */
-         const GLuint ln = (GLuint) state[1];
-         /* state[2] is the light attribute */
-         switch (state[2]) {
-         case STATE_AMBIENT:
-            COPY_4V(value, ctx->Light.Light[ln].Ambient);
-            return;
-         case STATE_DIFFUSE:
-            COPY_4V(value, ctx->Light.Light[ln].Diffuse);
-            return;
-         case STATE_SPECULAR:
-            COPY_4V(value, ctx->Light.Light[ln].Specular);
-            return;
-         case STATE_POSITION:
-            COPY_4V(value, ctx->Light.Light[ln].EyePosition);
-            return;
-         case STATE_ATTENUATION:
-            value[0] = ctx->Light.Light[ln].ConstantAttenuation;
-            value[1] = ctx->Light.Light[ln].LinearAttenuation;
-            value[2] = ctx->Light.Light[ln].QuadraticAttenuation;
-            value[3] = ctx->Light.Light[ln].SpotExponent;
-            return;
-         case STATE_SPOT_DIRECTION:
-            COPY_3V(value, ctx->Light.Light[ln].SpotDirection);
-            value[3] = ctx->Light.Light[ln]._CosCutoff;
-            return;
-         case STATE_SPOT_CUTOFF:
-            value[0] = ctx->Light.Light[ln].SpotCutoff;
-            return;
-         case STATE_HALF_VECTOR:
-            {
-               static const GLfloat eye_z[] = {0, 0, 1};
-               GLfloat p[3];
-               /* Compute infinite half angle vector:
-                *   halfVector = normalize(normalize(lightPos) + (0, 0, 1))
-		* light.EyePosition.w should be 0 for infinite lights.
-                */
-               COPY_3V(p, ctx->Light.Light[ln].EyePosition);
-               NORMALIZE_3FV(p);
-	       ADD_3V(value, p, eye_z);
-	       NORMALIZE_3FV(value);
-	       value[3] = 1.0;
-            }
-            return;
-         default:
-            _mesa_problem(ctx, "Invalid light state in fetch_state");
-            return;
-         }
-      }
-   case STATE_LIGHTMODEL_AMBIENT:
-      COPY_4V(value, ctx->Light.Model.Ambient);
-      return;
-   case STATE_LIGHTMODEL_SCENECOLOR:
-      if (state[1] == 0) {
-         /* front */
-         GLint i;
-         for (i = 0; i < 3; i++) {
-            value[i] = ctx->Light.Model.Ambient[i]
-               * ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_AMBIENT][i]
-               + ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_EMISSION][i];
-         }
-	 value[3] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE][3];
-      }
-      else {
-         /* back */
-         GLint i;
-         for (i = 0; i < 3; i++) {
-            value[i] = ctx->Light.Model.Ambient[i]
-               * ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_AMBIENT][i]
-               + ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_EMISSION][i];
-         }
-	 value[3] = ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_DIFFUSE][3];
-      }
-      return;
-   case STATE_LIGHTPROD:
-      {
-         const GLuint ln = (GLuint) state[1];
-         const GLuint face = (GLuint) state[2];
-         GLint i;
-         ASSERT(face == 0 || face == 1);
-         switch (state[3]) {
-            case STATE_AMBIENT:
-               for (i = 0; i < 3; i++) {
-                  value[i] = ctx->Light.Light[ln].Ambient[i] *
-                     ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_AMBIENT+face][i];
-               }
-               /* [3] = material alpha */
-               value[3] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_AMBIENT+face][3];
-               return;
-            case STATE_DIFFUSE:
-               for (i = 0; i < 3; i++) {
-                  value[i] = ctx->Light.Light[ln].Diffuse[i] *
-                     ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE+face][i];
-               }
-               /* [3] = material alpha */
-               value[3] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE+face][3];
-               return;
-            case STATE_SPECULAR:
-               for (i = 0; i < 3; i++) {
-                  value[i] = ctx->Light.Light[ln].Specular[i] *
-                     ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_SPECULAR+face][i];
-               }
-               /* [3] = material alpha */
-               value[3] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_SPECULAR+face][3];
-               return;
-            default:
-               _mesa_problem(ctx, "Invalid lightprod state in fetch_state");
-               return;
-         }
-      }
-   case STATE_TEXGEN:
-      {
-         /* state[1] is the texture unit */
-         const GLuint unit = (GLuint) state[1];
-         /* state[2] is the texgen attribute */
-         switch (state[2]) {
-         case STATE_TEXGEN_EYE_S:
-            COPY_4V(value, ctx->Texture.Unit[unit].GenS.EyePlane);
-            return;
-         case STATE_TEXGEN_EYE_T:
-            COPY_4V(value, ctx->Texture.Unit[unit].GenT.EyePlane);
-            return;
-         case STATE_TEXGEN_EYE_R:
-            COPY_4V(value, ctx->Texture.Unit[unit].GenR.EyePlane);
-            return;
-         case STATE_TEXGEN_EYE_Q:
-            COPY_4V(value, ctx->Texture.Unit[unit].GenQ.EyePlane);
-            return;
-         case STATE_TEXGEN_OBJECT_S:
-            COPY_4V(value, ctx->Texture.Unit[unit].GenS.ObjectPlane);
-            return;
-         case STATE_TEXGEN_OBJECT_T:
-            COPY_4V(value, ctx->Texture.Unit[unit].GenT.ObjectPlane);
-            return;
-         case STATE_TEXGEN_OBJECT_R:
-            COPY_4V(value, ctx->Texture.Unit[unit].GenR.ObjectPlane);
-            return;
-         case STATE_TEXGEN_OBJECT_Q:
-            COPY_4V(value, ctx->Texture.Unit[unit].GenQ.ObjectPlane);
-            return;
-         default:
-            _mesa_problem(ctx, "Invalid texgen state in fetch_state");
-            return;
-         }
-      }
-   case STATE_TEXENV_COLOR:
-      {
-         /* state[1] is the texture unit */
-         const GLuint unit = (GLuint) state[1];
-         COPY_4V(value, ctx->Texture.Unit[unit].EnvColor);
-      }
-      return;
-   case STATE_FOG_COLOR:
-      COPY_4V(value, ctx->Fog.Color);
-      return;
-   case STATE_FOG_PARAMS:
-      value[0] = ctx->Fog.Density;
-      value[1] = ctx->Fog.Start;
-      value[2] = ctx->Fog.End;
-      value[3] = (ctx->Fog.End == ctx->Fog.Start)
-         ? 1.0f : (GLfloat)(1.0 / (ctx->Fog.End - ctx->Fog.Start));
-      return;
-   case STATE_CLIPPLANE:
-      {
-         const GLuint plane = (GLuint) state[1];
-         COPY_4V(value, ctx->Transform.EyeUserPlane[plane]);
-      }
-      return;
-   case STATE_POINT_SIZE:
-      value[0] = ctx->Point.Size;
-      value[1] = ctx->Point.MinSize;
-      value[2] = ctx->Point.MaxSize;
-      value[3] = ctx->Point.Threshold;
-      return;
-   case STATE_POINT_ATTENUATION:
-      value[0] = ctx->Point.Params[0];
-      value[1] = ctx->Point.Params[1];
-      value[2] = ctx->Point.Params[2];
-      value[3] = 1.0F;
-      return;
-   case STATE_MODELVIEW_MATRIX:
-   case STATE_PROJECTION_MATRIX:
-   case STATE_MVP_MATRIX:
-   case STATE_TEXTURE_MATRIX:
-   case STATE_PROGRAM_MATRIX:
-   case STATE_COLOR_MATRIX:
-      {
-         /* state[0] = modelview, projection, texture, etc. */
-         /* state[1] = which texture matrix or program matrix */
-         /* state[2] = first row to fetch */
-         /* state[3] = last row to fetch */
-         /* state[4] = transpose, inverse or invtrans */
-         const GLmatrix *matrix;
-         const gl_state_index mat = state[0];
-         const GLuint index = (GLuint) state[1];
-         const GLuint firstRow = (GLuint) state[2];
-         const GLuint lastRow = (GLuint) state[3];
-         const gl_state_index modifier = state[4];
-         const GLfloat *m;
-         GLuint row, i;
-         ASSERT(firstRow >= 0);
-         ASSERT(firstRow < 4);
-         ASSERT(lastRow >= 0);
-         ASSERT(lastRow < 4);
-         if (mat == STATE_MODELVIEW_MATRIX) {
-            matrix = ctx->ModelviewMatrixStack.Top;
-         }
-         else if (mat == STATE_PROJECTION_MATRIX) {
-            matrix = ctx->ProjectionMatrixStack.Top;
-         }
-         else if (mat == STATE_MVP_MATRIX) {
-            matrix = &ctx->_ModelProjectMatrix;
-         }
-         else if (mat == STATE_TEXTURE_MATRIX) {
-            ASSERT(index < Elements(ctx->TextureMatrixStack));
-            matrix = ctx->TextureMatrixStack[index].Top;
-         }
-         else if (mat == STATE_PROGRAM_MATRIX) {
-            ASSERT(index < Elements(ctx->ProgramMatrixStack));
-            matrix = ctx->ProgramMatrixStack[index].Top;
-         }
-         else if (mat == STATE_COLOR_MATRIX) {
-            matrix = ctx->ColorMatrixStack.Top;
-         }
-         else {
-            _mesa_problem(ctx, "Bad matrix name in _mesa_fetch_state()");
-            return;
-         }
-         if (modifier == STATE_MATRIX_INVERSE ||
-             modifier == STATE_MATRIX_INVTRANS) {
-            /* Be sure inverse is up to date:
-	     */
-            _math_matrix_alloc_inv( (GLmatrix *) matrix );
-	    _math_matrix_analyse( (GLmatrix*) matrix );
-            m = matrix->inv;
-         }
-         else {
-            m = matrix->m;
-         }
-         if (modifier == STATE_MATRIX_TRANSPOSE ||
-             modifier == STATE_MATRIX_INVTRANS) {
-            for (i = 0, row = firstRow; row <= lastRow; row++) {
-               value[i++] = m[row * 4 + 0];
-               value[i++] = m[row * 4 + 1];
-               value[i++] = m[row * 4 + 2];
-               value[i++] = m[row * 4 + 3];
-            }
-         }
-         else {
-            for (i = 0, row = firstRow; row <= lastRow; row++) {
-               value[i++] = m[row + 0];
-               value[i++] = m[row + 4];
-               value[i++] = m[row + 8];
-               value[i++] = m[row + 12];
-            }
-         }
-      }
-      return;
-   case STATE_DEPTH_RANGE:
-      value[0] = ctx->Viewport.Near;                     /* near       */
-      value[1] = ctx->Viewport.Far;                      /* far        */
-      value[2] = ctx->Viewport.Far - ctx->Viewport.Near; /* far - near */
-      value[3] = 1.0;
-      return;
-   case STATE_FRAGMENT_PROGRAM:
-      {
-         /* state[1] = {STATE_ENV, STATE_LOCAL} */
-         /* state[2] = parameter index          */
-         const int idx = (int) state[2];
-         switch (state[1]) {
-            case STATE_ENV:
-               COPY_4V(value, ctx->FragmentProgram.Parameters[idx]);
-               return;
-            case STATE_LOCAL:
-               COPY_4V(value, ctx->FragmentProgram.Current->Base.LocalParams[idx]);
-               return;
-            default:
-               _mesa_problem(ctx, "Bad state switch in _mesa_fetch_state()");
-               return;
-         }
-      }
-      return;
-
-   case STATE_VERTEX_PROGRAM:
-      {
-         /* state[1] = {STATE_ENV, STATE_LOCAL} */
-         /* state[2] = parameter index          */
-         const int idx = (int) state[2];
-         switch (state[1]) {
-            case STATE_ENV:
-               COPY_4V(value, ctx->VertexProgram.Parameters[idx]);
-               return;
-            case STATE_LOCAL:
-               COPY_4V(value, ctx->VertexProgram.Current->Base.LocalParams[idx]);
-               return;
-            default:
-               _mesa_problem(ctx, "Bad state switch in _mesa_fetch_state()");
-               return;
-         }
-      }
-      return;
-
-   case STATE_NORMAL_SCALE:
-      ASSIGN_4V(value, ctx->_ModelViewInvScale, 0, 0, 1);
-      return;
-
-   case STATE_INTERNAL:
-      switch (state[1]) {
-      case STATE_CURRENT_ATTRIB:
-         {
-            const GLuint idx = (GLuint) state[2];
-            COPY_4V(value, ctx->Current.Attrib[idx]);
-         }
-         return;
-
-      case STATE_NORMAL_SCALE:
-         ASSIGN_4V(value, 
-                   ctx->_ModelViewInvScale, 
-                   ctx->_ModelViewInvScale, 
-                   ctx->_ModelViewInvScale, 
-                   1);
-         return;
-
-      case STATE_TEXRECT_SCALE:
-         /* Value = { 1/texWidth, 1/texHeight, 0, 1 }.
-          * Used to convert unnormalized texcoords to normalized texcoords.
-          */
-         {
-            const int unit = (int) state[2];
-            const struct gl_texture_object *texObj
-               = ctx->Texture.Unit[unit]._Current;
-            if (texObj) {
-               struct gl_texture_image *texImage = texObj->Image[0][0];
-               ASSIGN_4V(value,
-                         (GLfloat) (1.0 / texImage->Width),
-                         (GLfloat) (1.0 / texImage->Height),
-                         0.0f, 1.0f);
-            }
-         }
-         return;
-
-      case STATE_FOG_PARAMS_OPTIMIZED:
-         /* for simpler per-vertex/pixel fog calcs. POW (for EXP/EXP2 fog)
-          * might be more expensive than EX2 on some hw, plus it needs
-          * another constant (e) anyway. Linear fog can now be done with a
-          * single MAD.
-          * linear: fogcoord * -1/(end-start) + end/(end-start)
-          * exp: 2^-(density/ln(2) * fogcoord)
-          * exp2: 2^-((density/(ln(2)^2) * fogcoord)^2)
-          */
-         value[0] = (ctx->Fog.End == ctx->Fog.Start)
-            ? 1.0f : (GLfloat)(-1.0F / (ctx->Fog.End - ctx->Fog.Start));
-         value[1] = ctx->Fog.End * -value[0];
-         value[2] = (GLfloat)(ctx->Fog.Density * ONE_DIV_LN2);
-         value[3] = (GLfloat)(ctx->Fog.Density * ONE_DIV_SQRT_LN2);
-         return;
-
-      case STATE_POINT_SIZE_CLAMPED:
-         {
-           /* this includes implementation dependent limits, to avoid
-            * another potentially necessary clamp.
-            * Note: for sprites, point smooth (point AA) is ignored
-            * and we'll clamp to MinPointSizeAA and MaxPointSize, because we
-            * expect drivers will want to say their minimum for AA size is 0.0
-            * but for non-AA it's 1.0 (because normal points with size below 1.0
-            * need to get rounded up to 1.0, hence never disappear). GL does
-            * not specify max clamp size for sprites, other than it needs to be
-            * at least as large as max AA size, hence use non-AA size there.
-            */
-            GLfloat minImplSize;
-            GLfloat maxImplSize;
-            if (ctx->Point.PointSprite) {
-               minImplSize = ctx->Const.MinPointSizeAA;
-               maxImplSize = ctx->Const.MaxPointSize;
-            }
-            else if (ctx->Point.SmoothFlag || ctx->Multisample._Enabled) {
-               minImplSize = ctx->Const.MinPointSizeAA;
-               maxImplSize = ctx->Const.MaxPointSizeAA;
-            }
-            else {
-               minImplSize = ctx->Const.MinPointSize;
-               maxImplSize = ctx->Const.MaxPointSize;
-            }
-            value[0] = ctx->Point.Size;
-            value[1] = ctx->Point.MinSize >= minImplSize ? ctx->Point.MinSize : minImplSize;
-            value[2] = ctx->Point.MaxSize <= maxImplSize ? ctx->Point.MaxSize : maxImplSize;
-            value[3] = ctx->Point.Threshold;
-         }
-         return;
-      case STATE_POINT_SIZE_IMPL_CLAMP:
-         {
-           /* for implementation clamp only in vs */
-            GLfloat minImplSize;
-            GLfloat maxImplSize;
-            if (ctx->Point.PointSprite) {
-               minImplSize = ctx->Const.MinPointSizeAA;
-               maxImplSize = ctx->Const.MaxPointSize;
-            }
-            else if (ctx->Point.SmoothFlag || ctx->Multisample._Enabled) {
-               minImplSize = ctx->Const.MinPointSizeAA;
-               maxImplSize = ctx->Const.MaxPointSizeAA;
-            }
-            else {
-               minImplSize = ctx->Const.MinPointSize;
-               maxImplSize = ctx->Const.MaxPointSize;
-            }
-            value[0] = ctx->Point.Size;
-            value[1] = minImplSize;
-            value[2] = maxImplSize;
-            value[3] = ctx->Point.Threshold;
-         }
-         return;
-      case STATE_LIGHT_SPOT_DIR_NORMALIZED:
-         {
-            /* here, state[2] is the light number */
-            /* pre-normalize spot dir */
-            const GLuint ln = (GLuint) state[2];
-            COPY_3V(value, ctx->Light.Light[ln]._NormSpotDirection);
-            value[3] = ctx->Light.Light[ln]._CosCutoff;
-         }
-         return;
-
-      case STATE_LIGHT_POSITION:
-         {
-            const GLuint ln = (GLuint) state[2];
-            COPY_4V(value, ctx->Light.Light[ln]._Position);
-         }
-         return;
-
-      case STATE_LIGHT_POSITION_NORMALIZED:
-         {
-            const GLuint ln = (GLuint) state[2];
-            COPY_4V(value, ctx->Light.Light[ln]._Position);
-            NORMALIZE_3FV( value );
-         }
-         return;
-
-      case STATE_LIGHT_HALF_VECTOR:
-         {
-            const GLuint ln = (GLuint) state[2];
-            GLfloat p[3];
-            /* Compute infinite half angle vector:
-             *   halfVector = normalize(normalize(lightPos) + (0, 0, 1))
-             * light.EyePosition.w should be 0 for infinite lights.
-             */
-            COPY_3V(p, ctx->Light.Light[ln]._Position);
-            NORMALIZE_3FV(p);
-            ADD_3V(value, p, ctx->_EyeZDir);
-            NORMALIZE_3FV(value);
-            value[3] = 1.0;
-         }
-         return;
-
-      case STATE_PT_SCALE:
-         value[0] = ctx->Pixel.RedScale;
-         value[1] = ctx->Pixel.GreenScale;
-         value[2] = ctx->Pixel.BlueScale;
-         value[3] = ctx->Pixel.AlphaScale;
-         return;
-
-      case STATE_PT_BIAS:
-         value[0] = ctx->Pixel.RedBias;
-         value[1] = ctx->Pixel.GreenBias;
-         value[2] = ctx->Pixel.BlueBias;
-         value[3] = ctx->Pixel.AlphaBias;
-         return;
-
-      case STATE_PCM_SCALE:
-         COPY_4V(value, ctx->Pixel.PostColorMatrixScale);
-         return;
-
-      case STATE_PCM_BIAS:
-         COPY_4V(value, ctx->Pixel.PostColorMatrixBias);
-         return;
-
-      case STATE_SHADOW_AMBIENT:
-         {
-            const int unit = (int) state[2];
-            const struct gl_texture_object *texObj
-               = ctx->Texture.Unit[unit]._Current;
-            if (texObj) {
-               value[0] =
-               value[1] =
-               value[2] =
-               value[3] = texObj->CompareFailValue;
-            }
-         }
-         return;
-
-      case STATE_FB_SIZE:
-         value[0] = (GLfloat) (ctx->DrawBuffer->Width - 1);
-         value[1] = (GLfloat) (ctx->DrawBuffer->Height - 1);
-         value[2] = 0.0F;
-         value[3] = 0.0F;
-         return;
-
-      case STATE_ROT_MATRIX_0:
-         {
-            const int unit = (int) state[2];
-            GLfloat *rotMat22 = ctx->Texture.Unit[unit].RotMatrix;
-            value[0] = rotMat22[0]; 
-            value[1] = rotMat22[2];
-            value[2] = 0.0;
-            value[3] = 0.0;
-         }
-         return;
-
-      case STATE_ROT_MATRIX_1:
-         {
-            const int unit = (int) state[2];
-            GLfloat *rotMat22 = ctx->Texture.Unit[unit].RotMatrix;
-            value[0] = rotMat22[1];
-            value[1] = rotMat22[3];
-            value[2] = 0.0;
-            value[3] = 0.0;
-         }
-         return;
-
-      /* XXX: make sure new tokens added here are also handled in the 
-       * _mesa_program_state_flags() switch, below.
-       */
-      default:
-         /* Unknown state indexes are silently ignored here.
-          * Drivers may do something special.
-          */
-         return;
-      }
-      return;
-
-   default:
-      _mesa_problem(ctx, "Invalid state in _mesa_fetch_state");
-      return;
-   }
-}
-
-
-/**
- * Return a bitmask of the Mesa state flags (_NEW_* values) which would
- * indicate that the given context state may have changed.
- * The bitmask is used during validation to determine if we need to update
- * vertex/fragment program parameters (like "state.material.color") when
- * some GL state has changed.
- */
-GLbitfield
-_mesa_program_state_flags(const gl_state_index state[STATE_LENGTH])
-{
-   switch (state[0]) {
-   case STATE_MATERIAL:
-   case STATE_LIGHT:
-   case STATE_LIGHTMODEL_AMBIENT:
-   case STATE_LIGHTMODEL_SCENECOLOR:
-   case STATE_LIGHTPROD:
-      return _NEW_LIGHT;
-
-   case STATE_TEXGEN:
-   case STATE_TEXENV_COLOR:
-      return _NEW_TEXTURE;
-
-   case STATE_FOG_COLOR:
-   case STATE_FOG_PARAMS:
-      return _NEW_FOG;
-
-   case STATE_CLIPPLANE:
-      return _NEW_TRANSFORM;
-
-   case STATE_POINT_SIZE:
-   case STATE_POINT_ATTENUATION:
-      return _NEW_POINT;
-
-   case STATE_MODELVIEW_MATRIX:
-      return _NEW_MODELVIEW;
-   case STATE_PROJECTION_MATRIX:
-      return _NEW_PROJECTION;
-   case STATE_MVP_MATRIX:
-      return _NEW_MODELVIEW | _NEW_PROJECTION;
-   case STATE_TEXTURE_MATRIX:
-      return _NEW_TEXTURE_MATRIX;
-   case STATE_PROGRAM_MATRIX:
-      return _NEW_TRACK_MATRIX;
-   case STATE_COLOR_MATRIX:
-      return _NEW_COLOR_MATRIX;
-
-   case STATE_DEPTH_RANGE:
-      return _NEW_VIEWPORT;
-
-   case STATE_FRAGMENT_PROGRAM:
-   case STATE_VERTEX_PROGRAM:
-      return _NEW_PROGRAM;
-
-   case STATE_NORMAL_SCALE:
-      return _NEW_MODELVIEW;
-
-   case STATE_INTERNAL:
-      switch (state[1]) {
-      case STATE_CURRENT_ATTRIB:
-         return _NEW_CURRENT_ATTRIB;
-
-      case STATE_NORMAL_SCALE:
-         return _NEW_MODELVIEW;
-
-      case STATE_TEXRECT_SCALE:
-      case STATE_SHADOW_AMBIENT:
-      case STATE_ROT_MATRIX_0:
-      case STATE_ROT_MATRIX_1:
-	 return _NEW_TEXTURE;
-      case STATE_FOG_PARAMS_OPTIMIZED:
-	 return _NEW_FOG;
-      case STATE_POINT_SIZE_CLAMPED:
-      case STATE_POINT_SIZE_IMPL_CLAMP:
-         return _NEW_POINT | _NEW_MULTISAMPLE;
-      case STATE_LIGHT_SPOT_DIR_NORMALIZED:
-      case STATE_LIGHT_POSITION:
-      case STATE_LIGHT_POSITION_NORMALIZED:
-      case STATE_LIGHT_HALF_VECTOR:
-         return _NEW_LIGHT;
-
-      case STATE_PT_SCALE:
-      case STATE_PT_BIAS:
-      case STATE_PCM_SCALE:
-      case STATE_PCM_BIAS:
-         return _NEW_PIXEL;
-
-      case STATE_FB_SIZE:
-         return _NEW_BUFFERS;
-
-      default:
-         /* unknown state indexes are silently ignored and
-         *  no flag set, since it is handled by the driver.
-         */
-	 return 0;
-      }
-
-   default:
-      _mesa_problem(NULL, "unexpected state[0] in make_state_flags()");
-      return 0;
-   }
-}
-
-
-static void
-append(char *dst, const char *src)
-{
-   while (*dst)
-      dst++;
-   while (*src)
-     *dst++ = *src++;
-   *dst = 0;
-}
-
-
-/**
- * Convert token 'k' to a string, append it onto 'dst' string.
- */
-static void
-append_token(char *dst, gl_state_index k)
-{
-   switch (k) {
-   case STATE_MATERIAL:
-      append(dst, "material");
-      break;
-   case STATE_LIGHT:
-      append(dst, "light");
-      break;
-   case STATE_LIGHTMODEL_AMBIENT:
-      append(dst, "lightmodel.ambient");
-      break;
-   case STATE_LIGHTMODEL_SCENECOLOR:
-      break;
-   case STATE_LIGHTPROD:
-      append(dst, "lightprod");
-      break;
-   case STATE_TEXGEN:
-      append(dst, "texgen");
-      break;
-   case STATE_FOG_COLOR:
-      append(dst, "fog.color");
-      break;
-   case STATE_FOG_PARAMS:
-      append(dst, "fog.params");
-      break;
-   case STATE_CLIPPLANE:
-      append(dst, "clip");
-      break;
-   case STATE_POINT_SIZE:
-      append(dst, "point.size");
-      break;
-   case STATE_POINT_ATTENUATION:
-      append(dst, "point.attenuation");
-      break;
-   case STATE_MODELVIEW_MATRIX:
-      append(dst, "matrix.modelview");
-      break;
-   case STATE_PROJECTION_MATRIX:
-      append(dst, "matrix.projection");
-      break;
-   case STATE_MVP_MATRIX:
-      append(dst, "matrix.mvp");
-      break;
-   case STATE_TEXTURE_MATRIX:
-      append(dst, "matrix.texture");
-      break;
-   case STATE_PROGRAM_MATRIX:
-      append(dst, "matrix.program");
-      break;
-   case STATE_COLOR_MATRIX:
-      append(dst, "matrix.color");
-      break;
-   case STATE_MATRIX_INVERSE:
-      append(dst, ".inverse");
-      break;
-   case STATE_MATRIX_TRANSPOSE:
-      append(dst, ".transpose");
-      break;
-   case STATE_MATRIX_INVTRANS:
-      append(dst, ".invtrans");
-      break;
-   case STATE_AMBIENT:
-      append(dst, ".ambient");
-      break;
-   case STATE_DIFFUSE:
-      append(dst, ".diffuse");
-      break;
-   case STATE_SPECULAR:
-      append(dst, ".specular");
-      break;
-   case STATE_EMISSION:
-      append(dst, ".emission");
-      break;
-   case STATE_SHININESS:
-      append(dst, "lshininess");
-      break;
-   case STATE_HALF_VECTOR:
-      append(dst, ".half");
-      break;
-   case STATE_POSITION:
-      append(dst, ".position");
-      break;
-   case STATE_ATTENUATION:
-      append(dst, ".attenuation");
-      break;
-   case STATE_SPOT_DIRECTION:
-      append(dst, ".spot.direction");
-      break;
-   case STATE_SPOT_CUTOFF:
-      append(dst, ".spot.cutoff");
-      break;
-   case STATE_TEXGEN_EYE_S:
-      append(dst, ".eye.s");
-      break;
-   case STATE_TEXGEN_EYE_T:
-      append(dst, ".eye.t");
-      break;
-   case STATE_TEXGEN_EYE_R:
-      append(dst, ".eye.r");
-      break;
-   case STATE_TEXGEN_EYE_Q:
-      append(dst, ".eye.q");
-      break;
-   case STATE_TEXGEN_OBJECT_S:
-      append(dst, ".object.s");
-      break;
-   case STATE_TEXGEN_OBJECT_T:
-      append(dst, ".object.t");
-      break;
-   case STATE_TEXGEN_OBJECT_R:
-      append(dst, ".object.r");
-      break;
-   case STATE_TEXGEN_OBJECT_Q:
-      append(dst, ".object.q");
-      break;
-   case STATE_TEXENV_COLOR:
-      append(dst, "texenv");
-      break;
-   case STATE_DEPTH_RANGE:
-      append(dst, "depth.range");
-      break;
-   case STATE_VERTEX_PROGRAM:
-   case STATE_FRAGMENT_PROGRAM:
-      break;
-   case STATE_ENV:
-      append(dst, "env");
-      break;
-   case STATE_LOCAL:
-      append(dst, "local");
-      break;
-   /* BEGIN internal state vars */
-   case STATE_INTERNAL:
-      append(dst, ".internal.");
-      break;
-   case STATE_CURRENT_ATTRIB:
-      append(dst, "current");
-      break;
-   case STATE_NORMAL_SCALE:
-      append(dst, "normalScale");
-      break;
-   case STATE_TEXRECT_SCALE:
-      append(dst, "texrectScale");
-      break;
-   case STATE_FOG_PARAMS_OPTIMIZED:
-      append(dst, "fogParamsOptimized");
-      break;
-   case STATE_POINT_SIZE_CLAMPED:
-      append(dst, "pointSizeClamped");
-      break;
-   case STATE_POINT_SIZE_IMPL_CLAMP:
-      append(dst, "pointSizeImplClamp");
-      break;
-   case STATE_LIGHT_SPOT_DIR_NORMALIZED:
-      append(dst, "lightSpotDirNormalized");
-      break;
-   case STATE_LIGHT_POSITION:
-      append(dst, "lightPosition");
-      break;
-   case STATE_LIGHT_POSITION_NORMALIZED:
-      append(dst, "light.position.normalized");
-      break;
-   case STATE_LIGHT_HALF_VECTOR:
-      append(dst, "lightHalfVector");
-      break;
-   case STATE_PT_SCALE:
-      append(dst, "PTscale");
-      break;
-   case STATE_PT_BIAS:
-      append(dst, "PTbias");
-      break;
-   case STATE_PCM_SCALE:
-      append(dst, "PCMscale");
-      break;
-   case STATE_PCM_BIAS:
-      append(dst, "PCMbias");
-      break;
-   case STATE_SHADOW_AMBIENT:
-      append(dst, "CompareFailValue");
-      break;
-   case STATE_FB_SIZE:
-      append(dst, "FbSize");
-      break;
-   case STATE_ROT_MATRIX_0:
-      append(dst, "rotMatrixRow0");
-      break;
-   case STATE_ROT_MATRIX_1:
-      append(dst, "rotMatrixRow1");
-      break;
-   default:
-      /* probably STATE_INTERNAL_DRIVER+i (driver private state) */
-      append(dst, "driverState");
-   }
-}
-
-static void
-append_face(char *dst, GLint face)
-{
-   if (face == 0)
-      append(dst, "front.");
-   else
-      append(dst, "back.");
-}
-
-static void
-append_index(char *dst, GLint index)
-{
-   char s[20];
-   sprintf(s, "[%d]", index);
-   append(dst, s);
-}
-
-/**
- * Make a string from the given state vector.
- * For example, return "state.matrix.texture[2].inverse".
- * Use free() to deallocate the string.
- */
-char *
-_mesa_program_state_string(const gl_state_index state[STATE_LENGTH])
-{
-   char str[1000] = "";
-   char tmp[30];
-
-   append(str, "state.");
-   append_token(str, state[0]);
-
-   switch (state[0]) {
-   case STATE_MATERIAL:
-      append_face(str, state[1]);
-      append_token(str, state[2]);
-      break;
-   case STATE_LIGHT:
-      append_index(str, state[1]); /* light number [i]. */
-      append_token(str, state[2]); /* coefficients */
-      break;
-   case STATE_LIGHTMODEL_AMBIENT:
-      append(str, "lightmodel.ambient");
-      break;
-   case STATE_LIGHTMODEL_SCENECOLOR:
-      if (state[1] == 0) {
-         append(str, "lightmodel.front.scenecolor");
-      }
-      else {
-         append(str, "lightmodel.back.scenecolor");
-      }
-      break;
-   case STATE_LIGHTPROD:
-      append_index(str, state[1]); /* light number [i]. */
-      append_face(str, state[2]);
-      append_token(str, state[3]);
-      break;
-   case STATE_TEXGEN:
-      append_index(str, state[1]); /* tex unit [i] */
-      append_token(str, state[2]); /* plane coef */
-      break;
-   case STATE_TEXENV_COLOR:
-      append_index(str, state[1]); /* tex unit [i] */
-      append(str, "color");
-      break;
-   case STATE_CLIPPLANE:
-      append_index(str, state[1]); /* plane [i] */
-      append(str, ".plane");
-      break;
-   case STATE_MODELVIEW_MATRIX:
-   case STATE_PROJECTION_MATRIX:
-   case STATE_MVP_MATRIX:
-   case STATE_TEXTURE_MATRIX:
-   case STATE_PROGRAM_MATRIX:
-   case STATE_COLOR_MATRIX:
-      {
-         /* state[0] = modelview, projection, texture, etc. */
-         /* state[1] = which texture matrix or program matrix */
-         /* state[2] = first row to fetch */
-         /* state[3] = last row to fetch */
-         /* state[4] = transpose, inverse or invtrans */
-         const gl_state_index mat = state[0];
-         const GLuint index = (GLuint) state[1];
-         const GLuint firstRow = (GLuint) state[2];
-         const GLuint lastRow = (GLuint) state[3];
-         const gl_state_index modifier = state[4];
-         if (index ||
-             mat == STATE_TEXTURE_MATRIX ||
-             mat == STATE_PROGRAM_MATRIX)
-            append_index(str, index);
-         if (modifier)
-            append_token(str, modifier);
-         if (firstRow == lastRow)
-            sprintf(tmp, ".row[%d]", firstRow);
-         else
-            sprintf(tmp, ".row[%d..%d]", firstRow, lastRow);
-         append(str, tmp);
-      }
-      break;
-   case STATE_POINT_SIZE:
-      break;
-   case STATE_POINT_ATTENUATION:
-      break;
-   case STATE_FOG_PARAMS:
-      break;
-   case STATE_FOG_COLOR:
-      break;
-   case STATE_DEPTH_RANGE:
-      break;
-   case STATE_FRAGMENT_PROGRAM:
-   case STATE_VERTEX_PROGRAM:
-      /* state[1] = {STATE_ENV, STATE_LOCAL} */
-      /* state[2] = parameter index          */
-      append_token(str, state[1]);
-      append_index(str, state[2]);
-      break;
-   case STATE_INTERNAL:
-      append_token(str, state[1]);
-      if (state[1] == STATE_CURRENT_ATTRIB)
-         append_index(str, state[2]);
-       break;
-   default:
-      _mesa_problem(NULL, "Invalid state in _mesa_program_state_string");
-      break;
-   }
-
-   return _mesa_strdup(str);
-}
-
-
-/**
- * Loop over all the parameters in a parameter list.  If the parameter
- * is a GL state reference, look up the current value of that state
- * variable and put it into the parameter's Value[4] array.
- * This would be called at glBegin time when using a fragment program.
- */
-void
-_mesa_load_state_parameters(GLcontext *ctx,
-                            struct gl_program_parameter_list *paramList)
-{
-   GLuint i;
-
-   if (!paramList)
-      return;
-
-   /*assert(ctx->Driver.NeedFlush == 0);*/
-
-   for (i = 0; i < paramList->NumParameters; i++) {
-      if (paramList->Parameters[i].Type == PROGRAM_STATE_VAR) {
-         _mesa_fetch_state(ctx,
-			   (gl_state_index *) paramList->Parameters[i].StateIndexes,
-                           paramList->ParameterValues[i]);
-      }
-   }
-}
-
-
-/**
- * Copy the 16 elements of a matrix into four consecutive program
- * registers starting at 'pos'.
- */
-static void
-load_matrix(GLfloat registers[][4], GLuint pos, const GLfloat mat[16])
-{
-   GLuint i;
-   for (i = 0; i < 4; i++) {
-      registers[pos + i][0] = mat[0 + i];
-      registers[pos + i][1] = mat[4 + i];
-      registers[pos + i][2] = mat[8 + i];
-      registers[pos + i][3] = mat[12 + i];
-   }
-}
-
-
-/**
- * As above, but transpose the matrix.
- */
-static void
-load_transpose_matrix(GLfloat registers[][4], GLuint pos,
-                      const GLfloat mat[16])
-{
-   memcpy(registers[pos], mat, 16 * sizeof(GLfloat));
-}
-
-
-/**
- * Load current vertex program's parameter registers with tracked
- * matrices (if NV program).  This only needs to be done per
- * glBegin/glEnd, not per-vertex.
- */
-void
-_mesa_load_tracked_matrices(GLcontext *ctx)
-{
-   GLuint i;
-
-   for (i = 0; i < MAX_NV_VERTEX_PROGRAM_PARAMS / 4; i++) {
-      /* point 'mat' at source matrix */
-      GLmatrix *mat;
-      if (ctx->VertexProgram.TrackMatrix[i] == GL_MODELVIEW) {
-         mat = ctx->ModelviewMatrixStack.Top;
-      }
-      else if (ctx->VertexProgram.TrackMatrix[i] == GL_PROJECTION) {
-         mat = ctx->ProjectionMatrixStack.Top;
-      }
-      else if (ctx->VertexProgram.TrackMatrix[i] == GL_TEXTURE) {
-         GLuint unit = MIN2(ctx->Texture.CurrentUnit,
-                            Elements(ctx->TextureMatrixStack) - 1);
-         mat = ctx->TextureMatrixStack[unit].Top;
-      }
-      else if (ctx->VertexProgram.TrackMatrix[i] == GL_COLOR) {
-         mat = ctx->ColorMatrixStack.Top;
-      }
-      else if (ctx->VertexProgram.TrackMatrix[i]==GL_MODELVIEW_PROJECTION_NV) {
-         /* XXX verify the combined matrix is up to date */
-         mat = &ctx->_ModelProjectMatrix;
-      }
-      else if (ctx->VertexProgram.TrackMatrix[i] >= GL_MATRIX0_NV &&
-               ctx->VertexProgram.TrackMatrix[i] <= GL_MATRIX7_NV) {
-         GLuint n = ctx->VertexProgram.TrackMatrix[i] - GL_MATRIX0_NV;
-         ASSERT(n < Elements(ctx->ProgramMatrixStack));
-         mat = ctx->ProgramMatrixStack[n].Top;
-      }
-      else {
-         /* no matrix is tracked, but we leave the register values as-is */
-         assert(ctx->VertexProgram.TrackMatrix[i] == GL_NONE);
-         continue;
-      }
-
-      /* load the matrix values into sequential registers */
-      if (ctx->VertexProgram.TrackMatrixTransform[i] == GL_IDENTITY_NV) {
-         load_matrix(ctx->VertexProgram.Parameters, i*4, mat->m);
-      }
-      else if (ctx->VertexProgram.TrackMatrixTransform[i] == GL_INVERSE_NV) {
-         _math_matrix_analyse(mat); /* update the inverse */
-         ASSERT(!_math_matrix_is_dirty(mat));
-         load_matrix(ctx->VertexProgram.Parameters, i*4, mat->inv);
-      }
-      else if (ctx->VertexProgram.TrackMatrixTransform[i] == GL_TRANSPOSE_NV) {
-         load_transpose_matrix(ctx->VertexProgram.Parameters, i*4, mat->m);
-      }
-      else {
-         assert(ctx->VertexProgram.TrackMatrixTransform[i]
-                == GL_INVERSE_TRANSPOSE_NV);
-         _math_matrix_analyse(mat); /* update the inverse */
-         ASSERT(!_math_matrix_is_dirty(mat));
-         load_transpose_matrix(ctx->VertexProgram.Parameters, i*4, mat->inv);
-      }
-   }
-}
diff --git a/mesalib/src/mesa/shader/prog_statevars.h b/mesalib/src/mesa/shader/prog_statevars.h
deleted file mode 100644
index 1753471ff..000000000
--- a/mesalib/src/mesa/shader/prog_statevars.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * 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.
- */
-
-#ifndef PROG_STATEVARS_H
-#define PROG_STATEVARS_H
-
-#include "main/mtypes.h"
-
-
-/**
- * Number of STATE_* values we need to address any GL state.
- * Used to dimension arrays.
- */
-#define STATE_LENGTH 5
-
-
-/**
- * Used for describing GL state referenced from inside ARB vertex and
- * fragment programs.
- * A string such as "state.light[0].ambient" gets translated into a
- * sequence of tokens such as [ STATE_LIGHT, 0, STATE_AMBIENT ].
- *
- * For state that's an array, like STATE_CLIPPLANE, the 2nd token [1] should
- * always be the array index.
- */
-typedef enum gl_state_index_ {
-   STATE_MATERIAL = 100,  /* start at 100 so small ints are seen as ints */
-
-   STATE_LIGHT,
-   STATE_LIGHTMODEL_AMBIENT,
-   STATE_LIGHTMODEL_SCENECOLOR,
-   STATE_LIGHTPROD,
-
-   STATE_TEXGEN,
-
-   STATE_FOG_COLOR,
-   STATE_FOG_PARAMS,
-
-   STATE_CLIPPLANE,
-
-   STATE_POINT_SIZE,
-   STATE_POINT_ATTENUATION,
-
-   STATE_MODELVIEW_MATRIX,
-   STATE_PROJECTION_MATRIX,
-   STATE_MVP_MATRIX,
-   STATE_TEXTURE_MATRIX,
-   STATE_PROGRAM_MATRIX,
-   STATE_COLOR_MATRIX,
-   STATE_MATRIX_INVERSE,
-   STATE_MATRIX_TRANSPOSE,
-   STATE_MATRIX_INVTRANS,
-
-   STATE_AMBIENT,
-   STATE_DIFFUSE,
-   STATE_SPECULAR,
-   STATE_EMISSION,
-   STATE_SHININESS,
-   STATE_HALF_VECTOR,
-
-   STATE_POSITION,       /**< xyzw = position */
-   STATE_ATTENUATION,    /**< xyz = attenuation, w = spot exponent */
-   STATE_SPOT_DIRECTION, /**< xyz = direction, w = cos(cutoff) */
-   STATE_SPOT_CUTOFF,    /**< x = cutoff, yzw = undefined */
-
-   STATE_TEXGEN_EYE_S,
-   STATE_TEXGEN_EYE_T,
-   STATE_TEXGEN_EYE_R,
-   STATE_TEXGEN_EYE_Q,
-   STATE_TEXGEN_OBJECT_S,
-   STATE_TEXGEN_OBJECT_T,
-   STATE_TEXGEN_OBJECT_R,
-   STATE_TEXGEN_OBJECT_Q,
-
-   STATE_TEXENV_COLOR,
-
-   STATE_DEPTH_RANGE,
-
-   STATE_VERTEX_PROGRAM,
-   STATE_FRAGMENT_PROGRAM,
-
-   STATE_ENV,
-   STATE_LOCAL,
-
-   STATE_INTERNAL,		/* Mesa additions */
-   STATE_CURRENT_ATTRIB,        /* ctx->Current vertex attrib value */
-   STATE_NORMAL_SCALE,
-   STATE_TEXRECT_SCALE,
-   STATE_FOG_PARAMS_OPTIMIZED,  /* for faster fog calc */
-   STATE_POINT_SIZE_CLAMPED,    /* includes implementation dependent size clamp */
-   STATE_POINT_SIZE_IMPL_CLAMP, /* for implementation clamp only in vs */
-   STATE_LIGHT_SPOT_DIR_NORMALIZED,   /* pre-normalized spot dir */
-   STATE_LIGHT_POSITION,              /* object vs eye space */
-   STATE_LIGHT_POSITION_NORMALIZED,   /* object vs eye space */
-   STATE_LIGHT_HALF_VECTOR,           /* object vs eye space */
-   STATE_PT_SCALE,              /**< Pixel transfer RGBA scale */
-   STATE_PT_BIAS,               /**< Pixel transfer RGBA bias */
-   STATE_PCM_SCALE,             /**< Post color matrix RGBA scale */
-   STATE_PCM_BIAS,              /**< Post color matrix RGBA bias */
-   STATE_SHADOW_AMBIENT,        /**< ARB_shadow_ambient fail value; token[2] is texture unit index */
-   STATE_FB_SIZE,               /**< (width-1, height-1, 0, 0) */
-   STATE_ROT_MATRIX_0,          /**< ATI_envmap_bumpmap, rot matrix row 0 */
-   STATE_ROT_MATRIX_1,          /**< ATI_envmap_bumpmap, rot matrix row 1 */
-   STATE_INTERNAL_DRIVER	/* first available state index for drivers (must be last) */
-} gl_state_index;
-
-
-
-extern void
-_mesa_load_state_parameters(GLcontext *ctx,
-                            struct gl_program_parameter_list *paramList);
-
-
-extern GLbitfield
-_mesa_program_state_flags(const gl_state_index state[STATE_LENGTH]);
-
-
-extern char *
-_mesa_program_state_string(const gl_state_index state[STATE_LENGTH]);
-
-
-extern void
-_mesa_load_tracked_matrices(GLcontext *ctx);
-
-
-#endif /* PROG_STATEVARS_H */
diff --git a/mesalib/src/mesa/shader/prog_uniform.c b/mesalib/src/mesa/shader/prog_uniform.c
deleted file mode 100644
index c408a8492..000000000
--- a/mesalib/src/mesa/shader/prog_uniform.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.1
- *
- * Copyright (C) 1999-2008  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 prog_uniform.c
- * Shader uniform functions.
- * \author Brian Paul
- */
-
-#include "main/imports.h"
-#include "main/mtypes.h"
-#include "prog_uniform.h"
-
-
-struct gl_uniform_list *
-_mesa_new_uniform_list(void)
-{
-   return CALLOC_STRUCT(gl_uniform_list);
-}
-
-
-void
-_mesa_free_uniform_list(struct gl_uniform_list *list)
-{
-   GLuint i;
-   for (i = 0; i < list->NumUniforms; i++) {
-      free((void *) list->Uniforms[i].Name);
-   }
-   free(list->Uniforms);
-   free(list);
-}
-
-
-struct gl_uniform *
-_mesa_append_uniform(struct gl_uniform_list *list,
-                     const char *name, GLenum target, GLuint progPos)
-{
-   const GLuint oldNum = list->NumUniforms;
-   struct gl_uniform *uniform;
-   GLint index;
-
-   assert(target == GL_VERTEX_PROGRAM_ARB ||
-          target == GL_FRAGMENT_PROGRAM_ARB);
-
-   index = _mesa_lookup_uniform(list, name);
-   if (index < 0) {
-      /* not found - append to list */
-
-      if (oldNum + 1 > list->Size) {
-         /* Need to grow the list array (alloc some extra) */
-         list->Size += 4;
-
-         /* realloc arrays */
-         list->Uniforms = (struct gl_uniform *)
-            _mesa_realloc(list->Uniforms,
-                          oldNum * sizeof(struct gl_uniform),
-                          list->Size * sizeof(struct gl_uniform));
-      }
-
-      if (!list->Uniforms) {
-         /* out of memory */
-         list->NumUniforms = 0;
-         list->Size = 0;
-         return GL_FALSE;
-      }
-
-      uniform = list->Uniforms + oldNum;
-
-      uniform->Name = _mesa_strdup(name);
-      uniform->VertPos = -1;
-      uniform->FragPos = -1;
-      uniform->Initialized = GL_FALSE;
-
-      list->NumUniforms++;
-   }
-   else {
-      /* found */
-      uniform = list->Uniforms + index;
-   }
-
-   /* update position for the vertex or fragment program */
-   if (target == GL_VERTEX_PROGRAM_ARB) {
-      if (uniform->VertPos != -1) {
-         /* this uniform is already in the list - that shouldn't happen */
-         return GL_FALSE;
-      }
-      uniform->VertPos = progPos;
-   }
-   else {
-      if (uniform->FragPos != -1) {
-         /* this uniform is already in the list - that shouldn't happen */
-         return GL_FALSE;
-      }
-      uniform->FragPos = progPos;
-   }
-
-   return uniform;
-}
-
-
-/**
- * Return the location/index of the named uniform in the uniform list,
- * or -1 if not found.
- */
-GLint
-_mesa_lookup_uniform(const struct gl_uniform_list *list, const char *name)
-{
-   GLuint i;
-   for (i = 0; list && i < list->NumUniforms; i++) {
-      if (!strcmp(list->Uniforms[i].Name, name)) {
-         return i;
-      }
-   }
-   return -1;
-}
-
-
-GLint
-_mesa_longest_uniform_name(const struct gl_uniform_list *list)
-{
-   GLint max = 0;
-   GLuint i;
-   for (i = 0; list && i < list->NumUniforms; i++) {
-      GLint len = (GLint) strlen(list->Uniforms[i].Name);
-      if (len > max)
-         max = len;
-   }
-   return max;
-}
-
-
-void
-_mesa_print_uniforms(const struct gl_uniform_list *list)
-{
-   GLuint i;
-   printf("Uniform list %p:\n", (void *) list);
-   for (i = 0; i < list->NumUniforms; i++) {
-      printf("%d: %s %d %d\n",
-             i,
-             list->Uniforms[i].Name,
-             list->Uniforms[i].VertPos,
-             list->Uniforms[i].FragPos);
-   }
-}
diff --git a/mesalib/src/mesa/shader/prog_uniform.h b/mesalib/src/mesa/shader/prog_uniform.h
deleted file mode 100644
index 22a2bfd97..000000000
--- a/mesalib/src/mesa/shader/prog_uniform.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.1
- *
- * Copyright (C) 1999-2008  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 prog_uniform.c
- * Shader uniform functions.
- * \author Brian Paul
- */
-
-#ifndef PROG_UNIFORM_H
-#define PROG_UNIFORM_H
-
-#include "main/mtypes.h"
-#include "prog_statevars.h"
-
-
-/**
- * Shader program uniform variable.
- * The glGetUniformLocation() and glUniform() commands will use this
- * information.
- * Note that a uniform such as "binormal" might be used in both the
- * vertex shader and the fragment shader.  When glUniform() is called to
- * set the uniform's value, it must be updated in both the vertex and
- * fragment shaders.  The uniform may be in different locations in the
- * two shaders so we keep track of that here.
- */
-struct gl_uniform
-{
-   const char *Name;        /**< Null-terminated string */
-   GLint VertPos;
-   GLint FragPos;
-   GLboolean Initialized;   /**< For debug.  Has this uniform been set? */
-#if 0
-   GLenum DataType;         /**< GL_FLOAT, GL_FLOAT_VEC2, etc */
-   GLuint Size;             /**< Number of components (1..4) */
-#endif
-};
-
-
-/**
- * List of gl_uniforms
- */
-struct gl_uniform_list
-{
-   GLuint Size;                 /**< allocated size of Uniforms array */
-   GLuint NumUniforms;          /**< number of uniforms in the array */
-   struct gl_uniform *Uniforms; /**< Array [Size] */
-};
-
-
-extern struct gl_uniform_list *
-_mesa_new_uniform_list(void);
-
-extern void
-_mesa_free_uniform_list(struct gl_uniform_list *list);
-
-extern struct gl_uniform *
-_mesa_append_uniform(struct gl_uniform_list *list,
-                     const char *name, GLenum target, GLuint progPos);
-
-extern GLint
-_mesa_lookup_uniform(const struct gl_uniform_list *list, const char *name);
-
-extern GLint
-_mesa_longest_uniform_name(const struct gl_uniform_list *list);
-
-extern void
-_mesa_print_uniforms(const struct gl_uniform_list *list);
-
-
-#endif /* PROG_UNIFORM_H */
diff --git a/mesalib/src/mesa/shader/program.c b/mesalib/src/mesa/shader/program.c
deleted file mode 100644
index f77a77375..000000000
--- a/mesalib/src/mesa/shader/program.c
+++ /dev/null
@@ -1,912 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.3
- *
- * 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 program.c
- * Vertex and fragment program support functions.
- * \author Brian Paul
- */
-
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/hash.h"
-#include "program.h"
-#include "prog_cache.h"
-#include "prog_parameter.h"
-#include "prog_instruction.h"
-
-
-/**
- * A pointer to this dummy program is put into the hash table when
- * glGenPrograms is called.
- */
-struct gl_program _mesa_DummyProgram;
-
-
-/**
- * Init context's vertex/fragment program state
- */
-void
-_mesa_init_program(GLcontext *ctx)
-{
-   GLuint i;
-
-   /*
-    * If this assertion fails, we need to increase the field
-    * size for register indexes.
-    */
-   ASSERT(ctx->Const.VertexProgram.MaxUniformComponents / 4
-          <= (1 << INST_INDEX_BITS));
-   ASSERT(ctx->Const.FragmentProgram.MaxUniformComponents / 4
-          <= (1 << INST_INDEX_BITS));
-
-   /* If this fails, increase prog_instruction::TexSrcUnit size */
-   ASSERT(MAX_TEXTURE_UNITS < (1 << 5));
-
-   /* If this fails, increase prog_instruction::TexSrcTarget size */
-   ASSERT(NUM_TEXTURE_TARGETS < (1 << 3));
-
-   ctx->Program.ErrorPos = -1;
-   ctx->Program.ErrorString = _mesa_strdup("");
-
-#if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program
-   ctx->VertexProgram.Enabled = GL_FALSE;
-#if FEATURE_es2_glsl
-   ctx->VertexProgram.PointSizeEnabled = GL_TRUE;
-#else
-   ctx->VertexProgram.PointSizeEnabled = GL_FALSE;
-#endif
-   ctx->VertexProgram.TwoSideEnabled = GL_FALSE;
-   _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current,
-                            ctx->Shared->DefaultVertexProgram);
-   assert(ctx->VertexProgram.Current);
-   for (i = 0; i < MAX_NV_VERTEX_PROGRAM_PARAMS / 4; i++) {
-      ctx->VertexProgram.TrackMatrix[i] = GL_NONE;
-      ctx->VertexProgram.TrackMatrixTransform[i] = GL_IDENTITY_NV;
-   }
-   ctx->VertexProgram.Cache = _mesa_new_program_cache();
-#endif
-
-#if FEATURE_NV_fragment_program || FEATURE_ARB_fragment_program
-   ctx->FragmentProgram.Enabled = GL_FALSE;
-   _mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current,
-                            ctx->Shared->DefaultFragmentProgram);
-   assert(ctx->FragmentProgram.Current);
-   ctx->FragmentProgram.Cache = _mesa_new_program_cache();
-#endif
-
-
-   /* XXX probably move this stuff */
-#if FEATURE_ATI_fragment_shader
-   ctx->ATIFragmentShader.Enabled = GL_FALSE;
-   ctx->ATIFragmentShader.Current = ctx->Shared->DefaultFragmentShader;
-   assert(ctx->ATIFragmentShader.Current);
-   ctx->ATIFragmentShader.Current->RefCount++;
-#endif
-}
-
-
-/**
- * Free a context's vertex/fragment program state
- */
-void
-_mesa_free_program_data(GLcontext *ctx)
-{
-#if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program
-   _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current, NULL);
-   _mesa_delete_program_cache(ctx, ctx->VertexProgram.Cache);
-#endif
-#if FEATURE_NV_fragment_program || FEATURE_ARB_fragment_program
-   _mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current, NULL);
-   _mesa_delete_program_cache(ctx, ctx->FragmentProgram.Cache);
-#endif
-   /* XXX probably move this stuff */
-#if FEATURE_ATI_fragment_shader
-   if (ctx->ATIFragmentShader.Current) {
-      ctx->ATIFragmentShader.Current->RefCount--;
-      if (ctx->ATIFragmentShader.Current->RefCount <= 0) {
-         free(ctx->ATIFragmentShader.Current);
-      }
-   }
-#endif
-   free((void *) ctx->Program.ErrorString);
-}
-
-
-/**
- * Update the default program objects in the given context to reference those
- * specified in the shared state and release those referencing the old
- * shared state.
- */
-void
-_mesa_update_default_objects_program(GLcontext *ctx)
-{
-#if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program
-   _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current,
-                            (struct gl_vertex_program *)
-                            ctx->Shared->DefaultVertexProgram);
-   assert(ctx->VertexProgram.Current);
-#endif
-
-#if FEATURE_NV_fragment_program || FEATURE_ARB_fragment_program
-   _mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current,
-                            (struct gl_fragment_program *)
-                            ctx->Shared->DefaultFragmentProgram);
-   assert(ctx->FragmentProgram.Current);
-#endif
-
-   /* XXX probably move this stuff */
-#if FEATURE_ATI_fragment_shader
-   if (ctx->ATIFragmentShader.Current) {
-      ctx->ATIFragmentShader.Current->RefCount--;
-      if (ctx->ATIFragmentShader.Current->RefCount <= 0) {
-         free(ctx->ATIFragmentShader.Current);
-      }
-   }
-   ctx->ATIFragmentShader.Current = (struct ati_fragment_shader *) ctx->Shared->DefaultFragmentShader;
-   assert(ctx->ATIFragmentShader.Current);
-   ctx->ATIFragmentShader.Current->RefCount++;
-#endif
-}
-
-
-/**
- * Set the vertex/fragment program error state (position and error string).
- * This is generally called from within the parsers.
- */
-void
-_mesa_set_program_error(GLcontext *ctx, GLint pos, const char *string)
-{
-   ctx->Program.ErrorPos = pos;
-   free((void *) ctx->Program.ErrorString);
-   if (!string)
-      string = "";
-   ctx->Program.ErrorString = _mesa_strdup(string);
-}
-
-
-/**
- * Find the line number and column for 'pos' within 'string'.
- * Return a copy of the line which contains 'pos'.  Free the line with
- * free().
- * \param string  the program string
- * \param pos     the position within the string
- * \param line    returns the line number corresponding to 'pos'.
- * \param col     returns the column number corresponding to 'pos'.
- * \return copy of the line containing 'pos'.
- */
-const GLubyte *
-_mesa_find_line_column(const GLubyte *string, const GLubyte *pos,
-                       GLint *line, GLint *col)
-{
-   const GLubyte *lineStart = string;
-   const GLubyte *p = string;
-   GLubyte *s;
-   int len;
-
-   *line = 1;
-
-   while (p != pos) {
-      if (*p == (GLubyte) '\n') {
-         (*line)++;
-         lineStart = p + 1;
-      }
-      p++;
-   }
-
-   *col = (pos - lineStart) + 1;
-
-   /* return copy of this line */
-   while (*p != 0 && *p != '\n')
-      p++;
-   len = p - lineStart;
-   s = (GLubyte *) malloc(len + 1);
-   memcpy(s, lineStart, len);
-   s[len] = 0;
-
-   return s;
-}
-
-
-/**
- * Initialize a new vertex/fragment program object.
- */
-static struct gl_program *
-_mesa_init_program_struct( GLcontext *ctx, struct gl_program *prog,
-                           GLenum target, GLuint id)
-{
-   (void) ctx;
-   if (prog) {
-      GLuint i;
-      memset(prog, 0, sizeof(*prog));
-      prog->Id = id;
-      prog->Target = target;
-      prog->Resident = GL_TRUE;
-      prog->RefCount = 1;
-      prog->Format = GL_PROGRAM_FORMAT_ASCII_ARB;
-
-      /* default mapping from samplers to texture units */
-      for (i = 0; i < MAX_SAMPLERS; i++)
-         prog->SamplerUnits[i] = i;
-   }
-
-   return prog;
-}
-
-
-/**
- * Initialize a new fragment program object.
- */
-struct gl_program *
-_mesa_init_fragment_program( GLcontext *ctx, struct gl_fragment_program *prog,
-                             GLenum target, GLuint id)
-{
-   if (prog)
-      return _mesa_init_program_struct( ctx, &prog->Base, target, id );
-   else
-      return NULL;
-}
-
-
-/**
- * Initialize a new vertex program object.
- */
-struct gl_program *
-_mesa_init_vertex_program( GLcontext *ctx, struct gl_vertex_program *prog,
-                           GLenum target, GLuint id)
-{
-   if (prog)
-      return _mesa_init_program_struct( ctx, &prog->Base, target, id );
-   else
-      return NULL;
-}
-
-
-/**
- * Allocate and initialize a new fragment/vertex program object but
- * don't put it into the program hash table.  Called via
- * ctx->Driver.NewProgram.  May be overridden (ie. replaced) by a
- * device driver function to implement OO deriviation with additional
- * types not understood by this function.
- *
- * \param ctx  context
- * \param id   program id/number
- * \param target  program target/type
- * \return  pointer to new program object
- */
-struct gl_program *
-_mesa_new_program(GLcontext *ctx, GLenum target, GLuint id)
-{
-   struct gl_program *prog;
-   switch (target) {
-   case GL_VERTEX_PROGRAM_ARB: /* == GL_VERTEX_PROGRAM_NV */
-   case GL_VERTEX_STATE_PROGRAM_NV:
-      prog = _mesa_init_vertex_program(ctx, CALLOC_STRUCT(gl_vertex_program),
-                                       target, id );
-      break;
-   case GL_FRAGMENT_PROGRAM_NV:
-   case GL_FRAGMENT_PROGRAM_ARB:
-      prog =_mesa_init_fragment_program(ctx,
-                                         CALLOC_STRUCT(gl_fragment_program),
-                                         target, id );
-      break;
-   default:
-      _mesa_problem(ctx, "bad target in _mesa_new_program");
-      prog = NULL;
-   }
-   return prog;
-}
-
-
-/**
- * Delete a program and remove it from the hash table, ignoring the
- * reference count.
- * Called via ctx->Driver.DeleteProgram.  May be wrapped (OO deriviation)
- * by a device driver function.
- */
-void
-_mesa_delete_program(GLcontext *ctx, struct gl_program *prog)
-{
-   (void) ctx;
-   ASSERT(prog);
-   ASSERT(prog->RefCount==0);
-
-   if (prog == &_mesa_DummyProgram)
-      return;
-
-   if (prog->String)
-      free(prog->String);
-
-   _mesa_free_instructions(prog->Instructions, prog->NumInstructions);
-
-   if (prog->Parameters) {
-      _mesa_free_parameter_list(prog->Parameters);
-   }
-   if (prog->Varying) {
-      _mesa_free_parameter_list(prog->Varying);
-   }
-   if (prog->Attributes) {
-      _mesa_free_parameter_list(prog->Attributes);
-   }
-
-   free(prog);
-}
-
-
-/**
- * Return the gl_program object for a given ID.
- * Basically just a wrapper for _mesa_HashLookup() to avoid a lot of
- * casts elsewhere.
- */
-struct gl_program *
-_mesa_lookup_program(GLcontext *ctx, GLuint id)
-{
-   if (id)
-      return (struct gl_program *) _mesa_HashLookup(ctx->Shared->Programs, id);
-   else
-      return NULL;
-}
-
-
-/**
- * Reference counting for vertex/fragment programs
- */
-void
-_mesa_reference_program(GLcontext *ctx,
-                        struct gl_program **ptr,
-                        struct gl_program *prog)
-{
-   assert(ptr);
-   if (*ptr && prog) {
-      /* sanity check */
-      if ((*ptr)->Target == GL_VERTEX_PROGRAM_ARB)
-         ASSERT(prog->Target == GL_VERTEX_PROGRAM_ARB);
-      else if ((*ptr)->Target == GL_FRAGMENT_PROGRAM_ARB)
-         ASSERT(prog->Target == GL_FRAGMENT_PROGRAM_ARB ||
-                prog->Target == GL_FRAGMENT_PROGRAM_NV);
-   }
-   if (*ptr == prog) {
-      return;  /* no change */
-   }
-   if (*ptr) {
-      GLboolean deleteFlag;
-
-      /*_glthread_LOCK_MUTEX((*ptr)->Mutex);*/
-#if 0
-      printf("Program %p ID=%u Target=%s  Refcount-- to %d\n",
-             *ptr, (*ptr)->Id,
-             ((*ptr)->Target == GL_VERTEX_PROGRAM_ARB ? "VP" : "FP"),
-             (*ptr)->RefCount - 1);
-#endif
-      ASSERT((*ptr)->RefCount > 0);
-      (*ptr)->RefCount--;
-
-      deleteFlag = ((*ptr)->RefCount == 0);
-      /*_glthread_UNLOCK_MUTEX((*ptr)->Mutex);*/
-
-      if (deleteFlag) {
-         ASSERT(ctx);
-         ctx->Driver.DeleteProgram(ctx, *ptr);
-      }
-
-      *ptr = NULL;
-   }
-
-   assert(!*ptr);
-   if (prog) {
-      /*_glthread_LOCK_MUTEX(prog->Mutex);*/
-      prog->RefCount++;
-#if 0
-      printf("Program %p ID=%u Target=%s  Refcount++ to %d\n",
-             prog, prog->Id,
-             (prog->Target == GL_VERTEX_PROGRAM_ARB ? "VP" : "FP"),
-             prog->RefCount);
-#endif
-      /*_glthread_UNLOCK_MUTEX(prog->Mutex);*/
-   }
-
-   *ptr = prog;
-}
-
-
-/**
- * Return a copy of a program.
- * XXX Problem here if the program object is actually OO-derivation
- * made by a device driver.
- */
-struct gl_program *
-_mesa_clone_program(GLcontext *ctx, const struct gl_program *prog)
-{
-   struct gl_program *clone;
-
-   clone = ctx->Driver.NewProgram(ctx, prog->Target, prog->Id);
-   if (!clone)
-      return NULL;
-
-   assert(clone->Target == prog->Target);
-   assert(clone->RefCount == 1);
-
-   clone->String = (GLubyte *) _mesa_strdup((char *) prog->String);
-   clone->Format = prog->Format;
-   clone->Instructions = _mesa_alloc_instructions(prog->NumInstructions);
-   if (!clone->Instructions) {
-      _mesa_reference_program(ctx, &clone, NULL);
-      return NULL;
-   }
-   _mesa_copy_instructions(clone->Instructions, prog->Instructions,
-                           prog->NumInstructions);
-   clone->InputsRead = prog->InputsRead;
-   clone->OutputsWritten = prog->OutputsWritten;
-   clone->SamplersUsed = prog->SamplersUsed;
-   clone->ShadowSamplers = prog->ShadowSamplers;
-   memcpy(clone->TexturesUsed, prog->TexturesUsed, sizeof(prog->TexturesUsed));
-
-   if (prog->Parameters)
-      clone->Parameters = _mesa_clone_parameter_list(prog->Parameters);
-   memcpy(clone->LocalParams, prog->LocalParams, sizeof(clone->LocalParams));
-   if (prog->Varying)
-      clone->Varying = _mesa_clone_parameter_list(prog->Varying);
-   if (prog->Attributes)
-      clone->Attributes = _mesa_clone_parameter_list(prog->Attributes);
-   memcpy(clone->LocalParams, prog->LocalParams, sizeof(clone->LocalParams));
-   clone->NumInstructions = prog->NumInstructions;
-   clone->NumTemporaries = prog->NumTemporaries;
-   clone->NumParameters = prog->NumParameters;
-   clone->NumAttributes = prog->NumAttributes;
-   clone->NumAddressRegs = prog->NumAddressRegs;
-   clone->NumNativeInstructions = prog->NumNativeInstructions;
-   clone->NumNativeTemporaries = prog->NumNativeTemporaries;
-   clone->NumNativeParameters = prog->NumNativeParameters;
-   clone->NumNativeAttributes = prog->NumNativeAttributes;
-   clone->NumNativeAddressRegs = prog->NumNativeAddressRegs;
-   clone->NumAluInstructions = prog->NumAluInstructions;
-   clone->NumTexInstructions = prog->NumTexInstructions;
-   clone->NumTexIndirections = prog->NumTexIndirections;
-   clone->NumNativeAluInstructions = prog->NumNativeAluInstructions;
-   clone->NumNativeTexInstructions = prog->NumNativeTexInstructions;
-   clone->NumNativeTexIndirections = prog->NumNativeTexIndirections;
-
-   switch (prog->Target) {
-   case GL_VERTEX_PROGRAM_ARB:
-      {
-         const struct gl_vertex_program *vp
-            = (const struct gl_vertex_program *) prog;
-         struct gl_vertex_program *vpc = (struct gl_vertex_program *) clone;
-         vpc->IsPositionInvariant = vp->IsPositionInvariant;
-         vpc->IsNVProgram = vp->IsNVProgram;
-      }
-      break;
-   case GL_FRAGMENT_PROGRAM_ARB:
-      {
-         const struct gl_fragment_program *fp
-            = (const struct gl_fragment_program *) prog;
-         struct gl_fragment_program *fpc = (struct gl_fragment_program *) clone;
-         fpc->FogOption = fp->FogOption;
-         fpc->UsesKill = fp->UsesKill;
-         fpc->OriginUpperLeft = fp->OriginUpperLeft;
-         fpc->PixelCenterInteger = fp->PixelCenterInteger;
-      }
-      break;
-   default:
-      _mesa_problem(NULL, "Unexpected target in _mesa_clone_program");
-   }
-
-   return clone;
-}
-
-
-/**
- * Insert 'count' NOP instructions at 'start' in the given program.
- * Adjust branch targets accordingly.
- */
-GLboolean
-_mesa_insert_instructions(struct gl_program *prog, GLuint start, GLuint count)
-{
-   const GLuint origLen = prog->NumInstructions;
-   const GLuint newLen = origLen + count;
-   struct prog_instruction *newInst;
-   GLuint i;
-
-   /* adjust branches */
-   for (i = 0; i < prog->NumInstructions; i++) {
-      struct prog_instruction *inst = prog->Instructions + i;
-      if (inst->BranchTarget > 0) {
-         if ((GLuint)inst->BranchTarget >= start) {
-            inst->BranchTarget += count;
-         }
-      }
-   }
-
-   /* Alloc storage for new instructions */
-   newInst = _mesa_alloc_instructions(newLen);
-   if (!newInst) {
-      return GL_FALSE;
-   }
-
-   /* Copy 'start' instructions into new instruction buffer */
-   _mesa_copy_instructions(newInst, prog->Instructions, start);
-
-   /* init the new instructions */
-   _mesa_init_instructions(newInst + start, count);
-
-   /* Copy the remaining/tail instructions to new inst buffer */
-   _mesa_copy_instructions(newInst + start + count,
-                           prog->Instructions + start,
-                           origLen - start);
-
-   /* free old instructions */
-   _mesa_free_instructions(prog->Instructions, origLen);
-
-   /* install new instructions */
-   prog->Instructions = newInst;
-   prog->NumInstructions = newLen;
-
-   return GL_TRUE;
-}
-
-/**
- * Delete 'count' instructions at 'start' in the given program.
- * Adjust branch targets accordingly.
- */
-GLboolean
-_mesa_delete_instructions(struct gl_program *prog, GLuint start, GLuint count)
-{
-   const GLuint origLen = prog->NumInstructions;
-   const GLuint newLen = origLen - count;
-   struct prog_instruction *newInst;
-   GLuint i;
-
-   /* adjust branches */
-   for (i = 0; i < prog->NumInstructions; i++) {
-      struct prog_instruction *inst = prog->Instructions + i;
-      if (inst->BranchTarget > 0) {
-         if (inst->BranchTarget > (GLint) start) {
-            inst->BranchTarget -= count;
-         }
-      }
-   }
-
-   /* Alloc storage for new instructions */
-   newInst = _mesa_alloc_instructions(newLen);
-   if (!newInst) {
-      return GL_FALSE;
-   }
-
-   /* Copy 'start' instructions into new instruction buffer */
-   _mesa_copy_instructions(newInst, prog->Instructions, start);
-
-   /* Copy the remaining/tail instructions to new inst buffer */
-   _mesa_copy_instructions(newInst + start,
-                           prog->Instructions + start + count,
-                           newLen - start);
-
-   /* free old instructions */
-   _mesa_free_instructions(prog->Instructions, origLen);
-
-   /* install new instructions */
-   prog->Instructions = newInst;
-   prog->NumInstructions = newLen;
-
-   return GL_TRUE;
-}
-
-
-/**
- * Search instructions for registers that match (oldFile, oldIndex),
- * replacing them with (newFile, newIndex).
- */
-static void
-replace_registers(struct prog_instruction *inst, GLuint numInst,
-                  GLuint oldFile, GLuint oldIndex,
-                  GLuint newFile, GLuint newIndex)
-{
-   GLuint i, j;
-   for (i = 0; i < numInst; i++) {
-      /* src regs */
-      for (j = 0; j < _mesa_num_inst_src_regs(inst[i].Opcode); j++) {
-         if (inst[i].SrcReg[j].File == oldFile &&
-             inst[i].SrcReg[j].Index == oldIndex) {
-            inst[i].SrcReg[j].File = newFile;
-            inst[i].SrcReg[j].Index = newIndex;
-         }
-      }
-      /* dst reg */
-      if (inst[i].DstReg.File == oldFile && inst[i].DstReg.Index == oldIndex) {
-         inst[i].DstReg.File = newFile;
-         inst[i].DstReg.Index = newIndex;
-      }
-   }
-}
-
-
-/**
- * Search instructions for references to program parameters.  When found,
- * increment the parameter index by 'offset'.
- * Used when combining programs.
- */
-static void
-adjust_param_indexes(struct prog_instruction *inst, GLuint numInst,
-                     GLuint offset)
-{
-   GLuint i, j;
-   for (i = 0; i < numInst; i++) {
-      for (j = 0; j < _mesa_num_inst_src_regs(inst[i].Opcode); j++) {
-         GLuint f = inst[i].SrcReg[j].File;
-         if (f == PROGRAM_CONSTANT ||
-             f == PROGRAM_UNIFORM ||
-             f == PROGRAM_STATE_VAR) {
-            inst[i].SrcReg[j].Index += offset;
-         }
-      }
-   }
-}
-
-
-/**
- * Combine two programs into one.  Fix instructions so the outputs of
- * the first program go to the inputs of the second program.
- */
-struct gl_program *
-_mesa_combine_programs(GLcontext *ctx,
-                       const struct gl_program *progA,
-                       const struct gl_program *progB)
-{
-   struct prog_instruction *newInst;
-   struct gl_program *newProg;
-   const GLuint lenA = progA->NumInstructions - 1; /* omit END instr */
-   const GLuint lenB = progB->NumInstructions;
-   const GLuint numParamsA = _mesa_num_parameters(progA->Parameters);
-   const GLuint newLength = lenA + lenB;
-   GLboolean usedTemps[MAX_PROGRAM_TEMPS];
-   GLuint firstTemp = 0;
-   GLbitfield inputsB;
-   GLuint i;
-
-   ASSERT(progA->Target == progB->Target);
-
-   newInst = _mesa_alloc_instructions(newLength);
-   if (!newInst)
-      return GL_FALSE;
-
-   _mesa_copy_instructions(newInst, progA->Instructions, lenA);
-   _mesa_copy_instructions(newInst + lenA, progB->Instructions, lenB);
-
-   /* adjust branch / instruction addresses for B's instructions */
-   for (i = 0; i < lenB; i++) {
-      newInst[lenA + i].BranchTarget += lenA;
-   }
-
-   newProg = ctx->Driver.NewProgram(ctx, progA->Target, 0);
-   newProg->Instructions = newInst;
-   newProg->NumInstructions = newLength;
-
-   /* find used temp regs (we may need new temps below) */
-   _mesa_find_used_registers(newProg, PROGRAM_TEMPORARY,
-                             usedTemps, MAX_PROGRAM_TEMPS);
-
-   if (newProg->Target == GL_FRAGMENT_PROGRAM_ARB) {
-      struct gl_fragment_program *fprogA, *fprogB, *newFprog;
-      GLbitfield progB_inputsRead = progB->InputsRead;
-      GLint progB_colorFile, progB_colorIndex;
-
-      fprogA = (struct gl_fragment_program *) progA;
-      fprogB = (struct gl_fragment_program *) progB;
-      newFprog = (struct gl_fragment_program *) newProg;
-
-      newFprog->UsesKill = fprogA->UsesKill || fprogB->UsesKill;
-
-      /* We'll do a search and replace for instances
-       * of progB_colorFile/progB_colorIndex below...
-       */
-      progB_colorFile = PROGRAM_INPUT;
-      progB_colorIndex = FRAG_ATTRIB_COL0;
-
-      /*
-       * The fragment program may get color from a state var rather than
-       * a fragment input (vertex output) if it's constant.
-       * See the texenvprogram.c code.
-       * So, search the program's parameter list now to see if the program
-       * gets color from a state var instead of a conventional fragment
-       * input register.
-       */
-      for (i = 0; i < progB->Parameters->NumParameters; i++) {
-         struct gl_program_parameter *p = &progB->Parameters->Parameters[i];
-         if (p->Type == PROGRAM_STATE_VAR &&
-             p->StateIndexes[0] == STATE_INTERNAL &&
-             p->StateIndexes[1] == STATE_CURRENT_ATTRIB &&
-             p->StateIndexes[2] == VERT_ATTRIB_COLOR0) {
-            progB_inputsRead |= FRAG_BIT_COL0;
-            progB_colorFile = PROGRAM_STATE_VAR;
-            progB_colorIndex = i;
-            break;
-         }
-      }
-
-      /* Connect color outputs of fprogA to color inputs of fprogB, via a
-       * new temporary register.
-       */
-      if ((progA->OutputsWritten & (1 << FRAG_RESULT_COLOR)) &&
-          (progB_inputsRead & FRAG_BIT_COL0)) {
-         GLint tempReg = _mesa_find_free_register(usedTemps, MAX_PROGRAM_TEMPS,
-                                                  firstTemp);
-         if (tempReg < 0) {
-            _mesa_problem(ctx, "No free temp regs found in "
-                          "_mesa_combine_programs(), using 31");
-            tempReg = 31;
-         }
-         firstTemp = tempReg + 1;
-
-         /* replace writes to result.color[0] with tempReg */
-         replace_registers(newInst, lenA,
-                           PROGRAM_OUTPUT, FRAG_RESULT_COLOR,
-                           PROGRAM_TEMPORARY, tempReg);
-         /* replace reads from the input color with tempReg */
-         replace_registers(newInst + lenA, lenB,
-                           progB_colorFile, progB_colorIndex, /* search for */
-                           PROGRAM_TEMPORARY, tempReg  /* replace with */ );
-      }
-
-      /* compute combined program's InputsRead */
-      inputsB = progB_inputsRead;
-      if (progA->OutputsWritten & (1 << FRAG_RESULT_COLOR)) {
-         inputsB &= ~(1 << FRAG_ATTRIB_COL0);
-      }
-      newProg->InputsRead = progA->InputsRead | inputsB;
-      newProg->OutputsWritten = progB->OutputsWritten;
-      newProg->SamplersUsed = progA->SamplersUsed | progB->SamplersUsed;
-   }
-   else {
-      /* vertex program */
-      assert(0);      /* XXX todo */
-   }
-
-   /*
-    * Merge parameters (uniforms, constants, etc)
-    */
-   newProg->Parameters = _mesa_combine_parameter_lists(progA->Parameters,
-                                                       progB->Parameters);
-
-   adjust_param_indexes(newInst + lenA, lenB, numParamsA);
-
-
-   return newProg;
-}
-
-
-/**
- * Populate the 'used' array with flags indicating which registers (TEMPs,
- * INPUTs, OUTPUTs, etc, are used by the given program.
- * \param file  type of register to scan for
- * \param used  returns true/false flags for in use / free
- * \param usedSize  size of the 'used' array
- */
-void
-_mesa_find_used_registers(const struct gl_program *prog,
-                          gl_register_file file,
-                          GLboolean used[], GLuint usedSize)
-{
-   GLuint i, j;
-
-   memset(used, 0, usedSize);
-
-   for (i = 0; i < prog->NumInstructions; i++) {
-      const struct prog_instruction *inst = prog->Instructions + i;
-      const GLuint n = _mesa_num_inst_src_regs(inst->Opcode);
-
-      if (inst->DstReg.File == file) {
-         used[inst->DstReg.Index] = GL_TRUE;
-      }
-
-      for (j = 0; j < n; j++) {
-         if (inst->SrcReg[j].File == file) {
-            used[inst->SrcReg[j].Index] = GL_TRUE;
-         }
-      }
-   }
-}
-
-
-/**
- * Scan the given 'used' register flag array for the first entry
- * that's >= firstReg.
- * \param used  vector of flags indicating registers in use (as returned
- *              by _mesa_find_used_registers())
- * \param usedSize  size of the 'used' array
- * \param firstReg  first register to start searching at
- * \return index of unused register, or -1 if none.
- */
-GLint
-_mesa_find_free_register(const GLboolean used[],
-                         GLuint usedSize, GLuint firstReg)
-{
-   GLuint i;
-
-   assert(firstReg < usedSize);
-
-   for (i = firstReg; i < usedSize; i++)
-      if (!used[i])
-         return i;
-
-   return -1;
-}
-
-
-/**
- * "Post-process" a GPU program.  This is intended to be used for debugging.
- * Example actions include no-op'ing instructions or changing instruction
- * behaviour.
- */
-void
-_mesa_postprocess_program(GLcontext *ctx, struct gl_program *prog)
-{
-   static const GLfloat white[4] = { 0.5, 0.5, 0.5, 0.5 };
-   GLuint i;
-   GLuint whiteSwizzle;
-   GLint whiteIndex = _mesa_add_unnamed_constant(prog->Parameters,
-                                                 white, 4, &whiteSwizzle);
-
-   (void) whiteIndex;
-
-   for (i = 0; i < prog->NumInstructions; i++) {
-      struct prog_instruction *inst = prog->Instructions + i;
-      const GLuint n = _mesa_num_inst_src_regs(inst->Opcode);
-
-      (void) n;
-
-      if (_mesa_is_tex_instruction(inst->Opcode)) {
-#if 0
-         /* replace TEX/TXP/TXB with MOV */
-         inst->Opcode = OPCODE_MOV;
-         inst->DstReg.WriteMask = WRITEMASK_XYZW;
-         inst->SrcReg[0].Swizzle = SWIZZLE_XYZW;
-         inst->SrcReg[0].Negate = NEGATE_NONE;
-#endif
-
-#if 0
-         /* disable shadow texture mode */
-         inst->TexShadow = 0;
-#endif
-      }
-
-      if (inst->Opcode == OPCODE_TXP) {
-#if 0
-         inst->Opcode = OPCODE_MOV;
-         inst->DstReg.WriteMask = WRITEMASK_XYZW;
-         inst->SrcReg[0].File = PROGRAM_CONSTANT;
-         inst->SrcReg[0].Index = whiteIndex;
-         inst->SrcReg[0].Swizzle = SWIZZLE_XYZW;
-         inst->SrcReg[0].Negate = NEGATE_NONE;
-#endif
-#if 0
-         inst->TexShadow = 0;
-#endif
-#if 0
-         inst->Opcode = OPCODE_TEX;
-         inst->TexShadow = 0;
-#endif
-      }
-
-   }
-}
diff --git a/mesalib/src/mesa/shader/program.h b/mesalib/src/mesa/shader/program.h
deleted file mode 100644
index af9f4170d..000000000
--- a/mesalib/src/mesa/shader/program.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.3
- *
- * 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 program.c
- * Vertex and fragment program support functions.
- * \author Brian Paul
- */
-
-
-/**
- * \mainpage Mesa vertex and fragment program module
- *
- * This module or directory contains most of the code for vertex and
- * fragment programs and shaders, including state management, parsers,
- * and (some) software routines for executing programs
- */
-
-#ifndef PROGRAM_H
-#define PROGRAM_H
-
-#include "main/mtypes.h"
-
-
-extern struct gl_program _mesa_DummyProgram;
-
-
-extern void
-_mesa_init_program(GLcontext *ctx);
-
-extern void
-_mesa_free_program_data(GLcontext *ctx);
-
-extern void
-_mesa_update_default_objects_program(GLcontext *ctx);
-
-extern void
-_mesa_set_program_error(GLcontext *ctx, GLint pos, const char *string);
-
-extern const GLubyte *
-_mesa_find_line_column(const GLubyte *string, const GLubyte *pos,
-                       GLint *line, GLint *col);
-
-
-extern struct gl_program *
-_mesa_init_vertex_program(GLcontext *ctx,
-                          struct gl_vertex_program *prog,
-                          GLenum target, GLuint id);
-
-extern struct gl_program *
-_mesa_init_fragment_program(GLcontext *ctx,
-                            struct gl_fragment_program *prog,
-                            GLenum target, GLuint id);
-
-extern struct gl_program *
-_mesa_new_program(GLcontext *ctx, GLenum target, GLuint id);
-
-extern void
-_mesa_delete_program(GLcontext *ctx, struct gl_program *prog);
-
-extern struct gl_program *
-_mesa_lookup_program(GLcontext *ctx, GLuint id);
-
-extern void
-_mesa_reference_program(GLcontext *ctx,
-                        struct gl_program **ptr,
-                        struct gl_program *prog);
-
-static INLINE void
-_mesa_reference_vertprog(GLcontext *ctx,
-                         struct gl_vertex_program **ptr,
-                         struct gl_vertex_program *prog)
-{
-   _mesa_reference_program(ctx, (struct gl_program **) ptr,
-                           (struct gl_program *) prog);
-}
-
-static INLINE void
-_mesa_reference_fragprog(GLcontext *ctx,
-                         struct gl_fragment_program **ptr,
-                         struct gl_fragment_program *prog)
-{
-   _mesa_reference_program(ctx, (struct gl_program **) ptr,
-                           (struct gl_program *) prog);
-}
-
-extern struct gl_program *
-_mesa_clone_program(GLcontext *ctx, const struct gl_program *prog);
-
-static INLINE struct gl_vertex_program *
-_mesa_clone_vertex_program(GLcontext *ctx,
-                           const struct gl_vertex_program *prog)
-{
-   return (struct gl_vertex_program *) _mesa_clone_program(ctx, &prog->Base);
-}
-
-
-static INLINE struct gl_fragment_program *
-_mesa_clone_fragment_program(GLcontext *ctx,
-                             const struct gl_fragment_program *prog)
-{
-   return (struct gl_fragment_program *) _mesa_clone_program(ctx, &prog->Base);
-}
-
-
-extern  GLboolean
-_mesa_insert_instructions(struct gl_program *prog, GLuint start, GLuint count);
-
-extern  GLboolean
-_mesa_delete_instructions(struct gl_program *prog, GLuint start, GLuint count);
-
-extern struct gl_program *
-_mesa_combine_programs(GLcontext *ctx,
-                       const struct gl_program *progA,
-                       const struct gl_program *progB);
-
-extern void
-_mesa_find_used_registers(const struct gl_program *prog,
-                          gl_register_file file,
-                          GLboolean used[], GLuint usedSize);
-
-extern GLint
-_mesa_find_free_register(const GLboolean used[],
-                         GLuint maxRegs, GLuint firstReg);
-
-extern void
-_mesa_postprocess_program(GLcontext *ctx, struct gl_program *prog);
-
-
-#endif /* PROGRAM_H */
diff --git a/mesalib/src/mesa/shader/program_lexer.l b/mesalib/src/mesa/shader/program_lexer.l
deleted file mode 100644
index fe18272cd..000000000
--- a/mesalib/src/mesa/shader/program_lexer.l
+++ /dev/null
@@ -1,495 +0,0 @@
-%{
-/*
- * 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 "shader/prog_instruction.h"
-#include "shader/prog_statevars.h"
-
-#include "shader/symbol_table.h"
-#include "shader/program_parser.h"
-#include "shader/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_EXTRA_TYPE struct asm_parser_state *
-%}
-
-num    [0-9]+
-exp    [Ee][-+]?[0-9]+
-frac   "."[0-9]+
-dot    "."[ \t]*
-
-sz     [HRX]?
-szf    [HR]?
-cc     C?
-sat    (_SAT)?
-
-%option bison-bridge bison-locations reentrant noyywrap
-%%
-
-"!!ARBvp1.0"              { return ARBvp_10; }
-"!!ARBfp1.0"              { return ARBfp_10; }
-ADDRESS                   {
-   yylval->integer = at_address;
-   return_token_or_IDENTIFIER(require_ARB_vp, ADDRESS);
-}
-ALIAS                     { return ALIAS; }
-ATTRIB                    { return ATTRIB; }
-END                       { return END; }
-OPTION                    { return OPTION; }
-OUTPUT                    { return OUTPUT; }
-PARAM                     { return PARAM; }
-TEMP                      { yylval->integer = at_temp; return TEMP; }
-
-ABS{sz}{cc}{sat}   { return_opcode(             1, VECTOR_OP, ABS, 3); }
-ADD{sz}{cc}{sat}   { return_opcode(             1, BIN_OP, ADD, 3); }
-ARL                { return_opcode(require_ARB_vp, ARL, ARL, 3); }
-
-CMP{sat}           { return_opcode(require_ARB_fp, TRI_OP, CMP, 3); }
-COS{szf}{cc}{sat}  { return_opcode(require_ARB_fp, SCALAR_OP, COS, 3); }
-
-DDX{szf}{cc}{sat}  { return_opcode(require_NV_fp,  VECTOR_OP, DDX, 3); }
-DDY{szf}{cc}{sat}  { return_opcode(require_NV_fp,  VECTOR_OP, DDY, 3); }
-DP3{sz}{cc}{sat}   { return_opcode(             1, BIN_OP, DP3, 3); }
-DP4{sz}{cc}{sat}   { return_opcode(             1, BIN_OP, DP4, 3); }
-DPH{sz}{cc}{sat}   { return_opcode(             1, BIN_OP, DPH, 3); }
-DST{szf}{cc}{sat}  { return_opcode(             1, BIN_OP, DST, 3); }
-
-EX2{szf}{cc}{sat}  { return_opcode(             1, SCALAR_OP, EX2, 3); }
-EXP                { return_opcode(require_ARB_vp, SCALAR_OP, EXP, 3); }
-
-FLR{sz}{cc}{sat}   { return_opcode(             1, VECTOR_OP, FLR, 3); }
-FRC{sz}{cc}{sat}   { return_opcode(             1, VECTOR_OP, FRC, 3); }
-
-KIL                { return_opcode(require_ARB_fp, KIL, KIL, 3); }
-
-LIT{szf}{cc}{sat}  { return_opcode(             1, VECTOR_OP, LIT, 3); }
-LG2{szf}{cc}{sat}  { return_opcode(             1, SCALAR_OP, LG2, 3); }
-LOG                { return_opcode(require_ARB_vp, SCALAR_OP, LOG, 3); }
-LRP{sz}{cc}{sat}   { return_opcode(require_ARB_fp, TRI_OP, LRP, 3); }
-
-MAD{sz}{cc}{sat}   { return_opcode(             1, TRI_OP, MAD, 3); }
-MAX{sz}{cc}{sat}   { return_opcode(             1, BIN_OP, MAX, 3); }
-MIN{sz}{cc}{sat}   { return_opcode(             1, BIN_OP, MIN, 3); }
-MOV{sz}{cc}{sat}   { return_opcode(             1, VECTOR_OP, MOV, 3); }
-MUL{sz}{cc}{sat}   { return_opcode(             1, BIN_OP, MUL, 3); }
-
-PK2H               { return_opcode(require_NV_fp,  VECTOR_OP, PK2H, 4); }
-PK2US              { return_opcode(require_NV_fp,  VECTOR_OP, PK2US, 5); }
-PK4B               { return_opcode(require_NV_fp,  VECTOR_OP, PK4B, 4); }
-PK4UB              { return_opcode(require_NV_fp,  VECTOR_OP, PK4UB, 5); }
-POW{szf}{cc}{sat}  { return_opcode(             1, BINSC_OP, POW, 3); }
-
-RCP{szf}{cc}{sat}  { return_opcode(             1, SCALAR_OP, RCP, 3); }
-RFL{szf}{cc}{sat}  { return_opcode(require_NV_fp,  BIN_OP,    RFL, 3); }
-RSQ{szf}{cc}{sat}  { return_opcode(             1, SCALAR_OP, RSQ, 3); }
-
-SCS{sat}           { return_opcode(require_ARB_fp, SCALAR_OP, SCS, 3); }
-SEQ{sz}{cc}{sat}   { return_opcode(require_NV_fp,  BIN_OP, SEQ, 3); }
-SFL{sz}{cc}{sat}   { return_opcode(require_NV_fp,  BIN_OP, SFL, 3); }
-SGE{sz}{cc}{sat}   { return_opcode(             1, BIN_OP, SGE, 3); }
-SGT{sz}{cc}{sat}   { return_opcode(require_NV_fp,  BIN_OP, SGT, 3); }
-SIN{szf}{cc}{sat}  { return_opcode(require_ARB_fp, SCALAR_OP, SIN, 3); }
-SLE{sz}{cc}{sat}   { return_opcode(require_NV_fp,  BIN_OP, SLE, 3); }
-SLT{sz}{cc}{sat}   { return_opcode(             1, BIN_OP, SLT, 3); }
-SNE{sz}{cc}{sat}   { return_opcode(require_NV_fp,  BIN_OP, SNE, 3); }
-STR{sz}{cc}{sat}   { return_opcode(require_NV_fp,  BIN_OP, STR, 3); }
-SUB{sz}{cc}{sat}   { return_opcode(             1, BIN_OP, SUB, 3); }
-SWZ{sat}           { return_opcode(             1, SWZ, SWZ, 3); }
-
-TEX{cc}{sat}       { return_opcode(require_ARB_fp, SAMPLE_OP, TEX, 3); }
-TXB{cc}{sat}       { return_opcode(require_ARB_fp, SAMPLE_OP, TXB, 3); }
-TXD{cc}{sat}       { return_opcode(require_NV_fp,  TXD_OP, TXD, 3); }
-TXP{cc}{sat}       { return_opcode(require_ARB_fp, SAMPLE_OP, TXP, 3); }
-
-UP2H{cc}{sat}      { return_opcode(require_NV_fp,  SCALAR_OP, UP2H, 4); }
-UP2US{cc}{sat}     { return_opcode(require_NV_fp,  SCALAR_OP, UP2US, 5); }
-UP4B{cc}{sat}      { return_opcode(require_NV_fp,  SCALAR_OP, UP4B, 4); }
-UP4UB{cc}{sat}     { return_opcode(require_NV_fp,  SCALAR_OP, UP4UB, 5); }
-
-X2D{szf}{cc}{sat}  { return_opcode(require_NV_fp,  TRI_OP, X2D, 3); }
-XPD{sat}           { return_opcode(             1, BIN_OP, XPD, 3); }
-
-vertex                    { return_token_or_IDENTIFIER(require_ARB_vp, VERTEX); }
-fragment                  { return_token_or_IDENTIFIER(require_ARB_fp, FRAGMENT); }
-program                   { return PROGRAM; }
-state                     { return STATE; }
-result                    { return RESULT; }
-
-{dot}ambient              { return AMBIENT; }
-{dot}attenuation          { return ATTENUATION; }
-{dot}back                 { return BACK; }
-{dot}clip                 { return_token_or_DOT(require_ARB_vp, CLIP); }
-{dot}color                { return COLOR; }
-{dot}depth                { return_token_or_DOT(require_ARB_fp, DEPTH); }
-{dot}diffuse              { return DIFFUSE; }
-{dot}direction            { return DIRECTION; }
-{dot}emission             { return EMISSION; }
-{dot}env                  { return ENV; }
-{dot}eye                  { return EYE; }
-{dot}fogcoord             { return FOGCOORD; }
-{dot}fog                  { return FOG; }
-{dot}front                { return FRONT; }
-{dot}half                 { return HALF; }
-{dot}inverse              { return INVERSE; }
-{dot}invtrans             { return INVTRANS; }
-{dot}light                { return LIGHT; }
-{dot}lightmodel           { return LIGHTMODEL; }
-{dot}lightprod            { return LIGHTPROD; }
-{dot}local                { return LOCAL; }
-{dot}material             { return MATERIAL; }
-{dot}program              { return MAT_PROGRAM; }
-{dot}matrix               { return MATRIX; }
-{dot}matrixindex          { return_token_or_DOT(require_ARB_vp, MATRIXINDEX); }
-{dot}modelview            { return MODELVIEW; }
-{dot}mvp                  { return MVP; }
-{dot}normal               { return_token_or_DOT(require_ARB_vp, NORMAL); }
-{dot}object               { return OBJECT; }
-{dot}palette              { return PALETTE; }
-{dot}params               { return PARAMS; }
-{dot}plane                { return PLANE; }
-{dot}point                { return_token_or_DOT(require_ARB_vp, POINT_TOK); }
-{dot}pointsize            { return_token_or_DOT(require_ARB_vp, POINTSIZE); }
-{dot}position             { return POSITION; }
-{dot}primary              { return PRIMARY; }
-{dot}projection           { return PROJECTION; }
-{dot}range                { return_token_or_DOT(require_ARB_fp, RANGE); }
-{dot}row                  { return ROW; }
-{dot}scenecolor           { return SCENECOLOR; }
-{dot}secondary            { return SECONDARY; }
-{dot}shininess            { return SHININESS; }
-{dot}size                 { return_token_or_DOT(require_ARB_vp, SIZE_TOK); }
-{dot}specular             { return SPECULAR; }
-{dot}spot                 { return SPOT; }
-{dot}texcoord             { return TEXCOORD; }
-{dot}texenv               { return_token_or_DOT(require_ARB_fp, TEXENV); }
-{dot}texgen               { return_token_or_DOT(require_ARB_vp, TEXGEN); }
-{dot}q                    { return_token_or_DOT(require_ARB_vp, TEXGEN_Q); }
-{dot}s                    { return_token_or_DOT(require_ARB_vp, TEXGEN_S); }
-{dot}t                    { return_token_or_DOT(require_ARB_vp, TEXGEN_T); }
-{dot}texture              { return TEXTURE; }
-{dot}transpose            { return TRANSPOSE; }
-{dot}attrib               { return_token_or_DOT(require_ARB_vp, VTXATTRIB); }
-{dot}weight               { return_token_or_DOT(require_ARB_vp, WEIGHT); }
-
-texture                   { return_token_or_IDENTIFIER(require_ARB_fp, TEXTURE_UNIT); }
-1D                        { return_token_or_IDENTIFIER(require_ARB_fp, TEX_1D); }
-2D                        { return_token_or_IDENTIFIER(require_ARB_fp, TEX_2D); }
-3D                        { return_token_or_IDENTIFIER(require_ARB_fp, TEX_3D); }
-CUBE                      { return_token_or_IDENTIFIER(require_ARB_fp, TEX_CUBE); }
-RECT                      { return_token_or_IDENTIFIER(require_ARB_fp && require_rect, TEX_RECT); }
-SHADOW1D                  { return_token_or_IDENTIFIER(require_ARB_fp && require_shadow, TEX_SHADOW1D); }
-SHADOW2D                  { return_token_or_IDENTIFIER(require_ARB_fp && require_shadow, TEX_SHADOW2D); }
-SHADOWRECT                { return_token_or_IDENTIFIER(require_ARB_fp && require_shadow && require_rect, TEX_SHADOWRECT); }
-ARRAY1D                   { return_token_or_IDENTIFIER(require_ARB_fp && require_texarray, TEX_ARRAY1D); }
-ARRAY2D                   { return_token_or_IDENTIFIER(require_ARB_fp && require_texarray, TEX_ARRAY2D); }
-ARRAYSHADOW1D             { return_token_or_IDENTIFIER(require_ARB_fp && require_shadow && require_texarray, TEX_ARRAYSHADOW1D); }
-ARRAYSHADOW2D             { return_token_or_IDENTIFIER(require_ARB_fp && require_shadow && require_texarray, TEX_ARRAYSHADOW2D); }
-
-[_a-zA-Z$][_a-zA-Z0-9$]*  { return handle_ident(yyextra, yytext, yylval); }
-
-".."                      { return DOT_DOT; }
-
-{num}                     {
-   yylval->integer = strtol(yytext, NULL, 10);
-   return INTEGER;
-}
-{num}?{frac}{exp}?        {
-   yylval->real = _mesa_strtof(yytext, NULL);
-   return REAL;
-}
-{num}"."/[^.]             {
-   yylval->real = _mesa_strtof(yytext, NULL);
-   return REAL;
-}
-{num}{exp}                {
-   yylval->real = _mesa_strtof(yytext, NULL);
-   return REAL;
-}
-{num}"."{exp}             {
-   yylval->real = _mesa_strtof(yytext, NULL);
-   return REAL;
-}
-
-".xyzw"                   {
-   yylval->swiz_mask.swizzle = SWIZZLE_NOOP;
-   yylval->swiz_mask.mask = WRITEMASK_XYZW;
-   return MASK4;
-}
-
-".xy"[zw]                 {
-   yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
-   yylval->swiz_mask.mask = WRITEMASK_XY
-      | mask_from_char(yytext[3]);
-   return MASK3;
-}
-".xzw"                    {
-   yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
-   yylval->swiz_mask.mask = WRITEMASK_XZW;
-   return MASK3;
-}
-".yzw"                    {
-   yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
-   yylval->swiz_mask.mask = WRITEMASK_YZW;
-   return MASK3;
-}
-
-".x"[yzw]                 {
-   yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
-   yylval->swiz_mask.mask = WRITEMASK_X
-      | mask_from_char(yytext[2]);
-   return MASK2;
-}
-".y"[zw]                  {
-   yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
-   yylval->swiz_mask.mask = WRITEMASK_Y
-      | mask_from_char(yytext[2]);
-   return MASK2;
-}
-".zw"                     {
-   yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
-   yylval->swiz_mask.mask = WRITEMASK_ZW;
-   return MASK2;
-}
-
-"."[xyzw]                 {
-   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; 
-}
-
-"."[xyzw]{4}              {
-   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;
-}
-
-".rgba"                   {
-   yylval->swiz_mask.swizzle = SWIZZLE_NOOP;
-   yylval->swiz_mask.mask = WRITEMASK_XYZW;
-   return_token_or_DOT(require_ARB_fp, MASK4);
-}
-
-".rg"[ba]                 {
-   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);
-}
-".rba"                    {
-   yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
-   yylval->swiz_mask.mask = WRITEMASK_XZW;
-   return_token_or_DOT(require_ARB_fp, MASK3);
-}
-".gba"                    {
-   yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
-   yylval->swiz_mask.mask = WRITEMASK_YZW;
-   return_token_or_DOT(require_ARB_fp, MASK3);
-}
-
-".r"[gba]                 {
-   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);
-}
-".g"[ba]                  {
-   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);
-}
-".ba"                     {
-   yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
-   yylval->swiz_mask.mask = WRITEMASK_ZW;
-   return_token_or_DOT(require_ARB_fp, MASK2);
-}
-
-"."[gba]                  {
-   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);
-}
-
-
-".r"                      {
-   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;
-   }
-}
-
-"."[rgba]{4}              {
-   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);
-}
-
-"."                       { return DOT; }
-
-\n                        {
-   yylloc->first_line++;
-   yylloc->first_column = 1;
-   yylloc->last_line++;
-   yylloc->last_column = 1;
-   yylloc->position++;
-}
-[ \t\r]+                  /* eat whitespace */ ;
-#.*$                      /* eat comments */ ;
-.                         { return yytext[0]; }
-%%
-
-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/shader/program_parse.tab.c b/mesalib/src/mesa/shader/program_parse.tab.c
deleted file mode 100644
index 5679b6497..000000000
--- a/mesalib/src/mesa/shader/program_parse.tab.c
+++ /dev/null
@@ -1,5728 +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 "shader/program.h"
-#include "shader/prog_parameter.h"
-#include "shader/prog_parameter_layout.h"
-#include "shader/prog_statevars.h"
-#include "shader/prog_instruction.h"
-
-#include "shader/symbol_table.h"
-#include "shader/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,   847,   857,   861,   890,   909,   909,   911,
-     918,   930,   931,   932,   935,   949,   963,   983,   994,  1006,
-    1008,  1009,  1010,  1011,  1014,  1014,  1014,  1014,  1015,  1018,
-    1022,  1027,  1034,  1041,  1048,  1071,  1094,  1095,  1096,  1097,
-    1098,  1099,  1102,  1121,  1125,  1131,  1135,  1139,  1143,  1152,
-    1161,  1165,  1170,  1176,  1187,  1187,  1188,  1190,  1194,  1198,
-    1202,  1208,  1208,  1210,  1228,  1254,  1257,  1268,  1274,  1280,
-    1281,  1288,  1294,  1300,  1308,  1314,  1320,  1328,  1334,  1340,
-    1348,  1349,  1352,  1353,  1354,  1355,  1356,  1357,  1358,  1359,
-    1360,  1361,  1362,  1365,  1374,  1378,  1382,  1388,  1397,  1401,
-    1405,  1414,  1418,  1424,  1430,  1437,  1442,  1450,  1460,  1462,
-    1470,  1476,  1480,  1484,  1490,  1501,  1510,  1514,  1519,  1523,
-    1527,  1531,  1537,  1544,  1548,  1554,  1562,  1573,  1580,  1584,
-    1590,  1600,  1611,  1615,  1633,  1642,  1645,  1651,  1655,  1659,
-    1665,  1676,  1681,  1686,  1691,  1696,  1701,  1709,  1712,  1717,
-    1730,  1738,  1749,  1757,  1757,  1759,  1759,  1761,  1771,  1776,
-    1783,  1793,  1802,  1807,  1814,  1824,  1834,  1846,  1846,  1847,
-    1847,  1849,  1859,  1867,  1877,  1885,  1893,  1902,  1913,  1917,
-    1923,  1924,  1925,  1928,  1928,  1931,  1966,  1970,  1970,  1973,
-    1980,  1989,  2003,  2012,  2021,  2025,  2034,  2043,  2054,  2061,
-    2066,  2075,  2087,  2090,  2099,  2110,  2111,  2112,  2115,  2116,
-    2117,  2120,  2121,  2124,  2125,  2128,  2129,  2132,  2143,  2154,
-    2165,  2191,  2192
-};
-#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) {
-	      (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 848 "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 858 "program_parse.y"
-    {
-	   set_dst_reg(& (yyval.dst_reg), PROGRAM_OUTPUT, (yyvsp[(1) - (1)].result));
-	;}
-    break;
-
-  case 65:
-
-/* Line 1455 of yacc.c  */
-#line 862 "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 891 "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 912 "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 919 "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 930 "program_parse.y"
-    { (yyval.integer) = 0; ;}
-    break;
-
-  case 72:
-
-/* Line 1455 of yacc.c  */
-#line 931 "program_parse.y"
-    { (yyval.integer) = (yyvsp[(2) - (2)].integer); ;}
-    break;
-
-  case 73:
-
-/* Line 1455 of yacc.c  */
-#line 932 "program_parse.y"
-    { (yyval.integer) = -(yyvsp[(2) - (2)].integer); ;}
-    break;
-
-  case 74:
-
-/* Line 1455 of yacc.c  */
-#line 936 "program_parse.y"
-    {
-	   if (((yyvsp[(1) - (1)].integer) < 0) || ((yyvsp[(1) - (1)].integer) > 63)) {
-              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 950 "program_parse.y"
-    {
-	   if (((yyvsp[(1) - (1)].integer) < 0) || ((yyvsp[(1) - (1)].integer) > 64)) {
-              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 964 "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 984 "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 995 "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 1011 "program_parse.y"
-    { (yyval.swiz_mask).swizzle = SWIZZLE_NOOP; (yyval.swiz_mask).mask = WRITEMASK_XYZW; ;}
-    break;
-
-  case 88:
-
-/* Line 1455 of yacc.c  */
-#line 1015 "program_parse.y"
-    { (yyval.swiz_mask).swizzle = SWIZZLE_NOOP; (yyval.swiz_mask).mask = WRITEMASK_XYZW; ;}
-    break;
-
-  case 89:
-
-/* Line 1455 of yacc.c  */
-#line 1019 "program_parse.y"
-    {
-	   (yyval.dst_reg) = (yyvsp[(2) - (3)].dst_reg);
-	;}
-    break;
-
-  case 90:
-
-/* Line 1455 of yacc.c  */
-#line 1023 "program_parse.y"
-    {
-	   (yyval.dst_reg) = (yyvsp[(2) - (3)].dst_reg);
-	;}
-    break;
-
-  case 91:
-
-/* Line 1455 of yacc.c  */
-#line 1027 "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 1035 "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 1042 "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 1049 "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 1072 "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 1103 "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 1122 "program_parse.y"
-    {
-	   (yyval.attrib) = (yyvsp[(2) - (2)].attrib);
-	;}
-    break;
-
-  case 104:
-
-/* Line 1455 of yacc.c  */
-#line 1126 "program_parse.y"
-    {
-	   (yyval.attrib) = (yyvsp[(2) - (2)].attrib);
-	;}
-    break;
-
-  case 105:
-
-/* Line 1455 of yacc.c  */
-#line 1132 "program_parse.y"
-    {
-	   (yyval.attrib) = VERT_ATTRIB_POS;
-	;}
-    break;
-
-  case 106:
-
-/* Line 1455 of yacc.c  */
-#line 1136 "program_parse.y"
-    {
-	   (yyval.attrib) = VERT_ATTRIB_WEIGHT;
-	;}
-    break;
-
-  case 107:
-
-/* Line 1455 of yacc.c  */
-#line 1140 "program_parse.y"
-    {
-	   (yyval.attrib) = VERT_ATTRIB_NORMAL;
-	;}
-    break;
-
-  case 108:
-
-/* Line 1455 of yacc.c  */
-#line 1144 "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 1153 "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 1162 "program_parse.y"
-    {
-	   (yyval.attrib) = VERT_ATTRIB_TEX0 + (yyvsp[(2) - (2)].integer);
-	;}
-    break;
-
-  case 111:
-
-/* Line 1455 of yacc.c  */
-#line 1166 "program_parse.y"
-    {
-	   yyerror(& (yylsp[(1) - (4)]), state, "GL_ARB_matrix_palette not supported");
-	   YYERROR;
-	;}
-    break;
-
-  case 112:
-
-/* Line 1455 of yacc.c  */
-#line 1171 "program_parse.y"
-    {
-	   (yyval.attrib) = VERT_ATTRIB_GENERIC0 + (yyvsp[(3) - (4)].integer);
-	;}
-    break;
-
-  case 113:
-
-/* Line 1455 of yacc.c  */
-#line 1177 "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 1191 "program_parse.y"
-    {
-	   (yyval.attrib) = FRAG_ATTRIB_WPOS;
-	;}
-    break;
-
-  case 118:
-
-/* Line 1455 of yacc.c  */
-#line 1195 "program_parse.y"
-    {
-	   (yyval.attrib) = FRAG_ATTRIB_COL0 + (yyvsp[(2) - (2)].integer);
-	;}
-    break;
-
-  case 119:
-
-/* Line 1455 of yacc.c  */
-#line 1199 "program_parse.y"
-    {
-	   (yyval.attrib) = FRAG_ATTRIB_FOGC;
-	;}
-    break;
-
-  case 120:
-
-/* Line 1455 of yacc.c  */
-#line 1203 "program_parse.y"
-    {
-	   (yyval.attrib) = FRAG_ATTRIB_TEX0 + (yyvsp[(2) - (2)].integer);
-	;}
-    break;
-
-  case 123:
-
-/* Line 1455 of yacc.c  */
-#line 1211 "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 = SWIZZLE_XYZW;
-	      s->param_is_array = 0;
-	   }
-	;}
-    break;
-
-  case 124:
-
-/* Line 1455 of yacc.c  */
-#line 1229 "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 1254 "program_parse.y"
-    {
-	   (yyval.integer) = 0;
-	;}
-    break;
-
-  case 126:
-
-/* Line 1455 of yacc.c  */
-#line 1258 "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 1269 "program_parse.y"
-    {
-	   (yyval.temp_sym) = (yyvsp[(2) - (2)].temp_sym);
-	;}
-    break;
-
-  case 128:
-
-/* Line 1455 of yacc.c  */
-#line 1275 "program_parse.y"
-    {
-	   (yyval.temp_sym) = (yyvsp[(3) - (4)].temp_sym);
-	;}
-    break;
-
-  case 130:
-
-/* Line 1455 of yacc.c  */
-#line 1282 "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 1289 "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 1295 "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 1301 "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 1309 "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 1315 "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 1321 "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 1329 "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 1335 "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 1341 "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 1348 "program_parse.y"
-    { memcpy((yyval.state), (yyvsp[(1) - (1)].state), sizeof((yyval.state))); ;}
-    break;
-
-  case 141:
-
-/* Line 1455 of yacc.c  */
-#line 1349 "program_parse.y"
-    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
-    break;
-
-  case 142:
-
-/* Line 1455 of yacc.c  */
-#line 1352 "program_parse.y"
-    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
-    break;
-
-  case 143:
-
-/* Line 1455 of yacc.c  */
-#line 1353 "program_parse.y"
-    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
-    break;
-
-  case 144:
-
-/* Line 1455 of yacc.c  */
-#line 1354 "program_parse.y"
-    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
-    break;
-
-  case 145:
-
-/* Line 1455 of yacc.c  */
-#line 1355 "program_parse.y"
-    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
-    break;
-
-  case 146:
-
-/* Line 1455 of yacc.c  */
-#line 1356 "program_parse.y"
-    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
-    break;
-
-  case 147:
-
-/* Line 1455 of yacc.c  */
-#line 1357 "program_parse.y"
-    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
-    break;
-
-  case 148:
-
-/* Line 1455 of yacc.c  */
-#line 1358 "program_parse.y"
-    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
-    break;
-
-  case 149:
-
-/* Line 1455 of yacc.c  */
-#line 1359 "program_parse.y"
-    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
-    break;
-
-  case 150:
-
-/* Line 1455 of yacc.c  */
-#line 1360 "program_parse.y"
-    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
-    break;
-
-  case 151:
-
-/* Line 1455 of yacc.c  */
-#line 1361 "program_parse.y"
-    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
-    break;
-
-  case 152:
-
-/* Line 1455 of yacc.c  */
-#line 1362 "program_parse.y"
-    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
-    break;
-
-  case 153:
-
-/* Line 1455 of yacc.c  */
-#line 1366 "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 1375 "program_parse.y"
-    {
-	   (yyval.integer) = (yyvsp[(1) - (1)].integer);
-	;}
-    break;
-
-  case 155:
-
-/* Line 1455 of yacc.c  */
-#line 1379 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_EMISSION;
-	;}
-    break;
-
-  case 156:
-
-/* Line 1455 of yacc.c  */
-#line 1383 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_SHININESS;
-	;}
-    break;
-
-  case 157:
-
-/* Line 1455 of yacc.c  */
-#line 1389 "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 1398 "program_parse.y"
-    {
-	   (yyval.integer) = (yyvsp[(1) - (1)].integer);
-	;}
-    break;
-
-  case 159:
-
-/* Line 1455 of yacc.c  */
-#line 1402 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_POSITION;
-	;}
-    break;
-
-  case 160:
-
-/* Line 1455 of yacc.c  */
-#line 1406 "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 1415 "program_parse.y"
-    {
-	   (yyval.integer) = (yyvsp[(2) - (2)].integer);
-	;}
-    break;
-
-  case 162:
-
-/* Line 1455 of yacc.c  */
-#line 1419 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_HALF_VECTOR;
-	;}
-    break;
-
-  case 163:
-
-/* Line 1455 of yacc.c  */
-#line 1425 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_SPOT_DIRECTION;
-	;}
-    break;
-
-  case 164:
-
-/* Line 1455 of yacc.c  */
-#line 1431 "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 1438 "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 1443 "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 1451 "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 1463 "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 1471 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_TEXENV_COLOR;
-	;}
-    break;
-
-  case 171:
-
-/* Line 1455 of yacc.c  */
-#line 1477 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_AMBIENT;
-	;}
-    break;
-
-  case 172:
-
-/* Line 1455 of yacc.c  */
-#line 1481 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_DIFFUSE;
-	;}
-    break;
-
-  case 173:
-
-/* Line 1455 of yacc.c  */
-#line 1485 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_SPECULAR;
-	;}
-    break;
-
-  case 174:
-
-/* Line 1455 of yacc.c  */
-#line 1491 "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 1502 "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 1511 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_TEXGEN_EYE_S;
-	;}
-    break;
-
-  case 177:
-
-/* Line 1455 of yacc.c  */
-#line 1515 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_TEXGEN_OBJECT_S;
-	;}
-    break;
-
-  case 178:
-
-/* Line 1455 of yacc.c  */
-#line 1520 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_TEXGEN_EYE_S - STATE_TEXGEN_EYE_S;
-	;}
-    break;
-
-  case 179:
-
-/* Line 1455 of yacc.c  */
-#line 1524 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_TEXGEN_EYE_T - STATE_TEXGEN_EYE_S;
-	;}
-    break;
-
-  case 180:
-
-/* Line 1455 of yacc.c  */
-#line 1528 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_TEXGEN_EYE_R - STATE_TEXGEN_EYE_S;
-	;}
-    break;
-
-  case 181:
-
-/* Line 1455 of yacc.c  */
-#line 1532 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_TEXGEN_EYE_Q - STATE_TEXGEN_EYE_S;
-	;}
-    break;
-
-  case 182:
-
-/* Line 1455 of yacc.c  */
-#line 1538 "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 1545 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_FOG_COLOR;
-	;}
-    break;
-
-  case 184:
-
-/* Line 1455 of yacc.c  */
-#line 1549 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_FOG_PARAMS;
-	;}
-    break;
-
-  case 185:
-
-/* Line 1455 of yacc.c  */
-#line 1555 "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 1563 "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 1574 "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 1581 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_POINT_SIZE;
-	;}
-    break;
-
-  case 189:
-
-/* Line 1455 of yacc.c  */
-#line 1585 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_POINT_ATTENUATION;
-	;}
-    break;
-
-  case 190:
-
-/* Line 1455 of yacc.c  */
-#line 1591 "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 1601 "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 1611 "program_parse.y"
-    {
-	   (yyval.state)[2] = 0;
-	   (yyval.state)[3] = 3;
-	;}
-    break;
-
-  case 193:
-
-/* Line 1455 of yacc.c  */
-#line 1616 "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 1634 "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 1642 "program_parse.y"
-    {
-	   (yyval.integer) = 0;
-	;}
-    break;
-
-  case 196:
-
-/* Line 1455 of yacc.c  */
-#line 1646 "program_parse.y"
-    {
-	   (yyval.integer) = (yyvsp[(1) - (1)].integer);
-	;}
-    break;
-
-  case 197:
-
-/* Line 1455 of yacc.c  */
-#line 1652 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_MATRIX_INVERSE;
-	;}
-    break;
-
-  case 198:
-
-/* Line 1455 of yacc.c  */
-#line 1656 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_MATRIX_TRANSPOSE;
-	;}
-    break;
-
-  case 199:
-
-/* Line 1455 of yacc.c  */
-#line 1660 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_MATRIX_INVTRANS;
-	;}
-    break;
-
-  case 200:
-
-/* Line 1455 of yacc.c  */
-#line 1666 "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 1677 "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 1682 "program_parse.y"
-    {
-	   (yyval.state)[0] = STATE_PROJECTION_MATRIX;
-	   (yyval.state)[1] = 0;
-	;}
-    break;
-
-  case 203:
-
-/* Line 1455 of yacc.c  */
-#line 1687 "program_parse.y"
-    {
-	   (yyval.state)[0] = STATE_MVP_MATRIX;
-	   (yyval.state)[1] = 0;
-	;}
-    break;
-
-  case 204:
-
-/* Line 1455 of yacc.c  */
-#line 1692 "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 1697 "program_parse.y"
-    {
-	   yyerror(& (yylsp[(1) - (4)]), state, "GL_ARB_matrix_palette not supported");
-	   YYERROR;
-	;}
-    break;
-
-  case 206:
-
-/* Line 1455 of yacc.c  */
-#line 1702 "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 1709 "program_parse.y"
-    {
-	   (yyval.integer) = 0;
-	;}
-    break;
-
-  case 208:
-
-/* Line 1455 of yacc.c  */
-#line 1713 "program_parse.y"
-    {
-	   (yyval.integer) = (yyvsp[(2) - (3)].integer);
-	;}
-    break;
-
-  case 209:
-
-/* Line 1455 of yacc.c  */
-#line 1718 "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 1731 "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 1739 "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 1750 "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 1762 "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 1772 "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 1777 "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 1784 "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 1794 "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 1803 "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 1808 "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 1815 "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 1825 "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 1835 "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 1850 "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 1860 "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 1868 "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 1878 "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 1886 "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 1895 "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 1904 "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 1914 "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 1918 "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 1923 "program_parse.y"
-    { (yyval.negate) = FALSE; ;}
-    break;
-
-  case 241:
-
-/* Line 1455 of yacc.c  */
-#line 1924 "program_parse.y"
-    { (yyval.negate) = TRUE;  ;}
-    break;
-
-  case 242:
-
-/* Line 1455 of yacc.c  */
-#line 1925 "program_parse.y"
-    { (yyval.negate) = FALSE; ;}
-    break;
-
-  case 243:
-
-/* Line 1455 of yacc.c  */
-#line 1928 "program_parse.y"
-    { (yyval.integer) = (yyvsp[(2) - (2)].integer); ;}
-    break;
-
-  case 245:
-
-/* Line 1455 of yacc.c  */
-#line 1932 "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 1966 "program_parse.y"
-    {
-	;}
-    break;
-
-  case 247:
-
-/* Line 1455 of yacc.c  */
-#line 1970 "program_parse.y"
-    { (yyval.integer) = (yyvsp[(1) - (1)].integer); ;}
-    break;
-
-  case 249:
-
-/* Line 1455 of yacc.c  */
-#line 1974 "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 1981 "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 1990 "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 2004 "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 2013 "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 2022 "program_parse.y"
-    {
-	   (yyval.result) = (yyvsp[(2) - (2)].result);
-	;}
-    break;
-
-  case 255:
-
-/* Line 1455 of yacc.c  */
-#line 2026 "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 2035 "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 2044 "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 2055 "program_parse.y"
-    {
-	   (yyval.result) = (yyvsp[(2) - (3)].integer) + (yyvsp[(3) - (3)].integer);
-	;}
-    break;
-
-  case 259:
-
-/* Line 1455 of yacc.c  */
-#line 2061 "program_parse.y"
-    {
-	   (yyval.integer) = (state->mode == ARB_vertex)
-	      ? VERT_RESULT_COL0
-	      : FRAG_RESULT_COLOR;
-	;}
-    break;
-
-  case 260:
-
-/* Line 1455 of yacc.c  */
-#line 2067 "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 2076 "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 2087 "program_parse.y"
-    {
-	   (yyval.integer) = 0; 
-	;}
-    break;
-
-  case 263:
-
-/* Line 1455 of yacc.c  */
-#line 2091 "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 2100 "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 2110 "program_parse.y"
-    { (yyval.integer) = 0; ;}
-    break;
-
-  case 266:
-
-/* Line 1455 of yacc.c  */
-#line 2111 "program_parse.y"
-    { (yyval.integer) = 0; ;}
-    break;
-
-  case 267:
-
-/* Line 1455 of yacc.c  */
-#line 2112 "program_parse.y"
-    { (yyval.integer) = 1; ;}
-    break;
-
-  case 268:
-
-/* Line 1455 of yacc.c  */
-#line 2115 "program_parse.y"
-    { (yyval.integer) = 0; ;}
-    break;
-
-  case 269:
-
-/* Line 1455 of yacc.c  */
-#line 2116 "program_parse.y"
-    { (yyval.integer) = 0; ;}
-    break;
-
-  case 270:
-
-/* Line 1455 of yacc.c  */
-#line 2117 "program_parse.y"
-    { (yyval.integer) = 1; ;}
-    break;
-
-  case 271:
-
-/* Line 1455 of yacc.c  */
-#line 2120 "program_parse.y"
-    { (yyval.integer) = 0; ;}
-    break;
-
-  case 272:
-
-/* Line 1455 of yacc.c  */
-#line 2121 "program_parse.y"
-    { (yyval.integer) = (yyvsp[(2) - (3)].integer); ;}
-    break;
-
-  case 273:
-
-/* Line 1455 of yacc.c  */
-#line 2124 "program_parse.y"
-    { (yyval.integer) = 0; ;}
-    break;
-
-  case 274:
-
-/* Line 1455 of yacc.c  */
-#line 2125 "program_parse.y"
-    { (yyval.integer) = (yyvsp[(2) - (3)].integer); ;}
-    break;
-
-  case 275:
-
-/* Line 1455 of yacc.c  */
-#line 2128 "program_parse.y"
-    { (yyval.integer) = 0; ;}
-    break;
-
-  case 276:
-
-/* Line 1455 of yacc.c  */
-#line 2129 "program_parse.y"
-    { (yyval.integer) = (yyvsp[(2) - (3)].integer); ;}
-    break;
-
-  case 277:
-
-/* Line 1455 of yacc.c  */
-#line 2133 "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 2144 "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 2155 "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 2166 "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 4937 "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 2195 "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;
-
-   va_start(args, fmt);
-
-   /* Call vsnprintf once to determine how large the final string is.  Call it
-    * again to do the actual formatting.  from the v_mesa_snprintf manual page:
-    *
-    *    Upon successful return, these functions return the number of
-    *    characters printed  (not including the trailing '\0' used to end
-    *    output to strings).
-    */
-   length = 1 + vsnprintf(NULL, 0, fmt, args);
-
-   str = malloc(length);
-   if (str) {
-      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, 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(GLcontext *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/shader/program_parse.tab.h b/mesalib/src/mesa/shader/program_parse.tab.h
deleted file mode 100644
index 045241d9e..000000000
--- a/mesalib/src/mesa/shader/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/shader/program_parse.y b/mesalib/src/mesa/shader/program_parse.y
deleted file mode 100644
index d5fb0fac3..000000000
--- a/mesalib/src/mesa/shader/program_parse.y
+++ /dev/null
@@ -1,2766 +0,0 @@
-%{
-/*
- * 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 "shader/program.h"
-#include "shader/prog_parameter.h"
-#include "shader/prog_parameter_layout.h"
-#include "shader/prog_statevars.h"
-#include "shader/prog_instruction.h"
-
-#include "shader/symbol_table.h"
-#include "shader/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
-%}
-
-%pure-parser
-%locations
-%parse-param { struct asm_parser_state *state }
-%error-verbose
-%lex-param { void *scanner }
-
-%union {
-   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;
-}
-
-%token ARBvp_10 ARBfp_10
-
-/* Tokens for assembler pseudo-ops */
-%token <integer> ADDRESS
-%token ALIAS ATTRIB
-%token OPTION OUTPUT
-%token PARAM
-%token <integer> TEMP
-%token END
-
- /* Tokens for instructions */
-%token <temp_inst> BIN_OP BINSC_OP SAMPLE_OP SCALAR_OP TRI_OP VECTOR_OP
-%token <temp_inst> ARL KIL SWZ TXD_OP
-
-%token <integer> INTEGER
-%token <real> REAL
-
-%token AMBIENT ATTENUATION
-%token BACK
-%token CLIP COLOR
-%token DEPTH DIFFUSE DIRECTION
-%token EMISSION ENV EYE
-%token FOG FOGCOORD FRAGMENT FRONT
-%token HALF
-%token INVERSE INVTRANS
-%token LIGHT LIGHTMODEL LIGHTPROD LOCAL
-%token MATERIAL MAT_PROGRAM MATRIX MATRIXINDEX MODELVIEW MVP
-%token NORMAL
-%token OBJECT
-%token PALETTE PARAMS PLANE POINT_TOK POINTSIZE POSITION PRIMARY PROGRAM PROJECTION
-%token RANGE RESULT ROW
-%token SCENECOLOR SECONDARY SHININESS SIZE_TOK SPECULAR SPOT STATE
-%token TEXCOORD TEXENV TEXGEN TEXGEN_Q TEXGEN_R TEXGEN_S TEXGEN_T TEXTURE TRANSPOSE
-%token TEXTURE_UNIT TEX_1D TEX_2D TEX_3D TEX_CUBE TEX_RECT
-%token TEX_SHADOW1D TEX_SHADOW2D TEX_SHADOWRECT
-%token TEX_ARRAY1D TEX_ARRAY2D TEX_ARRAYSHADOW1D TEX_ARRAYSHADOW2D 
-%token VERTEX VTXATTRIB
-%token WEIGHT
-
-%token <string> IDENTIFIER USED_IDENTIFIER
-%type <string> string
-%token <swiz_mask> MASK4 MASK3 MASK2 MASK1 SWIZZLE
-%token DOT_DOT
-%token DOT
-
-%type <inst> instruction ALU_instruction TexInstruction
-%type <inst> ARL_instruction VECTORop_instruction
-%type <inst> SCALARop_instruction BINSCop_instruction BINop_instruction
-%type <inst> TRIop_instruction TXD_instruction SWZ_instruction SAMPLE_instruction
-%type <inst> KIL_instruction
-
-%type <dst_reg> dstReg maskedDstReg maskedAddrReg
-%type <src_reg> srcReg scalarUse scalarSrcReg swizzleSrcReg
-%type <swiz_mask> scalarSuffix swizzleSuffix extendedSwizzle
-%type <ext_swizzle> extSwizComp extSwizSel
-%type <swiz_mask> optionalMask
-
-%type <sym> progParamArray
-%type <integer> addrRegRelOffset addrRegPosOffset addrRegNegOffset
-%type <src_reg> progParamArrayMem progParamArrayAbs progParamArrayRel
-%type <sym> addrReg
-%type <swiz_mask> addrComponent addrWriteMask
-
-%type <dst_reg> ccMaskRule ccTest ccMaskRule2 ccTest2 optionalCcMask
-
-%type <result> resultBinding resultColBinding
-%type <integer> optFaceType optColorType
-%type <integer> optResultFaceType optResultColorType
-
-%type <integer> optTexImageUnitNum texImageUnitNum
-%type <integer> optTexCoordUnitNum texCoordUnitNum
-%type <integer> optLegacyTexUnitNum legacyTexUnitNum
-%type <integer> texImageUnit texTarget
-%type <integer> vtxAttribNum
-
-%type <attrib> attribBinding vtxAttribItem fragAttribItem
-
-%type <temp_sym> paramSingleInit paramSingleItemDecl
-%type <integer> optArraySize
-
-%type <state> stateSingleItem stateMultipleItem
-%type <state> stateMaterialItem
-%type <state> stateLightItem stateLightModelItem stateLightProdItem
-%type <state> stateTexGenItem stateFogItem stateClipPlaneItem statePointItem
-%type <state> stateMatrixItem stateMatrixRow stateMatrixRows
-%type <state> stateTexEnvItem stateDepthItem
-
-%type <state> stateLModProperty
-%type <state> stateMatrixName optMatrixRows
-
-%type <integer> stateMatProperty
-%type <integer> stateLightProperty stateSpotProperty
-%type <integer> stateLightNumber stateLProdProperty
-%type <integer> stateTexGenType stateTexGenCoord
-%type <integer> stateTexEnvProperty
-%type <integer> stateFogProperty
-%type <integer> stateClipPlaneNum
-%type <integer> statePointProperty
-
-%type <integer> stateOptMatModifier stateMatModifier stateMatrixRowNum
-%type <integer> stateOptModMatNum stateModMatNum statePaletteMatNum 
-%type <integer> stateProgramMatNum
-
-%type <integer> ambDiffSpecProperty
-
-%type <state> programSingleItem progEnvParam progLocalParam
-%type <state> programMultipleItem progEnvParams progLocalParams
-
-%type <temp_sym> paramMultipleInit paramMultInitList paramMultipleItem
-%type <temp_sym> paramSingleItemUse
-
-%type <integer> progEnvParamNum progLocalParamNum
-%type <state> progEnvParamNums progLocalParamNums
-
-%type <vector> paramConstDecl paramConstUse
-%type <vector> paramConstScalarDecl paramConstScalarUse paramConstVector
-%type <real> signedFloatConstant
-%type <negate> optionalSign
-
-%{
-extern int yylex(YYSTYPE *yylval_param, YYLTYPE *yylloc_param,
-    void *yyscanner);
-%}
-
-%%
-
-program: language optionSequence statementSequence END
-	;
-
-language: ARBvp_10
-	{
-	   if (state->prog->Target != GL_VERTEX_PROGRAM_ARB) {
-	      yyerror(& @1, state, "invalid fragment program header");
-
-	   }
-	   state->mode = ARB_vertex;
-	}
-	| ARBfp_10
-	{
-	   if (state->prog->Target != GL_FRAGMENT_PROGRAM_ARB) {
-	      yyerror(& @1, state, "invalid vertex program header");
-	   }
-	   state->mode = ARB_fragment;
-
-	   state->option.TexRect =
-	      (state->ctx->Extensions.NV_texture_rectangle != GL_FALSE);
-	}
-	;
-
-optionSequence: optionSequence option
-	|
-	;
-
-option: OPTION string ';'
-	{
-	   int valid = 0;
-
-	   if (state->mode == ARB_vertex) {
-	      valid = _mesa_ARBvp_parse_option(state, $2);
-	   } else if (state->mode == ARB_fragment) {
-	      valid = _mesa_ARBfp_parse_option(state, $2);
-	   }
-
-
-	   free($2);
-
-	   if (!valid) {
-	      const char *const err_str = (state->mode == ARB_vertex)
-		 ? "invalid ARB vertex program option"
-		 : "invalid ARB fragment program option";
-
-	      yyerror(& @2, state, err_str);
-	      YYERROR;
-	   }
-	}
-	;
-
-statementSequence: statementSequence statement
-	|
-	;
-
-statement: instruction ';'
-	{
-	   if ($1 != NULL) {
-	      if (state->inst_tail == NULL) {
-		 state->inst_head = $1;
-	      } else {
-		 state->inst_tail->next = $1;
-	      }
-
-	      state->inst_tail = $1;
-	      $1->next = NULL;
-
-	      state->prog->NumInstructions++;
-	   }
-	}
-	| namingStatement ';'
-	;
-
-instruction: ALU_instruction
-	{
-	   $$ = $1;
-	   state->prog->NumAluInstructions++;
-	}
-	| TexInstruction
-	{
-	   $$ = $1;
-	   state->prog->NumTexInstructions++;
-	}
-	;
-
-ALU_instruction: ARL_instruction
-	| VECTORop_instruction
-	| SCALARop_instruction
-	| BINSCop_instruction
-	| BINop_instruction
-	| TRIop_instruction
-	| SWZ_instruction
-	;
-
-TexInstruction: SAMPLE_instruction
-	| KIL_instruction
-	| TXD_instruction
-	;
-
-ARL_instruction: ARL maskedAddrReg ',' scalarSrcReg
-	{
-	   $$ = asm_instruction_ctor(OPCODE_ARL, & $2, & $4, NULL, NULL);
-	}
-	;
-
-VECTORop_instruction: VECTOR_OP maskedDstReg ',' swizzleSrcReg
-	{
-	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, NULL, NULL);
-	}
-	;
-
-SCALARop_instruction: SCALAR_OP maskedDstReg ',' scalarSrcReg
-	{
-	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, NULL, NULL);
-	}
-	;
-
-BINSCop_instruction: BINSC_OP maskedDstReg ',' scalarSrcReg ',' scalarSrcReg
-	{
-	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, & $6, NULL);
-	}
-	;
-
-
-BINop_instruction: BIN_OP maskedDstReg ',' swizzleSrcReg ',' swizzleSrcReg
-	{
-	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, & $6, NULL);
-	}
-	;
-
-TRIop_instruction: TRI_OP maskedDstReg ','
-                   swizzleSrcReg ',' swizzleSrcReg ',' swizzleSrcReg
-	{
-	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, & $6, & $8);
-	}
-	;
-
-SAMPLE_instruction: SAMPLE_OP maskedDstReg ',' swizzleSrcReg ',' texImageUnit ',' texTarget
-	{
-	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, NULL, NULL);
-	   if ($$ != NULL) {
-	      const GLbitfield tex_mask = (1U << $6);
-	      GLbitfield shadow_tex = 0;
-	      GLbitfield target_mask = 0;
-
-
-	      $$->Base.TexSrcUnit = $6;
-
-	      if ($8 < 0) {
-		 shadow_tex = tex_mask;
-
-		 $$->Base.TexSrcTarget = -$8;
-		 $$->Base.TexShadow = 1;
-	      } else {
-		 $$->Base.TexSrcTarget = $8;
-	      }
-
-	      target_mask = (1U << $$->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[$6] != 0)
-		  && ((state->prog->TexturesUsed[$6] != target_mask)
-		      || ((state->prog->ShadowSamplers & tex_mask)
-			  != shadow_tex))) {
-		 yyerror(& @8, state,
-			 "multiple targets used on one texture image unit");
-		 YYERROR;
-	      }
-
-
-	      state->prog->TexturesUsed[$6] |= target_mask;
-	      state->prog->ShadowSamplers |= shadow_tex;
-	   }
-	}
-	;
-
-KIL_instruction: KIL swizzleSrcReg
-	{
-	   $$ = asm_instruction_ctor(OPCODE_KIL, NULL, & $2, NULL, NULL);
-	   state->fragment.UsesKill = 1;
-	}
-	| KIL ccTest
-	{
-	   $$ = asm_instruction_ctor(OPCODE_KIL_NV, NULL, NULL, NULL, NULL);
-	   $$->Base.DstReg.CondMask = $2.CondMask;
-	   $$->Base.DstReg.CondSwizzle = $2.CondSwizzle;
-	   $$->Base.DstReg.CondSrc = $2.CondSrc;
-	   state->fragment.UsesKill = 1;
-	}
-	;
-
-TXD_instruction: TXD_OP maskedDstReg ',' swizzleSrcReg ',' swizzleSrcReg ',' swizzleSrcReg ',' texImageUnit ',' texTarget
-	{
-	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, & $6, & $8);
-	   if ($$ != NULL) {
-	      const GLbitfield tex_mask = (1U << $10);
-	      GLbitfield shadow_tex = 0;
-	      GLbitfield target_mask = 0;
-
-
-	      $$->Base.TexSrcUnit = $10;
-
-	      if ($12 < 0) {
-		 shadow_tex = tex_mask;
-
-		 $$->Base.TexSrcTarget = -$12;
-		 $$->Base.TexShadow = 1;
-	      } else {
-		 $$->Base.TexSrcTarget = $12;
-	      }
-
-	      target_mask = (1U << $$->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[$10] != 0)
-		  && ((state->prog->TexturesUsed[$10] != target_mask)
-		      || ((state->prog->ShadowSamplers & tex_mask)
-			  != shadow_tex))) {
-		 yyerror(& @12, state,
-			 "multiple targets used on one texture image unit");
-		 YYERROR;
-	      }
-
-
-	      state->prog->TexturesUsed[$10] |= target_mask;
-	      state->prog->ShadowSamplers |= shadow_tex;
-	   }
-	}
-	;
-
-texImageUnit: TEXTURE_UNIT optTexImageUnitNum
-	{
-	   $$ = $2;
-	}
-	;
-
-texTarget: TEX_1D  { $$ = TEXTURE_1D_INDEX; }
-	| TEX_2D   { $$ = TEXTURE_2D_INDEX; }
-	| TEX_3D   { $$ = TEXTURE_3D_INDEX; }
-	| TEX_CUBE { $$ = TEXTURE_CUBE_INDEX; }
-	| TEX_RECT { $$ = TEXTURE_RECT_INDEX; }
-	| TEX_SHADOW1D   { $$ = -TEXTURE_1D_INDEX; }
-	| TEX_SHADOW2D   { $$ = -TEXTURE_2D_INDEX; }
-	| TEX_SHADOWRECT { $$ = -TEXTURE_RECT_INDEX; }
-	| TEX_ARRAY1D         { $$ = TEXTURE_1D_ARRAY_INDEX; }
-	| TEX_ARRAY2D         { $$ = TEXTURE_2D_ARRAY_INDEX; }
-	| TEX_ARRAYSHADOW1D   { $$ = -TEXTURE_1D_ARRAY_INDEX; }
-	| TEX_ARRAYSHADOW2D   { $$ = -TEXTURE_2D_ARRAY_INDEX; }
-	;
-
-SWZ_instruction: SWZ maskedDstReg ',' srcReg ',' extendedSwizzle
-	{
-	   /* FIXME: Is this correct?  Should the extenedSwizzle be applied
-	    * FIXME: to the existing swizzle?
-	    */
-	   $4.Base.Swizzle = $6.swizzle;
-	   $4.Base.Negate = $6.mask;
-
-	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, NULL, NULL);
-	}
-	;
-
-scalarSrcReg: optionalSign scalarUse
-	{
-	   $$ = $2;
-
-	   if ($1) {
-	      $$.Base.Negate = ~$$.Base.Negate;
-	   }
-	}
-	| optionalSign '|' scalarUse '|'
-	{
-	   $$ = $3;
-
-	   if (!state->option.NV_fragment) {
-	      yyerror(& @2, state, "unexpected character '|'");
-	      YYERROR;
-	   }
-
-	   if ($1) {
-	      $$.Base.Negate = ~$$.Base.Negate;
-	   }
-
-	   $$.Base.Abs = 1;
-	}
-	;
-
-scalarUse:  srcReg scalarSuffix
-	{
-	   $$ = $1;
-
-	   $$.Base.Swizzle = _mesa_combine_swizzles($$.Base.Swizzle,
-						    $2.swizzle);
-	}
-	| paramConstScalarUse
-	{
-	   struct asm_symbol temp_sym;
-
-	   if (!state->option.NV_fragment) {
-	      yyerror(& @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, & $1, GL_TRUE);
-
-	   set_src_reg_swz(& $$, PROGRAM_CONSTANT,
-                           temp_sym.param_binding_begin,
-                           temp_sym.param_binding_swizzle);
-	}
-	;
-
-swizzleSrcReg: optionalSign srcReg swizzleSuffix
-	{
-	   $$ = $2;
-
-	   if ($1) {
-	      $$.Base.Negate = ~$$.Base.Negate;
-	   }
-
-	   $$.Base.Swizzle = _mesa_combine_swizzles($$.Base.Swizzle,
-						    $3.swizzle);
-	}
-	| optionalSign '|' srcReg swizzleSuffix '|'
-	{
-	   $$ = $3;
-
-	   if (!state->option.NV_fragment) {
-	      yyerror(& @2, state, "unexpected character '|'");
-	      YYERROR;
-	   }
-
-	   if ($1) {
-	      $$.Base.Negate = ~$$.Base.Negate;
-	   }
-
-	   $$.Base.Abs = 1;
-	   $$.Base.Swizzle = _mesa_combine_swizzles($$.Base.Swizzle,
-						    $4.swizzle);
-	}
-
-	;
-
-maskedDstReg: dstReg optionalMask optionalCcMask
-	{
-	   $$ = $1;
-	   $$.WriteMask = $2.mask;
-	   $$.CondMask = $3.CondMask;
-	   $$.CondSwizzle = $3.CondSwizzle;
-	   $$.CondSrc = $3.CondSrc;
-
-	   if ($$.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
-	       && ($$.Index == VERT_RESULT_HPOS)) {
-		 yyerror(& @1, state, "position-invariant programs cannot "
-			 "write position");
-		 YYERROR;
-	      }
-
-	      state->prog->OutputsWritten |= BITFIELD64_BIT($$.Index);
-	   }
-	}
-	;
-
-maskedAddrReg: addrReg addrWriteMask
-	{
-	   set_dst_reg(& $$, PROGRAM_ADDRESS, 0);
-	   $$.WriteMask = $2.mask;
-	}
-	;
-
-extendedSwizzle: extSwizComp ',' extSwizComp ',' extSwizComp ',' extSwizComp
-	{
-	   const unsigned xyzw_valid =
-	      ($1.xyzw_valid << 0)
-	      | ($3.xyzw_valid << 1)
-	      | ($5.xyzw_valid << 2)
-	      | ($7.xyzw_valid << 3);
-	   const unsigned rgba_valid =
-	      ($1.rgba_valid << 0)
-	      | ($3.rgba_valid << 1)
-	      | ($5.rgba_valid << 2)
-	      | ($7.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(& @1, state, "cannot combine RGBA and XYZW swizzle "
-		      "components");
-	      YYERROR;
-	   }
-
-	   $$.swizzle = MAKE_SWIZZLE4($1.swz, $3.swz, $5.swz, $7.swz);
-	   $$.mask = ($1.negate) | ($3.negate << 1) | ($5.negate << 2)
-	      | ($7.negate << 3);
-	}
-	;
-
-extSwizComp: optionalSign extSwizSel
-	{
-	   $$ = $2;
-	   $$.negate = ($1) ? 1 : 0;
-	}
-	;
-
-extSwizSel: INTEGER
-	{
-	   if (($1 != 0) && ($1 != 1)) {
-	      yyerror(& @1, state, "invalid extended swizzle selector");
-	      YYERROR;
-	   }
-
-	   $$.swz = ($1 == 0) ? SWIZZLE_ZERO : SWIZZLE_ONE;
-
-	   /* 0 and 1 are valid for both RGBA swizzle names and XYZW
-	    * swizzle names.
-	    */
-	   $$.xyzw_valid = 1;
-	   $$.rgba_valid = 1;
-	}
-	| string
-	{
-	   char s;
-
-	   if (strlen($1) > 1) {
-	      yyerror(& @1, state, "invalid extended swizzle selector");
-	      YYERROR;
-	   }
-
-	   s = $1[0];
-	   free($1);
-
-	   switch (s) {
-	   case 'x':
-	      $$.swz = SWIZZLE_X;
-	      $$.xyzw_valid = 1;
-	      break;
-	   case 'y':
-	      $$.swz = SWIZZLE_Y;
-	      $$.xyzw_valid = 1;
-	      break;
-	   case 'z':
-	      $$.swz = SWIZZLE_Z;
-	      $$.xyzw_valid = 1;
-	      break;
-	   case 'w':
-	      $$.swz = SWIZZLE_W;
-	      $$.xyzw_valid = 1;
-	      break;
-
-	   case 'r':
-	      $$.swz = SWIZZLE_X;
-	      $$.rgba_valid = 1;
-	      break;
-	   case 'g':
-	      $$.swz = SWIZZLE_Y;
-	      $$.rgba_valid = 1;
-	      break;
-	   case 'b':
-	      $$.swz = SWIZZLE_Z;
-	      $$.rgba_valid = 1;
-	      break;
-	   case 'a':
-	      $$.swz = SWIZZLE_W;
-	      $$.rgba_valid = 1;
-	      break;
-
-	   default:
-	      yyerror(& @1, state, "invalid extended swizzle selector");
-	      YYERROR;
-	      break;
-	   }
-	}
-	;
-
-srcReg: USED_IDENTIFIER /* temporaryReg | progParamSingle */
-	{
-	   struct asm_symbol *const s = (struct asm_symbol *)
-	      _mesa_symbol_table_find_symbol(state->st, 0, $1);
-
-	   free($1);
-
-	   if (s == NULL) {
-	      yyerror(& @1, state, "invalid operand variable");
-	      YYERROR;
-	   } else if ((s->type != at_param) && (s->type != at_temp)
-		      && (s->type != at_attrib)) {
-	      yyerror(& @1, state, "invalid operand variable");
-	      YYERROR;
-	   } else if ((s->type == at_param) && s->param_is_array) {
-	      yyerror(& @1, state, "non-array access to array PARAM");
-	      YYERROR;
-	   }
-
-	   init_src_reg(& $$);
-	   switch (s->type) {
-	   case at_temp:
-	      set_src_reg(& $$, PROGRAM_TEMPORARY, s->temp_binding);
-	      break;
-	   case at_param:
-              set_src_reg_swz(& $$, s->param_binding_type,
-                              s->param_binding_begin,
-                              s->param_binding_swizzle);
-	      break;
-	   case at_attrib:
-	      set_src_reg(& $$, PROGRAM_INPUT, s->attrib_binding);
-	      state->prog->InputsRead |= (1U << $$.Base.Index);
-
-	      if (!validate_inputs(& @1, state)) {
-		 YYERROR;
-	      }
-	      break;
-
-	   default:
-	      YYERROR;
-	      break;
-	   }
-	}
-	| attribBinding
-	{
-	   set_src_reg(& $$, PROGRAM_INPUT, $1);
-	   state->prog->InputsRead |= (1U << $$.Base.Index);
-
-	   if (!validate_inputs(& @1, state)) {
-	      YYERROR;
-	   }
-	}
-	| progParamArray '[' progParamArrayMem ']'
-	{
-	   if (! $3.Base.RelAddr
-	       && ((unsigned) $3.Base.Index >= $1->param_binding_length)) {
-	      yyerror(& @3, state, "out of bounds array access");
-	      YYERROR;
-	   }
-
-	   init_src_reg(& $$);
-	   $$.Base.File = $1->param_binding_type;
-
-	   if ($3.Base.RelAddr) {
-	      $1->param_accessed_indirectly = 1;
-
-	      $$.Base.RelAddr = 1;
-	      $$.Base.Index = $3.Base.Index;
-	      $$.Symbol = $1;
-	   } else {
-	      $$.Base.Index = $1->param_binding_begin + $3.Base.Index;
-	   }
-	}
-	| paramSingleItemUse
-	{
-           gl_register_file file = ($1.name != NULL) 
-	      ? $1.param_binding_type
-	      : PROGRAM_CONSTANT;
-           set_src_reg_swz(& $$, file, $1.param_binding_begin,
-                           $1.param_binding_swizzle);
-	}
-	;
-
-dstReg: resultBinding
-	{
-	   set_dst_reg(& $$, PROGRAM_OUTPUT, $1);
-	}
-	| USED_IDENTIFIER /* temporaryReg | vertexResultReg */
-	{
-	   struct asm_symbol *const s = (struct asm_symbol *)
-	      _mesa_symbol_table_find_symbol(state->st, 0, $1);
-
-	   free($1);
-
-	   if (s == NULL) {
-	      yyerror(& @1, state, "invalid operand variable");
-	      YYERROR;
-	   } else if ((s->type != at_output) && (s->type != at_temp)) {
-	      yyerror(& @1, state, "invalid operand variable");
-	      YYERROR;
-	   }
-
-	   switch (s->type) {
-	   case at_temp:
-	      set_dst_reg(& $$, PROGRAM_TEMPORARY, s->temp_binding);
-	      break;
-	   case at_output:
-	      set_dst_reg(& $$, PROGRAM_OUTPUT, s->output_binding);
-	      break;
-	   default:
-	      set_dst_reg(& $$, s->param_binding_type, s->param_binding_begin);
-	      break;
-	   }
-	}
-	;
-
-progParamArray: USED_IDENTIFIER
-	{
-	   struct asm_symbol *const s = (struct asm_symbol *)
-	      _mesa_symbol_table_find_symbol(state->st, 0, $1);
-
-	   free($1);
-
-	   if (s == NULL) {
-	      yyerror(& @1, state, "invalid operand variable");
-	      YYERROR;
-	   } else if ((s->type != at_param) || !s->param_is_array) {
-	      yyerror(& @1, state, "array access to non-PARAM variable");
-	      YYERROR;
-	   } else {
-	      $$ = s;
-	   }
-	}
-	;
-
-progParamArrayMem: progParamArrayAbs | progParamArrayRel;
-
-progParamArrayAbs: INTEGER
-	{
-	   init_src_reg(& $$);
-	   $$.Base.Index = $1;
-	}
-	;
-
-progParamArrayRel: addrReg addrComponent addrRegRelOffset
-	{
-	   /* FINISHME: Add support for multiple address registers.
-	    */
-	   /* FINISHME: Add support for 4-component address registers.
-	    */
-	   init_src_reg(& $$);
-	   $$.Base.RelAddr = 1;
-	   $$.Base.Index = $3;
-	}
-	;
-
-addrRegRelOffset:              { $$ = 0; }
-	| '+' addrRegPosOffset { $$ = $2; }
-	| '-' addrRegNegOffset { $$ = -$2; }
-	;
-
-addrRegPosOffset: INTEGER
-	{
-	   if (($1 < 0) || ($1 > 63)) {
-              char s[100];
-              _mesa_snprintf(s, sizeof(s),
-                             "relative address offset too large (%d)", $1);
-	      yyerror(& @1, state, s);
-	      YYERROR;
-	   } else {
-	      $$ = $1;
-	   }
-	}
-	;
-
-addrRegNegOffset: INTEGER
-	{
-	   if (($1 < 0) || ($1 > 64)) {
-              char s[100];
-              _mesa_snprintf(s, sizeof(s),
-                             "relative address offset too large (%d)", $1);
-	      yyerror(& @1, state, s);
-	      YYERROR;
-	   } else {
-	      $$ = $1;
-	   }
-	}
-	;
-
-addrReg: USED_IDENTIFIER
-	{
-	   struct asm_symbol *const s = (struct asm_symbol *)
-	      _mesa_symbol_table_find_symbol(state->st, 0, $1);
-
-	   free($1);
-
-	   if (s == NULL) {
-	      yyerror(& @1, state, "invalid array member");
-	      YYERROR;
-	   } else if (s->type != at_address) {
-	      yyerror(& @1, state,
-		      "invalid variable for indexed array access");
-	      YYERROR;
-	   } else {
-	      $$ = s;
-	   }
-	}
-	;
-
-addrComponent: MASK1
-	{
-	   if ($1.mask != WRITEMASK_X) {
-	      yyerror(& @1, state, "invalid address component selector");
-	      YYERROR;
-	   } else {
-	      $$ = $1;
-	   }
-	}
-	;
-
-addrWriteMask: MASK1
-	{
-	   if ($1.mask != WRITEMASK_X) {
-	      yyerror(& @1, state,
-		      "address register write mask must be \".x\"");
-	      YYERROR;
-	   } else {
-	      $$ = $1;
-	   }
-	}
-	;
-
-scalarSuffix: MASK1;
-
-swizzleSuffix: MASK1
-	| MASK4
-	| SWIZZLE
-	|              { $$.swizzle = SWIZZLE_NOOP; $$.mask = WRITEMASK_XYZW; }
-	;
-
-optionalMask: MASK4 | MASK3 | MASK2 | MASK1 
-	|              { $$.swizzle = SWIZZLE_NOOP; $$.mask = WRITEMASK_XYZW; }
-	;
-
-optionalCcMask: '(' ccTest ')'
-	{
-	   $$ = $2;
-	}
-	| '(' ccTest2 ')'
-	{
-	   $$ = $2;
-	}
-	|
-	{
-	   $$.CondMask = COND_TR;
-	   $$.CondSwizzle = SWIZZLE_NOOP;
-	   $$.CondSrc = 0;
-	}
-	;
-
-ccTest: ccMaskRule swizzleSuffix
-	{
-	   $$ = $1;
-	   $$.CondSwizzle = $2.swizzle;
-	}
-	;
-
-ccTest2: ccMaskRule2 swizzleSuffix
-	{
-	   $$ = $1;
-	   $$.CondSwizzle = $2.swizzle;
-	}
-	;
-
-ccMaskRule: IDENTIFIER
-	{
-	   const int cond = _mesa_parse_cc($1);
-	   if ((cond == 0) || ($1[2] != '\0')) {
-	      char *const err_str =
-		 make_error_string("invalid condition code \"%s\"", $1);
-
-	      yyerror(& @1, state, (err_str != NULL)
-		      ? err_str : "invalid condition code");
-
-	      if (err_str != NULL) {
-		 free(err_str);
-	      }
-
-	      YYERROR;
-	   }
-
-	   $$.CondMask = cond;
-	   $$.CondSwizzle = SWIZZLE_NOOP;
-	   $$.CondSrc = 0;
-	}
-	;
-
-ccMaskRule2: USED_IDENTIFIER
-	{
-	   const int cond = _mesa_parse_cc($1);
-	   if ((cond == 0) || ($1[2] != '\0')) {
-	      char *const err_str =
-		 make_error_string("invalid condition code \"%s\"", $1);
-
-	      yyerror(& @1, state, (err_str != NULL)
-		      ? err_str : "invalid condition code");
-
-	      if (err_str != NULL) {
-		 free(err_str);
-	      }
-
-	      YYERROR;
-	   }
-
-	   $$.CondMask = cond;
-	   $$.CondSwizzle = SWIZZLE_NOOP;
-	   $$.CondSrc = 0;
-	}
-	;
-
-namingStatement: ATTRIB_statement
-	| PARAM_statement
-	| TEMP_statement
-	| ADDRESS_statement
-	| OUTPUT_statement
-	| ALIAS_statement
-	;
-
-ATTRIB_statement: ATTRIB IDENTIFIER '=' attribBinding
-	{
-	   struct asm_symbol *const s =
-	      declare_variable(state, $2, at_attrib, & @2);
-
-	   if (s == NULL) {
-	      free($2);
-	      YYERROR;
-	   } else {
-	      s->attrib_binding = $4;
-	      state->InputsBound |= (1U << s->attrib_binding);
-
-	      if (!validate_inputs(& @4, state)) {
-		 YYERROR;
-	      }
-	   }
-	}
-	;
-
-attribBinding: VERTEX vtxAttribItem
-	{
-	   $$ = $2;
-	}
-	| FRAGMENT fragAttribItem
-	{
-	   $$ = $2;
-	}
-	;
-
-vtxAttribItem: POSITION
-	{
-	   $$ = VERT_ATTRIB_POS;
-	}
-	| WEIGHT vtxOptWeightNum
-	{
-	   $$ = VERT_ATTRIB_WEIGHT;
-	}
-	| NORMAL
-	{
-	   $$ = VERT_ATTRIB_NORMAL;
-	}
-	| COLOR optColorType
-	{
-	   if (!state->ctx->Extensions.EXT_secondary_color) {
-	      yyerror(& @2, state, "GL_EXT_secondary_color not supported");
-	      YYERROR;
-	   }
-
-	   $$ = VERT_ATTRIB_COLOR0 + $2;
-	}
-	| FOGCOORD
-	{
-	   if (!state->ctx->Extensions.EXT_fog_coord) {
-	      yyerror(& @1, state, "GL_EXT_fog_coord not supported");
-	      YYERROR;
-	   }
-
-	   $$ = VERT_ATTRIB_FOG;
-	}
-	| TEXCOORD optTexCoordUnitNum
-	{
-	   $$ = VERT_ATTRIB_TEX0 + $2;
-	}
-	| MATRIXINDEX '[' vtxWeightNum ']'
-	{
-	   yyerror(& @1, state, "GL_ARB_matrix_palette not supported");
-	   YYERROR;
-	}
-	| VTXATTRIB '[' vtxAttribNum ']'
-	{
-	   $$ = VERT_ATTRIB_GENERIC0 + $3;
-	}
-	;
-
-vtxAttribNum: INTEGER
-	{
-	   if ((unsigned) $1 >= state->limits->MaxAttribs) {
-	      yyerror(& @1, state, "invalid vertex attribute reference");
-	      YYERROR;
-	   }
-
-	   $$ = $1;
-	}
-	;
-
-vtxOptWeightNum:  | '[' vtxWeightNum ']';
-vtxWeightNum: INTEGER;
-
-fragAttribItem: POSITION
-	{
-	   $$ = FRAG_ATTRIB_WPOS;
-	}
-	| COLOR optColorType
-	{
-	   $$ = FRAG_ATTRIB_COL0 + $2;
-	}
-	| FOGCOORD
-	{
-	   $$ = FRAG_ATTRIB_FOGC;
-	}
-	| TEXCOORD optTexCoordUnitNum
-	{
-	   $$ = FRAG_ATTRIB_TEX0 + $2;
-	}
-	;
-
-PARAM_statement: PARAM_singleStmt | PARAM_multipleStmt;
-
-PARAM_singleStmt: PARAM IDENTIFIER paramSingleInit
-	{
-	   struct asm_symbol *const s =
-	      declare_variable(state, $2, at_param, & @2);
-
-	   if (s == NULL) {
-	      free($2);
-	      YYERROR;
-	   } else {
-	      s->param_binding_type = $3.param_binding_type;
-	      s->param_binding_begin = $3.param_binding_begin;
-	      s->param_binding_length = $3.param_binding_length;
-              s->param_binding_swizzle = SWIZZLE_XYZW;
-	      s->param_is_array = 0;
-	   }
-	}
-	;
-
-PARAM_multipleStmt: PARAM IDENTIFIER '[' optArraySize ']' paramMultipleInit
-	{
-	   if (($4 != 0) && ((unsigned) $4 != $6.param_binding_length)) {
-	      free($2);
-	      yyerror(& @4, state, 
-		      "parameter array size and number of bindings must match");
-	      YYERROR;
-	   } else {
-	      struct asm_symbol *const s =
-		 declare_variable(state, $2, $6.type, & @2);
-
-	      if (s == NULL) {
-		 free($2);
-		 YYERROR;
-	      } else {
-		 s->param_binding_type = $6.param_binding_type;
-		 s->param_binding_begin = $6.param_binding_begin;
-		 s->param_binding_length = $6.param_binding_length;
-                 s->param_binding_swizzle = SWIZZLE_XYZW;
-		 s->param_is_array = 1;
-	      }
-	   }
-	}
-	;
-
-optArraySize:
-	{
-	   $$ = 0;
-	}
-	| INTEGER
-        {
-	   if (($1 < 1) || ((unsigned) $1 > state->limits->MaxParameters)) {
-	      yyerror(& @1, state, "invalid parameter array size");
-	      YYERROR;
-	   } else {
-	      $$ = $1;
-	   }
-	}
-	;
-
-paramSingleInit: '=' paramSingleItemDecl
-	{
-	   $$ = $2;
-	}
-	;
-
-paramMultipleInit: '=' '{' paramMultInitList '}'
-	{
-	   $$ = $3;
-	}
-	;
-
-paramMultInitList: paramMultipleItem
-	| paramMultInitList ',' paramMultipleItem
-	{
-	   $1.param_binding_length += $3.param_binding_length;
-	   $$ = $1;
-	}
-	;
-
-paramSingleItemDecl: stateSingleItem
-	{
-	   memset(& $$, 0, sizeof($$));
-	   $$.param_binding_begin = ~0;
-	   initialize_symbol_from_state(state->prog, & $$, $1);
-	}
-	| programSingleItem
-	{
-	   memset(& $$, 0, sizeof($$));
-	   $$.param_binding_begin = ~0;
-	   initialize_symbol_from_param(state->prog, & $$, $1);
-	}
-	| paramConstDecl
-	{
-	   memset(& $$, 0, sizeof($$));
-	   $$.param_binding_begin = ~0;
-	   initialize_symbol_from_const(state->prog, & $$, & $1, GL_TRUE);
-	}
-	;
-
-paramSingleItemUse: stateSingleItem
-	{
-	   memset(& $$, 0, sizeof($$));
-	   $$.param_binding_begin = ~0;
-	   initialize_symbol_from_state(state->prog, & $$, $1);
-	}
-	| programSingleItem
-	{
-	   memset(& $$, 0, sizeof($$));
-	   $$.param_binding_begin = ~0;
-	   initialize_symbol_from_param(state->prog, & $$, $1);
-	}
-	| paramConstUse
-	{
-	   memset(& $$, 0, sizeof($$));
-	   $$.param_binding_begin = ~0;
-	   initialize_symbol_from_const(state->prog, & $$, & $1, GL_TRUE);
-	}
-	;
-
-paramMultipleItem: stateMultipleItem
-	{
-	   memset(& $$, 0, sizeof($$));
-	   $$.param_binding_begin = ~0;
-	   initialize_symbol_from_state(state->prog, & $$, $1);
-	}
-	| programMultipleItem
-	{
-	   memset(& $$, 0, sizeof($$));
-	   $$.param_binding_begin = ~0;
-	   initialize_symbol_from_param(state->prog, & $$, $1);
-	}
-	| paramConstDecl
-	{
-	   memset(& $$, 0, sizeof($$));
-	   $$.param_binding_begin = ~0;
-	   initialize_symbol_from_const(state->prog, & $$, & $1, GL_FALSE);
-	}
-	;
-
-stateMultipleItem: stateSingleItem        { memcpy($$, $1, sizeof($$)); }
-	| STATE stateMatrixRows           { memcpy($$, $2, sizeof($$)); }
-	;
-
-stateSingleItem: STATE stateMaterialItem  { memcpy($$, $2, sizeof($$)); }
-	| STATE stateLightItem            { memcpy($$, $2, sizeof($$)); }
-	| STATE stateLightModelItem       { memcpy($$, $2, sizeof($$)); }
-	| STATE stateLightProdItem        { memcpy($$, $2, sizeof($$)); }
-	| STATE stateTexGenItem           { memcpy($$, $2, sizeof($$)); }
-	| STATE stateTexEnvItem           { memcpy($$, $2, sizeof($$)); }
-	| STATE stateFogItem              { memcpy($$, $2, sizeof($$)); }
-	| STATE stateClipPlaneItem        { memcpy($$, $2, sizeof($$)); }
-	| STATE statePointItem            { memcpy($$, $2, sizeof($$)); }
-	| STATE stateMatrixRow            { memcpy($$, $2, sizeof($$)); }
-	| STATE stateDepthItem            { memcpy($$, $2, sizeof($$)); }
-	;
-
-stateMaterialItem: MATERIAL optFaceType stateMatProperty
-	{
-	   memset($$, 0, sizeof($$));
-	   $$[0] = STATE_MATERIAL;
-	   $$[1] = $2;
-	   $$[2] = $3;
-	}
-	;
-
-stateMatProperty: ambDiffSpecProperty
-	{
-	   $$ = $1;
-	}
-	| EMISSION
-	{
-	   $$ = STATE_EMISSION;
-	}
-	| SHININESS
-	{
-	   $$ = STATE_SHININESS;
-	}
-	;
-
-stateLightItem: LIGHT '[' stateLightNumber ']' stateLightProperty
-	{
-	   memset($$, 0, sizeof($$));
-	   $$[0] = STATE_LIGHT;
-	   $$[1] = $3;
-	   $$[2] = $5;
-	}
-	;
-
-stateLightProperty: ambDiffSpecProperty
-	{
-	   $$ = $1;
-	}
-	| POSITION
-	{
-	   $$ = STATE_POSITION;
-	}
-	| ATTENUATION
-	{
-	   if (!state->ctx->Extensions.EXT_point_parameters) {
-	      yyerror(& @1, state, "GL_ARB_point_parameters not supported");
-	      YYERROR;
-	   }
-
-	   $$ = STATE_ATTENUATION;
-	}
-	| SPOT stateSpotProperty
-	{
-	   $$ = $2;
-	}
-	| HALF
-	{
-	   $$ = STATE_HALF_VECTOR;
-	}
-	;
-
-stateSpotProperty: DIRECTION
-	{
-	   $$ = STATE_SPOT_DIRECTION;
-	}
-	;
-
-stateLightModelItem: LIGHTMODEL stateLModProperty
-	{
-	   $$[0] = $2[0];
-	   $$[1] = $2[1];
-	}
-	;
-
-stateLModProperty: AMBIENT
-	{
-	   memset($$, 0, sizeof($$));
-	   $$[0] = STATE_LIGHTMODEL_AMBIENT;
-	}
-	| optFaceType SCENECOLOR
-	{
-	   memset($$, 0, sizeof($$));
-	   $$[0] = STATE_LIGHTMODEL_SCENECOLOR;
-	   $$[1] = $1;
-	}
-	;
-
-stateLightProdItem: LIGHTPROD '[' stateLightNumber ']' optFaceType stateLProdProperty
-	{
-	   memset($$, 0, sizeof($$));
-	   $$[0] = STATE_LIGHTPROD;
-	   $$[1] = $3;
-	   $$[2] = $5;
-	   $$[3] = $6;
-	}
-	;
-
-stateLProdProperty: ambDiffSpecProperty;
-
-stateTexEnvItem: TEXENV optLegacyTexUnitNum stateTexEnvProperty
-	{
-	   memset($$, 0, sizeof($$));
-	   $$[0] = $3;
-	   $$[1] = $2;
-	}
-	;
-
-stateTexEnvProperty: COLOR
-	{
-	   $$ = STATE_TEXENV_COLOR;
-	}
-	;
-
-ambDiffSpecProperty: AMBIENT
-	{
-	   $$ = STATE_AMBIENT;
-	}
-	| DIFFUSE
-	{
-	   $$ = STATE_DIFFUSE;
-	}
-	| SPECULAR
-	{
-	   $$ = STATE_SPECULAR;
-	}
-	;
-
-stateLightNumber: INTEGER
-	{
-	   if ((unsigned) $1 >= state->MaxLights) {
-	      yyerror(& @1, state, "invalid light selector");
-	      YYERROR;
-	   }
-
-	   $$ = $1;
-	}
-	;
-
-stateTexGenItem: TEXGEN optTexCoordUnitNum stateTexGenType stateTexGenCoord
-	{
-	   memset($$, 0, sizeof($$));
-	   $$[0] = STATE_TEXGEN;
-	   $$[1] = $2;
-	   $$[2] = $3 + $4;
-	}
-	;
-
-stateTexGenType: EYE
-	{
-	   $$ = STATE_TEXGEN_EYE_S;
-	}
-	| OBJECT
-	{
-	   $$ = STATE_TEXGEN_OBJECT_S;
-	}
-	;
-stateTexGenCoord: TEXGEN_S
-	{
-	   $$ = STATE_TEXGEN_EYE_S - STATE_TEXGEN_EYE_S;
-	}
-	| TEXGEN_T
-	{
-	   $$ = STATE_TEXGEN_EYE_T - STATE_TEXGEN_EYE_S;
-	}
-	| TEXGEN_R
-	{
-	   $$ = STATE_TEXGEN_EYE_R - STATE_TEXGEN_EYE_S;
-	}
-	| TEXGEN_Q
-	{
-	   $$ = STATE_TEXGEN_EYE_Q - STATE_TEXGEN_EYE_S;
-	}
-	;
-
-stateFogItem: FOG stateFogProperty
-	{
-	   memset($$, 0, sizeof($$));
-	   $$[0] = $2;
-	}
-	;
-
-stateFogProperty: COLOR
-	{
-	   $$ = STATE_FOG_COLOR;
-	}
-	| PARAMS
-	{
-	   $$ = STATE_FOG_PARAMS;
-	}
-	;
-
-stateClipPlaneItem: CLIP '[' stateClipPlaneNum ']' PLANE
-	{
-	   memset($$, 0, sizeof($$));
-	   $$[0] = STATE_CLIPPLANE;
-	   $$[1] = $3;
-	}
-	;
-
-stateClipPlaneNum: INTEGER
-	{
-	   if ((unsigned) $1 >= state->MaxClipPlanes) {
-	      yyerror(& @1, state, "invalid clip plane selector");
-	      YYERROR;
-	   }
-
-	   $$ = $1;
-	}
-	;
-
-statePointItem: POINT_TOK statePointProperty
-	{
-	   memset($$, 0, sizeof($$));
-	   $$[0] = $2;
-	}
-	;
-
-statePointProperty: SIZE_TOK
-	{
-	   $$ = STATE_POINT_SIZE;
-	}
-	| ATTENUATION
-	{
-	   $$ = STATE_POINT_ATTENUATION;
-	}
-	;
-
-stateMatrixRow: stateMatrixItem ROW '[' stateMatrixRowNum ']'
-	{
-	   $$[0] = $1[0];
-	   $$[1] = $1[1];
-	   $$[2] = $4;
-	   $$[3] = $4;
-	   $$[4] = $1[2];
-	}
-	;
-
-stateMatrixRows: stateMatrixItem optMatrixRows
-	{
-	   $$[0] = $1[0];
-	   $$[1] = $1[1];
-	   $$[2] = $2[2];
-	   $$[3] = $2[3];
-	   $$[4] = $1[2];
-	}
-	;
-
-optMatrixRows:
-	{
-	   $$[2] = 0;
-	   $$[3] = 3;
-	}
-	| ROW '[' stateMatrixRowNum DOT_DOT stateMatrixRowNum ']'
-	{
-	   /* 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 ($3 > $5) {
-	      yyerror(& @3, state, "invalid matrix row range");
-	      YYERROR;
-	   }
-
-	   $$[2] = $3;
-	   $$[3] = $5;
-	}
-	;
-
-stateMatrixItem: MATRIX stateMatrixName stateOptMatModifier
-	{
-	   $$[0] = $2[0];
-	   $$[1] = $2[1];
-	   $$[2] = $3;
-	}
-	;
-
-stateOptMatModifier: 
-	{
-	   $$ = 0;
-	}
-	| stateMatModifier
-	{
-	   $$ = $1;
-	}
-	;
-
-stateMatModifier: INVERSE 
-	{
-	   $$ = STATE_MATRIX_INVERSE;
-	}
-	| TRANSPOSE 
-	{
-	   $$ = STATE_MATRIX_TRANSPOSE;
-	}
-	| INVTRANS
-	{
-	   $$ = STATE_MATRIX_INVTRANS;
-	}
-	;
-
-stateMatrixRowNum: INTEGER
-	{
-	   if ($1 > 3) {
-	      yyerror(& @1, state, "invalid matrix row reference");
-	      YYERROR;
-	   }
-
-	   $$ = $1;
-	}
-	;
-
-stateMatrixName: MODELVIEW stateOptModMatNum
-	{
-	   $$[0] = STATE_MODELVIEW_MATRIX;
-	   $$[1] = $2;
-	}
-	| PROJECTION
-	{
-	   $$[0] = STATE_PROJECTION_MATRIX;
-	   $$[1] = 0;
-	}
-	| MVP
-	{
-	   $$[0] = STATE_MVP_MATRIX;
-	   $$[1] = 0;
-	}
-	| TEXTURE optTexCoordUnitNum
-	{
-	   $$[0] = STATE_TEXTURE_MATRIX;
-	   $$[1] = $2;
-	}
-	| PALETTE '[' statePaletteMatNum ']'
-	{
-	   yyerror(& @1, state, "GL_ARB_matrix_palette not supported");
-	   YYERROR;
-	}
-	| MAT_PROGRAM '[' stateProgramMatNum ']'
-	{
-	   $$[0] = STATE_PROGRAM_MATRIX;
-	   $$[1] = $3;
-	}
-	;
-
-stateOptModMatNum:
-	{
-	   $$ = 0;
-	}
-	| '[' stateModMatNum ']'
-	{
-	   $$ = $2;
-	}
-	;
-stateModMatNum: INTEGER
-	{
-	   /* Since GL_ARB_vertex_blend isn't supported, only modelview matrix
-	    * zero is valid.
-	    */
-	   if ($1 != 0) {
-	      yyerror(& @1, state, "invalid modelview matrix index");
-	      YYERROR;
-	   }
-
-	   $$ = $1;
-	}
-	;
-statePaletteMatNum: INTEGER
-	{
-	   /* Since GL_ARB_matrix_palette isn't supported, just let any value
-	    * through here.  The error will be generated later.
-	    */
-	   $$ = $1;
-	}
-	;
-stateProgramMatNum: INTEGER
-	{
-	   if ((unsigned) $1 >= state->MaxProgramMatrices) {
-	      yyerror(& @1, state, "invalid program matrix selector");
-	      YYERROR;
-	   }
-
-	   $$ = $1;
-	}
-	;
-
-stateDepthItem: DEPTH RANGE
-	{
-	   memset($$, 0, sizeof($$));
-	   $$[0] = STATE_DEPTH_RANGE;
-	}
-	;
-
-
-programSingleItem: progEnvParam | progLocalParam;
-
-programMultipleItem: progEnvParams | progLocalParams;
-
-progEnvParams: PROGRAM ENV '[' progEnvParamNums ']'
-	{
-	   memset($$, 0, sizeof($$));
-	   $$[0] = state->state_param_enum;
-	   $$[1] = STATE_ENV;
-	   $$[2] = $4[0];
-	   $$[3] = $4[1];
-	}
-	;
-
-progEnvParamNums: progEnvParamNum
-	{
-	   $$[0] = $1;
-	   $$[1] = $1;
-	}
-	| progEnvParamNum DOT_DOT progEnvParamNum
-	{
-	   $$[0] = $1;
-	   $$[1] = $3;
-	}
-	;
-
-progEnvParam: PROGRAM ENV '[' progEnvParamNum ']'
-	{
-	   memset($$, 0, sizeof($$));
-	   $$[0] = state->state_param_enum;
-	   $$[1] = STATE_ENV;
-	   $$[2] = $4;
-	   $$[3] = $4;
-	}
-	;
-
-progLocalParams: PROGRAM LOCAL '[' progLocalParamNums ']'
-	{
-	   memset($$, 0, sizeof($$));
-	   $$[0] = state->state_param_enum;
-	   $$[1] = STATE_LOCAL;
-	   $$[2] = $4[0];
-	   $$[3] = $4[1];
-	}
-
-progLocalParamNums: progLocalParamNum
-	{
-	   $$[0] = $1;
-	   $$[1] = $1;
-	}
-	| progLocalParamNum DOT_DOT progLocalParamNum
-	{
-	   $$[0] = $1;
-	   $$[1] = $3;
-	}
-	;
-
-progLocalParam: PROGRAM LOCAL '[' progLocalParamNum ']'
-	{
-	   memset($$, 0, sizeof($$));
-	   $$[0] = state->state_param_enum;
-	   $$[1] = STATE_LOCAL;
-	   $$[2] = $4;
-	   $$[3] = $4;
-	}
-	;
-
-progEnvParamNum: INTEGER
-	{
-	   if ((unsigned) $1 >= state->limits->MaxEnvParams) {
-	      yyerror(& @1, state, "invalid environment parameter reference");
-	      YYERROR;
-	   }
-	   $$ = $1;
-	}
-	;
-
-progLocalParamNum: INTEGER
-	{
-	   if ((unsigned) $1 >= state->limits->MaxLocalParams) {
-	      yyerror(& @1, state, "invalid local parameter reference");
-	      YYERROR;
-	   }
-	   $$ = $1;
-	}
-	;
-
-
-
-paramConstDecl: paramConstScalarDecl | paramConstVector;
-paramConstUse: paramConstScalarUse | paramConstVector;
-
-paramConstScalarDecl: signedFloatConstant
-	{
-	   $$.count = 4;
-	   $$.data[0] = $1;
-	   $$.data[1] = $1;
-	   $$.data[2] = $1;
-	   $$.data[3] = $1;
-	}
-	;
-
-paramConstScalarUse: REAL
-	{
-	   $$.count = 1;
-	   $$.data[0] = $1;
-	   $$.data[1] = $1;
-	   $$.data[2] = $1;
-	   $$.data[3] = $1;
-	}
-	| INTEGER
-	{
-	   $$.count = 1;
-	   $$.data[0] = (float) $1;
-	   $$.data[1] = (float) $1;
-	   $$.data[2] = (float) $1;
-	   $$.data[3] = (float) $1;
-	}
-	;
-
-paramConstVector: '{' signedFloatConstant '}'
-	{
-	   $$.count = 4;
-	   $$.data[0] = $2;
-	   $$.data[1] = 0.0f;
-	   $$.data[2] = 0.0f;
-	   $$.data[3] = 1.0f;
-	}
-	| '{' signedFloatConstant ',' signedFloatConstant '}'
-	{
-	   $$.count = 4;
-	   $$.data[0] = $2;
-	   $$.data[1] = $4;
-	   $$.data[2] = 0.0f;
-	   $$.data[3] = 1.0f;
-	}
-	| '{' signedFloatConstant ',' signedFloatConstant ','
-              signedFloatConstant '}'
-	{
-	   $$.count = 4;
-	   $$.data[0] = $2;
-	   $$.data[1] = $4;
-	   $$.data[2] = $6;
-	   $$.data[3] = 1.0f;
-	}
-	| '{' signedFloatConstant ',' signedFloatConstant ','
-              signedFloatConstant ',' signedFloatConstant '}'
-	{
-	   $$.count = 4;
-	   $$.data[0] = $2;
-	   $$.data[1] = $4;
-	   $$.data[2] = $6;
-	   $$.data[3] = $8;
-	}
-	;
-
-signedFloatConstant: optionalSign REAL
-	{
-	   $$ = ($1) ? -$2 : $2;
-	}
-	| optionalSign INTEGER
-	{
-	   $$ = (float)(($1) ? -$2 : $2);
-	}
-	;
-
-optionalSign: '+'        { $$ = FALSE; }
-	| '-'            { $$ = TRUE;  }
-	|                { $$ = FALSE; }
-	;
-
-TEMP_statement: optVarSize TEMP { $<integer>$ = $2; } varNameList
-	;
-
-optVarSize: string
-	{
-	   /* 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(& @1, state, "unexpected IDENTIFIER");
-	      YYERROR;
-	   }
-
-	   if (strcmp("SHORT", $1) == 0) {
-	   } else if (strcmp("LONG", $1) == 0) {
-	   } else {
-	      char *const err_str =
-		 make_error_string("invalid storage size specifier \"%s\"",
-				   $1);
-
-	      yyerror(& @1, state, (err_str != NULL)
-		      ? err_str : "invalid storage size specifier");
-
-	      if (err_str != NULL) {
-		 free(err_str);
-	      }
-
-	      YYERROR;
-	   }
-	}
-	|
-	{
-	}
-	;
-
-ADDRESS_statement: ADDRESS { $<integer>$ = $1; } varNameList
-	;
-
-varNameList: varNameList ',' IDENTIFIER
-	{
-	   if (!declare_variable(state, $3, $<integer>0, & @3)) {
-	      free($3);
-	      YYERROR;
-	   }
-	}
-	| IDENTIFIER
-	{
-	   if (!declare_variable(state, $1, $<integer>0, & @1)) {
-	      free($1);
-	      YYERROR;
-	   }
-	}
-	;
-
-OUTPUT_statement: optVarSize OUTPUT IDENTIFIER '=' resultBinding
-	{
-	   struct asm_symbol *const s =
-	      declare_variable(state, $3, at_output, & @3);
-
-	   if (s == NULL) {
-	      free($3);
-	      YYERROR;
-	   } else {
-	      s->output_binding = $5;
-	   }
-	}
-	;
-
-resultBinding: RESULT POSITION
-	{
-	   if (state->mode == ARB_vertex) {
-	      $$ = VERT_RESULT_HPOS;
-	   } else {
-	      yyerror(& @2, state, "invalid program result name");
-	      YYERROR;
-	   }
-	}
-	| RESULT FOGCOORD
-	{
-	   if (state->mode == ARB_vertex) {
-	      $$ = VERT_RESULT_FOGC;
-	   } else {
-	      yyerror(& @2, state, "invalid program result name");
-	      YYERROR;
-	   }
-	}
-	| RESULT resultColBinding
-	{
-	   $$ = $2;
-	}
-	| RESULT POINTSIZE
-	{
-	   if (state->mode == ARB_vertex) {
-	      $$ = VERT_RESULT_PSIZ;
-	   } else {
-	      yyerror(& @2, state, "invalid program result name");
-	      YYERROR;
-	   }
-	}
-	| RESULT TEXCOORD optTexCoordUnitNum
-	{
-	   if (state->mode == ARB_vertex) {
-	      $$ = VERT_RESULT_TEX0 + $3;
-	   } else {
-	      yyerror(& @2, state, "invalid program result name");
-	      YYERROR;
-	   }
-	}
-	| RESULT DEPTH
-	{
-	   if (state->mode == ARB_fragment) {
-	      $$ = FRAG_RESULT_DEPTH;
-	   } else {
-	      yyerror(& @2, state, "invalid program result name");
-	      YYERROR;
-	   }
-	}
-	;
-
-resultColBinding: COLOR optResultFaceType optResultColorType
-	{
-	   $$ = $2 + $3;
-	}
-	;
-
-optResultFaceType:
-	{
-	   $$ = (state->mode == ARB_vertex)
-	      ? VERT_RESULT_COL0
-	      : FRAG_RESULT_COLOR;
-	}
-	| FRONT
-	{
-	   if (state->mode == ARB_vertex) {
-	      $$ = VERT_RESULT_COL0;
-	   } else {
-	      yyerror(& @1, state, "invalid program result name");
-	      YYERROR;
-	   }
-	}
-	| BACK
-	{
-	   if (state->mode == ARB_vertex) {
-	      $$ = VERT_RESULT_BFC0;
-	   } else {
-	      yyerror(& @1, state, "invalid program result name");
-	      YYERROR;
-	   }
-	}
-	;
-
-optResultColorType:
-	{
-	   $$ = 0; 
-	}
-	| PRIMARY
-	{
-	   if (state->mode == ARB_vertex) {
-	      $$ = 0;
-	   } else {
-	      yyerror(& @1, state, "invalid program result name");
-	      YYERROR;
-	   }
-	}
-	| SECONDARY
-	{
-	   if (state->mode == ARB_vertex) {
-	      $$ = 1;
-	   } else {
-	      yyerror(& @1, state, "invalid program result name");
-	      YYERROR;
-	   }
-	}
-	;
-
-optFaceType:    { $$ = 0; }
-	| FRONT	{ $$ = 0; }
-	| BACK  { $$ = 1; }
-	;
-
-optColorType:       { $$ = 0; }
-	| PRIMARY   { $$ = 0; }
-	| SECONDARY { $$ = 1; }
-	;
-
-optTexCoordUnitNum:                { $$ = 0; }
-	| '[' texCoordUnitNum ']'  { $$ = $2; }
-	;
-
-optTexImageUnitNum:                { $$ = 0; }
-	| '[' texImageUnitNum ']'  { $$ = $2; }
-	;
-
-optLegacyTexUnitNum:               { $$ = 0; }
-	| '[' legacyTexUnitNum ']' { $$ = $2; }
-	;
-
-texCoordUnitNum: INTEGER
-	{
-	   if ((unsigned) $1 >= state->MaxTextureCoordUnits) {
-	      yyerror(& @1, state, "invalid texture coordinate unit selector");
-	      YYERROR;
-	   }
-
-	   $$ = $1;
-	}
-	;
-
-texImageUnitNum: INTEGER
-	{
-	   if ((unsigned) $1 >= state->MaxTextureImageUnits) {
-	      yyerror(& @1, state, "invalid texture image unit selector");
-	      YYERROR;
-	   }
-
-	   $$ = $1;
-	}
-	;
-
-legacyTexUnitNum: INTEGER
-	{
-	   if ((unsigned) $1 >= state->MaxTextureUnits) {
-	      yyerror(& @1, state, "invalid texture unit selector");
-	      YYERROR;
-	   }
-
-	   $$ = $1;
-	}
-	;
-
-ALIAS_statement: ALIAS IDENTIFIER '=' USED_IDENTIFIER
-	{
-	   struct asm_symbol *exist = (struct asm_symbol *)
-	      _mesa_symbol_table_find_symbol(state->st, 0, $2);
-	   struct asm_symbol *target = (struct asm_symbol *)
-	      _mesa_symbol_table_find_symbol(state->st, 0, $4);
-
-	   free($4);
-
-	   if (exist != NULL) {
-	      char m[1000];
-	      _mesa_snprintf(m, sizeof(m), "redeclared identifier: %s", $2);
-	      free($2);
-	      yyerror(& @2, state, m);
-	      YYERROR;
-	   } else if (target == NULL) {
-	      free($2);
-	      yyerror(& @4, state,
-		      "undefined variable binding in ALIAS statement");
-	      YYERROR;
-	   } else {
-	      _mesa_symbol_table_add_symbol(state->st, 0, $2, target);
-	   }
-	}
-	;
-
-string: IDENTIFIER
-	| USED_IDENTIFIER
-	;
-
-%%
-
-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;
-
-   va_start(args, fmt);
-
-   /* Call vsnprintf once to determine how large the final string is.  Call it
-    * again to do the actual formatting.  from the v_mesa_snprintf manual page:
-    *
-    *    Upon successful return, these functions return the number of
-    *    characters printed  (not including the trailing '\0' used to end
-    *    output to strings).
-    */
-   length = 1 + vsnprintf(NULL, 0, fmt, args);
-
-   str = malloc(length);
-   if (str) {
-      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, 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(GLcontext *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/shader/program_parse_extra.c b/mesalib/src/mesa/shader/program_parse_extra.c
deleted file mode 100644
index ae98b782b..000000000
--- a/mesalib/src/mesa/shader/program_parse_extra.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- * 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 <string.h>
-#include "main/mtypes.h"
-#include "prog_instruction.h"
-#include "program_parser.h"
-
-
-/**
- * Extra assembly-level parser routines
- *
- * \author Ian Romanick <ian.d.romanick@intel.com>
- */
-
-int
-_mesa_parse_instruction_suffix(const struct asm_parser_state *state,
-			       const char *suffix,
-			       struct prog_instruction *inst)
-{
-   inst->CondUpdate = 0;
-   inst->CondDst = 0;
-   inst->SaturateMode = SATURATE_OFF;
-   inst->Precision = FLOAT32;
-
-
-   /* The first possible suffix element is the precision specifier from
-    * NV_fragment_program_option.
-    */
-   if (state->option.NV_fragment) {
-      switch (suffix[0]) {
-      case 'H':
-	 inst->Precision = FLOAT16;
-	 suffix++;
-	 break;
-      case 'R':
-	 inst->Precision = FLOAT32;
-	 suffix++;
-	 break;
-      case 'X':
-	 inst->Precision = FIXED12;
-	 suffix++;
-	 break;
-      default:
-	 break;
-      }
-   }
-
-   /* The next possible suffix element is the condition code modifier selection
-    * from NV_fragment_program_option.
-    */
-   if (state->option.NV_fragment) {
-      if (suffix[0] == 'C') {
-	 inst->CondUpdate = 1;
-	 suffix++;
-      }
-   }
-
-
-   /* The final possible suffix element is the saturation selector from
-    * ARB_fragment_program.
-    */
-   if (state->mode == ARB_fragment) {
-      if (strcmp(suffix, "_SAT") == 0) {
-	 inst->SaturateMode = SATURATE_ZERO_ONE;
-	 suffix += 4;
-      }
-   }
-
-
-   /* It is an error for all of the suffix string not to be consumed.
-    */
-   return suffix[0] == '\0';
-}
-
-
-int
-_mesa_parse_cc(const char *s)
-{
-   int cond = 0;
-
-   switch (s[0]) {
-   case 'E':
-      if (s[1] == 'Q') {
-	 cond = COND_EQ;
-      }
-      break;
-
-   case 'F':
-      if (s[1] == 'L') {
-	 cond = COND_FL;
-      }
-      break;
-
-   case 'G':
-      if (s[1] == 'E') {
-	 cond = COND_GE;
-      } else if (s[1] == 'T') {
-	 cond = COND_GT;
-      }
-      break;
-
-   case 'L':
-      if (s[1] == 'E') {
-	 cond = COND_LE;
-      } else if (s[1] == 'T') {
-	 cond = COND_LT;
-      }
-      break;
-
-   case 'N':
-      if (s[1] == 'E') {
-	 cond = COND_NE;
-      }
-      break;
-
-   case 'T':
-      if (s[1] == 'R') {
-	 cond = COND_TR;
-      }
-      break;
-
-   default:
-      break;
-   }
-
-   return ((cond == 0) || (s[2] != '\0')) ? 0 : cond;
-}
-
-
-int
-_mesa_ARBvp_parse_option(struct asm_parser_state *state, const char *option)
-{
-   if (strcmp(option, "ARB_position_invariant") == 0) {
-      state->option.PositionInvariant = 1;
-      return 1;
-   }
-
-   return 0;
-}
-
-
-int
-_mesa_ARBfp_parse_option(struct asm_parser_state *state, const char *option)
-{
-   /* All of the options currently supported start with "ARB_".  The code is
-    * currently structured with nested if-statements because eventually options
-    * that start with "NV_" will be supported.  This structure will result in
-    * less churn when those options are added.
-    */
-   if (strncmp(option, "ARB_", 4) == 0) {
-      /* Advance the pointer past the "ARB_" prefix.
-       */
-      option += 4;
-
-
-      if (strncmp(option, "fog_", 4) == 0) {
-	 option += 4;
-
-	 if (state->option.Fog == OPTION_NONE) {
-	    if (strcmp(option, "exp") == 0) {
-	       state->option.Fog = OPTION_FOG_EXP;
-	       return 1;
-	    } else if (strcmp(option, "exp2") == 0) {
-	       state->option.Fog = OPTION_FOG_EXP2;
-	       return 1;
-	    } else if (strcmp(option, "linear") == 0) {
-	       state->option.Fog = OPTION_FOG_LINEAR;
-	       return 1;
-	    }
-	 }
-
-	 return 0;
-      } else if (strncmp(option, "precision_hint_", 15) == 0) {
-	 option += 15;
-
-	 if (state->option.PrecisionHint == OPTION_NONE) {
-	    if (strcmp(option, "nicest") == 0) {
-	       state->option.PrecisionHint = OPTION_NICEST;
-	       return 1;
-	    } else if (strcmp(option, "fastest") == 0) {
-	       state->option.PrecisionHint = OPTION_FASTEST;
-	       return 1;
-	    }
-	 }
-
-	 return 0;
-      } else if (strcmp(option, "draw_buffers") == 0) {
-	 /* Don't need to check extension availability because all Mesa-based
-	  * drivers support GL_ARB_draw_buffers.
-	  */
-	 state->option.DrawBuffers = 1;
-	 return 1;
-      } else if (strcmp(option, "fragment_program_shadow") == 0) {
-	 if (state->ctx->Extensions.ARB_fragment_program_shadow) {
-	    state->option.Shadow = 1;
-	    return 1;
-	 }
-      } else if (strncmp(option, "fragment_coord_", 15) == 0) {
-         option += 15;
-         if (state->ctx->Extensions.ARB_fragment_coord_conventions) {
-            if (strcmp(option, "origin_upper_left") == 0) {
-               state->option.OriginUpperLeft = 1;
-               return 1;
-            }
-            else if (strcmp(option, "pixel_center_integer") == 0) {
-               state->option.PixelCenterInteger = 1;
-               return 1;
-            }
-         }
-      }
-   } else if (strncmp(option, "NV_fragment_program", 19) == 0) {
-      option += 19;
-
-      /* Other NV_fragment_program strings may be supported later.
-       */
-      if (option[0] == '\0') {
-	 if (state->ctx->Extensions.NV_fragment_program_option) {
-	    state->option.NV_fragment = 1;
-	    return 1;
-	 }
-      }
-   } else if (strncmp(option, "MESA_", 5) == 0) {
-      option += 5;
-
-      if (strcmp(option, "texture_array") == 0) {
-	 if (state->ctx->Extensions.MESA_texture_array) {
-	    state->option.TexArray = 1;
-	    return 1;
-	 }
-      }
-   }
-
-   return 0;
-}
diff --git a/mesalib/src/mesa/shader/program_parser.h b/mesalib/src/mesa/shader/program_parser.h
deleted file mode 100644
index be952d4b9..000000000
--- a/mesalib/src/mesa/shader/program_parser.h
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
- * 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.
- */
-#pragma once
-
-#include "main/config.h"
-
-#ifndef MTYPES_H
-struct __GLcontextRec;
-typedef struct __GLcontextRec GLcontext;
-#endif
-
-enum asm_type {
-   at_none,
-   at_address,
-   at_attrib,
-   at_param,
-   at_temp,
-   at_output
-};
-
-struct asm_symbol {
-   struct asm_symbol *next;    /**< List linkage for freeing. */
-   const char *name;
-   enum asm_type type;
-   unsigned attrib_binding;
-   unsigned output_binding;   /**< Output / result register number. */
-
-   /**
-    * One of PROGRAM_STATE_VAR, PROGRAM_LOCAL_PARAM, or PROGRAM_ENV_PARAM.
-    */
-   unsigned param_binding_type;
-
-   /** 
-    * Offset into the program_parameter_list where the tokens representing our
-    * bound state (or constants) start.
-    */
-   unsigned param_binding_begin;
-
-   /**
-    * Constants put into the parameter list may be swizzled.  This
-    * field contain's the symbol's swizzle. (SWIZZLE_X/Y/Z/W)
-    */
-   unsigned param_binding_swizzle;
-
-   /* This is how many entries in the program_parameter_list we take up
-    * with our state tokens or constants. Note that this is _not_ the same as
-    * the number of param registers we eventually use.
-    */
-   unsigned param_binding_length;
-
-   /**
-    * Index of the temp register assigned to this variable.
-    */
-   unsigned temp_binding;
-
-   /**
-    * Flag whether or not a PARAM is an array
-    */
-   unsigned param_is_array:1;
-
-
-   /**
-    * Flag whether or not a PARAM array is accessed indirectly
-    */
-   unsigned param_accessed_indirectly:1;
-
-
-   /**
-    * \brief Is first pass of parameter layout done with this variable?
-    *
-    * The parameter layout routine operates in two passes.  This flag tracks
-    * whether or not the first pass has handled this variable.
-    *
-    * \sa _mesa_layout_parameters
-    */
-   unsigned pass1_done:1;
-};
-
-
-struct asm_vector {
-   unsigned count;
-   float    data[4];
-};
-
-
-struct asm_swizzle_mask {
-   unsigned swizzle:12;
-   unsigned mask:4;
-};
-
-
-struct asm_src_register {
-   struct prog_src_register Base;
-
-   /**
-    * Symbol associated with indirect access to parameter arrays.
-    *
-    * If \c Base::RelAddr is 1, this will point to the symbol for the parameter
-    * that is being dereferenced.  Further, \c Base::Index will be the offset
-    * from the address register being used.
-    */
-   struct asm_symbol *Symbol;
-};
-
-
-struct asm_instruction {
-   struct prog_instruction Base;
-   struct asm_instruction *next;
-   struct asm_src_register SrcReg[3];
-};
-
-
-struct asm_parser_state {
-   GLcontext *ctx;
-   struct gl_program *prog;
-
-   /**
-    * Per-program target limits
-    */
-   struct gl_program_constants *limits;
-
-   struct _mesa_symbol_table *st;
-
-   /**
-    * Linked list of symbols
-    *
-    * This list is \b only used when cleaning up compiler state and freeing
-    * memory.
-    */
-   struct asm_symbol *sym;
-
-   /**
-    * State for the lexer.
-    */
-   void *scanner;
-
-   /**
-    * Linked list of instructions generated during parsing.
-    */
-   /*@{*/
-   struct asm_instruction *inst_head;
-   struct asm_instruction *inst_tail;
-   /*@}*/
-
-
-   /**
-    * Selected limits copied from gl_constants
-    *
-    * These are limits from the GL context, but various bits in the program
-    * must be validated against these values.
-    */
-   /*@{*/
-   unsigned MaxTextureCoordUnits;
-   unsigned MaxTextureImageUnits;
-   unsigned MaxTextureUnits;
-   unsigned MaxClipPlanes;
-   unsigned MaxLights;
-   unsigned MaxProgramMatrices;
-   /*@}*/
-
-   /**
-    * Value to use in state vector accessors for environment and local
-    * parameters
-    */
-   unsigned state_param_enum;
-
-
-   /**
-    * Input attributes bound to specific names
-    *
-    * This is only needed so that errors can be properly produced when
-    * multiple ATTRIB statements bind illegal combinations of vertex
-    * attributes.
-    */
-   unsigned InputsBound;
-
-   enum {
-      invalid_mode = 0,
-      ARB_vertex,
-      ARB_fragment
-   } mode;
-
-   struct {
-      unsigned PositionInvariant:1;
-      unsigned Fog:2;
-      unsigned PrecisionHint:2;
-      unsigned DrawBuffers:1;
-      unsigned Shadow:1;
-      unsigned TexRect:1;
-      unsigned TexArray:1;
-      unsigned NV_fragment:1;
-      unsigned OriginUpperLeft:1;
-      unsigned PixelCenterInteger:1;
-   } option;
-
-   struct {
-      unsigned UsesKill:1;
-   } fragment;
-};
-
-#define OPTION_NONE        0
-#define OPTION_FOG_EXP     1
-#define OPTION_FOG_EXP2    2
-#define OPTION_FOG_LINEAR  3
-#define OPTION_NICEST      1
-#define OPTION_FASTEST     2
-
-typedef struct YYLTYPE {
-   int first_line;
-   int first_column;
-   int last_line;
-   int last_column;
-   int position;
-} YYLTYPE;
-
-#define YYLTYPE_IS_DECLARED 1
-#define YYLTYPE_IS_TRIVIAL 1
-
-
-extern GLboolean _mesa_parse_arb_program(GLcontext *ctx, GLenum target,
-    const GLubyte *str, GLsizei len, struct asm_parser_state *state);
-
-
-
-/* From program_lexer.l. */
-extern void _mesa_program_lexer_dtor(void *scanner);
-
-extern void _mesa_program_lexer_ctor(void **scanner,
-    struct asm_parser_state *state, const char *string, size_t len);
-
-
-/**
- *\name From program_parse_extra.c
- */
-/*@{*/
-
-/**
- * Parses and processes an option string to an ARB vertex program
- *
- * \return
- * Non-zero on success, zero on failure.
- */
-extern int _mesa_ARBvp_parse_option(struct asm_parser_state *state,
-    const char *option);
-
-/**
- * Parses and processes an option string to an ARB fragment program
- *
- * \return
- * Non-zero on success, zero on failure.
- */
-extern int _mesa_ARBfp_parse_option(struct asm_parser_state *state,
-    const char *option);
-
-/**
- * Parses and processes instruction suffixes
- *
- * Instruction suffixes, such as \c _SAT, are processed.  The relevant bits
- * are set in \c inst.  If suffixes are encountered that are either not known
- * or not supported by the modes and options set in \c state, zero will be
- * returned.
- *
- * \return
- * Non-zero on success, zero on failure.
- */
-extern int _mesa_parse_instruction_suffix(const struct asm_parser_state *state,
-    const char *suffix, struct prog_instruction *inst);
-
-/**
- * Parses a condition code name
- *
- * The condition code names (e.g., \c LT, \c GT, \c NE) were added to assembly
- * shaders with the \c GL_NV_fragment_program_option extension.  This function
- * converts a string representation into one of the \c COND_ macros.
- *
- * \return
- * One of the \c COND_ macros defined in prog_instruction.h on success or zero
- * on failure.
- */
-extern int _mesa_parse_cc(const char *s);
-
-/*@}*/
diff --git a/mesalib/src/mesa/shader/programopt.c b/mesalib/src/mesa/shader/programopt.c
deleted file mode 100644
index fb2ebe633..000000000
--- a/mesalib/src/mesa/shader/programopt.c
+++ /dev/null
@@ -1,669 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.3
- *
- * 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  programopt.c 
- * Vertex/Fragment program optimizations and transformations for program
- * options, etc.
- *
- * \author Brian Paul
- */
-
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "prog_parameter.h"
-#include "prog_statevars.h"
-#include "program.h"
-#include "programopt.h"
-#include "prog_instruction.h"
-
-
-/**
- * This function inserts instructions for coordinate modelview * projection
- * into a vertex program.
- * May be used to implement the position_invariant option.
- */
-static void
-_mesa_insert_mvp_dp4_code(GLcontext *ctx, struct gl_vertex_program *vprog)
-{
-   struct prog_instruction *newInst;
-   const GLuint origLen = vprog->Base.NumInstructions;
-   const GLuint newLen = origLen + 4;
-   GLuint i;
-
-   /*
-    * Setup state references for the modelview/projection matrix.
-    * XXX we should check if these state vars are already declared.
-    */
-   static const gl_state_index mvpState[4][STATE_LENGTH] = {
-      { STATE_MVP_MATRIX, 0, 0, 0, 0 },  /* state.matrix.mvp.row[0] */
-      { STATE_MVP_MATRIX, 0, 1, 1, 0 },  /* state.matrix.mvp.row[1] */
-      { STATE_MVP_MATRIX, 0, 2, 2, 0 },  /* state.matrix.mvp.row[2] */
-      { STATE_MVP_MATRIX, 0, 3, 3, 0 },  /* state.matrix.mvp.row[3] */
-   };
-   GLint mvpRef[4];
-
-   for (i = 0; i < 4; i++) {
-      mvpRef[i] = _mesa_add_state_reference(vprog->Base.Parameters,
-                                            mvpState[i]);
-   }
-
-   /* Alloc storage for new instructions */
-   newInst = _mesa_alloc_instructions(newLen);
-   if (!newInst) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY,
-                  "glProgramString(inserting position_invariant code)");
-      return;
-   }
-
-   /*
-    * Generated instructions:
-    * newInst[0] = DP4 result.position.x, mvp.row[0], vertex.position;
-    * newInst[1] = DP4 result.position.y, mvp.row[1], vertex.position;
-    * newInst[2] = DP4 result.position.z, mvp.row[2], vertex.position;
-    * newInst[3] = DP4 result.position.w, mvp.row[3], vertex.position;
-    */
-   _mesa_init_instructions(newInst, 4);
-   for (i = 0; i < 4; i++) {
-      newInst[i].Opcode = OPCODE_DP4;
-      newInst[i].DstReg.File = PROGRAM_OUTPUT;
-      newInst[i].DstReg.Index = VERT_RESULT_HPOS;
-      newInst[i].DstReg.WriteMask = (WRITEMASK_X << i);
-      newInst[i].SrcReg[0].File = PROGRAM_STATE_VAR;
-      newInst[i].SrcReg[0].Index = mvpRef[i];
-      newInst[i].SrcReg[0].Swizzle = SWIZZLE_NOOP;
-      newInst[i].SrcReg[1].File = PROGRAM_INPUT;
-      newInst[i].SrcReg[1].Index = VERT_ATTRIB_POS;
-      newInst[i].SrcReg[1].Swizzle = SWIZZLE_NOOP;
-   }
-
-   /* Append original instructions after new instructions */
-   _mesa_copy_instructions (newInst + 4, vprog->Base.Instructions, origLen);
-
-   /* free old instructions */
-   _mesa_free_instructions(vprog->Base.Instructions, origLen);
-
-   /* install new instructions */
-   vprog->Base.Instructions = newInst;
-   vprog->Base.NumInstructions = newLen;
-   vprog->Base.InputsRead |= VERT_BIT_POS;
-   vprog->Base.OutputsWritten |= BITFIELD64_BIT(VERT_RESULT_HPOS);
-}
-
-
-static void
-_mesa_insert_mvp_mad_code(GLcontext *ctx, struct gl_vertex_program *vprog)
-{
-   struct prog_instruction *newInst;
-   const GLuint origLen = vprog->Base.NumInstructions;
-   const GLuint newLen = origLen + 4;
-   GLuint hposTemp;
-   GLuint i;
-
-   /*
-    * Setup state references for the modelview/projection matrix.
-    * XXX we should check if these state vars are already declared.
-    */
-   static const gl_state_index mvpState[4][STATE_LENGTH] = {
-      { STATE_MVP_MATRIX, 0, 0, 0, STATE_MATRIX_TRANSPOSE },
-      { STATE_MVP_MATRIX, 0, 1, 1, STATE_MATRIX_TRANSPOSE },
-      { STATE_MVP_MATRIX, 0, 2, 2, STATE_MATRIX_TRANSPOSE },
-      { STATE_MVP_MATRIX, 0, 3, 3, STATE_MATRIX_TRANSPOSE },
-   };
-   GLint mvpRef[4];
-
-   for (i = 0; i < 4; i++) {
-      mvpRef[i] = _mesa_add_state_reference(vprog->Base.Parameters,
-                                            mvpState[i]);
-   }
-
-   /* Alloc storage for new instructions */
-   newInst = _mesa_alloc_instructions(newLen);
-   if (!newInst) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY,
-                  "glProgramString(inserting position_invariant code)");
-      return;
-   }
-
-   /* TEMP hposTemp; */
-   hposTemp = vprog->Base.NumTemporaries++;
-
-   /*
-    * Generated instructions:
-    *    emit_op2(p, OPCODE_MUL, tmp, 0, swizzle1(src,X), mat[0]);
-    *    emit_op3(p, OPCODE_MAD, tmp, 0, swizzle1(src,Y), mat[1], tmp);
-    *    emit_op3(p, OPCODE_MAD, tmp, 0, swizzle1(src,Z), mat[2], tmp);
-    *    emit_op3(p, OPCODE_MAD, dest, 0, swizzle1(src,W), mat[3], tmp);
-    */
-   _mesa_init_instructions(newInst, 4);
-
-   newInst[0].Opcode = OPCODE_MUL;
-   newInst[0].DstReg.File = PROGRAM_TEMPORARY;
-   newInst[0].DstReg.Index = hposTemp;
-   newInst[0].DstReg.WriteMask = WRITEMASK_XYZW;
-   newInst[0].SrcReg[0].File = PROGRAM_INPUT;
-   newInst[0].SrcReg[0].Index = VERT_ATTRIB_POS;
-   newInst[0].SrcReg[0].Swizzle = SWIZZLE_XXXX;
-   newInst[0].SrcReg[1].File = PROGRAM_STATE_VAR;
-   newInst[0].SrcReg[1].Index = mvpRef[0];
-   newInst[0].SrcReg[1].Swizzle = SWIZZLE_NOOP;
-
-   for (i = 1; i <= 2; i++) {
-      newInst[i].Opcode = OPCODE_MAD;
-      newInst[i].DstReg.File = PROGRAM_TEMPORARY;
-      newInst[i].DstReg.Index = hposTemp;
-      newInst[i].DstReg.WriteMask = WRITEMASK_XYZW;
-      newInst[i].SrcReg[0].File = PROGRAM_INPUT;
-      newInst[i].SrcReg[0].Index = VERT_ATTRIB_POS;
-      newInst[i].SrcReg[0].Swizzle = MAKE_SWIZZLE4(i,i,i,i);
-      newInst[i].SrcReg[1].File = PROGRAM_STATE_VAR;
-      newInst[i].SrcReg[1].Index = mvpRef[i];
-      newInst[i].SrcReg[1].Swizzle = SWIZZLE_NOOP;
-      newInst[i].SrcReg[2].File = PROGRAM_TEMPORARY;
-      newInst[i].SrcReg[2].Index = hposTemp;
-      newInst[1].SrcReg[2].Swizzle = SWIZZLE_NOOP;
-   }
-
-   newInst[3].Opcode = OPCODE_MAD;
-   newInst[3].DstReg.File = PROGRAM_OUTPUT;
-   newInst[3].DstReg.Index = VERT_RESULT_HPOS;
-   newInst[3].DstReg.WriteMask = WRITEMASK_XYZW;
-   newInst[3].SrcReg[0].File = PROGRAM_INPUT;
-   newInst[3].SrcReg[0].Index = VERT_ATTRIB_POS;
-   newInst[3].SrcReg[0].Swizzle = SWIZZLE_WWWW;
-   newInst[3].SrcReg[1].File = PROGRAM_STATE_VAR;
-   newInst[3].SrcReg[1].Index = mvpRef[3];
-   newInst[3].SrcReg[1].Swizzle = SWIZZLE_NOOP;
-   newInst[3].SrcReg[2].File = PROGRAM_TEMPORARY;
-   newInst[3].SrcReg[2].Index = hposTemp;
-   newInst[3].SrcReg[2].Swizzle = SWIZZLE_NOOP;
-
-
-   /* Append original instructions after new instructions */
-   _mesa_copy_instructions (newInst + 4, vprog->Base.Instructions, origLen);
-
-   /* free old instructions */
-   _mesa_free_instructions(vprog->Base.Instructions, origLen);
-
-   /* install new instructions */
-   vprog->Base.Instructions = newInst;
-   vprog->Base.NumInstructions = newLen;
-   vprog->Base.InputsRead |= VERT_BIT_POS;
-   vprog->Base.OutputsWritten |= BITFIELD64_BIT(VERT_RESULT_HPOS);
-}
-
-
-void
-_mesa_insert_mvp_code(GLcontext *ctx, struct gl_vertex_program *vprog)
-{
-   if (ctx->mvp_with_dp4) 
-      _mesa_insert_mvp_dp4_code( ctx, vprog );
-   else
-      _mesa_insert_mvp_mad_code( ctx, vprog );
-}
-      
-
-
-
-
-
-/**
- * Append extra instructions onto the given fragment program to implement
- * the fog mode specified by fprog->FogOption.
- * The fragment.fogcoord input is used to compute the fog blend factor.
- *
- * XXX with a little work, this function could be adapted to add fog code
- * to vertex programs too.
- */
-void
-_mesa_append_fog_code(GLcontext *ctx, struct gl_fragment_program *fprog)
-{
-   static const gl_state_index fogPStateOpt[STATE_LENGTH]
-      = { STATE_INTERNAL, STATE_FOG_PARAMS_OPTIMIZED, 0, 0, 0 };
-   static const gl_state_index fogColorState[STATE_LENGTH]
-      = { STATE_FOG_COLOR, 0, 0, 0, 0};
-   struct prog_instruction *newInst, *inst;
-   const GLuint origLen = fprog->Base.NumInstructions;
-   const GLuint newLen = origLen + 5;
-   GLuint i;
-   GLint fogPRefOpt, fogColorRef; /* state references */
-   GLuint colorTemp, fogFactorTemp; /* temporary registerss */
-
-   if (fprog->FogOption == GL_NONE) {
-      _mesa_problem(ctx, "_mesa_append_fog_code() called for fragment program"
-                    " with FogOption == GL_NONE");
-      return;
-   }
-
-   /* Alloc storage for new instructions */
-   newInst = _mesa_alloc_instructions(newLen);
-   if (!newInst) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY,
-                  "glProgramString(inserting fog_option code)");
-      return;
-   }
-
-   /* Copy orig instructions into new instruction buffer */
-   _mesa_copy_instructions(newInst, fprog->Base.Instructions, origLen);
-
-   /* PARAM fogParamsRefOpt = internal optimized fog params; */
-   fogPRefOpt
-      = _mesa_add_state_reference(fprog->Base.Parameters, fogPStateOpt);
-   /* PARAM fogColorRef = state.fog.color; */
-   fogColorRef
-      = _mesa_add_state_reference(fprog->Base.Parameters, fogColorState);
-
-   /* TEMP colorTemp; */
-   colorTemp = fprog->Base.NumTemporaries++;
-   /* TEMP fogFactorTemp; */
-   fogFactorTemp = fprog->Base.NumTemporaries++;
-
-   /* Scan program to find where result.color is written */
-   inst = newInst;
-   for (i = 0; i < fprog->Base.NumInstructions; i++) {
-      if (inst->Opcode == OPCODE_END)
-         break;
-      if (inst->DstReg.File == PROGRAM_OUTPUT &&
-          inst->DstReg.Index == FRAG_RESULT_COLOR) {
-         /* change the instruction to write to colorTemp w/ clamping */
-         inst->DstReg.File = PROGRAM_TEMPORARY;
-         inst->DstReg.Index = colorTemp;
-         inst->SaturateMode = SATURATE_ZERO_ONE;
-         /* don't break (may be several writes to result.color) */
-      }
-      inst++;
-   }
-   assert(inst->Opcode == OPCODE_END); /* we'll overwrite this inst */
-
-   _mesa_init_instructions(inst, 5);
-
-   /* emit instructions to compute fog blending factor */
-   if (fprog->FogOption == GL_LINEAR) {
-      /* MAD fogFactorTemp.x, fragment.fogcoord.x, fogPRefOpt.x, fogPRefOpt.y; */
-      inst->Opcode = OPCODE_MAD;
-      inst->DstReg.File = PROGRAM_TEMPORARY;
-      inst->DstReg.Index = fogFactorTemp;
-      inst->DstReg.WriteMask = WRITEMASK_X;
-      inst->SrcReg[0].File = PROGRAM_INPUT;
-      inst->SrcReg[0].Index = FRAG_ATTRIB_FOGC;
-      inst->SrcReg[0].Swizzle = SWIZZLE_XXXX;
-      inst->SrcReg[1].File = PROGRAM_STATE_VAR;
-      inst->SrcReg[1].Index = fogPRefOpt;
-      inst->SrcReg[1].Swizzle = SWIZZLE_XXXX;
-      inst->SrcReg[2].File = PROGRAM_STATE_VAR;
-      inst->SrcReg[2].Index = fogPRefOpt;
-      inst->SrcReg[2].Swizzle = SWIZZLE_YYYY;
-      inst->SaturateMode = SATURATE_ZERO_ONE;
-      inst++;
-   }
-   else {
-      ASSERT(fprog->FogOption == GL_EXP || fprog->FogOption == GL_EXP2);
-      /* fogPRefOpt.z = d/ln(2), fogPRefOpt.w = d/sqrt(ln(2) */
-      /* EXP: MUL fogFactorTemp.x, fogPRefOpt.z, fragment.fogcoord.x; */
-      /* EXP2: MUL fogFactorTemp.x, fogPRefOpt.w, fragment.fogcoord.x; */
-      inst->Opcode = OPCODE_MUL;
-      inst->DstReg.File = PROGRAM_TEMPORARY;
-      inst->DstReg.Index = fogFactorTemp;
-      inst->DstReg.WriteMask = WRITEMASK_X;
-      inst->SrcReg[0].File = PROGRAM_STATE_VAR;
-      inst->SrcReg[0].Index = fogPRefOpt;
-      inst->SrcReg[0].Swizzle
-         = (fprog->FogOption == GL_EXP) ? SWIZZLE_ZZZZ : SWIZZLE_WWWW;
-      inst->SrcReg[1].File = PROGRAM_INPUT;
-      inst->SrcReg[1].Index = FRAG_ATTRIB_FOGC;
-      inst->SrcReg[1].Swizzle = SWIZZLE_XXXX;
-      inst++;
-      if (fprog->FogOption == GL_EXP2) {
-         /* MUL fogFactorTemp.x, fogFactorTemp.x, fogFactorTemp.x; */
-         inst->Opcode = OPCODE_MUL;
-         inst->DstReg.File = PROGRAM_TEMPORARY;
-         inst->DstReg.Index = fogFactorTemp;
-         inst->DstReg.WriteMask = WRITEMASK_X;
-         inst->SrcReg[0].File = PROGRAM_TEMPORARY;
-         inst->SrcReg[0].Index = fogFactorTemp;
-         inst->SrcReg[0].Swizzle = SWIZZLE_XXXX;
-         inst->SrcReg[1].File = PROGRAM_TEMPORARY;
-         inst->SrcReg[1].Index = fogFactorTemp;
-         inst->SrcReg[1].Swizzle = SWIZZLE_XXXX;
-         inst++;
-      }
-      /* EX2_SAT fogFactorTemp.x, -fogFactorTemp.x; */
-      inst->Opcode = OPCODE_EX2;
-      inst->DstReg.File = PROGRAM_TEMPORARY;
-      inst->DstReg.Index = fogFactorTemp;
-      inst->DstReg.WriteMask = WRITEMASK_X;
-      inst->SrcReg[0].File = PROGRAM_TEMPORARY;
-      inst->SrcReg[0].Index = fogFactorTemp;
-      inst->SrcReg[0].Negate = NEGATE_XYZW;
-      inst->SrcReg[0].Swizzle = SWIZZLE_XXXX;
-      inst->SaturateMode = SATURATE_ZERO_ONE;
-      inst++;
-   }
-   /* LRP result.color.xyz, fogFactorTemp.xxxx, colorTemp, fogColorRef; */
-   inst->Opcode = OPCODE_LRP;
-   inst->DstReg.File = PROGRAM_OUTPUT;
-   inst->DstReg.Index = FRAG_RESULT_COLOR;
-   inst->DstReg.WriteMask = WRITEMASK_XYZ;
-   inst->SrcReg[0].File = PROGRAM_TEMPORARY;
-   inst->SrcReg[0].Index = fogFactorTemp;
-   inst->SrcReg[0].Swizzle = SWIZZLE_XXXX;
-   inst->SrcReg[1].File = PROGRAM_TEMPORARY;
-   inst->SrcReg[1].Index = colorTemp;
-   inst->SrcReg[1].Swizzle = SWIZZLE_NOOP;
-   inst->SrcReg[2].File = PROGRAM_STATE_VAR;
-   inst->SrcReg[2].Index = fogColorRef;
-   inst->SrcReg[2].Swizzle = SWIZZLE_NOOP;
-   inst++;
-   /* MOV result.color.w, colorTemp.x;  # copy alpha */
-   inst->Opcode = OPCODE_MOV;
-   inst->DstReg.File = PROGRAM_OUTPUT;
-   inst->DstReg.Index = FRAG_RESULT_COLOR;
-   inst->DstReg.WriteMask = WRITEMASK_W;
-   inst->SrcReg[0].File = PROGRAM_TEMPORARY;
-   inst->SrcReg[0].Index = colorTemp;
-   inst->SrcReg[0].Swizzle = SWIZZLE_NOOP;
-   inst++;
-   /* END; */
-   inst->Opcode = OPCODE_END;
-   inst++;
-
-   /* free old instructions */
-   _mesa_free_instructions(fprog->Base.Instructions, origLen);
-
-   /* install new instructions */
-   fprog->Base.Instructions = newInst;
-   fprog->Base.NumInstructions = inst - newInst;
-   fprog->Base.InputsRead |= FRAG_BIT_FOGC;
-   /* XXX do this?  fprog->FogOption = GL_NONE; */
-}
-
-
-
-static GLboolean
-is_texture_instruction(const struct prog_instruction *inst)
-{
-   switch (inst->Opcode) {
-   case OPCODE_TEX:
-   case OPCODE_TXB:
-   case OPCODE_TXD:
-   case OPCODE_TXL:
-   case OPCODE_TXP:
-   case OPCODE_TXP_NV:
-      return GL_TRUE;
-   default:
-      return GL_FALSE;
-   }
-}
-      
-
-/**
- * Count the number of texure indirections in the given program.
- * The program's NumTexIndirections field will be updated.
- * See the GL_ARB_fragment_program spec (issue 24) for details.
- * XXX we count texture indirections in texenvprogram.c (maybe use this code
- * instead and elsewhere).
- */
-void
-_mesa_count_texture_indirections(struct gl_program *prog)
-{
-   GLuint indirections = 1;
-   GLbitfield tempsOutput = 0x0;
-   GLbitfield aluTemps = 0x0;
-   GLuint i;
-
-   for (i = 0; i < prog->NumInstructions; i++) {
-      const struct prog_instruction *inst = prog->Instructions + i;
-
-      if (is_texture_instruction(inst)) {
-         if (((inst->SrcReg[0].File == PROGRAM_TEMPORARY) && 
-              (tempsOutput & (1 << inst->SrcReg[0].Index))) ||
-             ((inst->Opcode != OPCODE_KIL) &&
-              (inst->DstReg.File == PROGRAM_TEMPORARY) && 
-              (aluTemps & (1 << inst->DstReg.Index)))) 
-            {
-               indirections++;
-               tempsOutput = 0x0;
-               aluTemps = 0x0;
-            }
-      }
-      else {
-         GLuint j;
-         for (j = 0; j < 3; j++) {
-            if (inst->SrcReg[j].File == PROGRAM_TEMPORARY)
-               aluTemps |= (1 << inst->SrcReg[j].Index);
-         }
-         if (inst->DstReg.File == PROGRAM_TEMPORARY)
-            aluTemps |= (1 << inst->DstReg.Index);
-      }
-
-      if ((inst->Opcode != OPCODE_KIL) && (inst->DstReg.File == PROGRAM_TEMPORARY))
-         tempsOutput |= (1 << inst->DstReg.Index);
-   }
-
-   prog->NumTexIndirections = indirections;
-}
-
-
-/**
- * Count number of texture instructions in given program and update the
- * program's NumTexInstructions field.
- */
-void
-_mesa_count_texture_instructions(struct gl_program *prog)
-{
-   GLuint i;
-   prog->NumTexInstructions = 0;
-   for (i = 0; i < prog->NumInstructions; i++) {
-      prog->NumTexInstructions += is_texture_instruction(prog->Instructions + i);
-   }
-}
-
-
-/**
- * Scan/rewrite program to remove reads of custom (output) registers.
- * The passed type has to be either PROGRAM_OUTPUT or PROGRAM_VARYING
- * (for vertex shaders).
- * In GLSL shaders, varying vars can be read and written.
- * On some hardware, trying to read an output register causes trouble.
- * So, rewrite the program to use a temporary register in this case.
- */
-void
-_mesa_remove_output_reads(struct gl_program *prog, gl_register_file type)
-{
-   GLuint i;
-   GLint outputMap[VERT_RESULT_MAX];
-   GLuint numVaryingReads = 0;
-   GLboolean usedTemps[MAX_PROGRAM_TEMPS];
-   GLuint firstTemp = 0;
-
-   _mesa_find_used_registers(prog, PROGRAM_TEMPORARY,
-                             usedTemps, MAX_PROGRAM_TEMPS);
-
-   assert(type == PROGRAM_VARYING || type == PROGRAM_OUTPUT);
-   assert(prog->Target == GL_VERTEX_PROGRAM_ARB || type != PROGRAM_VARYING);
-
-   for (i = 0; i < VERT_RESULT_MAX; i++)
-      outputMap[i] = -1;
-
-   /* look for instructions which read from varying vars */
-   for (i = 0; i < prog->NumInstructions; i++) {
-      struct prog_instruction *inst = prog->Instructions + i;
-      const GLuint numSrc = _mesa_num_inst_src_regs(inst->Opcode);
-      GLuint j;
-      for (j = 0; j < numSrc; j++) {
-         if (inst->SrcReg[j].File == type) {
-            /* replace the read with a temp reg */
-            const GLuint var = inst->SrcReg[j].Index;
-            if (outputMap[var] == -1) {
-               numVaryingReads++;
-               outputMap[var] = _mesa_find_free_register(usedTemps,
-                                                         MAX_PROGRAM_TEMPS,
-                                                         firstTemp);
-               firstTemp = outputMap[var] + 1;
-            }
-            inst->SrcReg[j].File = PROGRAM_TEMPORARY;
-            inst->SrcReg[j].Index = outputMap[var];
-         }
-      }
-   }
-
-   if (numVaryingReads == 0)
-      return; /* nothing to be done */
-
-   /* look for instructions which write to the varying vars identified above */
-   for (i = 0; i < prog->NumInstructions; i++) {
-      struct prog_instruction *inst = prog->Instructions + i;
-      if (inst->DstReg.File == type &&
-          outputMap[inst->DstReg.Index] >= 0) {
-         /* change inst to write to the temp reg, instead of the varying */
-         inst->DstReg.File = PROGRAM_TEMPORARY;
-         inst->DstReg.Index = outputMap[inst->DstReg.Index];
-      }
-   }
-
-   /* insert new instructions to copy the temp vars to the varying vars */
-   {
-      struct prog_instruction *inst;
-      GLint endPos, var;
-
-      /* Look for END instruction and insert the new varying writes */
-      endPos = -1;
-      for (i = 0; i < prog->NumInstructions; i++) {
-         struct prog_instruction *inst = prog->Instructions + i;
-         if (inst->Opcode == OPCODE_END) {
-            endPos = i;
-            _mesa_insert_instructions(prog, i, numVaryingReads);
-            break;
-         }
-      }
-
-      assert(endPos >= 0);
-
-      /* insert new MOV instructions here */
-      inst = prog->Instructions + endPos;
-      for (var = 0; var < VERT_RESULT_MAX; var++) {
-         if (outputMap[var] >= 0) {
-            /* MOV VAR[var], TEMP[tmp]; */
-            inst->Opcode = OPCODE_MOV;
-            inst->DstReg.File = type;
-            inst->DstReg.Index = var;
-            inst->SrcReg[0].File = PROGRAM_TEMPORARY;
-            inst->SrcReg[0].Index = outputMap[var];
-            inst++;
-         }
-      }
-   }
-}
-
-
-/**
- * Make the given fragment program into a "no-op" shader.
- * Actually, just copy the incoming fragment color (or texcoord)
- * to the output color.
- * This is for debug/test purposes.
- */
-void
-_mesa_nop_fragment_program(GLcontext *ctx, struct gl_fragment_program *prog)
-{
-   struct prog_instruction *inst;
-   GLuint inputAttr;
-
-   inst = _mesa_alloc_instructions(2);
-   if (!inst) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "_mesa_nop_fragment_program");
-      return;
-   }
-
-   _mesa_init_instructions(inst, 2);
-
-   inst[0].Opcode = OPCODE_MOV;
-   inst[0].DstReg.File = PROGRAM_OUTPUT;
-   inst[0].DstReg.Index = FRAG_RESULT_COLOR;
-   inst[0].SrcReg[0].File = PROGRAM_INPUT;
-   if (prog->Base.InputsRead & FRAG_BIT_COL0)
-      inputAttr = FRAG_ATTRIB_COL0;
-   else
-      inputAttr = FRAG_ATTRIB_TEX0;
-   inst[0].SrcReg[0].Index = inputAttr;
-
-   inst[1].Opcode = OPCODE_END;
-
-   _mesa_free_instructions(prog->Base.Instructions,
-                           prog->Base.NumInstructions);
-
-   prog->Base.Instructions = inst;
-   prog->Base.NumInstructions = 2;
-   prog->Base.InputsRead = 1 << inputAttr;
-   prog->Base.OutputsWritten = BITFIELD64_BIT(FRAG_RESULT_COLOR);
-}
-
-
-/**
- * \sa _mesa_nop_fragment_program
- * Replace the given vertex program with a "no-op" program that just
- * transforms vertex position and emits color.
- */
-void
-_mesa_nop_vertex_program(GLcontext *ctx, struct gl_vertex_program *prog)
-{
-   struct prog_instruction *inst;
-   GLuint inputAttr;
-
-   /*
-    * Start with a simple vertex program that emits color.
-    */
-   inst = _mesa_alloc_instructions(2);
-   if (!inst) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "_mesa_nop_vertex_program");
-      return;
-   }
-
-   _mesa_init_instructions(inst, 2);
-
-   inst[0].Opcode = OPCODE_MOV;
-   inst[0].DstReg.File = PROGRAM_OUTPUT;
-   inst[0].DstReg.Index = VERT_RESULT_COL0;
-   inst[0].SrcReg[0].File = PROGRAM_INPUT;
-   if (prog->Base.InputsRead & VERT_BIT_COLOR0)
-      inputAttr = VERT_ATTRIB_COLOR0;
-   else
-      inputAttr = VERT_ATTRIB_TEX0;
-   inst[0].SrcReg[0].Index = inputAttr;
-
-   inst[1].Opcode = OPCODE_END;
-
-   _mesa_free_instructions(prog->Base.Instructions,
-                           prog->Base.NumInstructions);
-
-   prog->Base.Instructions = inst;
-   prog->Base.NumInstructions = 2;
-   prog->Base.InputsRead = 1 << inputAttr;
-   prog->Base.OutputsWritten = BITFIELD64_BIT(VERT_RESULT_COL0);
-
-   /*
-    * Now insert code to do standard modelview/projection transformation.
-    */
-   _mesa_insert_mvp_code(ctx, prog);
-}
diff --git a/mesalib/src/mesa/shader/programopt.h b/mesalib/src/mesa/shader/programopt.h
deleted file mode 100644
index 21fac0784..000000000
--- a/mesalib/src/mesa/shader/programopt.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.3
- *
- * 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.
- */
-
-
-#ifndef PROGRAMOPT_H
-#define PROGRAMOPT_H 1
-
-
-extern void
-_mesa_insert_mvp_code(GLcontext *ctx, struct gl_vertex_program *vprog);
-
-extern void
-_mesa_append_fog_code(GLcontext *ctx, struct gl_fragment_program *fprog);
-
-extern void
-_mesa_count_texture_indirections(struct gl_program *prog);
-
-extern void
-_mesa_count_texture_instructions(struct gl_program *prog);
-
-extern void
-_mesa_remove_output_reads(struct gl_program *prog, gl_register_file type);
-
-extern void
-_mesa_nop_fragment_program(GLcontext *ctx, struct gl_fragment_program *prog);
-
-extern void
-_mesa_nop_vertex_program(GLcontext *ctx, struct gl_vertex_program *prog);
-
-
-#endif /* PROGRAMOPT_H */
diff --git a/mesalib/src/mesa/shader/shader_api.c b/mesalib/src/mesa/shader/shader_api.c
deleted file mode 100644
index 5e87bb405..000000000
--- a/mesalib/src/mesa/shader/shader_api.c
+++ /dev/null
@@ -1,2233 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.6
- *
- * Copyright (C) 2004-2008  Brian Paul   All Rights Reserved.
- * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, 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 shader_api.c
- * Implementation of GLSL-related API functions
- * \author Brian Paul
- */
-
-/**
- * XXX things to do:
- * 1. Check that the right error code is generated for all _mesa_error() calls.
- * 2. Insert FLUSH_VERTICES calls in various places
- */
-
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/hash.h"
-#include "shader/program.h"
-#include "shader/prog_parameter.h"
-#include "shader/prog_statevars.h"
-#include "shader/prog_uniform.h"
-#include "shader/shader_api.h"
-#include "shader/slang/slang_compile.h"
-#include "shader/slang/slang_link.h"
-#include "main/dispatch.h"
-
-
-/**
- * Allocate a new gl_shader_program object, initialize it.
- */
-static struct gl_shader_program *
-_mesa_new_shader_program(GLcontext *ctx, GLuint name)
-{
-   struct gl_shader_program *shProg;
-   shProg = CALLOC_STRUCT(gl_shader_program);
-   if (shProg) {
-      shProg->Type = GL_SHADER_PROGRAM_MESA;
-      shProg->Name = name;
-      shProg->RefCount = 1;
-      shProg->Attributes = _mesa_new_parameter_list();
-   }
-   return shProg;
-}
-
-
-/**
- * Clear (free) the shader program state that gets produced by linking.
- */
-void
-_mesa_clear_shader_program_data(GLcontext *ctx,
-                                struct gl_shader_program *shProg)
-{
-   _mesa_reference_vertprog(ctx, &shProg->VertexProgram, NULL);
-   _mesa_reference_fragprog(ctx, &shProg->FragmentProgram, NULL);
-
-   if (shProg->Uniforms) {
-      _mesa_free_uniform_list(shProg->Uniforms);
-      shProg->Uniforms = NULL;
-   }
-
-   if (shProg->Varying) {
-      _mesa_free_parameter_list(shProg->Varying);
-      shProg->Varying = NULL;
-   }
-}
-
-
-/**
- * Free all the data that hangs off a shader program object, but not the
- * object itself.
- */
-void
-_mesa_free_shader_program_data(GLcontext *ctx,
-                               struct gl_shader_program *shProg)
-{
-   GLuint i;
-
-   assert(shProg->Type == GL_SHADER_PROGRAM_MESA);
-
-   _mesa_clear_shader_program_data(ctx, shProg);
-
-   if (shProg->Attributes) {
-      _mesa_free_parameter_list(shProg->Attributes);
-      shProg->Attributes = NULL;
-   }
-
-   /* detach shaders */
-   for (i = 0; i < shProg->NumShaders; i++) {
-      _mesa_reference_shader(ctx, &shProg->Shaders[i], NULL);
-   }
-   shProg->NumShaders = 0;
-
-   if (shProg->Shaders) {
-      free(shProg->Shaders);
-      shProg->Shaders = NULL;
-   }
-
-   if (shProg->InfoLog) {
-      free(shProg->InfoLog);
-      shProg->InfoLog = NULL;
-   }
-}
-
-
-/**
- * Free/delete a shader program object.
- */
-void
-_mesa_free_shader_program(GLcontext *ctx, struct gl_shader_program *shProg)
-{
-   _mesa_free_shader_program_data(ctx, shProg);
-
-   free(shProg);
-}
-
-
-/**
- * Set ptr to point to shProg.
- * If ptr is pointing to another object, decrement its refcount (and delete
- * if refcount hits zero).
- * Then set ptr to point to shProg, incrementing its refcount.
- */
-/* XXX this could be static */
-void
-_mesa_reference_shader_program(GLcontext *ctx,
-                               struct gl_shader_program **ptr,
-                               struct gl_shader_program *shProg)
-{
-   assert(ptr);
-   if (*ptr == shProg) {
-      /* no-op */
-      return;
-   }
-   if (*ptr) {
-      /* Unreference the old shader program */
-      GLboolean deleteFlag = GL_FALSE;
-      struct gl_shader_program *old = *ptr;
-
-      ASSERT(old->RefCount > 0);
-      old->RefCount--;
-#if 0
-      printf("ShaderProgram %p ID=%u  RefCount-- to %d\n",
-             (void *) old, old->Name, old->RefCount);
-#endif
-      deleteFlag = (old->RefCount == 0);
-
-      if (deleteFlag) {
-         _mesa_HashRemove(ctx->Shared->ShaderObjects, old->Name);
-         _mesa_free_shader_program(ctx, old);
-      }
-
-      *ptr = NULL;
-   }
-   assert(!*ptr);
-
-   if (shProg) {
-      shProg->RefCount++;
-#if 0
-      printf("ShaderProgram %p ID=%u  RefCount++ to %d\n",
-             (void *) shProg, shProg->Name, shProg->RefCount);
-#endif
-      *ptr = shProg;
-   }
-}
-
-
-/**
- * Lookup a GLSL program object.
- */
-struct gl_shader_program *
-_mesa_lookup_shader_program(GLcontext *ctx, GLuint name)
-{
-   struct gl_shader_program *shProg;
-   if (name) {
-      shProg = (struct gl_shader_program *)
-         _mesa_HashLookup(ctx->Shared->ShaderObjects, name);
-      /* Note that both gl_shader and gl_shader_program objects are kept
-       * in the same hash table.  Check the object's type to be sure it's
-       * what we're expecting.
-       */
-      if (shProg && shProg->Type != GL_SHADER_PROGRAM_MESA) {
-         return NULL;
-      }
-      return shProg;
-   }
-   return NULL;
-}
-
-
-/**
- * As above, but record an error if program is not found.
- */
-static struct gl_shader_program *
-_mesa_lookup_shader_program_err(GLcontext *ctx, GLuint name,
-                                const char *caller)
-{
-   if (!name) {
-      _mesa_error(ctx, GL_INVALID_VALUE, caller);
-      return NULL;
-   }
-   else {
-      struct gl_shader_program *shProg = (struct gl_shader_program *)
-         _mesa_HashLookup(ctx->Shared->ShaderObjects, name);
-      if (!shProg) {
-         _mesa_error(ctx, GL_INVALID_VALUE, caller);
-         return NULL;
-      }
-      if (shProg->Type != GL_SHADER_PROGRAM_MESA) {
-         _mesa_error(ctx, GL_INVALID_OPERATION, caller);
-         return NULL;
-      }
-      return shProg;
-   }
-}
-
-
-
-
-/**
- * Allocate a new gl_shader object, initialize it.
- */
-struct gl_shader *
-_mesa_new_shader(GLcontext *ctx, GLuint name, GLenum type)
-{
-   struct gl_shader *shader;
-   assert(type == GL_FRAGMENT_SHADER || type == GL_VERTEX_SHADER);
-   shader = CALLOC_STRUCT(gl_shader);
-   if (shader) {
-      shader->Type = type;
-      shader->Name = name;
-      shader->RefCount = 1;
-   }
-   return shader;
-}
-
-
-void
-_mesa_free_shader(GLcontext *ctx, struct gl_shader *sh)
-{
-   if (sh->Source)
-      free((void *) sh->Source);
-   if (sh->InfoLog)
-      free(sh->InfoLog);
-   _mesa_reference_program(ctx, &sh->Program, NULL);
-   free(sh);
-}
-
-
-/**
- * Set ptr to point to sh.
- * If ptr is pointing to another shader, decrement its refcount (and delete
- * if refcount hits zero).
- * Then set ptr to point to sh, incrementing its refcount.
- */
-/* XXX this could be static */
-void
-_mesa_reference_shader(GLcontext *ctx, struct gl_shader **ptr,
-                       struct gl_shader *sh)
-{
-   assert(ptr);
-   if (*ptr == sh) {
-      /* no-op */
-      return;
-   }
-   if (*ptr) {
-      /* Unreference the old shader */
-      GLboolean deleteFlag = GL_FALSE;
-      struct gl_shader *old = *ptr;
-
-      ASSERT(old->RefCount > 0);
-      old->RefCount--;
-      /*printf("SHADER DECR %p (%d) to %d\n",
-        (void*) old, old->Name, old->RefCount);*/
-      deleteFlag = (old->RefCount == 0);
-
-      if (deleteFlag) {
-         _mesa_HashRemove(ctx->Shared->ShaderObjects, old->Name);
-         _mesa_free_shader(ctx, old);
-      }
-
-      *ptr = NULL;
-   }
-   assert(!*ptr);
-
-   if (sh) {
-      /* reference new */
-      sh->RefCount++;
-      /*printf("SHADER INCR %p (%d) to %d\n",
-        (void*) sh, sh->Name, sh->RefCount);*/
-      *ptr = sh;
-   }
-}
-
-
-/**
- * Lookup a GLSL shader object.
- */
-struct gl_shader *
-_mesa_lookup_shader(GLcontext *ctx, GLuint name)
-{
-   if (name) {
-      struct gl_shader *sh = (struct gl_shader *)
-         _mesa_HashLookup(ctx->Shared->ShaderObjects, name);
-      /* Note that both gl_shader and gl_shader_program objects are kept
-       * in the same hash table.  Check the object's type to be sure it's
-       * what we're expecting.
-       */
-      if (sh && sh->Type == GL_SHADER_PROGRAM_MESA) {
-         return NULL;
-      }
-      return sh;
-   }
-   return NULL;
-}
-
-
-/**
- * As above, but record an error if shader is not found.
- */
-static struct gl_shader *
-_mesa_lookup_shader_err(GLcontext *ctx, GLuint name, const char *caller)
-{
-   if (!name) {
-      _mesa_error(ctx, GL_INVALID_VALUE, caller);
-      return NULL;
-   }
-   else {
-      struct gl_shader *sh = (struct gl_shader *)
-         _mesa_HashLookup(ctx->Shared->ShaderObjects, name);
-      if (!sh) {
-         _mesa_error(ctx, GL_INVALID_VALUE, caller);
-         return NULL;
-      }
-      if (sh->Type == GL_SHADER_PROGRAM_MESA) {
-         _mesa_error(ctx, GL_INVALID_OPERATION, caller);
-         return NULL;
-      }
-      return sh;
-   }
-}
-
-
-/**
- * Return mask of GLSL_x flags by examining the MESA_GLSL env var.
- */
-static GLbitfield
-get_shader_flags(void)
-{
-   GLbitfield flags = 0x0;
-   const char *env = _mesa_getenv("MESA_GLSL");
-
-   if (env) {
-      if (strstr(env, "dump"))
-         flags |= GLSL_DUMP;
-      if (strstr(env, "log"))
-         flags |= GLSL_LOG;
-      if (strstr(env, "nopvert"))
-         flags |= GLSL_NOP_VERT;
-      if (strstr(env, "nopfrag"))
-         flags |= GLSL_NOP_FRAG;
-      if (strstr(env, "nopt"))
-         flags |= GLSL_NO_OPT;
-      else if (strstr(env, "opt"))
-         flags |= GLSL_OPT;
-      if (strstr(env, "uniform"))
-         flags |= GLSL_UNIFORMS;
-      if (strstr(env, "useprog"))
-         flags |= GLSL_USE_PROG;
-   }
-
-   return flags;
-}
-
-
-/**
- * Initialize context's shader state.
- */
-void
-_mesa_init_shader_state(GLcontext * ctx)
-{
-   /* Device drivers may override these to control what kind of instructions
-    * are generated by the GLSL compiler.
-    */
-   ctx->Shader.EmitHighLevelInstructions = GL_TRUE;
-   ctx->Shader.EmitContReturn = GL_TRUE;
-   ctx->Shader.EmitCondCodes = GL_FALSE;
-   ctx->Shader.EmitComments = GL_FALSE;
-   ctx->Shader.Flags = get_shader_flags();
-
-   /* Default pragma settings */
-   ctx->Shader.DefaultPragmas.IgnoreOptimize = GL_FALSE;
-   ctx->Shader.DefaultPragmas.IgnoreDebug = GL_FALSE;
-   ctx->Shader.DefaultPragmas.Optimize = GL_TRUE;
-   ctx->Shader.DefaultPragmas.Debug = GL_FALSE;
-}
-
-
-/**
- * Free the per-context shader-related state.
- */
-void
-_mesa_free_shader_state(GLcontext *ctx)
-{
-   _mesa_reference_shader_program(ctx, &ctx->Shader.CurrentProgram, NULL);
-}
-
-
-/**
- * Copy string from <src> to <dst>, up to maxLength characters, returning
- * length of <dst> in <length>.
- * \param src  the strings source
- * \param maxLength  max chars to copy
- * \param length  returns number of chars copied
- * \param dst  the string destination
- */
-static void
-copy_string(GLchar *dst, GLsizei maxLength, GLsizei *length, const GLchar *src)
-{
-   GLsizei len;
-   for (len = 0; len < maxLength - 1 && src && src[len]; len++)
-      dst[len] = src[len];
-   if (maxLength > 0)
-      dst[len] = 0;
-   if (length)
-      *length = len;
-}
-
-
-static GLboolean
-_mesa_is_program(GLcontext *ctx, GLuint name)
-{
-   struct gl_shader_program *shProg = _mesa_lookup_shader_program(ctx, name);
-   return shProg ? GL_TRUE : GL_FALSE;
-}
-
-
-static GLboolean
-_mesa_is_shader(GLcontext *ctx, GLuint name)
-{
-   struct gl_shader *shader = _mesa_lookup_shader(ctx, name);
-   return shader ? GL_TRUE : GL_FALSE;
-}
-
-
-/**
- * Called via ctx->Driver.AttachShader()
- */
-static void
-_mesa_attach_shader(GLcontext *ctx, GLuint program, GLuint shader)
-{
-   struct gl_shader_program *shProg;
-   struct gl_shader *sh;
-   GLuint i, n;
-
-   shProg = _mesa_lookup_shader_program_err(ctx, program, "glAttachShader");
-   if (!shProg)
-      return;
-
-   sh = _mesa_lookup_shader_err(ctx, shader, "glAttachShader");
-   if (!sh) {
-      return;
-   }
-
-   n = shProg->NumShaders;
-   for (i = 0; i < n; i++) {
-      if (shProg->Shaders[i] == sh) {
-         /* The shader is already attched to this program.  The
-          * GL_ARB_shader_objects spec says:
-          *
-          *     "The error INVALID_OPERATION is generated by AttachObjectARB
-          *     if <obj> is already attached to <containerObj>."
-          */
-         _mesa_error(ctx, GL_INVALID_OPERATION, "glAttachShader");
-         return;
-      }
-   }
-
-   /* grow list */
-   shProg->Shaders = (struct gl_shader **)
-      _mesa_realloc(shProg->Shaders,
-                    n * sizeof(struct gl_shader *),
-                    (n + 1) * sizeof(struct gl_shader *));
-   if (!shProg->Shaders) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glAttachShader");
-      return;
-   }
-
-   /* append */
-   shProg->Shaders[n] = NULL; /* since realloc() didn't zero the new space */
-   _mesa_reference_shader(ctx, &shProg->Shaders[n], sh);
-   shProg->NumShaders++;
-}
-
-
-static GLint
-_mesa_get_attrib_location(GLcontext *ctx, GLuint program,
-                          const GLchar *name)
-{
-   struct gl_shader_program *shProg
-      = _mesa_lookup_shader_program_err(ctx, program, "glGetAttribLocation");
-
-   if (!shProg) {
-      return -1;
-   }
-
-   if (!shProg->LinkStatus) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glGetAttribLocation(program not linked)");
-      return -1;
-   }
-
-   if (!name)
-      return -1;
-
-   if (shProg->VertexProgram) {
-      const struct gl_program_parameter_list *attribs =
-         shProg->VertexProgram->Base.Attributes;
-      if (attribs) {
-         GLint i = _mesa_lookup_parameter_index(attribs, -1, name);
-         if (i >= 0) {
-            return attribs->Parameters[i].StateIndexes[0];
-         }
-      }
-   }
-   return -1;
-}
-
-
-static void
-_mesa_bind_attrib_location(GLcontext *ctx, GLuint program, GLuint index,
-                           const GLchar *name)
-{
-   struct gl_shader_program *shProg;
-   const GLint size = -1; /* unknown size */
-   GLint i, oldIndex;
-   GLenum datatype = GL_FLOAT_VEC4;
-
-   shProg = _mesa_lookup_shader_program_err(ctx, program,
-                                            "glBindAttribLocation");
-   if (!shProg) {
-      return;
-   }
-
-   if (!name)
-      return;
-
-   if (strncmp(name, "gl_", 3) == 0) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glBindAttribLocation(illegal name)");
-      return;
-   }
-
-   if (index >= ctx->Const.VertexProgram.MaxAttribs) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glBindAttribLocation(index)");
-      return;
-   }
-
-   if (shProg->LinkStatus) {
-      /* get current index/location for the attribute */
-      oldIndex = _mesa_get_attrib_location(ctx, program, name);
-   }
-   else {
-      oldIndex = -1;
-   }
-
-   /* this will replace the current value if it's already in the list */
-   i = _mesa_add_attribute(shProg->Attributes, name, size, datatype, index);
-   if (i < 0) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindAttribLocation");
-      return;
-   }
-
-   /*
-    * Note that this attribute binding won't go into effect until
-    * glLinkProgram is called again.
-    */
-}
-
-
-static GLuint
-_mesa_create_shader(GLcontext *ctx, GLenum type)
-{
-   struct gl_shader *sh;
-   GLuint name;
-
-   name = _mesa_HashFindFreeKeyBlock(ctx->Shared->ShaderObjects, 1);
-
-   switch (type) {
-   case GL_FRAGMENT_SHADER:
-   case GL_VERTEX_SHADER:
-      sh = _mesa_new_shader(ctx, name, type);
-      break;
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM, "CreateShader(type)");
-      return 0;
-   }
-
-   _mesa_HashInsert(ctx->Shared->ShaderObjects, name, sh);
-
-   return name;
-}
-
-
-static GLuint 
-_mesa_create_program(GLcontext *ctx)
-{
-   GLuint name;
-   struct gl_shader_program *shProg;
-
-   name = _mesa_HashFindFreeKeyBlock(ctx->Shared->ShaderObjects, 1);
-   shProg = _mesa_new_shader_program(ctx, name);
-
-   _mesa_HashInsert(ctx->Shared->ShaderObjects, name, shProg);
-
-   assert(shProg->RefCount == 1);
-
-   return name;
-}
-
-
-/**
- * Named w/ "2" to indicate OpenGL 2.x vs GL_ARB_fragment_programs's
- * DeleteProgramARB.
- */
-static void
-_mesa_delete_program2(GLcontext *ctx, GLuint name)
-{
-   /*
-    * NOTE: deleting shaders/programs works a bit differently than
-    * texture objects (and buffer objects, etc).  Shader/program
-    * handles/IDs exist in the hash table until the object is really
-    * deleted (refcount==0).  With texture objects, the handle/ID is
-    * removed from the hash table in glDeleteTextures() while the tex
-    * object itself might linger until its refcount goes to zero.
-    */
-   struct gl_shader_program *shProg;
-
-   shProg = _mesa_lookup_shader_program_err(ctx, name, "glDeleteProgram");
-   if (!shProg)
-      return;
-
-   shProg->DeletePending = GL_TRUE;
-
-   /* effectively, decr shProg's refcount */
-   _mesa_reference_shader_program(ctx, &shProg, NULL);
-}
-
-
-static void
-_mesa_delete_shader(GLcontext *ctx, GLuint shader)
-{
-   struct gl_shader *sh;
-
-   sh = _mesa_lookup_shader_err(ctx, shader, "glDeleteShader");
-   if (!sh)
-      return;
-
-   sh->DeletePending = GL_TRUE;
-
-   /* effectively, decr sh's refcount */
-   _mesa_reference_shader(ctx, &sh, NULL);
-}
-
-
-static void
-_mesa_detach_shader(GLcontext *ctx, GLuint program, GLuint shader)
-{
-   struct gl_shader_program *shProg;
-   GLuint n;
-   GLuint i, j;
-
-   shProg = _mesa_lookup_shader_program_err(ctx, program, "glDetachShader");
-   if (!shProg)
-      return;
-
-   n = shProg->NumShaders;
-
-   for (i = 0; i < n; i++) {
-      if (shProg->Shaders[i]->Name == shader) {
-         /* found it */
-         struct gl_shader **newList;
-
-         /* release */
-         _mesa_reference_shader(ctx, &shProg->Shaders[i], NULL);
-
-         /* alloc new, smaller array */
-         newList = (struct gl_shader **)
-            malloc((n - 1) * sizeof(struct gl_shader *));
-         if (!newList) {
-            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glDetachShader");
-            return;
-         }
-         for (j = 0; j < i; j++) {
-            newList[j] = shProg->Shaders[j];
-         }
-         while (++i < n)
-            newList[j++] = shProg->Shaders[i];
-         free(shProg->Shaders);
-
-         shProg->Shaders = newList;
-         shProg->NumShaders = n - 1;
-
-#ifdef DEBUG
-         /* sanity check */
-         {
-            for (j = 0; j < shProg->NumShaders; j++) {
-               assert(shProg->Shaders[j]->Type == GL_VERTEX_SHADER ||
-                      shProg->Shaders[j]->Type == GL_FRAGMENT_SHADER);
-               assert(shProg->Shaders[j]->RefCount > 0);
-            }
-         }
-#endif
-
-         return;
-      }
-   }
-
-   /* not found */
-   {
-      GLenum err;
-      if (_mesa_is_shader(ctx, shader))
-         err = GL_INVALID_OPERATION;
-      else if (_mesa_is_program(ctx, shader))
-         err = GL_INVALID_OPERATION;
-      else
-         err = GL_INVALID_VALUE;
-      _mesa_error(ctx, err, "glDetachProgram(shader)");
-      return;
-   }
-}
-
-
-static GLint
-sizeof_glsl_type(GLenum type)
-{
-   switch (type) {
-   case GL_FLOAT:
-   case GL_INT:
-   case GL_BOOL:
-   case GL_SAMPLER_1D:
-   case GL_SAMPLER_2D:
-   case GL_SAMPLER_3D:
-   case GL_SAMPLER_CUBE:
-   case GL_SAMPLER_1D_SHADOW:
-   case GL_SAMPLER_2D_SHADOW:
-   case GL_SAMPLER_2D_RECT_ARB:
-   case GL_SAMPLER_2D_RECT_SHADOW_ARB:
-   case GL_SAMPLER_1D_ARRAY_EXT:
-   case GL_SAMPLER_2D_ARRAY_EXT:
-   case GL_SAMPLER_1D_ARRAY_SHADOW_EXT:
-   case GL_SAMPLER_2D_ARRAY_SHADOW_EXT:
-   case GL_SAMPLER_CUBE_SHADOW_EXT:
-      return 1;
-   case GL_FLOAT_VEC2:
-   case GL_INT_VEC2:
-   case GL_BOOL_VEC2:
-      return 2;
-   case GL_FLOAT_VEC3:
-   case GL_INT_VEC3:
-   case GL_BOOL_VEC3:
-      return 3;
-   case GL_FLOAT_VEC4:
-   case GL_INT_VEC4:
-   case GL_BOOL_VEC4:
-      return 4;
-   case GL_FLOAT_MAT2:
-   case GL_FLOAT_MAT2x3:
-   case GL_FLOAT_MAT2x4:
-      return 8; /* two float[4] vectors */
-   case GL_FLOAT_MAT3:
-   case GL_FLOAT_MAT3x2:
-   case GL_FLOAT_MAT3x4:
-      return 12; /* three float[4] vectors */
-   case GL_FLOAT_MAT4:
-   case GL_FLOAT_MAT4x2:
-   case GL_FLOAT_MAT4x3:
-      return 16;  /* four float[4] vectors */
-   default:
-      _mesa_problem(NULL, "Invalid type in sizeof_glsl_type()");
-      return 1;
-   }
-}
-
-
-static GLboolean
-is_boolean_type(GLenum type)
-{
-   switch (type) {
-   case GL_BOOL:
-   case GL_BOOL_VEC2:
-   case GL_BOOL_VEC3:
-   case GL_BOOL_VEC4:
-      return GL_TRUE;
-   default:
-      return GL_FALSE;
-   }
-}
-
-
-static GLboolean
-is_integer_type(GLenum type)
-{
-   switch (type) {
-   case GL_INT:
-   case GL_INT_VEC2:
-   case GL_INT_VEC3:
-   case GL_INT_VEC4:
-      return GL_TRUE;
-   default:
-      return GL_FALSE;
-   }
-}
-
-
-static GLboolean
-is_sampler_type(GLenum type)
-{
-   switch (type) {
-   case GL_SAMPLER_1D:
-   case GL_SAMPLER_2D:
-   case GL_SAMPLER_3D:
-   case GL_SAMPLER_CUBE:
-   case GL_SAMPLER_1D_SHADOW:
-   case GL_SAMPLER_2D_SHADOW:
-   case GL_SAMPLER_2D_RECT_ARB:
-   case GL_SAMPLER_2D_RECT_SHADOW_ARB:
-   case GL_SAMPLER_1D_ARRAY_EXT:
-   case GL_SAMPLER_2D_ARRAY_EXT:
-   case GL_SAMPLER_1D_ARRAY_SHADOW_EXT:
-   case GL_SAMPLER_2D_ARRAY_SHADOW_EXT:
-      return GL_TRUE;
-   default:
-      return GL_FALSE;
-   }
-}
-
-
-static void
-_mesa_get_active_attrib(GLcontext *ctx, GLuint program, GLuint index,
-                        GLsizei maxLength, GLsizei *length, GLint *size,
-                        GLenum *type, GLchar *nameOut)
-{
-   const struct gl_program_parameter_list *attribs = NULL;
-   struct gl_shader_program *shProg;
-
-   shProg = _mesa_lookup_shader_program_err(ctx, program, "glGetActiveAttrib");
-   if (!shProg)
-      return;
-
-   if (shProg->VertexProgram)
-      attribs = shProg->VertexProgram->Base.Attributes;
-
-   if (!attribs || index >= attribs->NumParameters) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glGetActiveAttrib(index)");
-      return;
-   }
-
-   copy_string(nameOut, maxLength, length, attribs->Parameters[index].Name);
-
-   if (size)
-      *size = attribs->Parameters[index].Size
-         / sizeof_glsl_type(attribs->Parameters[index].DataType);
-
-   if (type)
-      *type = attribs->Parameters[index].DataType;
-}
-
-
-static struct gl_program_parameter *
-get_uniform_parameter(const struct gl_shader_program *shProg, GLuint index)
-{
-   const struct gl_program *prog = NULL;
-   GLint progPos;
-
-   progPos = shProg->Uniforms->Uniforms[index].VertPos;
-   if (progPos >= 0) {
-      prog = &shProg->VertexProgram->Base;
-   }
-   else {
-      progPos = shProg->Uniforms->Uniforms[index].FragPos;
-      if (progPos >= 0) {
-         prog = &shProg->FragmentProgram->Base;
-      }
-   }
-
-   if (!prog || progPos < 0)
-      return NULL; /* should never happen */
-
-   return &prog->Parameters->Parameters[progPos];
-}
-
-
-/**
- * Called via ctx->Driver.GetActiveUniform().
- */
-static void
-_mesa_get_active_uniform(GLcontext *ctx, GLuint program, GLuint index,
-                         GLsizei maxLength, GLsizei *length, GLint *size,
-                         GLenum *type, GLchar *nameOut)
-{
-   const struct gl_shader_program *shProg;
-   const struct gl_program *prog = NULL;
-   const struct gl_program_parameter *param;
-   GLint progPos;
-
-   shProg = _mesa_lookup_shader_program_err(ctx, program, "glGetActiveUniform");
-   if (!shProg)
-      return;
-
-   if (!shProg->Uniforms || index >= shProg->Uniforms->NumUniforms) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glGetActiveUniform(index)");
-      return;
-   }
-
-   progPos = shProg->Uniforms->Uniforms[index].VertPos;
-   if (progPos >= 0) {
-      prog = &shProg->VertexProgram->Base;
-   }
-   else {
-      progPos = shProg->Uniforms->Uniforms[index].FragPos;
-      if (progPos >= 0) {
-         prog = &shProg->FragmentProgram->Base;
-      }
-   }
-
-   if (!prog || progPos < 0)
-      return; /* should never happen */
-
-   ASSERT(progPos < prog->Parameters->NumParameters);
-   param = &prog->Parameters->Parameters[progPos];
-
-   if (nameOut) {
-      copy_string(nameOut, maxLength, length, param->Name);
-   }
-
-   if (size) {
-      GLint typeSize = sizeof_glsl_type(param->DataType);
-      if ((GLint) param->Size > typeSize) {
-         /* This is an array.
-          * Array elements are placed on vector[4] boundaries so they're
-          * a multiple of four floats.  We round typeSize up to next multiple
-          * of four to get the right size below.
-          */
-         typeSize = (typeSize + 3) & ~3;
-      }
-      /* Note that the returned size is in units of the <type>, not bytes */
-      *size = param->Size / typeSize;
-   }
-
-   if (type) {
-      *type = param->DataType;
-   }
-}
-
-
-/**
- * Called via ctx->Driver.GetAttachedShaders().
- */
-static void
-_mesa_get_attached_shaders(GLcontext *ctx, GLuint program, GLsizei maxCount,
-                           GLsizei *count, GLuint *obj)
-{
-   struct gl_shader_program *shProg =
-      _mesa_lookup_shader_program_err(ctx, program, "glGetAttachedShaders");
-   if (shProg) {
-      GLuint i;
-      for (i = 0; i < (GLuint) maxCount && i < shProg->NumShaders; i++) {
-         obj[i] = shProg->Shaders[i]->Name;
-      }
-      if (count)
-         *count = i;
-   }
-}
-
-
-static GLuint
-_mesa_get_handle(GLcontext *ctx, GLenum pname)
-{
-   GLint handle = 0;
-   
-   if (pname == GL_PROGRAM_OBJECT_ARB) {
-      CALL_GetIntegerv(ctx->Exec, (GL_CURRENT_PROGRAM, &handle));
-   } else {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetHandleARB");
-   }
-
-   return handle;
-}
-
-
-static void
-_mesa_get_programiv(GLcontext *ctx, GLuint program,
-                    GLenum pname, GLint *params)
-{
-   const struct gl_program_parameter_list *attribs;
-   struct gl_shader_program *shProg
-      = _mesa_lookup_shader_program(ctx, program);
-
-   if (!shProg) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glGetProgramiv(program)");
-      return;
-   }
-
-   if (shProg->VertexProgram)
-      attribs = shProg->VertexProgram->Base.Attributes;
-   else
-      attribs = NULL;
-
-   switch (pname) {
-   case GL_DELETE_STATUS:
-      *params = shProg->DeletePending;
-      break; 
-   case GL_LINK_STATUS:
-      *params = shProg->LinkStatus;
-      break;
-   case GL_VALIDATE_STATUS:
-      *params = shProg->Validated;
-      break;
-   case GL_INFO_LOG_LENGTH:
-      *params = shProg->InfoLog ? strlen(shProg->InfoLog) + 1 : 0;
-      break;
-   case GL_ATTACHED_SHADERS:
-      *params = shProg->NumShaders;
-      break;
-   case GL_ACTIVE_ATTRIBUTES:
-      *params = attribs ? attribs->NumParameters : 0;
-      break;
-   case GL_ACTIVE_ATTRIBUTE_MAX_LENGTH:
-      *params = _mesa_longest_parameter_name(attribs, PROGRAM_INPUT) + 1;
-      break;
-   case GL_ACTIVE_UNIFORMS:
-      *params = shProg->Uniforms ? shProg->Uniforms->NumUniforms : 0;
-      break;
-   case GL_ACTIVE_UNIFORM_MAX_LENGTH:
-      *params = _mesa_longest_uniform_name(shProg->Uniforms);
-      if (*params > 0)
-         (*params)++;  /* add one for terminating zero */
-      break;
-   case GL_PROGRAM_BINARY_LENGTH_OES:
-      *params = 0;
-      break;
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramiv(pname)");
-      return;
-   }
-}
-
-
-static void
-_mesa_get_shaderiv(GLcontext *ctx, GLuint name, GLenum pname, GLint *params)
-{
-   struct gl_shader *shader = _mesa_lookup_shader_err(ctx, name, "glGetShaderiv");
-
-   if (!shader) {
-      return;
-   }
-
-   switch (pname) {
-   case GL_SHADER_TYPE:
-      *params = shader->Type;
-      break;
-   case GL_DELETE_STATUS:
-      *params = shader->DeletePending;
-      break;
-   case GL_COMPILE_STATUS:
-      *params = shader->CompileStatus;
-      break;
-   case GL_INFO_LOG_LENGTH:
-      *params = shader->InfoLog ? strlen(shader->InfoLog) + 1 : 0;
-      break;
-   case GL_SHADER_SOURCE_LENGTH:
-      *params = shader->Source ? strlen((char *) shader->Source) + 1 : 0;
-      break;
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetShaderiv(pname)");
-      return;
-   }
-}
-
-
-static void
-_mesa_get_program_info_log(GLcontext *ctx, GLuint program, GLsizei bufSize,
-                           GLsizei *length, GLchar *infoLog)
-{
-   struct gl_shader_program *shProg
-      = _mesa_lookup_shader_program(ctx, program);
-   if (!shProg) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glGetProgramInfoLog(program)");
-      return;
-   }
-   copy_string(infoLog, bufSize, length, shProg->InfoLog);
-}
-
-
-static void
-_mesa_get_shader_info_log(GLcontext *ctx, GLuint shader, GLsizei bufSize,
-                          GLsizei *length, GLchar *infoLog)
-{
-   struct gl_shader *sh = _mesa_lookup_shader(ctx, shader);
-   if (!sh) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glGetShaderInfoLog(shader)");
-      return;
-   }
-   copy_string(infoLog, bufSize, length, sh->InfoLog);
-}
-
-
-/**
- * Called via ctx->Driver.GetShaderSource().
- */
-static void
-_mesa_get_shader_source(GLcontext *ctx, GLuint shader, GLsizei maxLength,
-                        GLsizei *length, GLchar *sourceOut)
-{
-   struct gl_shader *sh;
-   sh = _mesa_lookup_shader_err(ctx, shader, "glGetShaderSource");
-   if (!sh) {
-      return;
-   }
-   copy_string(sourceOut, maxLength, length, sh->Source);
-}
-
-
-static void
-get_matrix_dims(GLenum type, GLint *rows, GLint *cols)
-{
-   switch (type) {
-   case GL_FLOAT_MAT2:
-      *rows = *cols = 2;
-      break;
-   case GL_FLOAT_MAT2x3:
-      *rows = 3;
-      *cols = 2;
-      break;
-   case GL_FLOAT_MAT2x4:
-      *rows = 4;
-      *cols = 2;
-      break;
-   case GL_FLOAT_MAT3:
-      *rows = 3;
-      *cols = 3;
-      break;
-   case GL_FLOAT_MAT3x2:
-      *rows = 2;
-      *cols = 3;
-      break;
-   case GL_FLOAT_MAT3x4:
-      *rows = 4;
-      *cols = 3;
-      break;
-   case GL_FLOAT_MAT4:
-      *rows = 4;
-      *cols = 4;
-      break;
-   case GL_FLOAT_MAT4x2:
-      *rows = 2;
-      *cols = 4;
-      break;
-   case GL_FLOAT_MAT4x3:
-      *rows = 3;
-      *cols = 4;
-      break;
-   default:
-      *rows = *cols = 0;
-   }
-}
-
-
-/**
- * Determine the number of rows and columns occupied by a uniform
- * according to its datatype.  For non-matrix types (such as GL_FLOAT_VEC4),
- * the number of rows = 1 and cols = number of elements in the vector.
- */
-static void
-get_uniform_rows_cols(const struct gl_program_parameter *p,
-                      GLint *rows, GLint *cols)
-{
-   get_matrix_dims(p->DataType, rows, cols);
-   if (*rows == 0 && *cols == 0) {
-      /* not a matrix type, probably a float or vector */
-      if (p->Size <= 4) {
-         *rows = 1;
-         *cols = p->Size;
-      }
-      else {
-         *rows = p->Size / 4 + 1;
-         if (p->Size % 4 == 0)
-            *cols = 4;
-         else
-            *cols = p->Size % 4;
-      }
-   }
-}
-
-
-/**
- * Helper for get_uniform[fi]v() functions.
- * Given a shader program name and uniform location, return a pointer
- * to the shader program and return the program parameter position.
- */
-static void
-lookup_uniform_parameter(GLcontext *ctx, GLuint program, GLint location,
-                         struct gl_program **progOut, GLint *paramPosOut)
-{
-   struct gl_shader_program *shProg
-      = _mesa_lookup_shader_program_err(ctx, program, "glGetUniform[if]v");
-   struct gl_program *prog = NULL;
-   GLint progPos = -1;
-
-   /* if shProg is NULL, we'll have already recorded an error */
-
-   if (shProg) {
-      if (!shProg->Uniforms ||
-          location < 0 ||
-          location >= (GLint) shProg->Uniforms->NumUniforms) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,  "glGetUniformfv(location)");
-      }
-      else {
-         /* OK, find the gl_program and program parameter location */
-         progPos = shProg->Uniforms->Uniforms[location].VertPos;
-         if (progPos >= 0) {
-            prog = &shProg->VertexProgram->Base;
-         }
-         else {
-            progPos = shProg->Uniforms->Uniforms[location].FragPos;
-            if (progPos >= 0) {
-               prog = &shProg->FragmentProgram->Base;
-            }
-         }
-      }
-   }
-
-   *progOut = prog;
-   *paramPosOut = progPos;
-}
-
-
-/**
- * GLGL uniform arrays and structs require special handling.
- *
- * The GL_ARB_shader_objects spec says that if you use
- * glGetUniformLocation to get the location of an array, you CANNOT
- * access other elements of the array by adding an offset to the
- * returned location.  For example, you must call
- * glGetUniformLocation("foo[16]") if you want to set the 16th element
- * of the array with glUniform().
- *
- * HOWEVER, some other OpenGL drivers allow accessing array elements
- * by adding an offset to the returned array location.  And some apps
- * seem to depend on that behaviour.
- *
- * Mesa's gl_uniform_list doesn't directly support this since each
- * entry in the list describes one uniform variable, not one uniform
- * element.  We could insert dummy entries in the list for each array
- * element after [0] but that causes complications elsewhere.
- *
- * We solve this problem by encoding two values in the location that's
- * returned by glGetUniformLocation():
- *  a) index into gl_uniform_list::Uniforms[] for the uniform
- *  b) an array/field offset (0 for simple types)
- *
- * These two values are encoded in the high and low halves of a GLint.
- * By putting the uniform number in the high part and the offset in the
- * low part, we can support the unofficial ability to index into arrays
- * by adding offsets to the location value.
- */
-static void
-merge_location_offset(GLint *location, GLint offset)
-{
-   *location = (*location << 16) | offset;
-}
-
-
-/**
- * Seperate the uniform location and parameter offset.  See above.
- */
-static void
-split_location_offset(GLint *location, GLint *offset)
-{
-   *offset = *location & 0xffff;
-   *location = *location >> 16;
-}
-
-
-
-/**
- * Called via ctx->Driver.GetUniformfv().
- */
-static void
-_mesa_get_uniformfv(GLcontext *ctx, GLuint program, GLint location,
-                    GLfloat *params)
-{
-   struct gl_program *prog;
-   GLint paramPos;
-   GLint offset;
-
-   split_location_offset(&location, &offset);
-
-   lookup_uniform_parameter(ctx, program, location, &prog, &paramPos);
-
-   if (prog) {
-      const struct gl_program_parameter *p =
-         &prog->Parameters->Parameters[paramPos];
-      GLint rows, cols, i, j, k;
-
-      get_uniform_rows_cols(p, &rows, &cols);
-
-      k = 0;
-      for (i = 0; i < rows; i++) {
-         for (j = 0; j < cols; j++ ) {
-            params[k++] = prog->Parameters->ParameterValues[paramPos+i][j];
-         }
-      }
-   }
-}
-
-
-/**
- * Called via ctx->Driver.GetUniformiv().
- * \sa _mesa_get_uniformfv, only difference is a cast.
- */
-static void
-_mesa_get_uniformiv(GLcontext *ctx, GLuint program, GLint location,
-                    GLint *params)
-{
-   struct gl_program *prog;
-   GLint paramPos;
-   GLint offset;
-
-   split_location_offset(&location, &offset);
- 
-   lookup_uniform_parameter(ctx, program, location, &prog, &paramPos);
-
-   if (prog) {
-      const struct gl_program_parameter *p =
-         &prog->Parameters->Parameters[paramPos];
-      GLint rows, cols, i, j, k;
-
-      get_uniform_rows_cols(p, &rows, &cols);
-
-      k = 0;
-      for (i = 0; i < rows; i++) {
-         for (j = 0; j < cols; j++ ) {
-            params[k++] = (GLint) prog->Parameters->ParameterValues[paramPos+i][j];
-         }
-      }
-   }
-}
-
-
-/**
- * Called via ctx->Driver.GetUniformLocation().
- *
- * The return value will encode two values, the uniform location and an
- * offset (used for arrays, structs).
- */
-static GLint
-_mesa_get_uniform_location(GLcontext *ctx, GLuint program, const GLchar *name)
-{
-   GLint offset = 0, location = -1;
-
-   struct gl_shader_program *shProg =
-      _mesa_lookup_shader_program_err(ctx, program, "glGetUniformLocation");
-
-   if (!shProg)
-      return -1;
-
-   if (shProg->LinkStatus == GL_FALSE) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetUniformfv(program)");
-      return -1;
-   }
-
-   /* XXX we should return -1 if the uniform was declared, but not
-    * actually used.
-    */
-
-   /* XXX we need to be able to parse uniform names for structs and arrays
-    * such as:
-    *   mymatrix[1]
-    *   mystruct.field1
-    */
-
-   {
-      /* handle 1-dimension arrays here... */
-      char *c = strchr(name, '[');
-      if (c) {
-         /* truncate name at [ */
-         const GLint len = c - name;
-         GLchar *newName = malloc(len + 1);
-         if (!newName)
-            return -1; /* out of mem */
-         memcpy(newName, name, len);
-         newName[len] = 0;
-
-         location = _mesa_lookup_uniform(shProg->Uniforms, newName);
-         if (location >= 0) {
-            const GLint element = atoi(c + 1);
-            if (element > 0) {
-               /* get type of the uniform array element */
-               struct gl_program_parameter *p;
-               p = get_uniform_parameter(shProg, location);
-               if (p) {
-                  GLint rows, cols;
-                  get_matrix_dims(p->DataType, &rows, &cols);
-                  if (rows < 1)
-                     rows = 1;
-                  offset = element * rows;
-               }
-            }
-         }
-
-         free(newName);
-      }
-   }
-
-   if (location < 0) {
-      location = _mesa_lookup_uniform(shProg->Uniforms, name);
-   }
-
-   if (location >= 0) {
-      merge_location_offset(&location, offset);
-   }
-
-   return location;
-}
-
-
-
-/**
- * Called via ctx->Driver.ShaderSource()
- */
-static void
-_mesa_shader_source(GLcontext *ctx, GLuint shader, const GLchar *source)
-{
-   struct gl_shader *sh;
-
-   sh = _mesa_lookup_shader_err(ctx, shader, "glShaderSource");
-   if (!sh)
-      return;
-
-   /* free old shader source string and install new one */
-   if (sh->Source) {
-      free((void *) sh->Source);
-   }
-   sh->Source = source;
-   sh->CompileStatus = GL_FALSE;
-#ifdef DEBUG
-   sh->SourceChecksum = _mesa_str_checksum(sh->Source);
-#endif
-}
-
-
-/**
- * Called via ctx->Driver.CompileShader()
- */
-static void
-_mesa_compile_shader(GLcontext *ctx, GLuint shaderObj)
-{
-   struct gl_shader *sh;
-
-   sh = _mesa_lookup_shader_err(ctx, shaderObj, "glCompileShader");
-   if (!sh)
-      return;
-
-   /* set default pragma state for shader */
-   sh->Pragmas = ctx->Shader.DefaultPragmas;
-
-   /* this call will set the sh->CompileStatus field to indicate if
-    * compilation was successful.
-    */
-   (void) _slang_compile(ctx, sh);
-}
-
-
-/**
- * Called via ctx->Driver.LinkProgram()
- */
-static void
-_mesa_link_program(GLcontext *ctx, GLuint program)
-{
-   struct gl_shader_program *shProg;
-
-   shProg = _mesa_lookup_shader_program_err(ctx, program, "glLinkProgram");
-   if (!shProg)
-      return;
-
-   FLUSH_VERTICES(ctx, _NEW_PROGRAM);
-
-   _slang_link(ctx, program, shProg);
-
-   /* debug code */
-   if (0) {
-      GLuint i;
-
-      printf("Link %u shaders in program %u: %s\n",
-                   shProg->NumShaders, shProg->Name,
-                   shProg->LinkStatus ? "Success" : "Failed");
-
-      for (i = 0; i < shProg->NumShaders; i++) {
-         printf(" shader %u, type 0x%x\n",
-                      shProg->Shaders[i]->Name,
-                      shProg->Shaders[i]->Type);
-      }
-   }
-}
-
-
-/**
- * Print basic shader info (for debug).
- */
-static void
-print_shader_info(const struct gl_shader_program *shProg)
-{
-   GLuint i;
-
-   printf("Mesa: glUseProgram(%u)\n", shProg->Name);
-   for (i = 0; i < shProg->NumShaders; i++) {
-      const char *s;
-      switch (shProg->Shaders[i]->Type) {
-      case GL_VERTEX_SHADER:
-         s = "vertex";
-         break;
-      case GL_FRAGMENT_SHADER:
-         s = "fragment";
-         break;
-      case GL_GEOMETRY_SHADER:
-         s = "geometry";
-         break;
-      default:
-         s = "";
-      }
-      printf("  %s shader %u, checksum %u\n", s, 
-	     shProg->Shaders[i]->Name,
-	     shProg->Shaders[i]->SourceChecksum);
-   }
-   if (shProg->VertexProgram)
-      printf("  vert prog %u\n", shProg->VertexProgram->Base.Id);
-   if (shProg->FragmentProgram)
-      printf("  frag prog %u\n", shProg->FragmentProgram->Base.Id);
-}
-
-
-/**
- * Called via ctx->Driver.UseProgram()
- */
-void
-_mesa_use_program(GLcontext *ctx, GLuint program)
-{
-   struct gl_shader_program *shProg;
-
-   if (ctx->Shader.CurrentProgram &&
-       ctx->Shader.CurrentProgram->Name == program) {
-      /* no-op */
-      return;
-   }
-
-   if (program) {
-      shProg = _mesa_lookup_shader_program_err(ctx, program, "glUseProgram");
-      if (!shProg) {
-         return;
-      }
-      if (!shProg->LinkStatus) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glUseProgram(program %u not linked)", program);
-         return;
-      }
-
-      /* debug code */
-      if (ctx->Shader.Flags & GLSL_USE_PROG) {
-         print_shader_info(shProg);
-      }
-   }
-   else {
-      shProg = NULL;
-   }
-
-   if (ctx->Shader.CurrentProgram != shProg) {
-      FLUSH_VERTICES(ctx, _NEW_PROGRAM | _NEW_PROGRAM_CONSTANTS);
-      _mesa_reference_shader_program(ctx, &ctx->Shader.CurrentProgram, shProg);
-   }
-}
-
-
-
-/**
- * Update the vertex/fragment program's TexturesUsed array.
- *
- * This needs to be called after glUniform(set sampler var) is called.
- * A call to glUniform(samplerVar, value) causes a sampler to point to a
- * particular texture unit.  We know the sampler's texture target
- * (1D/2D/3D/etc) from compile time but the sampler's texture unit is
- * set by glUniform() calls.
- *
- * So, scan the program->SamplerUnits[] and program->SamplerTargets[]
- * information to update the prog->TexturesUsed[] values.
- * Each value of TexturesUsed[unit] is one of zero, TEXTURE_1D_INDEX,
- * TEXTURE_2D_INDEX, TEXTURE_3D_INDEX, etc.
- * We'll use that info for state validation before rendering.
- */
-void
-_mesa_update_shader_textures_used(struct gl_program *prog)
-{
-   GLuint s;
-
-   memset(prog->TexturesUsed, 0, sizeof(prog->TexturesUsed));
-
-   for (s = 0; s < MAX_SAMPLERS; s++) {
-      if (prog->SamplersUsed & (1 << s)) {
-         GLuint unit = prog->SamplerUnits[s];
-         GLuint tgt = prog->SamplerTargets[s];
-         assert(unit < MAX_TEXTURE_IMAGE_UNITS);
-         assert(tgt < NUM_TEXTURE_TARGETS);
-         prog->TexturesUsed[unit] |= (1 << tgt);
-      }
-   }
-}
-
-
-/**
- * Check if the type given by userType is allowed to set a uniform of the
- * target type.  Generally, equivalence is required, but setting Boolean
- * uniforms can be done with glUniformiv or glUniformfv.
- */
-static GLboolean
-compatible_types(GLenum userType, GLenum targetType)
-{
-   if (userType == targetType)
-      return GL_TRUE;
-
-   if (targetType == GL_BOOL && (userType == GL_FLOAT || userType == GL_INT))
-      return GL_TRUE;
-
-   if (targetType == GL_BOOL_VEC2 && (userType == GL_FLOAT_VEC2 ||
-                                      userType == GL_INT_VEC2))
-      return GL_TRUE;
-
-   if (targetType == GL_BOOL_VEC3 && (userType == GL_FLOAT_VEC3 ||
-                                      userType == GL_INT_VEC3))
-      return GL_TRUE;
-
-   if (targetType == GL_BOOL_VEC4 && (userType == GL_FLOAT_VEC4 ||
-                                      userType == GL_INT_VEC4))
-      return GL_TRUE;
-
-   if (is_sampler_type(targetType) && userType == GL_INT)
-      return GL_TRUE;
-
-   return GL_FALSE;
-}
-
-
-/**
- * Set the value of a program's uniform variable.
- * \param program  the program whose uniform to update
- * \param index  the index of the program parameter for the uniform
- * \param offset  additional parameter slot offset (for arrays)
- * \param type  the incoming datatype of 'values'
- * \param count  the number of uniforms to set
- * \param elems  number of elements per uniform (1, 2, 3 or 4)
- * \param values  the new values, of datatype 'type'
- */
-static void
-set_program_uniform(GLcontext *ctx, struct gl_program *program,
-                    GLint index, GLint offset,
-                    GLenum type, GLsizei count, GLint elems,
-                    const void *values)
-{
-   const struct gl_program_parameter *param =
-      &program->Parameters->Parameters[index];
-
-   assert(offset >= 0);
-   assert(elems >= 1);
-   assert(elems <= 4);
-
-   if (!compatible_types(type, param->DataType)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glUniform(type mismatch)");
-      return;
-   }
-
-   if (index + offset > (GLint) program->Parameters->Size) {
-      /* out of bounds! */
-      return;
-   }
-
-   if (param->Type == PROGRAM_SAMPLER) {
-      /* This controls which texture unit which is used by a sampler */
-      GLboolean changed = GL_FALSE;
-      GLint i;
-
-      /* this should have been caught by the compatible_types() check */
-      ASSERT(type == GL_INT);
-
-      /* loop over number of samplers to change */
-      for (i = 0; i < count; i++) {
-         GLuint sampler =
-            (GLuint) program->Parameters->ParameterValues[index + offset + i][0];
-         GLuint texUnit = ((GLuint *) values)[i];
-
-         /* check that the sampler (tex unit index) is legal */
-         if (texUnit >= ctx->Const.MaxTextureImageUnits) {
-            _mesa_error(ctx, GL_INVALID_VALUE,
-                        "glUniform1(invalid sampler/tex unit index)");
-            return;
-         }
-
-         /* This maps a sampler to a texture unit: */
-         if (sampler < MAX_SAMPLERS) {
-#if 0
-            printf("Set program %p sampler %d '%s' to unit %u\n",
-		   program, sampler, param->Name, texUnit);
-#endif
-            if (program->SamplerUnits[sampler] != texUnit) {
-               program->SamplerUnits[sampler] = texUnit;
-               changed = GL_TRUE;
-            }
-         }
-      }
-
-      if (changed) {
-         /* When a sampler's value changes it usually requires rewriting
-          * a GPU program's TEX instructions since there may not be a
-          * sampler->texture lookup table.  We signal this with the
-          * ProgramStringNotify() callback.
-          */
-         FLUSH_VERTICES(ctx, _NEW_TEXTURE | _NEW_PROGRAM);
-         _mesa_update_shader_textures_used(program);
-         /* Do we need to care about the return value here?
-          * This should not be the first time the driver was notified of
-          * this program.
-          */
-         (void) ctx->Driver.ProgramStringNotify(ctx, program->Target, program);
-      }
-   }
-   else {
-      /* ordinary uniform variable */
-      const GLboolean isUniformBool = is_boolean_type(param->DataType);
-      const GLboolean areIntValues = is_integer_type(type);
-      const GLint slots = (param->Size + 3) / 4;
-      const GLint typeSize = sizeof_glsl_type(param->DataType);
-      GLsizei k, i;
-
-      if ((GLint) param->Size > typeSize) {
-         /* an array */
-         /* we'll ignore extra data below */
-      }
-      else {
-         /* non-array: count must be at most one; count == 0 is handled by the loop below */
-         if (count > 1) {
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glUniform(uniform is not an array)");
-            return;
-         }
-      }
-
-      /* loop over number of array elements */
-      for (k = 0; k < count; k++) {
-         GLfloat *uniformVal;
-
-         if (offset + k >= slots) {
-            /* Extra array data is ignored */
-            break;
-         }
-
-         /* uniformVal (the destination) is always float[4] */
-         uniformVal = program->Parameters->ParameterValues[index + offset + k];
-
-         if (areIntValues) {
-            /* convert user's ints to floats */
-            const GLint *iValues = ((const GLint *) values) + k * elems;
-            for (i = 0; i < elems; i++) {
-               uniformVal[i] = (GLfloat) iValues[i];
-            }
-         }
-         else {
-            const GLfloat *fValues = ((const GLfloat *) values) + k * elems;
-            for (i = 0; i < elems; i++) {
-               uniformVal[i] = fValues[i];
-            }
-         }
-
-         /* if the uniform is bool-valued, convert to 1.0 or 0.0 */
-         if (isUniformBool) {
-            for (i = 0; i < elems; i++) {
-               uniformVal[i] = uniformVal[i] ? 1.0f : 0.0f;
-            }
-         }
-      }
-   }
-}
-
-
-/**
- * Called via ctx->Driver.Uniform().
- */
-static void
-_mesa_uniform(GLcontext *ctx, GLint location, GLsizei count,
-              const GLvoid *values, GLenum type)
-{
-   struct gl_shader_program *shProg = ctx->Shader.CurrentProgram;
-   struct gl_uniform *uniform;
-   GLint elems, offset;
-   GLenum basicType;
-
-   if (!shProg || !shProg->LinkStatus) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glUniform(program not linked)");
-      return;
-   }
-
-   if (location == -1)
-      return;   /* The standard specifies this as a no-op */
-
-   if (location < -1) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glUniform(location)");
-      return;
-   }
-
-   split_location_offset(&location, &offset);
-
-   if (location < 0 || location >= (GLint) shProg->Uniforms->NumUniforms) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glUniform(location)");
-      return;
-   }
-
-   if (count < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glUniform(count < 0)");
-      return;
-   }
-
-   switch (type) {
-   case GL_FLOAT:
-      basicType = GL_FLOAT;
-      elems = 1;
-      break;
-   case GL_INT:
-      basicType = GL_INT;
-      elems = 1;
-      break;
-   case GL_FLOAT_VEC2:
-      basicType = GL_FLOAT;
-      elems = 2;
-      break;
-   case GL_INT_VEC2:
-      basicType = GL_INT;
-      elems = 2;
-      break;
-   case GL_FLOAT_VEC3:
-      basicType = GL_FLOAT;
-      elems = 3;
-      break;
-   case GL_INT_VEC3:
-      basicType = GL_INT;
-      elems = 3;
-      break;
-   case GL_FLOAT_VEC4:
-      basicType = GL_FLOAT;
-      elems = 4;
-      break;
-   case GL_INT_VEC4:
-      basicType = GL_INT;
-      elems = 4;
-      break;
-   default:
-      _mesa_problem(ctx, "Invalid type in _mesa_uniform");
-      return;
-   }
-
-   FLUSH_VERTICES(ctx, _NEW_PROGRAM_CONSTANTS);
-
-   uniform = &shProg->Uniforms->Uniforms[location];
-
-   if (ctx->Shader.Flags & GLSL_UNIFORMS) {
-      GLint i;
-      printf("Mesa: set program %u uniform %s (loc %d) to: ",
-	     shProg->Name, uniform->Name, location);
-      if (basicType == GL_INT) {
-         const GLint *v = (const GLint *) values;
-         for (i = 0; i < count * elems; i++) {
-            printf("%d ", v[i]);
-         }
-      }
-      else {
-         const GLfloat *v = (const GLfloat *) values;
-         for (i = 0; i < count * elems; i++) {
-            printf("%g ", v[i]);
-         }
-      }
-      printf("\n");
-   }
-
-   /* A uniform var may be used by both a vertex shader and a fragment
-    * shader.  We may need to update one or both shader's uniform here:
-    */
-   if (shProg->VertexProgram) {
-      /* convert uniform location to program parameter index */
-      GLint index = uniform->VertPos;
-      if (index >= 0) {
-         set_program_uniform(ctx, &shProg->VertexProgram->Base,
-                             index, offset, type, count, elems, values);
-      }
-   }
-
-   if (shProg->FragmentProgram) {
-      /* convert uniform location to program parameter index */
-      GLint index = uniform->FragPos;
-      if (index >= 0) {
-         set_program_uniform(ctx, &shProg->FragmentProgram->Base,
-                             index, offset, type, count, elems, values);
-      }
-   }
-
-   uniform->Initialized = GL_TRUE;
-}
-
-
-/**
- * Set a matrix-valued program parameter.
- */
-static void
-set_program_uniform_matrix(GLcontext *ctx, struct gl_program *program,
-                           GLuint index, GLuint offset,
-                           GLuint count, GLuint rows, GLuint cols,
-                           GLboolean transpose, const GLfloat *values)
-{
-   GLuint mat, row, col;
-   GLuint src = 0;
-   const struct gl_program_parameter * param = &program->Parameters->Parameters[index];
-   const GLuint slots = (param->Size + 3) / 4;
-   const GLint typeSize = sizeof_glsl_type(param->DataType);
-   GLint nr, nc;
-
-   /* check that the number of rows, columns is correct */
-   get_matrix_dims(param->DataType, &nr, &nc);
-   if (rows != nr || cols != nc) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glUniformMatrix(matrix size mismatch)");
-      return;
-   }
-
-   if ((GLint) param->Size <= typeSize) {
-      /* non-array: count must be at most one; count == 0 is handled by the loop below */
-      if (count > 1) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glUniformMatrix(uniform is not an array)");
-         return;
-      }
-   }
-
-   /*
-    * Note: the _columns_ of a matrix are stored in program registers, not
-    * the rows.  So, the loops below look a little funny.
-    * XXX could optimize this a bit...
-    */
-
-   /* loop over matrices */
-   for (mat = 0; mat < count; mat++) {
-
-      /* each matrix: */
-      for (col = 0; col < cols; col++) {
-         GLfloat *v;
-         if (offset >= slots) {
-            /* Ignore writes beyond the end of (the used part of) an array */
-            return;
-         }
-         v = program->Parameters->ParameterValues[index + offset];
-         for (row = 0; row < rows; row++) {
-            if (transpose) {
-               v[row] = values[src + row * cols + col];
-            }
-            else {
-               v[row] = values[src + col * rows + row];
-            }
-         }
-
-         offset++;
-      }
-
-      src += rows * cols;  /* next matrix */
-   }
-}
-
-
-/**
- * Called by ctx->Driver.UniformMatrix().
- * Note: cols=2, rows=4  ==>  array[2] of vec4
- */
-static void
-_mesa_uniform_matrix(GLcontext *ctx, GLint cols, GLint rows,
-                     GLint location, GLsizei count,
-                     GLboolean transpose, const GLfloat *values)
-{
-   struct gl_shader_program *shProg = ctx->Shader.CurrentProgram;
-   struct gl_uniform *uniform;
-   GLint offset;
-
-   if (!shProg || !shProg->LinkStatus) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-         "glUniformMatrix(program not linked)");
-      return;
-   }
-
-   if (location == -1)
-      return;   /* The standard specifies this as a no-op */
-
-   if (location < -1) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glUniformMatrix(location)");
-      return;
-   }
-
-   split_location_offset(&location, &offset);
-
-   if (location < 0 || location >= (GLint) shProg->Uniforms->NumUniforms) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glUniformMatrix(location)");
-      return;
-   }
-   if (values == NULL) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glUniformMatrix");
-      return;
-   }
-
-   FLUSH_VERTICES(ctx, _NEW_PROGRAM_CONSTANTS);
-
-   uniform = &shProg->Uniforms->Uniforms[location];
-
-   if (shProg->VertexProgram) {
-      /* convert uniform location to program parameter index */
-      GLint index = uniform->VertPos;
-      if (index >= 0) {
-         set_program_uniform_matrix(ctx, &shProg->VertexProgram->Base,
-                                    index, offset,
-                                    count, rows, cols, transpose, values);
-      }
-   }
-
-   if (shProg->FragmentProgram) {
-      /* convert uniform location to program parameter index */
-      GLint index = uniform->FragPos;
-      if (index >= 0) {
-         set_program_uniform_matrix(ctx, &shProg->FragmentProgram->Base,
-                                    index, offset,
-                                    count, rows, cols, transpose, values);
-      }
-   }
-
-   uniform->Initialized = GL_TRUE;
-}
-
-
-/**
- * Validate a program's samplers.
- * Specifically, check that there aren't two samplers of different types
- * pointing to the same texture unit.
- * \return GL_TRUE if valid, GL_FALSE if invalid
- */
-static GLboolean
-validate_samplers(GLcontext *ctx, const struct gl_program *prog, char *errMsg)
-{
-   static const char *targetName[] = {
-      "TEXTURE_2D_ARRAY",
-      "TEXTURE_1D_ARRAY",
-      "TEXTURE_CUBE",
-      "TEXTURE_3D",
-      "TEXTURE_RECT",
-      "TEXTURE_2D",
-      "TEXTURE_1D",
-   };
-   GLint targetUsed[MAX_TEXTURE_IMAGE_UNITS];
-   GLbitfield samplersUsed = prog->SamplersUsed;
-   GLuint i;
-
-   assert(Elements(targetName) == NUM_TEXTURE_TARGETS);
-
-   if (samplersUsed == 0x0)
-      return GL_TRUE;
-
-   for (i = 0; i < Elements(targetUsed); i++)
-      targetUsed[i] = -1;
-
-   /* walk over bits which are set in 'samplers' */
-   while (samplersUsed) {
-      GLuint unit;
-      gl_texture_index target;
-      GLint sampler = _mesa_ffs(samplersUsed) - 1;
-      assert(sampler >= 0);
-      assert(sampler < MAX_TEXTURE_IMAGE_UNITS);
-      unit = prog->SamplerUnits[sampler];
-      target = prog->SamplerTargets[sampler];
-      if (targetUsed[unit] != -1 && targetUsed[unit] != target) {
-         _mesa_snprintf(errMsg, 100,
-		  "Texture unit %d is accessed both as %s and %s",
-		  unit, targetName[targetUsed[unit]], targetName[target]);
-         return GL_FALSE;
-      }
-      targetUsed[unit] = target;
-      samplersUsed ^= (1 << sampler);
-   }
-
-   return GL_TRUE;
-}
-
-
-/**
- * Do validation of the given shader program.
- * \param errMsg  returns error message if validation fails.
- * \return GL_TRUE if valid, GL_FALSE if invalid (and set errMsg)
- */
-GLboolean
-_mesa_validate_shader_program(GLcontext *ctx,
-                              const struct gl_shader_program *shProg,
-                              char *errMsg)
-{
-   const struct gl_vertex_program *vp = shProg->VertexProgram;
-   const struct gl_fragment_program *fp = shProg->FragmentProgram;
-
-   if (!shProg->LinkStatus) {
-      return GL_FALSE;
-   }
-
-   /* From the GL spec, a program is invalid if any of these are true:
-
-     any two active samplers in the current program object are of
-     different types, but refer to the same texture image unit,
-
-     any active sampler in the current program object refers to a texture
-     image unit where fixed-function fragment processing accesses a
-     texture target that does not match the sampler type, or 
-
-     the sum of the number of active samplers in the program and the
-     number of texture image units enabled for fixed-function fragment
-     processing exceeds the combined limit on the total number of texture
-     image units allowed.
-   */
-
-
-   /*
-    * Check: any two active samplers in the current program object are of
-    * different types, but refer to the same texture image unit,
-    */
-   if (vp && !validate_samplers(ctx, &vp->Base, errMsg)) {
-      return GL_FALSE;
-   }
-   if (fp && !validate_samplers(ctx, &fp->Base, errMsg)) {
-      return GL_FALSE;
-   }
-
-   return GL_TRUE;
-}
-
-
-/**
- * Called via glValidateProgram()
- */
-static void
-_mesa_validate_program(GLcontext *ctx, GLuint program)
-{
-   struct gl_shader_program *shProg;
-   char errMsg[100];
-
-   shProg = _mesa_lookup_shader_program_err(ctx, program, "glValidateProgram");
-   if (!shProg) {
-      return;
-   }
-
-   shProg->Validated = _mesa_validate_shader_program(ctx, shProg, errMsg);
-   if (!shProg->Validated) {
-      /* update info log */
-      if (shProg->InfoLog) {
-         free(shProg->InfoLog);
-      }
-      shProg->InfoLog = _mesa_strdup(errMsg);
-   }
-}
-
-
-/**
- * Plug in Mesa's GLSL functions into the device driver function table.
- */
-void
-_mesa_init_glsl_driver_functions(struct dd_function_table *driver)
-{
-   driver->AttachShader = _mesa_attach_shader;
-   driver->BindAttribLocation = _mesa_bind_attrib_location;
-   driver->CompileShader = _mesa_compile_shader;
-   driver->CreateProgram = _mesa_create_program;
-   driver->CreateShader = _mesa_create_shader;
-   driver->DeleteProgram2 = _mesa_delete_program2;
-   driver->DeleteShader = _mesa_delete_shader;
-   driver->DetachShader = _mesa_detach_shader;
-   driver->GetActiveAttrib = _mesa_get_active_attrib;
-   driver->GetActiveUniform = _mesa_get_active_uniform;
-   driver->GetAttachedShaders = _mesa_get_attached_shaders;
-   driver->GetAttribLocation = _mesa_get_attrib_location;
-   driver->GetHandle = _mesa_get_handle;
-   driver->GetProgramiv = _mesa_get_programiv;
-   driver->GetProgramInfoLog = _mesa_get_program_info_log;
-   driver->GetShaderiv = _mesa_get_shaderiv;
-   driver->GetShaderInfoLog = _mesa_get_shader_info_log;
-   driver->GetShaderSource = _mesa_get_shader_source;
-   driver->GetUniformfv = _mesa_get_uniformfv;
-   driver->GetUniformiv = _mesa_get_uniformiv;
-   driver->GetUniformLocation = _mesa_get_uniform_location;
-   driver->IsProgram = _mesa_is_program;
-   driver->IsShader = _mesa_is_shader;
-   driver->LinkProgram = _mesa_link_program;
-   driver->ShaderSource = _mesa_shader_source;
-   driver->Uniform = _mesa_uniform;
-   driver->UniformMatrix = _mesa_uniform_matrix;
-   driver->UseProgram = _mesa_use_program;
-   driver->ValidateProgram = _mesa_validate_program;
-}
diff --git a/mesalib/src/mesa/shader/slang/descrip.mms b/mesalib/src/mesa/shader/slang/descrip.mms
deleted file mode 100644
index 674b786ac..000000000
--- a/mesalib/src/mesa/shader/slang/descrip.mms
+++ /dev/null
@@ -1,67 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen  joukj@hrem.nano.tudelft.nl
-# Last revision : 3 October 2007
-
-.first
-	define gl [----.include.gl]
-	define math [--.math]
-	define swrast [--.swrast]
-	define array_cache [--.array_cache]
-	define main [--.main]
-	define glapi [--.glapi]
-	define shader [--.shader]
-
-.include [----]mms-config.
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [----.include],[--.main],[--.glapi],[-.slang],[-]
-LIBDIR = [----.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = \
-	slang_compile.c
-
-OBJECTS = slang_builtin.obj,slang_codegen.obj,slang_compile.obj,\
-	slang_compile_function.obj,slang_compile_operation.obj,\
-	slang_compile_struct.obj,slang_compile_variable.obj,slang_emit.obj,\
-	slang_ir.obj,slang_label.obj,slang_library_noise.obj,slang_link.obj,\
-	slang_log.obj,slang_mem.obj,slang_preprocess.obj,slang_print.obj,\
-	slang_simplify.obj,slang_storage.obj,slang_typeinfo.obj,\
-	slang_utility.obj,slang_vartable.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
-  @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
-	purge
-	delete *.obj;*
-
-slang_builtin.obj : slang_builtin.c
-slang_codegen.obj : slang_codegen.c
-slang_compile.obj : slang_compile.c
-slang_compile_function.obj : slang_compile_function.c
-slang_compile_operation.obj : slang_compile_operation.c
-slang_compile_struct.obj : slang_compile_struct.c
-slang_compile_variable.obj : slang_compile_variable.c
-slang_emit.obj : slang_emit.c
-slang_ir.obj : slang_ir.c
-slang_label.obj : slang_label.c
-slang_library_noise.obj : slang_library_noise.c
-slang_link.obj : slang_link.c
-slang_log.obj : slang_log.c
-slang_mem.obj : slang_mem.c
-slang_print.obj : slang_print.c
-slang_simplify.obj : slang_simplify.c
-slang_storage.obj : slang_storage.c
-slang_typeinfo.obj : slang_typeinfo.c
-slang_utility.obj : slang_utility.c
-slang_vartable.obj : slang_vartable.c
diff --git a/mesalib/src/mesa/shader/slang/library/Makefile b/mesalib/src/mesa/shader/slang/library/Makefile
deleted file mode 100644
index c6964512b..000000000
--- a/mesalib/src/mesa/shader/slang/library/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-# src/mesa/shader/slang/library/Makefile
-
-TOP = ../../../../..
-
-include $(TOP)/configs/current
-
-GLSL_CL = $(TOP)/src/glsl/apps/compile
-
-#
-# targets
-#
-
-.PHONY: default clean
-
-default: builtin
-
-clean:
-	-rm -f *_gc.h
-
-builtin: builtin_110 builtin_120
-
-#
-# builtin library sources
-#
-
-builtin_110: slang_common_builtin_gc.h slang_core_gc.h slang_fragment_builtin_gc.h slang_vertex_builtin_gc.h
-
-builtin_120: slang_120_core_gc.h slang_builtin_120_common_gc.h slang_builtin_120_fragment_gc.h
-
-
-slang_120_core_gc.h: slang_120_core.gc
-	$(GLSL_CL) fragment slang_120_core.gc slang_120_core_gc.h
-
-slang_builtin_120_common_gc.h: slang_builtin_120_common.gc
-	$(GLSL_CL) fragment slang_builtin_120_common.gc slang_builtin_120_common_gc.h
-
-slang_builtin_120_fragment_gc.h: slang_builtin_120_fragment.gc
-	$(GLSL_CL) fragment slang_builtin_120_fragment.gc slang_builtin_120_fragment_gc.h
-
-slang_common_builtin_gc.h: slang_common_builtin.gc
-	$(GLSL_CL) fragment slang_common_builtin.gc slang_common_builtin_gc.h
-
-slang_core_gc.h: slang_core.gc
-	$(GLSL_CL) fragment slang_core.gc slang_core_gc.h
-
-slang_fragment_builtin_gc.h: slang_fragment_builtin.gc
-	$(GLSL_CL) fragment slang_fragment_builtin.gc slang_fragment_builtin_gc.h
-
-slang_vertex_builtin_gc.h: slang_vertex_builtin.gc
-	$(GLSL_CL) vertex slang_vertex_builtin.gc slang_vertex_builtin_gc.h
-
diff --git a/mesalib/src/mesa/shader/slang/library/slang_120_core.gc b/mesalib/src/mesa/shader/slang/library/slang_120_core.gc
deleted file mode 100644
index 04c5ec2ec..000000000
--- a/mesalib/src/mesa/shader/slang/library/slang_120_core.gc
+++ /dev/null
@@ -1,1978 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5
- *
- * Copyright (C) 2006  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-//
-// Constructors and operators introduced in GLSL 1.20 - mostly on new
-// (non-square) types of matrices.
-//
-// One important change in the language is that when a matrix is used
-// as an argument to a matrix constructor, it must be the only argument
-// for the constructor. The compiler takes care of it by itself and
-// here we only care to re-introduce constructors for old (square)
-// types of matrices.
-//
-
-//
-// From Shader Spec, ver. 1.20, rev. 6
-//
-
-//// mat2x3: 2 columns of vec3
-
-mat2x3 __constructor(const float f00, const float f10, const float f20,
-                     const float f01, const float f11, const float f21)
-{
-   __retVal[0].x = f00;
-   __retVal[0].y = f10;
-   __retVal[0].z = f20;
-   __retVal[1].x = f01;
-   __retVal[1].y = f11;
-   __retVal[1].z = f21;
-}
-
-mat2x3 __constructor(const float f)
-{
-   __retVal = mat2x3(  f, 0.0, 0.0,
-                     0.0,   f, 0.0);
-}
-
-mat2x3 __constructor(const int  i)
-{
-   const float f = float(i);
-   __retVal = mat2x3(f);
-}
-
-mat2x3 __constructor(const bool b)
-{
-   const float f = float(b);
-   __retVal = mat2x3(f);
-}
-
-mat2x3 __constructor(const vec3 c0, const vec3 c1)
-{
-   __retVal[0] = c0;
-   __retVal[1] = c1;
-}
-
-
-
-//// mat2x4: 2 columns of vec4
-
-mat2x4 __constructor(const float f00, const float f10, const float f20, const float f30,
-                     const float f01, const float f11, const float f21, const float f31)
-{
-   __retVal[0].x = f00;
-   __retVal[0].y = f10;
-   __retVal[0].z = f20;
-   __retVal[0].w = f30;
-   __retVal[1].x = f01;
-   __retVal[1].y = f11;
-   __retVal[1].z = f21;
-   __retVal[1].w = f31;
-}
-
-mat2x4 __constructor(const float f)
-{
-   __retVal = mat2x4(  f, 0.0, 0.0, 0.0,
-                     0.0,   f, 0.0, 0.0);
-}
-
-mat2x4 __constructor(const int i)
-{
-   const float f = float(i);
-   __retVal = mat2x4(f);
-}
-
-mat2x4 __constructor(const bool b)
-{
-   const float f = float(b);
-   __retVal = mat2x4(f);
-}
-
-mat2x4 __constructor(const vec4 c0, const vec4 c1)
-{
-   __retVal[0] = c0;
-   __retVal[1] = c1;
-}
-
-
-
-//// mat3x2: 3 columns of vec2
-
-mat3x2 __constructor(const float f00, const float f10,
-                     const float f01, const float f11,
-                     const float f02, const float f12)
-{
-   __retVal[0].x = f00;
-   __retVal[0].y = f10;
-   __retVal[1].x = f01;
-   __retVal[1].y = f11;
-   __retVal[2].x = f02;
-   __retVal[2].y = f12;
-}
-
-mat3x2 __constructor(const float f)
-{
-   __retVal = mat3x2(  f, 0.0,
-                     0.0,   f,
-                     0.0, 0.0);
-}
-
-mat3x2 __constructor(const int i)
-{
-   const float f = float(i);
-   __retVal = mat3x2(f);
-}
-
-mat3x2 __constructor(const bool b)
-{
-   const float f = float(b);
-   __retVal = mat3x2(f);
-}
-
-mat3x2 __constructor(const vec2 c0, const vec2 c1, const vec2 c2)
-{
-   __retVal[0] = c0;
-   __retVal[1] = c1;
-   __retVal[2] = c2;
-}
-
-
-
-//// mat3x4: 3 columns of vec4
-
-mat3x4 __constructor(const float f00, const float f10, const float f20, const float f30,
-                     const float f01, const float f11, const float f21, const float f31,
-		     const float f02, const float f12, const float f22, const float f32)
-{
-   __retVal[0].x = f00;
-   __retVal[0].y = f10;
-   __retVal[0].z = f20;
-   __retVal[0].w = f30;
-   __retVal[1].x = f01;
-   __retVal[1].y = f11;
-   __retVal[1].z = f21;
-   __retVal[1].w = f31;
-   __retVal[2].x = f02;
-   __retVal[2].y = f12;
-   __retVal[2].z = f22;
-   __retVal[2].w = f32;
-}
-
-mat3x4 __constructor(const float f)
-{
-   __retVal = mat3x4(  f, 0.0, 0.0, 0.0,
-                     0.0,   f, 0.0, 0.0,
-                     0.0, 0.0,   f, 0.0);
-}
-
-mat3x4 __constructor(const int i)
-{
-   const float f = float(i);
-   __retVal = mat3x4(f);
-}
-
-mat3x4 __constructor(const bool b)
-{
-   const float f = float(b);
-   __retVal = mat3x4(f);
-}
-
-mat3x4 __constructor(const vec4 c0, const vec4 c1, const vec4 c2)
-{
-   __retVal[0] = c0;
-   __retVal[1] = c1;
-   __retVal[2] = c2;
-}
-
-
-
-//// mat4x2: 4 columns of vec2
-
-mat4x2 __constructor(const float f00, const float f10,
-                     const float f01, const float f11,
-		     const float f02, const float f12,
-		     const float f03, const float f13)
-{
-   __retVal[0].x = f00;
-   __retVal[0].y = f10;
-   __retVal[1].x = f01;
-   __retVal[1].y = f11;
-   __retVal[2].x = f02;
-   __retVal[2].y = f12;
-   __retVal[3].x = f03;
-   __retVal[3].y = f13;
-}
-
-mat4x2 __constructor(const float f)
-{
-   __retVal = mat4x2(  f, 0.0,
-                     0.0,   4,
-                     0.0, 0.0,
-                     0.0, 0.0);
-}
-
-mat4x2 __constructor(const int i)
-{
-   const float f = float(i);
-   __retVal = mat4x2(f);
-}
-
-mat4x2 __constructor(const bool b)
-{
-   const float f = float(b);
-   __retVal = mat4x2(f);
-}
-
-mat4x2 __constructor(const vec2 c0, const vec2 c1, const vec2 c2, const vec2 c3)
-{
-   __retVal[0] = c0;
-   __retVal[1] = c1;
-   __retVal[2] = c2;
-   __retVal[3] = c3;
-}
-
-
-
-//// mat4x3: 4 columns of vec3
-
-mat4x3 __constructor(const float f00, const float f10, const float f20,
-                     const float f01, const float f11, const float f21,
-		     const float f02, const float f12, const float f22,
-		     const float f03, const float f13, const float f23)
-{
-   __retVal[0].x = f00;
-   __retVal[0].y = f10;
-   __retVal[0].z = f20;
-   __retVal[1].x = f01;
-   __retVal[1].y = f11;
-   __retVal[1].z = f21;
-   __retVal[2].x = f02;
-   __retVal[2].y = f12;
-   __retVal[2].z = f22;
-   __retVal[3].x = f03;
-   __retVal[3].y = f13;
-   __retVal[3].z = f23;
-}
-
-mat4x3 __constructor(const float f)
-{
-   __retVal = mat4x3(  f, 0.0, 0.0,
-                     0.0,   f, 0.0,
-                     0.0, 0.0,   f,
-                     0.0, 0.0, 0.0);
-}
-
-mat4x3 __constructor(const int i)
-{
-   const float f = float(i);
-   __retVal = mat4x3(f);
-}
-
-mat4x3 __constructor(const bool b)
-{
-   const float f = float(b);
-   __retVal = mat4x3(f);
-}
-
-mat4x3 __constructor(const vec3 c0, const vec3 c1, const vec3 c2, const vec3 c3)
-{
-   __retVal[0] = c0;
-   __retVal[1] = c1;
-   __retVal[2] = c2;
-   __retVal[3] = c3;
-}
-
-
-
-//// misc assorted matrix constructors
-
-mat2 __constructor(const mat2 m)
-{
-   __retVal = m;
-}
-
-mat2 __constructor(const mat3x2 m)
-{
-   __retVal = mat2(m[0], m[1]);
-}
-
-mat2 __constructor(const mat4x2 m)
-{
-   __retVal = mat2(m[0], m[1]);
-}
-
-mat2 __constructor(const mat2x3 m)
-{
-   __retVal = mat2(m[0].xy, m[1].xy);
-}
-
-mat2 __constructor(const mat2x4 m)
-{
-   __retVal = mat2(m[0].xy, m[1].xy);
-}
-
-mat2 __constructor(const mat3 m)
-{
-   __retVal = mat2(m[0].xy, m[1].xy);
-}
-
-mat2 __constructor(const mat3x4 m)
-{
-   __retVal = mat2(m[0].xy, m[1].xy);
-}
-
-mat2 __constructor(const mat4x3 m)
-{
-   __retVal = mat2(m[0].xy, m[1].xy);
-}
-
-mat2 __constructor(const mat4 m)
-{
-   __retVal = mat2(m[0].xy, m[1].xy);
-}
-
-
-
-mat2x3 __constructor(const mat2x3 m)
-{
-   __retVal = m;
-}
-
-mat2x3 __constructor(const mat3 m)
-{
-   __retVal = mat2x3(m[0], m[1]);
-}
-
-mat2x3 __constructor(const mat4x3 m)
-{
-   __retVal = mat2x3(m[0], m[1]);
-}
-
-mat2x3 __constructor(const mat2x4 m)
-{
-   __retVal = mat2x3(m[0].xyz, m[1].xyz);
-}
-
-mat2x3 __constructor(const mat3x4 m)
-{
-   __retVal = mat2x3(m[0].xyz, m[1].xyz);
-}
-
-mat2x3 __constructor(const mat4 m)
-{
-   __retVal = mat2x3(m[0].xyz, m[1].xyz);
-}
-
-mat2x3 __constructor(const mat2 m)
-{
-   __retVal = mat2x3(m[0].x, m[0].y, 0.0,
-                     m[1].x, m[1].y, 0.0);
-}
-
-mat2x3 __constructor(const mat3x2 m)
-{
-   __retVal = mat2x3(m[0].x, m[0].y, 0.0,
-                     m[1].x, m[1].y, 0.0);
-}
-
-mat2x3 __constructor(const mat4x2 m)
-{
-   __retVal = mat2x3(m[0].x, m[0].y, 0.0,
-                     m[1].x, m[1].y, 0.0);
-}
-
-
-
-mat2x4 __constructor(const mat2x4 m)
-{
-   __retVal = m;
-}
-
-mat2x4 __constructor(const mat3x4 m)
-{
-   __retVal = mat2x4(m[0], m[1]);
-}
-
-mat2x4 __constructor(const mat4 m)
-{
-   __retVal = mat2x4(m[0], m[1]);
-}
-
-mat2x4 __constructor(const mat2x3 m)
-{
-   __retVal = mat2x4(m[0].x, m[0].y, m[0].z, 0.0,
-                     m[1].x, m[1].y, m[1].z, 0.0);
-}
-
-mat2x4 __constructor(const mat3 m)
-{
-   __retVal = mat2x4(m[0].x, m[0].y, m[0].z, 0.0,
-                     m[1].x, m[1].y, m[1].z, 0.0);
-}
-
-mat2x4 __constructor(const mat4x3 m)
-{
-   __retVal = mat2x4(m[0].x, m[0].y, m[0].z, 0.0,
-                     m[1].x, m[1].y, m[1].z, 0.0);
-}
-
-mat2x4 __constructor(const mat2 m)
-{
-   __retVal = mat2x4(m[0].x, m[1].y, 0.0, 0.0,
-                     m[1].x, m[1].y, 0.0, 0.0);
-}
-
-mat2x4 __constructor(const mat3x2 m)
-{
-   __retVal = mat2x4(m[0].x, m[0].y, 0.0, 0.0,
-                     m[1].x, m[1].y, 0.0, 0.0);
-}
-
-mat2x4 __constructor(const mat4x2 m)
-{
-   __retVal = mat2x4(m[0].x, m[0].y, 0.0, 0.0,
-                     m[1].x, m[1].y, 0.0, 0.0);
-}
-
-
-
-mat3x2 __constructor(const mat3x2 m)
-{
-   __retVal = m;
-}
-
-mat3x2 __constructor(const mat4x2 m)
-{
-   __retVal = mat3x2(m[0], m[1], m[2]);
-}
-
-mat3x2 __constructor(const mat3 m)
-{
-   __retVal = mat3x2(m[0], m[1], m[2]);
-}
-
-mat3x2 __constructor(const mat3x4 m)
-{
-   __retVal = mat3x2(m[0].x, m[0].y,
-                     m[1].x, m[1].y,
-                     m[2].x, m[2].y);
-}
-
-mat3x2 __constructor(const mat4x3 m)
-{
-   __retVal = mat3x2(m[0].x, m[0].y,
-                     m[1].x, m[1].y,
-                     m[2].x, m[2].y);
-}
-
-mat3x2 __constructor(const mat4 m)
-{
-   __retVal = mat3x2(m[0].x, m[0].y,
-                     m[1].x, m[1].y,
-                        0.0,    0.0);
-}
-
-mat3x2 __constructor(const mat2 m)
-{
-   __retVal = mat3x2(m[0], m[1], vec2(0.0));
-}
-
-mat3x2 __constructor(const mat2x3 m)
-{
-   __retVal = mat3x2(m[0].x, m[0].y,
-                     m[1].x, m[1].y,
-                        0.0,    0.0);
-}
-
-mat3x2 __constructor(const mat2x4 m)
-{
-   __retVal = mat3x2(m[0].x, m[0].y,
-                     m[1].x, m[1].y,
-                        0.0,    0.0);
-}
-
-
-
-
-mat3 __constructor(const mat3 m)
-{
-   __retVal = m;
-}
-
-mat3 __constructor(const mat4x3 m)
-{
-   __retVal = mat3 (
-        m[0],
-        m[1],
-        m[2]
-    );
-}
-
-mat3 __constructor(const mat3x4 m)
-{
-   __retVal = mat3 (
-        m[0].xyz,
-        m[1].xyz,
-        m[2].xyz
-    );
-}
-
-mat3 __constructor(const mat4 m)
-{
-   __retVal = mat3 (
-        m[0].xyz,
-        m[1].xyz,
-        m[2].xyz
-    );
-}
-
-mat3 __constructor(const mat2x3 m)
-{
-   __retVal = mat3 (
-        m[0],
-        m[1],
-        0., 0., 1.
-    );
-}
-
-mat3 __constructor(const mat2x4 m)
-{
-   __retVal = mat3 (
-        m[0].xyz,
-        m[1].xyz,
-        0., 0., 1.
-    );
-}
-
-mat3 __constructor(const mat3x2 m)
-{
-   __retVal = mat3 (
-        m[0], 0.,
-        m[1], 0.,
-        m[2], 1.
-    );
-}
-
-mat3 __constructor(const mat4x2 m)
-{
-   __retVal = mat3 (
-        m[0], 0.,
-        m[1], 0.,
-        m[2], 1.
-    );
-}
-
-mat3 __constructor(const mat2 m)
-{
-   __retVal = mat3 (
-        m[0], 0.,
-        m[1], 0.,
-        0., 0., 1.
-    );
-}
-
-
-mat3x4 __constructor(const mat3x4 m)
-{
-   __retVal = m;
-}
-
-mat3x4 __constructor(const mat4 m)
-{
-   __retVal = mat3x4 (
-        m[0],
-        m[1],
-        m[2]
-    );
-}
-
-mat3x4 __constructor(const mat3 m)
-{
-   __retVal = mat3x4 (
-        m[0], 0.,
-        m[1], 0.,
-        m[2], 0.
-    );
-}
-
-mat3x4 __constructor(const mat4x3 m)
-{
-   __retVal = mat3x4 (
-        m[0], 0.,
-        m[1], 0.,
-        m[2], 0.
-    );
-}
-
-mat3x4 __constructor(const mat2x4 m)
-{
-   __retVal = mat3x4 (
-        m[0],
-        m[1],
-        0., 0., 1., 0.
-    );
-}
-
-mat3x4 __constructor(const mat2x3 m)
-{
-   __retVal = mat3x4 (
-        m[0], 0.,
-        m[1], 0.,
-        0., 0., 1., 0.
-    );
-}
-
-mat3x4 __constructor(const mat3x2 m)
-{
-   __retVal = mat3x4 (
-        m[0], 0., 0.,
-        m[1], 0., 0.,
-        m[2], 1., 0.
-    );
-}
-
-mat3x4 __constructor(const mat4x2 m)
-{
-   __retVal = mat3x4 (
-        m[0], 0., 0.,
-        m[1], 0., 0.,
-        m[2], 1., 0.
-    );
-}
-
-mat3x4 __constructor(const mat2 m)
-{
-   __retVal = mat3x4 (
-        m[0], 0., 0.,
-        m[1], 0., 0.,
-        0., 0., 1., 0.
-    );
-}
-
-
-mat4x2 __constructor(const mat4x2 m)
-{
-   __retVal = m;
-}
-
-mat4x2 __constructor(const mat4x3 m)
-{
-   __retVal = mat4x2 (
-        m[0].xy,
-        m[1].xy,
-        m[2].xy,
-        m[3].xy
-    );
-}
-
-mat4x2 __constructor(const mat4 m)
-{
-   __retVal = mat4x2 (
-        m[0].xy,
-        m[1].xy,
-        m[2].xy,
-        m[3].xy
-    );
-}
-
-mat4x2 __constructor(const mat3x2 m)
-{
-   __retVal = mat4x2 (
-        m[0],
-        m[1],
-        0., 0.
-    );
-}
-
-mat4x2 __constructor(const mat3 m)
-{
-   __retVal = mat4x2 (
-        m[0].xy,
-        m[1].xy,
-        m[2].xy,
-        0., 0.
-    );
-}
-
-mat4x2 __constructor(const mat3x4 m)
-{
-   __retVal = mat4x2 (
-        m[0].xy,
-        m[1].xy,
-        m[2].xy,
-        0., 0.
-    );
-}
-
-mat4x2 __constructor(const mat2 m)
-{
-   __retVal = mat4x2 (
-        m[0],
-        m[1],
-        0., 0.,
-        0., 0.
-    );
-}
-
-mat4x2 __constructor(const mat2x3 m)
-{
-   __retVal = mat4x2 (
-        m[0].xy,
-        m[1].xy,
-        0., 0.,
-        0., 0.
-    );
-}
-
-mat4x2 __constructor(const mat2x4 m)
-{
-   __retVal = mat4x2 (
-        m[0].xy,
-        m[1].xy,
-        0., 0.,
-        0., 0.
-    );
-}
-
-
-mat4x3 __constructor(const mat4x3 m)
-{
-   __retVal = m;
-}
-
-mat4x3 __constructor(const mat4 m)
-{
-   __retVal = mat4x3 (
-        m[0].xyz,
-        m[1].xyz,
-        m[2].xyz,
-        m[3].xyz
-    );
-}
-
-mat4x3 __constructor(const mat3 m)
-{
-   __retVal = mat4x3 (
-        m[0],
-        m[1],
-        m[2],
-        0., 0., 0.
-    );
-}
-
-mat4x3 __constructor(const mat3x4 m)
-{
-   __retVal = mat4x3 (
-        m[0].xyz,
-        m[1].xyz,
-        m[2].xyz,
-        0., 0., 0.
-    );
-}
-
-mat4x3 __constructor(const mat4x2 m)
-{
-   __retVal = mat4x3 (
-        m[0], 0.,
-        m[1], 0.,
-        m[2], 1.,
-        m[3], 0.
-    );
-}
-
-mat4x3 __constructor(const mat2x3 m)
-{
-   __retVal = mat4x3 (
-        m[0],
-        m[1],
-        0., 0., 1.,
-        0., 0., 0.
-    );
-}
-
-mat4x3 __constructor(const mat3x2 m)
-{
-   __retVal = mat4x3 (
-        m[0], 0.,
-        m[1], 0.,
-        m[2], 1.,
-        0., 0., 0.
-    );
-}
-
-mat4x3 __constructor(const mat2x4 m)
-{
-   __retVal = mat4x3 (
-        m[0].xyz,
-        m[1].xyz,
-        0., 0., 1.,
-        0., 0., 0.
-    );
-}
-
-mat4x3 __constructor(const mat2 m)
-{
-   __retVal = mat4x3 (
-        m[0], 0.,
-        m[1], 0.,
-        0., 0., 1.,
-        0., 0., 0.
-    );
-}
-
-
-mat4 __constructor(const mat4 m)
-{
-   __retVal = m;
-}
-
-mat4 __constructor(const mat3x4 m)
-{
-   __retVal = mat4 (
-        m[0],
-        m[1],
-        m[2],
-        0., 0., 0., 1.
-    );
-}
-
-mat4 __constructor(const mat4x3 m)
-{
-   __retVal = mat4 (
-        m[0], 0.,
-        m[1], 0.,
-        m[2], 0.,
-        m[3], 1.
-    );
-}
-
-mat4 __constructor(const mat2x4 m)
-{
-   __retVal = mat4 (
-        m[0],
-        m[1],
-        0., 0., 1., 0.,
-        0., 0., 0., 1.
-    );
-}
-
-mat4 __constructor(const mat4x2 m)
-{
-   __retVal = mat4 (
-        m[0], 0., 0.,
-        m[1], 0., 0.,
-        m[2], 1., 0.,
-        m[3], 0., 1.
-    );
-}
-
-mat4 __constructor(const mat3 m)
-{
-   __retVal = mat4 (
-        m[0], 0.,
-        m[1], 0.,
-        m[2], 0.,
-        0., 0., 0., 1.
-    );
-}
-
-mat4 __constructor(const mat2x3 m)
-{
-   __retVal = mat4 (
-        m[0], 0.,
-        m[1], 0.,
-        0., 0., 1., 0.,
-        0., 0., 0., 1.
-    );
-}
-
-mat4 __constructor(const mat3x2 m)
-{
-   __retVal = mat4 (
-        m[0], 0., 0.,
-        m[1], 0., 0.,
-        m[2], 1., 0.,
-        0., 0., 0., 1.
-    );
-}
-
-mat4 __constructor(const mat2 m)
-{
-   __retVal = mat4 (
-        m[0], 0., 0.,
-        m[1], 0., 0.,
-        0., 0., 1., 0.,
-        0., 0., 0., 1.
-    );
-}
-
-
-void __operator += (inout mat2x3 m, const mat2x3 n) {
-    m[0] += n[0];
-    m[1] += n[1];
-}
-
-void __operator += (inout mat2x4 m, const mat2x4 n) {
-    m[0] += n[0];
-    m[1] += n[1];
-}
-
-void __operator += (inout mat3x2 m, const mat3x2 n) {
-    m[0] += n[0];
-    m[1] += n[1];
-    m[2] += n[2];
-}
-
-void __operator += (inout mat3x4 m, const mat3x4 n) {
-    m[0] += n[0];
-    m[1] += n[1];
-    m[2] += n[2];
-}
-
-void __operator += (inout mat4x2 m, const mat4x2 n) {
-    m[0] += n[0];
-    m[1] += n[1];
-    m[2] += n[2];
-    m[3] += n[3];
-}
-
-void __operator += (inout mat4x3 m, const mat4x3 n) {
-    m[0] += n[0];
-    m[1] += n[1];
-    m[2] += n[2];
-    m[3] += n[3];
-}
-
-
-void __operator -= (inout mat2x3 m, const mat2x3 n) {
-    m[0] -= n[0];
-    m[1] -= n[1];
-}
-
-void __operator -= (inout mat2x4 m, const mat2x4 n) {
-    m[0] -= n[0];
-    m[1] -= n[1];
-}
-
-void __operator -= (inout mat3x2 m, const mat3x2 n) {
-    m[0] -= n[0];
-    m[1] -= n[1];
-    m[2] -= n[2];
-}
-
-void __operator -= (inout mat3x4 m, const mat3x4 n) {
-    m[0] -= n[0];
-    m[1] -= n[1];
-    m[2] -= n[2];
-}
-
-void __operator -= (inout mat4x2 m, const mat4x2 n) {
-    m[0] -= n[0];
-    m[1] -= n[1];
-    m[2] -= n[2];
-    m[3] -= n[3];
-}
-
-void __operator -= (inout mat4x3 m, const mat4x3 n) {
-    m[0] -= n[0];
-    m[1] -= n[1];
-    m[2] -= n[2];
-    m[3] -= n[3];
-}
-
-
-void __operator /= (inout mat2x3 m, const mat2x3 n) {
-    m[0] /= n[0];
-    m[1] /= n[1];
-}
-
-void __operator /= (inout mat2x4 m, const mat2x4 n) {
-    m[0] /= n[0];
-    m[1] /= n[1];
-}
-
-void __operator /= (inout mat3x2 m, const mat3x2 n) {
-    m[0] /= n[0];
-    m[1] /= n[1];
-    m[2] /= n[2];
-}
-
-void __operator /= (inout mat3x4 m, const mat3x4 n) {
-    m[0] /= n[0];
-    m[1] /= n[1];
-    m[2] /= n[2];
-}
-
-void __operator /= (inout mat4x2 m, const mat4x2 n) {
-    m[0] /= n[0];
-    m[1] /= n[1];
-    m[2] /= n[2];
-    m[3] /= n[3];
-}
-
-void __operator /= (inout mat4x3 m, const mat4x3 n) {
-    m[0] /= n[0];
-    m[1] /= n[1];
-    m[2] /= n[2];
-    m[3] /= n[3];
-}
-
-
-vec3 __operator * (const mat2x3 m, const vec2 v)
-{
-   __retVal.x = v.x * m[0].x + v.y * m[1].x;
-   __retVal.y = v.x * m[0].y + v.y * m[1].y;
-   __retVal.z = v.x * m[0].z + v.y * m[1].z;
-}
-
-vec4 __operator * (const mat2x4 m, const vec2 v)
-{
-   __retVal.x = v.x * m[0].x + v.y * m[1].x;
-   __retVal.y = v.x * m[0].y + v.y * m[1].y;
-   __retVal.z = v.x * m[0].z + v.y * m[1].z;
-   __retVal.w = v.x * m[0].w + v.y * m[1].w;
-}
-
-vec2 __operator * (const mat3x2 m, const vec3 v)
-{
-   __retVal.x = v.x * m[0].x + v.y * m[1].x + v.z * m[2].x;
-   __retVal.y = v.x * m[0].y + v.y * m[1].y + v.z * m[2].y;
-}
-
-vec4 __operator * (const mat3x4 m, const vec3 v)
-{
-   __retVal.x = v.x * m[0].x + v.y * m[1].x + v.z * m[2].x;
-   __retVal.y = v.x * m[0].y + v.y * m[1].y + v.z * m[2].y;
-   __retVal.z = v.x * m[0].z + v.y * m[1].z + v.z * m[2].z;
-   __retVal.w = v.x * m[0].w + v.y * m[1].w + v.z * m[2].w;
-}
-
-vec2 __operator * (const mat4x2 m, const vec4 v)
-{
-   __retVal.x = v.x * m[0].x + v.y * m[1].x + v.z * m[2].x + v.w * m[3].x;
-   __retVal.y = v.x * m[0].y + v.y * m[1].y + v.z * m[2].y + v.w * m[3].y;
-}
-
-vec3 __operator * (const mat4x3 m, const vec4 v)
-{
-   __retVal.x = v.x * m[0].x + v.y * m[1].x + v.z * m[2].x + v.w * m[3].x;
-   __retVal.y = v.x * m[0].y + v.y * m[1].y + v.z * m[2].y + v.w * m[3].y;
-   __retVal.z = v.x * m[0].z + v.y * m[1].z + v.z * m[2].z + v.w * m[3].z;
-}
-
-
-mat3x2 __operator * (const mat2 m, const mat3x2 n)
-{
-   //return mat3x2 (m * n[0], m * n[1], m * n[2]);
-   __retVal[0] = m * n[0];
-   __retVal[1] = m * n[1];
-   __retVal[2] = m * n[2];
-}
-
-mat4x2 __operator * (const mat2 m, const mat4x2 n)
-{
-   //return mat4x2 (m * n[0], m * n[1], m * n[2], m * n[3]);
-   __retVal[0] = m * n[0];
-   __retVal[1] = m * n[1];
-   __retVal[2] = m * n[2];
-   __retVal[3] = m * n[3];
-}
-
-
-mat2x3 __operator * (const mat2x3 m, const mat2 n)
-{
-   //return mat2x3 (m * n[0], m * n[1]);
-   __retVal[0] = m * n[0];
-   __retVal[1] = m * n[1];
-}
-
-mat3 __operator * (const mat2x3 m, const mat3x2 n)
-{
-   //return mat3 (m * n[0], m * n[1], m * n[2]);
-   __retVal[0] = m * n[0];
-   __retVal[1] = m * n[1];
-   __retVal[2] = m * n[2];
-}
-
-mat4x3 __operator * (const mat2x3 m, const mat4x2 n)
-{
-   //return mat4x3 (m * n[0], m * n[1], m * n[2], m * n[3]);
-   __retVal[0] = m * n[0];
-   __retVal[1] = m * n[1];
-   __retVal[2] = m * n[2];
-   __retVal[3] = m * n[3];
-}
-
-
-mat2x4 __operator * (const mat2x4 m, const mat2 n)
-{
-   //return mat2x4 (m * n[0], m * n[1]);
-   __retVal[0] = m * n[0];
-   __retVal[1] = m * n[1];
-}
-
-mat3x4 __operator * (const mat2x4 m, const mat3x2 n)
-{
-   //return mat3x4 (m * n[0], m * n[1], m * n[2]);
-   __retVal[0] = m * n[0];
-   __retVal[1] = m * n[1];
-   __retVal[2] = m * n[2];
-}
-
-mat4 __operator * (const mat2x4 m, const mat4x2 n)
-{
-   //return mat4 (m * n[0], m * n[1], m * n[2], m * n[3]);
-   __retVal[0] = m * n[0];
-   __retVal[1] = m * n[1];
-   __retVal[2] = m * n[2];
-   __retVal[3] = m * n[3];
-}
-
-
-mat2 __operator * (const mat3x2 m, const mat2x3 n)
-{
-   //return mat2 (m * n[0], m * n[1]);
-   __retVal[0] = m * n[0];
-   __retVal[1] = m * n[1];
-}
-
-mat3x2 __operator * (const mat3x2 m, const mat3 n)
-{
-   //return mat3x2 (m * n[0], m * n[1], m * n[2]);
-   __retVal[0] = m * n[0];
-   __retVal[1] = m * n[1];
-   __retVal[2] = m * n[2];
-}
-
-mat4x2 __operator * (const mat3x2 m, const mat4x3 n)
-{
-   //return mat4x2 (m * n[0], m * n[1], m * n[2], m * n[3]);
-   __retVal[0] = m * n[0];
-   __retVal[1] = m * n[1];
-   __retVal[2] = m * n[2];
-   __retVal[3] = m * n[3];
-}
-
-
-mat2x3 __operator * (const mat3 m, const mat2x3 n)
-{
-   //return mat2x3 (m * n[0], m * n[1]);
-   __retVal[0] = m * n[0];
-   __retVal[1] = m * n[1];
-}
-
-mat4x3 __operator * (const mat3 m, const mat4x3 n)
-{
-   //return mat4x3 (m * n[0], m * n[1], m * n[2], m * n[3]);
-   __retVal[0] = m * n[0];
-   __retVal[1] = m * n[1];
-   __retVal[2] = m * n[2];
-   __retVal[3] = m * n[3];
-}
-
-
-mat2x4 __operator * (const mat3x4 m, const mat2x3 n)
-{
-   //return mat2x4 (m * n[0], m * n[1]);
-   __retVal[0] = m * n[0];
-   __retVal[1] = m * n[1];
-}
-
-mat3x4 __operator * (const mat3x4 m, const mat3 n)
-{
-   //return mat3x4 (m * n[0], m * n[1], m * n[2]);
-   __retVal[0] = m * n[0];
-   __retVal[1] = m * n[1];
-   __retVal[2] = m * n[2];
-}
-
-mat4 __operator * (const mat3x4 m, const mat4x3 n)
-{
-   //return mat4 (m * n[0], m * n[1], m * n[2], m * n[3]);
-   __retVal[0] = m * n[0];
-   __retVal[1] = m * n[1];
-   __retVal[2] = m * n[2];
-   __retVal[3] = m * n[3];
-}
-
-
-mat2 __operator * (const mat4x2 m, const mat2x4 n)
-{
-   //return = mat2 (m * n[0], m * n[1]);
-   __retVal[0] = m * n[0];
-   __retVal[1] = m * n[1];
-}
-
-mat3x2 __operator * (const mat4x2 m, const mat3x4 n)
-{
-   //return mat3x2 (m * n[0], m * n[1], m * n[2]);
-   __retVal[0] = m * n[0];
-   __retVal[1] = m * n[1];
-   __retVal[2] = m * n[2];
-}
-
-mat4x2 __operator * (const mat4x2 m, const mat4 n)
-{
-   //return mat4x2 (m * n[0], m * n[1], m * n[2], m * n[3]);
-   __retVal[0] = m * n[0];
-   __retVal[1] = m * n[1];
-   __retVal[2] = m * n[2];
-   __retVal[3] = m * n[3];
-}
-
-
-mat2x3 __operator * (const mat4x3 m, const mat2x4 n)
-{
-   //return mat2x3 (m * n[0], m * n[1]);
-   __retVal[0] = m * n[0];
-   __retVal[1] = m * n[1];
-}
-
-mat3 __operator * (const mat4x3 m, const mat3x4 n)
-{
-   //return mat3 (m * n[0], m * n[1], m * n[2]);
-   __retVal[0] = m * n[0];
-   __retVal[1] = m * n[1];
-   __retVal[2] = m * n[2];
-}
-
-mat4x3 __operator * (const mat4x3 m, const mat4 n)
-{
-   //return mat4x3 (m * n[0], m * n[1], m * n[2], m * n[3]);
-   __retVal[0] = m * n[0];
-   __retVal[1] = m * n[1];
-   __retVal[2] = m * n[2];
-   __retVal[3] = m * n[3];
-}
-
-
-mat2x4 __operator * (const mat4 m, const mat2x4 n)
-{
-   //return mat2x4 (m * n[0], m * n[1]);
-   __retVal[0] = m * n[0];
-   __retVal[1] = m * n[1];
-}
-
-mat3x4 __operator * (const mat4 m, const mat3x4 n)
-{
-   //return mat3x4 (m * n[0], m * n[1], m * n[2]);
-   __retVal[0] = m * n[0];
-   __retVal[1] = m * n[1];
-   __retVal[2] = m * n[2];
-}
-
-
-void __operator *= (inout mat2x3 m, const mat2 n) {
-    m = m * n;
-}
-
-void __operator *= (inout mat2x4 m, const mat2 n) {
-    m = m * n;
-}
-
-void __operator *= (inout mat3x2 m, const mat3 n) {
-    m = m * n;
-}
-
-void __operator *= (inout mat3x4 m, const mat3 n) {
-    m = m * n;
-}
-
-void __operator *= (inout mat4x2 m, const mat4 n) {
-    m = m * n;
-}
-
-void __operator *= (inout mat4x3 m, const mat4 n) {
-    m = m * n;
-}
-
-
-vec3 __operator * (const vec2 v, const mat3x2 m)
-{
-   __retVal.x = dot(v, m[0]);
-   __retVal.y = dot(v, m[1]);
-   __retVal.z = dot(v, m[2]);
-}
-
-vec4 __operator * (const vec2 v, const mat4x2 m)
-{
-   __retVal.x = dot(v, m[0]);
-   __retVal.y = dot(v, m[1]);
-   __retVal.z = dot(v, m[2]);
-   __retVal.w = dot(v, m[3]);
-}
-
-vec2 __operator * (const vec3 v, const mat2x3 m)
-{
-   __retVal.x = dot(v, m[0]);
-   __retVal.y = dot(v, m[1]);
-}
-
-vec4 __operator * (const vec3 v, const mat4x3 m)
-{
-   __retVal.x = dot(v, m[0]);
-   __retVal.y = dot(v, m[1]);
-   __retVal.z = dot(v, m[2]);
-   __retVal.w = dot(v, m[3]);
-}
-
-vec2 __operator * (const vec4 v, const mat2x4 m)
-{
-   __retVal.x = dot(v, m[0]);
-   __retVal.y = dot(v, m[1]);
-}
-
-vec3 __operator * (const vec4 v, const mat3x4 m)
-{
-   __retVal.x = dot(v, m[0]);
-   __retVal.y = dot(v, m[1]);
-   __retVal.z = dot(v, m[2]);
-}
-
-
-void __operator += (inout mat2x3 m, const float a) {
-    m[0] += a;
-    m[1] += a;
-}
-
-void __operator += (inout mat2x4 m, const float a) {
-    m[0] += a;
-    m[1] += a;
-}
-
-void __operator += (inout mat3x2 m, const float a) {
-    m[0] += a;
-    m[1] += a;
-    m[2] += a;
-}
-
-void __operator += (inout mat3x4 m, const float a) {
-    m[0] += a;
-    m[1] += a;
-    m[2] += a;
-}
-
-void __operator += (inout mat4x2 m, const float a) {
-    m[0] += a;
-    m[1] += a;
-    m[2] += a;
-    m[3] += a;
-}
-
-void __operator += (inout mat4x3 m, const float a) {
-    m[0] += a;
-    m[1] += a;
-    m[2] += a;
-    m[3] += a;
-}
-
-
-void __operator -= (inout mat2x3 m, const float a) {
-    m[0] -= a;
-    m[1] -= a;
-}
-
-void __operator -= (inout mat2x4 m, const float a) {
-    m[0] -= a;
-    m[1] -= a;
-}
-
-void __operator -= (inout mat3x2 m, const float a) {
-    m[0] -= a;
-    m[1] -= a;
-    m[2] -= a;
-}
-
-void __operator -= (inout mat3x4 m, const float a) {
-    m[0] -= a;
-    m[1] -= a;
-    m[2] -= a;
-}
-
-void __operator -= (inout mat4x2 m, const float a) {
-    m[0] -= a;
-    m[1] -= a;
-    m[2] -= a;
-    m[3] -= a;
-}
-
-void __operator -= (inout mat4x3 m, const float a) {
-    m[0] -= a;
-    m[1] -= a;
-    m[2] -= a;
-    m[3] -= a;
-}
-
-
-void __operator *= (inout mat2x3 m, const float a) {
-    m[0] *= a;
-    m[1] *= a;
-}
-
-void __operator *= (inout mat2x4 m, const float a) {
-    m[0] *= a;
-    m[1] *= a;
-}
-
-void __operator *= (inout mat3x2 m, const float a) {
-    m[0] *= a;
-    m[1] *= a;
-    m[2] *= a;
-}
-
-void __operator *= (inout mat3x4 m, const float a) {
-    m[0] *= a;
-    m[1] *= a;
-    m[2] *= a;
-}
-
-void __operator *= (inout mat4x2 m, const float a) {
-    m[0] *= a;
-    m[1] *= a;
-    m[2] *= a;
-    m[3] *= a;
-}
-
-void __operator *= (inout mat4x3 m, const float a) {
-    m[0] *= a;
-    m[1] *= a;
-    m[2] *= a;
-    m[3] *= a;
-}
-
-
-void __operator /= (inout mat2x3 m, const float a) {
-    m[0] /= a;
-    m[1] /= a;
-}
-
-void __operator /= (inout mat2x4 m, const float a) {
-    m[0] /= a;
-    m[1] /= a;
-}
-
-void __operator /= (inout mat3x2 m, const float a) {
-    m[0] /= a;
-    m[1] /= a;
-    m[2] /= a;
-}
-
-void __operator /= (inout mat3x4 m, const float a) {
-    m[0] /= a;
-    m[1] /= a;
-    m[2] /= a;
-}
-
-void __operator /= (inout mat4x2 m, const float a) {
-    m[0] /= a;
-    m[1] /= a;
-    m[2] /= a;
-    m[3] /= a;
-}
-
-void __operator /= (inout mat4x3 m, const float a) {
-    m[0] /= a;
-    m[1] /= a;
-    m[2] /= a;
-    m[3] /= a;
-}
-
-
-mat2x3 __operator + (const mat2x3 m, const mat2x3 n) {
-    return mat2x3 (m[0] + n[0], m[1] + n[1]);
-}
-
-mat2x4 __operator + (const mat2x4 m, const mat2x4 n) {
-    return mat2x4 (m[0] + n[0], m[1] + n[1]);
-}
-
-mat3x2 __operator + (const mat3x2 m, const mat3x2 n) {
-    return mat3x2 (m[0] + n[0], m[1] + n[1], m[2] + n[2]);
-}
-
-mat3x4 __operator + (const mat3x4 m, const mat3x4 n) {
-    return mat3x4 (m[0] + n[0], m[1] + n[1], m[2] + n[2]);
-}
-
-mat4x2 __operator + (const mat4x2 m, const mat4x2 n) {
-    return mat4x2 (m[0] + n[0], m[1] + n[1], m[2] + n[2], m[3] + n[3]);
-}
-
-mat4x3 __operator + (const mat4x3 m, const mat4x3 n) {
-    return mat4x3 (m[0] + n[0], m[1] + n[1], m[2] + n[2], m[3] + n[3]);
-}
-
-
-mat2x3 __operator - (const mat2x3 m, const mat2x3 n) {
-    return mat2x3 (m[0] - n[0], m[1] - n[1]);
-}
-
-mat2x4 __operator - (const mat2x4 m, const mat2x4 n) {
-    return mat2x4 (m[0] - n[0], m[1] - n[1]);
-}
-
-mat3x2 __operator - (const mat3x2 m, const mat3x2 n) {
-    return mat3x2 (m[0] - n[0], m[1] - n[1], m[2] - n[2]);
-}
-
-mat3x4 __operator - (const mat3x4 m, const mat3x4 n) {
-    return mat3x4 (m[0] - n[0], m[1] - n[1], m[2] - n[2]);
-}
-
-mat4x2 __operator - (const mat4x2 m, const mat4x2 n) {
-    return mat4x2 (m[0] - n[0], m[1] - n[1], m[2] - n[2], m[3] - n[3]);
-}
-
-mat4x3 __operator - (const mat4x3 m, const mat4x3 n) {
-    return mat4x3 (m[0] - n[0], m[1] - n[1], m[2] - n[2], m[3] - n[3]);
-}
-
-
-mat2x3 __operator / (const mat2x3 m, const mat2x3 n) {
-    return mat2x3 (m[0] / n[0], m[1] / n[1]);
-}
-
-mat2x4 __operator / (const mat2x4 m, const mat2x4 n) {
-    return mat2x4 (m[0] / n[0], m[1] / n[1]);
-}
-
-mat3x2 __operator / (const mat3x2 m, const mat3x2 n) {
-    return mat3x2 (m[0] / n[0], m[1] / n[1], m[2] / n[2]);
-}
-
-mat3x4 __operator / (const mat3x4 m, const mat3x4 n) {
-    return mat3x4 (m[0] / n[0], m[1] / n[1], m[2] / n[2]);
-}
-
-mat4x2 __operator / (const mat4x2 m, const mat4x2 n) {
-    return mat4x2 (m[0] / n[0], m[1] / n[1], m[2] / n[2], m[3] / n[3]);
-}
-
-mat4x3 __operator / (const mat4x3 m, const mat4x3 n) {
-    return mat4x3 (m[0] / n[0], m[1] / n[1], m[2] / n[2], m[3] / n[3]);
-}
-
-
-mat2x3 __operator + (const float a, const mat2x3 n) {
-    return mat2x3 (a + n[0], a + n[1]);
-}
-
-mat2x3 __operator + (const mat2x3 m, const float b) {
-    return mat2x3 (m[0] + b, m[1] + b);
-}
-
-mat2x4 __operator + (const float a, const mat2x4 n) {
-    return mat2x4 (a + n[0], a + n[1]);
-}
-
-mat2x4 __operator + (const mat2x4 m, const float b) {
-    return mat2x4 (m[0] + b, m[1] + b);
-}
-
-mat3x2 __operator + (const float a, const mat3x2 n) {
-    return mat3x2 (a + n[0], a + n[1], a + n[2]);
-}
-
-mat3x2 __operator + (const mat3x2 m, const float b) {
-    return mat3x2 (m[0] + b, m[1] + b, m[2] + b);
-}
-
-mat3x4 __operator + (const float a, const mat3x4 n) {
-    return mat3x4 (a + n[0], a + n[1], a + n[2]);
-}
-
-mat3x4 __operator + (const mat3x4 m, const float b) {
-    return mat3x4 (m[0] + b, m[1] + b, m[2] + b);
-}
-
-mat4x2 __operator + (const mat4x2 m, const float b) {
-    return mat4x2 (m[0] + b, m[1] + b, m[2] + b, m[3] + b);
-}
-
-mat4x2 __operator + (const float a, const mat4x2 n) {
-    return mat4x2 (a + n[0], a + n[1], a + n[2], a + n[3]);
-}
-
-mat4x3 __operator + (const mat4x3 m, const float b) {
-    return mat4x3 (m[0] + b, m[1] + b, m[2] + b, m[3] + b);
-}
-
-mat4x3 __operator + (const float a, const mat4x3 n) {
-    return mat4x3 (a + n[0], a + n[1], a + n[2], a + n[3]);
-}
-
-
-mat2x3 __operator - (const float a, const mat2x3 n) {
-    return mat2x3 (a - n[0], a - n[1]);
-}
-
-mat2x3 __operator - (const mat2x3 m, const float b) {
-    return mat2x3 (m[0] - b, m[1] - b);
-}
-
-mat2x4 __operator - (const float a, const mat2x4 n) {
-    return mat2x4 (a - n[0], a - n[1]);
-}
-
-mat2x4 __operator - (const mat2x4 m, const float b) {
-    return mat2x4 (m[0] - b, m[1] - b);
-}
-
-mat3x2 __operator - (const float a, const mat3x2 n) {
-    return mat3x2 (a - n[0], a - n[1], a - n[2]);
-}
-
-mat3x2 __operator - (const mat3x2 m, const float b) {
-    return mat3x2 (m[0] - b, m[1] - b, m[2] - b);
-}
-
-mat3x4 __operator - (const float a, const mat3x4 n) {
-    return mat3x4 (a - n[0], a - n[1], a - n[2]);
-}
-
-mat3x4 __operator - (const mat3x4 m, const float b) {
-    return mat3x4 (m[0] - b, m[1] - b, m[2] - b);
-}
-
-mat4x2 __operator - (const mat4x2 m, const float b) {
-    return mat4x2 (m[0] - b, m[1] - b, m[2] - b, m[3] - b);
-}
-
-mat4x2 __operator - (const float a, const mat4x2 n) {
-    return mat4x2 (a - n[0], a - n[1], a - n[2], a - n[3]);
-}
-
-mat4x3 __operator - (const mat4x3 m, const float b) {
-    return mat4x3 (m[0] - b, m[1] - b, m[2] - b, m[3] - b);
-}
-
-mat4x3 __operator - (const float a, const mat4x3 n) {
-    return mat4x3 (a - n[0], a - n[1], a - n[2], a - n[3]);
-}
-
-
-mat2x3 __operator * (const float a, const mat2x3 n)
-{
-   //return mat2x3 (a * n[0], a * n[1]);
-   __retVal[0] = a * n[0];
-   __retVal[1] = a * n[1];
-}
-
-mat2x3 __operator * (const mat2x3 m, const float b)
-{
-   //return mat2x3 (m[0] * b, m[1] * b);
-   __retVal[0] = m[0] * b;
-   __retVal[1] = m[1] * b;
-}
-
-mat2x4 __operator * (const float a, const mat2x4 n)
-{
-   //return mat2x4 (a * n[0], a * n[1]);
-   __retVal[0] = a * n[0];
-   __retVal[1] = a * n[1];
-}
-
-mat2x4 __operator * (const mat2x4 m, const float b)
-{
-   //return mat2x4 (m[0] * b, m[1] * b);
-   __retVal[0] = m[0] * b;
-   __retVal[1] = m[1] * b;
-}
-
-mat3x2 __operator * (const float a, const mat3x2 n)
-{
-   //return mat3x2 (a * n[0], a * n[1], a * n[2]);
-   __retVal[0] = a * n[0];
-   __retVal[1] = a * n[1];
-   __retVal[2] = a * n[2];
-}
-
-mat3x2 __operator * (const mat3x2 m, const float b)
-{
-   //return mat3x2 (m[0] * b, m[1] * b, m[2] * b);
-   __retVal[0] = m[0] * b;
-   __retVal[1] = m[1] * b;
-   __retVal[2] = m[2] * b;
-}
-
-mat3x4 __operator * (const float a, const mat3x4 n)
-{
-   //return mat3x4 (a * n[0], a * n[1], a * n[2]);
-   __retVal[0] = a * n[0];
-   __retVal[1] = a * n[1];
-   __retVal[2] = a * n[2];
-}
-
-mat3x4 __operator * (const mat3x4 m, const float b)
-{
-   //return mat3x4 (m[0] * b, m[1] * b, m[2] * b);
-   __retVal[0] = m[0] * b;
-   __retVal[1] = m[1] * b;
-   __retVal[2] = m[2] * b;
-}
-
-mat4x2 __operator * (const mat4x2 m, const float b)
-{
-   //return mat4x2 (m[0] * b, m[1] * b, m[2] * b, m[3] * b);
-   __retVal[0] = m[0] * b;
-   __retVal[1] = m[1] * b;
-   __retVal[2] = m[2] * b;
-   __retVal[3] = m[3] * b;
-}
-
-mat4x2 __operator * (const float a, const mat4x2 n)
-{
-   //return mat4x2 (a * n[0], a * n[1], a * n[2], a * n[3]);
-   __retVal[0] = a * n[0];
-   __retVal[1] = a * n[1];
-   __retVal[2] = a * n[2];
-   __retVal[3] = a * n[3];
-}
-
-mat4x3 __operator * (const mat4x3 m, const float b)
-{
-   //return mat4x3 (m[0] * b, m[1] * b, m[2] * b, m[3] * b);
-   __retVal[0] = m[0] * b;
-   __retVal[1] = m[1] * b;
-   __retVal[2] = m[2] * b;
-   __retVal[3] = m[3] * b;
-}
-
-mat4x3 __operator * (const float a, const mat4x3 n)
-{
-   //return mat4x3 (a * n[0], a * n[1], a * n[2], a * n[3]);
-   __retVal[0] = a * n[0];
-   __retVal[1] = a * n[1];
-   __retVal[2] = a * n[2];
-   __retVal[3] = a * n[3];
-}
-
-
-mat2x3 __operator / (const float a, const mat2x3 n)
-{
-   //return mat2x3 (a / n[0], a / n[1]);
-   const float inv = 1.0 / a;
-   __retVal[0] = inv * n[0];
-   __retVal[1] = inv * n[1];
-}
-
-mat2x3 __operator / (const mat2x3 m, const float b)
-{
-   //return mat2x3 (m[0] / b, m[1] / b);
-   const float inv = 1.0 / b;
-   __retVal[0] = m[0] * inv;
-   __retVal[1] = m[1] * inv;
-}
-
-mat2x4 __operator / (const float a, const mat2x4 n)
-{
-   //return mat2x4 (a / n[0], a / n[1]);
-   const float inv = 1.0 / a;
-   __retVal[0] = inv * n[0];
-   __retVal[1] = inv * n[1];
-}
-
-mat2x4 __operator / (const mat2x4 m, const float b)
-{
-   //return mat2x4 (m[0] / b, m[1] / b);
-   const float inv = 1.0 / b;
-   __retVal[0] = m[0] * inv;
-   __retVal[1] = m[1] * inv;
-}
-
-mat3x2 __operator / (const float a, const mat3x2 n)
-{
-   //return mat3x2 (a / n[0], a / n[1], a / n[2]);
-   const float inv = 1.0 / a;
-   __retVal[0] = inv * n[0];
-   __retVal[1] = inv * n[1];
-   __retVal[2] = inv * n[2];
-}
-
-mat3x2 __operator / (const mat3x2 m, const float b)
-{
-   //return mat3x2 (m[0] / b, m[1] / b, m[2] / b);
-   const float inv = 1.0 / b;
-   __retVal[0] = m[0] * inv;
-   __retVal[1] = m[1] * inv;
-   __retVal[2] = m[2] * inv;
-}
-
-mat3x4 __operator / (const float a, const mat3x4 n)
-{
-   //return mat3x4 (a / n[0], a / n[1], a / n[2]);
-   const float inv = 1.0 / a;
-   __retVal[0] = inv * n[0];
-   __retVal[1] = inv * n[1];
-   __retVal[2] = inv * n[2];
-}
-
-mat3x4 __operator / (const mat3x4 m, const float b)
-{
-   //return mat3x4 (m[0] / b, m[1] / b, m[2] / b);
-   const float inv = 1.0 / b;
-   __retVal[0] = m[0] * inv;
-   __retVal[1] = m[1] * inv;
-   __retVal[2] = m[2] * inv;
-}
-
-mat4x2 __operator / (const mat4x2 m, const float b)
-{
-   //return mat4x2 (m[0] / b, m[1] / b, m[2] / b, m[3] / b);
-   const float inv = 1.0 / b;
-   __retVal[0] = m[0] * inv;
-   __retVal[1] = m[1] * inv;
-   __retVal[2] = m[2] * inv;
-   __retVal[3] = m[3] * inv;
-}
-
-mat4x2 __operator / (const float a, const mat4x2 n)
-{
-   //return mat4x2 (a / n[0], a / n[1], a / n[2], a / n[3]);
-   const float inv = 1.0 / a;
-   __retVal[0] = inv * n[0];
-   __retVal[1] = inv * n[1];
-   __retVal[2] = inv * n[2];
-   __retVal[3] = inv * n[3];
-}
-
-mat4x3 __operator / (const mat4x3 m, const float b)
-{
-   //return mat4x3 (m[0] / b, m[1] / b, m[2] / b, m[3] / b);
-   const float inv = 1.0 / b;
-   __retVal[0] = m[0] * inv;
-   __retVal[1] = m[1] * inv;
-   __retVal[2] = m[2] * inv;
-   __retVal[3] = m[3] * inv;
-}
-
-mat4x3 __operator / (const float a, const mat4x3 n)
-{
-   //return mat4x3 (a / n[0], a / n[1], a / n[2], a / n[3]);
-   const float inv = 1.0 / a;
-   __retVal[0] = inv * n[0];
-   __retVal[1] = inv * n[1];
-   __retVal[2] = inv * n[2];
-   __retVal[3] = inv * n[3];
-}
-
-
-mat2x3 __operator - (const mat2x3 m) {
-    return mat2x3 (-m[0], -m[1]);
-}
-
-mat2x4 __operator - (const mat2x4 m) {
-    return mat2x4 (-m[0], -m[1]);
-}
-
-mat3x2 __operator - (const mat3x2 m) {
-    return mat3x2 (-m[0], -m[1], -m[2]);
-}
-
-mat3x4 __operator - (const mat3x4 m) {
-    return mat3x4 (-m[0], -m[1], -m[2]);
-}
-
-mat4x2 __operator - (const mat4x2 m) {
-    return mat4x2 (-m[0], -m[1], -m[2], -m[3]);
-}
-
-mat4x3 __operator - (const mat4x3 m) {
-    return mat4x3 (-m[0], -m[1], -m[2], -m[3]);
-}
-
-
-void __operator -- (inout mat2x3 m) {
-    --m[0];
-    --m[1];
-}
-
-void __operator -- (inout mat2x4 m) {
-    --m[0];
-    --m[1];
-}
-
-void __operator -- (inout mat3x2 m) {
-    --m[0];
-    --m[1];
-    --m[2];
-}
-
-void __operator -- (inout mat3x4 m) {
-    --m[0];
-    --m[1];
-    --m[2];
-}
-
-void __operator -- (inout mat4x2 m) {
-    --m[0];
-    --m[1];
-    --m[2];
-    --m[3];
-}
-
-void __operator -- (inout mat4x3 m) {
-    --m[0];
-    --m[1];
-    --m[2];
-    --m[3];
-}
-
-
-void __operator ++ (inout mat2x3 m) {
-    ++m[0];
-    ++m[1];
-}
-
-void __operator ++ (inout mat2x4 m) {
-    ++m[0];
-    ++m[1];
-}
-
-void __operator ++ (inout mat3x2 m) {
-    ++m[0];
-    ++m[1];
-    ++m[2];
-}
-
-void __operator ++ (inout mat3x4 m) {
-    ++m[0];
-    ++m[1];
-    ++m[2];
-}
-
-void __operator ++ (inout mat4x2 m) {
-    ++m[0];
-    ++m[1];
-    ++m[2];
-    ++m[3];
-}
-
-void __operator ++ (inout mat4x3 m) {
-    ++m[0];
-    ++m[1];
-    ++m[2];
-    ++m[3];
-}
-
diff --git a/mesalib/src/mesa/shader/slang/library/slang_builtin_120_common.gc b/mesalib/src/mesa/shader/slang/library/slang_builtin_120_common.gc
deleted file mode 100644
index c6264c3b4..000000000
--- a/mesalib/src/mesa/shader/slang/library/slang_builtin_120_common.gc
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.6
- *
- * Copyright (C) 2006  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-//
-// From Shader Spec, ver. 1.20, rev. 6
-//
-
-//
-// 8.5 Matrix Functions
-//
-
-mat2x3 matrixCompMult (mat2x3 m, mat2x3 n) {
-    return mat2x3 (m[0] * n[0], m[1] * n[1]);
-}
-
-mat2x4 matrixCompMult (mat2x4 m, mat2x4 n) {
-    return mat2x4 (m[0] * n[0], m[1] * n[1]);
-}
-
-mat3x2 matrixCompMult (mat3x2 m, mat3x2 n) {
-    return mat3x2 (m[0] * n[0], m[1] * n[1], m[2] * n[2]);
-}
-
-mat3x4 matrixCompMult (mat3x4 m, mat3x4 n) {
-    return mat3x4 (m[0] * n[0], m[1] * n[1], m[2] * n[2]);
-}
-
-mat4x2 matrixCompMult (mat4x2 m, mat4x2 n) {
-    return mat4x2 (m[0] * n[0], m[1] * n[1], m[2] * n[2], m[3] * n[3]);
-}
-
-mat4x3 matrixCompMult (mat4x3 m, mat4x3 n) {
-    return mat4x3 (m[0] * n[0], m[1] * n[1], m[2] * n[2], m[3] * n[3]);
-}
-
-mat2 outerProduct (vec2 c, vec2 r) {
-    return mat2 (
-        c.x * r.x, c.y * r.x,
-        c.x * r.y, c.y * r.y
-    );
-}
-
-mat3 outerProduct (vec3 c, vec3 r) {
-    return mat3 (
-        c.x * r.x, c.y * r.x, c.z * r.x,
-        c.x * r.y, c.y * r.y, c.z * r.y,
-        c.x * r.z, c.y * r.z, c.z * r.z
-    );
-}
-
-mat4 outerProduct (vec4 c, vec4 r) {
-    return mat4 (
-        c.x * r.x, c.y * r.x, c.z * r.x, c.w * r.x,
-        c.x * r.y, c.y * r.y, c.z * r.y, c.w * r.y,
-        c.x * r.z, c.y * r.z, c.z * r.z, c.w * r.z,
-        c.x * r.w, c.y * r.w, c.z * r.w, c.w * r.w
-    );
-}
-
-mat2x3 outerProduct (vec3 c, vec2 r) {
-    return mat2x3 (
-        c.x * r.x, c.y * r.x, c.z * r.x,
-        c.x * r.y, c.y * r.y, c.z * r.y
-    );
-}
-
-mat3x2 outerProduct (vec2 c, vec3 r) {
-    return mat3x2 (
-        c.x * r.x, c.y * r.x,
-        c.x * r.y, c.y * r.y,
-        c.x * r.z, c.y * r.z
-    );
-}
-
-mat2x4 outerProduct (vec4 c, vec2 r) {
-    return mat2x4 (
-        c.x * r.x, c.y * r.x, c.z * r.x, c.w * r.x,
-        c.x * r.y, c.y * r.y, c.z * r.y, c.w * r.y
-    );
-}
-
-mat4x2 outerProduct (vec2 c, vec4 r) {
-    return mat4x2 (
-        c.x * r.x, c.y * r.x,
-        c.x * r.y, c.y * r.y,
-        c.x * r.z, c.y * r.z,
-        c.x * r.w, c.y * r.w
-    );
-}
-
-mat3x4 outerProduct (vec4 c, vec3 r) {
-    return mat3x4 (
-        c.x * r.x, c.y * r.x, c.z * r.x, c.w * r.x,
-        c.x * r.y, c.y * r.y, c.z * r.y, c.w * r.y,
-        c.x * r.z, c.y * r.z, c.z * r.z, c.w * r.z
-    );
-}
-
-mat4x3 outerProduct (vec3 c, vec4 r) {
-    return mat4x3 (
-        c.x * r.x, c.y * r.x, c.z * r.x,
-        c.x * r.y, c.y * r.y, c.z * r.y,
-        c.x * r.z, c.y * r.z, c.z * r.z,
-        c.x * r.w, c.y * r.w, c.z * r.w
-    );
-}
-
-mat2 transpose (mat2 m) {
-    return mat2 (
-        m[0].x, m[1].x,
-        m[0].y, m[1].y
-    );
-}
-
-mat3 transpose (mat3 m) {
-    return mat3 (
-        m[0].x, m[1].x, m[2].x,
-        m[0].y, m[1].y, m[2].y,
-        m[0].z, m[1].z, m[2].z
-    );
-}
-
-mat4 transpose (mat4 m) {
-    return mat4 (
-        m[0].x, m[1].x, m[2].x, m[3].x,
-        m[0].y, m[1].y, m[2].y, m[3].y,
-        m[0].z, m[1].z, m[2].z, m[3].z,
-        m[0].w, m[1].w, m[2].w, m[3].w
-    );
-}
-
-mat2x3 transpose (mat3x2 m) {
-    return mat2x3 (
-        m[0].x, m[1].x, m[2].x,
-        m[0].y, m[1].y, m[2].y
-    );
-}
-
-mat3x2 transpose (mat2x3 m) {
-    return mat3x2 (
-        m[0].x, m[1].x,
-        m[0].y, m[1].y,
-        m[0].z, m[1].z
-    );
-}
-
-mat2x4 transpose (mat4x2 m) {
-    return mat2x4 (
-        m[0].x, m[1].x, m[2].x, m[3].x,
-        m[0].y, m[1].y, m[2].y, m[3].y
-    );
-}
-
-mat4x2 transpose (mat2x4 m) {
-    return mat4x2 (
-        m[0].x, m[1].x,
-        m[0].y, m[1].y,
-        m[0].z, m[1].z,
-        m[0].w, m[1].w
-    );
-}
-
-mat3x4 transpose (mat4x3 m) {
-    return mat3x4 (
-        m[0].x, m[1].x, m[2].x, m[3].x,
-        m[0].y, m[1].y, m[2].y, m[3].y,
-        m[0].z, m[1].z, m[2].z, m[3].z
-    );
-}
-
-mat4x3 transpose (mat3x4 m) {
-    return mat4x3 (
-        m[0].x, m[1].x, m[2].x,
-        m[0].y, m[1].y, m[2].y,
-        m[0].z, m[1].z, m[2].z,
-        m[0].w, m[1].w, m[2].w
-    );
-}
-
diff --git a/mesalib/src/mesa/shader/slang/library/slang_common_builtin.gc b/mesalib/src/mesa/shader/slang/library/slang_common_builtin.gc
deleted file mode 100644
index a25ca55bc..000000000
--- a/mesalib/src/mesa/shader/slang/library/slang_common_builtin.gc
+++ /dev/null
@@ -1,1893 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.3
- *
- * Copyright (C) 2006  Brian Paul   All Rights Reserved.
- * Copyright (C) 2008  VMware, Inc.  All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, 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.
- */
-
-//
-// From Shader Spec, ver. 1.10, rev. 59
-//
-
-// Note: the values assigned to these constants here aren't actually used.
-// They're set by the compiler according to the GL context limits.
-// See slang_simplify.c
-const int gl_MaxLights = 8;
-const int gl_MaxClipPlanes = 6;
-const int gl_MaxTextureUnits = 8;
-const int gl_MaxTextureCoords = 8;
-const int gl_MaxVertexAttribs = 16;
-const int gl_MaxVertexUniformComponents = 512;
-const int gl_MaxVaryingFloats = 32;
-const int gl_MaxVertexTextureImageUnits = 0;
-const int gl_MaxCombinedTextureImageUnits = 2;
-const int gl_MaxTextureImageUnits = 2;
-const int gl_MaxFragmentUniformComponents = 64;
-const int gl_MaxDrawBuffers = 1;
-
-uniform mat4 gl_ModelViewMatrix;
-uniform mat4 gl_ProjectionMatrix;
-uniform mat4 gl_ModelViewProjectionMatrix;
-uniform mat4 gl_TextureMatrix[gl_MaxTextureCoords];
-
-uniform mat3 gl_NormalMatrix;
-
-uniform mat4 gl_ModelViewMatrixInverse;
-uniform mat4 gl_ProjectionMatrixInverse;
-uniform mat4 gl_ModelViewProjectionMatrixInverse;
-uniform mat4 gl_TextureMatrixInverse[gl_MaxTextureCoords];
-
-uniform mat4 gl_ModelViewMatrixTranspose;
-uniform mat4 gl_ProjectionMatrixTranspose;
-uniform mat4 gl_ModelViewProjectionMatrixTranspose;
-uniform mat4 gl_TextureMatrixTranspose[gl_MaxTextureCoords];
-
-uniform mat4 gl_ModelViewMatrixInverseTranspose;
-uniform mat4 gl_ProjectionMatrixInverseTranspose;
-uniform mat4 gl_ModelViewProjectionMatrixInverseTranspose;
-uniform mat4 gl_TextureMatrixInverseTranspose[gl_MaxTextureCoords];
-
-uniform float gl_NormalScale;
-
-struct gl_DepthRangeParameters {
-    float near;
-    float far;
-    float diff;
-};
-
-uniform gl_DepthRangeParameters gl_DepthRange;
-
-uniform vec4 gl_ClipPlane[gl_MaxClipPlanes];
-
-struct gl_PointParameters {
-    float size;
-    float sizeMin;
-    float sizeMax;
-    float fadeThresholdSize;
-    float distanceConstantAttenuation;
-    float distanceLinearAttenuation;
-    float distanceQuadraticAttenuation;
-};
-
-uniform gl_PointParameters gl_Point;
-
-struct gl_MaterialParameters {
-    vec4 emission;
-    vec4 ambient;
-    vec4 diffuse;
-    vec4 specular;
-    float shininess;
-};
-
-uniform gl_MaterialParameters gl_FrontMaterial;
-uniform gl_MaterialParameters gl_BackMaterial;
-
-/* NOTE: the order of these fields is significant!
- * See the definition of the lighting state vars such as STATE_SPOT_DIRECTION.
- */
-struct gl_LightSourceParameters {
-    vec4 ambient;
-    vec4 diffuse;
-    vec4 specular;
-    vec4 position;
-    vec4 halfVector;
-    vec3 spotDirection;
-    float spotCosCutoff;
-
-    float constantAttenuation;
-    float linearAttenuation;
-    float quadraticAttenuation;
-    float spotExponent;
-
-    float spotCutoff;
-};
-
-uniform gl_LightSourceParameters gl_LightSource[gl_MaxLights];
-
-struct gl_LightModelParameters {
-    vec4 ambient;
-};
-
-uniform gl_LightModelParameters gl_LightModel;
-
-struct gl_LightModelProducts {
-    vec4 sceneColor;
-};
-
-uniform gl_LightModelProducts gl_FrontLightModelProduct;
-uniform gl_LightModelProducts gl_BackLightModelProduct;
-
-struct gl_LightProducts {
-    vec4 ambient;
-    vec4 diffuse;
-    vec4 specular;
-};
-
-uniform gl_LightProducts gl_FrontLightProduct[gl_MaxLights];
-uniform gl_LightProducts gl_BackLightProduct[gl_MaxLights];
-
-uniform vec4 gl_TextureEnvColor[gl_MaxTextureImageUnits];
-uniform vec4 gl_EyePlaneS[gl_MaxTextureCoords];
-uniform vec4 gl_EyePlaneT[gl_MaxTextureCoords];
-uniform vec4 gl_EyePlaneR[gl_MaxTextureCoords];
-uniform vec4 gl_EyePlaneQ[gl_MaxTextureCoords];
-uniform vec4 gl_ObjectPlaneS[gl_MaxTextureCoords];
-uniform vec4 gl_ObjectPlaneT[gl_MaxTextureCoords];
-uniform vec4 gl_ObjectPlaneR[gl_MaxTextureCoords];
-uniform vec4 gl_ObjectPlaneQ[gl_MaxTextureCoords];
-
-struct gl_FogParameters {
-    vec4 color;
-    float density;
-    float start;
-    float end;
-    float scale;
-};
-
-uniform gl_FogParameters gl_Fog;
-
-
-
-
-
-//
-// 8.1 Angle and Trigonometry Functions
-//
-
-//// radians
-
-float radians(const float deg)
-{
-   const float c = 3.1415926 / 180.0;
-   __asm vec4_multiply __retVal, deg, c;
-}
-
-vec2 radians(const vec2 deg)
-{
-   const float c = 3.1415926 / 180.0;
-   __asm vec4_multiply __retVal.xy, deg.xy, c.xx;
-}
-
-vec3 radians(const vec3 deg)
-{
-   const float c = 3.1415926 / 180.0;
-   __asm vec4_multiply __retVal.xyz, deg.xyz, c.xxx;
-}
-
-vec4 radians(const vec4 deg)
-{
-   const float c = 3.1415926 / 180.0;
-   __asm vec4_multiply __retVal, deg, c.xxxx;
-}
-
-
-//// degrees
-
-float degrees(const float rad)
-{
-   const float c = 180.0 / 3.1415926;
-   __asm vec4_multiply __retVal, rad, c;
-}
-
-vec2 degrees(const vec2 rad)
-{
-   const float c = 180.0 / 3.1415926;
-   __asm vec4_multiply __retVal.xy, rad.xy, c.xx;
-}
-
-vec3 degrees(const vec3 rad)
-{
-   const float c = 180.0 / 3.1415926;
-   __asm vec4_multiply __retVal.xyz, rad.xyz, c.xxx;
-}
-
-vec4 degrees(const vec4 rad)
-{
-   const float c = 180.0 / 3.1415926;
-   __asm vec4_multiply __retVal, rad, c.xxxx;
-}
-
-
-//// sin
-
-float sin(const float radians)
-{
-   __asm float_sine __retVal, radians;
-}
-
-vec2 sin(const vec2 radians)
-{
-   __asm float_sine __retVal.x, radians.x;
-   __asm float_sine __retVal.y, radians.y;
-}
-
-vec3 sin(const vec3 radians)
-{
-   __asm float_sine __retVal.x, radians.x;
-   __asm float_sine __retVal.y, radians.y;
-   __asm float_sine __retVal.z, radians.z;
-}
-
-vec4 sin(const vec4 radians)
-{
-   __asm float_sine __retVal.x, radians.x;
-   __asm float_sine __retVal.y, radians.y;
-   __asm float_sine __retVal.z, radians.z;
-   __asm float_sine __retVal.w, radians.w;
-}
-
-
-//// cos
-
-float cos(const float radians)
-{
-   __asm float_cosine __retVal, radians;
-}
-
-vec2 cos(const vec2 radians)
-{
-   __asm float_cosine __retVal.x, radians.x;
-   __asm float_cosine __retVal.y, radians.y;
-}
-
-vec3 cos(const vec3 radians)
-{
-   __asm float_cosine __retVal.x, radians.x;
-   __asm float_cosine __retVal.y, radians.y;
-   __asm float_cosine __retVal.z, radians.z;
-}
-
-vec4 cos(const vec4 radians)
-{
-   __asm float_cosine __retVal.x, radians.x;
-   __asm float_cosine __retVal.y, radians.y;
-   __asm float_cosine __retVal.z, radians.z;
-   __asm float_cosine __retVal.w, radians.w;
-}
-
-
-
-//// tan
-
-float tan(const float angle)
-{
-   const float s = sin(angle);
-   const float c = cos(angle);
-   return s / c;
-}
-
-vec2 tan(const vec2 angle)
-{
-   const vec2 s = sin(angle);
-   const vec2 c = cos(angle);
-   return s / c;
-}
-
-vec3 tan(const vec3 angle)
-{
-   const vec3 s = sin(angle);
-   const vec3 c = cos(angle);
-   return s / c;
-}
-
-vec4 tan(const vec4 angle)
-{
-   const vec4 s = sin(angle);
-   const vec4 c = cos(angle);
-   return s / c;
-}
-
-
-
-float asin(const float x)
-{
-   const float a0 = 1.5707288;  // PI/2?
-   const float a1 = -0.2121144;
-   const float a2 = 0.0742610;
-   //const float a3 = -0.0187293;
-   const float halfPi = 3.1415926 * 0.5;
-   const float y = abs(x);
-   // three terms seem to be enough:
-   __retVal = (halfPi - sqrt(1.0 - y) * (a0 + y * (a1 + a2 * y))) * sign(x);
-   // otherwise, try four:
-   //__retVal = (halfPi - sqrt(1.0 - y) * (a0 + y * (a1 + y * (a2 + y * a3)))) * sign(x);
-}
-
-vec2 asin(const vec2 v)
-{
-   __retVal.x = asin(v.x);
-   __retVal.y = asin(v.y);
-}
-
-vec3 asin(const vec3 v)
-{
-   __retVal.x = asin(v.x);
-   __retVal.y = asin(v.y);
-   __retVal.z = asin(v.z);
-}
-
-vec4 asin(const vec4 v)
-{
-   __retVal.x = asin(v.x);
-   __retVal.y = asin(v.y);
-   __retVal.z = asin(v.z);
-   __retVal.w = asin(v.w);
-}
-
-float acos(const float x)
-{
-   const float halfPi = 3.1415926 * 0.5;
-   __retVal = halfPi - asin(x);
-}
-
-vec2 acos(const vec2 v)
-{
-   __retVal.x = acos(v.x);
-   __retVal.y = acos(v.y);
-}
-
-vec3 acos(const vec3 v)
-{
-   __retVal.x = acos(v.x);
-   __retVal.y = acos(v.y);
-   __retVal.z = acos(v.z);
-}
-
-vec4 acos(const vec4 v)
-{
-   __retVal.x = acos(v.x);
-   __retVal.y = acos(v.y);
-   __retVal.z = acos(v.z);
-   __retVal.w = acos(v.w);
-}
-
-float atan(const float x)
-{
-   __retVal = asin(x * inversesqrt(x * x + 1.0));
-}
-
-vec2 atan(const vec2 y_over_x)
-{
-   __retVal.x = atan(y_over_x.x);
-   __retVal.y = atan(y_over_x.y);
-}
-
-vec3 atan(const vec3 y_over_x)
-{
-   __retVal.x = atan(y_over_x.x);
-   __retVal.y = atan(y_over_x.y);
-   __retVal.z = atan(y_over_x.z);
-}
-
-vec4 atan(const vec4 y_over_x)
-{
-   __retVal.x = atan(y_over_x.x);
-   __retVal.y = atan(y_over_x.y);
-   __retVal.z = atan(y_over_x.z);
-   __retVal.w = atan(y_over_x.w);
-}
-
-float atan(const float y, const float x)
-{
-   float r;
-   if (abs(x) > 1.0e-4) {
-      r = atan(y / x);
-      if (x < 0.0) {
-         r = r + sign(y) * 3.141593;
-      }
-   }
-   else {
-      r = sign(y) * 1.5707965;  // pi/2
-   }
-   return r;
-}
-
-vec2 atan(const vec2 u, const vec2 v)
-{
-   __retVal.x = atan(u.x, v.x);
-   __retVal.y = atan(u.y, v.y);
-}
-
-vec3 atan(const vec3 u, const vec3 v)
-{
-   __retVal.x = atan(u.x, v.x);
-   __retVal.y = atan(u.y, v.y);
-   __retVal.z = atan(u.z, v.z);
-}
-
-vec4 atan(const vec4 u, const vec4 v)
-{
-   __retVal.x = atan(u.x, v.x);
-   __retVal.y = atan(u.y, v.y);
-   __retVal.z = atan(u.z, v.z);
-   __retVal.w = atan(u.w, v.w);
-}
-
-
-//
-// 8.2 Exponential Functions
-//
-
-//// pow
-
-float pow(const float a, const float b)
-{
-   __asm float_power __retVal, a, b;
-}
-
-vec2 pow(const vec2 a, const vec2 b)
-{
-   __asm float_power __retVal.x, a.x, b.x;
-   __asm float_power __retVal.y, a.y, b.y;
-}
-
-vec3 pow(const vec3 a, const vec3 b)
-{
-   __asm float_power __retVal.x, a.x, b.x;
-   __asm float_power __retVal.y, a.y, b.y;
-   __asm float_power __retVal.z, a.z, b.z;
-}
-
-vec4 pow(const vec4 a, const vec4 b)
-{
-   __asm float_power __retVal.x, a.x, b.x;
-   __asm float_power __retVal.y, a.y, b.y;
-   __asm float_power __retVal.z, a.z, b.z;
-   __asm float_power __retVal.w, a.w, b.w;
-}
-
-
-//// exp
-
-float exp(const float a)
-{
-   // NOTE: log2(e) = 1.44269502
-   float t = a * 1.44269502;
-   __asm float_exp2 __retVal, t;
-}
-
-vec2 exp(const vec2 a)
-{
-   vec2 t = a * 1.44269502;
-   __asm float_exp2 __retVal.x, t.x;
-   __asm float_exp2 __retVal.y, t.y;
-}
-
-vec3 exp(const vec3 a)
-{
-   vec3 t = a * 1.44269502;
-   __asm float_exp2 __retVal.x, t.x;
-   __asm float_exp2 __retVal.y, t.y;
-   __asm float_exp2 __retVal.z, t.z;
-}
-
-vec4 exp(const vec4 a)
-{
-   vec4 t = a * 1.44269502;
-   __asm float_exp2 __retVal.x, t.x;
-   __asm float_exp2 __retVal.y, t.y;
-   __asm float_exp2 __retVal.z, t.z;
-   __asm float_exp2 __retVal.w, t.w;
-}
-
-
-
-//// log2
-
-float log2(const float x)
-{
-   __asm float_log2 __retVal, x;
-}
-
-vec2 log2(const vec2 v)
-{
-   __asm float_log2 __retVal.x, v.x;
-   __asm float_log2 __retVal.y, v.y;
-}
-
-vec3 log2(const vec3 v)
-{
-   __asm float_log2 __retVal.x, v.x;
-   __asm float_log2 __retVal.y, v.y;
-   __asm float_log2 __retVal.z, v.z;
-}
-
-vec4 log2(const vec4 v)
-{
-   __asm float_log2 __retVal.x, v.x;
-   __asm float_log2 __retVal.y, v.y;
-   __asm float_log2 __retVal.z, v.z;
-   __asm float_log2 __retVal.w, v.w;
-}
-
-
-//// log  (natural log)
-
-float log(const float x)
-{
-   // note:  logBaseB(x) = logBaseN(x) / logBaseN(B)
-   // compute log(x) = log2(x) / log2(e)
-   // c = 1.0 / log2(e) = 0.693147181
-   const float c = 0.693147181;
-   return log2(x) * c;
-}
-
-vec2 log(const vec2 v)
-{
-   const float c = 0.693147181;
-   return log2(v) * c;
-}
-
-vec3 log(const vec3 v)
-{
-   const float c = 0.693147181;
-   return log2(v) * c;
-}
-
-vec4 log(const vec4 v)
-{
-   const float c = 0.693147181;
-   return log2(v) * c;
-}
-
-
-//// exp2
-
-float exp2(const float a)
-{
-   __asm float_exp2 __retVal, a;
-}
-
-vec2 exp2(const vec2 a)
-{
-   __asm float_exp2 __retVal.x, a.x;
-   __asm float_exp2 __retVal.y, a.y;
-}
-
-vec3 exp2(const vec3 a)
-{
-   __asm float_exp2 __retVal.x, a.x;
-   __asm float_exp2 __retVal.y, a.y;
-   __asm float_exp2 __retVal.z, a.z;
-}
-
-vec4 exp2(const vec4 a)
-{
-   __asm float_exp2 __retVal.x, a.x;
-   __asm float_exp2 __retVal.y, a.y;
-   __asm float_exp2 __retVal.z, a.z;
-   __asm float_exp2 __retVal.w, a.w;
-}
-
-
-//// sqrt
-
-float sqrt(const float x)
-{
-   const float nx = -x;
-   float r;
-   __asm float_rsq r, x;
-   __asm float_rcp r, r;
-   __asm vec4_cmp __retVal, nx, r, 0.0;
-}
-
-vec2 sqrt(const vec2 x)
-{
-   const vec2 nx = -x, zero = vec2(0.0);
-   vec2 r;
-   __asm float_rsq r.x, x.x;
-   __asm float_rsq r.y, x.y;
-   __asm float_rcp r.x, r.x;
-   __asm float_rcp r.y, r.y;
-   __asm vec4_cmp __retVal, nx, r, zero;
-}
-
-vec3 sqrt(const vec3 x)
-{
-   const vec3 nx = -x, zero = vec3(0.0);
-   vec3 r;
-   __asm float_rsq r.x, x.x;
-   __asm float_rsq r.y, x.y;
-   __asm float_rsq r.z, x.z;
-   __asm float_rcp r.x, r.x;
-   __asm float_rcp r.y, r.y;
-   __asm float_rcp r.z, r.z;
-   __asm vec4_cmp __retVal, nx, r, zero;
-}
-
-vec4 sqrt(const vec4 x)
-{
-   const vec4 nx = -x, zero = vec4(0.0);
-   vec4 r;
-   __asm float_rsq r.x, x.x;
-   __asm float_rsq r.y, x.y;
-   __asm float_rsq r.z, x.z;
-   __asm float_rsq r.w, x.w;
-   __asm float_rcp r.x, r.x;
-   __asm float_rcp r.y, r.y;
-   __asm float_rcp r.z, r.z;
-   __asm float_rcp r.w, r.w;
-   __asm vec4_cmp __retVal, nx, r, zero;
-}
-
-
-//// inversesqrt
-
-float inversesqrt(const float x)
-{
-   __asm float_rsq __retVal.x, x;
-}
-
-vec2 inversesqrt(const vec2 v)
-{
-   __asm float_rsq __retVal.x, v.x;
-   __asm float_rsq __retVal.y, v.y;
-}
-
-vec3 inversesqrt(const vec3 v)
-{
-   __asm float_rsq __retVal.x, v.x;
-   __asm float_rsq __retVal.y, v.y;
-   __asm float_rsq __retVal.z, v.z;
-}
-
-vec4 inversesqrt(const vec4 v)
-{
-   __asm float_rsq __retVal.x, v.x;
-   __asm float_rsq __retVal.y, v.y;
-   __asm float_rsq __retVal.z, v.z;
-   __asm float_rsq __retVal.w, v.w;
-}
-
-
-//// normalize
-
-float normalize(const float x)
-{
-   __retVal = 1.0;
-}
-
-vec2 normalize(const vec2 v)
-{
-   const float s = inversesqrt(dot(v, v));
-   __asm vec4_multiply __retVal.xy, v, s;
-}
-
-vec3 normalize(const vec3 v)
-{
-//   const float s = inversesqrt(dot(v, v));
-//   __retVal = v * s;
-// XXX note, we _could_ use __retVal.w instead of tmp and save a
-// register, but that's actually a compilation error because v is a vec3
-// and the .w suffix is illegal.  Oh well.
-   float tmp;
-   __asm vec3_dot tmp, v, v;
-   __asm float_rsq tmp, tmp;
-   __asm vec4_multiply __retVal.xyz, v, tmp;
-}
-
-vec4 normalize(const vec4 v)
-{
-   float tmp;
-   __asm vec4_dot tmp, v, v;
-   __asm float_rsq tmp, tmp;
-   __asm vec4_multiply __retVal.xyz, v, tmp;
-}
-
-
-
-//
-// 8.3 Common Functions
-//
-
-
-//// abs
-
-float abs(const float a)
-{
-   __asm vec4_abs __retVal, a;
-}
-
-vec2 abs(const vec2 a)
-{
-   __asm vec4_abs __retVal.xy, a;
-}
-
-vec3 abs(const vec3 a)
-{
-   __asm vec4_abs __retVal.xyz, a;
-}
-
-vec4 abs(const vec4 a)
-{
-   __asm vec4_abs __retVal, a;
-}
-
-
-//// sign
-
-float sign(const float x)
-{
-   float p, n;
-   __asm vec4_sgt p, x, 0.0;            // p = (x > 0)
-   __asm vec4_sgt n, 0.0, x;            // n = (x < 0)
-   __asm vec4_subtract __retVal, p, n;  // sign = p - n
-}
-
-vec2 sign(const vec2 v)
-{
-   vec2 p, n;
-   __asm vec4_sgt p.xy, v, 0.0;
-   __asm vec4_sgt n.xy, 0.0, v;
-   __asm vec4_subtract __retVal.xy, p, n;
-}
-
-vec3 sign(const vec3 v)
-{
-   vec3 p, n;
-   __asm vec4_sgt p.xyz, v, 0.0;
-   __asm vec4_sgt n.xyz, 0.0, v;
-   __asm vec4_subtract __retVal.xyz, p, n;
-}
-
-vec4 sign(const vec4 v)
-{
-   vec4 p, n;
-   __asm vec4_sgt p, v, 0.0;
-   __asm vec4_sgt n, 0.0, v;
-   __asm vec4_subtract __retVal, p, n;
-}
-
-
-//// floor
-
-float floor(const float a)
-{
-   __asm vec4_floor __retVal, a;
-}
-
-vec2 floor(const vec2 a)
-{
-   __asm vec4_floor __retVal.xy, a;
-}
-
-vec3 floor(const vec3 a)
-{
-   __asm vec4_floor __retVal.xyz, a;
-}
-
-vec4 floor(const vec4 a)
-{
-   __asm vec4_floor __retVal, a;
-}
-
-
-//// ceil
-
-float ceil(const float a)
-{
-   // XXX this could be improved
-   float b = -a;
-   __asm vec4_floor b, b;
-   __retVal = -b;
-}
-
-vec2 ceil(const vec2 a)
-{
-   vec2 b = -a;
-   __asm vec4_floor b, b;
-   __retVal.xy = -b;
-}
-
-vec3 ceil(const vec3 a)
-{
-   vec3 b = -a;
-   __asm vec4_floor b, b;
-   __retVal.xyz = -b;
-}
-
-vec4 ceil(const vec4 a)
-{
-   vec4 b = -a;
-   __asm vec4_floor b, b;
-   __retVal = -b;
-}
-
-
-//// fract
-
-float fract(const float a)
-{
-   __asm vec4_frac __retVal, a;
-}
-
-vec2 fract(const vec2 a)
-{
-   __asm vec4_frac __retVal.xy, a;
-}
-
-vec3 fract(const vec3 a)
-{
-   __asm vec4_frac __retVal.xyz, a;
-}
-
-vec4 fract(const vec4 a)
-{
-   __asm vec4_frac __retVal, a;
-}
-
-
-//// mod  (very untested!)
-
-float mod(const float a, const float b)
-{
-    float oneOverB;
-    __asm float_rcp oneOverB, b;
-    __retVal = a - b * floor(a * oneOverB);
-}
-
-vec2 mod(const vec2 a, const float b)
-{
-    float oneOverB;
-    __asm float_rcp oneOverB, b;
-    __retVal.xy = a - b * floor(a * oneOverB);
-}
-
-vec3 mod(const vec3 a, const float b)
-{
-    float oneOverB;
-    __asm float_rcp oneOverB, b;
-    __retVal.xyz = a - b * floor(a * oneOverB);
-}
-
-vec4 mod(const vec4 a, const float b)
-{
-    float oneOverB;
-    __asm float_rcp oneOverB, b;
-    __retVal = a - b * floor(a * oneOverB);
-}
-
-vec2 mod(const vec2 a, const vec2 b)
-{
-    vec2 oneOverB;
-    __asm float_rcp oneOverB.x, b.x;
-    __asm float_rcp oneOverB.y, b.y;
-    __retVal = a - b * floor(a * oneOverB);
-}
-
-vec3 mod(const vec3 a, const vec3 b)
-{
-    vec3 oneOverB;
-    __asm float_rcp oneOverB.x, b.x;
-    __asm float_rcp oneOverB.y, b.y;
-    __asm float_rcp oneOverB.z, b.z;
-    __retVal = a - b * floor(a * oneOverB);
-}
-
-vec4 mod(const vec4 a, const vec4 b)
-{
-    vec4 oneOverB;
-    __asm float_rcp oneOverB.x, b.x;
-    __asm float_rcp oneOverB.y, b.y;
-    __asm float_rcp oneOverB.z, b.z;
-    __asm float_rcp oneOverB.w, b.w;
-    __retVal = a - b * floor(a * oneOverB);
-}
-
-
-//// min
-
-float min(const float a, const float b)
-{
-   __asm vec4_min __retVal, a, b;
-}
-
-vec2 min(const vec2 a, const vec2 b)
-{
-   __asm vec4_min __retVal.xy, a.xy, b.xy;
-}
-
-vec3 min(const vec3 a, const vec3 b)
-{
-   __asm vec4_min __retVal.xyz, a.xyz, b.xyz;
-}
-
-vec4 min(const vec4 a, const vec4 b)
-{
-   __asm vec4_min __retVal, a, b;
-}
-
-vec2 min(const vec2 a, const float b)
-{
-   __asm vec4_min __retVal, a.xy, b;
-}
-
-vec3 min(const vec3 a, const float b)
-{
-   __asm vec4_min __retVal, a.xyz, b;
-}
-
-vec4 min(const vec4 a, const float b)
-{
-   __asm vec4_min __retVal, a, b;
-}
-
-
-//// max
-
-float max(const float a, const float b)
-{
-   __asm vec4_max __retVal, a, b;
-}
-
-vec2 max(const vec2 a, const vec2 b)
-{
-   __asm vec4_max __retVal.xy, a.xy, b.xy;
-}
-
-vec3 max(const vec3 a, const vec3 b)
-{
-   __asm vec4_max __retVal.xyz, a.xyz, b.xyz;
-}
-
-vec4 max(const vec4 a, const vec4 b)
-{
-   __asm vec4_max __retVal, a, b;
-}
-
-vec2 max(const vec2 a, const float b)
-{
-   __asm vec4_max __retVal, a.xy, b;
-}
-
-vec3 max(const vec3 a, const float b)
-{
-   __asm vec4_max __retVal, a.xyz, b;
-}
-
-vec4 max(const vec4 a, const float b)
-{
-   __asm vec4_max __retVal, a, b;
-}
-
-
-//// clamp
-
-float clamp(const float val, const float minVal, const float maxVal)
-{
-   __asm vec4_clamp __retVal, val, minVal, maxVal;
-}
-
-vec2 clamp(const vec2 val, const float minVal, const float maxVal)
-{
-   __asm vec4_clamp __retVal, val, minVal, maxVal;
-}
-
-vec3 clamp(const vec3 val, const float minVal, const float maxVal)
-{
-   __asm vec4_clamp __retVal, val, minVal, maxVal;
-}
-
-vec4 clamp(const vec4 val, const float minVal, const float maxVal)
-{
-   __asm vec4_clamp __retVal, val, minVal, maxVal;
-}
-
-vec2 clamp(const vec2 val, const vec2 minVal, const vec2 maxVal)
-{
-   __asm vec4_clamp __retVal, val, minVal, maxVal;
-}
-
-vec3 clamp(const vec3 val, const vec3 minVal, const vec3 maxVal)
-{
-   __asm vec4_clamp __retVal, val, minVal, maxVal;
-}
-
-vec4 clamp(const vec4 val, const vec4 minVal, const vec4 maxVal)
-{
-   __asm vec4_clamp __retVal, val, minVal, maxVal;
-}
-
-
-//// mix
-
-float mix(const float x, const float y, const float a)
-{
-   __asm vec4_lrp __retVal, a, y, x;
-}
-
-vec2 mix(const vec2 x, const vec2 y, const float a)
-{
-   __asm vec4_lrp __retVal, a, y, x;
-}
-
-vec3 mix(const vec3 x, const vec3 y, const float a)
-{
-   __asm vec4_lrp __retVal, a, y, x;
-}
-
-vec4 mix(const vec4 x, const vec4 y, const float a)
-{
-   __asm vec4_lrp __retVal, a, y, x;
-}
-
-vec2 mix(const vec2 x, const vec2 y, const vec2 a)
-{
-   __asm vec4_lrp __retVal, a, y, x;
-}
-
-vec3 mix(const vec3 x, const vec3 y, const vec3 a)
-{
-   __asm vec4_lrp __retVal, a, y, x;
-}
-
-vec4 mix(const vec4 x, const vec4 y, const vec4 a)
-{
-   __asm vec4_lrp __retVal, a, y, x;
-}
-
-
-//// step
-
-float step(const float edge, const float x)
-{
-   __asm vec4_sge __retVal, x, edge;
-}
-
-vec2 step(const vec2 edge, const vec2 x)
-{
-   __asm vec4_sge __retVal.xy, x, edge;
-}
-
-vec3 step(const vec3 edge, const vec3 x)
-{
-   __asm vec4_sge __retVal.xyz, x, edge;
-}
-
-vec4 step(const vec4 edge, const vec4 x)
-{
-   __asm vec4_sge __retVal, x, edge;
-}
-
-vec2 step(const float edge, const vec2 v)
-{
-   __asm vec4_sge __retVal.xy, v, edge;
-}
-
-vec3 step(const float edge, const vec3 v)
-{
-   __asm vec4_sge __retVal.xyz, v, edge;
-}
-
-vec4 step(const float edge, const vec4 v)
-{
-   __asm vec4_sge __retVal, v, edge;
-}
-
-
-//// smoothstep
-
-float smoothstep(const float edge0, const float edge1, const float x)
-{
-    float t = clamp((x - edge0) / (edge1 - edge0), 0.0, 1.0);
-    return t * t * (3.0 - 2.0 * t);
-}
-
-vec2 smoothstep(const vec2 edge0, const vec2 edge1, const vec2 v)
-{
-   vec2 t = clamp((v - edge0) / (edge1 - edge0), 0.0, 1.0);
-   return t * t * (3.0 - 2.0 * t);
-}
-
-vec3 smoothstep(const vec3 edge0, const vec3 edge1, const vec3 v)
-{
-   vec3 t = clamp((v - edge0) / (edge1 - edge0), 0.0, 1.0);
-   return t * t * (3.0 - 2.0 * t);
-}
-
-vec4 smoothstep(const vec4 edge0, const vec4 edge1, const vec4 v)
-{
-   vec4 t = clamp((v - edge0) / (edge1 - edge0), 0.0, 1.0);
-   return t * t * (3.0 - 2.0 * t);
-}
-
-vec2 smoothstep(const float edge0, const float edge1, const vec2 v)
-{
-   vec2 t = clamp((v - edge0) / (edge1 - edge0), 0.0, 1.0);
-   return t * t * (3.0 - 2.0 * t);
-}
-
-vec3 smoothstep(const float edge0, const float edge1, const vec3 v)
-{
-   vec3 t = clamp((v - edge0) / (edge1 - edge0), 0.0, 1.0);
-   return t * t * (3.0 - 2.0 * t);
-}
-
-vec4 smoothstep(const float edge0, const float edge1, const vec4 v)
-{
-   vec4 t = clamp((v - edge0) / (edge1 - edge0), 0.0, 1.0);
-   return t * t * (3.0 - 2.0 * t);
-}
-
-
-
-//
-// 8.4 Geometric Functions
-//
-
-
-//// length
-
-float length(const float x)
-{
-   return abs(x);
-}
-
-float length(const vec2 v)
-{
-   float r;
-   const float p = dot(v, v);      // p = v.x * v.x + v.y * v.y
-   __asm float_rsq r, p;           // r = 1 / sqrt(p)
-   __asm float_rcp __retVal.x, r;  // retVal = 1 / r
-}
-
-float length(const vec3 v)
-{
-   float r;
-   const float p = dot(v, v);      // p = v.x * v.x + v.y * v.y + v.z * v.z
-   __asm float_rsq r, p;           // r = 1 / sqrt(p)
-   __asm float_rcp __retVal, r;    // retVal = 1 / r
-}
-
-float length(const vec4 v)
-{
-   float r;
-   const float p = dot(v, v);      // p = v.x * v.x + v.y * v.y + ...
-   __asm float_rsq r, p;           // r = 1 / sqrt(p)
-   __asm float_rcp __retVal, r;    // retVal = 1 / r
-}
-
-
-//// distance
-
-float distance(const float x, const float y)
-{
-   const float d = x - y;
-   __retVal = length(d);
-}
-
-float distance(const vec2 v, const vec2 u)
-{
-   const vec2 d2 = v - u;
-   __retVal = length(d2);
-}
-
-float distance(const vec3 v, const vec3 u)
-{
-   const vec3 d3 = v - u;
-   __retVal = length(d3);
-}
-
-float distance(const vec4 v, const vec4 u)
-{
-   const vec4 d4 = v - u;
-   __retVal = length(d4);
-}
-
-
-//// cross
-
-vec3 cross(const vec3 v, const vec3 u)
-{
-   __asm vec3_cross __retVal.xyz, v, u;
-}
-
-
-//// faceforward
-
-float faceforward(const float N, const float I, const float Nref)
-{
-    // this could probably be done better
-    const float d = dot(Nref, I);
-    float s;
-    __asm vec4_sgt s, 0.0, d;  // s = (0.0 > d) ? 1 : 0
-    return mix(-N, N, s);
-}
-
-vec2 faceforward(const vec2 N, const vec2 I, const vec2 Nref)
-{
-    // this could probably be done better
-    const float d = dot(Nref, I);
-    float s;
-    __asm vec4_sgt s, 0.0, d;  // s = (0.0 > d) ? 1 : 0
-    return mix(-N, N, s);
-}
-
-vec3 faceforward(const vec3 N, const vec3 I, const vec3 Nref)
-{
-    // this could probably be done better
-    const float d = dot(Nref, I);
-    float s;
-    __asm vec4_sgt s, 0.0, d;  // s = (0.0 > d) ? 1 : 0
-    return mix(-N, N, s);
-}
-
-vec4 faceforward(const vec4 N, const vec4 I, const vec4 Nref)
-{
-    // this could probably be done better
-    const float d = dot(Nref, I);
-    float s;
-    __asm vec4_sgt s, 0.0, d;  // s = (0.0 > d) ? 1 : 0
-    return mix(-N, N, s);
-}
-
-
-//// reflect
-
-float reflect(const float I, const float N)
-{
-   return I - 2.0 * dot(N, I) * N;
-}
-
-vec2 reflect(const vec2 I, const vec2 N)
-{
-   return I - 2.0 * dot(N, I) * N;
-}
-
-vec3 reflect(const vec3 I, const vec3 N)
-{
-   return I - 2.0 * dot(N, I) * N;
-}
-
-vec4 reflect(const vec4 I, const vec4 N)
-{
-   return I - 2.0 * dot(N, I) * N;
-}
-
-//// refract
-
-float refract(const float I, const float N, const float eta)
-{
-   float n_dot_i = dot(N, I);
-   float k = 1.0 - eta * eta * (1.0 - n_dot_i * n_dot_i);
-   float retval;
-   if (k < 0.0)
-      retval = 0.0;
-   else
-      retval = eta * I - (eta * n_dot_i + sqrt(k)) * N;
-   return retval;
-}
-
-vec2 refract(const vec2 I, const vec2 N, const float eta)
-{
-   float n_dot_i = dot(N, I);
-   float k = 1.0 - eta * eta * (1.0 - n_dot_i * n_dot_i);
-   vec2 retval;
-   if (k < 0.0)
-      retval = vec2(0.0);
-   else
-      retval = eta * I - (eta * n_dot_i + sqrt(k)) * N;
-   return retval;
-}
-
-vec3 refract(const vec3 I, const vec3 N, const float eta)
-{
-   float n_dot_i = dot(N, I);
-   float k = 1.0 - eta * eta * (1.0 - n_dot_i * n_dot_i);
-   vec3 retval;
-   if (k < 0.0)
-      retval = vec3(0.0);
-   else
-      retval = eta * I - (eta * n_dot_i + sqrt(k)) * N;
-   return retval;
-}
-
-vec4 refract(const vec4 I, const vec4 N, const float eta)
-{
-   float n_dot_i = dot(N, I);
-   float k = 1.0 - eta * eta * (1.0 - n_dot_i * n_dot_i);
-   vec4 retval;
-   if (k < 0.0)
-      retval = vec4(0.0);
-   else
-      retval = eta * I - (eta * n_dot_i + sqrt(k)) * N;
-   return retval;
-}
-
-
-
-
-//
-// 8.5 Matrix Functions
-//
-
-mat2 matrixCompMult (mat2 m, mat2 n) {
-    return mat2 (m[0] * n[0], m[1] * n[1]);
-}
-
-mat3 matrixCompMult (mat3 m, mat3 n) {
-    return mat3 (m[0] * n[0], m[1] * n[1], m[2] * n[2]);
-}
-
-mat4 matrixCompMult (mat4 m, mat4 n) {
-    return mat4 (m[0] * n[0], m[1] * n[1], m[2] * n[2], m[3] * n[3]);
-}
-
-
-
-
-//
-// 8.6 Vector Relational Functions
-//
-
-//// lessThan
-
-bvec2 lessThan(const vec2 u, const vec2 v)
-{
-   __asm vec4_slt __retVal.xy, u, v;
-}
-
-bvec3 lessThan(const vec3 u, const vec3 v)
-{
-   __asm vec4_slt __retVal.xyz, u, v;
-}
-
-bvec4 lessThan(const vec4 u, const vec4 v)
-{
-   __asm vec4_slt __retVal, u, v;
-}
-
-bvec2 lessThan(const ivec2 u, const ivec2 v)
-{
-   __asm vec4_slt __retVal.xy, u, v;
-}
-
-bvec3 lessThan(const ivec3 u, const ivec3 v)
-{
-   __asm vec4_slt __retVal.xyz, u, v;
-}
-
-bvec4 lessThan(const ivec4 u, const ivec4 v)
-{
-   __asm vec4_slt __retVal, u, v;
-}
-
-
-//// lessThanEqual
-
-bvec2 lessThanEqual(const vec2 u, const vec2 v)
-{
-   __asm vec4_sle __retVal.xy, u, v;
-}
-
-bvec3 lessThanEqual(const vec3 u, const vec3 v)
-{
-   __asm vec4_sle __retVal.xyz, u, v;
-}
-
-bvec4 lessThanEqual(const vec4 u, const vec4 v)
-{
-   __asm vec4_sle __retVal, u, v;
-}
-
-bvec2 lessThanEqual(const ivec2 u, const ivec2 v)
-{
-   __asm vec4_sle __retVal.xy, u, v;
-}
-
-bvec3 lessThanEqual(const ivec3 u, const ivec3 v)
-{
-   __asm vec4_sle __retVal.xyz, u, v;
-}
-
-bvec4 lessThanEqual(const ivec4 u, const ivec4 v)
-{
-   __asm vec4_sle __retVal, u, v;
-}
-
-
-//// greaterThan
-
-bvec2 greaterThan(const vec2 u, const vec2 v)
-{
-   __asm vec4_sgt __retVal.xy, u, v;
-}
-
-bvec3 greaterThan(const vec3 u, const vec3 v)
-{
-   __asm vec4_sgt __retVal.xyz, u, v;
-}
-
-bvec4 greaterThan(const vec4 u, const vec4 v)
-{
-   __asm vec4_sgt __retVal, u, v;
-}
-
-bvec2 greaterThan(const ivec2 u, const ivec2 v)
-{
-   __asm vec4_sgt __retVal.xy, u.xy, v.xy;
-}
-
-bvec3 greaterThan(const ivec3 u, const ivec3 v)
-{
-   __asm vec4_sgt __retVal.xyz, u, v;
-}
-
-bvec4 greaterThan(const ivec4 u, const ivec4 v)
-{
-   __asm vec4_sgt __retVal, u, v;
-}
-
-
-//// greaterThanEqual
-
-bvec2 greaterThanEqual(const vec2 u, const vec2 v)
-{
-   __asm vec4_sge __retVal.xy, u, v;
-}
-
-bvec3 greaterThanEqual(const vec3 u, const vec3 v)
-{
-   __asm vec4_sge __retVal.xyz, u, v;
-}
-
-bvec4 greaterThanEqual(const vec4 u, const vec4 v)
-{
-   __asm vec4_sge __retVal, u, v;
-}
-
-bvec2 greaterThanEqual(const ivec2 u, const ivec2 v)
-{
-   __asm vec4_sge __retVal.xy, u, v;
-}
-
-bvec3 greaterThanEqual(const ivec3 u, const ivec3 v)
-{
-   __asm vec4_sge __retVal.xyz, u, v;
-}
-
-bvec4 greaterThanEqual(const ivec4 u, const ivec4 v)
-{
-   __asm vec4_sge __retVal, u, v;
-}
-
-
-//// equal
-
-bvec2 equal(const vec2 u, const vec2 v)
-{
-   __asm vec4_seq __retVal.xy, u, v;
-}
-
-bvec3 equal(const vec3 u, const vec3 v)
-{
-   __asm vec4_seq __retVal.xyz, u, v;
-}
-
-bvec4 equal(const vec4 u, const vec4 v)
-{
-   __asm vec4_seq __retVal, u, v;
-}
-
-bvec2 equal(const ivec2 u, const ivec2 v)
-{
-   __asm vec4_seq __retVal.xy, u, v;
-}
-
-bvec3 equal(const ivec3 u, const ivec3 v)
-{
-   __asm vec4_seq __retVal.xyz, u, v;
-}
-
-bvec4 equal(const ivec4 u, const ivec4 v)
-{
-   __asm vec4_seq __retVal, u, v;
-}
-
-bvec2 equal(const bvec2 u, const bvec2 v)
-{
-   __asm vec4_seq __retVal.xy, u, v;
-}
-
-bvec3 equal(const bvec3 u, const bvec3 v)
-{
-   __asm vec4_seq __retVal.xyz, u, v;
-}
-
-bvec4 equal(const bvec4 u, const bvec4 v)
-{
-   __asm vec4_seq __retVal, u, v;
-}
-
-
-
-
-//// notEqual
-
-bvec2 notEqual(const vec2 u, const vec2 v)
-{
-   __asm vec4_sne __retVal.xy, u, v;
-}
-
-bvec3 notEqual(const vec3 u, const vec3 v)
-{
-   __asm vec4_sne __retVal.xyz, u, v;
-}
-
-bvec4 notEqual(const vec4 u, const vec4 v)
-{
-   __asm vec4_sne __retVal, u, v;
-}
-
-bvec2 notEqual(const ivec2 u, const ivec2 v)
-{
-   __asm vec4_sne __retVal.xy, u, v;
-}
-
-bvec3 notEqual(const ivec3 u, const ivec3 v)
-{
-   __asm vec4_sne __retVal.xyz, u, v;
-}
-
-bvec4 notEqual(const ivec4 u, const ivec4 v)
-{
-   __asm vec4_sne __retVal, u, v;
-}
-
-bvec2 notEqual(const bvec2 u, const bvec2 v)
-{
-   __asm vec4_sne __retVal.xy, u, v;
-}
-
-bvec3 notEqual(const bvec3 u, const bvec3 v)
-{
-   __asm vec4_sne __retVal.xyz, u, v;
-}
-
-bvec4 notEqual(const bvec4 u, const bvec4 v)
-{
-   __asm vec4_sne __retVal, u, v;
-}
-
-
-
-//// any
-
-bool any(const bvec2 v)
-{
-   float sum;
-   __asm vec4_add sum.x, v.x, v.y;
-   __asm vec4_sne __retVal.x, sum.x, 0.0;
-}
-
-bool any(const bvec3 v)
-{
-   float sum;
-   __asm vec4_add sum.x, v.x, v.y;
-   __asm vec4_add sum.x, sum.x, v.z;
-   __asm vec4_sne __retVal.x, sum.x, 0.0;
-}
-
-bool any(const bvec4 v)
-{
-   float sum;
-   __asm vec4_add sum.x, v.x, v.y;
-   __asm vec4_add sum.x, sum.x, v.z;
-   __asm vec4_add sum.x, sum.x, v.w;
-   __asm vec4_sne __retVal.x, sum.x, 0.0;
-}
-
-
-//// all
-
-bool all (const bvec2 v)
-{
-   float prod;
-   __asm vec4_multiply prod, v.x, v.y;
-   __asm vec4_sne __retVal, prod, 0.0;
-}
-
-bool all (const bvec3 v)
-{
-   float prod;
-   __asm vec4_multiply prod, v.x, v.y;
-   __asm vec4_multiply prod, prod, v.z;
-   __asm vec4_sne __retVal, prod, 0.0;
-}
-
-bool all (const bvec4 v)
-{
-   float prod;
-   __asm vec4_multiply prod, v.x, v.y;
-   __asm vec4_multiply prod, prod, v.z;
-   __asm vec4_multiply prod, prod, v.w;
-   __asm vec4_sne __retVal, prod, 0.0;
-}
-
-
-
-//// not
-
-bvec2 not (const bvec2 v)
-{
-   __asm vec4_seq __retVal.xy, v, 0.0;
-}
-
-bvec3 not (const bvec3 v)
-{
-   __asm vec4_seq __retVal.xyz, v, 0.0;
-}
-
-bvec4 not (const bvec4 v)
-{
-   __asm vec4_seq __retVal, v, 0.0;
-}
-
-
-
-//// Texture Lookup Functions  (for both fragment and vertex shaders)
-
-vec4 texture1D(const sampler1D sampler, const float coord)
-{
-   __asm vec4_tex_1d __retVal, sampler, coord;
-}
-
-vec4 texture1DProj(const sampler1D sampler, const vec2 coord)
-{
-   // need to swizzle .y into .w
-   __asm vec4_tex_1d_proj __retVal, sampler, coord.xyyy;
-}
-
-vec4 texture1DProj(const sampler1D sampler, const vec4 coord)
-{
-   __asm vec4_tex_1d_proj __retVal, sampler, coord;
-}
-
-
-vec4 texture2D(const sampler2D sampler, const vec2 coord)
-{
-   __asm vec4_tex_2d __retVal, sampler, coord;
-}
-
-vec4 texture2DProj(const sampler2D sampler, const vec3 coord)
-{
-   // need to swizzle 'z' into 'w'.
-   __asm vec4_tex_2d_proj __retVal, sampler, coord.xyzz;
-}
-
-vec4 texture2DProj(const sampler2D sampler, const vec4 coord)
-{
-   __asm vec4_tex_2d_proj __retVal, sampler, coord;
-}
-
-
-vec4 texture3D(const sampler3D sampler, const vec3 coord)
-{
-   __asm vec4_tex_3d __retVal, sampler, coord;
-}
-
-vec4 texture3DProj(const sampler3D sampler, const vec4 coord)
-{
-   __asm vec4_tex_3d_proj __retVal, sampler, coord;
-}
-
-
-vec4 textureCube(const samplerCube sampler, const vec3 coord)
-{
-   __asm vec4_tex_cube __retVal, sampler, coord;
-}
-
-
-
-vec4 shadow1D(const sampler1DShadow sampler, const vec3 coord)
-{
-   __asm vec4_tex_1d_shadow __retVal, sampler, coord;
-}
-
-vec4 shadow1DProj(const sampler1DShadow sampler, const vec4 coord)
-{
-   // .s and .p will be divided by .q
-   __asm vec4_tex_1d_proj_shadow __retVal, sampler, coord;
-}
-
-vec4 shadow2D(const sampler2DShadow sampler, const vec3 coord)
-{
-   __asm vec4_tex_2d_shadow __retVal, sampler, coord;
-}
-
-vec4 shadow2DProj(const sampler2DShadow sampler, const vec4 coord)
-{
-   // .s, .t and .p will be divided by .q
-   __asm vec4_tex_2d_proj_shadow __retVal, sampler, coord;
-}
-
-
-//// GL_ARB_texture_rectangle:
-vec4 texture2DRect(const sampler2DRect sampler, const vec2 coord)
-{
-   __asm vec4_tex_rect __retVal, sampler, coord;
-}
-
-vec4 texture2DRectProj(const sampler2DRect sampler, const vec3 coord)
-{
-   // need to swizzle .y into .w
-   __asm vec4_tex_rect_proj __retVal, sampler, coord.xyzz;
-}
-
-vec4 texture2DRectProj(const sampler2DRect sampler, const vec4 coord)
-{
-   __asm vec4_tex_rect_proj __retVal, sampler, ccoord;
-}
-
-vec4 shadow2DRect(const sampler2DRectShadow sampler, const vec3 coord)
-{
-   __asm vec4_tex_rect_shadow __retVal, sampler, coord;
-}
-
-vec4 shadow2DRectProj(const sampler2DRectShadow sampler, const vec4 coord)
-{
-   __asm vec4_tex_rect_proj_shadow __retVal, sampler, coord;
-}
-
-
-
-//// GL_EXT_texture_array
-vec4 texture1DArray(const sampler1DArray sampler, const vec2 coord)
-{
-   __asm vec4_tex_1d_array __retVal, sampler, coord;
-}
-
-vec4 texture2DArray(const sampler2DArray sampler, const vec3 coord)
-{
-   __asm vec4_tex_2d_array __retVal, sampler, coord;
-}
-
-
-//
-// 8.9 Noise Functions
-//
-// AUTHOR: Stefan Gustavson (stegu@itn.liu.se), Nov 26, 2005
-//
-
-float noise1(const float x)
-{
-   __asm float_noise1 __retVal, x;
-}
-
-
-float noise1(const vec2 x)
-{
-    __asm float_noise2 __retVal, x;
-}
-
-float noise1(const vec3 x)
-{
-    __asm float_noise3 __retVal, x;
-}
-
-float noise1(const vec4 x)
-{
-    __asm float_noise4 __retVal, x;
-}
-
-vec2 noise2(const float x)
-{
-   __retVal.x = noise1(x);
-   __retVal.y = noise1(x + 19.34);
-}
-
-vec2 noise2(const vec2 x)
-{
-   __retVal.x = noise1(x);
-   __retVal.y = noise1(x + vec2(19.34, 7.66));
-}
-
-vec2 noise2(const vec3 x)
-{
-   __retVal.x = noise1(x);
-   __retVal.y = noise1(x + vec3(19.34, 7.66, 3.23));
-}
-
-vec2 noise2(const vec4 x)
-{
-   __retVal.x = noise1(x);
-   __retVal.y = noise1(x + vec4(19.34, 7.66, 3.23, 2.77));
-}
-
-vec3 noise3(const float x)
-{
-   __retVal.x = noise1(x);
-   __retVal.y = noise1(x + 19.34);
-   __retVal.z = noise1(x + 5.47);
-}
-
-vec3 noise3(const vec2 x)
-{
-   __retVal.x = noise1(x);
-   __retVal.y = noise1(x + vec2(19.34, 7.66));
-   __retVal.z = noise1(x + vec2(5.47, 17.85));
-}
-
-vec3 noise3(const vec3 x)
-{
-   __retVal.x = noise1(x);
-   __retVal.y = noise1(x + vec3(19.34, 7.66, 3.23));
-   __retVal.z = noise1(x + vec3(5.47, 17.85, 11.04));
-}
-
-vec3 noise3(const vec4 x)
-{
-   __retVal.x = noise1(x);
-   __retVal.y = noise1(x + vec4(19.34, 7.66, 3.23, 2.77));
-   __retVal.z = noise1(x + vec4(5.47, 17.85, 11.04, 13.19));
-}
-
-vec4 noise4(const float x)
-{
-   __retVal.x = noise1(x);
-   __retVal.y = noise1(x + 19.34);
-   __retVal.z = noise1(x + 5.47);
-   __retVal.w = noise1(x + 23.54);
-}
-
-vec4 noise4(const vec2 x)
-{
-   __retVal.x = noise1(x);
-   __retVal.y = noise1(x + vec2 (19.34, 7.66));
-   __retVal.z = noise1(x + vec2 (5.47, 17.85));
-   __retVal.w = noise1(x + vec2 (23.54, 29.11));
-}
-
-vec4 noise4(const vec3 x)
-{
-   __retVal.x = noise1(x);
-   __retVal.y = noise1(x + vec3(19.34, 7.66, 3.23));
-   __retVal.z = noise1(x + vec3(5.47, 17.85, 11.04));
-   __retVal.w = noise1(x + vec3(23.54, 29.11, 31.91));
-}
-
-vec4 noise4(const vec4 x)
-{
-   __retVal.x = noise1(x);
-   __retVal.y = noise1(x + vec4(19.34, 7.66, 3.23, 2.77));
-   __retVal.z = noise1(x + vec4(5.47, 17.85, 11.04, 13.19));
-   __retVal.w = noise1(x + vec4(23.54, 29.11, 31.91, 37.48));
-}
diff --git a/mesalib/src/mesa/shader/slang/library/slang_core.gc b/mesalib/src/mesa/shader/slang/library/slang_core.gc
deleted file mode 100644
index 0a0d15903..000000000
--- a/mesalib/src/mesa/shader/slang/library/slang_core.gc
+++ /dev/null
@@ -1,2619 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5
- *
- * Copyright (C) 2006  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-//
-// This file defines nearly all constructors and operators for built-in data
-// types, using extended language syntax. In general, compiler treats
-// constructors and operators as ordinary functions with some exceptions.
-// For example, the language does not allow functions to be called in
-// constant expressions - here the exception is made to allow it.
-//
-// Each implementation provides its own version of this file. Each
-// implementation can define the required set of operators and constructors
-// in its own fashion.
-//
-// The extended language syntax is only present when compiling this file.
-// It is implicitly included at the very beginning of the compiled shader,
-// so no built-in functions can be used.
-//
-// To communicate with the implementation, a special extended "__asm" keyword
-// is used, followed by an instruction name (any valid identifier), a
-// destination variable identifier and a list of zero or more source
-// variable identifiers.
-//
-// A variable identifier is a variable name declared earlier in the code
-// (as a function parameter, local or global variable).
-//
-// An instruction name designates an instruction that must be exported
-// by the implementation.  Each instruction receives data from source
-// variable identifiers and returns data in the destination variable
-// identifier.
-//
-// It is up to the implementation how to define a particular operator
-// or constructor. If it is expected to being used rarely, it can be
-// defined in terms of other operators and constructors,
-// for example:
-//
-// ivec2 __operator + (const ivec2 x, const ivec2 y) {
-//    return ivec2 (x[0] + y[0], x[1] + y[1]);
-// }
-//
-// If a particular operator or constructor is expected to be used very
-// often or is an atomic operation (that is, an operation that cannot be
-// expressed in terms of other operations or would create a dependency
-// cycle) it must be defined using one or more __asm constructs.
-//
-// Each implementation must define constructors for all scalar types
-// (bool, float, int).  There are 9 scalar-to-scalar constructors
-// (including identity constructors). However, since the language
-// introduces special constructors (like matrix constructor with a single
-// scalar value), implementations must also implement these cases.
-// The compiler provides the following algorithm when resolving a constructor:
-// - try to find a constructor with a prototype matching ours,
-// - if no constructor is found and this is a scalar-to-scalar constructor,
-//   raise an error,
-// - if a constructor is found, execute it and return,
-// - count the size of the constructor parameter list - if it is less than
-//   the size of our constructor's type, raise an error,
-// - for each parameter in the list do a recursive constructor matching for
-//   appropriate scalar fields in the constructed variable,
-//
-// Each implementation must also define a set of operators that deal with
-// built-in data types.
-// There are four kinds of operators:
-// 1) Operators that are implemented only by the compiler: "()" (function
-//    call), "," (sequence) and "?:" (selection).
-// 2) Operators that are implemented by the compiler by expressing it in
-//    terms of other operators:
-//    - "." (field selection) - translated to subscript access,
-//    - "&&" (logical and) - translated to "<left_expr> ? <right_expr> :
-//      false",
-//    - "||" (logical or) - translated to "<left_expr> ? true : <right_expr>",
-// 3) Operators that can be defined by the implementation and if the required
-//    prototype is not found, standard behaviour is used:
-//    - "==", "!=", "=" (equality, assignment) - compare or assign
-//      matching fields one-by-one;
-//      note that at least operators for scalar data types must be defined
-//      by the implementation to get it work,
-// 4) All other operators not mentioned above. If no required prototype is
-//    found, an error is raised. An implementation must follow the language
-//    specification to provide all valid operator prototypes.
-//
-
-
-
-//// Basic, scalar constructors/casts
-
-int __constructor(const float f)
-{
-   __asm vec4_to_ivec4 __retVal, f;
-}
-
-int __constructor(const bool b)
-{
-   __retVal = b;
-}
-
-int __constructor(const int i)
-{
-   __retVal = i;
-}
-
-bool __constructor(const int i)
-{
-   __asm vec4_sne __retVal, i, 0.0;
-}
-
-bool __constructor(const float f)
-{
-   __asm vec4_sne __retVal, f, 0.0;
-}
-
-bool __constructor(const bool b)
-{
-   __retVal = b;
-}
-
-float __constructor(const int i)
-{
-    __asm ivec4_to_vec4 __retVal, i;
-}
-
-float __constructor(const bool b)
-{
-    __asm ivec4_to_vec4 __retVal, b;
-}
-
-float __constructor(const float f)
-{
-   __retVal = f;
-}
-
-
-//// vec2 constructors
-
-vec2 __constructor(const float x, const float y)
-{
-   __retVal.x = x;
-   __retVal.y = y;
-}
-
-vec2 __constructor(const float f)
-{
-   __asm vec4_move __retVal.xy, f;
-}
-
-vec2 __constructor(const int i)
-{
-   __asm ivec4_to_vec4 __retVal.xy, i;
-}
-
-vec2 __constructor(const bool b)
-{
-   __asm ivec4_to_vec4 __retVal.xy, b;
-}
-
-vec2 __constructor(const bvec2 b)
-{
-//   __retVal = b;
-   __asm ivec4_to_vec4 __retVal.xy, b;
-}
-
-vec2 __constructor(const vec3 v)
-{
-   __asm vec4_move __retVal.xy, v.xy;
-}
-
-vec2 __constructor(const vec4 v)
-{
-   __asm vec4_move __retVal.xy, v.xy;
-}
-
-
-//// vec3 constructors
-
-vec3 __constructor(const float x, const float y, const float z)
-{
-   __retVal.x = x;
-   __retVal.y = y;
-   __retVal.z = z;
-}
-
-vec3 __constructor(const float f)
-{
-   // Note: this could be "__retVal.xyz = f" but that's an illegal assignment
-   __asm vec4_move __retVal.xyz, f;
-}
-
-vec3 __constructor(const int i)
-{
-   __asm ivec4_to_vec4 __retVal.xyz, i;
-}
-
-vec3 __constructor(const bool b)
-{
-   __asm ivec4_to_vec4 __retVal.xyz, b;
-}
-
-vec3 __constructor(const bvec3 b)
-{
-   __asm ivec4_to_vec4 __retVal.xyz, b;
-}
-
-vec3 __constructor(const vec4 v)
-{
-   __asm vec4_move __retVal.xyz, v;
-}
-
-
-//// vec4 constructors
-
-vec4 __constructor(const float x, const float y, const float z, const float w)
-{
-   __retVal.x = x;
-   __retVal.y = y;
-   __retVal.z = z;
-   __retVal.w = w;
-}
-
-vec4 __constructor(const float f)
-{
-   // Note: this could be "__retVal = f" but that's an illegal assignment
-   __asm vec4_move __retVal, f;
-}
-
-vec4 __constructor(const int i)
-{
-   __asm ivec4_to_vec4 __retVal, i;
-}
-
-vec4 __constructor(const bool b)
-{
-   __asm ivec4_to_vec4 __retVal, b;
-}
-
-vec4 __constructor(const bvec4 b)
-{
-   __asm ivec4_to_vec4 __retVal, b;
-}
-
-vec4 __constructor(const ivec4 i)
-{
-   __asm ivec4_to_vec4 __retVal, i;
-}
-
-vec4 __constructor(const vec3 v3, const float f)
-{
-   // XXX this constructor shouldn't be needed anymore
-   __retVal.xyz = v3;
-   __retVal.w = f;
-}
-
-vec4 __constructor(const vec2 v2, const float f1, const float f2)
-{
-   // XXX this constructor shouldn't be needed anymore
-   __retVal.xy = v2;
-   __retVal.z = f1;
-   __retVal.w = f2;
-}
-
-
-//// ivec2 constructors
-
-ivec2 __constructor(const int i, const int j)
-{
-   __retVal.x = i;
-   __retVal.y = j;
-}
-
-ivec2 __constructor(const int i)
-{
-   __asm vec4_move __retVal.xy, i;
-}
-
-ivec2 __constructor(const float f)
-{
-   __asm vec4_to_ivec4 __retVal.xy, f;
-}
-
-ivec2 __constructor(const bool b)
-{
-   __asm vec4_to_ivec4 __retVal.xy, b;
-}
-
-
-//// ivec3 constructors
-
-ivec3 __constructor(const int i, const int j, const int k)
-{
-   __retVal.x = i;
-   __retVal.y = j;
-   __retVal.z = k;
-}
-
-ivec3 __constructor(const int i)
-{
-   __asm vec4_move __retVal.xyz, i;
-}
-
-ivec3 __constructor(const float f)
-{
-   __asm vec4_to_ivec4 __retVal.xyz, f;
-}
-
-ivec3 __constructor(const bool b)
-{
-   __asm vec4_move __retVal.xyz, b;
-}
-
-
-//// ivec4 constructors
-
-ivec4 __constructor(const int x, const int y, const int z, const int w)
-{
-   __retVal.x = x;
-   __retVal.y = y;
-   __retVal.z = z;
-   __retVal.w = w;
-}
-
-ivec4 __constructor(const int i)
-{
-   __asm vec4_move __retVal, i;
-}
-
-ivec4 __constructor(const float f)
-{
-   __asm vec4_to_ivec4 __retVal, f;
-}
-
-ivec4 __constructor(const bool b)
-{
-   __asm vec4_to_ivec4 __retVal, b;
-}
-
-
-//// bvec2 constructors
-
-bvec2 __constructor(const bool b1, const bool b2)
-{
-   __retVal.x = b1;
-   __retVal.y = b2;
-}
-
-bvec2 __constructor(const int i1, const int i2)
-{
-   __asm vec4_sne __retVal.x, i1, 0.0;
-   __asm vec4_sne __retVal.y, i2, 0.0;
-}
-
-
-bvec2 __constructor(const bool b)
-{
-   __asm vec4_move __retVal.xy, b;
-}
-
-bvec2 __constructor(const float f)
-{
-   __asm vec4_sne __retVal.xy, f, 0.0;
-}
-
-bvec2 __constructor(const int i)
-{
-   __asm vec4_sne __retVal.xy, i, 0.0;
-}
-
-bvec2 __constructor(const vec2 v)
-{
-   __asm vec4_sne __retVal.xy, v, 0.0;
-}
-
-bvec2 __constructor(const ivec2 v)
-{
-   __asm vec4_sne __retVal.xy, v, 0.0;
-}
-
-
-
-//// bvec3 constructors
-
-bvec3 __constructor(const bool b1, const bool b2, const bool b3)
-{
-   __retVal.x = b1;
-   __retVal.y = b2;
-   __retVal.z = b3;
-}
-
-bvec3 __constructor(const float f1, const float f2, const float f3)
-{
-   __asm vec4_sne __retVal.x, f1, 0.0;
-   __asm vec4_sne __retVal.y, f2, 0.0;
-   __asm vec4_sne __retVal.z, f3, 0.0;
-}
-
-bvec3 __constructor(const bool b)
-{
-   __asm vec4_move __retVal.xyz, b;
-}
-
-bvec3 __constructor(const float f)
-{
-   __asm vec4_sne __retVal.xyz, f, 0.0;
-}
-
-bvec3 __constructor(const int i)
-{
-   __asm vec4_sne __retVal.xyz, i, 0.0;
-}
-
-bvec3 __constructor(const vec3 v)
-{
-   __asm vec4_sne __retVal.xyz, v, 0.0;
-}
-
-bvec3 __constructor(const ivec3 v)
-{
-   __asm vec4_sne __retVal.xyz, v, 0.0;
-}
-
-
-
-//// bvec4 constructors
-
-bvec4 __constructor(const bool b1, const bool b2, const bool b3, const bool b4)
-{
-   __retVal.x = b1;
-   __retVal.y = b2;
-   __retVal.z = b3;
-   __retVal.w = b4;
-}
-
-bvec4 __constructor(const float f1, const float f2, const float f3, const float f4)
-{
-   const float zero = 0.0;
-   __asm vec4_sne __retVal.x, f1, zero;   
-   __asm vec4_sne __retVal.y, f2, zero;   
-   __asm vec4_sne __retVal.z, f3, zero;   
-   __asm vec4_sne __retVal.w, f4, zero;   
-}
-
-bvec4 __constructor(const bool b)
-{
-   __asm vec4_move __retVal.xyzw, b;
-}
-
-bvec4 __constructor(const float f)
-{
-   __asm vec4_sne __retVal.xyzw, f, 0.0;
-}
-
-bvec4 __constructor(const int i)
-{
-   __asm vec4_sne __retVal.xyzw, i, 0.0;
-}
-
-bvec4 __constructor(const vec4 v)
-{
-   __asm vec4_sne __retVal.xyzw, v, 0.0;
-}
-
-bvec4 __constructor(const ivec4 v)
-{
-   __asm vec4_sne __retVal.xyzw, v, 0.0;
-}
-
-
-
-//// mat2 constructors
-
-mat2 __constructor(const float m00, const float m10,
-                   const float m01, const float m11)
-{
-   __retVal[0].x = m00;
-   __retVal[0].y = m10;
-   __retVal[1].x = m01;
-   __retVal[1].y = m11;
-}
-
-mat2 __constructor(const float f)
-{
-   __retVal[0].x = f;
-   __retVal[0].y = 0.0;
-   __retVal[1].x = 0.0;
-   __retVal[1].y = f;
-}
-
-mat2 __constructor(const int i)
-{
-   return mat2(float(i));
-}
-
-mat2 __constructor(const bool b)
-{
-   return mat2(float(b));
-}
-
-mat2 __constructor(const vec2 c0, const vec2 c1)
-{
-   __retVal[0] = c0;
-   __retVal[1] = c1;
-}
-
-
-//// mat3 constructors
-
-mat3 __constructor(const float m00, const float m10, const float m20,
-                   const float m01, const float m11, const float m21,
-                   const float m02, const float m12, const float m22)
-{
-   __retVal[0].x = m00;
-   __retVal[0].y = m10;
-   __retVal[0].z = m20;
-   __retVal[1].x = m01;
-   __retVal[1].y = m11;
-   __retVal[1].z = m21;
-   __retVal[2].x = m02;
-   __retVal[2].y = m12;
-   __retVal[2].z = m22;
-}
-
-mat3 __constructor(const float f)
-{
-   vec2 v = vec2(f, 0.0);
-   __retVal[0] = v.xyy;
-   __retVal[1] = v.yxy;
-   __retVal[2] = v.yyx;
-}
-
-mat3 __constructor(const int i)
-{
-   return mat3(float(i));
-}
-
-mat3 __constructor(const bool b)
-{
-   return mat3(float(b));
-}
-
-mat3 __constructor(const vec3 c0, const vec3 c1, const vec3 c2)
-{
-   __retVal[0] = c0;
-   __retVal[1] = c1;
-   __retVal[2] = c2;
-}
-
-
-//// mat4 constructors
-
-mat4 __constructor(const float m00, const float m10, const float m20, const float m30,
-                   const float m01, const float m11, const float m21, const float m31,
-                   const float m02, const float m12, const float m22, const float m32,
-                   const float m03, const float m13, const float m23, const float m33)
-{
-   __retVal[0].x = m00;
-   __retVal[0].y = m10;
-   __retVal[0].z = m20;
-   __retVal[0].w = m30;
-   __retVal[1].x = m01;
-   __retVal[1].y = m11;
-   __retVal[1].z = m21;
-   __retVal[1].w = m31;
-   __retVal[2].x = m02;
-   __retVal[2].y = m12;
-   __retVal[2].z = m22;
-   __retVal[2].w = m32;
-   __retVal[3].x = m03;
-   __retVal[3].y = m13;
-   __retVal[3].z = m23;
-   __retVal[3].w = m33;
-}
-
-
-mat4 __constructor(const float f)
-{
-   vec2 v = vec2(f, 0.0);
-   __retVal[0] = v.xyyy;
-   __retVal[1] = v.yxyy;
-   __retVal[2] = v.yyxy;
-   __retVal[3] = v.yyyx;
-}
-
-mat4 __constructor(const int i)
-{
-   return mat4(float(i));
-}
-
-mat4 __constructor(const bool b)
-{
-   return mat4(float(b));
-}
-
-mat4 __constructor(const vec4 c0, const vec4 c1, const vec4 c2, const vec4 c3)
-{
-   __retVal[0] = c0;
-   __retVal[1] = c1;
-   __retVal[2] = c2;
-   __retVal[3] = c3;
-}
-
-
-
-//// Basic int operators
-
-int __operator + (const int a, const int b)
-{
-   __asm vec4_add __retVal, a, b;
-}
-
-int __operator - (const int a, const int b)
-{
-   __asm vec4_subtract __retVal, a, b;
-}
-
-int __operator * (const int a, const int b)
-{
-   __asm vec4_multiply __retVal, a, b;
-}
-
-int __operator / (const int a, const int b)
-{
-   float bInv, x;
-   __asm float_rcp bInv, b;
-   __asm vec4_multiply x, a, bInv;
-   __asm vec4_to_ivec4 __retVal, x;
-}
-
-
-//// Basic ivec2 operators
-
-ivec2 __operator + (const ivec2 a, const ivec2 b)
-{
-   __asm vec4_add __retVal, a, b;
-}
-
-ivec2 __operator - (const ivec2 a, const ivec2 b)
-{
-   __asm vec4_subtract __retVal, a, b;
-}
-
-ivec2 __operator * (const ivec2 a, const ivec2 b)
-{
-   __asm vec4_multiply __retVal, a, b;
-}
-
-ivec2 __operator / (const ivec2 a, const ivec2 b)
-{
-   vec2 bInv, x;
-   __asm float_rcp bInv.x, b.x;
-   __asm float_rcp bInv.y, b.y;
-   __asm vec4_multiply x, a, bInv;
-   __asm vec4_to_ivec4 __retVal, x;
-}
-
-
-//// Basic ivec3 operators
-
-ivec3 __operator + (const ivec3 a, const ivec3 b)
-{
-   __asm vec4_add __retVal, a, b;
-}
-
-ivec3 __operator - (const ivec3 a, const ivec3 b)
-{
-   __asm vec4_subtract __retVal, a, b;
-}
-
-ivec3 __operator * (const ivec3 a, const ivec3 b)
-{
-   __asm vec4_multiply __retVal, a, b;
-}
-
-ivec3 __operator / (const ivec3 a, const ivec3 b)
-{
-   vec3 bInv, x;
-   __asm float_rcp bInv.x, b.x;
-   __asm float_rcp bInv.y, b.y;
-   __asm float_rcp bInv.z, b.z;
-   __asm vec4_multiply x, a, bInv;
-   __asm vec4_to_ivec4 __retVal, x;
-}
-
-
-//// Basic ivec4 operators
-
-ivec4 __operator + (const ivec4 a, const ivec4 b)
-{
-   __asm vec4_add __retVal, a, b;
-}
-
-ivec4 __operator - (const ivec4 a, const ivec4 b)
-{
-   __asm vec4_subtract __retVal, a, b;
-}
-
-ivec4 __operator * (const ivec4 a, const ivec4 b)
-{
-   __asm vec4_multiply __retVal, a, b;
-}
-
-ivec4 __operator / (const ivec4 a, const ivec4 b)
-{
-   vec4 bInv, x;
-   __asm float_rcp bInv.x, b.x;
-   __asm float_rcp bInv.y, b.y;
-   __asm float_rcp bInv.z, b.z;
-   __asm float_rcp bInv.w, b.w;
-   __asm vec4_multiply x, a, bInv;
-   __asm vec4_to_ivec4 __retVal, x;
-}
-
-
-//// Basic float operators
-
-float __operator + (const float a, const float b)
-{
-   __asm vec4_add __retVal, a, b;
-}
-
-float __operator - (const float a, const float b)
-{
-   __asm vec4_subtract __retVal, a, b;
-}
-
-float __operator * (const float a, const float b)
-{
-    __asm vec4_multiply __retVal, a, b;
-}
-
-float __operator / (const float a, const float b)
-{
-   float bInv;
-   __asm float_rcp bInv.x, b;
-   __asm vec4_multiply __retVal, a, bInv;
-}
-
-
-//// Basic vec2 operators
-
-vec2 __operator + (const vec2 v, const vec2 u)
-{
-   __asm vec4_add __retVal.xy, v, u;
-}
-
-vec2 __operator - (const vec2 v, const vec2 u)
-{
-    __asm vec4_subtract __retVal.xy, v, u;
-}
-
-vec2 __operator * (const vec2 v, const vec2 u)
-{
-    __asm vec4_multiply __retVal.xy, v, u;
-}
-
-vec2 __operator / (const vec2 v, const vec2 u)
-{
-   vec2 w; // = 1 / u
-   __asm float_rcp w.x, u.x;
-   __asm float_rcp w.y, u.y;
-   __asm vec4_multiply __retVal.xy, v, w;
-}
-
-
-//// Basic vec3 operators
-
-vec3 __operator + (const vec3 v, const vec3 u)
-{
-   __asm vec4_add __retVal.xyz, v, u;
-}
-
-vec3 __operator - (const vec3 v, const vec3 u)
-{
-    __asm vec4_subtract __retVal.xyz, v, u;
-}
-
-vec3 __operator * (const vec3 v, const vec3 u)
-{
-    __asm vec4_multiply __retVal.xyz, v, u;
-}
-
-vec3 __operator / (const vec3 v, const vec3 u)
-{
-   vec3 w; // = 1 / u
-   __asm float_rcp w.x, u.x;
-   __asm float_rcp w.y, u.y;
-   __asm float_rcp w.z, u.z;
-   __asm vec4_multiply __retVal.xyz, v, w;
-}
-
-
-//// Basic vec4 operators
-
-vec4 __operator + (const vec4 v, const vec4 u)
-{
-   __asm vec4_add __retVal, v, u;
-}
-
-vec4 __operator - (const vec4 v, const vec4 u)
-{
-    __asm vec4_subtract __retVal, v, u;
-}
-
-vec4 __operator * (const vec4 v, const vec4 u)
-{
-    __asm vec4_multiply __retVal, v, u;
-}
-
-vec4 __operator / (const vec4 v, const vec4 u)
-{
-   vec4 w; // = 1 / u
-   __asm float_rcp w.x, u.x;
-   __asm float_rcp w.y, u.y;
-   __asm float_rcp w.z, u.z;
-   __asm float_rcp w.w, u.w;
-   __asm vec4_multiply __retVal, v, w;
-}
-
-
-
-
-//// Basic vec2/float operators
-
-vec2 __operator + (const float a, const vec2 u)
-{
-   __asm vec4_add __retVal.xy, a, u.xy;
-}
-
-vec2 __operator + (const vec2 v, const float b)
-{
-   __asm vec4_add __retVal.xy, v.xy, b;
-}
-
-vec2 __operator - (const float a, const vec2 u)
-{
-   __asm vec4_subtract __retVal.xy, a, u.xy;
-}
-
-vec2 __operator - (const vec2 v, const float b)
-{
-   __asm vec4_subtract __retVal.xy, v.xy, b;
-}
-
-vec2 __operator * (const float a, const vec2 u)
-{
-   __asm vec4_multiply __retVal.xy, a, u.xy;
-}
-
-vec2 __operator * (const vec2 v, const float b)
-{
-   __asm vec4_multiply __retVal.xy, v.xy, b;
-}
-
-vec2 __operator / (const float a, const vec2 u)
-{
-   vec2 invU;
-   __asm float_rcp invU.x, u.x;
-   __asm float_rcp invU.y, u.y;
-   __asm vec4_multiply __retVal.xy, a, invU.xy;
-}
-
-vec2 __operator / (const vec2 v, const float b)
-{
-   float invB;
-   __asm float_rcp invB, b;
-   __asm vec4_multiply __retVal.xy, v.xy, invB;
-}
-
-
-//// Basic vec3/float operators
-
-vec3 __operator + (const float a, const vec3 u)
-{
-   __asm vec4_add __retVal.xyz, a, u.xyz;
-}
-
-vec3 __operator + (const vec3 v, const float b)
-{
-   __asm vec4_add __retVal.xyz, v.xyz, b;
-}
-
-vec3 __operator - (const float a, const vec3 u)
-{
-   __asm vec4_subtract __retVal.xyz, a, u.xyz;
-}
-
-vec3 __operator - (const vec3 v, const float b)
-{
-   __asm vec4_subtract __retVal.xyz, v.xyz, b;
-}
-
-vec3 __operator * (const float a, const vec3 u)
-{
-   __asm vec4_multiply __retVal.xyz, a, u.xyz;
-}
-
-vec3 __operator * (const vec3 v, const float b)
-{
-   __asm vec4_multiply __retVal.xyz, v.xyz, b;
-}
-
-vec3 __operator / (const float a, const vec3 u)
-{
-   vec3 invU;
-   __asm float_rcp invU.x, u.x;
-   __asm float_rcp invU.y, u.y;
-   __asm float_rcp invU.z, u.z;
-   __asm vec4_multiply __retVal.xyz, a, invU.xyz;
-}
-
-vec3 __operator / (const vec3 v, const float b)
-{
-   float invB;
-   __asm float_rcp invB, b;
-   __asm vec4_multiply __retVal.xyz, v.xyz, invB;
-}
-
-
-//// Basic vec4/float operators
-
-vec4 __operator + (const float a, const vec4 u)
-{
-   __asm vec4_add __retVal, a, u;
-}
-
-vec4 __operator + (const vec4 v, const float b)
-{
-   __asm vec4_add __retVal, v, b;
-}
-
-vec4 __operator - (const float a, const vec4 u)
-{
-   __asm vec4_subtract __retVal, a, u;
-}
-
-vec4 __operator - (const vec4 v, const float b)
-{
-   __asm vec4_subtract __retVal, v, b;
-}
-
-vec4 __operator * (const float a, const vec4 u)
-{
-   __asm vec4_multiply __retVal, a, u;
-}
-
-vec4 __operator * (const vec4 v, const float b)
-{
-   __asm vec4_multiply __retVal, v, b;
-}
-
-vec4 __operator / (const float a, const vec4 u)
-{
-   vec4 invU;
-   __asm float_rcp invU.x, u.x;
-   __asm float_rcp invU.y, u.y;
-   __asm float_rcp invU.z, u.z;
-   __asm float_rcp invU.w, u.w;
-   __asm vec4_multiply __retVal, a, invU;
-}
-
-vec4 __operator / (const vec4 v, const float b)
-{
-   float invB;
-   __asm float_rcp invB, b;
-   __asm vec4_multiply __retVal, v, invB;
-}
-
-
-
-//// Basic ivec2/int operators
-
-ivec2 __operator + (const int a, const ivec2 u)
-{
-   __retVal = ivec2(a) + u;
-}
-
-ivec2 __operator + (const ivec2 v, const int b)
-{
-   __retVal = v + ivec2(b);
-}
-
-ivec2 __operator - (const int a, const ivec2 u)
-{
-   __retVal = ivec2(a) - u;
-}
-
-ivec2 __operator - (const ivec2 v, const int b)
-{
-   __retVal = v - ivec2(b);
-}
-
-ivec2 __operator * (const int a, const ivec2 u)
-{
-   __retVal = ivec2(a) * u;
-}
-
-ivec2 __operator * (const ivec2 v, const int b)
-{
-   __retVal = v * ivec2(b);
-}
-
-ivec2 __operator / (const int a, const ivec2 u)
-{
-   __retVal = ivec2(a) / u;
-}
-
-ivec2 __operator / (const ivec2 v, const int b)
-{
-   __retVal = v / ivec2(b);
-}
-
-
-//// Basic ivec3/int operators
-
-ivec3 __operator + (const int a, const ivec3 u)
-{
-   __retVal = ivec3(a) + u;
-}
-
-ivec3 __operator + (const ivec3 v, const int b)
-{
-   __retVal = v + ivec3(b);
-}
-
-ivec3 __operator - (const int a, const ivec3 u)
-{
-   __retVal = ivec3(a) - u;
-}
-
-ivec3 __operator - (const ivec3 v, const int b)
-{
-   __retVal = v - ivec3(b);
-}
-
-ivec3 __operator * (const int a, const ivec3 u)
-{
-   __retVal = ivec3(a) * u;
-}
-
-ivec3 __operator * (const ivec3 v, const int b)
-{
-   __retVal = v * ivec3(b);
-}
-
-ivec3 __operator / (const int a, const ivec3 u)
-{
-   __retVal = ivec3(a) / u;
-}
-
-ivec3 __operator / (const ivec3 v, const int b)
-{
-   __retVal = v / ivec3(b);
-}
-
-
-//// Basic ivec4/int operators
-
-ivec4 __operator + (const int a, const ivec4 u)
-{
-   __retVal = ivec4(a) + u;
-}
-
-ivec4 __operator + (const ivec4 v, const int b)
-{
-   __retVal = v + ivec4(b);
-}
-
-ivec4 __operator - (const int a, const ivec4 u)
-{
-   __retVal = ivec4(a) - u;
-}
-
-ivec4 __operator - (const ivec4 v, const int b)
-{
-   __retVal = v - ivec4(b);
-}
-
-ivec4 __operator * (const int a, const ivec4 u)
-{
-   __retVal = ivec4(a) * u;
-}
-
-ivec4 __operator * (const ivec4 v, const int b)
-{
-   __retVal = v * ivec4(b);
-}
-
-ivec4 __operator / (const int a, const ivec4 u)
-{
-   __retVal = ivec4(a) / u;
-}
-
-ivec4 __operator / (const ivec4 v, const int b)
-{
-   __retVal = v / ivec4(b);
-}
-
-
-
-
-//// Unary negation operator
-
-int __operator - (const int a)
-{
-   __asm vec4_negate __retVal.x, a;
-}
-
-ivec2 __operator - (const ivec2 v)
-{
-   __asm vec4_negate __retVal, v;
-}
-
-ivec3 __operator - (const ivec3 v)
-{
-   __asm vec4_negate __retVal, v;
-}
-
-ivec4 __operator - (const ivec4 v)
-{
-   __asm vec4_negate __retVal, v;
-}
-
-float __operator - (const float a)
-{
-   __asm vec4_negate __retVal.x, a;
-}
-
-vec2 __operator - (const vec2 v)
-{
-   __asm vec4_negate __retVal.xy, v.xy;
-}
-
-vec3 __operator - (const vec3 v)
-{
-   __asm vec4_negate __retVal.xyz, v.xyz;
-}
-
-vec4 __operator - (const vec4 v)
-{
-   __asm vec4_negate __retVal, v;
-}
-
-mat2 __operator - (const mat2 m)
-{
-   __retVal[0] = -m[0];
-   __retVal[1] = -m[1];
-}
-
-mat3 __operator - (const mat3 m)
-{
-   __retVal[0] = -m[0];
-   __retVal[1] = -m[1];
-   __retVal[2] = -m[2];
-}
-
-mat4 __operator - (const mat4 m)
-{
-   __retVal[0] = -m[0];
-   __retVal[1] = -m[1];
-   __retVal[2] = -m[2];
-   __retVal[3] = -m[3];
-}
-
-
-
-//// dot product
-
-float dot(const float a, const float b)
-{
-   __retVal = a * b;
-}
-
-float dot(const vec2 a, const vec2 b)
-{
-   __retVal = a.x * b.x + a.y * b.y;
-}
-
-float dot(const vec3 a, const vec3 b)
-{
-    __asm vec3_dot __retVal, a, b;
-}
-
-float dot(const vec4 a, const vec4 b)
-{
-    __asm vec4_dot __retVal, a, b;
-}
-
-
-
-//// int assignment operators
-
-int __operator += (inout int a, const int b)
-{
-   a = a + b;
-   return a;
-}
-
-int __operator -= (inout int a, const int b)
-{
-   a = a - b;
-   return a;
-}
-
-int __operator *= (inout int a, const int b)
-{
-   a = a * b;
-   return a;
-}
-
-int __operator /= (inout int a, const int b)
-{
-   a = a / b;
-   return a;
-}
-
-
-//// ivec2 assignment operators
-
-ivec2 __operator += (inout ivec2 v, const ivec2 u)
-{
-   v = v + u;
-   return v;
-}
-
-ivec2 __operator -= (inout ivec2 v, const ivec2 u)
-{
-   v = v - u;
-   return v;
-}
-
-ivec2 __operator *= (inout ivec2 v, const ivec2 u)
-{
-   v = v * u;
-   return v;
-}
-
-ivec2 __operator /= (inout ivec2 v, const ivec2 u)
-{
-   v = v / u;
-   return v;
-}
-
-
-//// ivec3 assignment operators
-
-ivec3 __operator += (inout ivec3 v, const ivec3 u)
-{
-   v = v + u;
-   return v;
-}
-
-ivec3 __operator -= (inout ivec3 v, const ivec3 u)
-{
-   v = v - u;
-   return v;
-}
-
-ivec3 __operator *= (inout ivec3 v, const ivec3 u)
-{
-   v = v * u;
-   return v;
-}
-
-ivec3 __operator /= (inout ivec3 v, const ivec3 u)
-{
-   v = v / u;
-   return v;
-}
-
-
-//// ivec4 assignment operators
-
-ivec4 __operator += (inout ivec4 v, const ivec4 u)
-{
-   v = v + u;
-   return v;
-}
-
-ivec4 __operator -= (inout ivec4 v, const ivec4 u)
-{
-   v = v - u;
-   return v;
-}
-
-ivec4 __operator *= (inout ivec4 v, const ivec4 u)
-{
-   v = v * u;
-   return v;
-}
-
-ivec4 __operator /= (inout ivec4 v, const ivec4 u)
-{
-   v = v / u;
-   return v;
-}
-
-
-//// float assignment operators
-
-float __operator += (inout float a, const float b)
-{
-   a = a + b;
-   return a;
-}
-
-float __operator -= (inout float a, const float b)
-{
-   a = a - b;
-   return a;
-}
-
-float __operator *= (inout float a, const float b)
-{
-   a = a * b;
-   return a;
-}
-
-float __operator /= (inout float a, const float b)
-{
-   a = a / b;
-   return a;
-}
-
-
-//// vec2 assignment operators
-
-vec2 __operator += (inout vec2 v, const vec2 u)
-{
-   v = v + u;
-   return v;
-}
-
-vec2 __operator -= (inout vec2 v, const vec2 u)
-{
-   v = v - u;
-   return v;
-}
-
-vec2 __operator *= (inout vec2 v, const vec2 u)
-{
-   v = v * u;
-   return v;
-}
-
-vec2 __operator /= (inout vec2 v, const vec2 u)
-{
-   v = v / u;
-   return v;
-}
-
-
-//// vec3 assignment operators
-
-vec3 __operator += (inout vec3 v, const vec3 u)
-{
-   v = v + u;
-   return v;
-}
-
-vec3 __operator -= (inout vec3 v, const vec3 u)
-{
-   v = v - u;
-   return v;
-}
-
-vec3 __operator *= (inout vec3 v, const vec3 u)
-{
-   v = v * u;
-   return v;
-}
-
-vec3 __operator /= (inout vec3 v, const vec3 u)
-{
-   v = v / u;
-   return v;
-}
-
-
-//// vec4 assignment operators
-
-vec4 __operator += (inout vec4 v, const vec4 u)
-{
-   v = v + u;
-   return v;
-}
-
-vec4 __operator -= (inout vec4 v, const vec4 u)
-{
-   v = v - u;
-   return v;
-}
-
-vec4 __operator *= (inout vec4 v, const vec4 u)
-{
-   v = v * u;
-   return v;
-}
-
-vec4 __operator /= (inout vec4 v, const vec4 u)
-{
-   v = v / u;
-   return v;
-}
-
-
-
-//// ivec2/int assignment operators
-
-ivec2 __operator += (inout ivec2 v, const int a)
-{
-   v = v + ivec2(a);
-   return v;
-}
-
-ivec2 __operator -= (inout ivec2 v, const int a)
-{
-   v = v - ivec2(a);
-   return v;
-}
-
-ivec2 __operator *= (inout ivec2 v, const int a)
-{
-   v = v * ivec2(a);
-   return v;
-}
-
-ivec2 __operator /= (inout ivec2 v, const int a)
-{
-   v = v / ivec2(a);
-   return v;
-}
-
-
-//// ivec3/int assignment operators
-
-ivec3 __operator += (inout ivec3 v, const int a)
-{
-   v = v + ivec3(a);
-   return v;
-}
-
-ivec3 __operator -= (inout ivec3 v, const int a)
-{
-   v = v - ivec3(a);
-   return v;
-}
-
-ivec3 __operator *= (inout ivec3 v, const int a)
-{
-   v = v * ivec3(a);
-   return v;
-}
-
-ivec4 __operator /= (inout ivec3 v, const int a)
-{
-   v = v / ivec3(a);
-   return v;
-}
-
-
-//// ivec4/int assignment operators
-
-ivec4 __operator += (inout ivec4 v, const int a)
-{
-   v = v + ivec4(a);
-   return v;
-}
-
-ivec4 __operator -= (inout ivec4 v, const int a)
-{
-   v = v - ivec4(a);
-   return v;
-}
-
-ivec4 __operator *= (inout ivec4 v, const int a)
-{
-   v = v * ivec4(a);
-   return v;
-}
-
-ivec4 __operator /= (inout ivec4 v, const int a)
-{
-   v = v / ivec4(a);
-   return v;
-}
-
-
-
-//// vec2/float assignment operators
-
-vec2 __operator += (inout vec2 v, const float a)
-{
-   v = v + vec2(a);
-   return v;
-}
-
-vec2 __operator -= (inout vec2 v, const float a)
-{
-   v = v - vec2(a);
-   return v;
-}
-
-vec2 __operator *= (inout vec2 v, const float a)
-{
-   v = v * vec2(a);
-   return v;
-}
-
-vec2 __operator /= (inout vec2 v, const float a)
-{
-   v = v / vec2(a);
-   return v;
-}
-
-
-//// vec3/float assignment operators
-
-vec3 __operator += (inout vec3 v, const float a)
-{
-   v = v + vec3(a);
-   return v;
-}
-
-vec3 __operator -= (inout vec3 v, const float a)
-{
-   v = v - vec3(a);
-   return v;
-}
-
-vec3 __operator *= (inout vec3 v, const float a)
-{
-   v = v * vec3(a);
-   return v;
-}
-
-vec3 __operator /= (inout vec3 v, const float a)
-{
-   v = v / vec3(a);
-   return v;
-}
-
-
-//// vec4/float assignment operators
-
-vec4 __operator += (inout vec4 v, const float a)
-{
-   v = v + vec4(a);
-   return v;
-}
-
-vec4 __operator -= (inout vec4 v, const float a)
-{
-   v = v - vec4(a);
-   return v;
-}
-
-vec4 __operator *= (inout vec4 v, const float a)
-{
-   v = v * vec4(a);
-   return v;
-}
-
-vec4 __operator /= (inout vec4 v, const float a)
-{
-   v = v / vec4(a);
-   return v;
-}
-
-
-
-
-
-//// Basic mat2 operations
-
-mat2 __operator + (const mat2 m, const mat2 n)
-{
-   __retVal[0] = m[0] + n[0];
-   __retVal[1] = m[1] + n[1];
-}
-
-mat2 __operator - (const mat2 m, const mat2 n)
-{
-   __retVal[0] = m[0] - n[0];
-   __retVal[1] = m[1] - n[1];
-}
-
-mat2 __operator * (const mat2 m, const mat2 n)
-{
-   __retVal[0] = m[0] * n[0].xx + m[1] * n[0].yy;
-   __retVal[1] = m[0] * n[1].xx + m[1] * n[1].yy;
-}
-
-mat2 __operator / (const mat2 m, const mat2 n)
-{
-   __retVal[0] = m[0] / n[0];
-   __retVal[1] = m[1] / n[1];
-}
-
-
-//// Basic mat3 operations
-
-mat3 __operator + (const mat3 m, const mat3 n)
-{
-   __retVal[0] = m[0] + n[0];
-   __retVal[1] = m[1] + n[1];
-   __retVal[2] = m[2] + n[2];
-}
-
-mat3 __operator - (const mat3 m, const mat3 n)
-{
-   __retVal[0] = m[0] - n[0];
-   __retVal[1] = m[1] - n[1];
-   __retVal[2] = m[2] - n[2];
-}
-
-mat3 __operator * (const mat3 m, const mat3 n)
-{
-   __retVal[0] = m[0] * n[0].xxx + m[1] * n[0].yyy + m[2] * n[0].zzz;
-   __retVal[1] = m[0] * n[1].xxx + m[1] * n[1].yyy + m[2] * n[1].zzz;
-   __retVal[2] = m[0] * n[2].xxx + m[1] * n[2].yyy + m[2] * n[2].zzz;
-}
-
-mat3 __operator / (const mat3 m, const mat3 n)
-{
-    __retVal[0] = m[0] / n[0];
-    __retVal[1] = m[1] / n[1];
-    __retVal[2] = m[2] / n[2];
-}
-
-
-//// Basic mat4 operations
-
-mat4 __operator + (const mat4 m, const mat4 n)
-{
-   __retVal[0] = m[0] + n[0];
-   __retVal[1] = m[1] + n[1];
-   __retVal[2] = m[2] + n[2];
-   __retVal[3] = m[3] + n[3];
-}
-
-mat4 __operator - (const mat4 m, const mat4 n)
-{
-   __retVal[0] = m[0] - n[0];
-   __retVal[1] = m[1] - n[1];
-   __retVal[2] = m[2] - n[2];
-   __retVal[3] = m[3] - n[3];
-}
-
-mat4 __operator * (const mat4 m, const mat4 n)
-{
-   __retVal[0] = m[0] * n[0].xxxx + m[1] * n[0].yyyy + m[2] * n[0].zzzz + m[3] * n[0].wwww;
-   __retVal[1] = m[0] * n[1].xxxx + m[1] * n[1].yyyy + m[2] * n[1].zzzz + m[3] * n[1].wwww;
-   __retVal[2] = m[0] * n[2].xxxx + m[1] * n[2].yyyy + m[2] * n[2].zzzz + m[3] * n[2].wwww;
-   __retVal[3] = m[0] * n[3].xxxx + m[1] * n[3].yyyy + m[2] * n[3].zzzz + m[3] * n[3].wwww;
-}
-
-mat4 __operator / (const mat4 m, const mat4 n)
-{
-    __retVal[0] = m[0] / n[0];
-    __retVal[1] = m[1] / n[1];
-    __retVal[2] = m[2] / n[2];
-    __retVal[3] = m[3] / n[3];
-}
-
-
-//// mat2/float operations
-
-mat2 __operator + (const float a, const mat2 n)
-{
-   __retVal[0] = a + n[0];
-   __retVal[1] = a + n[1];
-}
-
-mat2 __operator + (const mat2 m, const float b)
-{
-   __retVal[0] = m[0] + b;
-   __retVal[1] = m[1] + b;
-}
-
-mat2 __operator - (const float a, const mat2 n)
-{
-   __retVal[0] = a - n[0];
-   __retVal[1] = a - n[1];
-}
-
-mat2 __operator - (const mat2 m, const float b)
-{
-   __retVal[0] = m[0] - b;
-   __retVal[1] = m[1] - b;
-}
-
-mat2 __operator * (const float a, const mat2 n)
-{
-   __retVal[0] = a * n[0];
-   __retVal[1] = a * n[1];
-}
-
-mat2 __operator * (const mat2 m, const float b)
-{
-   __retVal[0] = m[0] * b;
-   __retVal[1] = m[1] * b;
-}
-
-mat2 __operator / (const float a, const mat2 n)
-{
-   __retVal[0] = a / n[0];
-   __retVal[1] = a / n[1];
-}
-
-mat2 __operator / (const mat2 m, const float b)
-{
-   __retVal[0] = m[0] / b;
-   __retVal[1] = m[1] / b;
-}
-
-
-//// mat3/float operations
-
-mat3 __operator + (const float a, const mat3 n)
-{
-   __retVal[0] = a + n[0];
-   __retVal[1] = a + n[1];
-   __retVal[2] = a + n[2];
-}
-
-mat3 __operator + (const mat3 m, const float b)
-{
-   __retVal[0] = m[0] + b;
-   __retVal[1] = m[1] + b;
-   __retVal[2] = m[2] + b;
-}
-
-mat3 __operator - (const float a, const mat3 n)
-{
-   __retVal[0] = a - n[0];
-   __retVal[1] = a - n[1];
-   __retVal[2] = a - n[2];
-}
-
-mat3 __operator - (const mat3 m, const float b)
-{
-   __retVal[0] = m[0] - b;
-   __retVal[1] = m[1] - b;
-   __retVal[2] = m[2] - b;
-}
-
-mat3 __operator * (const float a, const mat3 n)
-{
-   __retVal[0] = a * n[0];
-   __retVal[1] = a * n[1];
-   __retVal[2] = a * n[2];
-}
-
-mat3 __operator * (const mat3 m, const float b)
-{
-   __retVal[0] = m[0] * b;
-   __retVal[1] = m[1] * b;
-   __retVal[2] = m[2] * b;
-}
-
-mat3 __operator / (const float a, const mat3 n)
-{
-   __retVal[0] = a / n[0];
-   __retVal[1] = a / n[1];
-   __retVal[2] = a / n[2];
-}
-
-mat3 __operator / (const mat3 m, const float b)
-{
-   __retVal[0] = m[0] / b;
-   __retVal[1] = m[1] / b;
-   __retVal[2] = m[2] / b;
-}
-
-
-//// mat4/float operations
-
-mat4 __operator + (const float a, const mat4 n)
-{
-   __retVal[0] = a + n[0];
-   __retVal[1] = a + n[1];
-   __retVal[2] = a + n[2];
-   __retVal[3] = a + n[3];
-}
-
-mat4 __operator + (const mat4 m, const float b)
-{
-   __retVal[0] = m[0] + b;
-   __retVal[1] = m[1] + b;
-   __retVal[2] = m[2] + b;
-   __retVal[3] = m[3] + b;
-}
-
-mat4 __operator - (const float a, const mat4 n)
-{
-   __retVal[0] = a - n[0];
-   __retVal[1] = a - n[1];
-   __retVal[2] = a - n[2];
-   __retVal[3] = a - n[3];
-}
-
-mat4 __operator - (const mat4 m, const float b)
-{
-   __retVal[0] = m[0] - b;
-   __retVal[1] = m[1] - b;
-   __retVal[2] = m[2] - b;
-   __retVal[3] = m[3] - b;
-}
-
-mat4 __operator * (const float a, const mat4 n)
-{
-   __retVal[0] = a * n[0];
-   __retVal[1] = a * n[1];
-   __retVal[2] = a * n[2];
-   __retVal[3] = a * n[3];
-}
-
-mat4 __operator * (const mat4 m, const float b)
-{
-   __retVal[0] = m[0] * b;
-   __retVal[1] = m[1] * b;
-   __retVal[2] = m[2] * b;
-   __retVal[3] = m[3] * b;
-}
-
-mat4 __operator / (const float a, const mat4 n)
-{
-   __retVal[0] = a / n[0];
-   __retVal[1] = a / n[1];
-   __retVal[2] = a / n[2];
-   __retVal[3] = a / n[3];
-}
-
-mat4 __operator / (const mat4 m, const float b)
-{
-   __retVal[0] = m[0] / b;
-   __retVal[1] = m[1] / b;
-   __retVal[2] = m[2] / b;
-   __retVal[3] = m[3] / b;
-}
-
-
-
-//// matrix / vector products
-
-vec2 __operator * (const mat2 m, const vec2 v)
-{
-   __retVal = m[0] * v.xx
-            + m[1] * v.yy;
-}
-
-vec2 __operator * (const vec2 v, const mat2 m)
-{
-   __retVal.x = dot(v, m[0]);
-   __retVal.y = dot(v, m[1]);
-}
-
-vec3 __operator * (const mat3 m, const vec3 v)
-{
-   __retVal = m[0] * v.xxx
-            + m[1] * v.yyy
-            + m[2] * v.zzz;
-}
-
-vec3 __operator * (const vec3 v, const mat3 m)
-{
-   __retVal.x = dot(v, m[0]);
-   __retVal.y = dot(v, m[1]);
-   __retVal.z = dot(v, m[2]);
-}
-
-vec4 __operator * (const mat4 m, const vec4 v)
-{
-   __retVal = m[0] * v.xxxx
-            + m[1] * v.yyyy
-            + m[2] * v.zzzz
-            + m[3] * v.wwww;
-}
-
-vec4 __operator * (const vec4 v, const mat4 m)
-{
-   __retVal.x = dot(v, m[0]);
-   __retVal.y = dot(v, m[1]);
-   __retVal.z = dot(v, m[2]);
-   __retVal.w = dot(v, m[3]);
-}
-
-
-
-//// mat2 assignment operators
-
-mat2 __operator += (inout mat2 m, const mat2 n)
-{
-   m[0] = m[0] + n[0];
-   m[1] = m[1] + n[1];
-   return m;
-}
-
-mat2 __operator -= (inout mat2 m, const mat2 n)
-{
-   m[0] = m[0] - n[0];
-   m[1] = m[1] - n[1];
-   return m;
-}
-
-mat2 __operator *= (inout mat2 m, const mat2 n)
-{
-   m = m * n;
-   return m;
-}
-
-mat2 __operator /= (inout mat2 m, const mat2 n)
-{
-   m[0] = m[0] / n[0];
-   m[1] = m[1] / n[1];
-   return m;
-}
-
-
-//// mat3 assignment operators
-
-mat3 __operator += (inout mat3 m, const mat3 n)
-{
-   m[0] = m[0] + n[0];
-   m[1] = m[1] + n[1];
-   m[2] = m[2] + n[2];
-   return m;
-}
-
-mat3 __operator -= (inout mat3 m, const mat3 n)
-{
-   m[0] = m[0] - n[0];
-   m[1] = m[1] - n[1];
-   m[2] = m[2] - n[2];
-   return m;
-}
-
-mat3 __operator *= (inout mat3 m, const mat3 n)
-{
-   m = m * n;
-   return m;
-}
-
-mat3 __operator /= (inout mat3 m, const mat3 n)
-{
-   m[0] = m[0] / n[0];
-   m[1] = m[1] / n[1];
-   m[2] = m[2] / n[2];
-   return m;
-}
-
-
-// mat4 assignment operators
-
-mat4 __operator += (inout mat4 m, const mat4 n)
-{
-   m[0] = m[0] + n[0];
-   m[1] = m[1] + n[1];
-   m[2] = m[2] + n[2];
-   m[3] = m[3] + n[3];
-   return m;
-}
-
-mat4 __operator -= (inout mat4 m, const mat4 n)
-{
-   m[0] = m[0] - n[0];
-   m[1] = m[1] - n[1];
-   m[2] = m[2] - n[2];
-   m[3] = m[3] - n[3];
-   return m;
-}
-
-mat4 __operator *= (inout mat4 m, const mat4 n)
-{
-   m = m * n;
-   return m;
-}
-
-mat4 __operator /= (inout mat4 m, const mat4 n)
-{
-   m[0] = m[0] / n[0];
-   m[1] = m[1] / n[1];
-   m[2] = m[2] / n[2];
-   m[3] = m[3] / n[3];
-   return m;
-}
-
-
-//// mat2/float assignment operators
-
-mat2 __operator += (inout mat2 m, const float a)
-{
-   vec2 v = vec2(a);
-   m[0] = m[0] + v;
-   m[1] = m[1] + v;
-   return m;
-}
-
-mat2 __operator -= (inout mat2 m, const float a)
-{
-   vec2 v = vec2(a);
-   m[0] = m[0] - v;
-   m[1] = m[1] - v;
-   return m;
-}
-
-mat2 __operator *= (inout mat2 m, const float a)
-{
-   vec2 v = vec2(a);
-   m[0] = m[0] * v;
-   m[1] = m[1] * v;
-   return m;
-}
-
-mat2 __operator /= (inout mat2 m, const float a)
-{
-   vec2 v = vec2(1.0 / a);
-   m[0] = m[0] * v;
-   m[1] = m[1] * v;
-   return m;
-}
-
-
-//// mat3/float assignment operators
-
-mat3 __operator += (inout mat3 m, const float a)
-{
-   vec3 v = vec3(a);
-   m[0] = m[0] + v;
-   m[1] = m[1] + v;
-   m[2] = m[2] + v;
-   return m;
-}
-
-mat3 __operator -= (inout mat3 m, const float a)
-{
-   vec3 v = vec3(a);
-   m[0] = m[0] - v;
-   m[1] = m[1] - v;
-   m[2] = m[2] - v;
-   return m;
-}
-
-mat3 __operator *= (inout mat3 m, const float a)
-{
-   vec3 v = vec3(a);
-   m[0] = m[0] * v;
-   m[1] = m[1] * v;
-   m[2] = m[2] * v;
-   return m;
-}
-
-mat3 __operator /= (inout mat3 m, const float a)
-{
-   vec3 v = vec3(1.0 / a);
-   m[0] = m[0] * v;
-   m[1] = m[1] * v;
-   m[2] = m[2] * v;
-   return m;
-}
-
-
-//// mat4/float assignment operators
-
-mat4 __operator += (inout mat4 m, const float a)
-{
-   vec4 v = vec4(a);
-   m[0] = m[0] + v;
-   m[1] = m[1] + v;
-   m[2] = m[2] + v;
-   m[3] = m[3] + v;
-   return m;
-}
-
-mat4 __operator -= (inout mat4 m, const float a)
-{
-   vec4 v = vec4(a);
-   m[0] = m[0] - v;
-   m[1] = m[1] - v;
-   m[2] = m[2] - v;
-   m[3] = m[3] - v;
-   return m;
-}
-
-mat4 __operator *= (inout mat4 m, const float a)
-{
-   vec4 v = vec4(a);
-   m[0] = m[0] * v;
-   m[1] = m[1] * v;
-   m[2] = m[2] * v;
-   m[3] = m[3] * v;
-   return m;
-}
-
-mat4 __operator /= (inout mat4 m, const float a)
-{
-   vec4 v = vec4(1.0 / a);
-   m[0] = m[0] * v;
-   m[1] = m[1] * v;
-   m[2] = m[2] * v;
-   m[3] = m[3] * v;
-   return m;
-}
-
-
-
-//// vec/mat assignment operators
-
-vec2 __operator *= (inout vec2 v, const mat2 m)
-{
-   v = v * m;
-   return v;
-}
-
-vec3 __operator *= (inout vec3 v, const mat3 m)
-{
-   v = v * m;
-   return v;
-}
-
-vec4 __operator *= (inout vec4 v, const mat4 m)
-{
-   v = v * m;
-   return v;
-}
-
-
-
-//// pre-decrement operators
-
-int __operator --(inout int a)
-{
-    a = a - 1;
-   __retVal = a;
-}
-
-ivec2 __operator --(inout ivec2 v)
-{
-   v = v - ivec2(1);
-   __retVal = v;
-}
-
-ivec3 __operator --(inout ivec3 v)
-{
-   v = v - ivec3(1);
-   __retVal = v;
-}
-
-ivec4 __operator --(inout ivec4 v)
-{
-   v = v - ivec4(1);
-   __retVal = v;
-}
-
-
-float __operator --(inout float a)
-{
-   a = a - 1.0;
-   __retVal = a;
-}
-
-vec2 __operator --(inout vec2 v)
-{
-   v = v - vec2(1.0);
-   __retVal = v;
-}
-
-vec3 __operator --(inout vec3 v)
-{
-   v = v - vec3(1.0);
-   __retVal = v;
-}
-
-vec4 __operator --(inout vec4 v)
-{
-   v = v - vec4(1.0);
-   __retVal = v;
-}
-
-
-mat2 __operator --(inout mat2 m)
-{
-   m[0] = m[0] - vec2(1.0);
-   m[1] = m[1] - vec2(1.0);
-   __retVal = m;
-}
-
-mat3 __operator --(inout mat3 m)
-{
-   m[0] = m[0] - vec3(1.0);
-   m[1] = m[1] - vec3(1.0);
-   m[2] = m[2] - vec3(1.0);
-   __retVal = m;
-}
-
-mat4 __operator --(inout mat4 m)
-{
-   m[0] = m[0] - vec4(1.0);
-   m[1] = m[1] - vec4(1.0);
-   m[2] = m[2] - vec4(1.0);
-   m[3] = m[3] - vec4(1.0);
-   __retVal = m;
-}
-
-
-//// pre-increment operators
-
-int __operator ++(inout int a)
-{
-    a = a + 1;
-    __retVal = a;
-}
-
-ivec2 __operator ++(inout ivec2 v)
-{
-   v = v + ivec2(1);
-   __retVal = v;
-}
-
-ivec3 __operator ++(inout ivec3 v)
-{
-   v = v + ivec3(1);
-   __retVal = v;
-}
-
-ivec4 __operator ++(inout ivec4 v)
-{
-   v = v + ivec4(1);
-   __retVal = v;
-}
-
-
-float __operator ++(inout float a)
-{
-    a = a + 1.0;
-    __retVal = a;
-}
-
-vec2 __operator ++(inout vec2 v)
-{
-   v = v + vec2(1.0);
-   __retVal = v;
-}
-
-vec3 __operator ++(inout vec3 v)
-{
-   v = v + vec3(1.0);
-   __retVal = v;
-}
-
-vec4 __operator ++(inout vec4 v)
-{
-   v = v + vec4(1.0);
-   __retVal = v;
-}
-
-
-mat2 __operator ++(inout mat2 m)
-{
-   m[0] = m[0] + vec2(1.0);
-   m[1] = m[1] + vec2(1.0);
-   __retVal = m;
-}
-
-mat3 __operator ++(inout mat3 m)
-{
-   m[0] = m[0] + vec3(1.0);
-   m[1] = m[1] + vec3(1.0);
-   m[2] = m[2] + vec3(1.0);
-   __retVal = m;
-}
-
-mat4 __operator ++(inout mat4 m)
-{
-   m[0] = m[0] + vec4(1.0);
-   m[1] = m[1] + vec4(1.0);
-   m[2] = m[2] + vec4(1.0);
-   m[3] = m[3] + vec4(1.0);
-   __retVal = m;
-}
-
-
-
-//// post-decrement
-
-int __postDecr(inout int a)
-{
-   __retVal = a;
-   a = a - 1;
-}
-
-ivec2 __postDecr(inout ivec2 v)
-{
-   __retVal = v;
-   v = v - ivec2(1);
-}
-
-ivec3 __postDecr(inout ivec3 v)
-{
-   __retVal = v;
-   v = v - ivec3(1);
-}
-
-ivec4 __postDecr(inout ivec4 v)
-{
-   __retVal = v;
-   v = v - ivec4(1);
-}
-
-
-float __postDecr(inout float a)
-{
-   __retVal = a;
-   a = a - 1.0;
-}
-
-vec2 __postDecr(inout vec2 v)
-{
-   __retVal = v;
-   v = v - vec2(1.0);
-}
-
-vec3 __postDecr(inout vec3 v)
-{
-   __retVal = v;
-   v = v - vec3(1.0);
-}
-
-vec4 __postDecr(inout vec4 v)
-{
-   __retVal = v;
-   v = v - vec4(1.0);
-}
-
-
-mat2 __postDecr(inout mat2 m)
-{
-   __retVal = m;
-   m[0] = m[0] - vec2(1.0);
-   m[1] = m[1] - vec2(1.0);
-}
-
-mat3 __postDecr(inout mat3 m)
-{
-   __retVal = m;
-   m[0] = m[0] - vec3(1.0);
-   m[1] = m[1] - vec3(1.0);
-   m[2] = m[2] - vec3(1.0);
-}
-
-mat4 __postDecr(inout mat4 m)
-{
-   __retVal = m;
-   m[0] = m[0] - vec4(1.0);
-   m[1] = m[1] - vec4(1.0);
-   m[2] = m[2] - vec4(1.0);
-   m[3] = m[3] - vec4(1.0);
-}
-
-
-//// post-increment
-
-float __postIncr(inout float a)
-{
-   __retVal = a;
-   a = a + 1;
-}
-
-vec2 __postIncr(inout vec2 v)
-{
-   __retVal = v;
-   v = v + vec2(1.0);
-}
-
-vec3 __postIncr(inout vec3 v)
-{
-   __retVal = v;
-   v = v + vec3(1.0);
-}
-
-vec4 __postIncr(inout vec4 v)
-{
-   __retVal = v;
-   v = v + vec4(1.0);
-}
-
-
-int __postIncr(inout int a)
-{
-   __retVal = a;
-   a = a + 1;
-}
-
-ivec2 __postIncr(inout ivec2 v)
-{
-   __retVal = v;
-   v = v + ivec2(1);
-}
-
-ivec3 __postIncr(inout ivec3 v)
-{
-   __retVal = v;
-   v = v + ivec3(1);
-}
-
-ivec4 __postIncr(inout ivec4 v)
-{
-   __retVal = v;
-   v = v + ivec3(1);
-}
-
-
-mat2 __postIncr(inout mat2 m)
-{
-   mat2 n = m;
-   m[0] = m[0] + vec2(1.0);
-   m[1] = m[1] + vec2(1.0);
-   return n;
-}
-
-mat3 __postIncr(inout mat3 m)
-{
-   mat3 n = m;
-   m[0] = m[0] + vec3(1.0);
-   m[1] = m[1] + vec3(1.0);
-   m[2] = m[2] + vec3(1.0);
-   return n;
-}
-
-mat4 __postIncr(inout mat4 m)
-{
-   mat4 n = m;
-   m[0] = m[0] + vec4(1.0);
-   m[1] = m[1] + vec4(1.0);
-   m[2] = m[2] + vec4(1.0);
-   m[3] = m[3] + vec4(1.0);
-   return n;
-}
-
-
-
-//// inequality operators
-
-
-// XXX are the inequality operators for floats/ints really needed????
-bool __operator < (const float a, const float b)
-{
-   __asm vec4_sgt __retVal.x, b, a;
-}
-
-
-bool __operator < (const int a, const int b) {
-    return float (a) < float (b);
-}
-
-bool __operator > (const float a, const float b) {
-    bool c;
-    __asm float_less c, b, a;
-    return c;
-}
-
-bool __operator > (const int a, const int b) {
-    return float (a) > float (b);
-}
-
-bool __operator >= (const float a, const float b) {
-    bool g, e;
-    __asm float_less  g, b, a;
-    __asm float_equal e, a, b;
-    return g || e;
-}
-
-bool __operator >= (const int a, const int b) {
-    return float (a) >= float (b);
-}
-
-bool __operator <= (const float a, const float b) {
-    bool g, e;
-    __asm float_less  g, a, b;
-    __asm float_equal e, a, b;
-    return g || e;
-}
-
-bool __operator <= (const int a, const int b) {
-    return float (a) <= float (b);
-}
-
-
-
-//
-// MESA-specific extension functions.
-//
-
-void printMESA (const float f) {
-    __asm float_print f;
-}
-
-void printMESA (const int i) {
-    __asm int_print i;
-}
-
-void printMESA (const bool b) {
-    __asm bool_print b;
-}
-
-void printMESA (const vec2 v) {
-    printMESA (v.x);
-    printMESA (v.y);
-}
-
-void printMESA (const vec3 v) {
-    printMESA (v.x);
-    printMESA (v.y);
-    printMESA (v.z);
-}
-
-void printMESA (const vec4 v) {
-    printMESA (v.x);
-    printMESA (v.y);
-    printMESA (v.z);
-    printMESA (v.w);
-}
-
-void printMESA (const ivec2 v) {
-    printMESA (v.x);
-    printMESA (v.y);
-}
-
-void printMESA (const ivec3 v) {
-    printMESA (v.x);
-    printMESA (v.y);
-    printMESA (v.z);
-}
-
-void printMESA (const ivec4 v) {
-    printMESA (v.x);
-    printMESA (v.y);
-    printMESA (v.z);
-    printMESA (v.w);
-}
-
-void printMESA (const bvec2 v) {
-    printMESA (v.x);
-    printMESA (v.y);
-}
-
-void printMESA (const bvec3 v) {
-    printMESA (v.x);
-    printMESA (v.y);
-    printMESA (v.z);
-}
-
-void printMESA (const bvec4 v) {
-    printMESA (v.x);
-    printMESA (v.y);
-    printMESA (v.z);
-    printMESA (v.w);
-}
-
-void printMESA (const mat2 m) {
-    printMESA (m[0]);
-    printMESA (m[1]);
-}
-
-void printMESA (const mat3 m) {
-    printMESA (m[0]);
-    printMESA (m[1]);
-    printMESA (m[2]);
-}
-
-void printMESA (const mat4 m) {
-    printMESA (m[0]);
-    printMESA (m[1]);
-    printMESA (m[2]);
-    printMESA (m[3]);
-}
-
-void printMESA (const sampler1D e) {
-    __asm int_print e;
-}
-
-void printMESA (const sampler2D e) {
-    __asm int_print e;
-}
-
-void printMESA (const sampler3D e) {
-    __asm int_print e;
-}
-
-void printMESA (const samplerCube e) {
-    __asm int_print e;
-}
-
-void printMESA (const sampler1DShadow e) {
-    __asm int_print e;
-}
-
-void printMESA (const sampler2DShadow e) {
-    __asm int_print e;
-}
-
diff --git a/mesalib/src/mesa/shader/slang/library/slang_fragment_builtin.gc b/mesalib/src/mesa/shader/slang/library/slang_fragment_builtin.gc
deleted file mode 100644
index 54a80ea0e..000000000
--- a/mesalib/src/mesa/shader/slang/library/slang_fragment_builtin.gc
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5
- *
- * Copyright (C) 2006  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-//
-// From Shader Spec, ver. 1.10, rev. 59
-//
-
-__fixed_input vec4 gl_FragCoord;
-__fixed_input bool gl_FrontFacing;
-__fixed_output vec4 gl_FragColor;
-__fixed_output vec4 gl_FragData[gl_MaxDrawBuffers];
-__fixed_output float gl_FragDepth;
-
-varying vec4 gl_Color;
-varying vec4 gl_SecondaryColor;
-varying vec4 gl_TexCoord[gl_MaxTextureCoords];
-varying float gl_FogFragCoord;
-
-
-
-//// 8.7 Texture Lookup Functions (with bias)
-
-vec4 texture1D(const sampler1D sampler, const float coord, const float bias)
-{
-   vec4 coord4;
-   coord4.x = coord;
-   coord4.w = bias;
-   __asm vec4_tex_1d_bias __retVal, sampler, coord4;
-}
-
-vec4 texture1DProj(const sampler1D sampler, const vec2 coord, const float bias)
-{
-   // do projection here (there's no vec4_texbp1d instruction)
-   vec4 pcoord;
-   pcoord.x = coord.x / coord.y;
-   pcoord.w = bias;
-   __asm vec4_tex_1d_bias __retVal, sampler, pcoord;
-}
-
-vec4 texture1DProj(const sampler1D sampler, const vec4 coord, const float bias)
-{
-   // do projection here (there's no vec4_texbp1d instruction)
-   vec4 pcoord;
-   pcoord.x = coord.x / coord.z;
-   pcoord.w = bias;
-   __asm vec4_tex_1d_bias __retVal, sampler, pcoord;
-}
-
-
-
-
-vec4 texture2D(const sampler2D sampler, const vec2 coord, const float bias)
-{
-   vec4 coord4;
-   coord4.xy = coord.xy;
-   coord4.w = bias;
-   __asm vec4_tex_2d_bias __retVal, sampler, coord4;
-}
-
-vec4 texture2DProj(const sampler2D sampler, const vec3 coord, const float bias)
-{
-   // do projection here (there's no vec4_texbp2d instruction)
-   vec4 pcoord;
-   pcoord.xy = coord.xy / coord.z;
-   pcoord.w = bias;
-   __asm vec4_tex_2d_bias __retVal, sampler, pcoord;
-}
-
-vec4 texture2DProj(const sampler2D sampler, const vec4 coord, const float bias)
-{
-   // do projection here (there's no vec4_texbp2d instruction)
-   vec4 pcoord;
-   pcoord.xy = coord.xy / coord.w;
-   pcoord.w = bias;
-   __asm vec4_tex_2d_bias __retVal, sampler, pcoord;
-}
-
-
-
-
-vec4 texture3D(const sampler3D sampler, const vec3 coord, const float bias)
-{
-   vec4 coord4;
-   coord4.xyz = coord.xyz;
-   coord4.w = bias;
-   __asm vec4_tex_3d_bias __retVal, sampler, coord4;
-}
-
-vec4 texture3DProj(const sampler3D sampler, const vec4 coord, const float bias)
-{
-   // do projection here (there's no vec4_texbp3d instruction)
-   vec4 pcoord;
-   pcoord.xyz = coord.xyz / coord.w;
-   pcoord.w = bias;
-   __asm vec4_tex_3d_bias __retVal, sampler, pcoord;
-}
-
-
-
-
-vec4 textureCube(const samplerCube sampler, const vec3 coord, const float bias)
-{
-   vec4 coord4;
-   coord4.xyz = coord;
-   coord4.w = bias;
-   __asm vec4_tex_cube __retVal, sampler, coord4;
-}
-
-
-
-vec4 shadow1D(const sampler1DShadow sampler, const vec3 coord, const float bias)
-{
-   vec4 coord4;
-   coord4.xyz = coord;
-   coord4.w = bias;
-   __asm vec4_tex_1d_bias_shadow __retVal, sampler, coord4;
-}
-
-vec4 shadow1DProj(const sampler1DShadow sampler, const vec4 coord, const float bias)
-{
-   vec4 pcoord;
-   pcoord.x = coord.x / coord.w;
-   pcoord.z = coord.z;
-   pcoord.w = bias;
-   __asm vec4_tex_1d_bias_shadow __retVal, sampler, pcoord;
-}
-
-vec4 shadow2D(const sampler2DShadow sampler, const vec3 coord, const float bias)
-{
-   vec4 coord4;
-   coord4.xyz = coord;
-   coord4.w = bias;
-   __asm vec4_tex_2d_bias_shadow __retVal, sampler, coord4;
-}
-
-vec4 shadow2DProj(const sampler2DShadow sampler, const vec4 coord, const float bias)
-{
-   vec4 pcoord;
-   pcoord.xy = coord.xy / coord.w;
-   pcoord.z = coord.z;
-   pcoord.w = bias;
-   __asm vec4_tex_2d_bias_shadow __retVal, sampler, pcoord;
-}
-
-
-
-//// GL_EXT_texture_array
-
-vec4 texture1DArray(const sampler1DArray sampler, const vec2 coord)
-{
-   vec4 coord4;
-   coord4.xy = coord;
-   __asm vec4_tex_1d_array __retVal, sampler, coord4;
-}
-
-vec4 texture1DArray(const sampler1DArray sampler, const vec2 coord, const float bias)
-{
-   vec4 coord4;
-   coord4.xy = coord;
-   coord4.w = bias;
-   __asm vec4_tex_1d_array_bias __retVal, sampler, coord4;
-}
-
-vec4 texure2DArray(const sampler2DArray sampler, const vec3 coord)
-{
-   vec4 coord4;
-   coord4.xyz = coord;
-   __asm vec4_tex_2d_array __retVal, sampler, coord4;
-}
-
-vec4 texture2DArray(const sampler2DArray sampler, const vec3 coord, const float bias)
-{
-   vec4 coord4;
-   coord4.xyz = coord;
-   coord4.w = bias;
-   __asm vec4_tex_2d_array_bias __retVal, sampler, coord4;
-}
-
-vec4 shadow1DArray(const sampler1DArrayShadow sampler, const vec2 coord)
-{
-   vec4 coord4;
-   coord4.xy = coord;
-   __asm vec4_tex_1d_array_shadow __retVal, sampler, coord4;
-}
-
-vec4 shadow1DArray(const sampler1DArrayShadow sampler, const vec2 coord, const float bias)
-{
-   vec4 coord4;
-   coord4.xy = coord;
-   coord4.w = bias;
-   __asm vec4_tex_1d_array_bias_shadow __retVal, sampler, coord4;
-}
-
-vec4 shadow2DArray(const sampler2DArrayShadow sampler, const vec3 coord)
-{
-   vec4 coord4;
-   coord4.xyz = coord;
-   __asm vec4_tex_2d_array_shadow __retVal, sampler, coord4;
-}
-
-vec4 shadow2DArray(const sampler2DArrayShadow sampler, const vec3 coord, const float bias)
-{
-   vec4 coord4;
-   coord4.xyz = coord;
-   coord4.w = bias;
-   __asm vec4_tex_2d_array_bias_shadow __retVal, sampler, coord4;
-}
-
-
-
-//
-// 8.8 Fragment Processing Functions
-//
-
-float dFdx(const float p)
-{
-   __asm vec4_ddx __retVal.x, p.xxxx;
-}
-
-vec2 dFdx(const vec2 p)
-{
-   __asm vec4_ddx __retVal.xy, p.xyyy;
-}
-
-vec3 dFdx(const vec3 p)
-{
-   __asm vec4_ddx __retVal.xyz, p.xyzz;
-}
-
-vec4 dFdx(const vec4 p)
-{
-   __asm vec4_ddx __retVal, p;
-}
-
-float dFdy(const float p)
-{
-   __asm vec4_ddy __retVal.x, p.xxxx;
-}
-
-vec2 dFdy(const vec2 p)
-{
-   __asm vec4_ddy __retVal.xy, p.xyyy;
-}
-
-vec3 dFdy(const vec3 p)
-{
-   __asm vec4_ddy __retVal.xyz, p.xyzz;
-}
-
-vec4 dFdy(const vec4 p)
-{
-   __asm vec4_ddy __retVal, p;
-}
-
-float fwidth (const float p)
-{
-   // XXX hand-write with __asm
-   return abs(dFdx(p)) + abs(dFdy(p));
-}
-
-vec2 fwidth(const vec2 p)
-{
-   // XXX hand-write with __asm
-   return abs(dFdx(p)) + abs(dFdy(p));
-}
-
-vec3 fwidth(const vec3 p)
-{
-   // XXX hand-write with __asm
-   return abs(dFdx(p)) + abs(dFdy(p));
-}
-
-vec4 fwidth(const vec4 p)
-{
-   // XXX hand-write with __asm
-   return abs(dFdx(p)) + abs(dFdy(p));
-}
-
diff --git a/mesalib/src/mesa/shader/slang/library/slang_vertex_builtin.gc b/mesalib/src/mesa/shader/slang/library/slang_vertex_builtin.gc
deleted file mode 100644
index 0c67c2ef2..000000000
--- a/mesalib/src/mesa/shader/slang/library/slang_vertex_builtin.gc
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5
- *
- * Copyright (C) 2006  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-//
-// From Shader Spec, ver. 1.10, rev. 59
-//
-
-__fixed_output vec4 gl_Position;
-__fixed_output float gl_PointSize;
-__fixed_output vec4 gl_ClipVertex;
-
-attribute vec4 gl_Color;
-attribute vec4 gl_SecondaryColor;
-attribute vec3 gl_Normal;
-attribute vec4 gl_Vertex;
-attribute vec4 gl_MultiTexCoord0;
-attribute vec4 gl_MultiTexCoord1;
-attribute vec4 gl_MultiTexCoord2;
-attribute vec4 gl_MultiTexCoord3;
-attribute vec4 gl_MultiTexCoord4;
-attribute vec4 gl_MultiTexCoord5;
-attribute vec4 gl_MultiTexCoord6;
-attribute vec4 gl_MultiTexCoord7;
-attribute float gl_FogCoord;
-
-varying vec4 gl_FrontColor;
-varying vec4 gl_BackColor;
-varying vec4 gl_FrontSecondaryColor;
-varying vec4 gl_BackSecondaryColor;
-varying vec4 gl_TexCoord[gl_MaxTextureCoords];
-varying float gl_FogFragCoord;
-
-//
-// Geometric Functions
-//
-
-vec4 ftransform()
-{
-   __retVal = gl_ModelViewProjectionMatrix[0] * gl_Vertex.xxxx
-            + gl_ModelViewProjectionMatrix[1] * gl_Vertex.yyyy
-            + gl_ModelViewProjectionMatrix[2] * gl_Vertex.zzzz
-            + gl_ModelViewProjectionMatrix[3] * gl_Vertex.wwww;
-}
-
-
-
-//
-// 8.7 Texture Lookup Functions
-// These are pretty much identical to the ones in slang_fragment_builtin.gc
-// When used in a vertex program, the texture sample instructions should not
-// be using a LOD term so it's effectively zero.  Adding 'lod' to that does
-// what we want.
-//
-
-vec4 texture1DLod(const sampler1D sampler, const float coord, const float lod)
-{
-   vec4 coord4;
-   coord4.x = coord;
-   coord4.w = lod;
-   __asm vec4_tex_1d_bias __retVal, sampler, coord4;
-}
-
-vec4 texture1DProjLod(const sampler1D sampler, const vec2 coord, const float lod)
-{
-   vec4 pcoord;
-   pcoord.x = coord.x / coord.y;
-   pcoord.w = lod;
-   __asm vec4_tex_1d_bias __retVal, sampler, pcoord;
-}
-
-vec4 texture1DProjLod(const sampler1D sampler, const vec4 coord, const float lod)
-{
-   vec4 pcoord;
-   pcoord.x = coord.x / coord.z;
-   pcoord.w = lod;
-   __asm vec4_tex_1d_bias __retVal, sampler, pcoord;
-}
-
-
-
-vec4 texture2DLod(const sampler2D sampler, const vec2 coord, const float lod)
-{
-   vec4 coord4;
-   coord4.xy = coord.xy;
-   coord4.w = lod;
-   __asm vec4_tex_2d_bias __retVal, sampler, coord4;
-}
-
-vec4 texture2DProjLod(const sampler2D sampler, const vec3 coord, const float lod)
-{
-   vec4 pcoord;
-   pcoord.xy = coord.xy / coord.z;
-   pcoord.w = lod;
-   __asm vec4_tex_2d_bias __retVal, sampler, pcoord;
-}
-
-vec4 texture2DProjLod(const sampler2D sampler, const vec4 coord, const float lod)
-{
-   vec4 pcoord;
-   pcoord.xy = coord.xy / coord.z;
-   pcoord.w = lod;
-   __asm vec4_tex_2d_bias __retVal, sampler, pcoord;
-}
-
-
-vec4 texture3DLod(const sampler3D sampler, const vec3 coord, const float lod)
-{
-   vec4 coord4;
-   coord4.xyz = coord.xyz;
-   coord4.w = lod;
-   __asm vec4_tex_3d_bias __retVal, sampler, coord4;
-}
-
-vec4 texture3DProjLod(const sampler3D sampler, const vec4 coord, const float lod)
-{
-   // do projection here (there's no vec4_tex_3d_bias_proj instruction)
-   vec4 pcoord;
-   pcoord.xyz = coord.xyz / coord.w;
-   pcoord.w = lod;
-   __asm vec4_tex_3d_bias __retVal, sampler, pcoord;
-}
-
-
-vec4 textureCubeLod(const samplerCube sampler, const vec3 coord, const float lod)
-{
-   vec4 coord4;
-   coord4.xyz = coord;
-   coord4.w = lod;
-   __asm vec4_tex_cube __retVal, sampler, coord4;
-}
-
-
-vec4 shadow1DLod(const sampler1DShadow sampler, const vec3 coord, const float lod)
-{
-   vec4 coord4;
-   coord4.xyz = coord;
-   coord4.w = lod;
-   __asm vec4_tex_1d_bias_shadow __retVal, sampler, coord4;
-}
-
-vec4 shadow1DProjLod(const sampler1DShadow sampler, const vec4 coord,
-                     const float lod)
-{
-   vec4 pcoord;
-   pcoord.x = coord.x / coord.w;
-   pcoord.z = coord.z;
-   pcoord.w = lod;
-   __asm vec4_tex_1d_bias_shadow __retVal, sampler, pcoord;
-}
-
-
-vec4 shadow2DLod(const sampler2DShadow sampler, const vec3 coord, const float lod)
-{
-   vec4 coord4;
-   coord4.xyz = coord;
-   coord4.w = lod;
-   __asm vec4_tex_2d_bias_shadow __retVal, sampler, coord4;
-}
-
-vec4 shadow2DProjLod(const sampler2DShadow sampler, const vec4 coord,
-                     const float lod)
-{
-   vec4 pcoord;
-   pcoord.xy = coord.xy / coord.w;
-   pcoord.z = coord.z;
-   pcoord.w = lod;
-   __asm vec4_tex_2d_bias_shadow __retVal, sampler, pcoord;
-}
-
-
-//// GL_EXT_texture_array
-
-vec4 texture1DArrayLod(const sampler1DArray sampler, const vec2 coord, const float lod)
-{
-   vec4 coord4;
-   coord4.xy = coord;
-   coord4.w = lod;
-   __asm vec4_tex_1d_array_bias __retVal, sampler, coord4;
-}
-
-
-vec4 texture2DArrayLod(const sampler2DArray sampler, const vec3 coord, const float lod)
-{
-   vec4 coord4;
-   coord4.xyz = coord;
-   coord4.w = lod;
-   __asm vec4_tex_2d_array_bias __retVal, sampler, coord4;
-}
-
diff --git a/mesalib/src/mesa/shader/slang/slang_builtin.c b/mesalib/src/mesa/shader/slang/slang_builtin.c
deleted file mode 100644
index 791e75152..000000000
--- a/mesalib/src/mesa/shader/slang/slang_builtin.c
+++ /dev/null
@@ -1,897 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.3
- *
- * Copyright (C) 2005-2007  Brian Paul   All Rights Reserved.
- * Copyright (C) 2008  VMware, Inc.   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, 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 slang_builtin.c
- * Resolve built-in uniform vars.
- * \author Brian Paul
- */
-
-#include "main/imports.h"
-#include "main/mtypes.h"
-#include "shader/program.h"
-#include "shader/prog_instruction.h"
-#include "shader/prog_parameter.h"
-#include "shader/prog_statevars.h"
-#include "shader/slang/slang_ir.h"
-#include "shader/slang/slang_builtin.h"
-
-
-/** special state token (see below) */
-#define STATE_ARRAY ((gl_state_index) 0xfffff)
-
-
-/**
- * Lookup GL state given a variable name, 0, 1 or 2 indexes and a field.
- * Allocate room for the state in the given param list and return position
- * in the list.
- * Yes, this is kind of ugly, but it works.
- */
-static GLint
-lookup_statevar(const char *var, GLint index1, GLint index2, const char *field,
-                GLuint *swizzleOut,
-                struct gl_program_parameter_list *paramList)
-{
-   /*
-    * NOTE: The ARB_vertex_program extension specified that matrices get
-    * loaded in registers in row-major order.  With GLSL, we want column-
-    * major order.  So, we need to transpose all matrices here...
-    */
-   static const struct {
-      const char *name;
-      gl_state_index matrix;
-      gl_state_index modifier;
-   } matrices[] = {
-      { "gl_ModelViewMatrix", STATE_MODELVIEW_MATRIX, STATE_MATRIX_TRANSPOSE },
-      { "gl_ModelViewMatrixInverse", STATE_MODELVIEW_MATRIX, STATE_MATRIX_INVTRANS },
-      { "gl_ModelViewMatrixTranspose", STATE_MODELVIEW_MATRIX, 0 },
-      { "gl_ModelViewMatrixInverseTranspose", STATE_MODELVIEW_MATRIX, STATE_MATRIX_INVERSE },
-
-      { "gl_ProjectionMatrix", STATE_PROJECTION_MATRIX, STATE_MATRIX_TRANSPOSE },
-      { "gl_ProjectionMatrixInverse", STATE_PROJECTION_MATRIX, STATE_MATRIX_INVTRANS },
-      { "gl_ProjectionMatrixTranspose", STATE_PROJECTION_MATRIX, 0 },
-      { "gl_ProjectionMatrixInverseTranspose", STATE_PROJECTION_MATRIX, STATE_MATRIX_INVERSE },
-
-      { "gl_ModelViewProjectionMatrix", STATE_MVP_MATRIX, STATE_MATRIX_TRANSPOSE },
-      { "gl_ModelViewProjectionMatrixInverse", STATE_MVP_MATRIX, STATE_MATRIX_INVTRANS },
-      { "gl_ModelViewProjectionMatrixTranspose", STATE_MVP_MATRIX, 0 },
-      { "gl_ModelViewProjectionMatrixInverseTranspose", STATE_MVP_MATRIX, STATE_MATRIX_INVERSE },
-
-      { "gl_TextureMatrix", STATE_TEXTURE_MATRIX, STATE_MATRIX_TRANSPOSE },
-      { "gl_TextureMatrixInverse", STATE_TEXTURE_MATRIX, STATE_MATRIX_INVTRANS },
-      { "gl_TextureMatrixTranspose", STATE_TEXTURE_MATRIX, 0 },
-      { "gl_TextureMatrixInverseTranspose", STATE_TEXTURE_MATRIX, STATE_MATRIX_INVERSE },
-
-      { "gl_NormalMatrix", STATE_MODELVIEW_MATRIX, STATE_MATRIX_INVERSE },
-
-      { NULL, 0, 0 }
-   };
-   gl_state_index tokens[STATE_LENGTH];
-   GLuint i;
-   GLboolean isMatrix = GL_FALSE;
-
-   for (i = 0; i < STATE_LENGTH; i++) {
-      tokens[i] = 0;
-   }
-   *swizzleOut = SWIZZLE_NOOP;
-
-   /* first, look if var is a pre-defined matrix */
-   for (i = 0; matrices[i].name; i++) {
-      if (strcmp(var, matrices[i].name) == 0) {
-         tokens[0] = matrices[i].matrix;
-         /* tokens[1], [2] and [3] filled below */
-         tokens[4] = matrices[i].modifier;
-         isMatrix = GL_TRUE;
-         break;
-      }
-   }
-
-   if (isMatrix) {
-      if (tokens[0] == STATE_TEXTURE_MATRIX) {
-         /* texture_matrix[index1][index2] */
-         tokens[1] = index1 >= 0 ? index1 : 0; /* which texture matrix */
-         index1 = index2; /* move matrix row value to index1 */
-      }
-      if (index1 < 0) {
-         /* index1 is unused: prevent extra addition at end of function */
-         index1 = 0;
-      }
-   }
-   else if (strcmp(var, "gl_DepthRange") == 0) {
-      tokens[0] = STATE_DEPTH_RANGE;
-      assert(field);
-      if (strcmp(field, "near") == 0) {
-         *swizzleOut = SWIZZLE_XXXX;
-      }
-      else if (strcmp(field, "far") == 0) {
-         *swizzleOut = SWIZZLE_YYYY;
-      }
-      else if (strcmp(field, "diff") == 0) {
-         *swizzleOut = SWIZZLE_ZZZZ;
-      }
-      else {
-         return -1;
-      }
-   }
-   else if (strcmp(var, "gl_ClipPlane") == 0) {
-      if (index1 < 0)
-         return -1;
-      tokens[0] = STATE_CLIPPLANE;
-      tokens[1] = index1;
-   }
-   else if (strcmp(var, "gl_Point") == 0) {
-      assert(field);
-      if (strcmp(field, "size") == 0) {
-         tokens[0] = STATE_POINT_SIZE;
-         *swizzleOut = SWIZZLE_XXXX;
-      }
-      else if (strcmp(field, "sizeMin") == 0) {
-         tokens[0] = STATE_POINT_SIZE;
-         *swizzleOut = SWIZZLE_YYYY;
-      }
-      else if (strcmp(field, "sizeMax") == 0) {
-         tokens[0] = STATE_POINT_SIZE;
-         *swizzleOut = SWIZZLE_ZZZZ;
-      }
-      else if (strcmp(field, "fadeThresholdSize") == 0) {
-         tokens[0] = STATE_POINT_SIZE;
-         *swizzleOut = SWIZZLE_WWWW;
-      }
-      else if (strcmp(field, "distanceConstantAttenuation") == 0) {
-         tokens[0] = STATE_POINT_ATTENUATION;
-         *swizzleOut = SWIZZLE_XXXX;
-      }
-      else if (strcmp(field, "distanceLinearAttenuation") == 0) {
-         tokens[0] = STATE_POINT_ATTENUATION;
-         *swizzleOut = SWIZZLE_YYYY;
-      }
-      else if (strcmp(field, "distanceQuadraticAttenuation") == 0) {
-         tokens[0] = STATE_POINT_ATTENUATION;
-         *swizzleOut = SWIZZLE_ZZZZ;
-      }
-      else {
-         return -1;
-      }
-   }
-   else if (strcmp(var, "gl_FrontMaterial") == 0 ||
-            strcmp(var, "gl_BackMaterial") == 0) {
-      tokens[0] = STATE_MATERIAL;
-      if (strcmp(var, "gl_FrontMaterial") == 0)
-         tokens[1] = 0;
-      else
-         tokens[1] = 1;
-      assert(field);
-      if (strcmp(field, "emission") == 0) {
-         tokens[2] = STATE_EMISSION;
-      }
-      else if (strcmp(field, "ambient") == 0) {
-         tokens[2] = STATE_AMBIENT;
-      }
-      else if (strcmp(field, "diffuse") == 0) {
-         tokens[2] = STATE_DIFFUSE;
-      }
-      else if (strcmp(field, "specular") == 0) {
-         tokens[2] = STATE_SPECULAR;
-      }
-      else if (strcmp(field, "shininess") == 0) {
-         tokens[2] = STATE_SHININESS;
-         *swizzleOut = SWIZZLE_XXXX;
-      }
-      else {
-         return -1;
-      }
-   }
-   else if (strcmp(var, "gl_LightSource") == 0) {
-      if (!field || index1 < 0)
-         return -1;
-
-      tokens[0] = STATE_LIGHT;
-      tokens[1] = index1;
-
-      if (strcmp(field, "ambient") == 0) {
-         tokens[2] = STATE_AMBIENT;
-      }
-      else if (strcmp(field, "diffuse") == 0) {
-         tokens[2] = STATE_DIFFUSE;
-      }
-      else if (strcmp(field, "specular") == 0) {
-         tokens[2] = STATE_SPECULAR;
-      }
-      else if (strcmp(field, "position") == 0) {
-         tokens[2] = STATE_POSITION;
-      }
-      else if (strcmp(field, "halfVector") == 0) {
-         tokens[2] = STATE_HALF_VECTOR;
-      }
-      else if (strcmp(field, "spotDirection") == 0) {
-         tokens[2] = STATE_SPOT_DIRECTION;
-      }
-      else if (strcmp(field, "spotCosCutoff") == 0) {
-         tokens[2] = STATE_SPOT_DIRECTION;
-         *swizzleOut = SWIZZLE_WWWW;
-      }
-      else if (strcmp(field, "spotCutoff") == 0) {
-         tokens[2] = STATE_SPOT_CUTOFF;
-         *swizzleOut = SWIZZLE_XXXX;
-      }
-      else if (strcmp(field, "spotExponent") == 0) {
-         tokens[2] = STATE_ATTENUATION;
-         *swizzleOut = SWIZZLE_WWWW;
-      }
-      else if (strcmp(field, "constantAttenuation") == 0) {
-         tokens[2] = STATE_ATTENUATION;
-         *swizzleOut = SWIZZLE_XXXX;
-      }
-      else if (strcmp(field, "linearAttenuation") == 0) {
-         tokens[2] = STATE_ATTENUATION;
-         *swizzleOut = SWIZZLE_YYYY;
-      }
-      else if (strcmp(field, "quadraticAttenuation") == 0) {
-         tokens[2] = STATE_ATTENUATION;
-         *swizzleOut = SWIZZLE_ZZZZ;
-      }
-      else {
-         return -1;
-      }
-   }
-   else if (strcmp(var, "gl_LightModel") == 0) {
-      if (strcmp(field, "ambient") == 0) {
-         tokens[0] = STATE_LIGHTMODEL_AMBIENT;
-      }
-      else {
-         return -1;
-      }
-   }
-   else if (strcmp(var, "gl_FrontLightModelProduct") == 0) {
-      if (strcmp(field, "sceneColor") == 0) {
-         tokens[0] = STATE_LIGHTMODEL_SCENECOLOR;
-         tokens[1] = 0;
-      }
-      else {
-         return -1;
-      }
-   }
-   else if (strcmp(var, "gl_BackLightModelProduct") == 0) {
-      if (strcmp(field, "sceneColor") == 0) {
-         tokens[0] = STATE_LIGHTMODEL_SCENECOLOR;
-         tokens[1] = 1;
-      }
-      else {
-         return -1;
-      }
-   }
-   else if (strcmp(var, "gl_FrontLightProduct") == 0 ||
-            strcmp(var, "gl_BackLightProduct") == 0) {
-      if (index1 < 0 || !field)
-         return -1;
-
-      tokens[0] = STATE_LIGHTPROD;
-      tokens[1] = index1; /* light number */
-      if (strcmp(var, "gl_FrontLightProduct") == 0) {
-         tokens[2] = 0; /* front */
-      }
-      else {
-         tokens[2] = 1; /* back */
-      }
-      if (strcmp(field, "ambient") == 0) {
-         tokens[3] = STATE_AMBIENT;
-      }
-      else if (strcmp(field, "diffuse") == 0) {
-         tokens[3] = STATE_DIFFUSE;
-      }
-      else if (strcmp(field, "specular") == 0) {
-         tokens[3] = STATE_SPECULAR;
-      }
-      else {
-         return -1;
-      }
-   }
-   else if (strcmp(var, "gl_TextureEnvColor") == 0) {
-      if (index1 < 0)
-         return -1;
-      tokens[0] = STATE_TEXENV_COLOR;
-      tokens[1] = index1;
-   }
-   else if (strcmp(var, "gl_EyePlaneS") == 0) {
-      if (index1 < 0)
-         return -1;
-      tokens[0] = STATE_TEXGEN;
-      tokens[1] = index1; /* tex unit */
-      tokens[2] = STATE_TEXGEN_EYE_S;
-   }
-   else if (strcmp(var, "gl_EyePlaneT") == 0) {
-      if (index1 < 0)
-         return -1;
-      tokens[0] = STATE_TEXGEN;
-      tokens[1] = index1; /* tex unit */
-      tokens[2] = STATE_TEXGEN_EYE_T;
-   }
-   else if (strcmp(var, "gl_EyePlaneR") == 0) {
-      if (index1 < 0)
-         return -1;
-      tokens[0] = STATE_TEXGEN;
-      tokens[1] = index1; /* tex unit */
-      tokens[2] = STATE_TEXGEN_EYE_R;
-   }
-   else if (strcmp(var, "gl_EyePlaneQ") == 0) {
-      if (index1 < 0)
-         return -1;
-      tokens[0] = STATE_TEXGEN;
-      tokens[1] = index1; /* tex unit */
-      tokens[2] = STATE_TEXGEN_EYE_Q;
-   }
-   else if (strcmp(var, "gl_ObjectPlaneS") == 0) {
-      if (index1 < 0)
-         return -1;
-      tokens[0] = STATE_TEXGEN;
-      tokens[1] = index1; /* tex unit */
-      tokens[2] = STATE_TEXGEN_OBJECT_S;
-   }
-   else if (strcmp(var, "gl_ObjectPlaneT") == 0) {
-      if (index1 < 0)
-         return -1;
-      tokens[0] = STATE_TEXGEN;
-      tokens[1] = index1; /* tex unit */
-      tokens[2] = STATE_TEXGEN_OBJECT_T;
-   }
-   else if (strcmp(var, "gl_ObjectPlaneR") == 0) {
-      if (index1 < 0)
-         return -1;
-      tokens[0] = STATE_TEXGEN;
-      tokens[1] = index1; /* tex unit */
-      tokens[2] = STATE_TEXGEN_OBJECT_R;
-   }
-   else if (strcmp(var, "gl_ObjectPlaneQ") == 0) {
-      if (index1 < 0)
-         return -1;
-      tokens[0] = STATE_TEXGEN;
-      tokens[1] = index1; /* tex unit */
-      tokens[2] = STATE_TEXGEN_OBJECT_Q;
-   }
-   else if (strcmp(var, "gl_Fog") == 0) {
-      if (strcmp(field, "color") == 0) {
-         tokens[0] = STATE_FOG_COLOR;
-      }
-      else if (strcmp(field, "density") == 0) {
-         tokens[0] = STATE_FOG_PARAMS;
-         *swizzleOut = SWIZZLE_XXXX;
-      }
-      else if (strcmp(field, "start") == 0) {
-         tokens[0] = STATE_FOG_PARAMS;
-         *swizzleOut = SWIZZLE_YYYY;
-      }
-      else if (strcmp(field, "end") == 0) {
-         tokens[0] = STATE_FOG_PARAMS;
-         *swizzleOut = SWIZZLE_ZZZZ;
-      }
-      else if (strcmp(field, "scale") == 0) {
-         tokens[0] = STATE_FOG_PARAMS;
-         *swizzleOut = SWIZZLE_WWWW;
-      }
-      else {
-         return -1;
-      }
-   }
-   else {
-      return -1;
-   }
-
-   if (isMatrix) {
-      /* load all four columns of matrix */
-      GLint pos[4];
-      GLuint j;
-      for (j = 0; j < 4; j++) {
-         tokens[2] = tokens[3] = j; /* jth row of matrix */
-         pos[j] = _mesa_add_state_reference(paramList, tokens);
-         assert(pos[j] >= 0);
-         ASSERT(pos[j] >= 0);
-      }
-      return pos[0] + index1;
-   }
-   else {
-      /* allocate a single register */
-      GLint pos = _mesa_add_state_reference(paramList, tokens);
-      ASSERT(pos >= 0);
-      return pos;
-   }
-}
-
-
-
-/**
- * Given a variable name and datatype, emit uniform/constant buffer
- * entries which will store that state variable.
- * For example, if name="gl_LightSource" we'll emit 64 state variable
- * vectors/references and return position where that data starts.  This will
- * allow run-time array indexing into the light source array.
- *
- * Note that this is a recursive function.
- *
- * \return -1 if error, else index of start of data in the program parameter list
- */
-static GLint
-emit_statevars(const char *name, int array_len,
-               const slang_type_specifier *type,
-               gl_state_index tokens[STATE_LENGTH],
-               struct gl_program_parameter_list *paramList)
-{
-   if (type->type == SLANG_SPEC_ARRAY) {
-      GLint i, pos = -1;
-      assert(array_len > 0);
-      if (strcmp(name, "gl_ClipPlane") == 0) {
-         tokens[0] = STATE_CLIPPLANE;
-      }
-      else if (strcmp(name, "gl_LightSource") == 0) {
-         tokens[0] = STATE_LIGHT;
-      }
-      else if (strcmp(name, "gl_FrontLightProduct") == 0) {
-         tokens[0] = STATE_LIGHTPROD;
-         tokens[2] = 0; /* front */
-      }
-      else if (strcmp(name, "gl_BackLightProduct") == 0) {
-         tokens[0] = STATE_LIGHTPROD;
-         tokens[2] = 1; /* back */
-      }
-      else if (strcmp(name, "gl_TextureEnvColor") == 0) {
-         tokens[0] = STATE_TEXENV_COLOR;
-      }
-      else if (strcmp(name, "gl_EyePlaneS") == 0) {
-         tokens[0] = STATE_TEXGEN;
-         tokens[2] = STATE_TEXGEN_EYE_S;
-      }
-      else if (strcmp(name, "gl_EyePlaneT") == 0) {
-         tokens[0] = STATE_TEXGEN;
-         tokens[2] = STATE_TEXGEN_EYE_T;
-      }
-      else if (strcmp(name, "gl_EyePlaneR") == 0) {
-         tokens[0] = STATE_TEXGEN;
-         tokens[2] = STATE_TEXGEN_EYE_R;
-      }
-      else if (strcmp(name, "gl_EyePlaneQ") == 0) {
-         tokens[0] = STATE_TEXGEN;
-         tokens[2] = STATE_TEXGEN_EYE_Q;
-      }
-      else if (strcmp(name, "gl_ObjectPlaneS") == 0) {
-         tokens[0] = STATE_TEXGEN;
-         tokens[2] = STATE_TEXGEN_OBJECT_S;
-      }
-      else if (strcmp(name, "gl_ObjectPlaneT") == 0) {
-         tokens[0] = STATE_TEXGEN;
-         tokens[2] = STATE_TEXGEN_OBJECT_T;
-      }
-      else if (strcmp(name, "gl_ObjectPlaneR") == 0) {
-         tokens[0] = STATE_TEXGEN;
-         tokens[2] = STATE_TEXGEN_OBJECT_R;
-      }
-      else if (strcmp(name, "gl_ObjectPlaneQ") == 0) {
-         tokens[0] = STATE_TEXGEN;
-         tokens[2] = STATE_TEXGEN_OBJECT_Q;
-      }
-      else {
-         return -1; /* invalid array name */
-      }
-      for (i = 0; i < array_len; i++) {
-         GLint p;
-         tokens[1] = i;
-         p = emit_statevars(NULL, 0, type->_array, tokens, paramList);
-         if (i == 0)
-            pos = p;
-      }
-      return pos;
-   }
-   else if (type->type == SLANG_SPEC_STRUCT) {
-      const slang_variable_scope *fields = type->_struct->fields;
-      GLuint i, pos = 0;
-      for (i = 0; i < fields->num_variables; i++) {
-         const slang_variable *var = fields->variables[i];
-         GLint p = emit_statevars(var->a_name, 0, &var->type.specifier,
-                                  tokens, paramList);
-         if (i == 0)
-            pos = p;
-      }
-      return pos;
-   }
-   else {
-      GLint pos;
-      assert(type->type == SLANG_SPEC_VEC4 ||
-             type->type == SLANG_SPEC_VEC3 ||
-             type->type == SLANG_SPEC_VEC2 ||
-             type->type == SLANG_SPEC_FLOAT ||
-             type->type == SLANG_SPEC_IVEC4 ||
-             type->type == SLANG_SPEC_IVEC3 ||
-             type->type == SLANG_SPEC_IVEC2 ||
-             type->type == SLANG_SPEC_INT);
-      if (name) {
-         GLint t;
-
-         if (tokens[0] == STATE_LIGHT)
-            t = 2;
-         else if (tokens[0] == STATE_LIGHTPROD)
-            t = 3;
-         else
-            return -1; /* invalid array name */
-
-         if (strcmp(name, "ambient") == 0) {
-            tokens[t] = STATE_AMBIENT;
-         }
-         else if (strcmp(name, "diffuse") == 0) {
-            tokens[t] = STATE_DIFFUSE;
-         }
-         else if (strcmp(name, "specular") == 0) {
-            tokens[t] = STATE_SPECULAR;
-         }
-         else if (strcmp(name, "position") == 0) {
-            tokens[t] = STATE_POSITION;
-         }
-         else if (strcmp(name, "halfVector") == 0) {
-            tokens[t] = STATE_HALF_VECTOR;
-         }
-         else if (strcmp(name, "spotDirection") == 0) {
-            tokens[t] = STATE_SPOT_DIRECTION; /* xyz components */
-         }
-         else if (strcmp(name, "spotCosCutoff") == 0) {
-            tokens[t] = STATE_SPOT_DIRECTION; /* w component */
-         }
-
-         else if (strcmp(name, "constantAttenuation") == 0) {
-            tokens[t] = STATE_ATTENUATION; /* x component */
-         }
-         else if (strcmp(name, "linearAttenuation") == 0) {
-            tokens[t] = STATE_ATTENUATION; /* y component */
-         }
-         else if (strcmp(name, "quadraticAttenuation") == 0) {
-            tokens[t] = STATE_ATTENUATION; /* z component */
-         }
-         else if (strcmp(name, "spotExponent") == 0) {
-            tokens[t] = STATE_ATTENUATION; /* w = spot exponent */
-         }
-
-         else if (strcmp(name, "spotCutoff") == 0) {
-            tokens[t] = STATE_SPOT_CUTOFF; /* x component */
-         }
-
-         else {
-            return -1; /* invalid field name */
-         }
-      }
-
-      pos = _mesa_add_state_reference(paramList, tokens);
-      return pos;
-   }
-
-   return 1;
-}
-
-
-/**
- * Unroll the named built-in uniform variable into a sequence of state
- * vars in the given parameter list.
- */
-static GLint
-alloc_state_var_array(const slang_variable *var,
-                      struct gl_program_parameter_list *paramList)
-{
-   gl_state_index tokens[STATE_LENGTH];
-   GLuint i;
-   GLint pos;
-
-   /* Initialize the state tokens array.  This is very important.
-    * When we call _mesa_add_state_reference() it'll searches the parameter
-    * list to see if the given statevar token sequence is already present.
-    * This is normally a good thing since it prevents redundant values in the
-    * constant buffer.
-    *
-    * But when we're building arrays of state this can be bad.  For example,
-    * consider this fragment of GLSL code:
-    *   foo = gl_LightSource[3].diffuse;
-    *   ...
-    *   bar = gl_LightSource[i].diffuse;
-    *
-    * When we unroll the gl_LightSource array (for "bar") we want to re-emit
-    * gl_LightSource[3].diffuse and not re-use the first instance (from "foo")
-    * since that would upset the array layout.  We handle this situation by
-    * setting the last token in the state var token array to the special
-    * value STATE_ARRAY.
-    * This token will only be set for array state.  We can hijack the last
-    * element in the array for this since it's never used for light, clipplane
-    * or texture env array state.
-    */
-   for (i = 0; i < STATE_LENGTH; i++)
-      tokens[i] = 0;
-   tokens[STATE_LENGTH - 1] = STATE_ARRAY;
-
-   pos = emit_statevars(var->a_name, var->array_len, &var->type.specifier,
-                        tokens, paramList);
-
-   return pos;
-}
-
-
-
-/**
- * Allocate storage for a pre-defined uniform (a GL state variable).
- * As a memory-saving optimization, we try to only allocate storage for
- * state vars that are actually used.
- *
- * Arrays such as gl_LightSource are handled specially.  For an expression
- * like "gl_LightSource[2].diffuse", we can allocate a single uniform/constant
- * slot and return the index.  In this case, we return direct=TRUE.
- *
- * Buf for something like "gl_LightSource[i].diffuse" we don't know the value
- * of 'i' at compile time so we need to "unroll" the gl_LightSource array
- * into a consecutive sequence of uniform/constant slots so it can be indexed
- * at runtime.  In this case, we return direct=FALSE.
- *
- * Currently, all pre-defined uniforms are in one of these forms:
- *   var
- *   var[i]
- *   var.field
- *   var[i].field
- *   var[i][j]
- *
- * \return -1 upon error, else position in paramList of the state variable/data
- */
-GLint
-_slang_alloc_statevar(slang_ir_node *n,
-                      struct gl_program_parameter_list *paramList,
-                      GLboolean *direct)
-{
-   slang_ir_node *n0 = n;
-   const char *field = NULL;
-   GLint index1 = -1, index2 = -1;
-   GLuint swizzle;
-
-   *direct = GL_TRUE;
-
-   if (n->Opcode == IR_FIELD) {
-      field = n->Field;
-      n = n->Children[0];
-   }
-
-   if (n->Opcode == IR_ELEMENT) {
-      if (n->Children[1]->Opcode == IR_FLOAT) {
-         index1 = (GLint) n->Children[1]->Value[0];
-      }
-      else {
-         *direct = GL_FALSE;
-      }
-      n = n->Children[0];
-   }
-
-   if (n->Opcode == IR_ELEMENT) {
-      /* XXX can only handle constant indexes for now */
-      if (n->Children[1]->Opcode == IR_FLOAT) {
-         /* two-dimensional array index: mat[i][j] */
-         index2 = index1;
-         index1 = (GLint) n->Children[1]->Value[0];
-      }
-      else {
-         *direct = GL_FALSE;
-      }
-      n = n->Children[0];
-   }
-
-   assert(n->Opcode == IR_VAR);
-
-   if (*direct) {
-      const char *var = (const char *) n->Var->a_name;
-      GLint pos =
-         lookup_statevar(var, index1, index2, field, &swizzle, paramList);
-      if (pos >= 0) {
-         /* newly resolved storage for the statevar/constant/uniform */
-         n0->Store->File = PROGRAM_STATE_VAR;
-         n0->Store->Index = pos;
-         n0->Store->Swizzle = swizzle;
-         n0->Store->Parent = NULL;
-         return pos;
-      }
-   }
-
-   *direct = GL_FALSE;
-   return alloc_state_var_array(n->Var, paramList);
-}
-
-
-
-
-#define SWIZZLE_ZWWW MAKE_SWIZZLE4(SWIZZLE_Z, SWIZZLE_W, SWIZZLE_W, SWIZZLE_W)
-
-
-/** Predefined shader inputs */
-struct input_info
-{
-   const char *Name;
-   GLuint Attrib;
-   GLenum Type;
-   GLuint Swizzle;
-};
-
-/** Predefined vertex shader inputs/attributes */
-static const struct input_info vertInputs[] = {
-   { "gl_Vertex", VERT_ATTRIB_POS, GL_FLOAT_VEC4, SWIZZLE_NOOP },
-   { "gl_Normal", VERT_ATTRIB_NORMAL, GL_FLOAT_VEC3, SWIZZLE_NOOP },
-   { "gl_Color", VERT_ATTRIB_COLOR0, GL_FLOAT_VEC4, SWIZZLE_NOOP },
-   { "gl_SecondaryColor", VERT_ATTRIB_COLOR1, GL_FLOAT_VEC4, SWIZZLE_NOOP },
-   { "gl_FogCoord", VERT_ATTRIB_FOG, GL_FLOAT, SWIZZLE_XXXX },
-   { "gl_MultiTexCoord0", VERT_ATTRIB_TEX0, GL_FLOAT_VEC4, SWIZZLE_NOOP },
-   { "gl_MultiTexCoord1", VERT_ATTRIB_TEX1, GL_FLOAT_VEC4, SWIZZLE_NOOP },
-   { "gl_MultiTexCoord2", VERT_ATTRIB_TEX2, GL_FLOAT_VEC4, SWIZZLE_NOOP },
-   { "gl_MultiTexCoord3", VERT_ATTRIB_TEX3, GL_FLOAT_VEC4, SWIZZLE_NOOP },
-   { "gl_MultiTexCoord4", VERT_ATTRIB_TEX4, GL_FLOAT_VEC4, SWIZZLE_NOOP },
-   { "gl_MultiTexCoord5", VERT_ATTRIB_TEX5, GL_FLOAT_VEC4, SWIZZLE_NOOP },
-   { "gl_MultiTexCoord6", VERT_ATTRIB_TEX6, GL_FLOAT_VEC4, SWIZZLE_NOOP },
-   { "gl_MultiTexCoord7", VERT_ATTRIB_TEX7, GL_FLOAT_VEC4, SWIZZLE_NOOP },
-   { NULL, 0, GL_NONE, SWIZZLE_NOOP }
-};
-
-/** Predefined fragment shader inputs */
-static const struct input_info fragInputs[] = {
-   { "gl_FragCoord", FRAG_ATTRIB_WPOS, GL_FLOAT_VEC4, SWIZZLE_NOOP },
-   { "gl_Color", FRAG_ATTRIB_COL0, GL_FLOAT_VEC4, SWIZZLE_NOOP },
-   { "gl_SecondaryColor", FRAG_ATTRIB_COL1, GL_FLOAT_VEC4, SWIZZLE_NOOP },
-   { "gl_TexCoord", FRAG_ATTRIB_TEX0, GL_FLOAT_VEC4, SWIZZLE_NOOP },
-   /* note: we're packing several quantities into the fogcoord vector */
-   { "gl_FogFragCoord", FRAG_ATTRIB_FOGC, GL_FLOAT, SWIZZLE_XXXX },
-   { "gl_FrontFacing", FRAG_ATTRIB_FACE, GL_FLOAT, SWIZZLE_XXXX },
-   { "gl_PointCoord", FRAG_ATTRIB_PNTC, GL_FLOAT_VEC2, SWIZZLE_XYZW },
-   { NULL, 0, GL_NONE, SWIZZLE_NOOP }
-};
-
-
-/**
- * Return the VERT_ATTRIB_* or FRAG_ATTRIB_* value that corresponds to
- * a vertex or fragment program input variable.  Return -1 if the input
- * name is invalid.
- * XXX return size too
- */
-GLint
-_slang_input_index(const char *name, GLenum target, GLuint *swizzleOut)
-{
-   const struct input_info *inputs;
-   GLuint i;
-
-   switch (target) {
-   case GL_VERTEX_PROGRAM_ARB:
-      inputs = vertInputs;
-      break;
-   case GL_FRAGMENT_PROGRAM_ARB:
-      inputs = fragInputs;
-      break;
-   /* XXX geom program */
-   default:
-      _mesa_problem(NULL, "bad target in _slang_input_index");
-      return -1;
-   }
-
-   ASSERT(MAX_TEXTURE_COORD_UNITS == 8); /* if this fails, fix vertInputs above */
-
-   for (i = 0; inputs[i].Name; i++) {
-      if (strcmp(inputs[i].Name, name) == 0) {
-         /* found */
-         *swizzleOut = inputs[i].Swizzle;
-         return inputs[i].Attrib;
-      }
-   }
-   return -1;
-}
-
-
-/**
- * Return name of the given vertex attribute (VERT_ATTRIB_x).
- */
-const char *
-_slang_vert_attrib_name(GLuint attrib)
-{
-   GLuint i;
-   assert(attrib < VERT_ATTRIB_GENERIC0);
-   for (i = 0; vertInputs[i].Name; i++) {
-      if (vertInputs[i].Attrib == attrib)
-         return vertInputs[i].Name;
-   }
-   return NULL;
-}
-
-
-/**
- * Return type (GL_FLOAT, GL_FLOAT_VEC2, etc) of the given vertex
- * attribute (VERT_ATTRIB_x).
- */
-GLenum
-_slang_vert_attrib_type(GLuint attrib)
-{
-   GLuint i;
-   assert(attrib < VERT_ATTRIB_GENERIC0);
-   for (i = 0; vertInputs[i].Name; i++) {
-      if (vertInputs[i].Attrib == attrib)
-         return vertInputs[i].Type;
-   }
-   return GL_NONE;
-}
-
-
-
-
-
-/** Predefined shader output info */
-struct output_info
-{
-   const char *Name;
-   GLuint Attrib;
-};
-
-/** Predefined vertex shader outputs */
-static const struct output_info vertOutputs[] = {
-   { "gl_Position", VERT_RESULT_HPOS },
-   { "gl_FrontColor", VERT_RESULT_COL0 },
-   { "gl_BackColor", VERT_RESULT_BFC0 },
-   { "gl_FrontSecondaryColor", VERT_RESULT_COL1 },
-   { "gl_BackSecondaryColor", VERT_RESULT_BFC1 },
-   { "gl_TexCoord", VERT_RESULT_TEX0 },
-   { "gl_FogFragCoord", VERT_RESULT_FOGC },
-   { "gl_PointSize", VERT_RESULT_PSIZ },
-   { NULL, 0 }
-};
-
-/** Predefined fragment shader outputs */
-static const struct output_info fragOutputs[] = {
-   { "gl_FragColor", FRAG_RESULT_COLOR },
-   { "gl_FragDepth", FRAG_RESULT_DEPTH },
-   { "gl_FragData", FRAG_RESULT_DATA0 },
-   { NULL, 0 }
-};
-
-
-/**
- * Return the VERT_RESULT_* or FRAG_RESULT_* value that corresponds to
- * a vertex or fragment program output variable.  Return -1 for an invalid
- * output name.
- */
-GLint
-_slang_output_index(const char *name, GLenum target)
-{
-   const struct output_info *outputs;
-   GLuint i;
-
-   switch (target) {
-   case GL_VERTEX_PROGRAM_ARB:
-      outputs = vertOutputs;
-      break;
-   case GL_FRAGMENT_PROGRAM_ARB:
-      outputs = fragOutputs;
-      break;
-   /* XXX geom program */
-   default:
-      _mesa_problem(NULL, "bad target in _slang_output_index");
-      return -1;
-   }
-
-   for (i = 0; outputs[i].Name; i++) {
-      if (strcmp(outputs[i].Name, name) == 0) {
-         /* found */
-         return outputs[i].Attrib;
-      }
-   }
-   return -1;
-}
diff --git a/mesalib/src/mesa/shader/slang/slang_builtin.h b/mesalib/src/mesa/shader/slang/slang_builtin.h
deleted file mode 100644
index f814d11ac..000000000
--- a/mesalib/src/mesa/shader/slang/slang_builtin.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.3
- *
- * Copyright (C) 2005-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.
- */
-
-
-#ifndef SLANG_BUILTIN_H
-#define SLANG_BUILTIN_H
-
-#include "shader/prog_parameter.h"
-#include "slang_utility.h"
-#include "slang_ir.h"
-
-
-extern GLint
-_slang_alloc_statevar(slang_ir_node *n,
-                      struct gl_program_parameter_list *paramList,
-                      GLboolean *direct);
-
-
-extern GLint
-_slang_input_index(const char *name, GLenum target, GLuint *swizzleOut);
-
-extern GLint
-_slang_output_index(const char *name, GLenum target);
-
-
-extern const char *
-_slang_vert_attrib_name(GLuint attrib);
-
-extern GLenum
-_slang_vert_attrib_type(GLuint attrib);
-
-
-#endif /* SLANG_BUILTIN_H */
diff --git a/mesalib/src/mesa/shader/slang/slang_codegen.c b/mesalib/src/mesa/shader/slang/slang_codegen.c
deleted file mode 100644
index 7d5e5eb29..000000000
--- a/mesalib/src/mesa/shader/slang/slang_codegen.c
+++ /dev/null
@@ -1,5354 +0,0 @@
-/*
- * Mesa 3-D graphics library
- *
- * Copyright (C) 2005-2007  Brian Paul   All Rights Reserved.
- * Copyright (C) 2008 VMware, Inc.  All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, 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 slang_codegen.c
- * Generate IR tree from AST.
- * \author Brian Paul
- */
-
-
-/***
- *** NOTES:
- *** The new_() functions return a new instance of a simple IR node.
- *** The gen_() functions generate larger IR trees from the simple nodes.
- ***/
-
-
-
-#include "main/imports.h"
-#include "main/macros.h"
-#include "main/mtypes.h"
-#include "shader/program.h"
-#include "shader/prog_instruction.h"
-#include "shader/prog_parameter.h"
-#include "shader/prog_print.h"
-#include "shader/prog_statevars.h"
-#include "slang_typeinfo.h"
-#include "slang_builtin.h"
-#include "slang_codegen.h"
-#include "slang_compile.h"
-#include "slang_label.h"
-#include "slang_mem.h"
-#include "slang_simplify.h"
-#include "slang_emit.h"
-#include "slang_vartable.h"
-#include "slang_ir.h"
-#include "slang_print.h"
-
-
-/** Max iterations to unroll */
-const GLuint MAX_FOR_LOOP_UNROLL_ITERATIONS = 32;
-
-/** Max for-loop body size (in slang operations) to unroll */
-const GLuint MAX_FOR_LOOP_UNROLL_BODY_SIZE = 50;
-
-/** Max for-loop body complexity to unroll.
- * We'll compute complexity as the product of the number of iterations
- * and the size of the body.  So long-ish loops with very simple bodies
- * can be unrolled, as well as short loops with larger bodies.
- */
-const GLuint MAX_FOR_LOOP_UNROLL_COMPLEXITY = 256;
-
-
-
-static slang_ir_node *
-_slang_gen_operation(slang_assemble_ctx * A, slang_operation *oper);
-
-static void
-slang_substitute(slang_assemble_ctx *A, slang_operation *oper,
-                 GLuint substCount, slang_variable **substOld,
-		 slang_operation **substNew, GLboolean isLHS);
-
-
-/**
- * Retrieves type information about an operation.
- * Returns GL_TRUE on success.
- * Returns GL_FALSE otherwise.
- */
-static GLboolean
-typeof_operation(const struct slang_assemble_ctx_ *A,
-                 slang_operation *op,
-                 slang_typeinfo *ti)
-{
-   return _slang_typeof_operation(op, &A->space, ti, A->atoms, A->log);
-}
-
-
-static GLboolean
-is_sampler_type(const slang_fully_specified_type *t)
-{
-   switch (t->specifier.type) {
-   case SLANG_SPEC_SAMPLER_1D:
-   case SLANG_SPEC_SAMPLER_2D:
-   case SLANG_SPEC_SAMPLER_3D:
-   case SLANG_SPEC_SAMPLER_CUBE:
-   case SLANG_SPEC_SAMPLER_1D_SHADOW:
-   case SLANG_SPEC_SAMPLER_2D_SHADOW:
-   case SLANG_SPEC_SAMPLER_RECT:
-   case SLANG_SPEC_SAMPLER_RECT_SHADOW:
-   case SLANG_SPEC_SAMPLER_1D_ARRAY:
-   case SLANG_SPEC_SAMPLER_2D_ARRAY:
-   case SLANG_SPEC_SAMPLER_1D_ARRAY_SHADOW:
-   case SLANG_SPEC_SAMPLER_2D_ARRAY_SHADOW:
-      return GL_TRUE;
-   default:
-      return GL_FALSE;
-   }
-}
-
-
-/**
- * Return the offset (in floats or ints) of the named field within
- * the given struct.  Return -1 if field not found.
- * If field is NULL, return the size of the struct instead.
- */
-static GLint
-_slang_field_offset(const slang_type_specifier *spec, slang_atom field)
-{
-   GLint offset = 0;
-   GLuint i;
-   for (i = 0; i < spec->_struct->fields->num_variables; i++) {
-      const slang_variable *v = spec->_struct->fields->variables[i];
-      const GLuint sz = _slang_sizeof_type_specifier(&v->type.specifier);
-      if (sz > 1) {
-         /* types larger than 1 float are register (4-float) aligned */
-         offset = (offset + 3) & ~3;
-      }
-      if (field && v->a_name == field) {
-         return offset;
-      }
-      offset += sz;
-   }
-   if (field)
-      return -1; /* field not found */
-   else
-      return offset;  /* struct size */
-}
-
-
-/**
- * Return the size (in floats) of the given type specifier.
- * If the size is greater than 4, the size should be a multiple of 4
- * so that the correct number of 4-float registers are allocated.
- * For example, a mat3x2 is size 12 because we want to store the
- * 3 columns in 3 float[4] registers.
- */
-GLuint
-_slang_sizeof_type_specifier(const slang_type_specifier *spec)
-{
-   GLuint sz;
-   switch (spec->type) {
-   case SLANG_SPEC_VOID:
-      sz = 0;
-      break;
-   case SLANG_SPEC_BOOL:
-      sz = 1;
-      break;
-   case SLANG_SPEC_BVEC2:
-      sz = 2;
-      break;
-   case SLANG_SPEC_BVEC3:
-      sz = 3;
-      break;
-   case SLANG_SPEC_BVEC4:
-      sz = 4;
-      break;
-   case SLANG_SPEC_INT:
-      sz = 1;
-      break;
-   case SLANG_SPEC_IVEC2:
-      sz = 2;
-      break;
-   case SLANG_SPEC_IVEC3:
-      sz = 3;
-      break;
-   case SLANG_SPEC_IVEC4:
-      sz = 4;
-      break;
-   case SLANG_SPEC_FLOAT:
-      sz = 1;
-      break;
-   case SLANG_SPEC_VEC2:
-      sz = 2;
-      break;
-   case SLANG_SPEC_VEC3:
-      sz = 3;
-      break;
-   case SLANG_SPEC_VEC4:
-      sz = 4;
-      break;
-   case SLANG_SPEC_MAT2:
-      sz = 2 * 4; /* 2 columns (regs) */
-      break;
-   case SLANG_SPEC_MAT3:
-      sz = 3 * 4;
-      break;
-   case SLANG_SPEC_MAT4:
-      sz = 4 * 4;
-      break;
-   case SLANG_SPEC_MAT23:
-      sz = 2 * 4; /* 2 columns (regs) */
-      break;
-   case SLANG_SPEC_MAT32:
-      sz = 3 * 4; /* 3 columns (regs) */
-      break;
-   case SLANG_SPEC_MAT24:
-      sz = 2 * 4;
-      break;
-   case SLANG_SPEC_MAT42:
-      sz = 4 * 4; /* 4 columns (regs) */
-      break;
-   case SLANG_SPEC_MAT34:
-      sz = 3 * 4;
-      break;
-   case SLANG_SPEC_MAT43:
-      sz = 4 * 4; /* 4 columns (regs) */
-      break;
-   case SLANG_SPEC_SAMPLER_1D:
-   case SLANG_SPEC_SAMPLER_2D:
-   case SLANG_SPEC_SAMPLER_3D:
-   case SLANG_SPEC_SAMPLER_CUBE:
-   case SLANG_SPEC_SAMPLER_1D_SHADOW:
-   case SLANG_SPEC_SAMPLER_2D_SHADOW:
-   case SLANG_SPEC_SAMPLER_RECT:
-   case SLANG_SPEC_SAMPLER_RECT_SHADOW:
-   case SLANG_SPEC_SAMPLER_1D_ARRAY:
-   case SLANG_SPEC_SAMPLER_2D_ARRAY:
-   case SLANG_SPEC_SAMPLER_1D_ARRAY_SHADOW:
-   case SLANG_SPEC_SAMPLER_2D_ARRAY_SHADOW:
-      sz = 1; /* a sampler is basically just an integer index */
-      break;
-   case SLANG_SPEC_STRUCT:
-      sz = _slang_field_offset(spec, 0); /* special use */
-      if (sz == 1) {
-         /* 1-float structs are actually troublesome to deal with since they
-          * might get placed at R.x, R.y, R.z or R.z.  Return size=2 to
-          * ensure the object is placed at R.x
-          */
-         sz = 2;
-      }
-      else if (sz > 4) {
-         sz = (sz + 3) & ~0x3; /* round up to multiple of four */
-      }
-      break;
-   case SLANG_SPEC_ARRAY:
-      sz = _slang_sizeof_type_specifier(spec->_array);
-      break;
-   default:
-      _mesa_problem(NULL, "Unexpected type in _slang_sizeof_type_specifier()");
-      sz = 0;
-   }
-
-   if (sz > 4) {
-      /* if size is > 4, it should be a multiple of four */
-      assert((sz & 0x3) == 0);
-   }
-   return sz;
-}
-
-
-/**
- * Query variable/array length (number of elements).
- * This is slightly non-trivial because there are two ways to express
- * arrays: "float x[3]" vs. "float[3] x".
- * \return the length of the array for the given variable, or 0 if not an array
- */
-static GLint
-_slang_array_length(const slang_variable *var)
-{
-   if (var->type.array_len > 0) {
-      /* Ex: float[4] x; */
-      return var->type.array_len;
-   }
-   if (var->array_len > 0) {
-      /* Ex: float x[4]; */
-      return var->array_len;
-   }
-   return 0;
-}
-
-
-/**
- * Compute total size of array give size of element, number of elements.
- * \return size in floats
- */
-static GLint
-_slang_array_size(GLint elemSize, GLint arrayLen)
-{
-   GLint total;
-   assert(elemSize > 0);
-   if (arrayLen > 1) {
-      /* round up base type to multiple of 4 */
-      total = ((elemSize + 3) & ~0x3) * MAX2(arrayLen, 1);
-   }
-   else {
-      total = elemSize;
-   }
-   return total;
-}
-
-
-/**
- * Return the TEXTURE_*_INDEX value that corresponds to a sampler type,
- * or -1 if the type is not a sampler.
- */
-static GLint
-sampler_to_texture_index(const slang_type_specifier_type type)
-{
-   switch (type) {
-   case SLANG_SPEC_SAMPLER_1D:
-      return TEXTURE_1D_INDEX;
-   case SLANG_SPEC_SAMPLER_2D:
-      return TEXTURE_2D_INDEX;
-   case SLANG_SPEC_SAMPLER_3D:
-      return TEXTURE_3D_INDEX;
-   case SLANG_SPEC_SAMPLER_CUBE:
-      return TEXTURE_CUBE_INDEX;
-   case SLANG_SPEC_SAMPLER_1D_SHADOW:
-      return TEXTURE_1D_INDEX; /* XXX fix */
-   case SLANG_SPEC_SAMPLER_2D_SHADOW:
-      return TEXTURE_2D_INDEX; /* XXX fix */
-   case SLANG_SPEC_SAMPLER_RECT:
-      return TEXTURE_RECT_INDEX;
-   case SLANG_SPEC_SAMPLER_RECT_SHADOW:
-      return TEXTURE_RECT_INDEX; /* XXX fix */
-   case SLANG_SPEC_SAMPLER_1D_ARRAY:
-      return TEXTURE_1D_ARRAY_INDEX;
-   case SLANG_SPEC_SAMPLER_2D_ARRAY:
-      return TEXTURE_2D_ARRAY_INDEX;
-   case SLANG_SPEC_SAMPLER_1D_ARRAY_SHADOW:
-      return TEXTURE_1D_ARRAY_INDEX;
-   case SLANG_SPEC_SAMPLER_2D_ARRAY_SHADOW:
-      return TEXTURE_2D_ARRAY_INDEX;
-   default:
-      return -1;
-   }
-}
-
-
-/** helper to build a SLANG_OPER_IDENTIFIER node */
-static void
-slang_operation_identifier(slang_operation *oper,
-                           slang_assemble_ctx *A,
-                           const char *name)
-{
-   oper->type = SLANG_OPER_IDENTIFIER;
-   oper->a_id = slang_atom_pool_atom(A->atoms, name);
-}
-
-
-/**
- * Called when we begin code/IR generation for a new while/do/for loop.
- */
-static void
-push_loop(slang_assemble_ctx *A, slang_operation *loopOper, slang_ir_node *loopIR)
-{
-   A->LoopOperStack[A->LoopDepth] = loopOper;
-   A->LoopIRStack[A->LoopDepth] = loopIR;
-   A->LoopDepth++;
-}
-
-
-/**
- * Called when we end code/IR generation for a new while/do/for loop.
- */
-static void
-pop_loop(slang_assemble_ctx *A)
-{
-   assert(A->LoopDepth > 0);
-   A->LoopDepth--;
-}
-
-
-/**
- * Return pointer to slang_operation for the loop we're currently inside,
- * or NULL if not in a loop.
- */
-static const slang_operation *
-current_loop_oper(const slang_assemble_ctx *A)
-{
-   if (A->LoopDepth > 0)
-      return A->LoopOperStack[A->LoopDepth - 1];
-   else
-      return NULL;
-}
-
-
-/**
- * Return pointer to slang_ir_node for the loop we're currently inside,
- * or NULL if not in a loop.
- */
-static slang_ir_node *
-current_loop_ir(const slang_assemble_ctx *A)
-{
-   if (A->LoopDepth > 0)
-      return A->LoopIRStack[A->LoopDepth - 1];
-   else
-      return NULL;
-}
-
-
-/**********************************************************************/
-
-
-/**
- * Map "_asm foo" to IR_FOO, etc.
- */
-typedef struct
-{
-   const char *Name;
-   slang_ir_opcode Opcode;
-   GLuint HaveRetValue, NumParams;
-} slang_asm_info;
-
-
-static slang_asm_info AsmInfo[] = {
-   /* vec4 binary op */
-   { "vec4_add", IR_ADD, 1, 2 },
-   { "vec4_subtract", IR_SUB, 1, 2 },
-   { "vec4_multiply", IR_MUL, 1, 2 },
-   { "vec4_dot", IR_DOT4, 1, 2 },
-   { "vec3_dot", IR_DOT3, 1, 2 },
-   { "vec2_dot", IR_DOT2, 1, 2 },
-   { "vec3_nrm", IR_NRM3, 1, 1 },
-   { "vec4_nrm", IR_NRM4, 1, 1 },
-   { "vec3_cross", IR_CROSS, 1, 2 },
-   { "vec4_lrp", IR_LRP, 1, 3 },
-   { "vec4_min", IR_MIN, 1, 2 },
-   { "vec4_max", IR_MAX, 1, 2 },
-   { "vec4_cmp", IR_CMP, 1, 3 },
-   { "vec4_clamp", IR_CLAMP, 1, 3 },
-   { "vec4_seq", IR_SEQUAL, 1, 2 },
-   { "vec4_sne", IR_SNEQUAL, 1, 2 },
-   { "vec4_sge", IR_SGE, 1, 2 },
-   { "vec4_sgt", IR_SGT, 1, 2 },
-   { "vec4_sle", IR_SLE, 1, 2 },
-   { "vec4_slt", IR_SLT, 1, 2 },
-   /* vec4 unary */
-   { "vec4_move", IR_MOVE, 1, 1 },
-   { "vec4_floor", IR_FLOOR, 1, 1 },
-   { "vec4_frac", IR_FRAC, 1, 1 },
-   { "vec4_abs", IR_ABS, 1, 1 },
-   { "vec4_negate", IR_NEG, 1, 1 },
-   { "vec4_ddx", IR_DDX, 1, 1 },
-   { "vec4_ddy", IR_DDY, 1, 1 },
-   /* float binary op */
-   { "float_power", IR_POW, 1, 2 },
-   /* texture / sampler */
-   { "vec4_tex_1d", IR_TEX, 1, 2 },
-   { "vec4_tex_1d_bias", IR_TEXB, 1, 2 },  /* 1d w/ bias */
-   { "vec4_tex_1d_proj", IR_TEXP, 1, 2 },  /* 1d w/ projection */
-   { "vec4_tex_2d", IR_TEX, 1, 2 },
-   { "vec4_tex_2d_bias", IR_TEXB, 1, 2 },  /* 2d w/ bias */
-   { "vec4_tex_2d_proj", IR_TEXP, 1, 2 },  /* 2d w/ projection */
-   { "vec4_tex_3d", IR_TEX, 1, 2 },
-   { "vec4_tex_3d_bias", IR_TEXB, 1, 2 },  /* 3d w/ bias */
-   { "vec4_tex_3d_proj", IR_TEXP, 1, 2 },  /* 3d w/ projection */
-   { "vec4_tex_cube", IR_TEX, 1, 2 },      /* cubemap */
-   { "vec4_tex_rect", IR_TEX, 1, 2 },      /* rectangle */
-   { "vec4_tex_rect_bias", IR_TEX, 1, 2 }, /* rectangle w/ projection */
-   { "vec4_tex_1d_array", IR_TEX, 1, 2 },
-   { "vec4_tex_1d_array_bias", IR_TEXB, 1, 2 },
-   { "vec4_tex_1d_array_shadow", IR_TEX, 1, 2 },
-   { "vec4_tex_1d_array_bias_shadow", IR_TEXB, 1, 2 },
-   { "vec4_tex_2d_array", IR_TEX, 1, 2 },
-   { "vec4_tex_2d_array_bias", IR_TEXB, 1, 2 },
-   { "vec4_tex_2d_array_shadow", IR_TEX, 1, 2 },
-   { "vec4_tex_2d_array_bias_shadow", IR_TEXB, 1, 2 },
-
-   /* texture / sampler but with shadow comparison */
-   { "vec4_tex_1d_shadow", IR_TEX_SH, 1, 2 },
-   { "vec4_tex_1d_bias_shadow", IR_TEXB_SH, 1, 2 },
-   { "vec4_tex_1d_proj_shadow", IR_TEXP_SH, 1, 2 },
-   { "vec4_tex_2d_shadow", IR_TEX_SH, 1, 2 },
-   { "vec4_tex_2d_bias_shadow", IR_TEXB_SH, 1, 2 },
-   { "vec4_tex_2d_proj_shadow", IR_TEXP_SH, 1, 2 },
-   { "vec4_tex_rect_shadow", IR_TEX_SH, 1, 2 },
-   { "vec4_tex_rect_proj_shadow", IR_TEXP_SH, 1, 2 },
-
-   /* unary op */
-   { "ivec4_to_vec4", IR_I_TO_F, 1, 1 }, /* int[4] to float[4] */
-   { "vec4_to_ivec4", IR_F_TO_I, 1, 1 },  /* float[4] to int[4] */
-   { "float_exp", IR_EXP, 1, 1 },
-   { "float_exp2", IR_EXP2, 1, 1 },
-   { "float_log2", IR_LOG2, 1, 1 },
-   { "float_rsq", IR_RSQ, 1, 1 },
-   { "float_rcp", IR_RCP, 1, 1 },
-   { "float_sine", IR_SIN, 1, 1 },
-   { "float_cosine", IR_COS, 1, 1 },
-   { "float_noise1", IR_NOISE1, 1, 1},
-   { "float_noise2", IR_NOISE2, 1, 1},
-   { "float_noise3", IR_NOISE3, 1, 1},
-   { "float_noise4", IR_NOISE4, 1, 1},
-
-   { NULL, IR_NOP, 0, 0 }
-};
-
-
-static slang_ir_node *
-new_node3(slang_ir_opcode op,
-          slang_ir_node *c0, slang_ir_node *c1, slang_ir_node *c2)
-{
-   slang_ir_node *n = (slang_ir_node *) _slang_alloc(sizeof(slang_ir_node));
-   if (n) {
-      n->Opcode = op;
-      n->Children[0] = c0;
-      n->Children[1] = c1;
-      n->Children[2] = c2;
-      n->InstLocation = -1;
-   }
-   return n;
-}
-
-static slang_ir_node *
-new_node2(slang_ir_opcode op, slang_ir_node *c0, slang_ir_node *c1)
-{
-   return new_node3(op, c0, c1, NULL);
-}
-
-static slang_ir_node *
-new_node1(slang_ir_opcode op, slang_ir_node *c0)
-{
-   return new_node3(op, c0, NULL, NULL);
-}
-
-static slang_ir_node *
-new_node0(slang_ir_opcode op)
-{
-   return new_node3(op, NULL, NULL, NULL);
-}
-
-
-/**
- * Create sequence of two nodes.
- */
-static slang_ir_node *
-new_seq(slang_ir_node *left, slang_ir_node *right)
-{
-   if (!left)
-      return right;
-   if (!right)
-      return left;
-   return new_node2(IR_SEQ, left, right);
-}
-
-static slang_ir_node *
-new_label(slang_label *label)
-{
-   slang_ir_node *n = new_node0(IR_LABEL);
-   assert(label);
-   if (n)
-      n->Label = label;
-   return n;
-}
-
-static slang_ir_node *
-new_float_literal(const float v[4], GLuint size)
-{
-   slang_ir_node *n = new_node0(IR_FLOAT);
-   assert(size <= 4);
-   COPY_4V(n->Value, v);
-   /* allocate a storage object, but compute actual location (Index) later */
-   n->Store = _slang_new_ir_storage(PROGRAM_CONSTANT, -1, size);
-   return n;
-}
-
-
-static slang_ir_node *
-new_not(slang_ir_node *n)
-{
-   return new_node1(IR_NOT, n);
-}
-
-
-/**
- * Non-inlined function call.
- */
-static slang_ir_node *
-new_function_call(slang_ir_node *code, slang_label *name)
-{
-   slang_ir_node *n = new_node1(IR_CALL, code);
-   assert(name);
-   if (n)
-      n->Label = name;
-   return n;
-}
-
-
-/**
- * Unconditional jump.
- */
-static slang_ir_node *
-new_return(slang_label *dest)
-{
-   slang_ir_node *n = new_node0(IR_RETURN);
-   assert(dest);
-   if (n)
-      n->Label = dest;
-   return n;
-}
-
-
-static slang_ir_node *
-new_loop(slang_ir_node *body)
-{
-   return new_node1(IR_LOOP, body);
-}
-
-
-static slang_ir_node *
-new_break(slang_ir_node *loopNode)
-{
-   slang_ir_node *n = new_node0(IR_BREAK);
-   assert(loopNode);
-   assert(loopNode->Opcode == IR_LOOP);
-   if (n) {
-      /* insert this node at head of linked list of cont/break instructions */
-      n->List = loopNode->List;
-      loopNode->List = n;
-   }
-   return n;
-}
-
-
-/**
- * Make new IR_BREAK_IF_TRUE.
- */
-static slang_ir_node *
-new_break_if_true(slang_assemble_ctx *A, slang_ir_node *cond)
-{
-   slang_ir_node *loopNode = current_loop_ir(A);
-   slang_ir_node *n;
-   assert(loopNode);
-   assert(loopNode->Opcode == IR_LOOP);
-   n = new_node1(IR_BREAK_IF_TRUE, cond);
-   if (n) {
-      /* insert this node at head of linked list of cont/break instructions */
-      n->List = loopNode->List;
-      loopNode->List = n;
-   }
-   return n;
-}
-
-
-/**
- * Make new IR_CONT_IF_TRUE node.
- */
-static slang_ir_node *
-new_cont_if_true(slang_assemble_ctx *A, slang_ir_node *cond)
-{
-   slang_ir_node *loopNode = current_loop_ir(A);
-   slang_ir_node *n;
-   assert(loopNode);
-   assert(loopNode->Opcode == IR_LOOP);
-   n = new_node1(IR_CONT_IF_TRUE, cond);
-   if (n) {
-      n->Parent = loopNode; /* pointer to containing loop */
-      /* insert this node at head of linked list of cont/break instructions */
-      n->List = loopNode->List;
-      loopNode->List = n;
-   }
-   return n;
-}
-
-
-static slang_ir_node *
-new_cond(slang_ir_node *n)
-{
-   slang_ir_node *c = new_node1(IR_COND, n);
-   return c;
-}
-
-
-static slang_ir_node *
-new_if(slang_ir_node *cond, slang_ir_node *ifPart, slang_ir_node *elsePart)
-{
-   return new_node3(IR_IF, cond, ifPart, elsePart);
-}
-
-
-/**
- * New IR_VAR node - a reference to a previously declared variable.
- */
-static slang_ir_node *
-new_var(slang_assemble_ctx *A, slang_variable *var)
-{
-   slang_ir_node *n = new_node0(IR_VAR);
-   if (n) {
-      ASSERT(var);
-      ASSERT(var->store);
-      ASSERT(!n->Store);
-      ASSERT(!n->Var);
-
-      /* Set IR node's Var and Store pointers */
-      n->Var = var;
-      n->Store = var->store;
-   }
-   return n;
-}
-
-
-/**
- * Check if the given function is really just a wrapper for a
- * basic assembly instruction.
- */
-static GLboolean
-slang_is_asm_function(const slang_function *fun)
-{
-   if (fun->body->type == SLANG_OPER_BLOCK_NO_NEW_SCOPE &&
-       fun->body->num_children == 1 &&
-       fun->body->children[0].type == SLANG_OPER_ASM) {
-      return GL_TRUE;
-   }
-   return GL_FALSE;
-}
-
-
-static GLboolean
-_slang_is_noop(const slang_operation *oper)
-{
-   if (!oper ||
-       oper->type == SLANG_OPER_VOID ||
-       (oper->num_children == 1 && oper->children[0].type == SLANG_OPER_VOID))
-      return GL_TRUE;
-   else
-      return GL_FALSE;
-}
-
-
-/**
- * Recursively search tree for a node of the given type.
- */
-#if 0
-static slang_operation *
-_slang_find_node_type(slang_operation *oper, slang_operation_type type)
-{
-   GLuint i;
-   if (oper->type == type)
-      return oper;
-   for (i = 0; i < oper->num_children; i++) {
-      slang_operation *p = _slang_find_node_type(&oper->children[i], type);
-      if (p)
-         return p;
-   }
-   return NULL;
-}
-#endif
-
-
-/**
- * Count the number of operations of the given time rooted at 'oper'.
- */
-static GLuint
-_slang_count_node_type(const slang_operation *oper, slang_operation_type type)
-{
-   GLuint i, count = 0;
-   if (oper->type == type) {
-      return 1;
-   }
-   for (i = 0; i < oper->num_children; i++) {
-      count += _slang_count_node_type(&oper->children[i], type);
-   }
-   return count;
-}
-
-
-/**
- * Check if the 'return' statement found under 'oper' is a "tail return"
- * that can be no-op'd.  For example:
- *
- * void func(void)
- * {
- *    .. do something ..
- *    return;   // this is a no-op
- * }
- *
- * This is used when determining if a function can be inlined.  If the
- * 'return' is not the last statement, we can't inline the function since
- * we still need the semantic behaviour of the 'return' but we don't want
- * to accidentally return from the _calling_ function.  We'd need to use an
- * unconditional branch, but we don't have such a GPU instruction (not
- * always, at least).
- */
-static GLboolean
-_slang_is_tail_return(const slang_operation *oper)
-{
-   GLuint k = oper->num_children;
-
-   while (k > 0) {
-      const slang_operation *last = &oper->children[k - 1];
-      if (last->type == SLANG_OPER_RETURN)
-         return GL_TRUE;
-      else if (last->type == SLANG_OPER_IDENTIFIER ||
-               last->type == SLANG_OPER_LABEL)
-         k--; /* try prev child */
-      else if (last->type == SLANG_OPER_BLOCK_NO_NEW_SCOPE ||
-               last->type == SLANG_OPER_BLOCK_NEW_SCOPE)
-         /* try sub-children */
-         return _slang_is_tail_return(last);
-      else
-         break;
-   }
-
-   return GL_FALSE;
-}
-
-
-/**
- * Generate a variable declaration opeartion.
- * I.e.: generate AST code for "bool flag = false;"
- */
-static void
-slang_generate_declaration(slang_assemble_ctx *A,
-                           slang_variable_scope *scope,
-                           slang_operation *decl,
-                           slang_type_specifier_type type,
-                           const char *name,
-                           GLint initValue)
-{
-   slang_variable *var;
-
-   assert(type == SLANG_SPEC_BOOL ||
-          type == SLANG_SPEC_INT);
-
-   decl->type = SLANG_OPER_VARIABLE_DECL;
-
-   var = slang_variable_scope_grow(scope);
-
-   slang_fully_specified_type_construct(&var->type);
-
-   var->type.specifier.type = type;
-   var->a_name = slang_atom_pool_atom(A->atoms, name);
-   decl->a_id = var->a_name;
-   var->initializer = slang_operation_new(1);
-   slang_operation_literal_bool(var->initializer, initValue);
-}
-
-
-static void
-slang_resolve_variable(slang_operation *oper)
-{
-   if (oper->type == SLANG_OPER_IDENTIFIER && !oper->var) {
-      oper->var = _slang_variable_locate(oper->locals, oper->a_id, GL_TRUE);
-   }
-}
-
-
-/**
- * Rewrite AST code for "return expression;".
- *
- * We return values from functions by assinging the returned value to
- * the hidden __retVal variable which is an extra 'out' parameter we add
- * to the function signature.
- * This code basically converts "return expr;" into "__retVal = expr; return;"
- *
- * \return the new AST code.
- */
-static slang_operation *
-gen_return_with_expression(slang_assemble_ctx *A, slang_operation *oper)
-{
-   slang_operation *blockOper, *assignOper;
-
-   assert(oper->type == SLANG_OPER_RETURN);
-
-   if (A->CurFunction->header.type.specifier.type == SLANG_SPEC_VOID) {
-      slang_info_log_error(A->log, "illegal return expression");
-      return NULL;
-   }
-
-   blockOper = slang_operation_new(1);
-   blockOper->type = SLANG_OPER_BLOCK_NO_NEW_SCOPE;
-   blockOper->locals->outer_scope = oper->locals->outer_scope;
-   slang_operation_add_children(blockOper, 2);
-
-   if (A->UseReturnFlag) {
-      /* Emit:
-       *    {
-       *       if (__notRetFlag)
-       *          __retVal = expr;
-       *       __notRetFlag = 0;
-       *    }
-       */
-      {
-         slang_operation *ifOper = slang_oper_child(blockOper, 0);
-         ifOper->type = SLANG_OPER_IF;
-         slang_operation_add_children(ifOper, 3);
-         {
-            slang_operation *cond = slang_oper_child(ifOper, 0);
-            cond->type = SLANG_OPER_IDENTIFIER;
-            cond->a_id = slang_atom_pool_atom(A->atoms, "__notRetFlag");
-         }
-         {
-            slang_operation *elseOper = slang_oper_child(ifOper, 2);
-            elseOper->type = SLANG_OPER_VOID;
-         }
-         assignOper = slang_oper_child(ifOper, 1);
-      }
-      {
-         slang_operation *setOper = slang_oper_child(blockOper, 1);
-         setOper->type = SLANG_OPER_ASSIGN;
-         slang_operation_add_children(setOper, 2);
-         {
-            slang_operation *lhs = slang_oper_child(setOper, 0);
-            lhs->type = SLANG_OPER_IDENTIFIER;
-            lhs->a_id = slang_atom_pool_atom(A->atoms, "__notRetFlag");
-         }
-         {
-            slang_operation *rhs = slang_oper_child(setOper, 1);
-            slang_operation_literal_bool(rhs, GL_FALSE);
-         }
-      }
-   }
-   else {
-      /* Emit:
-       *    {
-       *       __retVal = expr;
-       *       return_inlined;
-       *    }
-       */
-      assignOper = slang_oper_child(blockOper, 0);
-      {
-         slang_operation *returnOper = slang_oper_child(blockOper, 1);
-         returnOper->type = SLANG_OPER_RETURN_INLINED;
-         assert(returnOper->num_children == 0);
-      }
-   }
-
-   /* __retVal = expression; */
-   assignOper->type = SLANG_OPER_ASSIGN;
-   slang_operation_add_children(assignOper, 2);
-   {
-      slang_operation *lhs = slang_oper_child(assignOper, 0);
-      lhs->type = SLANG_OPER_IDENTIFIER;
-      lhs->a_id = slang_atom_pool_atom(A->atoms, "__retVal");
-   }
-   {
-      slang_operation *rhs = slang_oper_child(assignOper, 1);
-      slang_operation_copy(rhs, &oper->children[0]);
-   }
-
-   /*blockOper->locals->outer_scope = oper->locals->outer_scope;*/
-
-   /*slang_print_tree(blockOper, 0);*/
-
-   return blockOper;
-}
-
-
-/**
- * Rewrite AST code for "return;" (no expression).
- */
-static slang_operation *
-gen_return_without_expression(slang_assemble_ctx *A, slang_operation *oper)
-{
-   slang_operation *newRet;
-
-   assert(oper->type == SLANG_OPER_RETURN);
-
-   if (A->CurFunction->header.type.specifier.type != SLANG_SPEC_VOID) {
-      slang_info_log_error(A->log, "return statement requires an expression");
-      return NULL;
-   }
-
-   if (A->UseReturnFlag) {
-      /* Emit:
-       *    __notRetFlag = 0;
-       */
-      {
-         newRet = slang_operation_new(1);
-         newRet->locals->outer_scope = oper->locals->outer_scope;
-         newRet->type = SLANG_OPER_ASSIGN;
-         slang_operation_add_children(newRet, 2);
-         {
-            slang_operation *lhs = slang_oper_child(newRet, 0);
-            lhs->type = SLANG_OPER_IDENTIFIER;
-            lhs->a_id = slang_atom_pool_atom(A->atoms, "__notRetFlag");
-         }
-         {
-            slang_operation *rhs = slang_oper_child(newRet, 1);
-            slang_operation_literal_bool(rhs, GL_FALSE);
-         }
-      }
-   }
-   else {
-      /* Emit:
-       *    return_inlined;
-       */
-      newRet = slang_operation_new(1);
-      newRet->locals->outer_scope = oper->locals->outer_scope;
-      newRet->type = SLANG_OPER_RETURN_INLINED;
-   }
-
-   /*slang_print_tree(newRet, 0);*/
-
-   return newRet;
-}
-
-
-
-
-/**
- * Replace particular variables (SLANG_OPER_IDENTIFIER) with new expressions.
- */
-static void
-slang_substitute(slang_assemble_ctx *A, slang_operation *oper,
-                 GLuint substCount, slang_variable **substOld,
-		 slang_operation **substNew, GLboolean isLHS)
-{
-   switch (oper->type) {
-   case SLANG_OPER_VARIABLE_DECL:
-      {
-         slang_variable *v = _slang_variable_locate(oper->locals,
-                                                    oper->a_id, GL_TRUE);
-         assert(v);
-         if (v->initializer && oper->num_children == 0) {
-            /* set child of oper to copy of initializer */
-            oper->num_children = 1;
-            oper->children = slang_operation_new(1);
-            slang_operation_copy(&oper->children[0], v->initializer);
-         }
-         if (oper->num_children == 1) {
-            /* the initializer */
-            slang_substitute(A, &oper->children[0], substCount,
-                             substOld, substNew, GL_FALSE);
-         }
-      }
-      break;
-   case SLANG_OPER_IDENTIFIER:
-      assert(oper->num_children == 0);
-      if (1/**!isLHS XXX FIX */) {
-         slang_atom id = oper->a_id;
-         slang_variable *v;
-	 GLuint i;
-         v = _slang_variable_locate(oper->locals, id, GL_TRUE);
-	 if (!v) {
-            if (strcmp((char *) oper->a_id, "__notRetFlag"))
-               _mesa_problem(NULL, "var %s not found!\n", (char *) oper->a_id);
-            return;
-	 }
-
-	 /* look for a substitution */
-	 for (i = 0; i < substCount; i++) {
-	    if (v == substOld[i]) {
-               /* OK, replace this SLANG_OPER_IDENTIFIER with a new expr */
-#if 0 /* DEBUG only */
-	       if (substNew[i]->type == SLANG_OPER_IDENTIFIER) {
-                  assert(substNew[i]->var);
-                  assert(substNew[i]->var->a_name);
-		  printf("Substitute %s with %s in id node %p\n",
-			 (char*)v->a_name, (char*) substNew[i]->var->a_name,
-			 (void*) oper);
-               }
-	       else {
-		  printf("Substitute %s with %f in id node %p\n",
-			 (char*)v->a_name, substNew[i]->literal[0],
-			 (void*) oper);
-               }
-#endif
-	       slang_operation_copy(oper, substNew[i]);
-	       break;
-	    }
-	 }
-      }
-      break;
-
-   case SLANG_OPER_RETURN:
-      {
-         slang_operation *newReturn;
-         /* generate new 'return' code' */
-         if (slang_oper_child(oper, 0)->type == SLANG_OPER_VOID)
-            newReturn = gen_return_without_expression(A, oper);
-         else
-            newReturn = gen_return_with_expression(A, oper);
-
-         if (!newReturn)
-            return;
-
-         /* do substitutions on the new 'return' code */
-         slang_substitute(A, newReturn,
-                          substCount, substOld, substNew, GL_FALSE);
-
-         /* install new 'return' code */
-         slang_operation_copy(oper, newReturn);
-         slang_operation_destruct(newReturn);
-      }
-      break;
-
-   case SLANG_OPER_ASSIGN:
-   case SLANG_OPER_SUBSCRIPT:
-      /* special case:
-       * child[0] can't have substitutions but child[1] can.
-       */
-      slang_substitute(A, &oper->children[0],
-                       substCount, substOld, substNew, GL_TRUE);
-      slang_substitute(A, &oper->children[1],
-                       substCount, substOld, substNew, GL_FALSE);
-      break;
-   case SLANG_OPER_FIELD:
-      /* XXX NEW - test */
-      slang_substitute(A, &oper->children[0],
-                       substCount, substOld, substNew, GL_TRUE);
-      break;
-   default:
-      {
-         GLuint i;
-         for (i = 0; i < oper->num_children; i++) 
-            slang_substitute(A, &oper->children[i],
-                             substCount, substOld, substNew, GL_FALSE);
-      }
-   }
-}
-
-
-/**
- * Produce inline code for a call to an assembly instruction.
- * This is typically used to compile a call to a built-in function like this:
- *
- * vec4 mix(const vec4 x, const vec4 y, const vec4 a)
- * {
- *    __asm vec4_lrp __retVal, a, y, x;
- * }
- *
- *
- * A call to
- *     r = mix(p1, p2, p3);
- *
- * Becomes:
- *
- *              mov
- *             /   \
- *            r   vec4_lrp
- *                 /  |  \
- *                p3  p2  p1
- *
- * We basically translate a SLANG_OPER_CALL into a SLANG_OPER_ASM.
- */
-static slang_operation *
-slang_inline_asm_function(slang_assemble_ctx *A,
-                          slang_function *fun, slang_operation *oper)
-{
-   const GLuint numArgs = oper->num_children;
-   GLuint i;
-   slang_operation *inlined;
-   const GLboolean haveRetValue = _slang_function_has_return_value(fun);
-   slang_variable **substOld;
-   slang_operation **substNew;
-
-   ASSERT(slang_is_asm_function(fun));
-   ASSERT(fun->param_count == numArgs + haveRetValue);
-
-   /*
-   printf("Inline %s as %s\n",
-          (char*) fun->header.a_name,
-          (char*) fun->body->children[0].a_id);
-   */
-
-   /*
-    * We'll substitute formal params with actual args in the asm call.
-    */
-   substOld = (slang_variable **)
-      _slang_alloc(numArgs * sizeof(slang_variable *));
-   substNew = (slang_operation **)
-      _slang_alloc(numArgs * sizeof(slang_operation *));
-   for (i = 0; i < numArgs; i++) {
-      substOld[i] = fun->parameters->variables[i];
-      substNew[i] = oper->children + i;
-   }
-
-   /* make a copy of the code to inline */
-   inlined = slang_operation_new(1);
-   slang_operation_copy(inlined, &fun->body->children[0]);
-   if (haveRetValue) {
-      /* get rid of the __retVal child */
-      inlined->num_children--;
-      for (i = 0; i < inlined->num_children; i++) {
-         inlined->children[i] = inlined->children[i + 1];
-      }
-   }
-
-   /* now do formal->actual substitutions */
-   slang_substitute(A, inlined, numArgs, substOld, substNew, GL_FALSE);
-
-   _slang_free(substOld);
-   _slang_free(substNew);
-
-#if 0
-   printf("+++++++++++++ inlined asm function %s +++++++++++++\n",
-          (char *) fun->header.a_name);
-   slang_print_tree(inlined, 3);
-   printf("+++++++++++++++++++++++++++++++++++++++++++++++++++\n");
-#endif
-
-   return inlined;
-}
-
-
-/**
- * Inline the given function call operation.
- * Return a new slang_operation that corresponds to the inlined code.
- */
-static slang_operation *
-slang_inline_function_call(slang_assemble_ctx * A, slang_function *fun,
-			   slang_operation *oper, slang_operation *returnOper)
-{
-   typedef enum {
-      SUBST = 1,
-      COPY_IN,
-      COPY_OUT
-   } ParamMode;
-   ParamMode *paramMode;
-   const GLboolean haveRetValue = _slang_function_has_return_value(fun);
-   const GLuint numArgs = oper->num_children;
-   const GLuint totalArgs = numArgs + haveRetValue;
-   slang_operation *args = oper->children;
-   slang_operation *inlined, *top;
-   slang_variable **substOld;
-   slang_operation **substNew;
-   GLuint substCount, numCopyIn, i;
-   slang_function *prevFunction;
-   slang_variable_scope *newScope = NULL;
-
-   /* save / push */
-   prevFunction = A->CurFunction;
-   A->CurFunction = fun;
-
-   /*assert(oper->type == SLANG_OPER_CALL); (or (matrix) multiply, etc) */
-   assert(fun->param_count == totalArgs);
-
-   /* allocate temporary arrays */
-   paramMode = (ParamMode *)
-      _slang_alloc(totalArgs * sizeof(ParamMode));
-   substOld = (slang_variable **)
-      _slang_alloc(totalArgs * sizeof(slang_variable *));
-   substNew = (slang_operation **)
-      _slang_alloc(totalArgs * sizeof(slang_operation *));
-
-#if 0
-   printf("\nInline call to %s  (total vars=%d  nparams=%d)\n",
-	  (char *) fun->header.a_name,
-	  fun->parameters->num_variables, numArgs);
-#endif
-
-   if (haveRetValue && !returnOper) {
-      /* Create 3-child comma sequence for inlined code:
-       * child[0]:  declare __resultTmp
-       * child[1]:  inlined function body
-       * child[2]:  __resultTmp
-       */
-      slang_operation *commaSeq;
-      slang_operation *declOper = NULL;
-      slang_variable *resultVar;
-
-      commaSeq = slang_operation_new(1);
-      commaSeq->type = SLANG_OPER_SEQUENCE;
-      assert(commaSeq->locals);
-      commaSeq->locals->outer_scope = oper->locals->outer_scope;
-      commaSeq->num_children = 3;
-      commaSeq->children = slang_operation_new(3);
-      /* allocate the return var */
-      resultVar = slang_variable_scope_grow(commaSeq->locals);
-      /*
-      printf("Alloc __resultTmp in scope %p for retval of calling %s\n",
-             (void*)commaSeq->locals, (char *) fun->header.a_name);
-      */
-
-      resultVar->a_name = slang_atom_pool_atom(A->atoms, "__resultTmp");
-      resultVar->type = fun->header.type; /* XXX copy? */
-      resultVar->isTemp = GL_TRUE;
-
-      /* child[0] = __resultTmp declaration */
-      declOper = &commaSeq->children[0];
-      declOper->type = SLANG_OPER_VARIABLE_DECL;
-      declOper->a_id = resultVar->a_name;
-      declOper->locals->outer_scope = commaSeq->locals;
-
-      /* child[1] = function body */
-      inlined = &commaSeq->children[1];
-      inlined->locals->outer_scope = commaSeq->locals;
-
-      /* child[2] = __resultTmp reference */
-      returnOper = &commaSeq->children[2];
-      returnOper->type = SLANG_OPER_IDENTIFIER;
-      returnOper->a_id = resultVar->a_name;
-      returnOper->locals->outer_scope = commaSeq->locals;
-
-      top = commaSeq;
-   }
-   else {
-      top = inlined = slang_operation_new(1);
-      /* XXXX this may be inappropriate!!!! */
-      inlined->locals->outer_scope = oper->locals->outer_scope;
-   }
-
-
-   assert(inlined->locals);
-
-   /* Examine the parameters, look for inout/out params, look for possible
-    * substitutions, etc:
-    *    param type      behaviour
-    *     in             copy actual to local
-    *     const in       substitute param with actual
-    *     out            copy out
-    */
-   substCount = 0;
-   for (i = 0; i < totalArgs; i++) {
-      slang_variable *p = fun->parameters->variables[i];
-      /*
-      printf("Param %d: %s %s \n", i,
-             slang_type_qual_string(p->type.qualifier),
-	     (char *) p->a_name);
-      */
-      if (p->type.qualifier == SLANG_QUAL_INOUT ||
-	  p->type.qualifier == SLANG_QUAL_OUT) {
-	 /* an output param */
-         slang_operation *arg;
-         if (i < numArgs)
-            arg = &args[i];
-         else
-            arg = returnOper;
-	 paramMode[i] = SUBST;
-
-	 if (arg->type == SLANG_OPER_IDENTIFIER)
-            slang_resolve_variable(arg);
-
-         /* replace parameter 'p' with argument 'arg' */
-	 substOld[substCount] = p;
-	 substNew[substCount] = arg; /* will get copied */
-	 substCount++;
-      }
-      else if (p->type.qualifier == SLANG_QUAL_CONST) {
-	 /* a constant input param */
-         if (args[i].type == SLANG_OPER_IDENTIFIER ||
-             args[i].type == SLANG_OPER_LITERAL_FLOAT ||
-             args[i].type == SLANG_OPER_SUBSCRIPT) {
-	    /* replace all occurances of this parameter variable with the
-	     * actual argument variable or a literal.
-	     */
-	    paramMode[i] = SUBST;
-            slang_resolve_variable(&args[i]);
-	    substOld[substCount] = p;
-	    substNew[substCount] = &args[i]; /* will get copied */
-	    substCount++;
-	 }
-	 else {
-	    paramMode[i] = COPY_IN;
-	 }
-      }
-      else {
-	 paramMode[i] = COPY_IN;
-      }
-      assert(paramMode[i]);
-   }
-
-   /* actual code inlining: */
-   slang_operation_copy(inlined, fun->body);
-
-   /*** XXX review this */
-   assert(inlined->type == SLANG_OPER_BLOCK_NO_NEW_SCOPE ||
-          inlined->type == SLANG_OPER_BLOCK_NEW_SCOPE);
-   inlined->type = SLANG_OPER_BLOCK_NEW_SCOPE;
-
-#if 0
-   printf("======================= orig body code ======================\n");
-   printf("=== params scope = %p\n", (void*) fun->parameters);
-   slang_print_tree(fun->body, 8);
-   printf("======================= copied code =========================\n");
-   slang_print_tree(inlined, 8);
-#endif
-
-   /* do parameter substitution in inlined code: */
-   slang_substitute(A, inlined, substCount, substOld, substNew, GL_FALSE);
-
-#if 0
-   printf("======================= subst code ==========================\n");
-   slang_print_tree(inlined, 8);
-   printf("=============================================================\n");
-#endif
-
-   /* New prolog statements: (inserted before the inlined code)
-    * Copy the 'in' arguments.
-    */
-   numCopyIn = 0;
-   for (i = 0; i < numArgs; i++) {
-      if (paramMode[i] == COPY_IN) {
-	 slang_variable *p = fun->parameters->variables[i];
-	 /* declare parameter 'p' */
-	 slang_operation *decl = slang_operation_insert(&inlined->num_children,
-							&inlined->children,
-							numCopyIn);
-
-	 decl->type = SLANG_OPER_VARIABLE_DECL;
-         assert(decl->locals);
-         decl->locals->outer_scope = inlined->locals;
-	 decl->a_id = p->a_name;
-	 decl->num_children = 1;
-	 decl->children = slang_operation_new(1);
-
-         /* child[0] is the var's initializer */
-         slang_operation_copy(&decl->children[0], args + i);
-
-         /* add parameter 'p' to the local variable scope here */
-         {
-            slang_variable *pCopy = slang_variable_scope_grow(inlined->locals);
-            pCopy->type = p->type;
-            pCopy->a_name = p->a_name;
-            pCopy->array_len = p->array_len;
-         }
-
-         newScope = inlined->locals;
-	 numCopyIn++;
-      }
-   }
-
-   /* Now add copies of the function's local vars to the new variable scope */
-   for (i = totalArgs; i < fun->parameters->num_variables; i++) {
-      slang_variable *p = fun->parameters->variables[i];
-      slang_variable *pCopy = slang_variable_scope_grow(inlined->locals);
-      pCopy->type = p->type;
-      pCopy->a_name = p->a_name;
-      pCopy->array_len = p->array_len;
-   }
-
-
-   /* New epilog statements:
-    * 1. Create end of function label to jump to from return statements.
-    * 2. Copy the 'out' parameter vars
-    */
-   {
-      slang_operation *lab = slang_operation_insert(&inlined->num_children,
-                                                    &inlined->children,
-                                                    inlined->num_children);
-      lab->type = SLANG_OPER_LABEL;
-      lab->label = A->curFuncEndLabel;
-   }
-
-   for (i = 0; i < totalArgs; i++) {
-      if (paramMode[i] == COPY_OUT) {
-	 const slang_variable *p = fun->parameters->variables[i];
-	 /* actualCallVar = outParam */
-	 /*if (i > 0 || !haveRetValue)*/
-	 slang_operation *ass = slang_operation_insert(&inlined->num_children,
-						       &inlined->children,
-						       inlined->num_children);
-	 ass->type = SLANG_OPER_ASSIGN;
-	 ass->num_children = 2;
-         ass->locals->outer_scope = inlined->locals;
-	 ass->children = slang_operation_new(2);
-	 ass->children[0] = args[i]; /*XXX copy */
-	 ass->children[1].type = SLANG_OPER_IDENTIFIER;
-	 ass->children[1].a_id = p->a_name;
-         ass->children[1].locals->outer_scope = ass->locals;
-      }
-   }
-
-   _slang_free(paramMode);
-   _slang_free(substOld);
-   _slang_free(substNew);
-
-   /* Update scoping to use the new local vars instead of the
-    * original function's vars.  This is especially important
-    * for nested inlining.
-    */
-   if (newScope)
-      slang_replace_scope(inlined, fun->parameters, newScope);
-
-#if 0
-   printf("Done Inline call to %s  (total vars=%d  nparams=%d)\n\n",
-	  (char *) fun->header.a_name,
-	  fun->parameters->num_variables, numArgs);
-   slang_print_tree(top, 0);
-#endif
-
-   /* pop */
-   A->CurFunction = prevFunction;
-
-   return top;
-}
-
-
-/**
- * Insert declaration for "bool __notRetFlag" in given block operation.
- * This is used when we can't emit "early" return statements in subroutines.
- */
-static void
-declare_return_flag(slang_assemble_ctx *A, slang_operation *oper)
-{
-   slang_operation *decl;
-
-   assert(oper->type == SLANG_OPER_BLOCK_NEW_SCOPE ||
-          oper->type == SLANG_OPER_SEQUENCE);
-
-   decl = slang_operation_insert_child(oper, 1);
-
-   slang_generate_declaration(A, oper->locals, decl,
-                              SLANG_SPEC_BOOL, "__notRetFlag", GL_TRUE);
-
-   /*slang_print_tree(oper, 0);*/
-}
-
-
-/**
- * Recursively replace instances of the old node type with the new type.
- */
-static void
-replace_node_type(slang_operation *oper, slang_operation_type oldType,
-                  slang_operation_type newType)
-{
-   GLuint i;
-
-   if (oper->type == oldType)
-      oper->type = newType;
-
-   for (i = 0; i < slang_oper_num_children(oper); i++) {
-      replace_node_type(slang_oper_child(oper, i), oldType, newType);
-   }
-}
-
-
-
-/**
- * Test if the given function body has an "early return".  That is, there's
- * a 'return' statement that's not the very last instruction in the body.
- */
-static GLboolean
-has_early_return(const slang_operation *funcBody)
-{
-   GLuint retCount = _slang_count_node_type(funcBody, SLANG_OPER_RETURN);
-   if (retCount == 0)
-      return GL_FALSE;
-   else if (retCount == 1 && _slang_is_tail_return(funcBody))
-      return GL_FALSE;
-   else
-      return GL_TRUE;
-}
-
-
-/**
- * Emit IR code for a function call.  This does one of two things:
- * 1. Inline the function's code
- * 2. Create an IR for the function's body and create a real call to it.
- */
-static slang_ir_node *
-_slang_gen_function_call(slang_assemble_ctx *A, slang_function *fun,
-                         slang_operation *oper, slang_operation *dest)
-{
-   slang_ir_node *n;
-   slang_operation *instance;
-   slang_label *prevFuncEndLabel;
-   char name[200];
-
-   prevFuncEndLabel = A->curFuncEndLabel;
-   sprintf(name, "__endOfFunc_%s_", (char *) fun->header.a_name);
-   A->curFuncEndLabel = _slang_label_new(name);
-   assert(A->curFuncEndLabel);
-
-   /*
-    * 'instance' is basically a copy of the function's body with various
-    * transformations.
-    */
-
-   if (slang_is_asm_function(fun) && !dest) {
-      /* assemble assembly function - tree style */
-      instance = slang_inline_asm_function(A, fun, oper);
-   }
-   else {
-      /* non-assembly function */
-      /* We always generate an "inline-able" block of code here.
-       * We may either:
-       *  1. insert the inline code
-       *  2. Generate a call to the "inline" code as a subroutine
-       */
-      const GLboolean earlyReturn = has_early_return(fun->body);
-
-      if (earlyReturn && !A->EmitContReturn) {
-         A->UseReturnFlag = GL_TRUE;
-      }
-
-      instance = slang_inline_function_call(A, fun, oper, dest);
-      if (!instance)
-         return NULL;
-
-      if (earlyReturn) {
-         /* The function we're calling has one or more 'return' statements
-          * that prevent us from inlining the function's code.
-          *
-          * In this case, change the function's body type from
-          * SLANG_OPER_BLOCK_NEW_SCOPE to SLANG_OPER_NON_INLINED_CALL.
-          * During code emit this will result in a true subroutine call.
-          *
-          * Also, convert SLANG_OPER_RETURN_INLINED nodes to SLANG_OPER_RETURN.
-          */
-         slang_operation *callOper;
-
-         assert(instance->type == SLANG_OPER_BLOCK_NEW_SCOPE ||
-                instance->type == SLANG_OPER_SEQUENCE);
-
-         if (_slang_function_has_return_value(fun) && !dest) {
-            assert(instance->children[0].type == SLANG_OPER_VARIABLE_DECL);
-            assert(instance->children[2].type == SLANG_OPER_IDENTIFIER);
-            callOper = &instance->children[1];
-         }
-         else {
-            callOper = instance;
-         }
-
-         if (A->UseReturnFlag) {
-            /* Early returns not supported.  Create a _returnFlag variable
-             * that's set upon 'return' and tested elsewhere to no-op any
-             * remaining instructions in the subroutine.
-             */
-            assert(callOper->type == SLANG_OPER_BLOCK_NEW_SCOPE ||
-                   callOper->type == SLANG_OPER_SEQUENCE);
-            declare_return_flag(A, callOper);
-         }
-         else {
-            /* We can emit real 'return' statements.  If we generated any
-             * 'inline return' statements during function instantiation,
-             * change them back to regular 'return' statements.
-             */
-            replace_node_type(instance, SLANG_OPER_RETURN_INLINED,
-                              SLANG_OPER_RETURN);
-         }
-
-         callOper->type = SLANG_OPER_NON_INLINED_CALL;
-         callOper->fun = fun;
-         callOper->label = _slang_label_new_unique((char*) fun->header.a_name);
-      }
-      else {
-         /* If there are any 'return' statements remaining, they're at the
-          * very end of the function and can effectively become no-ops.
-          */
-         replace_node_type(instance, SLANG_OPER_RETURN_INLINED,
-                           SLANG_OPER_VOID);
-      }
-   }
-
-   if (!instance)
-      return NULL;
-
-   /* Replace the function call with the instance block (or new CALL stmt) */
-   slang_operation_destruct(oper);
-   *oper = *instance;
-   _slang_free(instance);
-
-#if 0
-   assert(instance->locals);
-   printf("*** Inlined code for call to %s:\n", (char*) fun->header.a_name);
-   slang_print_tree(oper, 10);
-   printf("\n");
-#endif
-
-   n = _slang_gen_operation(A, oper);
-
-   /*_slang_label_delete(A->curFuncEndLabel);*/
-   A->curFuncEndLabel = prevFuncEndLabel;
-
-   if (A->pragmas->Debug) {
-      char s[1000];
-      _mesa_snprintf(s, sizeof(s), "Call/inline %s()", (char *) fun->header.a_name);
-      n->Comment = _slang_strdup(s);
-   }
-
-   A->UseReturnFlag = GL_FALSE;
-
-   return n;
-}
-
-
-static slang_asm_info *
-slang_find_asm_info(const char *name)
-{
-   GLuint i;
-   for (i = 0; AsmInfo[i].Name; i++) {
-      if (strcmp(AsmInfo[i].Name, name) == 0) {
-         return AsmInfo + i;
-      }
-   }
-   return NULL;
-}
-
-
-/**
- * Some write-masked assignments are simple, but others are hard.
- * Simple example:
- *    vec3 v;
- *    v.xy = vec2(a, b);
- * Hard example:
- *    vec3 v;
- *    v.zy = vec2(a, b);
- * this gets transformed/swizzled into:
- *    v.zy = vec2(a, b).*yx*         (* = don't care)
- * This function helps to determine simple vs. non-simple.
- */
-static GLboolean
-_slang_simple_writemask(GLuint writemask, GLuint swizzle)
-{
-   switch (writemask) {
-   case WRITEMASK_X:
-      return GET_SWZ(swizzle, 0) == SWIZZLE_X;
-   case WRITEMASK_Y:
-      return GET_SWZ(swizzle, 1) == SWIZZLE_Y;
-   case WRITEMASK_Z:
-      return GET_SWZ(swizzle, 2) == SWIZZLE_Z;
-   case WRITEMASK_W:
-      return GET_SWZ(swizzle, 3) == SWIZZLE_W;
-   case WRITEMASK_XY:
-      return (GET_SWZ(swizzle, 0) == SWIZZLE_X)
-         && (GET_SWZ(swizzle, 1) == SWIZZLE_Y);
-   case WRITEMASK_XYZ:
-      return (GET_SWZ(swizzle, 0) == SWIZZLE_X)
-         && (GET_SWZ(swizzle, 1) == SWIZZLE_Y)
-         && (GET_SWZ(swizzle, 2) == SWIZZLE_Z);
-   case WRITEMASK_XYZW:
-      return swizzle == SWIZZLE_NOOP;
-   default:
-      return GL_FALSE;
-   }
-}
-
-
-/**
- * Convert the given swizzle into a writemask.  In some cases this
- * is trivial, in other cases, we'll need to also swizzle the right
- * hand side to put components in the right places.
- * See comment above for more info.
- * XXX this function could be simplified and should probably be renamed.
- * \param swizzle  the incoming swizzle
- * \param writemaskOut  returns the writemask
- * \param swizzleOut  swizzle to apply to the right-hand-side
- * \return GL_FALSE for simple writemasks, GL_TRUE for non-simple
- */
-static GLboolean
-swizzle_to_writemask(slang_assemble_ctx *A, GLuint swizzle,
-                     GLuint *writemaskOut, GLuint *swizzleOut)
-{
-   GLuint mask = 0x0, newSwizzle[4];
-   GLint i, size;
-
-   /* make new dst writemask, compute size */
-   for (i = 0; i < 4; i++) {
-      const GLuint swz = GET_SWZ(swizzle, i);
-      if (swz == SWIZZLE_NIL) {
-         /* end */
-         break;
-      }
-      assert(swz <= 3);
-
-      if (swizzle != SWIZZLE_XXXX &&
-          swizzle != SWIZZLE_YYYY &&
-          swizzle != SWIZZLE_ZZZZ &&
-          swizzle != SWIZZLE_WWWW &&
-          (mask & (1 << swz))) {
-         /* a channel can't be specified twice (ex: ".xyyz") */
-         slang_info_log_error(A->log, "Invalid writemask '%s'",
-                              _mesa_swizzle_string(swizzle, 0, 0));
-         return GL_FALSE;
-      }
-
-      mask |= (1 << swz);
-   }
-   assert(mask <= 0xf);
-   size = i;  /* number of components in mask/swizzle */
-
-   *writemaskOut = mask;
-
-   /* make new src swizzle, by inversion */
-   for (i = 0; i < 4; i++) {
-      newSwizzle[i] = i; /*identity*/
-   }
-   for (i = 0; i < size; i++) {
-      const GLuint swz = GET_SWZ(swizzle, i);
-      newSwizzle[swz] = i;
-   }
-   *swizzleOut = MAKE_SWIZZLE4(newSwizzle[0],
-                               newSwizzle[1],
-                               newSwizzle[2],
-                               newSwizzle[3]);
-
-   if (_slang_simple_writemask(mask, *swizzleOut)) {
-      if (size >= 1)
-         assert(GET_SWZ(*swizzleOut, 0) == SWIZZLE_X);
-      if (size >= 2)
-         assert(GET_SWZ(*swizzleOut, 1) == SWIZZLE_Y);
-      if (size >= 3)
-         assert(GET_SWZ(*swizzleOut, 2) == SWIZZLE_Z);
-      if (size >= 4)
-         assert(GET_SWZ(*swizzleOut, 3) == SWIZZLE_W);
-      return GL_TRUE;
-   }
-   else
-      return GL_FALSE;
-}
-
-
-#if 0 /* not used, but don't remove just yet */
-/**
- * Recursively traverse 'oper' to produce a swizzle mask in the event
- * of any vector subscripts and swizzle suffixes.
- * Ex:  for "vec4 v",  "v[2].x" resolves to v.z
- */
-static GLuint
-resolve_swizzle(const slang_operation *oper)
-{
-   if (oper->type == SLANG_OPER_FIELD) {
-      /* writemask from .xyzw suffix */
-      slang_swizzle swz;
-      if (_slang_is_swizzle((char*) oper->a_id, 4, &swz)) {
-         GLuint swizzle = MAKE_SWIZZLE4(swz.swizzle[0],
-                                        swz.swizzle[1],
-                                        swz.swizzle[2],
-                                        swz.swizzle[3]);
-         GLuint child_swizzle = resolve_swizzle(&oper->children[0]);
-         GLuint s = _slang_swizzle_swizzle(child_swizzle, swizzle);
-         return s;
-      }
-      else
-         return SWIZZLE_XYZW;
-   }
-   else if (oper->type == SLANG_OPER_SUBSCRIPT &&
-            oper->children[1].type == SLANG_OPER_LITERAL_INT) {
-      /* writemask from [index] */
-      GLuint child_swizzle = resolve_swizzle(&oper->children[0]);
-      GLuint i = (GLuint) oper->children[1].literal[0];
-      GLuint swizzle;
-      GLuint s;
-      switch (i) {
-      case 0:
-         swizzle = SWIZZLE_XXXX;
-         break;
-      case 1:
-         swizzle = SWIZZLE_YYYY;
-         break;
-      case 2:
-         swizzle = SWIZZLE_ZZZZ;
-         break;
-      case 3:
-         swizzle = SWIZZLE_WWWW;
-         break;
-      default:
-         swizzle = SWIZZLE_XYZW;
-      }
-      s = _slang_swizzle_swizzle(child_swizzle, swizzle);
-      return s;
-   }
-   else {
-      return SWIZZLE_XYZW;
-   }
-}
-#endif
-
-
-#if 0
-/**
- * Recursively descend through swizzle nodes to find the node's storage info.
- */
-static slang_ir_storage *
-get_store(const slang_ir_node *n)
-{
-   if (n->Opcode == IR_SWIZZLE) {
-      return get_store(n->Children[0]);
-   }
-   return n->Store;
-}
-#endif
-
-
-/**
- * Generate IR tree for an asm instruction/operation such as:
- *    __asm vec4_dot __retVal.x, v1, v2;
- */
-static slang_ir_node *
-_slang_gen_asm(slang_assemble_ctx *A, slang_operation *oper,
-               slang_operation *dest)
-{
-   const slang_asm_info *info;
-   slang_ir_node *kids[3], *n;
-   GLuint j, firstOperand;
-
-   assert(oper->type == SLANG_OPER_ASM);
-
-   info = slang_find_asm_info((char *) oper->a_id);
-   if (!info) {
-      _mesa_problem(NULL, "undefined __asm function %s\n",
-                    (char *) oper->a_id);
-      assert(info);
-      return NULL;
-   }
-   assert(info->NumParams <= 3);
-
-   if (info->NumParams == oper->num_children) {
-      /* Storage for result is not specified.
-       * Children[0], [1], [2] are the operands.
-       */
-      firstOperand = 0;
-   }
-   else {
-      /* Storage for result (child[0]) is specified.
-       * Children[1], [2], [3] are the operands.
-       */
-      firstOperand = 1;
-   }
-
-   /* assemble child(ren) */
-   kids[0] = kids[1] = kids[2] = NULL;
-   for (j = 0; j < info->NumParams; j++) {
-      kids[j] = _slang_gen_operation(A, &oper->children[firstOperand + j]);
-      if (!kids[j])
-         return NULL;
-   }
-
-   n = new_node3(info->Opcode, kids[0], kids[1], kids[2]);
-
-   if (firstOperand) {
-      /* Setup n->Store to be a particular location.  Otherwise, storage
-       * for the result (a temporary) will be allocated later.
-       */
-      slang_operation *dest_oper;
-      slang_ir_node *n0;
-
-      dest_oper = &oper->children[0];
-
-      n0 = _slang_gen_operation(A, dest_oper);
-      if (!n0)
-         return NULL;
-
-      assert(!n->Store);
-      n->Store = n0->Store;
-
-      assert(n->Store->File != PROGRAM_UNDEFINED || n->Store->Parent);
-
-      _slang_free(n0);
-   }
-
-   return n;
-}
-
-
-#if 0
-static void
-print_funcs(struct slang_function_scope_ *scope, const char *name)
-{
-   GLuint i;
-   for (i = 0; i < scope->num_functions; i++) {
-      slang_function *f = &scope->functions[i];
-      if (!name || strcmp(name, (char*) f->header.a_name) == 0)
-          printf("  %s (%d args)\n", name, f->param_count);
-
-   }
-   if (scope->outer_scope)
-      print_funcs(scope->outer_scope, name);
-}
-#endif
-
-
-/**
- * Find a function of the given name, taking 'numArgs' arguments.
- * This is the function we'll try to call when there is no exact match
- * between function parameters and call arguments.
- *
- * XXX we should really create a list of candidate functions and try
- * all of them...
- */
-static slang_function *
-_slang_find_function_by_argc(slang_function_scope *scope,
-                             const char *name, int numArgs)
-{
-   while (scope) {
-      GLuint i;
-      for (i = 0; i < scope->num_functions; i++) {
-         slang_function *f = &scope->functions[i];
-         if (strcmp(name, (char*) f->header.a_name) == 0) {
-            int haveRetValue = _slang_function_has_return_value(f);
-            if (numArgs == f->param_count - haveRetValue)
-               return f;
-         }
-      }
-      scope = scope->outer_scope;
-   }
-
-   return NULL;
-}
-
-
-static slang_function *
-_slang_find_function_by_max_argc(slang_function_scope *scope,
-                                 const char *name)
-{
-   slang_function *maxFunc = NULL;
-   GLuint maxArgs = 0;
-
-   while (scope) {
-      GLuint i;
-      for (i = 0; i < scope->num_functions; i++) {
-         slang_function *f = &scope->functions[i];
-         if (strcmp(name, (char*) f->header.a_name) == 0) {
-            if (f->param_count > maxArgs) {
-               maxArgs = f->param_count;
-               maxFunc = f;
-            }
-         }
-      }
-      scope = scope->outer_scope;
-   }
-
-   return maxFunc;
-}
-
-
-/**
- * Generate a new slang_function which is a constructor for a user-defined
- * struct type.
- */
-static slang_function *
-_slang_make_struct_constructor(slang_assemble_ctx *A, slang_struct *str)
-{
-   const GLint numFields = str->fields->num_variables;
-   slang_function *fun = slang_function_new(SLANG_FUNC_CONSTRUCTOR);
-
-   /* function header (name, return type) */
-   fun->header.a_name = str->a_name;
-   fun->header.type.qualifier = SLANG_QUAL_NONE;
-   fun->header.type.specifier.type = SLANG_SPEC_STRUCT;
-   fun->header.type.specifier._struct = str;
-
-   /* function parameters (= struct's fields) */
-   {
-      GLint i;
-      for (i = 0; i < numFields; i++) {
-         /*
-         printf("Field %d: %s\n", i, (char*) str->fields->variables[i]->a_name);
-         */
-         slang_variable *p = slang_variable_scope_grow(fun->parameters);
-         *p = *str->fields->variables[i]; /* copy the variable and type */
-         p->type.qualifier = SLANG_QUAL_CONST;
-      }
-      fun->param_count = fun->parameters->num_variables;
-   }
-
-   /* Add __retVal to params */
-   {
-      slang_variable *p = slang_variable_scope_grow(fun->parameters);
-      slang_atom a_retVal = slang_atom_pool_atom(A->atoms, "__retVal");
-      assert(a_retVal);
-      p->a_name = a_retVal;
-      p->type = fun->header.type;
-      p->type.qualifier = SLANG_QUAL_OUT;
-      fun->param_count++;
-   }
-
-   /* function body is:
-    *    block:
-    *       declare T;
-    *       T.f1 = p1;
-    *       T.f2 = p2;
-    *       ...
-    *       T.fn = pn;
-    *       return T;
-    */
-   {
-      slang_variable_scope *scope;
-      slang_variable *var;
-      GLint i;
-
-      fun->body = slang_operation_new(1);
-      fun->body->type = SLANG_OPER_BLOCK_NEW_SCOPE;
-      fun->body->num_children = numFields + 2;
-      fun->body->children = slang_operation_new(numFields + 2);
-
-      scope = fun->body->locals;
-      scope->outer_scope = fun->parameters;
-
-      /* create local var 't' */
-      var = slang_variable_scope_grow(scope);
-      var->a_name = slang_atom_pool_atom(A->atoms, "t");
-      var->type = fun->header.type;
-
-      /* declare t */
-      {
-         slang_operation *decl;
-
-         decl = &fun->body->children[0];
-         decl->type = SLANG_OPER_VARIABLE_DECL;
-         decl->locals = _slang_variable_scope_new(scope);
-         decl->a_id = var->a_name;
-      }
-
-      /* assign params to fields of t */
-      for (i = 0; i < numFields; i++) {
-         slang_operation *assign = &fun->body->children[1 + i];
-
-         assign->type = SLANG_OPER_ASSIGN;
-         assign->locals = _slang_variable_scope_new(scope);
-         assign->num_children = 2;
-         assign->children = slang_operation_new(2);
-         
-         {
-            slang_operation *lhs = &assign->children[0];
-
-            lhs->type = SLANG_OPER_FIELD;
-            lhs->locals = _slang_variable_scope_new(scope);
-            lhs->num_children = 1;
-            lhs->children = slang_operation_new(1);
-            lhs->a_id = str->fields->variables[i]->a_name;
-
-            lhs->children[0].type = SLANG_OPER_IDENTIFIER;
-            lhs->children[0].a_id = var->a_name;
-            lhs->children[0].locals = _slang_variable_scope_new(scope);
-
-#if 0
-            lhs->children[1].num_children = 1;
-            lhs->children[1].children = slang_operation_new(1);
-            lhs->children[1].children[0].type = SLANG_OPER_IDENTIFIER;
-            lhs->children[1].children[0].a_id = str->fields->variables[i]->a_name;
-            lhs->children[1].children->locals = _slang_variable_scope_new(scope);
-#endif
-         }
-
-         {
-            slang_operation *rhs = &assign->children[1];
-
-            rhs->type = SLANG_OPER_IDENTIFIER;
-            rhs->locals = _slang_variable_scope_new(scope);
-            rhs->a_id = str->fields->variables[i]->a_name;
-         }         
-      }
-
-      /* return t; */
-      {
-         slang_operation *ret = &fun->body->children[numFields + 1];
-
-         ret->type = SLANG_OPER_RETURN;
-         ret->locals = _slang_variable_scope_new(scope);
-         ret->num_children = 1;
-         ret->children = slang_operation_new(1);
-         ret->children[0].type = SLANG_OPER_IDENTIFIER;
-         ret->children[0].a_id = var->a_name;
-         ret->children[0].locals = _slang_variable_scope_new(scope);
-      }
-   }
-   /*
-   slang_print_function(fun, 1);
-   */
-   return fun;
-}
-
-
-/**
- * Find/create a function (constructor) for the given structure name.
- */
-static slang_function *
-_slang_locate_struct_constructor(slang_assemble_ctx *A, const char *name)
-{
-   unsigned int i;
-   for (i = 0; i < A->space.structs->num_structs; i++) {
-      slang_struct *str = &A->space.structs->structs[i];
-      if (strcmp(name, (const char *) str->a_name) == 0) {
-         /* found a structure type that matches the function name */
-         if (!str->constructor) {
-            /* create the constructor function now */
-            str->constructor = _slang_make_struct_constructor(A, str);
-         }
-         return str->constructor;
-      }
-   }
-   return NULL;
-}
-
-
-/**
- * Generate a new slang_function to satisfy a call to an array constructor.
- * Ex:  float[3](1., 2., 3.)
- */
-static slang_function *
-_slang_make_array_constructor(slang_assemble_ctx *A, slang_operation *oper)
-{
-   slang_type_specifier_type baseType;
-   slang_function *fun;
-   int num_elements;
-
-   fun = slang_function_new(SLANG_FUNC_CONSTRUCTOR);
-   if (!fun)
-      return NULL;
-
-   baseType = slang_type_specifier_type_from_string((char *) oper->a_id);
-
-   num_elements = oper->num_children;
-
-   /* function header, return type */
-   {
-      fun->header.a_name = oper->a_id;
-      fun->header.type.qualifier = SLANG_QUAL_NONE;
-      fun->header.type.specifier.type = SLANG_SPEC_ARRAY;
-      fun->header.type.specifier._array =
-         slang_type_specifier_new(baseType, NULL, NULL);
-      fun->header.type.array_len = num_elements;
-   }
-
-   /* function parameters (= number of elements) */
-   {
-      GLint i;
-      for (i = 0; i < num_elements; i++) {
-         /*
-         printf("Field %d: %s\n", i, (char*) str->fields->variables[i]->a_name);
-         */
-         slang_variable *p = slang_variable_scope_grow(fun->parameters);
-         char name[10];
-         _mesa_snprintf(name, sizeof(name), "p%d", i);
-         p->a_name = slang_atom_pool_atom(A->atoms, name);
-         p->type.qualifier = SLANG_QUAL_CONST;
-         p->type.specifier.type = baseType;
-      }
-      fun->param_count = fun->parameters->num_variables;
-   }
-
-   /* Add __retVal to params */
-   {
-      slang_variable *p = slang_variable_scope_grow(fun->parameters);
-      slang_atom a_retVal = slang_atom_pool_atom(A->atoms, "__retVal");
-      assert(a_retVal);
-      p->a_name = a_retVal;
-      p->type = fun->header.type;
-      p->type.qualifier = SLANG_QUAL_OUT;
-      p->type.specifier.type = baseType;
-      fun->param_count++;
-   }
-
-   /* function body is:
-    *    block:
-    *       declare T;
-    *       T[0] = p0;
-    *       T[1] = p1;
-    *       ...
-    *       T[n] = pn;
-    *       return T;
-    */
-   {
-      slang_variable_scope *scope;
-      slang_variable *var;
-      GLint i;
-
-      fun->body = slang_operation_new(1);
-      fun->body->type = SLANG_OPER_BLOCK_NEW_SCOPE;
-      fun->body->num_children = num_elements + 2;
-      fun->body->children = slang_operation_new(num_elements + 2);
-
-      scope = fun->body->locals;
-      scope->outer_scope = fun->parameters;
-
-      /* create local var 't' */
-      var = slang_variable_scope_grow(scope);
-      var->a_name = slang_atom_pool_atom(A->atoms, "ttt");
-      var->type = fun->header.type;/*XXX copy*/
-
-      /* declare t */
-      {
-         slang_operation *decl;
-
-         decl = &fun->body->children[0];
-         decl->type = SLANG_OPER_VARIABLE_DECL;
-         decl->locals = _slang_variable_scope_new(scope);
-         decl->a_id = var->a_name;
-      }
-
-      /* assign params to elements of t */
-      for (i = 0; i < num_elements; i++) {
-         slang_operation *assign = &fun->body->children[1 + i];
-
-         assign->type = SLANG_OPER_ASSIGN;
-         assign->locals = _slang_variable_scope_new(scope);
-         assign->num_children = 2;
-         assign->children = slang_operation_new(2);
-         
-         {
-            slang_operation *lhs = &assign->children[0];
-
-            lhs->type = SLANG_OPER_SUBSCRIPT;
-            lhs->locals = _slang_variable_scope_new(scope);
-            lhs->num_children = 2;
-            lhs->children = slang_operation_new(2);
- 
-            lhs->children[0].type = SLANG_OPER_IDENTIFIER;
-            lhs->children[0].a_id = var->a_name;
-            lhs->children[0].locals = _slang_variable_scope_new(scope);
-
-            lhs->children[1].type = SLANG_OPER_LITERAL_INT;
-            lhs->children[1].literal[0] = (GLfloat) i;
-         }
-
-         {
-            slang_operation *rhs = &assign->children[1];
-
-            rhs->type = SLANG_OPER_IDENTIFIER;
-            rhs->locals = _slang_variable_scope_new(scope);
-            rhs->a_id = fun->parameters->variables[i]->a_name;
-         }         
-      }
-
-      /* return t; */
-      {
-         slang_operation *ret = &fun->body->children[num_elements + 1];
-
-         ret->type = SLANG_OPER_RETURN;
-         ret->locals = _slang_variable_scope_new(scope);
-         ret->num_children = 1;
-         ret->children = slang_operation_new(1);
-         ret->children[0].type = SLANG_OPER_IDENTIFIER;
-         ret->children[0].a_id = var->a_name;
-         ret->children[0].locals = _slang_variable_scope_new(scope);
-      }
-   }
-
-   /*
-   slang_print_function(fun, 1);
-   */
-
-   return fun;
-}
-
-
-static GLboolean
-_slang_is_vec_mat_type(const char *name)
-{
-   static const char *vecmat_types[] = {
-      "float", "int", "bool",
-      "vec2", "vec3", "vec4",
-      "ivec2", "ivec3", "ivec4",
-      "bvec2", "bvec3", "bvec4",
-      "mat2", "mat3", "mat4",
-      "mat2x3", "mat2x4", "mat3x2", "mat3x4", "mat4x2", "mat4x3",
-      NULL
-   };
-   int i;
-   for (i = 0; vecmat_types[i]; i++)
-      if (strcmp(name, vecmat_types[i]) == 0)
-         return GL_TRUE;
-   return GL_FALSE;
-}
-
-
-/**
- * Assemble a function call, given a particular function name.
- * \param name  the function's name (operators like '*' are possible).
- */
-static slang_ir_node *
-_slang_gen_function_call_name(slang_assemble_ctx *A, const char *name,
-                              slang_operation *oper, slang_operation *dest)
-{
-   slang_operation *params = oper->children;
-   const GLuint param_count = oper->num_children;
-   slang_atom atom;
-   slang_function *fun;
-   slang_ir_node *n;
-
-   atom = slang_atom_pool_atom(A->atoms, name);
-   if (atom == SLANG_ATOM_NULL)
-      return NULL;
-
-   if (oper->array_constructor) {
-      /* this needs special handling */
-      fun = _slang_make_array_constructor(A, oper);
-   }
-   else {
-      /* Try to find function by name and exact argument type matching */
-      GLboolean error = GL_FALSE;
-      fun = _slang_function_locate(A->space.funcs, atom, params, param_count,
-                                   &A->space, A->atoms, A->log, &error);
-      if (error) {
-         slang_info_log_error(A->log,
-                              "Function '%s' not found (check argument types)",
-                              name);
-         return NULL;
-      }
-   }
-
-   if (!fun) {
-      /* Next, try locating a constructor function for a user-defined type */
-      fun = _slang_locate_struct_constructor(A, name);
-   }
-
-   /*
-    * At this point, some heuristics are used to try to find a function
-    * that matches the calling signature by means of casting or "unrolling"
-    * of constructors.
-    */
-
-   if (!fun && _slang_is_vec_mat_type(name)) {
-      /* Next, if this call looks like a vec() or mat() constructor call,
-       * try "unwinding" the args to satisfy a constructor.
-       */
-      fun = _slang_find_function_by_max_argc(A->space.funcs, name);
-      if (fun) {
-         if (!_slang_adapt_call(oper, fun, &A->space, A->atoms, A->log)) {
-            slang_info_log_error(A->log,
-                                 "Function '%s' not found (check argument types)",
-                                 name);
-            return NULL;
-         }
-      }
-   }
-
-   if (!fun && _slang_is_vec_mat_type(name)) {
-      /* Next, try casting args to the types of the formal parameters */
-      int numArgs = oper->num_children;
-      fun = _slang_find_function_by_argc(A->space.funcs, name, numArgs);
-      if (!fun || !_slang_cast_func_params(oper, fun, &A->space, A->atoms, A->log)) {
-         slang_info_log_error(A->log,
-                              "Function '%s' not found (check argument types)",
-                              name);
-         return NULL;
-      }
-      assert(fun);
-   }
-
-   if (!fun) {
-      slang_info_log_error(A->log,
-                           "Function '%s' not found (check argument types)",
-                           name);
-      return NULL;
-   }
-
-   if (!fun->body) {
-      /* The function body may be in another compilation unit.
-       * We'll try concatenating the shaders and recompile at link time.
-       */
-      A->UnresolvedRefs = GL_TRUE;
-      return new_node1(IR_NOP, NULL);
-   }
-
-   /* type checking to be sure function's return type matches 'dest' type */
-   if (dest) {
-      slang_typeinfo t0;
-
-      slang_typeinfo_construct(&t0);
-      typeof_operation(A, dest, &t0);
-
-      if (!slang_type_specifier_equal(&t0.spec, &fun->header.type.specifier)) {
-         slang_info_log_error(A->log,
-                              "Incompatible type returned by call to '%s'",
-                              name);
-         return NULL;
-      }
-   }
-
-   n = _slang_gen_function_call(A, fun, oper, dest);
-
-   if (n && !n->Store && !dest
-       && fun->header.type.specifier.type != SLANG_SPEC_VOID) {
-      /* setup n->Store for the result of the function call */
-      GLint size = _slang_sizeof_type_specifier(&fun->header.type.specifier);
-      n->Store = _slang_new_ir_storage(PROGRAM_TEMPORARY, -1, size);
-      /*printf("Alloc storage for function result, size %d \n", size);*/
-   }
-
-   if (oper->array_constructor) {
-      /* free the temporary array constructor function now */
-      slang_function_destruct(fun);
-   }
-
-   return n;
-}
-
-
-static slang_ir_node *
-_slang_gen_method_call(slang_assemble_ctx *A, slang_operation *oper)
-{
-   slang_atom *a_length = slang_atom_pool_atom(A->atoms, "length");
-   slang_ir_node *n;
-   slang_variable *var;
-
-   /* NOTE: In GLSL 1.20, there's only one kind of method
-    * call: array.length().  Anything else is an error.
-    */
-   if (oper->a_id != a_length) {
-      slang_info_log_error(A->log,
-                           "Undefined method call '%s'", (char *) oper->a_id);
-      return NULL;
-   }
-
-   /* length() takes no arguments */
-   if (oper->num_children > 0) {
-      slang_info_log_error(A->log, "Invalid arguments to length() method");
-      return NULL;
-   }
-
-   /* lookup the object/variable */
-   var = _slang_variable_locate(oper->locals, oper->a_obj, GL_TRUE);
-   if (!var || var->type.specifier.type != SLANG_SPEC_ARRAY) {
-      slang_info_log_error(A->log,
-                           "Undefined object '%s'", (char *) oper->a_obj);
-      return NULL;
-   }
-
-   /* Create a float/literal IR node encoding the array length */
-   n = new_node0(IR_FLOAT);
-   if (n) {
-      n->Value[0] = (float) _slang_array_length(var);
-      n->Store = _slang_new_ir_storage(PROGRAM_CONSTANT, -1, 1);
-   }
-   return n;
-}
-
-
-static GLboolean
-_slang_is_constant_cond(const slang_operation *oper, GLboolean *value)
-{
-   if (oper->type == SLANG_OPER_LITERAL_FLOAT ||
-       oper->type == SLANG_OPER_LITERAL_INT ||
-       oper->type == SLANG_OPER_LITERAL_BOOL) {
-      if (oper->literal[0])
-         *value = GL_TRUE;
-      else
-         *value = GL_FALSE;
-      return GL_TRUE;
-   }
-   else if (oper->type == SLANG_OPER_EXPRESSION &&
-            oper->num_children == 1) {
-      return _slang_is_constant_cond(&oper->children[0], value);
-   }
-   return GL_FALSE;
-}
-
-
-/**
- * Test if an operation is a scalar or boolean.
- */
-static GLboolean
-_slang_is_scalar_or_boolean(slang_assemble_ctx *A, slang_operation *oper)
-{
-   slang_typeinfo type;
-   GLint size;
-
-   slang_typeinfo_construct(&type);
-   typeof_operation(A, oper, &type);
-   size = _slang_sizeof_type_specifier(&type.spec);
-   slang_typeinfo_destruct(&type);
-   return size == 1;
-}
-
-
-/**
- * Test if an operation is boolean.
- */
-static GLboolean
-_slang_is_boolean(slang_assemble_ctx *A, slang_operation *oper)
-{
-   slang_typeinfo type;
-   GLboolean isBool;
-
-   slang_typeinfo_construct(&type);
-   typeof_operation(A, oper, &type);
-   isBool = (type.spec.type == SLANG_SPEC_BOOL);
-   slang_typeinfo_destruct(&type);
-   return isBool;
-}
-
-
-/**
- * Check if a loop contains a 'continue' statement.
- * Stop looking if we find a nested loop.
- */
-static GLboolean
-_slang_loop_contains_continue(const slang_operation *oper)
-{
-   switch (oper->type) {
-   case SLANG_OPER_CONTINUE:
-      return GL_TRUE;
-   case SLANG_OPER_FOR:
-   case SLANG_OPER_DO:
-   case SLANG_OPER_WHILE:
-      /* stop upon finding a nested loop */
-      return GL_FALSE;
-   default:
-       /* recurse */
-      {
-         GLuint i;
-         for (i = 0; i < oper->num_children; i++) {
-            const slang_operation *child = slang_oper_child_const(oper, i);
-            if (_slang_loop_contains_continue(child))
-               return GL_TRUE;
-         }
-      }
-      return GL_FALSE;
-   }
-}
-
-
-/**
- * Check if a loop contains a 'continue' or 'break' statement.
- * Stop looking if we find a nested loop.
- */
-static GLboolean
-_slang_loop_contains_continue_or_break(const slang_operation *oper)
-{
-   switch (oper->type) {
-   case SLANG_OPER_CONTINUE:
-   case SLANG_OPER_BREAK:
-      return GL_TRUE;
-   case SLANG_OPER_FOR:
-   case SLANG_OPER_DO:
-   case SLANG_OPER_WHILE:
-      /* stop upon finding a nested loop */
-      return GL_FALSE;
-   default:
-       /* recurse */
-      {
-         GLuint i;
-         for (i = 0; i < oper->num_children; i++) {
-            const slang_operation *child = slang_oper_child_const(oper, i);
-            if (_slang_loop_contains_continue_or_break(child))
-               return GL_TRUE;
-         }
-      }
-      return GL_FALSE;
-   }
-}
-
-
-/**
- * Replace 'break' and 'continue' statements inside a do and while loops.
- * This is a recursive helper function used by
- * _slang_gen_do/while_without_continue().
- */
-static void
-replace_break_and_cont(slang_assemble_ctx *A, slang_operation *oper)
-{
-   switch (oper->type) {
-   case SLANG_OPER_BREAK:
-      /* replace 'break' with "_notBreakFlag = false; break" */
-      {
-         slang_operation *block = oper;
-         block->type = SLANG_OPER_BLOCK_NEW_SCOPE;
-         slang_operation_add_children(block, 2);
-         {
-            slang_operation *assign = slang_oper_child(block, 0);
-            assign->type = SLANG_OPER_ASSIGN;
-            slang_operation_add_children(assign, 2);
-            {
-               slang_operation *lhs = slang_oper_child(assign, 0);
-               slang_operation_identifier(lhs, A, "_notBreakFlag");
-            }
-            {
-               slang_operation *rhs = slang_oper_child(assign, 1);
-               slang_operation_literal_bool(rhs, GL_FALSE);
-            }
-         }
-         {
-            slang_operation *brk = slang_oper_child(block, 1);
-            brk->type = SLANG_OPER_BREAK;
-            assert(!brk->children);
-         }
-      }
-      break;
-   case SLANG_OPER_CONTINUE:
-      /* convert continue into a break */
-      oper->type = SLANG_OPER_BREAK;
-      break;
-   case SLANG_OPER_FOR:
-   case SLANG_OPER_DO:
-   case SLANG_OPER_WHILE:
-      /* stop upon finding a nested loop */
-      break;
-   default:
-      /* recurse */
-      {
-         GLuint i;
-         for (i = 0; i < oper->num_children; i++) {
-            replace_break_and_cont(A, slang_oper_child(oper, i));
-         }
-      }
-   }
-}
-
-
-/**
- * Transform a while-loop so that continue statements are converted to breaks.
- * Then do normal IR code generation.
- *
- * Before:
- * 
- * while (LOOPCOND) {
- *    A;
- *    if (IFCOND)
- *       continue;
- *    B;
- *    break;
- *    C;
- * }
- * 
- * After:
- * 
- * {
- *    bool _notBreakFlag = 1;
- *    while (_notBreakFlag && LOOPCOND) {
- *       do {
- *          A;
- *          if (IFCOND) {
- *             break;  // was continue
- *          }
- *          B;
- *          _notBreakFlag = 0; // was
- *          break;             // break
- *          C;
- *       } while (0)
- *    }
- * }
- */
-static slang_ir_node *
-_slang_gen_while_without_continue(slang_assemble_ctx *A, slang_operation *oper)
-{
-   slang_operation *top;
-   slang_operation *innerBody;
-
-   assert(oper->type == SLANG_OPER_WHILE);
-
-   top = slang_operation_new(1);
-   top->type = SLANG_OPER_BLOCK_NEW_SCOPE;
-   top->locals->outer_scope = oper->locals->outer_scope;
-   slang_operation_add_children(top, 2);
-
-   /* declare: bool _notBreakFlag = true */
-   {
-      slang_operation *condDecl = slang_oper_child(top, 0);
-      slang_generate_declaration(A, top->locals, condDecl,
-                                 SLANG_SPEC_BOOL, "_notBreakFlag", GL_TRUE);
-   }
-
-   /* build outer while-loop:  while (_notBreakFlag && LOOPCOND) { ... } */
-   {
-      slang_operation *outerWhile = slang_oper_child(top, 1);
-      outerWhile->type = SLANG_OPER_WHILE;
-      slang_operation_add_children(outerWhile, 2);
-
-      /* _notBreakFlag && LOOPCOND */
-      {
-         slang_operation *cond = slang_oper_child(outerWhile, 0);
-         cond->type = SLANG_OPER_LOGICALAND;
-         slang_operation_add_children(cond, 2);
-         {
-            slang_operation *notBreak = slang_oper_child(cond, 0);
-            slang_operation_identifier(notBreak, A, "_notBreakFlag");
-         }
-         {
-            slang_operation *origCond = slang_oper_child(cond, 1);
-            slang_operation_copy(origCond, slang_oper_child(oper, 0));
-         }
-      }
-
-      /* inner loop */
-      {
-         slang_operation *innerDo = slang_oper_child(outerWhile, 1);
-         innerDo->type = SLANG_OPER_DO;
-         slang_operation_add_children(innerDo, 2);
-
-         /* copy original do-loop body into inner do-loop's body */
-         innerBody = slang_oper_child(innerDo, 0);
-         slang_operation_copy(innerBody, slang_oper_child(oper, 1));
-         innerBody->locals->outer_scope = innerDo->locals;
-
-         /* inner do-loop's condition is constant/false */
-         {
-            slang_operation *constFalse = slang_oper_child(innerDo, 1);
-            slang_operation_literal_bool(constFalse, GL_FALSE);
-         }
-      }
-   }
-
-   /* Finally, in innerBody,
-    *   replace "break" with "_notBreakFlag = 0; break"
-    *   replace "continue" with "break"
-    */
-   replace_break_and_cont(A, innerBody);
-
-   /*slang_print_tree(top, 0);*/
-
-   return _slang_gen_operation(A, top);
-
-   return NULL;
-}
-
-
-/**
- * Generate loop code using high-level IR_LOOP instruction
- */
-static slang_ir_node *
-_slang_gen_while(slang_assemble_ctx * A, slang_operation *oper)
-{
-   /*
-    * LOOP:
-    *    BREAK if !expr (child[0])
-    *    body code (child[1])
-    */
-   slang_ir_node *loop, *breakIf, *body;
-   GLboolean isConst, constTrue = GL_FALSE;
-
-   if (!A->EmitContReturn) {
-      /* We don't want to emit CONT instructions.  If this while-loop has
-       * a continue, translate it away.
-       */
-      if (_slang_loop_contains_continue(slang_oper_child(oper, 1))) {
-         return _slang_gen_while_without_continue(A, oper);
-      }
-   }
-
-   /* type-check expression */
-   if (!_slang_is_boolean(A, &oper->children[0])) {
-      slang_info_log_error(A->log, "scalar/boolean expression expected for 'while'");
-      return NULL;
-   }
-
-   /* Check if loop condition is a constant */
-   isConst = _slang_is_constant_cond(&oper->children[0], &constTrue);
-
-   if (isConst && !constTrue) {
-      /* loop is never executed! */
-      return new_node0(IR_NOP);
-   }
-
-   /* Begin new loop */
-   loop = new_loop(NULL);
-
-   /* save loop state */
-   push_loop(A, oper, loop);
-
-   if (isConst && constTrue) {
-      /* while(nonzero constant), no conditional break */
-      breakIf = NULL;
-   }
-   else {
-      slang_ir_node *cond
-         = new_cond(new_not(_slang_gen_operation(A, &oper->children[0])));
-      breakIf = new_break_if_true(A, cond);
-   }
-   body = _slang_gen_operation(A, &oper->children[1]);
-   loop->Children[0] = new_seq(breakIf, body);
-
-   /* Do infinite loop detection */
-   /* loop->List is head of linked list of break/continue nodes */
-   if (!loop->List && isConst && constTrue) {
-      /* infinite loop detected */
-      pop_loop(A);
-      slang_info_log_error(A->log, "Infinite loop detected!");
-      return NULL;
-   }
-
-   /* restore loop state */
-   pop_loop(A);
-
-   return loop;
-}
-
-
-/**
- * Transform a do-while-loop so that continue statements are converted to breaks.
- * Then do normal IR code generation.
- *
- * Before:
- * 
- * do {
- *    A;
- *    if (IFCOND)
- *       continue;
- *    B;
- *    break;
- *    C;
- * } while (LOOPCOND);
- * 
- * After:
- * 
- * {
- *    bool _notBreakFlag = 1;
- *    do {
- *       do {
- *          A;
- *          if (IFCOND) {
- *             break;  // was continue
- *          }
- *          B;
- *          _notBreakFlag = 0; // was
- *          break;             // break
- *          C;
- *       } while (0)
- *    } while (_notBreakFlag && LOOPCOND);
- * }
- */
-static slang_ir_node *
-_slang_gen_do_without_continue(slang_assemble_ctx *A, slang_operation *oper)
-{
-   slang_operation *top;
-   slang_operation *innerBody;
-
-   assert(oper->type == SLANG_OPER_DO);
-
-   top = slang_operation_new(1);
-   top->type = SLANG_OPER_BLOCK_NEW_SCOPE;
-   top->locals->outer_scope = oper->locals->outer_scope;
-   slang_operation_add_children(top, 2);
-
-   /* declare: bool _notBreakFlag = true */
-   {
-      slang_operation *condDecl = slang_oper_child(top, 0);
-      slang_generate_declaration(A, top->locals, condDecl,
-                                 SLANG_SPEC_BOOL, "_notBreakFlag", GL_TRUE);
-   }
-
-   /* build outer do-loop:  do { ... } while (_notBreakFlag && LOOPCOND) */
-   {
-      slang_operation *outerDo = slang_oper_child(top, 1);
-      outerDo->type = SLANG_OPER_DO;
-      slang_operation_add_children(outerDo, 2);
-
-      /* inner do-loop */
-      {
-         slang_operation *innerDo = slang_oper_child(outerDo, 0);
-         innerDo->type = SLANG_OPER_DO;
-         slang_operation_add_children(innerDo, 2);
-
-         /* copy original do-loop body into inner do-loop's body */
-         innerBody = slang_oper_child(innerDo, 0);
-         slang_operation_copy(innerBody, slang_oper_child(oper, 0));
-         innerBody->locals->outer_scope = innerDo->locals;
-
-         /* inner do-loop's condition is constant/false */
-         {
-            slang_operation *constFalse = slang_oper_child(innerDo, 1);
-            slang_operation_literal_bool(constFalse, GL_FALSE);
-         }
-      }
-
-      /* _notBreakFlag && LOOPCOND */
-      {
-         slang_operation *cond = slang_oper_child(outerDo, 1);
-         cond->type = SLANG_OPER_LOGICALAND;
-         slang_operation_add_children(cond, 2);
-         {
-            slang_operation *notBreak = slang_oper_child(cond, 0);
-            slang_operation_identifier(notBreak, A, "_notBreakFlag");
-         }
-         {
-            slang_operation *origCond = slang_oper_child(cond, 1);
-            slang_operation_copy(origCond, slang_oper_child(oper, 1));
-         }
-      }
-   }
-
-   /* Finally, in innerBody,
-    *   replace "break" with "_notBreakFlag = 0; break"
-    *   replace "continue" with "break"
-    */
-   replace_break_and_cont(A, innerBody);
-
-   /*slang_print_tree(top, 0);*/
-
-   return _slang_gen_operation(A, top);
-}
-
-
-/**
- * Generate IR tree for a do-while loop using high-level LOOP, IF instructions.
- */
-static slang_ir_node *
-_slang_gen_do(slang_assemble_ctx * A, slang_operation *oper)
-{
-   /*
-    * LOOP:
-    *    body code (child[0])
-    *    tail code:
-    *       BREAK if !expr (child[1])
-    */
-   slang_ir_node *loop;
-   GLboolean isConst, constTrue;
-
-   if (!A->EmitContReturn) {
-      /* We don't want to emit CONT instructions.  If this do-loop has
-       * a continue, translate it away.
-       */
-      if (_slang_loop_contains_continue(slang_oper_child(oper, 0))) {
-         return _slang_gen_do_without_continue(A, oper);
-      }
-   }
-
-   /* type-check expression */
-   if (!_slang_is_boolean(A, &oper->children[1])) {
-      slang_info_log_error(A->log, "scalar/boolean expression expected for 'do/while'");
-      return NULL;
-   }
-
-   loop = new_loop(NULL);
-
-   /* save loop state */
-   push_loop(A, oper, loop);
-
-   /* loop body: */
-   loop->Children[0] = _slang_gen_operation(A, &oper->children[0]);
-
-   /* Check if loop condition is a constant */
-   isConst = _slang_is_constant_cond(&oper->children[1], &constTrue);
-   if (isConst && constTrue) {
-      /* do { } while(1)   ==> no conditional break */
-      loop->Children[1] = NULL; /* no tail code */
-   }
-   else {
-      slang_ir_node *cond
-         = new_cond(new_not(_slang_gen_operation(A, &oper->children[1])));
-      loop->Children[1] = new_break_if_true(A, cond);
-   }
-
-   /* XXX we should do infinite loop detection, as above */
-
-   /* restore loop state */
-   pop_loop(A);
-
-   return loop;
-}
-
-
-/**
- * Recursively count the number of operations rooted at 'oper'.
- * This gives some kind of indication of the size/complexity of an operation.
- */
-static GLuint
-sizeof_operation(const slang_operation *oper)
-{
-   if (oper) {
-      GLuint count = 1; /* me */
-      GLuint i;
-      for (i = 0; i < oper->num_children; i++) {
-         count += sizeof_operation(&oper->children[i]);
-      }
-      return count;
-   }
-   else {
-      return 0;
-   }
-}
-
-
-/**
- * Determine if a for-loop can be unrolled.
- * At this time, only a rather narrow class of for loops can be unrolled.
- * See code for details.
- * When a loop can't be unrolled because it's too large we'll emit a
- * message to the log.
- */
-static GLboolean
-_slang_can_unroll_for_loop(slang_assemble_ctx * A, const slang_operation *oper)
-{
-   GLuint bodySize;
-   GLint start, end;
-   const char *varName;
-   slang_atom varId;
-
-   if (oper->type != SLANG_OPER_FOR)
-      return GL_FALSE;
-
-   assert(oper->num_children == 4);
-
-   if (_slang_loop_contains_continue_or_break(slang_oper_child_const(oper, 3)))
-      return GL_FALSE;
-
-   /* children[0] must be either "int i=constant" or "i=constant" */
-   if (oper->children[0].type == SLANG_OPER_BLOCK_NO_NEW_SCOPE) {
-      slang_variable *var;
-
-      if (oper->children[0].children[0].type != SLANG_OPER_VARIABLE_DECL)
-         return GL_FALSE;
-
-      varId = oper->children[0].children[0].a_id;
-
-      var = _slang_variable_locate(oper->children[0].children[0].locals,
-                                   varId, GL_TRUE);
-      if (!var)
-         return GL_FALSE;
-      if (!var->initializer)
-         return GL_FALSE;
-      if (var->initializer->type != SLANG_OPER_LITERAL_INT)
-         return GL_FALSE;
-      start = (GLint) var->initializer->literal[0];
-   }
-   else if (oper->children[0].type == SLANG_OPER_EXPRESSION) {
-      if (oper->children[0].children[0].type != SLANG_OPER_ASSIGN)
-         return GL_FALSE;
-      if (oper->children[0].children[0].children[0].type != SLANG_OPER_IDENTIFIER)
-         return GL_FALSE;
-      if (oper->children[0].children[0].children[1].type != SLANG_OPER_LITERAL_INT)
-         return GL_FALSE;
-
-      varId = oper->children[0].children[0].children[0].a_id;
-
-      start = (GLint) oper->children[0].children[0].children[1].literal[0];
-   }
-   else {
-      return GL_FALSE;
-   }
-
-   /* children[1] must be "i<constant" */
-   if (oper->children[1].type != SLANG_OPER_EXPRESSION)
-      return GL_FALSE;
-   if (oper->children[1].children[0].type != SLANG_OPER_LESS)
-      return GL_FALSE;
-   if (oper->children[1].children[0].children[0].type != SLANG_OPER_IDENTIFIER)
-      return GL_FALSE;
-   if (oper->children[1].children[0].children[1].type != SLANG_OPER_LITERAL_INT)
-      return GL_FALSE;
-
-   end = (GLint) oper->children[1].children[0].children[1].literal[0];
-
-   /* children[2] must be "i++" or "++i" */
-   if (oper->children[2].type != SLANG_OPER_POSTINCREMENT &&
-       oper->children[2].type != SLANG_OPER_PREINCREMENT)
-      return GL_FALSE;
-   if (oper->children[2].children[0].type != SLANG_OPER_IDENTIFIER)
-      return GL_FALSE;
-
-   /* make sure the same variable name is used in all places */
-   if ((oper->children[1].children[0].children[0].a_id != varId) ||
-       (oper->children[2].children[0].a_id != varId))
-      return GL_FALSE;
-
-   varName = (const char *) varId;
-
-   /* children[3], the loop body, can't be too large */
-   bodySize = sizeof_operation(&oper->children[3]);
-   if (bodySize > MAX_FOR_LOOP_UNROLL_BODY_SIZE) {
-      slang_info_log_print(A->log,
-                           "Note: 'for (%s ... )' body is too large/complex"
-                           " to unroll",
-                           varName);
-      return GL_FALSE;
-   }
-
-   if (start >= end)
-      return GL_FALSE; /* degenerate case */
-
-   if ((GLuint)(end - start) > MAX_FOR_LOOP_UNROLL_ITERATIONS) {
-      slang_info_log_print(A->log,
-                           "Note: 'for (%s=%d; %s<%d; ++%s)' is too"
-                           " many iterations to unroll",
-                           varName, start, varName, end, varName);
-      return GL_FALSE;
-   }
-
-   if ((end - start) * bodySize > MAX_FOR_LOOP_UNROLL_COMPLEXITY) {
-      slang_info_log_print(A->log,
-                           "Note: 'for (%s=%d; %s<%d; ++%s)' will generate"
-                           " too much code to unroll",
-                           varName, start, varName, end, varName);
-      return GL_FALSE;
-   }
-
-   return GL_TRUE; /* we can unroll the loop */
-}
-
-
-/**
- * Unroll a for-loop.
- * First we determine the number of iterations to unroll.
- * Then for each iteration:
- *   make a copy of the loop body
- *   replace instances of the loop variable with the current iteration value
- *   generate IR code for the body
- * \return pointer to generated IR code or NULL if error, out of memory, etc.
- */
-static slang_ir_node *
-_slang_unroll_for_loop(slang_assemble_ctx * A, const slang_operation *oper)
-{
-   GLint start, end, iter;
-   slang_ir_node *n, *root = NULL;
-   slang_atom varId;
-
-   if (oper->children[0].type == SLANG_OPER_BLOCK_NO_NEW_SCOPE) {
-      /* for (int i=0; ... */
-      slang_variable *var;
-
-      varId = oper->children[0].children[0].a_id;
-      var = _slang_variable_locate(oper->children[0].children[0].locals,
-                                   varId, GL_TRUE);
-      assert(var);
-      start = (GLint) var->initializer->literal[0];
-   }
-   else {
-      /* for (i=0; ... */
-      varId = oper->children[0].children[0].children[0].a_id;
-      start = (GLint) oper->children[0].children[0].children[1].literal[0];
-   }
-
-   end = (GLint) oper->children[1].children[0].children[1].literal[0];
-
-   for (iter = start; iter < end; iter++) {
-      slang_operation *body;
-
-      /* make a copy of the loop body */
-      body = slang_operation_new(1);
-      if (!body)
-         return NULL;
-
-      if (!slang_operation_copy(body, &oper->children[3]))
-         return NULL;
-
-      /* in body, replace instances of 'varId' with literal 'iter' */
-      {
-         slang_variable *oldVar;
-         slang_operation *newOper;
-
-         oldVar = _slang_variable_locate(oper->locals, varId, GL_TRUE);
-         if (!oldVar) {
-            /* undeclared loop variable */
-            slang_operation_delete(body);
-            return NULL;
-         }
-
-         newOper = slang_operation_new(1);
-         newOper->type = SLANG_OPER_LITERAL_INT;
-         newOper->literal_size = 1;
-         newOper->literal[0] = (GLfloat) iter;
-
-         /* replace instances of the loop variable with newOper */
-         slang_substitute(A, body, 1, &oldVar, &newOper, GL_FALSE);
-      }
-
-      /* do IR codegen for body */
-      n = _slang_gen_operation(A, body);
-      if (!n)
-         return NULL;
-
-      root = new_seq(root, n);
-
-      slang_operation_delete(body);
-   }
-
-   return root;
-}
-
-
-/**
- * Replace 'continue' statement with 'break' inside a for-loop.
- * This is a recursive helper function used by _slang_gen_for_without_continue().
- */
-static void
-replace_continue_with_break(slang_assemble_ctx *A, slang_operation *oper)
-{
-   switch (oper->type) {
-   case SLANG_OPER_CONTINUE:
-      oper->type = SLANG_OPER_BREAK;
-      break;
-   case SLANG_OPER_FOR:
-   case SLANG_OPER_DO:
-   case SLANG_OPER_WHILE:
-      /* stop upon finding a nested loop */
-      break;
-   default:
-      /* recurse */
-      {
-         GLuint i;
-         for (i = 0; i < oper->num_children; i++) {
-            replace_continue_with_break(A, slang_oper_child(oper, i));
-         }
-      }
-   }
-}
-
-
-/**
- * Transform a for-loop so that continue statements are converted to breaks.
- * Then do normal IR code generation.
- *
- * Before:
- * 
- * for (INIT; LOOPCOND; INCR) {
- *    A;
- *    if (IFCOND) {
- *       continue;
- *    }
- *    B;
- * }
- * 
- * After:
- * 
- * {
- *    bool _condFlag = 1;
- *    for (INIT; _condFlag; ) {
- *       for ( ; _condFlag = LOOPCOND; INCR) {
- *          A;
- *          if (IFCOND) {
- *             break;
- *          }
- *          B;
- *       }
- *       if (_condFlag)
- *          INCR;
- *    }
- * }
- */
-static slang_ir_node *
-_slang_gen_for_without_continue(slang_assemble_ctx *A, slang_operation *oper)
-{
-   slang_operation *top;
-   slang_operation *outerFor, *innerFor, *init, *cond, *incr;
-   slang_operation *lhs, *rhs;
-
-   assert(oper->type == SLANG_OPER_FOR);
-
-   top = slang_operation_new(1);
-   top->type = SLANG_OPER_BLOCK_NEW_SCOPE;
-   top->locals->outer_scope = oper->locals->outer_scope;
-   slang_operation_add_children(top, 2);
-
-   /* declare: bool _condFlag = true */
-   {
-      slang_operation *condDecl = slang_oper_child(top, 0);
-      slang_generate_declaration(A, top->locals, condDecl,
-                                 SLANG_SPEC_BOOL, "_condFlag", GL_TRUE);
-   }
-
-   /* build outer loop:  for (INIT; _condFlag; ) { */
-   outerFor = slang_oper_child(top, 1);
-   outerFor->type = SLANG_OPER_FOR;
-   slang_operation_add_children(outerFor, 4);
-
-   init = slang_oper_child(outerFor, 0);
-   slang_operation_copy(init, slang_oper_child(oper, 0));
-
-   cond = slang_oper_child(outerFor, 1);
-   cond->type = SLANG_OPER_IDENTIFIER;
-   cond->a_id = slang_atom_pool_atom(A->atoms, "_condFlag");
-
-   incr = slang_oper_child(outerFor, 2);
-   incr->type = SLANG_OPER_VOID;
-
-   /* body of the outer loop */
-   {
-      slang_operation *block = slang_oper_child(outerFor, 3);
-
-      slang_operation_add_children(block, 2);
-      block->type = SLANG_OPER_BLOCK_NO_NEW_SCOPE;
-
-      /* build inner loop:  for ( ; _condFlag = LOOPCOND; INCR) { */
-      {
-         innerFor = slang_oper_child(block, 0);
-
-         /* make copy of orig loop */
-         slang_operation_copy(innerFor, oper);
-         assert(innerFor->type == SLANG_OPER_FOR);
-         innerFor->locals->outer_scope = block->locals;
-
-         init = slang_oper_child(innerFor, 0);
-         init->type = SLANG_OPER_VOID; /* leak? */
-
-         cond = slang_oper_child(innerFor, 1);
-         slang_operation_destruct(cond);
-         cond->type = SLANG_OPER_ASSIGN;
-         cond->locals = _slang_variable_scope_new(innerFor->locals);
-         slang_operation_add_children(cond, 2);
-
-         lhs = slang_oper_child(cond, 0);
-         lhs->type = SLANG_OPER_IDENTIFIER;
-         lhs->a_id = slang_atom_pool_atom(A->atoms, "_condFlag");
-
-         rhs = slang_oper_child(cond, 1);
-         slang_operation_copy(rhs, slang_oper_child(oper, 1));
-      }
-
-      /* if (_condFlag) INCR; */
-      {
-         slang_operation *ifop = slang_oper_child(block, 1);
-         ifop->type = SLANG_OPER_IF;
-         slang_operation_add_children(ifop, 2);
-
-         /* re-use cond node build above */
-         slang_operation_copy(slang_oper_child(ifop, 0), cond);
-
-         /* incr node from original for-loop operation */
-         slang_operation_copy(slang_oper_child(ifop, 1),
-                              slang_oper_child(oper, 2));
-      }
-
-      /* finally, replace "continue" with "break" in the inner for-loop */
-      replace_continue_with_break(A, slang_oper_child(innerFor, 3));
-   }
-
-   return _slang_gen_operation(A, top);
-}
-
-
-
-/**
- * Generate IR for a for-loop.  Unrolling will be done when possible.
- */
-static slang_ir_node *
-_slang_gen_for(slang_assemble_ctx * A, slang_operation *oper)
-{
-   GLboolean unroll;
-
-   if (!A->EmitContReturn) {
-      /* We don't want to emit CONT instructions.  If this for-loop has
-       * a continue, translate it away.
-       */
-      if (_slang_loop_contains_continue(slang_oper_child(oper, 3))) {
-         return _slang_gen_for_without_continue(A, oper);
-      }
-   }
-
-   unroll = _slang_can_unroll_for_loop(A, oper);
-   if (unroll) {
-      slang_ir_node *code = _slang_unroll_for_loop(A, oper);
-      if (code)
-         return code;
-   }
-
-   assert(oper->type == SLANG_OPER_FOR);
-
-   /* conventional for-loop code generation */
-   {
-      /*
-       * init code (child[0])
-       * LOOP:
-       *    BREAK if !expr (child[1])
-       *    body code (child[3])
-       *    tail code:
-       *       incr code (child[2])   // XXX continue here
-       */
-      slang_ir_node *loop, *cond, *breakIf, *body, *init, *incr;
-      init = _slang_gen_operation(A, &oper->children[0]);
-      loop = new_loop(NULL);
-
-      /* save loop state */
-      push_loop(A, oper, loop);
-
-      cond = new_cond(new_not(_slang_gen_operation(A, &oper->children[1])));
-      breakIf = new_break_if_true(A, cond);
-      body = _slang_gen_operation(A, &oper->children[3]);
-      incr = _slang_gen_operation(A, &oper->children[2]);
-
-      loop->Children[0] = new_seq(breakIf, body);
-      loop->Children[1] = incr;  /* tail code */
-
-      /* restore loop state */
-      pop_loop(A);
-
-      return new_seq(init, loop);
-   }
-}
-
-
-static slang_ir_node *
-_slang_gen_continue(slang_assemble_ctx * A, const slang_operation *oper)
-{
-   slang_ir_node *n, *cont, *incr = NULL, *loopNode;
-
-   assert(oper->type == SLANG_OPER_CONTINUE);
-   loopNode = current_loop_ir(A);
-   assert(loopNode);
-   assert(loopNode->Opcode == IR_LOOP);
-
-   cont = new_node0(IR_CONT);
-   if (cont) {
-      cont->Parent = loopNode;
-      /* insert this node at head of linked list of cont/break instructions */
-      cont->List = loopNode->List;
-      loopNode->List = cont;
-   }
-
-   n = new_seq(incr, cont);
-   return n;
-}
-
-
-/**
- * Determine if the given operation is of a specific type.
- */
-static GLboolean
-is_operation_type(const slang_operation *oper, slang_operation_type type)
-{
-   if (oper->type == type)
-      return GL_TRUE;
-   else if ((oper->type == SLANG_OPER_BLOCK_NEW_SCOPE ||
-             oper->type == SLANG_OPER_BLOCK_NO_NEW_SCOPE) &&
-            oper->num_children == 1)
-      return is_operation_type(&oper->children[0], type);
-   else
-      return GL_FALSE;
-}
-
-
-/**
- * Generate IR tree for an if/then/else conditional using high-level
- * IR_IF instruction.
- */
-static slang_ir_node *
-_slang_gen_if(slang_assemble_ctx * A, const slang_operation *oper)
-{
-   /*
-    * eval expr (child[0])
-    * IF expr THEN
-    *    if-body code
-    * ELSE
-    *    else-body code
-    * ENDIF
-    */
-   const GLboolean haveElseClause = !_slang_is_noop(&oper->children[2]);
-   slang_ir_node *ifNode, *cond, *ifBody, *elseBody;
-   GLboolean isConst, constTrue;
-
-   /* type-check expression */
-   if (!_slang_is_boolean(A, &oper->children[0])) {
-      slang_info_log_error(A->log, "boolean expression expected for 'if'");
-      return NULL;
-   }
-
-   if (!_slang_is_scalar_or_boolean(A, &oper->children[0])) {
-      slang_info_log_error(A->log, "scalar/boolean expression expected for 'if'");
-      return NULL;
-   }
-
-   isConst = _slang_is_constant_cond(&oper->children[0], &constTrue);
-   if (isConst) {
-      if (constTrue) {
-         /* if (true) ... */
-         return _slang_gen_operation(A, &oper->children[1]);
-      }
-      else {
-         /* if (false) ... */
-         return _slang_gen_operation(A, &oper->children[2]);
-      }
-   }
-
-   cond = _slang_gen_operation(A, &oper->children[0]);
-   cond = new_cond(cond);
-
-   if (is_operation_type(&oper->children[1], SLANG_OPER_BREAK)
-       && !haveElseClause) {
-      /* Special case: generate a conditional break */
-      ifBody = new_break_if_true(A, cond);
-      return ifBody;
-   }
-   else if (is_operation_type(&oper->children[1], SLANG_OPER_CONTINUE)
-            && !haveElseClause
-            && current_loop_oper(A)
-            && current_loop_oper(A)->type != SLANG_OPER_FOR) {
-      /* Special case: generate a conditional continue */
-      ifBody = new_cont_if_true(A, cond);
-      return ifBody;
-   }
-   else {
-      /* general case */
-      ifBody = _slang_gen_operation(A, &oper->children[1]);
-      if (haveElseClause)
-         elseBody = _slang_gen_operation(A, &oper->children[2]);
-      else
-         elseBody = NULL;
-      ifNode = new_if(cond, ifBody, elseBody);
-      return ifNode;
-   }
-}
-
-
-
-static slang_ir_node *
-_slang_gen_not(slang_assemble_ctx * A, const slang_operation *oper)
-{
-   slang_ir_node *n;
-
-   assert(oper->type == SLANG_OPER_NOT);
-
-   /* type-check expression */
-   if (!_slang_is_scalar_or_boolean(A, &oper->children[0])) {
-      slang_info_log_error(A->log,
-                           "scalar/boolean expression expected for '!'");
-      return NULL;
-   }
-
-   n = _slang_gen_operation(A, &oper->children[0]);
-   if (n)
-      return new_not(n);
-   else
-      return NULL;
-}
-
-
-static slang_ir_node *
-_slang_gen_xor(slang_assemble_ctx * A, const slang_operation *oper)
-{
-   slang_ir_node *n1, *n2;
-
-   assert(oper->type == SLANG_OPER_LOGICALXOR);
-
-   if (!_slang_is_scalar_or_boolean(A, &oper->children[0]) ||
-       !_slang_is_scalar_or_boolean(A, &oper->children[0])) {
-      slang_info_log_error(A->log,
-                           "scalar/boolean expressions expected for '^^'");
-      return NULL;
-   }
-
-   n1 = _slang_gen_operation(A, &oper->children[0]);
-   if (!n1)
-      return NULL;
-   n2 = _slang_gen_operation(A, &oper->children[1]);
-   if (!n2)
-      return NULL;
-   return new_node2(IR_NOTEQUAL, n1, n2);
-}
-
-
-/**
- * Generate IR node for storage of a temporary of given size.
- */
-static slang_ir_node *
-_slang_gen_temporary(GLint size)
-{
-   slang_ir_storage *store;
-   slang_ir_node *n = NULL;
-
-   store = _slang_new_ir_storage(PROGRAM_TEMPORARY, -2, size);
-   if (store) {
-      n = new_node0(IR_VAR_DECL);
-      if (n) {
-         n->Store = store;
-      }
-      else {
-         _slang_free(store);
-      }
-   }
-   return n;
-}
-
-
-/**
- * Generate program constants for an array.
- * Ex: const vec2[3] v = vec2[3](vec2(1,1), vec2(2,2), vec2(3,3));
- * This will allocate and initialize three vector constants, storing
- * the array in constant memory, not temporaries like a non-const array.
- * This can also be used for uniform array initializers.
- * \return GL_TRUE for success, GL_FALSE if failure (semantic error, etc).
- */
-static GLboolean
-make_constant_array(slang_assemble_ctx *A,
-                    slang_variable *var,
-                    slang_operation *initializer)
-{
-   struct gl_program *prog = A->program;
-   const GLenum datatype = _slang_gltype_from_specifier(&var->type.specifier);
-   const char *varName = (char *) var->a_name;
-   const GLuint numElements = initializer->num_children;
-   GLint size;
-   GLuint i, j;
-   GLfloat *values;
-
-   if (!var->store) {
-      var->store = _slang_new_ir_storage(PROGRAM_UNDEFINED, -6, -6);
-   }
-   size = var->store->Size;
-
-   assert(var->type.qualifier == SLANG_QUAL_CONST ||
-          var->type.qualifier == SLANG_QUAL_UNIFORM);
-   assert(initializer->type == SLANG_OPER_CALL);
-   assert(initializer->array_constructor);
-
-   values = (GLfloat *) malloc(numElements * 4 * sizeof(GLfloat));
-
-   /* convert constructor params into ordinary floats */
-   for (i = 0; i < numElements; i++) {
-      const slang_operation *op = &initializer->children[i];
-      if (op->type != SLANG_OPER_LITERAL_FLOAT) {
-         /* unsupported type for this optimization */
-         free(values);
-         return GL_FALSE;
-      }
-      for (j = 0; j < op->literal_size; j++) {
-         values[i * 4 + j] = op->literal[j];
-      }
-      for ( ; j < 4; j++) {
-         values[i * 4 + j] = 0.0f;
-      }
-   }
-
-   /* slightly different paths for constants vs. uniforms */
-   if (var->type.qualifier == SLANG_QUAL_UNIFORM) {
-      var->store->File = PROGRAM_UNIFORM;
-      var->store->Index = _mesa_add_uniform(prog->Parameters, varName,
-                                            size, datatype, values);
-   }
-   else {
-      var->store->File = PROGRAM_CONSTANT;
-      var->store->Index = _mesa_add_named_constant(prog->Parameters, varName,
-                                                   values, size);
-   }
-   assert(var->store->Size == size);
-
-   free(values);
-
-   return GL_TRUE;
-}
-
-
-
-/**
- * Generate IR node for allocating/declaring a variable (either a local or
- * a global).
- * Generally, this involves allocating an slang_ir_storage instance for the
- * variable, choosing a register file (temporary, constant, etc).
- * For ordinary variables we do not yet allocate storage though.  We do that
- * when we find the first actual use of the variable to avoid allocating temp
- * regs that will never get used.
- * At this time, uniforms are always allocated space in this function.
- *
- * \param initializer  Optional initializer expression for the variable.
- */
-static slang_ir_node *
-_slang_gen_var_decl(slang_assemble_ctx *A, slang_variable *var,
-                    slang_operation *initializer)
-{
-   const char *varName = (const char *) var->a_name;
-   const GLenum datatype = _slang_gltype_from_specifier(&var->type.specifier);
-   slang_ir_node *varDecl, *n;
-   slang_ir_storage *store;
-   GLint arrayLen, size, totalSize;  /* if array then totalSize > size */
-   gl_register_file file;
-
-   /*assert(!var->declared);*/
-   var->declared = GL_TRUE;
-
-   /* determine GPU register file for simple cases */
-   if (is_sampler_type(&var->type)) {
-      file = PROGRAM_SAMPLER;
-   }
-   else if (var->type.qualifier == SLANG_QUAL_UNIFORM) {
-      file = PROGRAM_UNIFORM;
-   }
-   else {
-      file = PROGRAM_TEMPORARY;
-   }
-
-   size = _slang_sizeof_type_specifier(&var->type.specifier);
-   if (size <= 0) {
-      slang_info_log_error(A->log, "invalid declaration for '%s'", varName);
-      return NULL;
-   }
-
-   arrayLen = _slang_array_length(var);
-   totalSize = _slang_array_size(size, arrayLen);
-
-   /* Allocate IR node for the declaration */
-   varDecl = new_node0(IR_VAR_DECL);
-   if (!varDecl)
-      return NULL;
-
-   /* Allocate slang_ir_storage for this variable if needed.
-    * Note that we may not actually allocate a constant or temporary register
-    * until later.
-    */
-   if (!var->store) {
-      GLint index = -7;  /* TBD / unknown */
-      var->store = _slang_new_ir_storage(file, index, totalSize);
-      if (!var->store)
-         return NULL; /* out of memory */
-   }
-
-   /* set the IR node's Var and Store pointers */
-   varDecl->Var = var;
-   varDecl->Store = var->store;
-
-
-   store = var->store;
-
-   /* if there's an initializer, generate IR for the expression */
-   if (initializer) {
-      slang_ir_node *varRef, *init;
-
-      if (var->type.qualifier == SLANG_QUAL_CONST) {
-         /* if the variable is const, the initializer must be a const
-          * expression as well.
-          */
-#if 0
-         if (!_slang_is_constant_expr(initializer)) {
-            slang_info_log_error(A->log,
-                                 "initializer for %s not constant", varName);
-            return NULL;
-         }
-#endif
-      }
-
-      if (var->type.qualifier == SLANG_QUAL_UNIFORM &&
-          !A->allow_uniform_initializers) {
-         slang_info_log_error(A->log,
-                              "initializer for uniform %s not allowed",
-                              varName);
-         return NULL;
-      }
-
-      /* IR for the variable we're initializing */
-      varRef = new_var(A, var);
-      if (!varRef) {
-         slang_info_log_error(A->log, "out of memory");
-         return NULL;
-      }
-
-      /* constant-folding, etc here */
-      _slang_simplify(initializer, &A->space, A->atoms); 
-
-      /* look for simple constant-valued variables and uniforms */
-      if (var->type.qualifier == SLANG_QUAL_CONST ||
-          var->type.qualifier == SLANG_QUAL_UNIFORM) {
-
-         if (initializer->type == SLANG_OPER_CALL &&
-             initializer->array_constructor) {
-            /* array initializer */
-            if (make_constant_array(A, var, initializer))
-               return varRef;
-         }
-         else if (initializer->type == SLANG_OPER_LITERAL_FLOAT ||
-                  initializer->type == SLANG_OPER_LITERAL_INT) {
-            /* simple float/vector initializer */
-            if (store->File == PROGRAM_UNIFORM) {
-               store->Index = _mesa_add_uniform(A->program->Parameters,
-                                                varName,
-                                                totalSize, datatype,
-                                                initializer->literal);
-               store->Swizzle = _slang_var_swizzle(size, 0);
-               return varRef;
-            }
-#if 0
-            else {
-               store->File = PROGRAM_CONSTANT;
-               store->Index = _mesa_add_named_constant(A->program->Parameters,
-                                                       varName,
-                                                       initializer->literal,
-                                                       totalSize);
-               store->Swizzle = _slang_var_swizzle(size, 0);
-               return varRef;
-            }
-#endif
-         }
-      }
-
-      /* IR for initializer */
-      init = _slang_gen_operation(A, initializer);
-      if (!init)
-         return NULL;
-
-      /* XXX remove this when type checking is added above */
-      if (init->Store && init->Store->Size != totalSize) {
-         slang_info_log_error(A->log, "invalid assignment (wrong types)");
-         return NULL;
-      }
-
-      /* assign RHS to LHS */
-      n = new_node2(IR_COPY, varRef, init);
-      n = new_seq(varDecl, n);
-   }
-   else {
-      /* no initializer */
-      n = varDecl;
-   }
-
-   if (store->File == PROGRAM_UNIFORM && store->Index < 0) {
-      /* always need to allocate storage for uniforms at this point */
-      store->Index = _mesa_add_uniform(A->program->Parameters, varName,
-                                       totalSize, datatype, NULL);
-      store->Swizzle = _slang_var_swizzle(size, 0);
-   }
-
-#if 0
-   printf("%s var %p %s  store=%p index=%d size=%d\n",
-          __FUNCTION__, (void *) var, (char *) varName,
-          (void *) store, store->Index, store->Size);
-#endif
-
-   return n;
-}
-
-
-/**
- * Generate code for a selection expression:   b ? x : y
- * XXX In some cases we could implement a selection expression
- * with an LRP instruction (use the boolean as the interpolant).
- * Otherwise, we use an IF/ELSE/ENDIF construct.
- */
-static slang_ir_node *
-_slang_gen_select(slang_assemble_ctx *A, slang_operation *oper)
-{
-   slang_ir_node *cond, *ifNode, *trueExpr, *falseExpr, *trueNode, *falseNode;
-   slang_ir_node *tmpDecl, *tmpVar, *tree;
-   slang_typeinfo type0, type1, type2;
-   int size, isBool, isEqual;
-
-   assert(oper->type == SLANG_OPER_SELECT);
-   assert(oper->num_children == 3);
-
-   /* type of children[0] must be boolean */
-   slang_typeinfo_construct(&type0);
-   typeof_operation(A, &oper->children[0], &type0);
-   isBool = (type0.spec.type == SLANG_SPEC_BOOL);
-   slang_typeinfo_destruct(&type0);
-   if (!isBool) {
-      slang_info_log_error(A->log, "selector type is not boolean");
-      return NULL;
-   }
-
-   slang_typeinfo_construct(&type1);
-   slang_typeinfo_construct(&type2);
-   typeof_operation(A, &oper->children[1], &type1);
-   typeof_operation(A, &oper->children[2], &type2);
-   isEqual = slang_type_specifier_equal(&type1.spec, &type2.spec);
-   slang_typeinfo_destruct(&type1);
-   slang_typeinfo_destruct(&type2);
-   if (!isEqual) {
-      slang_info_log_error(A->log, "incompatible types for ?: operator");
-      return NULL;
-   }
-
-   /* size of x or y's type */
-   size = _slang_sizeof_type_specifier(&type1.spec);
-   assert(size > 0);
-
-   /* temporary var */
-   tmpDecl = _slang_gen_temporary(size);
-
-   /* the condition (child 0) */
-   cond = _slang_gen_operation(A, &oper->children[0]);
-   cond = new_cond(cond);
-
-   /* if-true body (child 1) */
-   tmpVar = new_node0(IR_VAR);
-   tmpVar->Store = tmpDecl->Store;
-   trueExpr = _slang_gen_operation(A, &oper->children[1]);
-   trueNode = new_node2(IR_COPY, tmpVar, trueExpr);
-
-   /* if-false body (child 2) */
-   tmpVar = new_node0(IR_VAR);
-   tmpVar->Store = tmpDecl->Store;
-   falseExpr = _slang_gen_operation(A, &oper->children[2]);
-   falseNode = new_node2(IR_COPY, tmpVar, falseExpr);
-
-   ifNode = new_if(cond, trueNode, falseNode);
-
-   /* tmp var value */
-   tmpVar = new_node0(IR_VAR);
-   tmpVar->Store = tmpDecl->Store;
-
-   tree = new_seq(ifNode, tmpVar);
-   tree = new_seq(tmpDecl, tree);
-
-   /*_slang_print_ir_tree(tree, 10);*/
-   return tree;
-}
-
-
-/**
- * Generate code for &&.
- */
-static slang_ir_node *
-_slang_gen_logical_and(slang_assemble_ctx *A, slang_operation *oper)
-{
-   /* rewrite "a && b" as  "a ? b : false" */
-   slang_operation *select;
-   slang_ir_node *n;
-
-   select = slang_operation_new(1);
-   select->type = SLANG_OPER_SELECT;
-   slang_operation_add_children(select, 3);
-
-   slang_operation_copy(slang_oper_child(select, 0), &oper->children[0]);
-   slang_operation_copy(slang_oper_child(select, 1), &oper->children[1]);
-   slang_operation_literal_bool(slang_oper_child(select, 2), GL_FALSE);
-
-   n = _slang_gen_select(A, select);
-   return n;
-}
-
-
-/**
- * Generate code for ||.
- */
-static slang_ir_node *
-_slang_gen_logical_or(slang_assemble_ctx *A, slang_operation *oper)
-{
-   /* rewrite "a || b" as  "a ? true : b" */
-   slang_operation *select;
-   slang_ir_node *n;
-
-   select = slang_operation_new(1);
-   select->type = SLANG_OPER_SELECT;
-   slang_operation_add_children(select, 3);
-
-   slang_operation_copy(slang_oper_child(select, 0), &oper->children[0]);
-   slang_operation_literal_bool(slang_oper_child(select, 1), GL_TRUE);
-   slang_operation_copy(slang_oper_child(select, 2), &oper->children[1]);
-
-   n = _slang_gen_select(A, select);
-   return n;
-}
-
-
-/**
- * Generate IR tree for a return statement.
- */
-static slang_ir_node *
-_slang_gen_return(slang_assemble_ctx * A, slang_operation *oper)
-{
-   assert(oper->type == SLANG_OPER_RETURN);
-   return new_return(A->curFuncEndLabel);
-}
-
-
-#if 0
-/**
- * Determine if the given operation/expression is const-valued.
- */
-static GLboolean
-_slang_is_constant_expr(const slang_operation *oper)
-{
-   slang_variable *var;
-   GLuint i;
-
-   switch (oper->type) {
-   case SLANG_OPER_IDENTIFIER:
-      var = _slang_variable_locate(oper->locals, oper->a_id, GL_TRUE);
-      if (var && var->type.qualifier == SLANG_QUAL_CONST)
-         return GL_TRUE;
-      return GL_FALSE;
-   default:
-      for (i = 0; i < oper->num_children; i++) {
-         if (!_slang_is_constant_expr(&oper->children[i]))
-            return GL_FALSE;
-      }
-      return GL_TRUE;
-   }
-}
-#endif
-
-
-/**
- * Check if an assignment of type t1 to t0 is legal.
- * XXX more cases needed.
- */
-static GLboolean
-_slang_assignment_compatible(slang_assemble_ctx *A,
-                             slang_operation *op0,
-                             slang_operation *op1)
-{
-   slang_typeinfo t0, t1;
-   GLuint sz0, sz1;
-
-   if (op0->type == SLANG_OPER_POSTINCREMENT ||
-       op0->type == SLANG_OPER_POSTDECREMENT) {
-      return GL_FALSE;
-   }
-
-   slang_typeinfo_construct(&t0);
-   typeof_operation(A, op0, &t0);
-
-   slang_typeinfo_construct(&t1);
-   typeof_operation(A, op1, &t1);
-
-   sz0 = _slang_sizeof_type_specifier(&t0.spec);
-   sz1 = _slang_sizeof_type_specifier(&t1.spec);
-
-#if 1
-   if (sz0 != sz1) {
-      /*printf("assignment size mismatch %u vs %u\n", sz0, sz1);*/
-      return GL_FALSE;
-   }
-#endif
-
-   if (t0.spec.type == SLANG_SPEC_STRUCT &&
-       t1.spec.type == SLANG_SPEC_STRUCT &&
-       t0.spec._struct->a_name != t1.spec._struct->a_name)
-      return GL_FALSE;
-
-   if (t0.spec.type == SLANG_SPEC_FLOAT &&
-       t1.spec.type == SLANG_SPEC_BOOL)
-      return GL_FALSE;
-
-#if 0 /* not used just yet - causes problems elsewhere */
-   if (t0.spec.type == SLANG_SPEC_INT &&
-       t1.spec.type == SLANG_SPEC_FLOAT)
-      return GL_FALSE;
-#endif
-
-   if (t0.spec.type == SLANG_SPEC_BOOL &&
-       t1.spec.type == SLANG_SPEC_FLOAT)
-      return GL_FALSE;
-
-   if (t0.spec.type == SLANG_SPEC_BOOL &&
-       t1.spec.type == SLANG_SPEC_INT)
-      return GL_FALSE;
-
-   return GL_TRUE;
-}
-
-
-/**
- * Generate IR tree for a local variable declaration.
- * Basically do some error checking and call _slang_gen_var_decl().
- */
-static slang_ir_node *
-_slang_gen_declaration(slang_assemble_ctx *A, slang_operation *oper)
-{
-   const char *varName = (char *) oper->a_id;
-   slang_variable *var;
-   slang_ir_node *varDecl;
-   slang_operation *initializer;
-
-   assert(oper->type == SLANG_OPER_VARIABLE_DECL);
-   assert(oper->num_children <= 1);
-
-
-   /* lookup the variable by name */
-   var = _slang_variable_locate(oper->locals, oper->a_id, GL_TRUE);
-   if (!var)
-      return NULL;  /* "shouldn't happen" */
-
-   if (var->type.qualifier == SLANG_QUAL_ATTRIBUTE ||
-       var->type.qualifier == SLANG_QUAL_VARYING ||
-       var->type.qualifier == SLANG_QUAL_UNIFORM) {
-      /* can't declare attribute/uniform vars inside functions */
-      slang_info_log_error(A->log,
-                "local variable '%s' cannot be an attribute/uniform/varying",
-                varName);
-      return NULL;
-   }
-
-#if 0
-   if (v->declared) {
-      slang_info_log_error(A->log, "variable '%s' redeclared", varName);
-      return NULL;
-   }
-#endif
-
-   /* check if the var has an initializer */
-   if (oper->num_children > 0) {
-      assert(oper->num_children == 1);
-      initializer = &oper->children[0];
-   }
-   else if (var->initializer) {
-      initializer = var->initializer;
-   }
-   else {
-      initializer = NULL;
-   }
-
-   if (initializer) {
-      /* check/compare var type and initializer type */
-      if (!_slang_assignment_compatible(A, oper, initializer)) {
-         slang_info_log_error(A->log, "incompatible types in assignment");
-         return NULL;
-      }         
-   }
-   else {
-      if (var->type.qualifier == SLANG_QUAL_CONST) {
-         slang_info_log_error(A->log,
-                       "const-qualified variable '%s' requires initializer",
-                       varName);
-         return NULL;
-      }
-   }
-
-   /* Generate IR node */
-   varDecl = _slang_gen_var_decl(A, var, initializer);
-   if (!varDecl)
-      return NULL;
-
-   return varDecl;
-}
-
-
-/**
- * Generate IR tree for a reference to a variable (such as in an expression).
- * This is different from a variable declaration.
- */
-static slang_ir_node *
-_slang_gen_variable(slang_assemble_ctx * A, slang_operation *oper)
-{
-   /* If there's a variable associated with this oper (from inlining)
-    * use it.  Otherwise, use the oper's var id.
-    */
-   slang_atom name = oper->var ? oper->var->a_name : oper->a_id;
-   slang_variable *var = _slang_variable_locate(oper->locals, name, GL_TRUE);
-   slang_ir_node *n;
-   if (!var || !var->declared) {
-      slang_info_log_error(A->log, "undefined variable '%s'", (char *) name);
-      return NULL;
-   }
-   n = new_var(A, var);
-   return n;
-}
-
-
-
-/**
- * Return the number of components actually named by the swizzle.
- * Recall that swizzles may have undefined/don't-care values.
- */
-static GLuint
-swizzle_size(GLuint swizzle)
-{
-   GLuint size = 0, i;
-   for (i = 0; i < 4; i++) {
-      GLuint swz = GET_SWZ(swizzle, i);
-      size += (swz <= 3);
-   }
-   return size;
-}
-
-
-static slang_ir_node *
-_slang_gen_swizzle(slang_ir_node *child, GLuint swizzle)
-{
-   slang_ir_node *n = new_node1(IR_SWIZZLE, child);
-   assert(child);
-   if (n) {
-      assert(!n->Store);
-      n->Store = _slang_new_ir_storage_relative(0,
-                                                swizzle_size(swizzle),
-                                                child->Store);
-      assert(n->Store);
-      n->Store->Swizzle = swizzle;
-   }
-   return n;
-}
-
-
-static GLboolean
-is_store_writable(const slang_assemble_ctx *A, const slang_ir_storage *store)
-{
-   while (store->Parent)
-      store = store->Parent;
-
-   if (!(store->File == PROGRAM_OUTPUT ||
-         store->File == PROGRAM_TEMPORARY ||
-         (store->File == PROGRAM_VARYING &&
-          A->program->Target == GL_VERTEX_PROGRAM_ARB))) {
-      return GL_FALSE;
-   }
-   else {
-      return GL_TRUE;
-   }
-}
-
-
-/**
- * Walk up an IR storage path to compute the final swizzle.
- * This is used when we find an expression such as "foo.xz.yx".
- */
-static GLuint
-root_swizzle(const slang_ir_storage *st)
-{
-   GLuint swizzle = st->Swizzle;
-   while (st->Parent) {
-      st = st->Parent;
-      swizzle = _slang_swizzle_swizzle(st->Swizzle, swizzle);
-   }
-   return swizzle;
-}
-
-
-/**
- * Generate IR tree for an assignment (=).
- */
-static slang_ir_node *
-_slang_gen_assignment(slang_assemble_ctx * A, slang_operation *oper)
-{
-   slang_operation *pred = NULL;
-   slang_ir_node *n = NULL;
-
-   if (oper->children[0].type == SLANG_OPER_IDENTIFIER) {
-      /* Check that var is writeable */
-      const char *varName = (char *) oper->children[0].a_id;
-      slang_variable *var
-         = _slang_variable_locate(oper->children[0].locals,
-                                  oper->children[0].a_id, GL_TRUE);
-      if (!var) {
-         slang_info_log_error(A->log, "undefined variable '%s'", varName);
-         return NULL;
-      }
-
-      if (var->type.qualifier == SLANG_QUAL_CONST ||
-          var->type.qualifier == SLANG_QUAL_ATTRIBUTE ||
-          var->type.qualifier == SLANG_QUAL_UNIFORM ||
-          (var->type.qualifier == SLANG_QUAL_VARYING &&
-           A->program->Target == GL_FRAGMENT_PROGRAM_ARB)) {
-         slang_info_log_error(A->log,
-                              "illegal assignment to read-only variable '%s'",
-                              varName);
-         return NULL;
-      }
-
-      /* check if we need to predicate this assignment based on __notRetFlag */
-      if ((var->is_global ||
-           var->type.qualifier == SLANG_QUAL_OUT ||
-           var->type.qualifier == SLANG_QUAL_INOUT) && A->UseReturnFlag) {
-         /* create predicate, used below */
-         pred = slang_operation_new(1);
-         pred->type = SLANG_OPER_IDENTIFIER;
-         pred->a_id = slang_atom_pool_atom(A->atoms, "__notRetFlag");
-         pred->locals->outer_scope = oper->locals->outer_scope;
-      }
-   }
-
-   if (oper->children[0].type == SLANG_OPER_IDENTIFIER &&
-       oper->children[1].type == SLANG_OPER_CALL) {
-      /* Special case of:  x = f(a, b)
-       * Replace with f(a, b, x)  (where x == hidden __retVal out param)
-       *
-       * XXX this could be even more effective if we could accomodate
-       * cases such as "v.x = f();"  - would help with typical vertex
-       * transformation.
-       */
-      n = _slang_gen_function_call_name(A,
-                                      (const char *) oper->children[1].a_id,
-                                      &oper->children[1], &oper->children[0]);
-   }
-   else {
-      slang_ir_node *lhs, *rhs;
-
-      /* lhs and rhs type checking */
-      if (!_slang_assignment_compatible(A,
-                                        &oper->children[0],
-                                        &oper->children[1])) {
-         slang_info_log_error(A->log, "incompatible types in assignment");
-         return NULL;
-      }
-
-      lhs = _slang_gen_operation(A, &oper->children[0]);
-      if (!lhs) {
-         return NULL;
-      }
-
-      if (!lhs->Store) {
-         slang_info_log_error(A->log,
-                              "invalid left hand side for assignment");
-         return NULL;
-      }
-
-      /* check that lhs is writable */
-      if (!is_store_writable(A, lhs->Store)) {
-         slang_info_log_error(A->log,
-                              "illegal assignment to read-only l-value");
-         return NULL;
-      }
-
-      rhs = _slang_gen_operation(A, &oper->children[1]);
-      if (lhs && rhs) {
-         /* convert lhs swizzle into writemask */
-         const GLuint swizzle = root_swizzle(lhs->Store);
-         GLuint writemask, newSwizzle = 0x0;
-         if (!swizzle_to_writemask(A, swizzle, &writemask, &newSwizzle)) {
-            /* Non-simple writemask, need to swizzle right hand side in
-             * order to put components into the right place.
-             */
-            rhs = _slang_gen_swizzle(rhs, newSwizzle);
-         }
-         n = new_node2(IR_COPY, lhs, rhs);
-      }
-      else {
-         return NULL;
-      }
-   }
-
-   if (n && pred) {
-      /* predicate the assignment code on __notRetFlag */
-      slang_ir_node *top, *cond;
-
-      cond = _slang_gen_operation(A, pred);
-      top = new_if(cond, n, NULL);
-      return top;
-   }
-   return n;
-}
-
-
-/**
- * Generate IR tree for referencing a field in a struct (or basic vector type)
- */
-static slang_ir_node *
-_slang_gen_struct_field(slang_assemble_ctx * A, slang_operation *oper)
-{
-   slang_typeinfo ti;
-
-   /* type of struct */
-   slang_typeinfo_construct(&ti);
-   typeof_operation(A, &oper->children[0], &ti);
-
-   if (_slang_type_is_vector(ti.spec.type)) {
-      /* the field should be a swizzle */
-      const GLuint rows = _slang_type_dim(ti.spec.type);
-      slang_swizzle swz;
-      slang_ir_node *n;
-      GLuint swizzle;
-      if (!_slang_is_swizzle((char *) oper->a_id, rows, &swz)) {
-         slang_info_log_error(A->log, "Bad swizzle");
-         return NULL;
-      }
-      swizzle = MAKE_SWIZZLE4(swz.swizzle[0],
-                              swz.swizzle[1],
-                              swz.swizzle[2],
-                              swz.swizzle[3]);
-
-      n = _slang_gen_operation(A, &oper->children[0]);
-      /* create new parent node with swizzle */
-      if (n)
-         n = _slang_gen_swizzle(n, swizzle);
-      return n;
-   }
-   else if (   ti.spec.type == SLANG_SPEC_FLOAT
-            || ti.spec.type == SLANG_SPEC_INT
-            || ti.spec.type == SLANG_SPEC_BOOL) {
-      const GLuint rows = 1;
-      slang_swizzle swz;
-      slang_ir_node *n;
-      GLuint swizzle;
-      if (!_slang_is_swizzle((char *) oper->a_id, rows, &swz)) {
-         slang_info_log_error(A->log, "Bad swizzle");
-      }
-      swizzle = MAKE_SWIZZLE4(swz.swizzle[0],
-                              swz.swizzle[1],
-                              swz.swizzle[2],
-                              swz.swizzle[3]);
-      n = _slang_gen_operation(A, &oper->children[0]);
-      /* create new parent node with swizzle */
-      n = _slang_gen_swizzle(n, swizzle);
-      return n;
-   }
-   else {
-      /* the field is a structure member (base.field) */
-      /* oper->children[0] is the base */
-      /* oper->a_id is the field name */
-      slang_ir_node *base, *n;
-      slang_typeinfo field_ti;
-      GLint fieldSize, fieldOffset = -1;
-
-      /* type of field */
-      slang_typeinfo_construct(&field_ti);
-      typeof_operation(A, oper, &field_ti);
-
-      fieldSize = _slang_sizeof_type_specifier(&field_ti.spec);
-      if (fieldSize > 0)
-         fieldOffset = _slang_field_offset(&ti.spec, oper->a_id);
-
-      if (fieldSize == 0 || fieldOffset < 0) {
-         const char *structName;
-         if (ti.spec._struct)
-            structName = (char *) ti.spec._struct->a_name;
-         else
-            structName = "unknown";
-         slang_info_log_error(A->log,
-                              "\"%s\" is not a member of struct \"%s\"",
-                              (char *) oper->a_id, structName);
-         return NULL;
-      }
-      assert(fieldSize >= 0);
-
-      base = _slang_gen_operation(A, &oper->children[0]);
-      if (!base) {
-         /* error msg should have already been logged */
-         return NULL;
-      }
-
-      n = new_node1(IR_FIELD, base);
-      if (!n)
-         return NULL;
-
-      n->Field = (char *) oper->a_id;
-
-      /* Store the field's offset in storage->Index */
-      n->Store = _slang_new_ir_storage(base->Store->File,
-                                       fieldOffset,
-                                       fieldSize);
-
-      return n;
-   }
-}
-
-
-/**
- * Gen code for array indexing.
- */
-static slang_ir_node *
-_slang_gen_array_element(slang_assemble_ctx * A, slang_operation *oper)
-{
-   slang_typeinfo array_ti;
-
-   /* get array's type info */
-   slang_typeinfo_construct(&array_ti);
-   typeof_operation(A, &oper->children[0], &array_ti);
-
-   if (_slang_type_is_vector(array_ti.spec.type)) {
-      /* indexing a simple vector type: "vec4 v; v[0]=p;" */
-      /* translate the index into a swizzle/writemask: "v.x=p" */
-      const GLuint max = _slang_type_dim(array_ti.spec.type);
-      GLint index;
-      slang_ir_node *n;
-
-      index = (GLint) oper->children[1].literal[0];
-      if (oper->children[1].type != SLANG_OPER_LITERAL_INT ||
-          index >= (GLint) max) {
-#if 0
-         slang_info_log_error(A->log, "Invalid array index for vector type");
-         printf("type = %d\n", oper->children[1].type);
-         printf("index = %d, max = %d\n", index, max);
-         printf("array = %s\n", (char*)oper->children[0].a_id);
-         printf("index = %s\n", (char*)oper->children[1].a_id);
-         return NULL;
-#else
-         index = 0;
-#endif
-      }
-
-      n = _slang_gen_operation(A, &oper->children[0]);
-      if (n) {
-         /* use swizzle to access the element */
-         GLuint swizzle = MAKE_SWIZZLE4(SWIZZLE_X + index,
-                                        SWIZZLE_NIL,
-                                        SWIZZLE_NIL,
-                                        SWIZZLE_NIL);
-         n = _slang_gen_swizzle(n, swizzle);
-      }
-      return n;
-   }
-   else {
-      /* conventional array */
-      slang_typeinfo elem_ti;
-      slang_ir_node *elem, *array, *index;
-      GLint elemSize, arrayLen;
-
-      /* size of array element */
-      slang_typeinfo_construct(&elem_ti);
-      typeof_operation(A, oper, &elem_ti);
-      elemSize = _slang_sizeof_type_specifier(&elem_ti.spec);
-
-      if (_slang_type_is_matrix(array_ti.spec.type))
-         arrayLen = _slang_type_dim(array_ti.spec.type);
-      else
-         arrayLen = array_ti.array_len;
-
-      slang_typeinfo_destruct(&array_ti);
-      slang_typeinfo_destruct(&elem_ti);
-
-      if (elemSize <= 0) {
-         /* unknown var or type */
-         slang_info_log_error(A->log, "Undefined variable or type");
-         return NULL;
-      }
-
-      array = _slang_gen_operation(A, &oper->children[0]);
-      index = _slang_gen_operation(A, &oper->children[1]);
-      if (array && index) {
-         /* bounds check */
-         GLint constIndex = -1;
-         if (index->Opcode == IR_FLOAT) {
-            constIndex = (int) index->Value[0];
-            if (constIndex < 0 || constIndex >= arrayLen) {
-               slang_info_log_error(A->log,
-                                "Array index out of bounds (index=%d size=%d)",
-                                 constIndex, arrayLen);
-               _slang_free_ir_tree(array);
-               _slang_free_ir_tree(index);
-               return NULL;
-            }
-         }
-
-         if (!array->Store) {
-            slang_info_log_error(A->log, "Invalid array");
-            return NULL;
-         }
-
-         elem = new_node2(IR_ELEMENT, array, index);
-
-         /* The storage info here will be updated during code emit */
-         elem->Store = _slang_new_ir_storage(array->Store->File,
-                                             array->Store->Index,
-                                             elemSize);
-         elem->Store->Swizzle = _slang_var_swizzle(elemSize, 0);
-         return elem;
-      }
-      else {
-         _slang_free_ir_tree(array);
-         _slang_free_ir_tree(index);
-         return NULL;
-      }
-   }
-}
-
-
-static slang_ir_node *
-_slang_gen_compare(slang_assemble_ctx *A, slang_operation *oper,
-                   slang_ir_opcode opcode)
-{
-   slang_typeinfo t0, t1;
-   slang_ir_node *n;
-   
-   slang_typeinfo_construct(&t0);
-   typeof_operation(A, &oper->children[0], &t0);
-
-   slang_typeinfo_construct(&t1);
-   typeof_operation(A, &oper->children[0], &t1);
-
-   if (t0.spec.type == SLANG_SPEC_ARRAY ||
-       t1.spec.type == SLANG_SPEC_ARRAY) {
-      slang_info_log_error(A->log, "Illegal array comparison");
-      return NULL;
-   }
-
-   if (oper->type != SLANG_OPER_EQUAL &&
-       oper->type != SLANG_OPER_NOTEQUAL) {
-      /* <, <=, >, >= can only be used with scalars */
-      if ((t0.spec.type != SLANG_SPEC_INT &&
-           t0.spec.type != SLANG_SPEC_FLOAT) ||
-          (t1.spec.type != SLANG_SPEC_INT &&
-           t1.spec.type != SLANG_SPEC_FLOAT)) {
-         slang_info_log_error(A->log, "Incompatible type(s) for inequality operator");
-         return NULL;
-      }
-   }
-
-   n =  new_node2(opcode,
-                  _slang_gen_operation(A, &oper->children[0]),
-                  _slang_gen_operation(A, &oper->children[1]));
-
-   /* result is a bool (size 1) */
-   n->Store = _slang_new_ir_storage(PROGRAM_TEMPORARY, -1, 1);
-
-   return n;
-}
-
-
-#if 0
-static void
-print_vars(slang_variable_scope *s)
-{
-   int i;
-   printf("vars: ");
-   for (i = 0; i < s->num_variables; i++) {
-      printf("%s %d, \n",
-             (char*) s->variables[i]->a_name,
-             s->variables[i]->declared);
-   }
-
-   printf("\n");
-}
-#endif
-
-
-#if 0
-static void
-_slang_undeclare_vars(slang_variable_scope *locals)
-{
-   if (locals->num_variables > 0) {
-      int i;
-      for (i = 0; i < locals->num_variables; i++) {
-         slang_variable *v = locals->variables[i];
-         printf("undeclare %s at %p\n", (char*) v->a_name, v);
-         v->declared = GL_FALSE;
-      }
-   }
-}
-#endif
-
-
-/**
- * Generate IR tree for a slang_operation (AST node)
- */
-static slang_ir_node *
-_slang_gen_operation(slang_assemble_ctx * A, slang_operation *oper)
-{
-   switch (oper->type) {
-   case SLANG_OPER_BLOCK_NEW_SCOPE:
-      {
-         slang_ir_node *n;
-
-         _slang_push_var_table(A->vartable);
-
-         oper->type = SLANG_OPER_BLOCK_NO_NEW_SCOPE; /* temp change */
-         n = _slang_gen_operation(A, oper);
-         oper->type = SLANG_OPER_BLOCK_NEW_SCOPE; /* restore */
-
-         _slang_pop_var_table(A->vartable);
-
-         /*_slang_undeclare_vars(oper->locals);*/
-         /*print_vars(oper->locals);*/
-
-         if (n)
-            n = new_node1(IR_SCOPE, n);
-         return n;
-      }
-      break;
-
-   case SLANG_OPER_BLOCK_NO_NEW_SCOPE:
-      /* list of operations */
-      if (oper->num_children > 0)
-      {
-         slang_ir_node *n, *tree = NULL;
-         GLuint i;
-
-         for (i = 0; i < oper->num_children; i++) {
-            n = _slang_gen_operation(A, &oper->children[i]);
-            if (!n) {
-               _slang_free_ir_tree(tree);
-               return NULL; /* error must have occured */
-            }
-            tree = new_seq(tree, n);
-         }
-
-         return tree;
-      }
-      else {
-         return new_node0(IR_NOP);
-      }
-
-   case SLANG_OPER_EXPRESSION:
-      return _slang_gen_operation(A, &oper->children[0]);
-
-   case SLANG_OPER_FOR:
-      return _slang_gen_for(A, oper);
-   case SLANG_OPER_DO:
-      return _slang_gen_do(A, oper);
-   case SLANG_OPER_WHILE:
-      return _slang_gen_while(A, oper);
-   case SLANG_OPER_BREAK:
-      if (!current_loop_oper(A)) {
-         slang_info_log_error(A->log, "'break' not in loop");
-         return NULL;
-      }
-      return new_break(current_loop_ir(A));
-   case SLANG_OPER_CONTINUE:
-      if (!current_loop_oper(A)) {
-         slang_info_log_error(A->log, "'continue' not in loop");
-         return NULL;
-      }
-      return _slang_gen_continue(A, oper);
-   case SLANG_OPER_DISCARD:
-      return new_node0(IR_KILL);
-
-   case SLANG_OPER_EQUAL:
-      return _slang_gen_compare(A, oper, IR_EQUAL);
-   case SLANG_OPER_NOTEQUAL:
-      return _slang_gen_compare(A, oper, IR_NOTEQUAL);
-   case SLANG_OPER_GREATER:
-      return _slang_gen_compare(A, oper, IR_SGT);
-   case SLANG_OPER_LESS:
-      return _slang_gen_compare(A, oper, IR_SLT);
-   case SLANG_OPER_GREATEREQUAL:
-      return _slang_gen_compare(A, oper, IR_SGE);
-   case SLANG_OPER_LESSEQUAL:
-      return _slang_gen_compare(A, oper, IR_SLE);
-   case SLANG_OPER_ADD:
-      {
-	 slang_ir_node *n;
-         assert(oper->num_children == 2);
-	 n = _slang_gen_function_call_name(A, "+", oper, NULL);
-	 return n;
-      }
-   case SLANG_OPER_SUBTRACT:
-      {
-	 slang_ir_node *n;
-         assert(oper->num_children == 2);
-	 n = _slang_gen_function_call_name(A, "-", oper, NULL);
-	 return n;
-      }
-   case SLANG_OPER_MULTIPLY:
-      {
-	 slang_ir_node *n;
-         assert(oper->num_children == 2);
-         n = _slang_gen_function_call_name(A, "*", oper, NULL);
-	 return n;
-      }
-   case SLANG_OPER_DIVIDE:
-      {
-         slang_ir_node *n;
-         assert(oper->num_children == 2);
-	 n = _slang_gen_function_call_name(A, "/", oper, NULL);
-	 return n;
-      }
-   case SLANG_OPER_MINUS:
-      {
-         slang_ir_node *n;
-         assert(oper->num_children == 1);
-	 n = _slang_gen_function_call_name(A, "-", oper, NULL);
-	 return n;
-      }
-   case SLANG_OPER_PLUS:
-      /* +expr   --> do nothing */
-      return _slang_gen_operation(A, &oper->children[0]);
-   case SLANG_OPER_VARIABLE_DECL:
-      return _slang_gen_declaration(A, oper);
-   case SLANG_OPER_ASSIGN:
-      return _slang_gen_assignment(A, oper);
-   case SLANG_OPER_ADDASSIGN:
-      {
-	 slang_ir_node *n;
-         assert(oper->num_children == 2);
-	 n = _slang_gen_function_call_name(A, "+=", oper, NULL);
-	 return n;
-      }
-   case SLANG_OPER_SUBASSIGN:
-      {
-	 slang_ir_node *n;
-         assert(oper->num_children == 2);
-	 n = _slang_gen_function_call_name(A, "-=", oper, NULL);
-	 return n;
-      }
-      break;
-   case SLANG_OPER_MULASSIGN:
-      {
-	 slang_ir_node *n;
-         assert(oper->num_children == 2);
-	 n = _slang_gen_function_call_name(A, "*=", oper, NULL);
-	 return n;
-      }
-   case SLANG_OPER_DIVASSIGN:
-      {
-	 slang_ir_node *n;
-         assert(oper->num_children == 2);
-	 n = _slang_gen_function_call_name(A, "/=", oper, NULL);
-	 return n;
-      }
-   case SLANG_OPER_LOGICALAND:
-      {
-	 slang_ir_node *n;
-         assert(oper->num_children == 2);
-	 n = _slang_gen_logical_and(A, oper);
-	 return n;
-      }
-   case SLANG_OPER_LOGICALOR:
-      {
-	 slang_ir_node *n;
-         assert(oper->num_children == 2);
-	 n = _slang_gen_logical_or(A, oper);
-	 return n;
-      }
-   case SLANG_OPER_LOGICALXOR:
-      return _slang_gen_xor(A, oper);
-   case SLANG_OPER_NOT:
-      return _slang_gen_not(A, oper);
-   case SLANG_OPER_SELECT:  /* b ? x : y */
-      {
-	 slang_ir_node *n;
-         assert(oper->num_children == 3);
-	 n = _slang_gen_select(A, oper);
-	 return n;
-      }
-
-   case SLANG_OPER_ASM:
-      return _slang_gen_asm(A, oper, NULL);
-   case SLANG_OPER_CALL:
-      return _slang_gen_function_call_name(A, (const char *) oper->a_id,
-                                           oper, NULL);
-   case SLANG_OPER_METHOD:
-      return _slang_gen_method_call(A, oper);
-   case SLANG_OPER_RETURN:
-      return _slang_gen_return(A, oper);
-   case SLANG_OPER_RETURN_INLINED:
-      return _slang_gen_return(A, oper);
-   case SLANG_OPER_LABEL:
-      return new_label(oper->label);
-   case SLANG_OPER_IDENTIFIER:
-      return _slang_gen_variable(A, oper);
-   case SLANG_OPER_IF:
-      return _slang_gen_if(A, oper);
-   case SLANG_OPER_FIELD:
-      return _slang_gen_struct_field(A, oper);
-   case SLANG_OPER_SUBSCRIPT:
-      return _slang_gen_array_element(A, oper);
-   case SLANG_OPER_LITERAL_FLOAT:
-      /* fall-through */
-   case SLANG_OPER_LITERAL_INT:
-      /* fall-through */
-   case SLANG_OPER_LITERAL_BOOL:
-      return new_float_literal(oper->literal, oper->literal_size);
-
-   case SLANG_OPER_POSTINCREMENT:   /* var++ */
-      {
-	 slang_ir_node *n;
-         assert(oper->num_children == 1);
-	 n = _slang_gen_function_call_name(A, "__postIncr", oper, NULL);
-	 return n;
-      }
-   case SLANG_OPER_POSTDECREMENT:   /* var-- */
-      {
-	 slang_ir_node *n;
-         assert(oper->num_children == 1);
-	 n = _slang_gen_function_call_name(A, "__postDecr", oper, NULL);
-	 return n;
-      }
-   case SLANG_OPER_PREINCREMENT:   /* ++var */
-      {
-	 slang_ir_node *n;
-         assert(oper->num_children == 1);
-	 n = _slang_gen_function_call_name(A, "++", oper, NULL);
-	 return n;
-      }
-   case SLANG_OPER_PREDECREMENT:   /* --var */
-      {
-	 slang_ir_node *n;
-         assert(oper->num_children == 1);
-	 n = _slang_gen_function_call_name(A, "--", oper, NULL);
-	 return n;
-      }
-
-   case SLANG_OPER_NON_INLINED_CALL:
-   case SLANG_OPER_SEQUENCE:
-      {
-         slang_ir_node *tree = NULL;
-         GLuint i;
-         for (i = 0; i < oper->num_children; i++) {
-            slang_ir_node *n = _slang_gen_operation(A, &oper->children[i]);
-            tree = new_seq(tree, n);
-            if (n)
-               tree->Store = n->Store;
-         }
-         if (oper->type == SLANG_OPER_NON_INLINED_CALL) {
-            tree = new_function_call(tree, oper->label);
-         }
-         return tree;
-      }
-
-   case SLANG_OPER_NONE:
-   case SLANG_OPER_VOID:
-      /* returning NULL here would generate an error */
-      return new_node0(IR_NOP);
-
-   default:
-      _mesa_problem(NULL, "bad node type %d in _slang_gen_operation",
-                    oper->type);
-      return new_node0(IR_NOP);
-   }
-
-   return NULL;
-}
-
-
-/**
- * Check if the given type specifier is a rectangular texture sampler.
- */
-static GLboolean
-is_rect_sampler_spec(const slang_type_specifier *spec)
-{
-   while (spec->_array) {
-      spec = spec->_array;
-   }
-   return spec->type == SLANG_SPEC_SAMPLER_RECT ||
-          spec->type == SLANG_SPEC_SAMPLER_RECT_SHADOW;
-}
-
-
-
-/**
- * Called by compiler when a global variable has been parsed/compiled.
- * Here we examine the variable's type to determine what kind of register
- * storage will be used.
- *
- * A uniform such as "gl_Position" will become the register specification
- * (PROGRAM_OUTPUT, VERT_RESULT_HPOS).  Or, uniform "gl_FogFragCoord"
- * will be (PROGRAM_INPUT, FRAG_ATTRIB_FOGC).
- *
- * Samplers are interesting.  For "uniform sampler2D tex;" we'll specify
- * (PROGRAM_SAMPLER, index) where index is resolved at link-time to an
- * actual texture unit (as specified by the user calling glUniform1i()).
- */
-GLboolean
-_slang_codegen_global_variable(slang_assemble_ctx *A, slang_variable *var,
-                               slang_unit_type type)
-{
-   struct gl_program *prog = A->program;
-   const char *varName = (char *) var->a_name;
-   GLboolean success = GL_TRUE;
-   slang_ir_storage *store = NULL;
-   int dbg = 0;
-   const GLenum datatype = _slang_gltype_from_specifier(&var->type.specifier);
-   const GLint size = _slang_sizeof_type_specifier(&var->type.specifier);
-   const GLint arrayLen = _slang_array_length(var);
-   const GLint totalSize = _slang_array_size(size, arrayLen);
-   GLint texIndex = sampler_to_texture_index(var->type.specifier.type);
-
-   var->is_global = GL_TRUE;
-
-   /* check for sampler2D arrays */
-   if (texIndex == -1 && var->type.specifier._array)
-      texIndex = sampler_to_texture_index(var->type.specifier._array->type);
-
-   if (texIndex != -1) {
-      /* This is a texture sampler variable...
-       * store->File = PROGRAM_SAMPLER
-       * store->Index = sampler number (0..7, typically)
-       * store->Size = texture type index (1D, 2D, 3D, cube, etc)
-       */
-      if (var->initializer) {
-         slang_info_log_error(A->log, "illegal assignment to '%s'", varName);
-         return GL_FALSE;
-      }
-#if FEATURE_es2_glsl /* XXX should use FEATURE_texture_rect */
-      /* disallow rect samplers */
-      if (is_rect_sampler_spec(&var->type.specifier)) {
-         slang_info_log_error(A->log, "invalid sampler type for '%s'", varName);
-         return GL_FALSE;
-      }
-#else
-      (void) is_rect_sampler_spec; /* silence warning */
-#endif
-      {
-         GLint sampNum = _mesa_add_sampler(prog->Parameters, varName, datatype);
-         store = _slang_new_ir_storage_sampler(sampNum, texIndex, totalSize);
-
-         /* If we have a sampler array, then we need to allocate the 
-	  * additional samplers to ensure we don't allocate them elsewhere.
-	  * We can't directly use _mesa_add_sampler() as that checks the
-	  * varName and gets a match, so we call _mesa_add_parameter()
-	  * directly and use the last sampler number from the call above.
-	  */
-	 if (arrayLen > 0) {
-	    GLint a = arrayLen - 1;
-	    GLint i;
-	    for (i = 0; i < a; i++) {
-               GLfloat value = (GLfloat)(i + sampNum + 1);
-               (void) _mesa_add_parameter(prog->Parameters, PROGRAM_SAMPLER,
-                                 varName, 1, datatype, &value, NULL, 0x0);
-	    }
-	 }
-      }
-      if (dbg) printf("SAMPLER ");
-   }
-   else if (var->type.qualifier == SLANG_QUAL_UNIFORM) {
-      /* Uniform variable */
-      const GLuint swizzle = _slang_var_swizzle(totalSize, 0);
-
-      if (prog) {
-         /* user-defined uniform */
-         if (datatype == GL_NONE) {
-	    if ((var->type.specifier.type == SLANG_SPEC_ARRAY &&
-	         var->type.specifier._array->type == SLANG_SPEC_STRUCT) ||
-                (var->type.specifier.type == SLANG_SPEC_STRUCT)) {
-               /* temporary work-around */
-               GLenum datatype = GL_FLOAT;
-               GLint uniformLoc = _mesa_add_uniform(prog->Parameters, varName,
-                                                    totalSize, datatype, NULL);
-               store = _slang_new_ir_storage_swz(PROGRAM_UNIFORM, uniformLoc,
-                                                 totalSize, swizzle);
-	 
-	       if (arrayLen > 0) {
-	          GLint a = arrayLen - 1;
-	          GLint i;
-	          for (i = 0; i < a; i++) {
-                     GLfloat value = (GLfloat)(i + uniformLoc + 1);
-                     (void) _mesa_add_parameter(prog->Parameters, PROGRAM_UNIFORM,
-                                 varName, 1, datatype, &value, NULL, 0x0);
-                  }
-	       }
-
-               /* XXX what we need to do is unroll the struct into its
-                * basic types, creating a uniform variable for each.
-                * For example:
-                * struct foo {
-                *   vec3 a;
-                *   vec4 b;
-                * };
-                * uniform foo f;
-                *
-                * Should produce uniforms:
-                * "f.a"  (GL_FLOAT_VEC3)
-                * "f.b"  (GL_FLOAT_VEC4)
-                */
-
-               if (var->initializer) {
-                  slang_info_log_error(A->log,
-                     "unsupported initializer for uniform '%s'", varName);
-                  return GL_FALSE;
-               }
-            }
-            else {
-               slang_info_log_error(A->log,
-                                    "invalid datatype for uniform variable %s",
-                                    varName);
-               return GL_FALSE;
-            }
-         }
-         else {
-            /* non-struct uniform */
-            if (!_slang_gen_var_decl(A, var, var->initializer))
-               return GL_FALSE;
-            store = var->store;
-         }
-      }
-      else {
-         /* pre-defined uniform, like gl_ModelviewMatrix */
-         /* We know it's a uniform, but don't allocate storage unless
-          * it's really used.
-          */
-         store = _slang_new_ir_storage_swz(PROGRAM_STATE_VAR, -1,
-                                           totalSize, swizzle);
-      }
-      if (dbg) printf("UNIFORM (sz %d) ", totalSize);
-   }
-   else if (var->type.qualifier == SLANG_QUAL_VARYING) {
-      /* varyings must be float, vec or mat */
-      if (!_slang_type_is_float_vec_mat(var->type.specifier.type) &&
-          var->type.specifier.type != SLANG_SPEC_ARRAY) {
-         slang_info_log_error(A->log,
-                              "varying '%s' must be float/vector/matrix",
-                              varName);
-         return GL_FALSE;
-      }
-
-      if (var->initializer) {
-         slang_info_log_error(A->log, "illegal initializer for varying '%s'",
-                              varName);
-         return GL_FALSE;
-      }
-
-      if (prog) {
-         /* user-defined varying */
-         GLbitfield flags;
-         GLint varyingLoc;
-         GLuint swizzle;
-
-         flags = 0x0;
-         if (var->type.centroid == SLANG_CENTROID)
-            flags |= PROG_PARAM_BIT_CENTROID;
-         if (var->type.variant == SLANG_INVARIANT)
-            flags |= PROG_PARAM_BIT_INVARIANT;
-
-         varyingLoc = _mesa_add_varying(prog->Varying, varName,
-                                        totalSize, flags);
-         swizzle = _slang_var_swizzle(size, 0);
-         store = _slang_new_ir_storage_swz(PROGRAM_VARYING, varyingLoc,
-                                           totalSize, swizzle);
-      }
-      else {
-         /* pre-defined varying, like gl_Color or gl_TexCoord */
-         if (type == SLANG_UNIT_FRAGMENT_BUILTIN) {
-            /* fragment program input */
-            GLuint swizzle;
-            GLint index = _slang_input_index(varName, GL_FRAGMENT_PROGRAM_ARB,
-                                             &swizzle);
-            assert(index >= 0);
-            assert(index < FRAG_ATTRIB_MAX);
-            store = _slang_new_ir_storage_swz(PROGRAM_INPUT, index,
-                                              size, swizzle);
-         }
-         else {
-            /* vertex program output */
-            GLint index = _slang_output_index(varName, GL_VERTEX_PROGRAM_ARB);
-            GLuint swizzle = _slang_var_swizzle(size, 0);
-            assert(index >= 0);
-            assert(index < VERT_RESULT_MAX);
-            assert(type == SLANG_UNIT_VERTEX_BUILTIN);
-            store = _slang_new_ir_storage_swz(PROGRAM_OUTPUT, index,
-                                              size, swizzle);
-         }
-         if (dbg) printf("V/F ");
-      }
-      if (dbg) printf("VARYING ");
-   }
-   else if (var->type.qualifier == SLANG_QUAL_ATTRIBUTE) {
-      GLuint swizzle;
-      GLint index;
-      /* attributes must be float, vec or mat */
-      if (!_slang_type_is_float_vec_mat(var->type.specifier.type)) {
-         slang_info_log_error(A->log,
-                              "attribute '%s' must be float/vector/matrix",
-                              varName);
-         return GL_FALSE;
-      }
-
-      if (prog) {
-         /* user-defined vertex attribute */
-         const GLint attr = -1; /* unknown */
-         swizzle = _slang_var_swizzle(size, 0);
-         index = _mesa_add_attribute(prog->Attributes, varName,
-                                     size, datatype, attr);
-         assert(index >= 0);
-         index = VERT_ATTRIB_GENERIC0 + index;
-      }
-      else {
-         /* pre-defined vertex attrib */
-         index = _slang_input_index(varName, GL_VERTEX_PROGRAM_ARB, &swizzle);
-         assert(index >= 0);
-      }
-      store = _slang_new_ir_storage_swz(PROGRAM_INPUT, index, size, swizzle);
-      if (dbg) printf("ATTRIB ");
-   }
-   else if (var->type.qualifier == SLANG_QUAL_FIXEDINPUT) {
-      GLuint swizzle = SWIZZLE_XYZW; /* silence compiler warning */
-      GLint index = _slang_input_index(varName, GL_FRAGMENT_PROGRAM_ARB,
-                                       &swizzle);
-      store = _slang_new_ir_storage_swz(PROGRAM_INPUT, index, size, swizzle);
-      if (dbg) printf("INPUT ");
-   }
-   else if (var->type.qualifier == SLANG_QUAL_FIXEDOUTPUT) {
-      if (type == SLANG_UNIT_VERTEX_BUILTIN) {
-         GLint index = _slang_output_index(varName, GL_VERTEX_PROGRAM_ARB);
-         store = _slang_new_ir_storage(PROGRAM_OUTPUT, index, size);
-      }
-      else {
-         GLint index = _slang_output_index(varName, GL_FRAGMENT_PROGRAM_ARB);
-         GLint specialSize = 4; /* treat all fragment outputs as float[4] */
-         assert(type == SLANG_UNIT_FRAGMENT_BUILTIN);
-         store = _slang_new_ir_storage(PROGRAM_OUTPUT, index, specialSize);
-      }
-      if (dbg) printf("OUTPUT ");
-   }
-   else if (var->type.qualifier == SLANG_QUAL_CONST && !prog) {
-      /* pre-defined global constant, like gl_MaxLights */
-      store = _slang_new_ir_storage(PROGRAM_CONSTANT, -1, size);
-      if (dbg) printf("CONST ");
-   }
-   else {
-      /* ordinary variable (may be const) */
-      slang_ir_node *n;
-
-      /* IR node to declare the variable */
-      n = _slang_gen_var_decl(A, var, var->initializer);
-
-      /* emit GPU instructions */
-      success = _slang_emit_code(n, A->vartable, A->program, A->pragmas, GL_FALSE, A->log);
-
-      _slang_free_ir_tree(n);
-   }
-
-   if (dbg) printf("GLOBAL VAR %s  idx %d\n", (char*) var->a_name,
-                   store ? store->Index : -2);
-
-   if (store)
-      var->store = store;  /* save var's storage info */
-
-   var->declared = GL_TRUE;
-
-   return success;
-}
-
-
-/**
- * Produce an IR tree from a function AST (fun->body).
- * Then call the code emitter to convert the IR tree into gl_program
- * instructions.
- */
-GLboolean
-_slang_codegen_function(slang_assemble_ctx * A, slang_function * fun)
-{
-   slang_ir_node *n;
-   GLboolean success = GL_TRUE;
-
-   if (strcmp((char *) fun->header.a_name, "main") != 0) {
-      /* we only really generate code for main, all other functions get
-       * inlined or codegen'd upon an actual call.
-       */
-#if 0
-      /* do some basic error checking though */
-      if (fun->header.type.specifier.type != SLANG_SPEC_VOID) {
-         /* check that non-void functions actually return something */
-         slang_operation *op
-            = _slang_find_node_type(fun->body, SLANG_OPER_RETURN);
-         if (!op) {
-            slang_info_log_error(A->log,
-                                 "function \"%s\" has no return statement",
-                                 (char *) fun->header.a_name);
-            printf(
-                   "function \"%s\" has no return statement\n",
-                   (char *) fun->header.a_name);
-            return GL_FALSE;
-         }
-      }
-#endif
-      return GL_TRUE;  /* not an error */
-   }
-
-#if 0
-   printf("\n*********** codegen_function %s\n", (char *) fun->header.a_name);
-   slang_print_function(fun, 1);
-#endif
-
-   /* should have been allocated earlier: */
-   assert(A->program->Parameters );
-   assert(A->program->Varying);
-   assert(A->vartable);
-
-   A->LoopDepth = 0;
-   A->UseReturnFlag = GL_FALSE;
-   A->CurFunction = fun;
-
-   /* fold constant expressions, etc. */
-   _slang_simplify(fun->body, &A->space, A->atoms);
-
-#if 0
-   printf("\n*********** simplified %s\n", (char *) fun->header.a_name);
-   slang_print_function(fun, 1);
-#endif
-
-   /* Create an end-of-function label */
-   A->curFuncEndLabel = _slang_label_new("__endOfFunc__main");
-
-   /* push new vartable scope */
-   _slang_push_var_table(A->vartable);
-
-   /* Generate IR tree for the function body code */
-   n = _slang_gen_operation(A, fun->body);
-   if (n)
-      n = new_node1(IR_SCOPE, n);
-
-   /* pop vartable, restore previous */
-   _slang_pop_var_table(A->vartable);
-
-   if (!n) {
-      /* XXX record error */
-      return GL_FALSE;
-   }
-
-   /* append an end-of-function-label to IR tree */
-   n = new_seq(n, new_label(A->curFuncEndLabel));
-
-   /*_slang_label_delete(A->curFuncEndLabel);*/
-   A->curFuncEndLabel = NULL;
-
-#if 0
-   printf("************* New AST for %s *****\n", (char*)fun->header.a_name);
-   slang_print_function(fun, 1);
-#endif
-#if 0
-   printf("************* IR for %s *******\n", (char*)fun->header.a_name);
-   _slang_print_ir_tree(n, 0);
-#endif
-#if 0
-   printf("************* End codegen function ************\n\n");
-#endif
-
-   if (A->UnresolvedRefs) {
-      /* Can't codegen at this time.
-       * At link time we'll concatenate all the vertex shaders and/or all
-       * the fragment shaders and try recompiling.
-       */
-      return GL_TRUE;
-   }
-
-   /* Emit program instructions */
-   success = _slang_emit_code(n, A->vartable, A->program, A->pragmas, GL_TRUE, A->log);
-   _slang_free_ir_tree(n);
-
-   /* free codegen context */
-   /*
-   free(A->codegen);
-   */
-
-   return success;
-}
-
diff --git a/mesalib/src/mesa/shader/slang/slang_codegen.h b/mesalib/src/mesa/shader/slang/slang_codegen.h
deleted file mode 100644
index 461633fe3..000000000
--- a/mesalib/src/mesa/shader/slang/slang_codegen.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.3
- *
- * Copyright (C) 2005-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.
- */
-
-
-#ifndef SLANG_CODEGEN_H
-#define SLANG_CODEGEN_H
-
-
-#include "main/imports.h"
-#include "slang_compile.h"
-
-
-#define MAX_LOOP_DEPTH 30
-
-
-typedef struct slang_assemble_ctx_
-{
-   slang_atom_pool *atoms;
-   slang_name_space space;
-   struct gl_program *program;
-   struct gl_sl_pragmas *pragmas;
-   slang_var_table *vartable;
-   slang_info_log *log;
-   GLboolean allow_uniform_initializers;
-
-   /* current loop stack */
-   const slang_operation *LoopOperStack[MAX_LOOP_DEPTH];
-   struct slang_ir_node_ *LoopIRStack[MAX_LOOP_DEPTH];
-   GLuint LoopDepth;
-
-   /* current function */
-   struct slang_function_ *CurFunction;
-   struct slang_label_ *curFuncEndLabel;
-   GLboolean UseReturnFlag;
-
-   GLboolean UnresolvedRefs;
-   GLboolean EmitContReturn;
-} slang_assemble_ctx;
-
-
-extern GLuint
-_slang_sizeof_type_specifier(const slang_type_specifier *spec);
-
-extern GLboolean
-_slang_codegen_function(slang_assemble_ctx *A , struct slang_function_ *fun);
-
-extern GLboolean
-_slang_codegen_global_variable(slang_assemble_ctx *A, slang_variable *var,
-                               slang_unit_type type);
-
-
-#endif /* SLANG_CODEGEN_H */
diff --git a/mesalib/src/mesa/shader/slang/slang_compile.c b/mesalib/src/mesa/shader/slang/slang_compile.c
deleted file mode 100644
index ad8667615..000000000
--- a/mesalib/src/mesa/shader/slang/slang_compile.c
+++ /dev/null
@@ -1,3032 +0,0 @@
-/*
- * Mesa 3-D graphics library
- *
- * Copyright (C) 2005-2006  Brian Paul   All Rights Reserved.
- * Copyright (C) 2008 VMware, Inc.  All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, 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 slang_compile.c
- * slang front-end compiler
- * \author Michal Krol
- */
-
-#include "main/imports.h"
-#include "main/context.h"
-#include "shader/program.h"
-#include "shader/programopt.h"
-#include "shader/prog_optimize.h"
-#include "shader/prog_print.h"
-#include "shader/prog_parameter.h"
-#include "../../glsl/pp/sl_pp_public.h"
-#include "../../glsl/cl/sl_cl_parse.h"
-#include "slang_codegen.h"
-#include "slang_compile.h"
-#include "slang_storage.h"
-#include "slang_log.h"
-#include "slang_mem.h"
-#include "slang_vartable.h"
-#include "slang_simplify.h"
-
-/*
- * This is a straightforward implementation of the slang front-end
- * compiler.  Lots of error-checking functionality is missing but
- * every well-formed shader source should compile successfully and
- * execute as expected. However, some semantically ill-formed shaders
- * may be accepted resulting in undefined behaviour.
- */
-
-
-/** re-defined below, should be the same though */
-#define TYPE_SPECIFIER_COUNT 36
-
-
-/**
- * Check if the given identifier is legal.
- */
-static GLboolean
-legal_identifier(slang_atom name)
-{
-   /* "gl_" is a reserved prefix */
-   if (strncmp((char *) name, "gl_", 3) == 0) {
-      return GL_FALSE;
-   }
-   return GL_TRUE;
-}
-
-
-/*
- * slang_code_unit
- */
-
-GLvoid
-_slang_code_unit_ctr(slang_code_unit * self,
-                     struct slang_code_object_ * object)
-{
-   _slang_variable_scope_ctr(&self->vars);
-   _slang_function_scope_ctr(&self->funs);
-   _slang_struct_scope_ctr(&self->structs);
-   self->object = object;
-}
-
-GLvoid
-_slang_code_unit_dtr(slang_code_unit * self)
-{
-   slang_variable_scope_destruct(&self->vars);
-   slang_function_scope_destruct(&self->funs);
-   slang_struct_scope_destruct(&self->structs);
-}
-
-/*
- * slang_code_object
- */
-
-GLvoid
-_slang_code_object_ctr(slang_code_object * self)
-{
-   GLuint i;
-
-   for (i = 0; i < SLANG_BUILTIN_TOTAL; i++)
-      _slang_code_unit_ctr(&self->builtin[i], self);
-   _slang_code_unit_ctr(&self->unit, self);
-   slang_atom_pool_construct(&self->atompool);
-}
-
-GLvoid
-_slang_code_object_dtr(slang_code_object * self)
-{
-   GLuint i;
-
-   for (i = 0; i < SLANG_BUILTIN_TOTAL; i++)
-      _slang_code_unit_dtr(&self->builtin[i]);
-   _slang_code_unit_dtr(&self->unit);
-   slang_atom_pool_destruct(&self->atompool);
-}
-
-
-/* slang_parse_ctx */
-
-typedef struct slang_parse_ctx_
-{
-   const unsigned char *I;
-   slang_info_log *L;
-   int parsing_builtin;
-   GLboolean global_scope;   /**< Is object being declared a global? */
-   slang_atom_pool *atoms;
-   slang_unit_type type;     /**< Vertex vs. Fragment */
-   GLuint version;           /**< user-specified (or default) #version */
-} slang_parse_ctx;
-
-/* slang_output_ctx */
-
-typedef struct slang_output_ctx_
-{
-   slang_variable_scope *vars;
-   slang_function_scope *funs;
-   slang_struct_scope *structs;
-   struct gl_program *program;
-   struct gl_sl_pragmas *pragmas;
-   slang_var_table *vartable;
-   GLuint default_precision[TYPE_SPECIFIER_COUNT];
-   GLboolean allow_precision;
-   GLboolean allow_invariant;
-   GLboolean allow_centroid;
-   GLboolean allow_array_types;  /* float[] syntax */
-} slang_output_ctx;
-
-/* _slang_compile() */
-
-
-/* Debugging aid, print file/line where parsing error is detected */
-#define RETURN0 \
-   do { \
-      if (0) \
-         printf("slang error at %s:%d\n", __FILE__, __LINE__); \
-      return 0; \
-   } while (0)
-
-
-static void
-parse_identifier_str(slang_parse_ctx * C, char **id)
-{
-   *id = (char *) C->I;
-   C->I += strlen(*id) + 1;
-}
-
-static slang_atom
-parse_identifier(slang_parse_ctx * C)
-{
-   const char *id;
-
-   id = (const char *) C->I;
-   C->I += strlen(id) + 1;
-   return slang_atom_pool_atom(C->atoms, id);
-}
-
-static int
-is_hex_digit(char c)
-{
-   return (c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F');
-}
-
-static int
-parse_general_number(slang_parse_ctx *ctx, float *number)
-{
-   char *flt = NULL;
-
-   if (*ctx->I == '0') {
-      int value = 0;
-      const unsigned char *pi;
-
-      if (ctx->I[1] == 'x' || ctx->I[1] == 'X') {
-         ctx->I += 2;
-         if (!is_hex_digit(*ctx->I)) {
-            return 0;
-         }
-         do {
-            int digit;
-
-            if (*ctx->I >= '0' && *ctx->I <= '9') {
-               digit = (int)(*ctx->I - '0');
-            } else if (*ctx->I >= 'a' && *ctx->I <= 'f') {
-               digit = (int)(*ctx->I - 'a') + 10;
-            } else {
-               digit = (int)(*ctx->I - 'A') + 10;
-            }
-            value = value * 0x10 + digit;
-            ctx->I++;
-         } while (is_hex_digit(*ctx->I));
-         if (*ctx->I != '\0') {
-            return 0;
-         }
-         ctx->I++;
-         *number = (float)value;
-         return 1;
-      }
-
-      pi = ctx->I;
-      pi++;
-      while (*pi >= '0' && *pi <= '7') {
-         int digit;
-
-         digit = (int)(*pi - '0');
-         value = value * 010 + digit;
-         pi++;
-      }
-      if (*pi == '\0') {
-         pi++;
-         ctx->I = pi;
-         *number = (float)value;
-         return 1;
-      }
-   }
-
-   parse_identifier_str(ctx, &flt);
-   flt = _mesa_strdup(flt);
-   if (!flt) {
-      return 0;
-   }
-   if (flt[strlen(flt) - 1] == 'f' || flt[strlen(flt) - 1] == 'F') {
-      flt[strlen(flt) - 1] = '\0';
-   }
-   *number = _mesa_strtof(flt, (char **)NULL);
-   free(flt);
-
-   return 1;
-}
-
-static int
-parse_number(slang_parse_ctx * C, int *number)
-{
-   const int radix = (int) (*C->I++);
-
-   if (radix == 1) {
-      float f = 0.0f;
-
-      parse_general_number(C, &f);
-      *number = (int)f;
-   } else {
-      *number = 0;
-      while (*C->I != '\0') {
-         int digit;
-         if (*C->I >= '0' && *C->I <= '9')
-            digit = (int) (*C->I - '0');
-         else if (*C->I >= 'A' && *C->I <= 'Z')
-            digit = (int) (*C->I - 'A') + 10;
-         else
-            digit = (int) (*C->I - 'a') + 10;
-         *number = *number * radix + digit;
-         C->I++;
-      }
-      C->I++;
-   }
-   if (*number > 65535)
-      slang_info_log_warning(C->L, "%d: literal integer overflow.", *number);
-   return 1;
-}
-
-static int
-parse_float(slang_parse_ctx * C, float *number)
-{
-   if (*C->I == 1) {
-      C->I++;
-      parse_general_number(C, number);
-   } else {
-      char *integral = NULL;
-      char *fractional = NULL;
-      char *exponent = NULL;
-      char *whole = NULL;
-
-      parse_identifier_str(C, &integral);
-      parse_identifier_str(C, &fractional);
-      parse_identifier_str(C, &exponent);
-
-      whole = (char *) _slang_alloc((strlen(integral) +
-                                     strlen(fractional) +
-                                     strlen(exponent) + 3) * sizeof(char));
-      if (whole == NULL) {
-         slang_info_log_memory(C->L);
-         RETURN0;
-      }
-
-      slang_string_copy(whole, integral);
-      slang_string_concat(whole, ".");
-      slang_string_concat(whole, fractional);
-      slang_string_concat(whole, "E");
-      slang_string_concat(whole, exponent);
-
-      *number = _mesa_strtof(whole, (char **) NULL);
-
-      _slang_free(whole);
-   }
-
-   return 1;
-}
-
-/* revision number - increment after each change affecting emitted output */
-#define REVISION 5
-
-static int
-check_revision(slang_parse_ctx * C)
-{
-   if (*C->I != REVISION) {
-      slang_info_log_error(C->L, "Internal compiler error.");
-      RETURN0;
-   }
-   C->I++;
-   return 1;
-}
-
-static int parse_statement(slang_parse_ctx *, slang_output_ctx *,
-                           slang_operation *);
-static int parse_expression(slang_parse_ctx *, slang_output_ctx *,
-                            slang_operation *);
-static int parse_type_specifier(slang_parse_ctx *, slang_output_ctx *,
-                                slang_type_specifier *);
-static int
-parse_type_array_size(slang_parse_ctx *C,
-                      slang_output_ctx *O,
-                      GLint *array_len);
-
-static GLboolean
-parse_array_len(slang_parse_ctx * C, slang_output_ctx * O, GLuint * len)
-{
-   slang_operation array_size;
-   slang_name_space space;
-   GLboolean result;
-
-   if (!slang_operation_construct(&array_size))
-      return GL_FALSE;
-   if (!parse_expression(C, O, &array_size)) {
-      slang_operation_destruct(&array_size);
-      return GL_FALSE;
-   }
-
-   space.funcs = O->funs;
-   space.structs = O->structs;
-   space.vars = O->vars;
-
-   /* evaluate compile-time expression which is array size */
-   _slang_simplify(&array_size, &space, C->atoms);
-
-   if (array_size.type == SLANG_OPER_LITERAL_INT) {
-      result = GL_TRUE;
-      *len = (GLint) array_size.literal[0];
-   } else if (array_size.type == SLANG_OPER_IDENTIFIER) {
-      slang_variable *var = _slang_variable_locate(array_size.locals, array_size.a_id, GL_TRUE);
-      if (!var) {
-         slang_info_log_error(C->L, "undefined variable '%s'",
-                              (char *) array_size.a_id);
-         result = GL_FALSE;
-      } else if (var->type.qualifier == SLANG_QUAL_CONST &&
-                 var->type.specifier.type == SLANG_SPEC_INT) {
-         if (var->initializer &&
-             var->initializer->type == SLANG_OPER_LITERAL_INT) {
-            *len = (GLint) var->initializer->literal[0];
-            result = GL_TRUE;
-         } else {
-            slang_info_log_error(C->L, "unable to parse array size declaration");
-            result = GL_FALSE;
-         }
-      } else {
-         slang_info_log_error(C->L, "unable to parse array size declaration");
-         result = GL_FALSE;
-      }
-   } else {
-      result = GL_FALSE;
-   }
-
-   slang_operation_destruct(&array_size);
-   return result;
-}
-
-static GLboolean
-calculate_var_size(slang_parse_ctx * C, slang_output_ctx * O,
-                   slang_variable * var)
-{
-   slang_storage_aggregate agg;
-
-   if (!slang_storage_aggregate_construct(&agg))
-      return GL_FALSE;
-   if (!_slang_aggregate_variable(&agg, &var->type.specifier, var->array_len,
-                                  O->funs, O->structs, O->vars, C->atoms)) {
-      slang_storage_aggregate_destruct(&agg);
-      return GL_FALSE;
-   }
-   var->size = _slang_sizeof_aggregate(&agg);
-   slang_storage_aggregate_destruct(&agg);
-   return GL_TRUE;
-}
-
-static void
-promote_type_to_array(slang_parse_ctx *C,
-                      slang_fully_specified_type *type,
-                      GLint array_len)
-{
-   slang_type_specifier *baseType =
-      slang_type_specifier_new(type->specifier.type, NULL, NULL);
-
-   type->specifier.type = SLANG_SPEC_ARRAY;
-   type->specifier._array = baseType;
-   type->array_len = array_len;
-}
-
-
-static GLboolean
-convert_to_array(slang_parse_ctx * C, slang_variable * var,
-                 const slang_type_specifier * sp)
-{
-   /* sized array - mark it as array, copy the specifier to the array element
-    * and parse the expression */
-   var->type.specifier.type = SLANG_SPEC_ARRAY;
-   var->type.specifier._array = (slang_type_specifier *)
-      _slang_alloc(sizeof(slang_type_specifier));
-   if (var->type.specifier._array == NULL) {
-      slang_info_log_memory(C->L);
-      return GL_FALSE;
-   }
-   slang_type_specifier_ctr(var->type.specifier._array);
-   return slang_type_specifier_copy(var->type.specifier._array, sp);
-}
-
-/* structure field */
-#define FIELD_NONE 0
-#define FIELD_NEXT 1
-#define FIELD_ARRAY 2
-
-static GLboolean
-parse_struct_field_var(slang_parse_ctx * C, slang_output_ctx * O,
-                       slang_variable * var, slang_atom a_name,
-                       const slang_type_specifier * sp,
-                       GLuint array_len)
-{
-   var->a_name = a_name;
-   if (var->a_name == SLANG_ATOM_NULL)
-      return GL_FALSE;
-
-   switch (*C->I++) {
-   case FIELD_NONE:
-      if (array_len != -1) {
-         if (!convert_to_array(C, var, sp))
-            return GL_FALSE;
-         var->array_len = array_len;
-      }
-      else {
-         if (!slang_type_specifier_copy(&var->type.specifier, sp))
-            return GL_FALSE;
-      }
-      break;
-   case FIELD_ARRAY:
-      if (array_len != -1)
-         return GL_FALSE;
-      if (!convert_to_array(C, var, sp))
-         return GL_FALSE;
-      if (!parse_array_len(C, O, &var->array_len))
-         return GL_FALSE;
-      break;
-   default:
-      return GL_FALSE;
-   }
-
-   return calculate_var_size(C, O, var);
-}
-
-static int
-parse_struct_field(slang_parse_ctx * C, slang_output_ctx * O,
-                   slang_struct * st, slang_type_specifier * sp)
-{
-   slang_output_ctx o = *O;
-   GLint array_len;
-
-   o.structs = st->structs;
-   if (!parse_type_specifier(C, &o, sp))
-      RETURN0;
-   if (!parse_type_array_size(C, &o, &array_len))
-      RETURN0;
-
-   do {
-      slang_atom a_name;
-      slang_variable *var = slang_variable_scope_grow(st->fields);
-      if (!var) {
-         slang_info_log_memory(C->L);
-         RETURN0;
-      }
-      a_name = parse_identifier(C);
-      if (_slang_variable_locate(st->fields, a_name, GL_FALSE)) {
-         slang_info_log_error(C->L, "duplicate field '%s'", (char *) a_name);
-         RETURN0;
-      }
-
-      if (!parse_struct_field_var(C, &o, var, a_name, sp, array_len))
-         RETURN0;
-   }
-   while (*C->I++ != FIELD_NONE);
-
-   return 1;
-}
-
-static int
-parse_struct(slang_parse_ctx * C, slang_output_ctx * O, slang_struct ** st)
-{
-   slang_atom a_name;
-   const char *name;
-
-   /* parse struct name (if any) and make sure it is unique in current scope */
-   a_name = parse_identifier(C);
-   if (a_name == SLANG_ATOM_NULL)
-      RETURN0;
-
-   name = slang_atom_pool_id(C->atoms, a_name);
-   if (name[0] != '\0'
-       && slang_struct_scope_find(O->structs, a_name, 0) != NULL) {
-      slang_info_log_error(C->L, "%s: duplicate type name.", name);
-      RETURN0;
-   }
-
-   /* set-up a new struct */
-   *st = (slang_struct *) _slang_alloc(sizeof(slang_struct));
-   if (*st == NULL) {
-      slang_info_log_memory(C->L);
-      RETURN0;
-   }
-   if (!slang_struct_construct(*st)) {
-      _slang_free(*st);
-      *st = NULL;
-      slang_info_log_memory(C->L);
-      RETURN0;
-   }
-   (**st).a_name = a_name;
-   (**st).structs->outer_scope = O->structs;
-
-   /* parse individual struct fields */
-   do {
-      slang_type_specifier sp;
-
-      slang_type_specifier_ctr(&sp);
-      if (!parse_struct_field(C, O, *st, &sp)) {
-         slang_type_specifier_dtr(&sp);
-         RETURN0;
-      }
-      slang_type_specifier_dtr(&sp);
-   }
-   while (*C->I++ != FIELD_NONE);
-
-   /* if named struct, copy it to current scope */
-   if (name[0] != '\0') {
-      slang_struct *s;
-
-      O->structs->structs =
-         (slang_struct *) _slang_realloc(O->structs->structs,
-                                         O->structs->num_structs
-                                         * sizeof(slang_struct),
-                                         (O->structs->num_structs + 1)
-                                         * sizeof(slang_struct));
-      if (O->structs->structs == NULL) {
-         slang_info_log_memory(C->L);
-         RETURN0;
-      }
-      s = &O->structs->structs[O->structs->num_structs];
-      if (!slang_struct_construct(s))
-         RETURN0;
-      O->structs->num_structs++;
-      if (!slang_struct_copy(s, *st))
-         RETURN0;
-   }
-
-   return 1;
-}
-
-
-/* invariant qualifer */
-#define TYPE_VARIANT    90
-#define TYPE_INVARIANT  91
-
-static int
-parse_type_variant(slang_parse_ctx * C, slang_type_variant *variant)
-{
-   GLuint invariant = *C->I++;
-   switch (invariant) {
-   case TYPE_VARIANT:
-      *variant = SLANG_VARIANT;
-      return 1;
-   case TYPE_INVARIANT:
-      *variant = SLANG_INVARIANT;
-      return 1;
-   default:
-      RETURN0;
-   }
-}
-
-
-/* centroid qualifer */
-#define TYPE_CENTER    95
-#define TYPE_CENTROID  96
-
-static int
-parse_type_centroid(slang_parse_ctx * C, slang_type_centroid *centroid)
-{
-   GLuint c = *C->I++;
-   switch (c) {
-   case TYPE_CENTER:
-      *centroid = SLANG_CENTER;
-      return 1;
-   case TYPE_CENTROID:
-      *centroid = SLANG_CENTROID;
-      return 1;
-   default:
-      RETURN0;
-   }
-}
-
-
-/* Layout qualifiers */
-#define LAYOUT_QUALIFIER_NONE                      0
-#define LAYOUT_QUALIFIER_UPPER_LEFT                1
-#define LAYOUT_QUALIFIER_PIXEL_CENTER_INTEGER      2
-
-static int
-parse_layout_qualifiers(slang_parse_ctx * C, slang_layout_qualifier *layout)
-{
-   *layout = 0x0;
-
-   /* the layout qualifiers come as a list of LAYOUT_QUALIFER_x tokens,
-    * terminated by LAYOUT_QUALIFIER_NONE.
-    */
-   while (1) {
-      GLuint c = *C->I++;
-      switch (c) {
-      case LAYOUT_QUALIFIER_NONE:
-         /* end of list of qualifiers */
-         return 1;
-      case LAYOUT_QUALIFIER_UPPER_LEFT:
-         *layout |= SLANG_LAYOUT_UPPER_LEFT_BIT;
-         break;
-      case LAYOUT_QUALIFIER_PIXEL_CENTER_INTEGER:
-         *layout |= SLANG_LAYOUT_PIXEL_CENTER_INTEGER_BIT;
-         break;
-      default:
-         assert(0 && "Bad layout qualifier");
-      }
-   }
-}
-
-
-/* type qualifier */
-#define TYPE_QUALIFIER_NONE 0
-#define TYPE_QUALIFIER_CONST 1
-#define TYPE_QUALIFIER_ATTRIBUTE 2
-#define TYPE_QUALIFIER_VARYING 3
-#define TYPE_QUALIFIER_UNIFORM 4
-#define TYPE_QUALIFIER_FIXEDOUTPUT 5
-#define TYPE_QUALIFIER_FIXEDINPUT 6
-
-static int
-parse_type_qualifier(slang_parse_ctx * C, slang_type_qualifier * qual)
-{
-   GLuint qualifier = *C->I++;
-   switch (qualifier) {
-   case TYPE_QUALIFIER_NONE:
-      *qual = SLANG_QUAL_NONE;
-      break;
-   case TYPE_QUALIFIER_CONST:
-      *qual = SLANG_QUAL_CONST;
-      break;
-   case TYPE_QUALIFIER_ATTRIBUTE:
-      *qual = SLANG_QUAL_ATTRIBUTE;
-      break;
-   case TYPE_QUALIFIER_VARYING:
-      *qual = SLANG_QUAL_VARYING;
-      break;
-   case TYPE_QUALIFIER_UNIFORM:
-      *qual = SLANG_QUAL_UNIFORM;
-      break;
-   case TYPE_QUALIFIER_FIXEDOUTPUT:
-      *qual = SLANG_QUAL_FIXEDOUTPUT;
-      break;
-   case TYPE_QUALIFIER_FIXEDINPUT:
-      *qual = SLANG_QUAL_FIXEDINPUT;
-      break;
-   default:
-      RETURN0;
-   }
-   return 1;
-}
-
-/* type specifier */
-#define TYPE_SPECIFIER_VOID 0
-#define TYPE_SPECIFIER_BOOL 1
-#define TYPE_SPECIFIER_BVEC2 2
-#define TYPE_SPECIFIER_BVEC3 3
-#define TYPE_SPECIFIER_BVEC4 4
-#define TYPE_SPECIFIER_INT 5
-#define TYPE_SPECIFIER_IVEC2 6
-#define TYPE_SPECIFIER_IVEC3 7
-#define TYPE_SPECIFIER_IVEC4 8
-#define TYPE_SPECIFIER_FLOAT 9
-#define TYPE_SPECIFIER_VEC2 10
-#define TYPE_SPECIFIER_VEC3 11
-#define TYPE_SPECIFIER_VEC4 12
-#define TYPE_SPECIFIER_MAT2 13
-#define TYPE_SPECIFIER_MAT3 14
-#define TYPE_SPECIFIER_MAT4 15
-#define TYPE_SPECIFIER_SAMPLER1D 16
-#define TYPE_SPECIFIER_SAMPLER2D 17
-#define TYPE_SPECIFIER_SAMPLER3D 18
-#define TYPE_SPECIFIER_SAMPLERCUBE 19
-#define TYPE_SPECIFIER_SAMPLER1DSHADOW 20
-#define TYPE_SPECIFIER_SAMPLER2DSHADOW 21
-#define TYPE_SPECIFIER_SAMPLER2DRECT 22
-#define TYPE_SPECIFIER_SAMPLER2DRECTSHADOW 23
-#define TYPE_SPECIFIER_STRUCT 24
-#define TYPE_SPECIFIER_TYPENAME 25
-#define TYPE_SPECIFIER_MAT23 26
-#define TYPE_SPECIFIER_MAT32 27
-#define TYPE_SPECIFIER_MAT24 28
-#define TYPE_SPECIFIER_MAT42 29
-#define TYPE_SPECIFIER_MAT34 30
-#define TYPE_SPECIFIER_MAT43 31
-#define TYPE_SPECIFIER_SAMPLER_1D_ARRAY 32
-#define TYPE_SPECIFIER_SAMPLER_2D_ARRAY 33
-#define TYPE_SPECIFIER_SAMPLER_1D_ARRAY_SHADOW 34
-#define TYPE_SPECIFIER_SAMPLER_2D_ARRAY_SHADOW 35
-#define TYPE_SPECIFIER_COUNT 36
-
-static int
-parse_type_specifier(slang_parse_ctx * C, slang_output_ctx * O,
-                     slang_type_specifier * spec)
-{
-   int type = *C->I++;
-   switch (type) {
-   case TYPE_SPECIFIER_VOID:
-      spec->type = SLANG_SPEC_VOID;
-      break;
-   case TYPE_SPECIFIER_BOOL:
-      spec->type = SLANG_SPEC_BOOL;
-      break;
-   case TYPE_SPECIFIER_BVEC2:
-      spec->type = SLANG_SPEC_BVEC2;
-      break;
-   case TYPE_SPECIFIER_BVEC3:
-      spec->type = SLANG_SPEC_BVEC3;
-      break;
-   case TYPE_SPECIFIER_BVEC4:
-      spec->type = SLANG_SPEC_BVEC4;
-      break;
-   case TYPE_SPECIFIER_INT:
-      spec->type = SLANG_SPEC_INT;
-      break;
-   case TYPE_SPECIFIER_IVEC2:
-      spec->type = SLANG_SPEC_IVEC2;
-      break;
-   case TYPE_SPECIFIER_IVEC3:
-      spec->type = SLANG_SPEC_IVEC3;
-      break;
-   case TYPE_SPECIFIER_IVEC4:
-      spec->type = SLANG_SPEC_IVEC4;
-      break;
-   case TYPE_SPECIFIER_FLOAT:
-      spec->type = SLANG_SPEC_FLOAT;
-      break;
-   case TYPE_SPECIFIER_VEC2:
-      spec->type = SLANG_SPEC_VEC2;
-      break;
-   case TYPE_SPECIFIER_VEC3:
-      spec->type = SLANG_SPEC_VEC3;
-      break;
-   case TYPE_SPECIFIER_VEC4:
-      spec->type = SLANG_SPEC_VEC4;
-      break;
-   case TYPE_SPECIFIER_MAT2:
-      spec->type = SLANG_SPEC_MAT2;
-      break;
-   case TYPE_SPECIFIER_MAT3:
-      spec->type = SLANG_SPEC_MAT3;
-      break;
-   case TYPE_SPECIFIER_MAT4:
-      spec->type = SLANG_SPEC_MAT4;
-      break;
-   case TYPE_SPECIFIER_MAT23:
-      spec->type = SLANG_SPEC_MAT23;
-      break;
-   case TYPE_SPECIFIER_MAT32:
-      spec->type = SLANG_SPEC_MAT32;
-      break;
-   case TYPE_SPECIFIER_MAT24:
-      spec->type = SLANG_SPEC_MAT24;
-      break;
-   case TYPE_SPECIFIER_MAT42:
-      spec->type = SLANG_SPEC_MAT42;
-      break;
-   case TYPE_SPECIFIER_MAT34:
-      spec->type = SLANG_SPEC_MAT34;
-      break;
-   case TYPE_SPECIFIER_MAT43:
-      spec->type = SLANG_SPEC_MAT43;
-      break;
-   case TYPE_SPECIFIER_SAMPLER1D:
-      spec->type = SLANG_SPEC_SAMPLER_1D;
-      break;
-   case TYPE_SPECIFIER_SAMPLER2D:
-      spec->type = SLANG_SPEC_SAMPLER_2D;
-      break;
-   case TYPE_SPECIFIER_SAMPLER3D:
-      spec->type = SLANG_SPEC_SAMPLER_3D;
-      break;
-   case TYPE_SPECIFIER_SAMPLERCUBE:
-      spec->type = SLANG_SPEC_SAMPLER_CUBE;
-      break;
-   case TYPE_SPECIFIER_SAMPLER2DRECT:
-      spec->type = SLANG_SPEC_SAMPLER_RECT;
-      break;
-   case TYPE_SPECIFIER_SAMPLER1DSHADOW:
-      spec->type = SLANG_SPEC_SAMPLER_1D_SHADOW;
-      break;
-   case TYPE_SPECIFIER_SAMPLER2DSHADOW:
-      spec->type = SLANG_SPEC_SAMPLER_2D_SHADOW;
-      break;
-   case TYPE_SPECIFIER_SAMPLER2DRECTSHADOW:
-      spec->type = SLANG_SPEC_SAMPLER_RECT_SHADOW;
-      break;
-   case TYPE_SPECIFIER_SAMPLER_1D_ARRAY:
-      spec->type = SLANG_SPEC_SAMPLER_1D_ARRAY;
-      break;
-   case TYPE_SPECIFIER_SAMPLER_2D_ARRAY:
-      spec->type = SLANG_SPEC_SAMPLER_2D_ARRAY;
-      break;
-   case TYPE_SPECIFIER_SAMPLER_1D_ARRAY_SHADOW:
-      spec->type = SLANG_SPEC_SAMPLER_1D_ARRAY_SHADOW;
-      break;
-   case TYPE_SPECIFIER_SAMPLER_2D_ARRAY_SHADOW:
-      spec->type = SLANG_SPEC_SAMPLER_2D_ARRAY_SHADOW;
-      break;
-   case TYPE_SPECIFIER_STRUCT:
-      spec->type = SLANG_SPEC_STRUCT;
-      if (!parse_struct(C, O, &spec->_struct))
-         RETURN0;
-      break;
-   case TYPE_SPECIFIER_TYPENAME:
-      spec->type = SLANG_SPEC_STRUCT;
-      {
-         slang_atom a_name;
-         slang_struct *stru;
-
-         a_name = parse_identifier(C);
-         if (a_name == NULL)
-            RETURN0;
-
-         stru = slang_struct_scope_find(O->structs, a_name, 1);
-         if (stru == NULL) {
-            slang_info_log_error(C->L, "undeclared type name '%s'",
-                                 slang_atom_pool_id(C->atoms, a_name));
-            RETURN0;
-         }
-
-         spec->_struct = (slang_struct *) _slang_alloc(sizeof(slang_struct));
-         if (spec->_struct == NULL) {
-            slang_info_log_memory(C->L);
-            RETURN0;
-         }
-         if (!slang_struct_construct(spec->_struct)) {
-            _slang_free(spec->_struct);
-            spec->_struct = NULL;
-            RETURN0;
-         }
-         if (!slang_struct_copy(spec->_struct, stru))
-            RETURN0;
-      }
-      break;
-   default:
-      RETURN0;
-   }
-   return 1;
-}
-
-#define TYPE_SPECIFIER_NONARRAY 0
-#define TYPE_SPECIFIER_ARRAY    1
-
-static int
-parse_type_array_size(slang_parse_ctx *C,
-                      slang_output_ctx *O,
-                      GLint *array_len)
-{
-   GLuint size;
-
-   switch (*C->I++) {
-   case TYPE_SPECIFIER_NONARRAY:
-      *array_len = -1; /* -1 = not an array */
-      break;
-   case TYPE_SPECIFIER_ARRAY:
-      if (!parse_array_len(C, O, &size))
-         RETURN0;
-      *array_len = (GLint) size;
-      break;
-   default:
-      assert(0);
-      RETURN0;
-   }
-   return 1;
-}
-
-#define PRECISION_DEFAULT 0
-#define PRECISION_LOW     1
-#define PRECISION_MEDIUM  2
-#define PRECISION_HIGH    3
-
-static int
-parse_type_precision(slang_parse_ctx *C,
-                     slang_type_precision *precision)
-{
-   GLint prec = *C->I++;
-   switch (prec) {
-   case PRECISION_DEFAULT:
-      *precision = SLANG_PREC_DEFAULT;
-      return 1;
-   case PRECISION_LOW:
-      *precision = SLANG_PREC_LOW;
-      return 1;
-   case PRECISION_MEDIUM:
-      *precision = SLANG_PREC_MEDIUM;
-      return 1;
-   case PRECISION_HIGH:
-      *precision = SLANG_PREC_HIGH;
-      return 1;
-   default:
-      RETURN0;
-   }
-}
-
-static int
-parse_fully_specified_type(slang_parse_ctx * C, slang_output_ctx * O,
-                           slang_fully_specified_type * type)
-{
-   if (!parse_layout_qualifiers(C, &type->layout))
-      RETURN0;
-
-   if (!parse_type_variant(C, &type->variant))
-      RETURN0;
-
-   if (!parse_type_centroid(C, &type->centroid))
-      RETURN0;
-
-   if (!parse_type_qualifier(C, &type->qualifier))
-      RETURN0;
-
-   if (!parse_type_precision(C, &type->precision))
-      RETURN0;
-
-   if (!parse_type_specifier(C, O, &type->specifier))
-      RETURN0;
-
-   if (!parse_type_array_size(C, O, &type->array_len))
-      RETURN0;
-
-   if (!O->allow_invariant && type->variant == SLANG_INVARIANT) {
-      slang_info_log_error(C->L,
-         "'invariant' keyword not allowed (perhaps set #version 120)");
-      RETURN0;
-   }
-
-   if (!O->allow_centroid && type->centroid == SLANG_CENTROID) {
-      slang_info_log_error(C->L,
-         "'centroid' keyword not allowed (perhaps set #version 120)");
-      RETURN0;
-   }
-   else if (type->centroid == SLANG_CENTROID &&
-            type->qualifier != SLANG_QUAL_VARYING) {
-      slang_info_log_error(C->L,
-         "'centroid' keyword only allowed for varying vars");
-      RETURN0;
-   }
-
-
-   /* need this?
-   if (type->qualifier != SLANG_QUAL_VARYING &&
-       type->variant == SLANG_INVARIANT) {
-      slang_info_log_error(C->L,
-                           "invariant qualifer only allowed for varying vars");
-      RETURN0;
-   }
-   */
-
-   if (O->allow_precision) {
-      if (type->precision == SLANG_PREC_DEFAULT) {
-         assert(type->specifier.type < TYPE_SPECIFIER_COUNT);
-         /* use the default precision for this datatype */
-         type->precision = O->default_precision[type->specifier.type];
-      }
-   }
-   else {
-      /* only default is allowed */
-      if (type->precision != SLANG_PREC_DEFAULT) {
-         slang_info_log_error(C->L, "precision qualifiers not allowed");
-         RETURN0;
-      }
-   }
-
-   if (!O->allow_array_types && type->array_len >= 0) {
-      slang_info_log_error(C->L, "first-class array types not allowed");
-      RETURN0;
-   }
-
-   if (type->array_len >= 0) {
-      /* convert type to array type (ex: convert "int" to "array of int" */
-      promote_type_to_array(C, type, type->array_len);
-   }
-
-   return 1;
-}
-
-/* operation */
-#define OP_END 0
-#define OP_BLOCK_BEGIN_NO_NEW_SCOPE 1
-#define OP_BLOCK_BEGIN_NEW_SCOPE 2
-#define OP_DECLARE 3
-#define OP_ASM 4
-#define OP_BREAK 5
-#define OP_CONTINUE 6
-#define OP_DISCARD 7
-#define OP_RETURN 8
-#define OP_EXPRESSION 9
-#define OP_IF 10
-#define OP_WHILE 11
-#define OP_DO 12
-#define OP_FOR 13
-#define OP_PUSH_VOID 14
-#define OP_PUSH_BOOL 15
-#define OP_PUSH_INT 16
-#define OP_PUSH_FLOAT 17
-#define OP_PUSH_IDENTIFIER 18
-#define OP_SEQUENCE 19
-#define OP_ASSIGN 20
-#define OP_ADDASSIGN 21
-#define OP_SUBASSIGN 22
-#define OP_MULASSIGN 23
-#define OP_DIVASSIGN 24
-/*#define OP_MODASSIGN 25*/
-/*#define OP_LSHASSIGN 26*/
-/*#define OP_RSHASSIGN 27*/
-/*#define OP_ORASSIGN 28*/
-/*#define OP_XORASSIGN 29*/
-/*#define OP_ANDASSIGN 30*/
-#define OP_SELECT 31
-#define OP_LOGICALOR 32
-#define OP_LOGICALXOR 33
-#define OP_LOGICALAND 34
-/*#define OP_BITOR 35*/
-/*#define OP_BITXOR 36*/
-/*#define OP_BITAND 37*/
-#define OP_EQUAL 38
-#define OP_NOTEQUAL 39
-#define OP_LESS 40
-#define OP_GREATER 41
-#define OP_LESSEQUAL 42
-#define OP_GREATEREQUAL 43
-/*#define OP_LSHIFT 44*/
-/*#define OP_RSHIFT 45*/
-#define OP_ADD 46
-#define OP_SUBTRACT 47
-#define OP_MULTIPLY 48
-#define OP_DIVIDE 49
-/*#define OP_MODULUS 50*/
-#define OP_PREINCREMENT 51
-#define OP_PREDECREMENT 52
-#define OP_PLUS 53
-#define OP_MINUS 54
-/*#define OP_COMPLEMENT 55*/
-#define OP_NOT 56
-#define OP_SUBSCRIPT 57
-#define OP_CALL 58
-#define OP_FIELD 59
-#define OP_POSTINCREMENT 60
-#define OP_POSTDECREMENT 61
-#define OP_PRECISION 62
-#define OP_METHOD 63
-
-
-/**
- * When parsing a compound production, this function is used to parse the
- * children.
- * For example, a while-loop compound will have two children, the
- * while condition expression and the loop body.  So, this function will
- * be called twice to parse those two sub-expressions.
- * \param C  the parsing context
- * \param O  the output context
- * \param oper  the operation we're parsing
- * \param statement  indicates whether parsing a statement, or expression
- * \return 1 if success, 0 if error
- */
-static int
-parse_child_operation(slang_parse_ctx * C, slang_output_ctx * O,
-                      slang_operation * oper, GLboolean statement)
-{
-   slang_operation *ch;
-
-   /* grow child array */
-   ch = slang_operation_grow(&oper->num_children, &oper->children);
-   if (statement)
-      return parse_statement(C, O, ch);
-   return parse_expression(C, O, ch);
-}
-
-static int parse_declaration(slang_parse_ctx * C, slang_output_ctx * O);
-
-static int
-parse_statement(slang_parse_ctx * C, slang_output_ctx * O,
-                slang_operation * oper)
-{
-   int op;
-
-   oper->locals->outer_scope = O->vars;
-
-   op = *C->I++;
-   switch (op) {
-   case OP_BLOCK_BEGIN_NO_NEW_SCOPE:
-      /* parse child statements, do not create new variable scope */
-      oper->type = SLANG_OPER_BLOCK_NO_NEW_SCOPE;
-      while (*C->I != OP_END)
-         if (!parse_child_operation(C, O, oper, GL_TRUE))
-            RETURN0;
-      C->I++;
-      break;
-   case OP_BLOCK_BEGIN_NEW_SCOPE:
-      /* parse child statements, create new variable scope */
-      {
-         slang_output_ctx o = *O;
-
-         oper->type = SLANG_OPER_BLOCK_NEW_SCOPE;
-         o.vars = oper->locals;
-         while (*C->I != OP_END)
-            if (!parse_child_operation(C, &o, oper, GL_TRUE))
-               RETURN0;
-         C->I++;
-      }
-      break;
-   case OP_DECLARE:
-      /* local variable declaration, individual declarators are stored as
-       * children identifiers
-       */
-      oper->type = SLANG_OPER_BLOCK_NO_NEW_SCOPE;
-      {
-         const unsigned int first_var = O->vars->num_variables;
-
-         /* parse the declaration, note that there can be zero or more
-          * than one declarators
-          */
-         if (!parse_declaration(C, O))
-            RETURN0;
-         if (first_var < O->vars->num_variables) {
-            const unsigned int num_vars = O->vars->num_variables - first_var;
-            unsigned int i;
-            assert(oper->num_children == 0);
-            oper->num_children = num_vars;
-            oper->children = slang_operation_new(num_vars);
-            if (oper->children == NULL) {
-               slang_info_log_memory(C->L);
-               RETURN0;
-            }
-            for (i = first_var; i < O->vars->num_variables; i++) {
-               slang_operation *o = &oper->children[i - first_var];
-               slang_variable *var = O->vars->variables[i];
-               o->type = SLANG_OPER_VARIABLE_DECL;
-               o->locals->outer_scope = O->vars;
-               o->a_id = var->a_name;
-
-               /* new/someday...
-               calculate_var_size(C, O, var);
-               */
-
-               if (!legal_identifier(o->a_id)) {
-                  slang_info_log_error(C->L, "illegal variable name '%s'",
-                                       (char *) o->a_id);
-                  RETURN0;
-               }
-            }
-         }
-      }
-      break;
-   case OP_ASM:
-      /* the __asm statement, parse the mnemonic and all its arguments
-       * as expressions
-       */
-      oper->type = SLANG_OPER_ASM;
-      oper->a_id = parse_identifier(C);
-      if (oper->a_id == SLANG_ATOM_NULL)
-         RETURN0;
-      while (*C->I != OP_END) {
-         if (!parse_child_operation(C, O, oper, GL_FALSE))
-            RETURN0;
-      }
-      C->I++;
-      break;
-   case OP_BREAK:
-      oper->type = SLANG_OPER_BREAK;
-      break;
-   case OP_CONTINUE:
-      oper->type = SLANG_OPER_CONTINUE;
-      break;
-   case OP_DISCARD:
-      oper->type = SLANG_OPER_DISCARD;
-      break;
-   case OP_RETURN:
-      oper->type = SLANG_OPER_RETURN;
-      if (!parse_child_operation(C, O, oper, GL_FALSE))
-         RETURN0;
-      break;
-   case OP_EXPRESSION:
-      oper->type = SLANG_OPER_EXPRESSION;
-      if (!parse_child_operation(C, O, oper, GL_FALSE))
-         RETURN0;
-      break;
-   case OP_IF:
-      oper->type = SLANG_OPER_IF;
-      if (!parse_child_operation(C, O, oper, GL_FALSE))
-         RETURN0;
-      if (!parse_child_operation(C, O, oper, GL_TRUE))
-         RETURN0;
-      if (!parse_child_operation(C, O, oper, GL_TRUE))
-         RETURN0;
-      break;
-   case OP_WHILE:
-      {
-         slang_output_ctx o = *O;
-
-         oper->type = SLANG_OPER_WHILE;
-         o.vars = oper->locals;
-         if (!parse_child_operation(C, &o, oper, GL_TRUE))
-            RETURN0;
-         if (!parse_child_operation(C, &o, oper, GL_TRUE))
-            RETURN0;
-      }
-      break;
-   case OP_DO:
-      oper->type = SLANG_OPER_DO;
-      if (!parse_child_operation(C, O, oper, GL_TRUE))
-         RETURN0;
-      if (!parse_child_operation(C, O, oper, GL_FALSE))
-         RETURN0;
-      break;
-   case OP_FOR:
-      {
-         slang_output_ctx o = *O;
-
-         oper->type = SLANG_OPER_FOR;
-         o.vars = oper->locals;
-         if (!parse_child_operation(C, &o, oper, GL_TRUE))
-            RETURN0;
-         if (!parse_child_operation(C, &o, oper, GL_TRUE))
-            RETURN0;
-         if (!parse_child_operation(C, &o, oper, GL_FALSE))
-            RETURN0;
-         if (!parse_child_operation(C, &o, oper, GL_TRUE))
-            RETURN0;
-      }
-      break;
-   case OP_PRECISION:
-      {
-         /* set default precision for a type in this scope */
-         /* ignored at this time */
-         int prec_qual = *C->I++;
-         int datatype = *C->I++;
-         (void) prec_qual;
-         (void) datatype;
-      }
-      break;
-   default:
-      /*printf("Unexpected operation %d\n", op);*/
-      RETURN0;
-   }
-   return 1;
-}
-
-static int
-handle_nary_expression(slang_parse_ctx * C, slang_operation * op,
-                       slang_operation ** ops, unsigned int *total_ops,
-                       unsigned int n)
-{
-   unsigned int i;
-
-   op->children = slang_operation_new(n);
-   if (op->children == NULL) {
-      slang_info_log_memory(C->L);
-      RETURN0;
-   }
-   op->num_children = n;
-
-   for (i = 0; i < n; i++) {
-      slang_operation_destruct(&op->children[i]);
-      op->children[i] = (*ops)[*total_ops - (n + 1 - i)];
-   }
-
-   (*ops)[*total_ops - (n + 1)] = (*ops)[*total_ops - 1];
-   *total_ops -= n;
-
-   *ops = (slang_operation *)
-      _slang_realloc(*ops,
-                     (*total_ops + n) * sizeof(slang_operation),
-                     *total_ops * sizeof(slang_operation));
-   if (*ops == NULL) {
-      slang_info_log_memory(C->L);
-      RETURN0;
-   }
-   return 1;
-}
-
-static int
-is_constructor_name(const char *name, slang_atom a_name,
-                    slang_struct_scope * structs)
-{
-   if (slang_type_specifier_type_from_string(name) != SLANG_SPEC_VOID)
-      return 1;
-   return slang_struct_scope_find(structs, a_name, 1) != NULL;
-}
-
-#define FUNCTION_CALL_NONARRAY 0
-#define FUNCTION_CALL_ARRAY    1
-
-static int
-parse_expression(slang_parse_ctx * C, slang_output_ctx * O,
-                 slang_operation * oper)
-{
-   slang_operation *ops = NULL;
-   unsigned int num_ops = 0;
-   int number;
-
-   while (*C->I != OP_END) {
-      slang_operation *op;
-      const unsigned int op_code = *C->I++;
-
-      /* allocate default operation, becomes a no-op if not used  */
-      ops = (slang_operation *)
-         _slang_realloc(ops,
-                        num_ops * sizeof(slang_operation),
-                        (num_ops + 1) * sizeof(slang_operation));
-      if (ops == NULL) {
-         slang_info_log_memory(C->L);
-         RETURN0;
-      }
-      op = &ops[num_ops];
-      if (!slang_operation_construct(op)) {
-         slang_info_log_memory(C->L);
-         RETURN0;
-      }
-      num_ops++;
-      op->locals->outer_scope = O->vars;
-
-      switch (op_code) {
-      case OP_PUSH_VOID:
-         op->type = SLANG_OPER_VOID;
-         break;
-      case OP_PUSH_BOOL:
-         op->type = SLANG_OPER_LITERAL_BOOL;
-         if (!parse_number(C, &number))
-            RETURN0;
-         op->literal[0] =
-         op->literal[1] =
-         op->literal[2] =
-         op->literal[3] = (GLfloat) number;
-         op->literal_size = 1;
-         break;
-      case OP_PUSH_INT:
-         op->type = SLANG_OPER_LITERAL_INT;
-         if (!parse_number(C, &number))
-            RETURN0;
-         op->literal[0] =
-         op->literal[1] =
-         op->literal[2] =
-         op->literal[3] = (GLfloat) number;
-         op->literal_size = 1;
-         break;
-      case OP_PUSH_FLOAT:
-         op->type = SLANG_OPER_LITERAL_FLOAT;
-         if (!parse_float(C, &op->literal[0]))
-            RETURN0;
-         op->literal[1] =
-         op->literal[2] =
-         op->literal[3] = op->literal[0];
-         op->literal_size = 1;
-         break;
-      case OP_PUSH_IDENTIFIER:
-         op->type = SLANG_OPER_IDENTIFIER;
-         op->a_id = parse_identifier(C);
-         if (op->a_id == SLANG_ATOM_NULL)
-            RETURN0;
-         break;
-      case OP_SEQUENCE:
-         op->type = SLANG_OPER_SEQUENCE;
-         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
-            RETURN0;
-         break;
-      case OP_ASSIGN:
-         op->type = SLANG_OPER_ASSIGN;
-         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
-            RETURN0;
-         break;
-      case OP_ADDASSIGN:
-         op->type = SLANG_OPER_ADDASSIGN;
-         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
-            RETURN0;
-         break;
-      case OP_SUBASSIGN:
-         op->type = SLANG_OPER_SUBASSIGN;
-         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
-            RETURN0;
-         break;
-      case OP_MULASSIGN:
-         op->type = SLANG_OPER_MULASSIGN;
-         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
-            RETURN0;
-         break;
-      case OP_DIVASSIGN:
-         op->type = SLANG_OPER_DIVASSIGN;
-         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
-            RETURN0;
-         break;
-         /*case OP_MODASSIGN: */
-         /*case OP_LSHASSIGN: */
-         /*case OP_RSHASSIGN: */
-         /*case OP_ORASSIGN: */
-         /*case OP_XORASSIGN: */
-         /*case OP_ANDASSIGN: */
-      case OP_SELECT:
-         op->type = SLANG_OPER_SELECT;
-         if (!handle_nary_expression(C, op, &ops, &num_ops, 3))
-            RETURN0;
-         break;
-      case OP_LOGICALOR:
-         op->type = SLANG_OPER_LOGICALOR;
-         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
-            RETURN0;
-         break;
-      case OP_LOGICALXOR:
-         op->type = SLANG_OPER_LOGICALXOR;
-         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
-            RETURN0;
-         break;
-      case OP_LOGICALAND:
-         op->type = SLANG_OPER_LOGICALAND;
-         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
-            RETURN0;
-         break;
-         /*case OP_BITOR: */
-         /*case OP_BITXOR: */
-         /*case OP_BITAND: */
-      case OP_EQUAL:
-         op->type = SLANG_OPER_EQUAL;
-         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
-            RETURN0;
-         break;
-      case OP_NOTEQUAL:
-         op->type = SLANG_OPER_NOTEQUAL;
-         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
-            RETURN0;
-         break;
-      case OP_LESS:
-         op->type = SLANG_OPER_LESS;
-         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
-            RETURN0;
-         break;
-      case OP_GREATER:
-         op->type = SLANG_OPER_GREATER;
-         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
-            RETURN0;
-         break;
-      case OP_LESSEQUAL:
-         op->type = SLANG_OPER_LESSEQUAL;
-         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
-            RETURN0;
-         break;
-      case OP_GREATEREQUAL:
-         op->type = SLANG_OPER_GREATEREQUAL;
-         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
-            RETURN0;
-         break;
-         /*case OP_LSHIFT: */
-         /*case OP_RSHIFT: */
-      case OP_ADD:
-         op->type = SLANG_OPER_ADD;
-         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
-            RETURN0;
-         break;
-      case OP_SUBTRACT:
-         op->type = SLANG_OPER_SUBTRACT;
-         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
-            RETURN0;
-         break;
-      case OP_MULTIPLY:
-         op->type = SLANG_OPER_MULTIPLY;
-         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
-            RETURN0;
-         break;
-      case OP_DIVIDE:
-         op->type = SLANG_OPER_DIVIDE;
-         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
-            RETURN0;
-         break;
-         /*case OP_MODULUS: */
-      case OP_PREINCREMENT:
-         op->type = SLANG_OPER_PREINCREMENT;
-         if (!handle_nary_expression(C, op, &ops, &num_ops, 1))
-            RETURN0;
-         break;
-      case OP_PREDECREMENT:
-         op->type = SLANG_OPER_PREDECREMENT;
-         if (!handle_nary_expression(C, op, &ops, &num_ops, 1))
-            RETURN0;
-         break;
-      case OP_PLUS:
-         op->type = SLANG_OPER_PLUS;
-         if (!handle_nary_expression(C, op, &ops, &num_ops, 1))
-            RETURN0;
-         break;
-      case OP_MINUS:
-         op->type = SLANG_OPER_MINUS;
-         if (!handle_nary_expression(C, op, &ops, &num_ops, 1))
-            RETURN0;
-         break;
-      case OP_NOT:
-         op->type = SLANG_OPER_NOT;
-         if (!handle_nary_expression(C, op, &ops, &num_ops, 1))
-            RETURN0;
-         break;
-         /*case OP_COMPLEMENT: */
-      case OP_SUBSCRIPT:
-         op->type = SLANG_OPER_SUBSCRIPT;
-         if (!handle_nary_expression(C, op, &ops, &num_ops, 2))
-            RETURN0;
-         break;
-      case OP_METHOD:
-         op->type = SLANG_OPER_METHOD;
-         op->a_obj = parse_identifier(C);
-         if (op->a_obj == SLANG_ATOM_NULL)
-            RETURN0;
-
-         op->a_id = parse_identifier(C);
-         if (op->a_id == SLANG_ATOM_NULL)
-            RETURN0;
-
-         assert(*C->I == OP_END);
-         C->I++;
-
-         while (*C->I != OP_END)
-            if (!parse_child_operation(C, O, op, GL_FALSE))
-               RETURN0;
-         C->I++;
-#if 0
-         /* don't lookup the method (not yet anyway) */
-         if (!C->parsing_builtin
-             && !slang_function_scope_find_by_name(O->funs, op->a_id, 1)) {
-            const char *id;
-
-            id = slang_atom_pool_id(C->atoms, op->a_id);
-            if (!is_constructor_name(id, op->a_id, O->structs)) {
-               slang_info_log_error(C->L, "%s: undeclared function name.", id);
-               RETURN0;
-            }
-         }
-#endif
-         break;
-      case OP_CALL:
-         {
-            GLboolean array_constructor = GL_FALSE;
-            GLint array_constructor_size = 0;
-
-            op->type = SLANG_OPER_CALL;
-            op->a_id = parse_identifier(C);
-            if (op->a_id == SLANG_ATOM_NULL)
-               RETURN0;
-            switch (*C->I++) {
-            case FUNCTION_CALL_NONARRAY:
-               /* Nothing to do. */
-               break;
-            case FUNCTION_CALL_ARRAY:
-               /* Calling an array constructor. For example:
-                *   float[3](1.1, 2.2, 3.3);
-                */
-               if (!O->allow_array_types) {
-                  slang_info_log_error(C->L,
-                                       "array constructors not allowed "
-                                       "in this GLSL version");
-                  RETURN0;
-               }
-               else {
-                  /* parse the array constructor size */
-                  slang_operation array_size;
-                  array_constructor = GL_TRUE;
-                  slang_operation_construct(&array_size);
-                  if (!parse_expression(C, O, &array_size)) {
-                     slang_operation_destruct(&array_size);
-                     return GL_FALSE;
-                  }
-                  if (array_size.type != SLANG_OPER_LITERAL_INT) {
-                     slang_info_log_error(C->L,
-                        "constructor array size is not an integer");
-                     slang_operation_destruct(&array_size);
-                     RETURN0;
-                  }
-                  array_constructor_size = (int) array_size.literal[0];
-                  op->array_constructor = GL_TRUE;
-                  slang_operation_destruct(&array_size);
-               }
-               break;
-            default:
-               assert(0);
-               RETURN0;
-            }
-            while (*C->I != OP_END)
-               if (!parse_child_operation(C, O, op, GL_FALSE))
-                  RETURN0;
-            C->I++;
-
-            if (array_constructor &&
-                array_constructor_size != op->num_children) {
-               slang_info_log_error(C->L, "number of parameters to array"
-                                    " constructor does not match array size");
-               RETURN0;
-            }
-
-            if (!C->parsing_builtin
-                && !slang_function_scope_find_by_name(O->funs, op->a_id, 1)) {
-               const char *id;
-
-               id = slang_atom_pool_id(C->atoms, op->a_id);
-               if (!is_constructor_name(id, op->a_id, O->structs)) {
-                  slang_info_log_error(C->L, "%s: undeclared function name.", id);
-                  RETURN0;
-               }
-            }
-         }
-         break;
-      case OP_FIELD:
-         op->type = SLANG_OPER_FIELD;
-         op->a_id = parse_identifier(C);
-         if (op->a_id == SLANG_ATOM_NULL)
-            RETURN0;
-         if (!handle_nary_expression(C, op, &ops, &num_ops, 1))
-            RETURN0;
-         break;
-      case OP_POSTINCREMENT:
-         op->type = SLANG_OPER_POSTINCREMENT;
-         if (!handle_nary_expression(C, op, &ops, &num_ops, 1))
-            RETURN0;
-         break;
-      case OP_POSTDECREMENT:
-         op->type = SLANG_OPER_POSTDECREMENT;
-         if (!handle_nary_expression(C, op, &ops, &num_ops, 1))
-            RETURN0;
-         break;
-      default:
-         RETURN0;
-      }
-   }
-   C->I++;
-
-   slang_operation_destruct(oper);
-   *oper = *ops; /* struct copy */
-   _slang_free(ops);
-
-   return 1;
-}
-
-/* parameter qualifier */
-#define PARAM_QUALIFIER_IN 0
-#define PARAM_QUALIFIER_OUT 1
-#define PARAM_QUALIFIER_INOUT 2
-
-/* function parameter array presence */
-#define PARAMETER_ARRAY_NOT_PRESENT 0
-#define PARAMETER_ARRAY_PRESENT 1
-
-static int
-parse_parameter_declaration(slang_parse_ctx * C, slang_output_ctx * O,
-                            slang_variable * param)
-{
-   int param_qual, precision_qual;
-
-   /* parse and validate the parameter's type qualifiers (there can be
-    * two at most) because not all combinations are valid
-    */
-   if (!parse_type_qualifier(C, &param->type.qualifier))
-      RETURN0;
-
-   param_qual = *C->I++;
-   switch (param_qual) {
-   case PARAM_QUALIFIER_IN:
-      if (param->type.qualifier != SLANG_QUAL_CONST
-          && param->type.qualifier != SLANG_QUAL_NONE) {
-         slang_info_log_error(C->L, "Invalid type qualifier.");
-         RETURN0;
-      }
-      break;
-   case PARAM_QUALIFIER_OUT:
-      if (param->type.qualifier == SLANG_QUAL_NONE)
-         param->type.qualifier = SLANG_QUAL_OUT;
-      else {
-         slang_info_log_error(C->L, "Invalid type qualifier.");
-         RETURN0;
-      }
-      break;
-   case PARAM_QUALIFIER_INOUT:
-      if (param->type.qualifier == SLANG_QUAL_NONE)
-         param->type.qualifier = SLANG_QUAL_INOUT;
-      else {
-         slang_info_log_error(C->L, "Invalid type qualifier.");
-         RETURN0;
-      }
-      break;
-   default:
-      RETURN0;
-   }
-
-   /* parse precision qualifier (lowp, mediump, highp */
-   precision_qual = *C->I++;
-   /* ignored at this time */
-   (void) precision_qual;
-
-   /* parse parameter's type specifier and name */
-   if (!parse_type_specifier(C, O, &param->type.specifier))
-      RETURN0;
-   if (!parse_type_array_size(C, O, &param->type.array_len))
-      RETURN0;
-   param->a_name = parse_identifier(C);
-   if (param->a_name == SLANG_ATOM_NULL)
-      RETURN0;
-
-   /* first-class array
-    */
-   if (param->type.array_len >= 0) {
-      slang_type_specifier p;
-
-      slang_type_specifier_ctr(&p);
-      if (!slang_type_specifier_copy(&p, &param->type.specifier)) {
-         slang_type_specifier_dtr(&p);
-         RETURN0;
-      }
-      if (!convert_to_array(C, param, &p)) {
-         slang_type_specifier_dtr(&p);
-         RETURN0;
-      }
-      slang_type_specifier_dtr(&p);
-      param->array_len = param->type.array_len;
-   }
-
-   /* if the parameter is an array, parse its size (the size must be
-    * explicitly defined
-    */
-   if (*C->I++ == PARAMETER_ARRAY_PRESENT) {
-      slang_type_specifier p;
-
-      if (param->type.array_len >= 0) {
-         slang_info_log_error(C->L, "multi-dimensional arrays not allowed");
-         RETURN0;
-      }
-      slang_type_specifier_ctr(&p);
-      if (!slang_type_specifier_copy(&p, &param->type.specifier)) {
-         slang_type_specifier_dtr(&p);
-         RETURN0;
-      }
-      if (!convert_to_array(C, param, &p)) {
-         slang_type_specifier_dtr(&p);
-         RETURN0;
-      }
-      slang_type_specifier_dtr(&p);
-      if (!parse_array_len(C, O, &param->array_len))
-         RETURN0;
-   }
-
-#if 0
-   /* calculate the parameter size */
-   if (!calculate_var_size(C, O, param))
-      RETURN0;
-#endif
-   /* TODO: allocate the local address here? */
-   return 1;
-}
-
-/* function type */
-#define FUNCTION_ORDINARY 0
-#define FUNCTION_CONSTRUCTOR 1
-#define FUNCTION_OPERATOR 2
-
-/* function parameter */
-#define PARAMETER_NONE 0
-#define PARAMETER_NEXT 1
-
-/* operator type */
-#define OPERATOR_ADDASSIGN 1
-#define OPERATOR_SUBASSIGN 2
-#define OPERATOR_MULASSIGN 3
-#define OPERATOR_DIVASSIGN 4
-/*#define OPERATOR_MODASSIGN 5*/
-/*#define OPERATOR_LSHASSIGN 6*/
-/*#define OPERATOR_RSHASSIGN 7*/
-/*#define OPERATOR_ANDASSIGN 8*/
-/*#define OPERATOR_XORASSIGN 9*/
-/*#define OPERATOR_ORASSIGN 10*/
-#define OPERATOR_LOGICALXOR 11
-/*#define OPERATOR_BITOR 12*/
-/*#define OPERATOR_BITXOR 13*/
-/*#define OPERATOR_BITAND 14*/
-#define OPERATOR_LESS 15
-#define OPERATOR_GREATER 16
-#define OPERATOR_LESSEQUAL 17
-#define OPERATOR_GREATEREQUAL 18
-/*#define OPERATOR_LSHIFT 19*/
-/*#define OPERATOR_RSHIFT 20*/
-#define OPERATOR_MULTIPLY 21
-#define OPERATOR_DIVIDE 22
-/*#define OPERATOR_MODULUS 23*/
-#define OPERATOR_INCREMENT 24
-#define OPERATOR_DECREMENT 25
-#define OPERATOR_PLUS 26
-#define OPERATOR_MINUS 27
-/*#define OPERATOR_COMPLEMENT 28*/
-#define OPERATOR_NOT 29
-
-static const struct
-{
-   unsigned int o_code;
-   const char *o_name;
-} operator_names[] = {
-   {OPERATOR_INCREMENT, "++"},
-   {OPERATOR_ADDASSIGN, "+="},
-   {OPERATOR_PLUS, "+"},
-   {OPERATOR_DECREMENT, "--"},
-   {OPERATOR_SUBASSIGN, "-="},
-   {OPERATOR_MINUS, "-"},
-   {OPERATOR_NOT, "!"},
-   {OPERATOR_MULASSIGN, "*="},
-   {OPERATOR_MULTIPLY, "*"},
-   {OPERATOR_DIVASSIGN, "/="},
-   {OPERATOR_DIVIDE, "/"},
-   {OPERATOR_LESSEQUAL, "<="},
-   /*{ OPERATOR_LSHASSIGN, "<<=" }, */
-   /*{ OPERATOR_LSHIFT, "<<" }, */
-   {OPERATOR_LESS, "<"},
-   {OPERATOR_GREATEREQUAL, ">="},
-   /*{ OPERATOR_RSHASSIGN, ">>=" }, */
-   /*{ OPERATOR_RSHIFT, ">>" }, */
-   {OPERATOR_GREATER, ">"},
-   /*{ OPERATOR_MODASSIGN, "%=" }, */
-   /*{ OPERATOR_MODULUS, "%" }, */
-   /*{ OPERATOR_ANDASSIGN, "&=" }, */
-   /*{ OPERATOR_BITAND, "&" }, */
-   /*{ OPERATOR_ORASSIGN, "|=" }, */
-   /*{ OPERATOR_BITOR, "|" }, */
-   /*{ OPERATOR_COMPLEMENT, "~" }, */
-   /*{ OPERATOR_XORASSIGN, "^=" }, */
-   {OPERATOR_LOGICALXOR, "^^"},
-   /*{ OPERATOR_BITXOR, "^" } */
-};
-
-static slang_atom
-parse_operator_name(slang_parse_ctx * C)
-{
-   unsigned int i;
-
-   for (i = 0; i < sizeof(operator_names) / sizeof(*operator_names); i++) {
-      if (operator_names[i].o_code == (unsigned int) (*C->I)) {
-         slang_atom atom =
-            slang_atom_pool_atom(C->atoms, operator_names[i].o_name);
-         if (atom == SLANG_ATOM_NULL) {
-            slang_info_log_memory(C->L);
-            RETURN0;
-         }
-         C->I++;
-         return atom;
-      }
-   }
-   RETURN0;
-}
-
-
-static int
-parse_function_prototype(slang_parse_ctx * C, slang_output_ctx * O,
-                         slang_function * func)
-{
-   GLuint functype;
-   /* parse function type and name */
-   if (!parse_fully_specified_type(C, O, &func->header.type))
-      RETURN0;
-
-   functype = *C->I++;
-   switch (functype) {
-   case FUNCTION_ORDINARY:
-      func->kind = SLANG_FUNC_ORDINARY;
-      func->header.a_name = parse_identifier(C);
-      if (func->header.a_name == SLANG_ATOM_NULL)
-         RETURN0;
-      break;
-   case FUNCTION_CONSTRUCTOR:
-      func->kind = SLANG_FUNC_CONSTRUCTOR;
-      if (func->header.type.specifier.type == SLANG_SPEC_STRUCT)
-         RETURN0;
-      func->header.a_name =
-         slang_atom_pool_atom(C->atoms,
-                              slang_type_specifier_type_to_string
-                              (func->header.type.specifier.type));
-      if (func->header.a_name == SLANG_ATOM_NULL) {
-         slang_info_log_memory(C->L);
-         RETURN0;
-      }
-      break;
-   case FUNCTION_OPERATOR:
-      func->kind = SLANG_FUNC_OPERATOR;
-      func->header.a_name = parse_operator_name(C);
-      if (func->header.a_name == SLANG_ATOM_NULL)
-         RETURN0;
-      break;
-   default:
-      RETURN0;
-   }
-
-   if (!legal_identifier(func->header.a_name)) {
-      slang_info_log_error(C->L, "illegal function name '%s'",
-                           (char *) func->header.a_name);
-      RETURN0;
-   }
-
-   /* parse function parameters */
-   while (*C->I++ == PARAMETER_NEXT) {
-      slang_variable *p = slang_variable_scope_grow(func->parameters);
-      if (!p) {
-         slang_info_log_memory(C->L);
-         RETURN0;
-      }
-      if (!parse_parameter_declaration(C, O, p))
-         RETURN0;
-   }
-
-   /* if the function returns a value, append a hidden __retVal 'out'
-    * parameter that corresponds to the return value.
-    */
-   if (_slang_function_has_return_value(func)) {
-      slang_variable *p = slang_variable_scope_grow(func->parameters);
-      slang_atom a_retVal = slang_atom_pool_atom(C->atoms, "__retVal");
-      assert(a_retVal);
-      p->a_name = a_retVal;
-      p->type = func->header.type;
-      p->type.qualifier = SLANG_QUAL_OUT;
-   }
-
-   /* function formal parameters and local variables share the same
-    * scope, so save the information about param count in a seperate
-    * place also link the scope to the global variable scope so when a
-    * given identifier is not found here, the search process continues
-    * in the global space
-    */
-   func->param_count = func->parameters->num_variables;
-   func->parameters->outer_scope = O->vars;
-
-   return 1;
-}
-
-static int
-parse_function_definition(slang_parse_ctx * C, slang_output_ctx * O,
-                          slang_function * func)
-{
-   slang_output_ctx o = *O;
-
-   if (!parse_function_prototype(C, O, func))
-      RETURN0;
-
-   /* create function's body operation */
-   func->body = (slang_operation *) _slang_alloc(sizeof(slang_operation));
-   if (func->body == NULL) {
-      slang_info_log_memory(C->L);
-      RETURN0;
-   }
-   if (!slang_operation_construct(func->body)) {
-      _slang_free(func->body);
-      func->body = NULL;
-      slang_info_log_memory(C->L);
-      RETURN0;
-   }
-
-   /* to parse the body the parse context is modified in order to
-    * capture parsed variables into function's local variable scope
-    */
-   C->global_scope = GL_FALSE;
-   o.vars = func->parameters;
-   if (!parse_statement(C, &o, func->body))
-      RETURN0;
-
-   C->global_scope = GL_TRUE;
-   return 1;
-}
-
-static GLboolean
-initialize_global(slang_assemble_ctx * A, slang_variable * var)
-{
-   slang_operation op_id, op_assign;
-   GLboolean result;
-
-   /* construct the left side of assignment */
-   if (!slang_operation_construct(&op_id))
-      return GL_FALSE;
-   op_id.type = SLANG_OPER_IDENTIFIER;
-   op_id.a_id = var->a_name;
-
-   /* put the variable into operation's scope */
-   op_id.locals->variables =
-      (slang_variable **) _slang_alloc(sizeof(slang_variable *));
-   if (op_id.locals->variables == NULL) {
-      slang_operation_destruct(&op_id);
-      return GL_FALSE;
-   }
-   op_id.locals->num_variables = 1;
-   op_id.locals->variables[0] = var;
-
-   /* construct the assignment expression */
-   if (!slang_operation_construct(&op_assign)) {
-      op_id.locals->num_variables = 0;
-      slang_operation_destruct(&op_id);
-      return GL_FALSE;
-   }
-   op_assign.type = SLANG_OPER_ASSIGN;
-   op_assign.children =
-      (slang_operation *) _slang_alloc(2 * sizeof(slang_operation));
-   if (op_assign.children == NULL) {
-      slang_operation_destruct(&op_assign);
-      op_id.locals->num_variables = 0;
-      slang_operation_destruct(&op_id);
-      return GL_FALSE;
-   }
-   op_assign.num_children = 2;
-   op_assign.children[0] = op_id;
-   op_assign.children[1] = *var->initializer;
-
-   result = 1;
-
-   /* carefully destroy the operations */
-   op_assign.num_children = 0;
-   _slang_free(op_assign.children);
-   op_assign.children = NULL;
-   slang_operation_destruct(&op_assign);
-   op_id.locals->num_variables = 0;
-   slang_operation_destruct(&op_id);
-
-   if (!result)
-      return GL_FALSE;
-
-   return GL_TRUE;
-}
-
-/* init declarator list */
-#define DECLARATOR_NONE 0
-#define DECLARATOR_NEXT 1
-
-/* variable declaration */
-#define VARIABLE_NONE 0
-#define VARIABLE_IDENTIFIER 1
-#define VARIABLE_INITIALIZER 2
-#define VARIABLE_ARRAY_EXPLICIT 3
-#define VARIABLE_ARRAY_UNKNOWN 4
-
-
-/**
- * Check if it's OK to re-declare a variable with the given new type.
- * This happens when applying layout qualifiers to gl_FragCoord or
- * (re)setting an array size.
- * If redeclaration is OK, return a pointer to the incoming variable
- * updated with new type info.  Else return NULL;
- */
-static slang_variable *
-redeclare_variable(slang_variable *var, 
-                   const slang_fully_specified_type *type)
-{
-   if (slang_fully_specified_types_compatible(&var->type, type)) {
-      /* replace orig var layout with new layout */
-      var->type.layout = type->layout;
-
-      /* XXX there may be other type updates in the future here */
-
-      return var;
-   }
-   else
-      return NULL;
-}
-
-
-/**
- * Parse the initializer for a variable declaration.
- */
-static int
-parse_init_declarator(slang_parse_ctx * C, slang_output_ctx * O,
-                      const slang_fully_specified_type * type)
-{
-   GET_CURRENT_CONTEXT(ctx); /* a hack */
-   slang_variable *var = NULL, *prevDecl;
-   slang_atom a_name;
-
-   /* empty init declatator (without name, e.g. "float ;") */
-   if (*C->I++ == VARIABLE_NONE)
-      return 1;
-
-   a_name = parse_identifier(C);
-
-   /* check if name is already in this scope */
-   prevDecl = _slang_variable_locate(O->vars, a_name, C->global_scope);
-   if (prevDecl) {
-      /* A var with this name has already been declared.
-       * Check if redeclaring the var with a different type/layout is legal.
-       */
-      if (C->global_scope) {
-         var = redeclare_variable(prevDecl, type);
-      }
-      if (!var) {
-         slang_info_log_error(C->L,
-                   "declaration of '%s' conflicts with previous declaration",
-                   (char *) a_name);
-         RETURN0;
-      }
-   }
-
-   if (!var) {
-      /* make room for a new variable and initialize it */
-      var = slang_variable_scope_grow(O->vars);
-      if (!var) {
-         slang_info_log_memory(C->L);
-         RETURN0;
-      }
-
-      /* copy the declarator type qualifier/etc info, parse the identifier */
-      var->type.qualifier = type->qualifier;
-      var->type.centroid = type->centroid;
-      var->type.precision = type->precision;
-      var->type.specifier = type->specifier;/*new*/
-      var->type.variant = type->variant;
-      var->type.layout = type->layout;
-      var->type.array_len = type->array_len;
-      var->a_name = a_name;
-      if (var->a_name == SLANG_ATOM_NULL)
-         RETURN0;
-   }
-
-   switch (*C->I++) {
-   case VARIABLE_NONE:
-      /* simple variable declarator - just copy the specifier */
-      if (!slang_type_specifier_copy(&var->type.specifier, &type->specifier))
-         RETURN0;
-      break;
-   case VARIABLE_INITIALIZER:
-      /* initialized variable - copy the specifier and parse the expression */
-      if (0 && type->array_len >= 0) {
-         /* The type was something like "float[4]" */
-         convert_to_array(C, var, &type->specifier);
-         var->array_len = type->array_len;
-      }
-      else {
-         if (!slang_type_specifier_copy(&var->type.specifier, &type->specifier))
-            RETURN0;
-      }
-      var->initializer =
-         (slang_operation *) _slang_alloc(sizeof(slang_operation));
-      if (var->initializer == NULL) {
-         slang_info_log_memory(C->L);
-         RETURN0;
-      }
-      if (!slang_operation_construct(var->initializer)) {
-         _slang_free(var->initializer);
-         var->initializer = NULL;
-         slang_info_log_memory(C->L);
-         RETURN0;
-      }
-      if (!parse_expression(C, O, var->initializer))
-         RETURN0;
-      break;
-   case VARIABLE_ARRAY_UNKNOWN:
-      /* unsized array - mark it as array and copy the specifier to
-       * the array element
-       */
-      if (type->array_len >= 0) {
-         slang_info_log_error(C->L, "multi-dimensional arrays not allowed");
-         RETURN0;
-      }
-      if (!convert_to_array(C, var, &type->specifier))
-         return GL_FALSE;
-      break;
-   case VARIABLE_ARRAY_EXPLICIT:
-      if (type->array_len >= 0) {
-         /* the user is trying to do something like: float[2] x[3]; */
-         slang_info_log_error(C->L, "multi-dimensional arrays not allowed");
-         RETURN0;
-      }
-      if (!convert_to_array(C, var, &type->specifier))
-         return GL_FALSE;
-      if (!parse_array_len(C, O, &var->array_len))
-         return GL_FALSE;
-      break;
-   default:
-      RETURN0;
-   }
-
-   /* allocate global address space for a variable with a known size */
-   if (C->global_scope
-       && !(var->type.specifier.type == SLANG_SPEC_ARRAY
-            && var->array_len == 0)) {
-      if (!calculate_var_size(C, O, var))
-         return GL_FALSE;
-   }
-
-   /* emit code for global var decl */
-   if (C->global_scope) {
-      slang_assemble_ctx A;
-      memset(&A, 0, sizeof(slang_assemble_ctx));
-      A.allow_uniform_initializers = C->version > 110;
-      A.atoms = C->atoms;
-      A.space.funcs = O->funs;
-      A.space.structs = O->structs;
-      A.space.vars = O->vars;
-      A.program = O->program;
-      A.pragmas = O->pragmas;
-      A.vartable = O->vartable;
-      A.log = C->L;
-      A.curFuncEndLabel = NULL;
-      A.EmitContReturn = ctx->Shader.EmitContReturn;
-      if (!_slang_codegen_global_variable(&A, var, C->type))
-         RETURN0;
-   }
-
-   /* initialize global variable */
-   if (C->global_scope) {
-      if (var->initializer != NULL) {
-         slang_assemble_ctx A;
-         memset(&A, 0, sizeof(slang_assemble_ctx));
-         A.allow_uniform_initializers = C->version > 110;
-         A.atoms = C->atoms;
-         A.space.funcs = O->funs;
-         A.space.structs = O->structs;
-         A.space.vars = O->vars;
-         if (!initialize_global(&A, var))
-            RETURN0;
-      }
-   }
-
-   if (var->type.qualifier == SLANG_QUAL_FIXEDINPUT &&
-       var->a_name == slang_atom_pool_atom(C->atoms, "gl_FragCoord")) {
-      /* set the program's PixelCenterInteger, OriginUpperLeft fields */
-      struct gl_fragment_program *fragProg =
-         (struct gl_fragment_program *) O->program;
-
-      if (var->type.layout & SLANG_LAYOUT_UPPER_LEFT_BIT) {
-         fragProg->OriginUpperLeft = GL_TRUE;
-      }
-      if (var->type.layout & SLANG_LAYOUT_PIXEL_CENTER_INTEGER_BIT) {
-         fragProg->PixelCenterInteger = GL_TRUE;
-      }
-   }
-
-   return 1;
-}
-
-/**
- * Parse a list of variable declarations.  Each variable may have an
- * initializer.
- */
-static int
-parse_init_declarator_list(slang_parse_ctx * C, slang_output_ctx * O)
-{
-   slang_fully_specified_type type;
-
-   /* parse the fully specified type, common to all declarators */
-   if (!slang_fully_specified_type_construct(&type))
-      RETURN0;
-   if (!parse_fully_specified_type(C, O, &type)) {
-      slang_fully_specified_type_destruct(&type);
-      RETURN0;
-   }
-
-   /* parse declarators, pass-in the parsed type */
-   do {
-      if (!parse_init_declarator(C, O, &type)) {
-         slang_fully_specified_type_destruct(&type);
-         RETURN0;
-      }
-   }
-   while (*C->I++ == DECLARATOR_NEXT);
-
-   slang_fully_specified_type_destruct(&type);
-   return 1;
-}
-
-
-/**
- * Parse a function definition or declaration.
- * \param C  parsing context
- * \param O  output context
- * \param definition if non-zero expect a definition, else a declaration
- * \param parsed_func_ret  returns the parsed function
- * \return GL_TRUE if success, GL_FALSE if failure
- */
-static GLboolean
-parse_function(slang_parse_ctx * C, slang_output_ctx * O, int definition,
-               slang_function ** parsed_func_ret)
-{
-   slang_function parsed_func, *found_func;
-
-   /* parse function definition/declaration */
-   if (!slang_function_construct(&parsed_func))
-      return GL_FALSE;
-   if (definition) {
-      if (!parse_function_definition(C, O, &parsed_func)) {
-         slang_function_destruct(&parsed_func);
-         return GL_FALSE;
-      }
-   }
-   else {
-      if (!parse_function_prototype(C, O, &parsed_func)) {
-         slang_function_destruct(&parsed_func);
-         return GL_FALSE;
-      }
-   }
-
-   /* find a function with a prototype matching the parsed one - only
-    * the current scope is being searched to allow built-in function
-    * overriding
-    */
-   found_func = slang_function_scope_find(O->funs, &parsed_func, 0);
-   if (found_func == NULL) {
-      /* New function, add it to the function list */
-      O->funs->functions =
-         (slang_function *) _slang_realloc(O->funs->functions,
-                                           O->funs->num_functions
-                                           * sizeof(slang_function),
-                                           (O->funs->num_functions + 1)
-                                           * sizeof(slang_function));
-      if (O->funs->functions == NULL) {
-         /* Make sure that there are no functions marked, as the
-          * allocation is currently NULL, in order to avoid
-          * a potental segfault as we clean up later.
-          */
-         O->funs->num_functions = 0;
-
-         slang_info_log_memory(C->L);
-         slang_function_destruct(&parsed_func);
-         return GL_FALSE;
-      }
-      O->funs->functions[O->funs->num_functions] = parsed_func;
-      O->funs->num_functions++;
-
-      /* return the newly parsed function */
-      *parsed_func_ret = &O->funs->functions[O->funs->num_functions - 1];
-   }
-   else {
-      /* previously defined or declared */
-      /* TODO: check function return type qualifiers and specifiers */
-      if (definition) {
-         if (found_func->body != NULL) {
-            slang_info_log_error(C->L, "%s: function already has a body.",
-                                 slang_atom_pool_id(C->atoms,
-                                                    parsed_func.header.
-                                                    a_name));
-            slang_function_destruct(&parsed_func);
-            return GL_FALSE;
-         }
-
-         /* destroy the existing function declaration and replace it
-          * with the new one
-          */
-         slang_function_destruct(found_func);
-         *found_func = parsed_func;
-      }
-      else {
-         /* another declaration of the same function prototype - ignore it */
-         slang_function_destruct(&parsed_func);
-      }
-
-      /* return the found function */
-      *parsed_func_ret = found_func;
-   }
-
-   return GL_TRUE;
-}
-
-/* declaration */
-#define DECLARATION_FUNCTION_PROTOTYPE 1
-#define DECLARATION_INIT_DECLARATOR_LIST 2
-
-static int
-parse_declaration(slang_parse_ctx * C, slang_output_ctx * O)
-{
-   switch (*C->I++) {
-   case DECLARATION_INIT_DECLARATOR_LIST:
-      if (!parse_init_declarator_list(C, O))
-         RETURN0;
-      break;
-   case DECLARATION_FUNCTION_PROTOTYPE:
-      {
-         slang_function *dummy_func;
-
-         if (!parse_function(C, O, 0, &dummy_func))
-            RETURN0;
-      }
-      break;
-   default:
-      RETURN0;
-   }
-   return 1;
-}
-
-static int
-parse_default_precision(slang_parse_ctx * C, slang_output_ctx * O)
-{
-   int precision, type;
-
-   if (!O->allow_precision) {
-      slang_info_log_error(C->L, "syntax error at \"precision\"");
-      RETURN0;
-   }
-
-   precision = *C->I++;
-   switch (precision) {
-   case PRECISION_LOW:
-   case PRECISION_MEDIUM:
-   case PRECISION_HIGH:
-      /* OK */
-      break;
-   default:
-      _mesa_problem(NULL, "unexpected precision %d at %s:%d\n",
-                    precision, __FILE__, __LINE__);
-      RETURN0;
-   }
-
-   type = *C->I++;
-   switch (type) {
-   case TYPE_SPECIFIER_FLOAT:
-   case TYPE_SPECIFIER_INT:
-   case TYPE_SPECIFIER_SAMPLER1D:
-   case TYPE_SPECIFIER_SAMPLER2D:
-   case TYPE_SPECIFIER_SAMPLER3D:
-   case TYPE_SPECIFIER_SAMPLERCUBE:
-   case TYPE_SPECIFIER_SAMPLER1DSHADOW:
-   case TYPE_SPECIFIER_SAMPLER2DSHADOW:
-   case TYPE_SPECIFIER_SAMPLER2DRECT:
-   case TYPE_SPECIFIER_SAMPLER2DRECTSHADOW:
-   case TYPE_SPECIFIER_SAMPLER_1D_ARRAY:
-   case TYPE_SPECIFIER_SAMPLER_2D_ARRAY:
-   case TYPE_SPECIFIER_SAMPLER_1D_ARRAY_SHADOW:
-   case TYPE_SPECIFIER_SAMPLER_2D_ARRAY_SHADOW:
-      /* OK */
-      break;
-   default:
-      _mesa_problem(NULL, "unexpected type %d at %s:%d\n",
-                    type, __FILE__, __LINE__);
-      RETURN0;
-   }
-
-   assert(type < TYPE_SPECIFIER_COUNT);
-   O->default_precision[type] = precision;
-
-   return 1;
-}
-
-
-/**
- * Initialize the default precision for all types.
- * XXX this info isn't used yet.
- */
-static void
-init_default_precision(slang_output_ctx *O, slang_unit_type type)
-{
-   GLuint i;
-   for (i = 0; i < TYPE_SPECIFIER_COUNT; i++) {
-#if FEATURE_es2_glsl
-      O->default_precision[i] = PRECISION_LOW;
-#else
-      O->default_precision[i] = PRECISION_HIGH;
-#endif
-   }
-
-   if (type == SLANG_UNIT_VERTEX_SHADER) {
-      O->default_precision[TYPE_SPECIFIER_FLOAT] = PRECISION_HIGH;
-      O->default_precision[TYPE_SPECIFIER_INT] = PRECISION_HIGH;
-   }
-   else {
-      O->default_precision[TYPE_SPECIFIER_INT] = PRECISION_MEDIUM;
-   }
-}
-
-
-static int
-parse_invariant(slang_parse_ctx * C, slang_output_ctx * O)
-{
-   if (O->allow_invariant) {
-      slang_atom *a = parse_identifier(C);
-      /* XXX not doing anything with this var yet */
-      /*printf("ID: %s\n", (char*) a);*/
-      return a ? 1 : 0;
-   }
-   else {
-      slang_info_log_error(C->L, "syntax error at \"invariant\"");
-      RETURN0;
-   }
-}
-      
-
-/* external declaration or default precision specifier */
-#define EXTERNAL_NULL 0
-#define EXTERNAL_FUNCTION_DEFINITION 1
-#define EXTERNAL_DECLARATION 2
-#define DEFAULT_PRECISION 3
-#define INVARIANT_STMT 4
-
-
-static GLboolean
-parse_code_unit(slang_parse_ctx * C, slang_code_unit * unit,
-                struct gl_shader *shader)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   slang_output_ctx o;
-   GLboolean success;
-   GLuint maxRegs;
-   slang_function *mainFunc = NULL;
-
-   if (unit->type == SLANG_UNIT_FRAGMENT_BUILTIN ||
-       unit->type == SLANG_UNIT_FRAGMENT_SHADER) {
-      maxRegs = ctx->Const.FragmentProgram.MaxTemps;
-   }
-   else {
-      assert(unit->type == SLANG_UNIT_VERTEX_BUILTIN ||
-             unit->type == SLANG_UNIT_VERTEX_SHADER);
-      maxRegs = ctx->Const.VertexProgram.MaxTemps;
-   }
-
-   /* setup output context */
-   o.funs = &unit->funs;
-   o.structs = &unit->structs;
-   o.vars = &unit->vars;
-   o.program = shader ? shader->Program : NULL;
-   o.pragmas = shader ? &shader->Pragmas : NULL;
-   o.vartable = _slang_new_var_table(maxRegs);
-   _slang_push_var_table(o.vartable);
-
-   /* allow 'invariant' keyword? */
-#if FEATURE_es2_glsl
-   o.allow_invariant = GL_TRUE;
-#else
-   o.allow_invariant = (C->version >= 120) ? GL_TRUE : GL_FALSE;
-#endif
-
-   /* allow 'centroid' keyword? */
-   o.allow_centroid = (C->version >= 120) ? GL_TRUE : GL_FALSE;
-
-   /* allow 'lowp/mediump/highp' keywords? */
-#if FEATURE_es2_glsl
-   o.allow_precision = GL_TRUE;
-#else
-   o.allow_precision = (C->version >= 120) ? GL_TRUE : GL_FALSE;
-#endif
-   init_default_precision(&o, unit->type);
-
-   /* allow 'float[]' keyword? */
-   o.allow_array_types = (C->version >= 120) ? GL_TRUE : GL_FALSE;
-
-   /* parse individual functions and declarations */
-   while (*C->I != EXTERNAL_NULL) {
-      switch (*C->I++) {
-      case EXTERNAL_FUNCTION_DEFINITION:
-         {
-            slang_function *func;
-            success = parse_function(C, &o, 1, &func);
-            if (success && strcmp((char *) func->header.a_name, "main") == 0) {
-               /* found main() */
-               mainFunc = func;
-            }
-         }
-         break;
-      case EXTERNAL_DECLARATION:
-         success = parse_declaration(C, &o);
-         break;
-      case DEFAULT_PRECISION:
-         success = parse_default_precision(C, &o);
-         break;
-      case INVARIANT_STMT:
-         success = parse_invariant(C, &o);
-         break;
-      default:
-         success = GL_FALSE;
-      }
-
-      if (!success) {
-         /* xxx free codegen */
-         _slang_pop_var_table(o.vartable);
-         return GL_FALSE;
-      }
-   }
-   C->I++;
-
-   if (mainFunc) {
-      /* assemble (generate code) for main() */
-      slang_assemble_ctx A;
-      memset(&A, 0, sizeof(slang_assemble_ctx));
-      A.atoms = C->atoms;
-      A.space.funcs = o.funs;
-      A.space.structs = o.structs;
-      A.space.vars = o.vars;
-      A.program = o.program;
-      A.pragmas = &shader->Pragmas;
-      A.vartable = o.vartable;
-      A.EmitContReturn = ctx->Shader.EmitContReturn;
-      A.log = C->L;
-      A.allow_uniform_initializers = C->version > 110;
-
-      /* main() takes no parameters */
-      if (mainFunc->param_count > 0) {
-         slang_info_log_error(A.log, "main() takes no arguments");
-         return GL_FALSE;
-      }
-
-      _slang_codegen_function(&A, mainFunc);
-
-      shader->Main = GL_TRUE; /* this shader defines main() */
-
-      shader->UnresolvedRefs = A.UnresolvedRefs;
-   }
-
-   _slang_pop_var_table(o.vartable);
-   _slang_delete_var_table(o.vartable);
-
-   return GL_TRUE;
-}
-
-static GLboolean
-compile_binary(const unsigned char * prod, slang_code_unit * unit,
-               GLuint version,
-               slang_unit_type type, slang_info_log * infolog,
-               slang_code_unit * builtin, slang_code_unit * downlink,
-               struct gl_shader *shader)
-{
-   slang_parse_ctx C;
-
-   unit->type = type;
-
-   /* setup parse context */
-   C.I = prod;
-   C.L = infolog;
-   C.parsing_builtin = (builtin == NULL);
-   C.global_scope = GL_TRUE;
-   C.atoms = &unit->object->atompool;
-   C.type = type;
-   C.version = version;
-
-   if (!check_revision(&C))
-      return GL_FALSE;
-
-   if (downlink != NULL) {
-      unit->vars.outer_scope = &downlink->vars;
-      unit->funs.outer_scope = &downlink->funs;
-      unit->structs.outer_scope = &downlink->structs;
-   }
-
-   /* parse translation unit */
-   return parse_code_unit(&C, unit, shader);
-}
-
-static GLboolean
-compile_with_grammar(const char *source,
-                     slang_code_unit *unit,
-                     slang_unit_type type,
-                     slang_info_log *infolog,
-                     slang_code_unit *builtin,
-                     struct gl_shader *shader,
-                     struct gl_sl_pragmas *pragmas,
-                     unsigned int shader_type,
-                     unsigned int parsing_builtin)
-{
-   struct sl_pp_purify_options options;
-   struct sl_pp_context *context;
-   unsigned char *prod;
-   GLuint size;
-   unsigned int version;
-   unsigned int maxVersion;
-   int result;
-   char errmsg[200] = "";
-
-   assert(shader_type == 1 || shader_type == 2);
-
-   memset(&options, 0, sizeof(options));
-
-   context = sl_pp_context_create(source, &options);
-   if (!context) {
-      slang_info_log_error(infolog, "out of memory");
-      return GL_FALSE;
-   }
-
-   if (sl_pp_version(context, &version)) {
-      slang_info_log_error(infolog, "%s", sl_pp_context_error_message(context));
-      sl_pp_context_destroy(context);
-      return GL_FALSE;
-   }
-
-   if (sl_pp_context_add_extension(context, "GL_ARB_draw_buffers") ||
-       sl_pp_context_add_extension(context, "GL_ARB_texture_rectangle")) {
-      slang_info_log_error(infolog, "%s", sl_pp_context_error_message(context));
-      sl_pp_context_destroy(context);
-      return GL_FALSE;
-   }
-
-   if (type == SLANG_UNIT_FRAGMENT_SHADER) {
-      sl_pp_context_add_extension(context, "GL_ARB_fragment_coord_conventions");
-   }
-
-
-#if FEATURE_es2_glsl
-   if (sl_pp_context_add_predefined(context, "GL_ES", "1") ||
-       sl_pp_context_add_predefined(context, "GL_FRAGMENT_PRECISION_HIGH", "1")) {
-      slang_info_log_error(infolog, "%s", sl_pp_context_error_message(context));
-      sl_pp_context_destroy(context);
-      return GL_FALSE;
-   }
-#endif
-
-#if FEATURE_ARB_shading_language_120
-   maxVersion = 120;
-#elif FEATURE_es2_glsl
-   maxVersion = 100;
-#else
-   maxVersion = 110;
-#endif
-
-   if (version > maxVersion ||
-       (version != 100 && version != 110 && version != 120)) {
-      slang_info_log_error(infolog,
-                           "language version %.2f is not supported.",
-                           version * 0.01);
-      sl_pp_context_destroy(context);
-      return GL_FALSE;
-   }
-
-   /* Finally check the syntax and generate its binary representation. */
-   result = sl_cl_compile(context,
-                          shader_type,
-                          parsing_builtin,
-                          &prod,
-                          &size,
-                          errmsg,
-                          sizeof(errmsg));
-
-   sl_pp_context_destroy(context);
-
-   if (result) {
-      /*GLint pos;*/
-
-      slang_info_log_error(infolog, errmsg);
-      /* syntax error (possibly in library code) */
-#if 0
-      {
-         int line, col;
-         char *s;
-         s = (char *) _mesa_find_line_column((const GLubyte *) source,
-                                             (const GLubyte *) source + pos,
-                                             &line, &col);
-         printf("Error on line %d, col %d: %s\n", line, col, s);
-      }
-#endif
-      return GL_FALSE;
-   }
-
-   /* Syntax is okay - translate it to internal representation. */
-   if (!compile_binary(prod, unit, version, type, infolog, builtin,
-                       &builtin[SLANG_BUILTIN_TOTAL - 1],
-                       shader)) {
-      free(prod);
-      return GL_FALSE;
-   }
-   free(prod);
-   return GL_TRUE;
-}
-
-static const unsigned char slang_core_gc[] = {
-#include "library/slang_core_gc.h"
-};
-
-static const unsigned char slang_120_core_gc[] = {
-#include "library/slang_120_core_gc.h"
-};
-
-static const unsigned char slang_120_fragment_gc[] = {
-#include "library/slang_builtin_120_fragment_gc.h"
-};
-
-static const unsigned char slang_common_builtin_gc[] = {
-#include "library/slang_common_builtin_gc.h"
-};
-
-static const unsigned char slang_fragment_builtin_gc[] = {
-#include "library/slang_fragment_builtin_gc.h"
-};
-
-static const unsigned char slang_vertex_builtin_gc[] = {
-#include "library/slang_vertex_builtin_gc.h"
-};
-
-static GLboolean
-compile_object(const char *source,
-               slang_code_object *object,
-               slang_unit_type type,
-               slang_info_log *infolog,
-               struct gl_shader *shader,
-               struct gl_sl_pragmas *pragmas)
-{
-   slang_code_unit *builtins = NULL;
-   GLuint base_version = 110;
-   unsigned int shader_type;
-   unsigned int parsing_builtin;
-
-   /* set shader type - the syntax is slightly different for different shaders */
-   if (type == SLANG_UNIT_FRAGMENT_SHADER || type == SLANG_UNIT_FRAGMENT_BUILTIN) {
-      shader_type = 1;
-   } else {
-      shader_type = 2;
-   }
-
-   /* enable language extensions */
-   parsing_builtin = 1;
-
-   /* if parsing user-specified shader, load built-in library */
-   if (type == SLANG_UNIT_FRAGMENT_SHADER || type == SLANG_UNIT_VERTEX_SHADER) {
-      /* compile core functionality first */
-      if (!compile_binary(slang_core_gc,
-                          &object->builtin[SLANG_BUILTIN_CORE],
-                          base_version,
-                          SLANG_UNIT_FRAGMENT_BUILTIN, infolog,
-                          NULL, NULL, NULL))
-         return GL_FALSE;
-
-#if FEATURE_ARB_shading_language_120
-      if (!compile_binary(slang_120_core_gc,
-                          &object->builtin[SLANG_BUILTIN_120_CORE],
-                          120,
-                          SLANG_UNIT_FRAGMENT_BUILTIN, infolog,
-                          NULL, &object->builtin[SLANG_BUILTIN_CORE], NULL))
-         return GL_FALSE;
-#endif
-
-      /* compile common functions and variables, link to core */
-      if (!compile_binary(slang_common_builtin_gc,
-                          &object->builtin[SLANG_BUILTIN_COMMON],
-#if FEATURE_ARB_shading_language_120
-                          120,
-#else
-                          base_version,
-#endif
-                          SLANG_UNIT_FRAGMENT_BUILTIN, infolog, NULL,
-#if FEATURE_ARB_shading_language_120
-                          &object->builtin[SLANG_BUILTIN_120_CORE],
-#else
-                          &object->builtin[SLANG_BUILTIN_CORE],
-#endif
-                          NULL))
-         return GL_FALSE;
-
-      /* compile target-specific functions and variables, link to common */
-      if (type == SLANG_UNIT_FRAGMENT_SHADER) {
-         if (!compile_binary(slang_fragment_builtin_gc,
-                             &object->builtin[SLANG_BUILTIN_TARGET],
-                             base_version,
-                             SLANG_UNIT_FRAGMENT_BUILTIN, infolog, NULL,
-                             &object->builtin[SLANG_BUILTIN_COMMON], NULL))
-            return GL_FALSE;
-#if FEATURE_ARB_shading_language_120
-         if (!compile_binary(slang_120_fragment_gc,
-                             &object->builtin[SLANG_BUILTIN_TARGET],
-                             120,
-                             SLANG_UNIT_FRAGMENT_BUILTIN, infolog, NULL,
-                             &object->builtin[SLANG_BUILTIN_COMMON], NULL))
-            return GL_FALSE;
-#endif
-      }
-      else if (type == SLANG_UNIT_VERTEX_SHADER) {
-         if (!compile_binary(slang_vertex_builtin_gc,
-                             &object->builtin[SLANG_BUILTIN_TARGET],
-                             base_version,
-                             SLANG_UNIT_VERTEX_BUILTIN, infolog, NULL,
-                             &object->builtin[SLANG_BUILTIN_COMMON], NULL))
-            return GL_FALSE;
-      }
-
-      /* disable language extensions */
-      parsing_builtin = 0;
-
-      builtins = object->builtin;
-   }
-
-   /* compile the actual shader - pass-in built-in library for external shader */
-   return compile_with_grammar(source,
-                               &object->unit,
-                               type,
-                               infolog,
-                               builtins,
-                               shader,
-                               pragmas,
-                               shader_type,
-                               parsing_builtin);
-}
-
-
-GLboolean
-_slang_compile(GLcontext *ctx, struct gl_shader *shader)
-{
-   GLboolean success;
-   slang_info_log info_log;
-   slang_code_object obj;
-   slang_unit_type type;
-   GLenum progTarget;
-
-   if (shader->Type == GL_VERTEX_SHADER) {
-      type = SLANG_UNIT_VERTEX_SHADER;
-   }
-   else {
-      assert(shader->Type == GL_FRAGMENT_SHADER);
-      type = SLANG_UNIT_FRAGMENT_SHADER;
-   }
-
-   if (!shader->Source)
-      return GL_FALSE;
-
-   ctx->Shader.MemPool = _slang_new_mempool(1024*1024);
-
-   shader->Main = GL_FALSE;
-
-   /* free the shader's old instructions, etc */
-   _mesa_reference_program(ctx, &shader->Program, NULL);
-
-   /* allocate new GPU program, parameter lists, etc. */
-   if (shader->Type == GL_VERTEX_SHADER)
-      progTarget = GL_VERTEX_PROGRAM_ARB;
-   else
-      progTarget = GL_FRAGMENT_PROGRAM_ARB;
-   shader->Program = ctx->Driver.NewProgram(ctx, progTarget, 1);
-   shader->Program->Parameters = _mesa_new_parameter_list();
-   shader->Program->Varying = _mesa_new_parameter_list();
-   shader->Program->Attributes = _mesa_new_parameter_list();
-
-   slang_info_log_construct(&info_log);
-   _slang_code_object_ctr(&obj);
-
-   success = compile_object(shader->Source,
-                            &obj,
-                            type,
-                            &info_log,
-                            shader,
-                            &shader->Pragmas);
-
-   /* free shader's prev info log */
-   if (shader->InfoLog) {
-      free(shader->InfoLog);
-      shader->InfoLog = NULL;
-   }
-
-   if (info_log.text) {
-      /* copy info-log string to shader object */
-      shader->InfoLog = _mesa_strdup(info_log.text);
-   }
-
-   if (info_log.error_flag) {
-      success = GL_FALSE;
-   }
-
-   slang_info_log_destruct(&info_log);
-   _slang_code_object_dtr(&obj);
-
-   _slang_delete_mempool((slang_mempool *) ctx->Shader.MemPool);
-   ctx->Shader.MemPool = NULL;
-
-   /* remove any reads of output registers */
-#if 0
-   printf("Pre-remove output reads:\n");
-   _mesa_print_program(shader->Program);
-#endif
-   _mesa_remove_output_reads(shader->Program, PROGRAM_OUTPUT);
-   if (shader->Type == GL_VERTEX_SHADER) {
-      /* and remove writes to varying vars in vertex programs */
-      _mesa_remove_output_reads(shader->Program, PROGRAM_VARYING);
-   }
-#if 0
-   printf("Post-remove output reads:\n");
-   _mesa_print_program(shader->Program);
-#endif
-
-   shader->CompileStatus = success;
-
-   if (success) {
-      if (shader->Pragmas.Optimize &&
-          (ctx->Shader.Flags & GLSL_NO_OPT) == 0) {
-         _mesa_optimize_program(ctx, shader->Program);
-      }
-      if ((ctx->Shader.Flags & GLSL_NOP_VERT) &&
-          shader->Program->Target == GL_VERTEX_PROGRAM_ARB) {
-         _mesa_nop_vertex_program(ctx,
-                                  (struct gl_vertex_program *) shader->Program);
-      }
-      if ((ctx->Shader.Flags & GLSL_NOP_FRAG) &&
-          shader->Program->Target == GL_FRAGMENT_PROGRAM_ARB) {
-         _mesa_nop_fragment_program(ctx,
-                                (struct gl_fragment_program *) shader->Program);
-      }
-   }
-
-   if (ctx->Shader.Flags & GLSL_LOG) {
-      _mesa_write_shader_to_file(shader);
-   }
-
-   return success;
-}
-
diff --git a/mesalib/src/mesa/shader/slang/slang_compile.h b/mesalib/src/mesa/shader/slang/slang_compile.h
deleted file mode 100644
index 7fb549d33..000000000
--- a/mesalib/src/mesa/shader/slang/slang_compile.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5
- *
- * Copyright (C) 2005-2006  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#if !defined SLANG_COMPILE_H
-#define SLANG_COMPILE_H
-
-#include "main/imports.h"
-#include "main/mtypes.h"
-#include "slang_typeinfo.h"
-#include "slang_compile_variable.h"
-#include "slang_compile_struct.h"
-#include "slang_compile_operation.h"
-#include "slang_compile_function.h"
-
-#if defined __cplusplus
-extern "C" {
-#endif
-
-typedef struct slang_name_space_
-{
-   struct slang_function_scope_ *funcs;
-   struct slang_struct_scope_ *structs;
-   struct slang_variable_scope_ *vars;
-} slang_name_space;
-
-typedef enum slang_unit_type_
-{
-   SLANG_UNIT_FRAGMENT_SHADER,
-   SLANG_UNIT_VERTEX_SHADER,
-   SLANG_UNIT_FRAGMENT_BUILTIN,
-   SLANG_UNIT_VERTEX_BUILTIN
-} slang_unit_type;
-
-
-typedef struct slang_code_unit_
-{
-   slang_variable_scope vars;
-   slang_function_scope funs;
-   slang_struct_scope structs;
-   slang_unit_type type;
-   struct slang_code_object_ *object;
-} slang_code_unit;
-
-
-extern GLvoid
-_slang_code_unit_ctr (slang_code_unit *, struct slang_code_object_ *);
-
-extern GLvoid
-_slang_code_unit_dtr (slang_code_unit *);
-
-#define SLANG_BUILTIN_CORE   0
-#define SLANG_BUILTIN_120_CORE   1
-#define SLANG_BUILTIN_COMMON 2
-#define SLANG_BUILTIN_TARGET 3
-
-#define SLANG_BUILTIN_TOTAL  4
-
-typedef struct slang_code_object_
-{
-   slang_code_unit builtin[SLANG_BUILTIN_TOTAL];
-   slang_code_unit unit;
-   slang_atom_pool atompool;
-} slang_code_object;
-
-extern GLvoid
-_slang_code_object_ctr (slang_code_object *);
-
-extern GLvoid
-_slang_code_object_dtr (slang_code_object *);
-
-extern GLboolean
-_slang_compile (GLcontext *ctx, struct gl_shader *shader);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
diff --git a/mesalib/src/mesa/shader/slang/slang_compile_function.c b/mesalib/src/mesa/shader/slang/slang_compile_function.c
deleted file mode 100644
index 4dd885176..000000000
--- a/mesalib/src/mesa/shader/slang/slang_compile_function.c
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5
- *
- * Copyright (C) 2005-2006  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * \file slang_compile_function.c
- * slang front-end compiler
- * \author Michal Krol
- */
-
-#include "main/imports.h"
-#include "slang_compile.h"
-#include "slang_mem.h"
-
-
-int
-slang_function_construct(slang_function * func)
-{
-   func->kind = SLANG_FUNC_ORDINARY;
-   if (!slang_variable_construct(&func->header))
-      return 0;
-
-   func->parameters = (slang_variable_scope *)
-      _slang_alloc(sizeof(slang_variable_scope));
-   if (func->parameters == NULL) {
-      slang_variable_destruct(&func->header);
-      return 0;
-   }
-
-   _slang_variable_scope_ctr(func->parameters);
-   func->param_count = 0;
-   func->body = NULL;
-   return 1;
-}
-
-void
-slang_function_destruct(slang_function * func)
-{
-   slang_variable_destruct(&func->header);
-   slang_variable_scope_destruct(func->parameters);
-   _slang_free(func->parameters);
-   if (func->body != NULL) {
-      slang_operation_destruct(func->body);
-      _slang_free(func->body);
-   }
-}
-
-
-slang_function *
-slang_function_new(slang_function_kind kind)
-{
-   slang_function *fun = (slang_function *)
-      _slang_alloc(sizeof(slang_function));
-   if (fun) {
-      slang_function_construct(fun);
-      fun->kind = kind;
-   }
-   return fun;
-}
-
-
-/*
- * slang_function_scope
- */
-
-GLvoid
-_slang_function_scope_ctr(slang_function_scope * self)
-{
-   self->functions = NULL;
-   self->num_functions = 0;
-   self->outer_scope = NULL;
-}
-
-void
-slang_function_scope_destruct(slang_function_scope * scope)
-{
-   unsigned int i;
-
-   for (i = 0; i < scope->num_functions; i++)
-      slang_function_destruct(scope->functions + i);
-   _slang_free(scope->functions);
-}
-
-
-/**
- * Does this function have a non-void return value?
- */
-GLboolean
-_slang_function_has_return_value(const slang_function *fun)
-{
-   return fun->header.type.specifier.type != SLANG_SPEC_VOID;
-}
-
-
-/**
- * Search a list of functions for a particular function by name.
- * \param funcs  the list of functions to search
- * \param a_name  the name to search for
- * \param all_scopes  if non-zero, search containing scopes too.
- * \return pointer to found function, or NULL.
- */
-int
-slang_function_scope_find_by_name(slang_function_scope * funcs,
-                                  slang_atom a_name, int all_scopes)
-{
-   unsigned int i;
-
-   for (i = 0; i < funcs->num_functions; i++)
-      if (a_name == funcs->functions[i].header.a_name)
-         return 1;
-   if (all_scopes && funcs->outer_scope != NULL)
-      return slang_function_scope_find_by_name(funcs->outer_scope, a_name, 1);
-   return 0;
-}
-
-
-/**
- * Search a list of functions for a particular function (for implementing
- * function calls.  Matching is done by first comparing the function's name,
- * then the function's parameter list.
- *
- * \param funcs  the list of functions to search
- * \param fun  the function to search for
- * \param all_scopes  if non-zero, search containing scopes too.
- * \return pointer to found function, or NULL.
- */
-slang_function *
-slang_function_scope_find(slang_function_scope * funcs, slang_function * fun,
-                          int all_scopes)
-{
-   unsigned int i;
-
-   for (i = 0; i < funcs->num_functions; i++) {
-      slang_function *f = &funcs->functions[i];
-      const GLuint haveRetValue = 0;
-#if 0
-         = (f->header.type.specifier.type != SLANG_SPEC_VOID);
-#endif
-      unsigned int j;
-
-      /*
-      printf("Compare name %s to %s  (ret %u, %d, %d)\n",
-             (char *) fun->header.a_name, (char *) f->header.a_name,
-             haveRetValue,
-             fun->param_count, f->param_count);
-      */
-
-      if (fun->header.a_name != f->header.a_name)
-         continue;
-      if (fun->param_count != f->param_count)
-         continue;
-      for (j = haveRetValue; j < fun->param_count; j++) {
-         if (!slang_type_specifier_equal
-             (&fun->parameters->variables[j]->type.specifier,
-              &f->parameters->variables[j]->type.specifier))
-            break;
-      }
-      if (j == fun->param_count) {
-         /*
-         printf("Found match\n");
-         */
-         return f;
-      }
-   }
-   /*
-   printf("Not found\n");
-   */
-   if (all_scopes && funcs->outer_scope != NULL)
-      return slang_function_scope_find(funcs->outer_scope, fun, 1);
-   return NULL;
-}
-
-
-/**
- * Lookup a function according to name and parameter count/types.
- */
-slang_function *
-_slang_function_locate(const slang_function_scope * funcs, slang_atom a_name,
-                       slang_operation * args, GLuint num_args,
-                       const slang_name_space * space, slang_atom_pool * atoms,
-                       slang_info_log *log, GLboolean *error)
-{
-   slang_typeinfo arg_ti[100];
-   GLuint i;
-
-   *error = GL_FALSE;
-
-   /* determine type of each argument */
-   assert(num_args < 100);
-   for (i = 0; i < num_args; i++) {
-      if (!slang_typeinfo_construct(&arg_ti[i]))
-         return NULL;
-      if (!_slang_typeof_operation(&args[i], space, &arg_ti[i], atoms, log)) {
-         return NULL;
-      }
-   }
-
-   /* loop over function scopes */
-   while (funcs) {
-
-      /* look for function with matching name and argument/param types */
-      for (i = 0; i < funcs->num_functions; i++) {
-         slang_function *f = &funcs->functions[i];
-         const GLuint haveRetValue = _slang_function_has_return_value(f);
-         GLuint j;
-
-         if (a_name != f->header.a_name)
-            continue;
-         if (f->param_count - haveRetValue != num_args)
-            continue;
-
-         /* compare parameter / argument types */
-         for (j = 0; j < num_args; j++) {
-            if (!slang_type_specifier_compatible(&arg_ti[j].spec,
-                              &f->parameters->variables[j]->type.specifier)) {
-               /* param/arg types don't match */
-               break;
-            }
-
-            /* "out" and "inout" formal parameter requires the actual
-             * argument to be an l-value.
-             */
-            if (!arg_ti[j].can_be_referenced &&
-                (f->parameters->variables[j]->type.qualifier == SLANG_QUAL_OUT ||
-                 f->parameters->variables[j]->type.qualifier == SLANG_QUAL_INOUT)) {
-               /* param is not an lvalue! */
-               *error = GL_TRUE;
-               return NULL;
-            }
-         }
-
-         if (j == num_args) {
-            /* name and args match! */
-            return f;
-         }
-      }
-
-      funcs = funcs->outer_scope;
-   }
-
-   return NULL;
-}
diff --git a/mesalib/src/mesa/shader/slang/slang_compile_function.h b/mesalib/src/mesa/shader/slang/slang_compile_function.h
deleted file mode 100644
index a5445ec25..000000000
--- a/mesalib/src/mesa/shader/slang/slang_compile_function.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.2
- *
- * Copyright (C) 2005-2006  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef SLANG_COMPILE_FUNCTION_H
-#define SLANG_COMPILE_FUNCTION_H
-
-
-/**
- * Types of functions.
- */
-typedef enum slang_function_kind_
-{
-   SLANG_FUNC_ORDINARY,
-   SLANG_FUNC_CONSTRUCTOR,
-   SLANG_FUNC_OPERATOR
-} slang_function_kind;
-
-
-/**
- * Description of a compiled shader function.
- */
-typedef struct slang_function_
-{
-   slang_function_kind kind;
-   slang_variable header;      /**< The function's name and return type */
-   slang_variable_scope *parameters; /**< formal parameters AND local vars */
-   unsigned int param_count;   /**< number of formal params (no locals) */
-   slang_operation *body;      /**< The instruction tree */
-} slang_function;
-
-extern int slang_function_construct(slang_function *);
-extern void slang_function_destruct(slang_function *);
-extern slang_function *slang_function_new(slang_function_kind kind);
-
-extern GLboolean
-_slang_function_has_return_value(const slang_function *fun);
-
-
-/**
- * Basically, a list of compiled functions.
- */
-typedef struct slang_function_scope_
-{
-   slang_function *functions;
-   GLuint num_functions;
-   struct slang_function_scope_ *outer_scope;
-} slang_function_scope;
-
-
-extern GLvoid
-_slang_function_scope_ctr(slang_function_scope *);
-
-extern void
-slang_function_scope_destruct(slang_function_scope *);
-
-extern int
-slang_function_scope_find_by_name(slang_function_scope *, slang_atom, int);
-
-extern slang_function *
-slang_function_scope_find(slang_function_scope *, slang_function *, int);
-
-extern struct slang_function_ *
-_slang_function_locate(const struct slang_function_scope_ *funcs,
-                       slang_atom name, struct slang_operation_ *params,
-                       GLuint num_params,
-                       const struct slang_name_space_ *space,
-                       slang_atom_pool *atoms, slang_info_log *log,
-                       GLboolean *error);
-
-
-#endif /* SLANG_COMPILE_FUNCTION_H */
diff --git a/mesalib/src/mesa/shader/slang/slang_compile_operation.c b/mesalib/src/mesa/shader/slang/slang_compile_operation.c
deleted file mode 100644
index 5441d60df..000000000
--- a/mesalib/src/mesa/shader/slang/slang_compile_operation.c
+++ /dev/null
@@ -1,334 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.2
- *
- * Copyright (C) 2005-2006  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * \file slang_compile_operation.c
- * slang front-end compiler
- * \author Michal Krol
- */
-
-#include "main/imports.h"
-#include "slang_compile.h"
-#include "slang_mem.h"
-
-
-/**
- * Init a slang_operation object
- */
-GLboolean
-slang_operation_construct(slang_operation * oper)
-{
-   oper->type = SLANG_OPER_NONE;
-   oper->children = NULL;
-   oper->num_children = 0;
-   oper->literal[0] = 0.0;
-   oper->literal_size = 1;
-   oper->array_constructor = GL_FALSE;
-   oper->a_id = SLANG_ATOM_NULL;
-   oper->a_obj = SLANG_ATOM_NULL;
-   oper->locals = _slang_variable_scope_new(NULL);
-   if (oper->locals == NULL)
-      return GL_FALSE;
-   _slang_variable_scope_ctr(oper->locals);
-   oper->fun = NULL;
-   oper->var = NULL;
-   oper->label = NULL;
-   return GL_TRUE;
-}
-
-void
-slang_operation_destruct(slang_operation * oper)
-{
-   GLuint i;
-
-   for (i = 0; i < oper->num_children; i++)
-      slang_operation_destruct(oper->children + i);
-   _slang_free(oper->children);
-   slang_variable_scope_destruct(oper->locals);
-   _slang_free(oper->locals);
-   oper->children = NULL;
-   oper->num_children = 0;
-   oper->locals = NULL;
-}
-
-
-/**
- * Recursively traverse 'oper', replacing occurances of 'oldScope' with
- * 'newScope' in the oper->locals->outer_scope field.
- */
-void
-slang_replace_scope(slang_operation *oper,
-                    slang_variable_scope *oldScope,
-                    slang_variable_scope *newScope)
-{
-   GLuint i;
-
-   if (oper->locals != newScope &&
-       oper->locals->outer_scope == oldScope) {
-      /* found.  replace old w/ new */
-      oper->locals->outer_scope = newScope;
-   }
-
-   if (oper->type == SLANG_OPER_VARIABLE_DECL) {
-      /* search/replace in the initializer */
-      slang_variable *var;
-      var = _slang_variable_locate(oper->locals, oper->a_id, GL_TRUE);
-      if (var && var->initializer) {
-         slang_replace_scope(var->initializer, oldScope, newScope);
-      }
-   }
-
-   /* search/replace in children */
-   for (i = 0; i < oper->num_children; i++) {
-      slang_replace_scope(&oper->children[i], oldScope, newScope);
-   }
-}
-
-
-/**
- * Recursively copy a slang_operation node.
- * \param x  copy target
- * \param y  copy source
- * \return GL_TRUE for success, GL_FALSE if failure
- */
-GLboolean
-slang_operation_copy(slang_operation * x, const slang_operation * y)
-{
-   slang_operation z;
-   GLuint i;
-
-   if (!slang_operation_construct(&z))
-      return GL_FALSE;
-   z.type = y->type;
-   if (y->num_children > 0) {
-      z.children = (slang_operation *)
-         _slang_alloc(y->num_children * sizeof(slang_operation));
-      if (z.children == NULL) {
-         slang_operation_destruct(&z);
-         return GL_FALSE;
-      }
-   }
-   for (z.num_children = 0; z.num_children < y->num_children;
-        z.num_children++) {
-      if (!slang_operation_construct(&z.children[z.num_children])) {
-         slang_operation_destruct(&z);
-         return GL_FALSE;
-      }
-   }
-   for (i = 0; i < z.num_children; i++) {
-      if (!slang_operation_copy(&z.children[i], &y->children[i])) {
-         slang_operation_destruct(&z);
-         return GL_FALSE;
-      }
-   }
-   z.literal[0] = y->literal[0];
-   z.literal[1] = y->literal[1];
-   z.literal[2] = y->literal[2];
-   z.literal[3] = y->literal[3];
-   z.literal_size = y->literal_size;
-   assert(y->literal_size >= 1);
-   assert(y->literal_size <= 4);
-   z.a_id = y->a_id;
-   if (y->locals) {
-      if (!slang_variable_scope_copy(z.locals, y->locals)) {
-         slang_operation_destruct(&z);
-         return GL_FALSE;
-      }
-   }
-
-   /* update scoping for children */
-   for (i = 0; i < y->num_children; i++) {
-      if (y->children[i].locals &&
-          y->children[i].locals->outer_scope == y->locals) {
-         z.children[i].locals->outer_scope = z.locals;
-      }
-   }
-
-#if 0
-   z.var = y->var;
-   z.fun = y->fun;
-#endif
-   slang_operation_destruct(x);
-   *x = z;
-
-   /* If this operation declares a new scope, we need to make sure
-    * all children point to it, not the original operation's scope!
-    */
-   if (x->type == SLANG_OPER_BLOCK_NEW_SCOPE ||
-       x->type == SLANG_OPER_WHILE ||
-       x->type == SLANG_OPER_FOR) {
-      slang_replace_scope(x, y->locals, x->locals);
-   }
-
-   return GL_TRUE;
-}
-
-
-slang_operation *
-slang_operation_new(GLuint count)
-{
-   slang_operation *ops
-       = (slang_operation *) _slang_alloc(count * sizeof(slang_operation));
-   assert(count > 0);
-   if (ops) {
-      GLuint i;
-      for (i = 0; i < count; i++)
-         slang_operation_construct(ops + i);
-   }
-   return ops;
-}
-
-
-/**
- * Delete operation and all children
- */
-void
-slang_operation_delete(slang_operation *oper)
-{
-   slang_operation_destruct(oper);
-   _slang_free(oper);
-}
-
-
-void
-slang_operation_free_children(slang_operation *oper)
-{
-   GLuint i;
-   for (i = 0; i < slang_oper_num_children(oper); i++) {
-      slang_operation *child = slang_oper_child(oper, i);
-      slang_operation_destruct(child);
-   }
-   _slang_free(oper->children);
-   oper->children = NULL;
-   oper->num_children = 0;
-}
-
-
-slang_operation *
-slang_operation_grow(GLuint *numChildren, slang_operation **children)
-{
-   slang_operation *ops;
-
-   ops = (slang_operation *)
-      _slang_realloc(*children,
-                     *numChildren * sizeof(slang_operation),
-                     (*numChildren + 1) * sizeof(slang_operation));
-   if (ops) {
-      slang_operation *newOp = ops + *numChildren;
-      if (!slang_operation_construct(newOp)) {
-         _slang_free(ops);
-         *children = NULL;
-         return NULL;
-      }
-      *children = ops;
-      (*numChildren)++;
-      return newOp;
-   }
-   return NULL;
-}
-
-/**
- * Insert a new slang_operation into an array.
- * \param numElements  pointer to current array size (in/out)
- * \param array  address of the array (in/out)
- * \param pos  position to insert new element
- * \return  pointer to the new operation/element
- */
-slang_operation *
-slang_operation_insert(GLuint *numElements, slang_operation **array,
-                       GLuint pos)
-{
-   slang_operation *ops;
-
-   assert(pos <= *numElements);
-
-   ops = (slang_operation *)
-      _slang_alloc((*numElements + 1) * sizeof(slang_operation));
-   if (ops) {
-      slang_operation *newOp;
-      newOp = ops + pos;
-      if (pos > 0)
-         memcpy(ops, *array, pos * sizeof(slang_operation));
-      if (pos < *numElements)
-         memcpy(newOp + 1, (*array) + pos,
-                (*numElements - pos) * sizeof(slang_operation));
-
-      if (!slang_operation_construct(newOp)) {
-         _slang_free(ops);
-         *numElements = 0;
-         *array = NULL;
-         return NULL;
-      }
-      if (*array)
-         _slang_free(*array);
-      *array = ops;
-      (*numElements)++;
-      return newOp;
-   }
-   return NULL;
-}
-
-
-/**
- * Add/insert new child into given node at given position.
- * \return pointer to the new child node
- */
-slang_operation *
-slang_operation_insert_child(slang_operation *oper, GLuint pos)
-{
-   slang_operation *newOp;
-
-   newOp = slang_operation_insert(&oper->num_children,
-                                  &oper->children,
-                                  pos);
-   if (newOp) {
-      newOp->locals->outer_scope = oper->locals;
-   }
-
-   return newOp;
-}
-
-
-void
-_slang_operation_swap(slang_operation *oper0, slang_operation *oper1)
-{
-   slang_operation tmp = *oper0;
-   *oper0 = *oper1;
-   *oper1 = tmp;
-}
-
-
-void
-slang_operation_add_children(slang_operation *oper, GLuint num_children)
-{
-   GLuint i;
-   assert(oper->num_children == 0);
-   assert(oper->children == NULL);
-   oper->num_children = num_children;
-   oper->children = slang_operation_new(num_children);
-   for (i = 0; i < num_children; i++) {
-      oper->children[i].locals = _slang_variable_scope_new(oper->locals);
-   }
-}
-
diff --git a/mesalib/src/mesa/shader/slang/slang_compile_operation.h b/mesalib/src/mesa/shader/slang/slang_compile_operation.h
deleted file mode 100644
index 1f15c1989..000000000
--- a/mesalib/src/mesa/shader/slang/slang_compile_operation.h
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.2
- *
- * Copyright (C) 2005-2006  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef SLANG_COMPILE_OPERATION_H
-#define SLANG_COMPILE_OPERATION_H
-
-
-/**
- * Types of slang operations.
- * These are the types of the AST (abstract syntax tree) nodes.
- * [foo] indicates a sub-tree or reference to another type of node
- */
-typedef enum slang_operation_type_
-{
-   SLANG_OPER_NONE,
-   SLANG_OPER_BLOCK_NO_NEW_SCOPE,       /* "{" sequence "}" */
-   SLANG_OPER_BLOCK_NEW_SCOPE,  /* "{" sequence "}" */
-   SLANG_OPER_VARIABLE_DECL,    /* [type] [var] or [var] = [expr] */
-   SLANG_OPER_ASM,
-   SLANG_OPER_BREAK,            /* "break" statement */
-   SLANG_OPER_CONTINUE,         /* "continue" statement */
-   SLANG_OPER_DISCARD,          /* "discard" (kill fragment) statement */
-   SLANG_OPER_RETURN,           /* "return" [expr]  */
-   SLANG_OPER_RETURN_INLINED,   /* "return" [expr] from inlined function  */
-   SLANG_OPER_LABEL,            /* a jump target */
-   SLANG_OPER_EXPRESSION,       /* [expr] */
-   SLANG_OPER_IF,               /* "if" [0] then [1] else [2] */
-   SLANG_OPER_WHILE,            /* "while" [cond] [body] */
-   SLANG_OPER_DO,               /* "do" [body] "while" [cond] */
-   SLANG_OPER_FOR,              /* "for" [init] [while] [incr] [body] */
-   SLANG_OPER_VOID,             /* nop */
-   SLANG_OPER_LITERAL_BOOL,     /* "true" or "false" */
-   SLANG_OPER_LITERAL_INT,      /* integer literal */
-   SLANG_OPER_LITERAL_FLOAT,    /* float literal */
-   SLANG_OPER_IDENTIFIER,       /* var name, func name, etc */
-   SLANG_OPER_SEQUENCE,         /* [expr] "," [expr] "," etc */
-   SLANG_OPER_ASSIGN,           /* [var] "=" [expr] */
-   SLANG_OPER_ADDASSIGN,        /* [var] "+=" [expr] */
-   SLANG_OPER_SUBASSIGN,        /* [var] "-=" [expr] */
-   SLANG_OPER_MULASSIGN,        /* [var] "*=" [expr] */
-   SLANG_OPER_DIVASSIGN,        /* [var] "/=" [expr] */
-   /*SLANG_OPER_MODASSIGN, */
-   /*SLANG_OPER_LSHASSIGN, */
-   /*SLANG_OPER_RSHASSIGN, */
-   /*SLANG_OPER_ORASSIGN, */
-   /*SLANG_OPER_XORASSIGN, */
-   /*SLANG_OPER_ANDASSIGN, */
-   SLANG_OPER_SELECT,           /* [expr] "?" [expr] ":" [expr] */
-   SLANG_OPER_LOGICALOR,        /* [expr] "||" [expr] */
-   SLANG_OPER_LOGICALXOR,       /* [expr] "^^" [expr] */
-   SLANG_OPER_LOGICALAND,       /* [expr] "&&" [expr] */
-   /*SLANG_OPER_BITOR, */
-   /*SLANG_OPER_BITXOR, */
-   /*SLANG_OPER_BITAND, */
-   SLANG_OPER_EQUAL,            /* [expr] "==" [expr] */
-   SLANG_OPER_NOTEQUAL,         /* [expr] "!=" [expr] */
-   SLANG_OPER_LESS,             /* [expr] "<" [expr] */
-   SLANG_OPER_GREATER,          /* [expr] ">" [expr] */
-   SLANG_OPER_LESSEQUAL,        /* [expr] "<=" [expr] */
-   SLANG_OPER_GREATEREQUAL,     /* [expr] ">=" [expr] */
-   /*SLANG_OPER_LSHIFT, */
-   /*SLANG_OPER_RSHIFT, */
-   SLANG_OPER_ADD,              /* [expr] "+" [expr] */
-   SLANG_OPER_SUBTRACT,         /* [expr] "-" [expr] */
-   SLANG_OPER_MULTIPLY,         /* [expr] "*" [expr] */
-   SLANG_OPER_DIVIDE,           /* [expr] "/" [expr] */
-   /*SLANG_OPER_MODULUS, */
-   SLANG_OPER_PREINCREMENT,     /* "++" [var] */
-   SLANG_OPER_PREDECREMENT,     /* "--" [var] */
-   SLANG_OPER_PLUS,             /* "-" [expr] */
-   SLANG_OPER_MINUS,            /* "+" [expr] */
-   /*SLANG_OPER_COMPLEMENT, */
-   SLANG_OPER_NOT,              /* "!" [expr] */
-   SLANG_OPER_SUBSCRIPT,        /* [expr] "[" [expr] "]" */
-   SLANG_OPER_CALL,             /* [func name] [param] [param] [...] */
-   SLANG_OPER_NON_INLINED_CALL, /* a real function call */
-   SLANG_OPER_METHOD,           /* method call, such as  v.length() */
-   SLANG_OPER_FIELD,            /* i.e.: ".next" or ".xzy" or ".xxx" etc */
-   SLANG_OPER_POSTINCREMENT,    /* [var] "++" */
-   SLANG_OPER_POSTDECREMENT     /* [var] "--" */
-} slang_operation_type;
-
-
-/**
- * A slang_operation is basically a compiled instruction (such as assignment,
- * a while-loop, a conditional, a multiply, a function call, etc).
- * The AST (abstract syntax tree) is built from these nodes.
- * NOTE: This structure could have been implemented as a union of simpler
- * structs which would correspond to the operation types above.
- */
-typedef struct slang_operation_
-{
-   slang_operation_type type;
-   struct slang_operation_ *children;
-   GLuint num_children;
-   GLfloat literal[4];           /**< Used for float, int and bool values */
-   GLuint literal_size;          /**< 1, 2, 3, or 4 */
-   slang_atom a_id;              /**< type: asm, identifier, call, field */
-   slang_atom a_obj;             /**< object in a method call */
-   slang_variable_scope *locals; /**< local vars for scope */
-   struct slang_function_ *fun;  /**< If type == SLANG_OPER_CALL */
-   struct slang_variable_ *var;  /**< If type == slang_oper_identier */
-   struct slang_label_ *label;   /**< If type == SLANG_OPER_LABEL */
-   /** If type==SLANG_OPER_CALL and we're calling an array constructor,
-    * for which there's no real function, we need to have a flag to
-    * indicate such.  num_children indicates number of elements.
-    */
-   GLboolean array_constructor;
-} slang_operation;
-
-
-extern GLboolean
-slang_operation_construct(slang_operation *);
-
-extern void
-slang_operation_destruct(slang_operation *);
-
-extern void
-slang_replace_scope(slang_operation *oper,
-                    slang_variable_scope *oldScope,
-                    slang_variable_scope *newScope);
-
-extern GLboolean
-slang_operation_copy(slang_operation *, const slang_operation *);
-
-extern slang_operation *
-slang_operation_new(GLuint count);
-
-extern void
-slang_operation_delete(slang_operation *oper);
-
-extern void
-slang_operation_free_children(slang_operation *oper);
-
-extern slang_operation *
-slang_operation_grow(GLuint *numChildren, slang_operation **children);
-
-extern slang_operation *
-slang_operation_insert(GLuint *numChildren, slang_operation **children,
-                       GLuint pos);
-
-extern slang_operation *
-slang_operation_insert_child(slang_operation *oper, GLuint pos);
-
-extern void
-_slang_operation_swap(slang_operation *oper0, slang_operation *oper1);
-
-
-extern void
-slang_operation_add_children(slang_operation *oper, GLuint num_children);
-
-
-/** Return number of children of given node */
-static INLINE GLuint
-slang_oper_num_children(const slang_operation *oper)
-{
-   return oper->num_children;
-}
-
-/** Return child of given operation node */
-static INLINE slang_operation *
-slang_oper_child(slang_operation *oper, GLuint child)
-{
-   assert(child < oper->num_children);
-   return &oper->children[child];
-}
-
-
-/** Return child of given operation node, const version */
-static INLINE const slang_operation *
-slang_oper_child_const(const slang_operation *oper, GLuint child)
-{
-   assert(child < oper->num_children);
-   return &oper->children[child];
-}
-
-
-/** Init oper to a boolean literal. */
-static INLINE void
-slang_operation_literal_bool(slang_operation *oper, GLboolean value)
-{
-   oper->type = SLANG_OPER_LITERAL_BOOL;
-   oper->literal[0] =
-   oper->literal[1] =
-   oper->literal[2] =
-   oper->literal[3] = (float) value;
-   oper->literal_size = 1;
-}
-
-
-/** Init oper to an int literal. */
-static INLINE void
-slang_operation_literal_int(slang_operation *oper, GLint value)
-{
-   oper->type = SLANG_OPER_LITERAL_INT;
-   oper->literal[0] =
-   oper->literal[1] =
-   oper->literal[2] =
-   oper->literal[3] = (float) value;
-   oper->literal_size = 1;
-}
-
-
-#endif /* SLANG_COMPILE_OPERATION_H */
diff --git a/mesalib/src/mesa/shader/slang/slang_compile_struct.c b/mesalib/src/mesa/shader/slang/slang_compile_struct.c
deleted file mode 100644
index e6c38730d..000000000
--- a/mesalib/src/mesa/shader/slang/slang_compile_struct.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.3
- *
- * Copyright (C) 2005-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 slang_compile_struct.c
- * slang front-end compiler
- * \author Michal Krol
- */
-
-#include "main/imports.h"
-#include "slang_mem.h"
-#include "slang_compile.h"
-
-
-GLvoid
-_slang_struct_scope_ctr(slang_struct_scope * self)
-{
-   self->structs = NULL;
-   self->num_structs = 0;
-   self->outer_scope = NULL;
-}
-
-void
-slang_struct_scope_destruct(slang_struct_scope * scope)
-{
-   GLuint i;
-
-   for (i = 0; i < scope->num_structs; i++)
-      slang_struct_destruct(scope->structs + i);
-   _slang_free(scope->structs);
-   /* do not free scope->outer_scope */
-}
-
-int
-slang_struct_scope_copy(slang_struct_scope * x, const slang_struct_scope * y)
-{
-   slang_struct_scope z;
-   GLuint i;
-
-   _slang_struct_scope_ctr(&z);
-   z.structs = (slang_struct *)
-      _slang_alloc(y->num_structs * sizeof(slang_struct));
-   if (z.structs == NULL) {
-      slang_struct_scope_destruct(&z);
-      return 0;
-   }
-   for (z.num_structs = 0; z.num_structs < y->num_structs; z.num_structs++)
-      if (!slang_struct_construct(&z.structs[z.num_structs])) {
-         slang_struct_scope_destruct(&z);
-         return 0;
-      }
-   for (i = 0; i < z.num_structs; i++)
-      if (!slang_struct_copy(&z.structs[i], &y->structs[i])) {
-         slang_struct_scope_destruct(&z);
-         return 0;
-      }
-   z.outer_scope = y->outer_scope;
-   slang_struct_scope_destruct(x);
-   *x = z;
-   return 1;
-}
-
-slang_struct *
-slang_struct_scope_find(slang_struct_scope * stru, slang_atom a_name,
-                        int all_scopes)
-{
-   GLuint i;
-
-   for (i = 0; i < stru->num_structs; i++)
-      if (a_name == stru->structs[i].a_name)
-         return &stru->structs[i];
-   if (all_scopes && stru->outer_scope != NULL)
-      return slang_struct_scope_find(stru->outer_scope, a_name, 1);
-   return NULL;
-}
-
-/* slang_struct */
-
-int
-slang_struct_construct(slang_struct * stru)
-{
-   stru->a_name = SLANG_ATOM_NULL;
-   stru->fields = (slang_variable_scope *)
-      _slang_alloc(sizeof(slang_variable_scope));
-   if (stru->fields == NULL)
-      return 0;
-   _slang_variable_scope_ctr(stru->fields);
-
-   stru->structs =
-      (slang_struct_scope *) _slang_alloc(sizeof(slang_struct_scope));
-   if (stru->structs == NULL) {
-      slang_variable_scope_destruct(stru->fields);
-      _slang_free(stru->fields);
-      return 0;
-   }
-   _slang_struct_scope_ctr(stru->structs);
-   stru->constructor = NULL;
-   return 1;
-}
-
-void
-slang_struct_destruct(slang_struct * stru)
-{
-   slang_variable_scope_destruct(stru->fields);
-   _slang_free(stru->fields);
-   slang_struct_scope_destruct(stru->structs);
-   _slang_free(stru->structs);
-}
-
-int
-slang_struct_copy(slang_struct * x, const slang_struct * y)
-{
-   slang_struct z;
-
-   if (!slang_struct_construct(&z))
-      return 0;
-   z.a_name = y->a_name;
-   if (!slang_variable_scope_copy(z.fields, y->fields)) {
-      slang_struct_destruct(&z);
-      return 0;
-   }
-   if (!slang_struct_scope_copy(z.structs, y->structs)) {
-      slang_struct_destruct(&z);
-      return 0;
-   }
-   slang_struct_destruct(x);
-   *x = z;
-   return 1;
-}
-
-int
-slang_struct_equal(const slang_struct * x, const slang_struct * y)
-{
-   GLuint i;
-
-   if (x->fields->num_variables != y->fields->num_variables)
-      return 0;
-
-   for (i = 0; i < x->fields->num_variables; i++) {
-      const slang_variable *varx = x->fields->variables[i];
-      const slang_variable *vary = y->fields->variables[i];
-
-      if (varx->a_name != vary->a_name)
-         return 0;
-      if (!slang_type_specifier_equal(&varx->type.specifier,
-                                      &vary->type.specifier))
-         return 0;
-      if (varx->type.specifier.type == SLANG_SPEC_ARRAY)
-         if (varx->array_len != vary->array_len)
-            return GL_FALSE;
-   }
-   return 1;
-}
diff --git a/mesalib/src/mesa/shader/slang/slang_compile_struct.h b/mesalib/src/mesa/shader/slang/slang_compile_struct.h
deleted file mode 100644
index 90c5512f4..000000000
--- a/mesalib/src/mesa/shader/slang/slang_compile_struct.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5
- *
- * Copyright (C) 2005-2006  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#if !defined SLANG_COMPILE_STRUCT_H
-#define SLANG_COMPILE_STRUCT_H
-
-#if defined __cplusplus
-extern "C" {
-#endif
-
-struct slang_function_;
-
-typedef struct slang_struct_scope_
-{
-   struct slang_struct_ *structs;
-   GLuint num_structs;
-   struct slang_struct_scope_ *outer_scope;
-} slang_struct_scope;
-
-extern GLvoid
-_slang_struct_scope_ctr (slang_struct_scope *);
-
-void slang_struct_scope_destruct (slang_struct_scope *);
-int slang_struct_scope_copy (slang_struct_scope *, const slang_struct_scope *);
-struct slang_struct_ *slang_struct_scope_find (slang_struct_scope *, slang_atom, int);
-
-typedef struct slang_struct_
-{
-   slang_atom a_name;
-   struct slang_variable_scope_ *fields;
-   slang_struct_scope *structs;
-   struct slang_function_ *constructor;
-} slang_struct;
-
-int slang_struct_construct (slang_struct *);
-void slang_struct_destruct (slang_struct *);
-int slang_struct_copy (slang_struct *, const slang_struct *);
-int slang_struct_equal (const slang_struct *, const slang_struct *);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
diff --git a/mesalib/src/mesa/shader/slang/slang_compile_variable.c b/mesalib/src/mesa/shader/slang/slang_compile_variable.c
deleted file mode 100644
index 23c08a903..000000000
--- a/mesalib/src/mesa/shader/slang/slang_compile_variable.c
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.3
- *
- * Copyright (C) 2005-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 slang_compile_variable.c
- * slang front-end compiler
- * \author Michal Krol
- */
-
-#include "main/imports.h"
-#include "slang_compile.h"
-#include "slang_mem.h"
-
-
-static slang_variable *
-slang_variable_new(void)
-{
-   slang_variable *v = (slang_variable *) _slang_alloc(sizeof(slang_variable));
-   if (v) {
-      if (!slang_variable_construct(v)) {
-         _slang_free(v);
-         v = NULL;
-      }
-   }
-   return v;
-}
-
-
-static void
-slang_variable_delete(slang_variable * var)
-{
-   slang_variable_destruct(var);
-   _slang_free(var);
-}
-
-
-/*
- * slang_variable_scope
- */
-
-slang_variable_scope *
-_slang_variable_scope_new(slang_variable_scope *parent)
-{
-   slang_variable_scope *s;
-   s = (slang_variable_scope *) _slang_alloc(sizeof(slang_variable_scope));
-   if (s)
-      s->outer_scope = parent;
-   return s;
-}
-
-
-GLvoid
-_slang_variable_scope_ctr(slang_variable_scope * self)
-{
-   self->variables = NULL;
-   self->num_variables = 0;
-   self->outer_scope = NULL;
-}
-
-void
-slang_variable_scope_destruct(slang_variable_scope * scope)
-{
-   unsigned int i;
-
-   if (!scope)
-      return;
-   for (i = 0; i < scope->num_variables; i++) {
-      if (scope->variables[i])
-         slang_variable_delete(scope->variables[i]);
-   }
-   _slang_free(scope->variables);
-   /* do not free scope->outer_scope */
-}
-
-int
-slang_variable_scope_copy(slang_variable_scope * x,
-                          const slang_variable_scope * y)
-{
-   slang_variable_scope z;
-   unsigned int i;
-
-   _slang_variable_scope_ctr(&z);
-   z.variables = (slang_variable **)
-      _slang_alloc(y->num_variables * sizeof(slang_variable *));
-   if (z.variables == NULL) {
-      slang_variable_scope_destruct(&z);
-      return 0;
-   }
-   for (z.num_variables = 0; z.num_variables < y->num_variables;
-        z.num_variables++) {
-      z.variables[z.num_variables] = slang_variable_new();
-      if (!z.variables[z.num_variables]) {
-         slang_variable_scope_destruct(&z);
-         return 0;
-      }
-   }
-   for (i = 0; i < z.num_variables; i++) {
-      if (!slang_variable_copy(z.variables[i], y->variables[i])) {
-         slang_variable_scope_destruct(&z);
-         return 0;
-      }
-   }
-   z.outer_scope = y->outer_scope;
-   slang_variable_scope_destruct(x);
-   *x = z;
-   return 1;
-}
-
-
-/**
- * Grow the variable list by one.
- * \return  pointer to space for the new variable (will be initialized)
- */
-slang_variable *
-slang_variable_scope_grow(slang_variable_scope *scope)
-{
-   const int n = scope->num_variables;
-   scope->variables = (slang_variable **)
-         _slang_realloc(scope->variables,
-                        n * sizeof(slang_variable *),
-                        (n + 1) * sizeof(slang_variable *));
-   if (!scope->variables)
-      return NULL;
-
-   scope->num_variables++;
-
-   scope->variables[n] = slang_variable_new();
-   if (!scope->variables[n])
-      return NULL;
-
-   return scope->variables[n];
-}
-
-
-
-/* slang_variable */
-
-int
-slang_variable_construct(slang_variable * var)
-{
-   if (!slang_fully_specified_type_construct(&var->type))
-      return 0;
-   var->a_name = SLANG_ATOM_NULL;
-   var->array_len = 0;
-   var->initializer = NULL;
-   var->size = 0;
-   var->isTemp = GL_FALSE;
-   var->store = NULL;
-   var->declared = 0;
-   return 1;
-}
-
-
-void
-slang_variable_destruct(slang_variable * var)
-{
-   slang_fully_specified_type_destruct(&var->type);
-   if (var->initializer != NULL) {
-      slang_operation_destruct(var->initializer);
-      _slang_free(var->initializer);
-   }
-#if 0
-   if (var->aux) {
-      free(var->aux);
-   }
-#endif
-}
-
-
-int
-slang_variable_copy(slang_variable * x, const slang_variable * y)
-{
-   slang_variable z;
-
-   if (!slang_variable_construct(&z))
-      return 0;
-   if (!slang_fully_specified_type_copy(&z.type, &y->type)) {
-      slang_variable_destruct(&z);
-      return 0;
-   }
-   z.a_name = y->a_name;
-   z.array_len = y->array_len;
-   if (y->initializer != NULL) {
-      z.initializer
-         = (slang_operation *) _slang_alloc(sizeof(slang_operation));
-      if (z.initializer == NULL) {
-         slang_variable_destruct(&z);
-         return 0;
-      }
-      if (!slang_operation_construct(z.initializer)) {
-         _slang_free(z.initializer);
-         slang_variable_destruct(&z);
-         return 0;
-      }
-      if (!slang_operation_copy(z.initializer, y->initializer)) {
-         slang_variable_destruct(&z);
-         return 0;
-      }
-   }
-   z.size = y->size;
-   slang_variable_destruct(x);
-   *x = z;
-   return 1;
-}
-
-
-/**
- * Search for named variable in given scope.
- * \param all  if true, search parent scopes too.
- */
-slang_variable *
-_slang_variable_locate(const slang_variable_scope * scope,
-                       const slang_atom a_name, GLboolean all)
-{
-   while (scope) {
-      GLuint i;
-      for (i = 0; i < scope->num_variables; i++)
-         if (a_name == scope->variables[i]->a_name)
-            return scope->variables[i];
-      if (all)
-         scope = scope->outer_scope;
-      else
-         scope = NULL;
-   }
-   return NULL;
-}
diff --git a/mesalib/src/mesa/shader/slang/slang_compile_variable.h b/mesalib/src/mesa/shader/slang/slang_compile_variable.h
deleted file mode 100644
index 5c9d248b3..000000000
--- a/mesalib/src/mesa/shader/slang/slang_compile_variable.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.2
- *
- * Copyright (C) 2005-2006  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef SLANG_COMPILE_VARIABLE_H
-#define SLANG_COMPILE_VARIABLE_H
-
-
-struct slang_ir_storage_;
-
-
-/**
- * A shading language program variable.
- */
-typedef struct slang_variable_
-{
-   slang_fully_specified_type type; /**< Variable's data type */
-   slang_atom a_name;               /**< The variable's name (char *) */
-   GLuint array_len;                /**< only if type == SLANG_SPEC_ARRAy */
-   struct slang_operation_ *initializer; /**< Optional initializer code */
-   GLuint size;                     /**< Variable's size in bytes */
-   GLboolean is_global;
-   GLboolean isTemp;                /**< a named temporary (__resultTmp) */
-   GLboolean declared;              /**< has the var been declared? */
-   struct slang_ir_storage_ *store; /**< Storage for this var */
-} slang_variable;
-
-
-/**
- * Basically a list of variables, with a pointer to the parent scope.
- */
-typedef struct slang_variable_scope_
-{
-   slang_variable **variables;  /**< Array [num_variables] of ptrs to vars */
-   GLuint num_variables;
-   struct slang_variable_scope_ *outer_scope;
-} slang_variable_scope;
-
-
-extern slang_variable_scope *
-_slang_variable_scope_new(slang_variable_scope *parent);
-
-extern GLvoid
-_slang_variable_scope_ctr(slang_variable_scope *);
-
-extern void
-slang_variable_scope_destruct(slang_variable_scope *);
-
-extern int
-slang_variable_scope_copy(slang_variable_scope *,
-                          const slang_variable_scope *);
-
-extern slang_variable *
-slang_variable_scope_grow(slang_variable_scope *);
-
-extern int
-slang_variable_construct(slang_variable *);
-
-extern void
-slang_variable_destruct(slang_variable *);
-
-extern int
-slang_variable_copy(slang_variable *, const slang_variable *);
-
-extern slang_variable *
-_slang_variable_locate(const slang_variable_scope *, const slang_atom a_name,
-                       GLboolean all);
-
-
-#endif /* SLANG_COMPILE_VARIABLE_H */
diff --git a/mesalib/src/mesa/shader/slang/slang_emit.c b/mesalib/src/mesa/shader/slang/slang_emit.c
deleted file mode 100644
index 7c0ea0c11..000000000
--- a/mesalib/src/mesa/shader/slang/slang_emit.c
+++ /dev/null
@@ -1,2667 +0,0 @@
-/*
- * Mesa 3-D graphics library
- *
- * Copyright (C) 2005-2008  Brian Paul   All Rights Reserved.
- * Copyright (C) 2008 VMware, Inc.   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, 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 slang_emit.c
- * Emit program instructions (PI code) from IR trees.
- * \author Brian Paul
- */
-
-/***
- *** NOTES
- ***
- *** To emit GPU instructions, we basically just do an in-order traversal
- *** of the IR tree.
- ***/
-
-
-#include "main/imports.h"
-#include "main/context.h"
-#include "shader/program.h"
-#include "shader/prog_instruction.h"
-#include "shader/prog_parameter.h"
-#include "shader/prog_print.h"
-#include "slang_builtin.h"
-#include "slang_emit.h"
-#include "slang_mem.h"
-
-
-#define PEEPHOLE_OPTIMIZATIONS 1
-#define ANNOTATE 0
-
-
-typedef struct
-{
-   slang_info_log *log;
-   slang_var_table *vt;
-   struct gl_program *prog;
-   struct gl_program **Subroutines;
-   GLuint NumSubroutines;
-
-   GLuint MaxInstructions;  /**< size of prog->Instructions[] buffer */
-
-   GLboolean UnresolvedFunctions;
-
-   /* code-gen options */
-   GLboolean EmitHighLevelInstructions;
-   GLboolean EmitCondCodes;
-   GLboolean EmitComments;
-   GLboolean EmitBeginEndSub; /* XXX TEMPORARY */
-} slang_emit_info;
-
-
-
-static struct gl_program *
-new_subroutine(slang_emit_info *emitInfo, GLuint *id)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   const GLuint n = emitInfo->NumSubroutines;
-
-   emitInfo->Subroutines = (struct gl_program **)
-      _mesa_realloc(emitInfo->Subroutines,
-                    n * sizeof(struct gl_program *),
-                    (n + 1) * sizeof(struct gl_program *));
-   emitInfo->Subroutines[n] = ctx->Driver.NewProgram(ctx, emitInfo->prog->Target, 0);
-   emitInfo->Subroutines[n]->Parameters = emitInfo->prog->Parameters;
-   emitInfo->NumSubroutines++;
-   *id = n;
-   return emitInfo->Subroutines[n];
-}
-
-
-/**
- * Convert a writemask to a swizzle.  Used for testing cond codes because
- * we only want to test the cond code component(s) that was set by the
- * previous instruction.
- */
-static GLuint
-writemask_to_swizzle(GLuint writemask)
-{
-   if (writemask == WRITEMASK_X)
-      return SWIZZLE_XXXX;
-   if (writemask == WRITEMASK_Y)
-      return SWIZZLE_YYYY;
-   if (writemask == WRITEMASK_Z)
-      return SWIZZLE_ZZZZ;
-   if (writemask == WRITEMASK_W)
-      return SWIZZLE_WWWW;
-   return SWIZZLE_XYZW;  /* shouldn't be hit */
-}
-
-
-/**
- * Convert a swizzle mask to a writemask.
- * Note that the slang_ir_storage->Swizzle field can represent either a
- * swizzle mask or a writemask, depending on how it's used.  For example,
- * when we parse "direction.yz" alone, we don't know whether .yz is a
- * writemask or a swizzle.  In this case, we encode ".yz" in store->Swizzle
- * as a swizzle mask (.yz?? actually).  Later, if direction.yz is used as
- * an R-value, we use store->Swizzle as-is.  Otherwise, if direction.yz is
- * used as an L-value, we convert it to a writemask.
- */
-static GLuint
-swizzle_to_writemask(GLuint swizzle)
-{
-   GLuint i, writemask = 0x0;
-   for (i = 0; i < 4; i++) {
-      GLuint swz = GET_SWZ(swizzle, i);
-      if (swz <= SWIZZLE_W) {
-         writemask |= (1 << swz);
-      }
-   }
-   return writemask;
-}
-
-
-/**
- * Swizzle a swizzle (function composition).
- * That is, return swz2(swz1), or said another way: swz1.szw2
- * Example: swizzle_swizzle(".zwxx", ".xxyw") yields ".zzwx"
- */
-GLuint
-_slang_swizzle_swizzle(GLuint swz1, GLuint swz2)
-{
-   GLuint i, swz, s[4];
-   for (i = 0; i < 4; i++) {
-      GLuint c = GET_SWZ(swz2, i);
-      if (c <= SWIZZLE_W)
-         s[i] = GET_SWZ(swz1, c);
-      else
-         s[i] = c;
-   }
-   swz = MAKE_SWIZZLE4(s[0], s[1], s[2], s[3]);
-   return swz;
-}
-
-
-/**
- * Return the default swizzle mask for accessing a variable of the
- * given size (in floats).  If size = 1, comp is used to identify
- * which component [0..3] of the register holds the variable.
- */
-GLuint
-_slang_var_swizzle(GLint size, GLint comp)
-{
-   switch (size) {
-   case 1:
-      return MAKE_SWIZZLE4(comp, SWIZZLE_NIL, SWIZZLE_NIL, SWIZZLE_NIL);
-   case 2:
-      return MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_Y, SWIZZLE_NIL, SWIZZLE_NIL);
-   case 3:
-      return MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_Y, SWIZZLE_Z, SWIZZLE_NIL);
-   default:
-      return SWIZZLE_XYZW;
-   }
-}
-
-
-
-/**
- * Allocate storage for the given node (if it hasn't already been allocated).
- *
- * Typically this is temporary storage for an intermediate result (such as
- * for a multiply or add, etc).
- *
- * If n->Store does not exist it will be created and will be of the size
- * specified by defaultSize.
- */
-static GLboolean
-alloc_node_storage(slang_emit_info *emitInfo, slang_ir_node *n,
-                   GLint defaultSize)
-{
-   assert(!n->Var);
-   if (!n->Store) {
-      assert(defaultSize > 0);
-      n->Store = _slang_new_ir_storage(PROGRAM_TEMPORARY, -1, defaultSize);
-      if (!n->Store) {
-         return GL_FALSE;
-      }
-   }
-
-   /* now allocate actual register(s).  I.e. set n->Store->Index >= 0 */
-   if (n->Store->Index < 0) {
-      if (!_slang_alloc_temp(emitInfo->vt, n->Store)) {
-         slang_info_log_error(emitInfo->log,
-                              "Ran out of registers, too many temporaries");
-         _slang_free(n->Store);
-         n->Store = NULL;
-         return GL_FALSE;
-      }
-   }
-   return GL_TRUE;
-}
-
-
-/**
- * Free temporary storage, if n->Store is, in fact, temp storage.
- * Otherwise, no-op.
- */
-static void
-free_node_storage(slang_var_table *vt, slang_ir_node *n)
-{
-   if (n->Store->File == PROGRAM_TEMPORARY &&
-       n->Store->Index >= 0 &&
-       n->Opcode != IR_SWIZZLE) {
-      if (_slang_is_temp(vt, n->Store)) {
-         _slang_free_temp(vt, n->Store);
-         n->Store->Index = -1;
-         n->Store = NULL; /* XXX this may not be needed */
-      }
-   }
-}
-
-
-/**
- * Helper function to allocate a short-term temporary.
- * Free it with _slang_free_temp().
- */
-static GLboolean
-alloc_local_temp(slang_emit_info *emitInfo, slang_ir_storage *temp, GLint size)
-{
-   assert(size >= 1);
-   assert(size <= 4);
-   memset(temp, 0, sizeof(*temp));
-   temp->Size = size;
-   temp->File = PROGRAM_TEMPORARY;
-   temp->Index = -1;
-   return _slang_alloc_temp(emitInfo->vt, temp);
-}
-
-
-/**
- * Remove any SWIZZLE_NIL terms from given swizzle mask.
- * For a swizzle like .z??? generate .zzzz (replicate single component).
- * Else, for .wx?? generate .wxzw (insert default component for the position).
- */
-static GLuint
-fix_swizzle(GLuint swizzle)
-{
-   GLuint c0 = GET_SWZ(swizzle, 0),
-      c1 = GET_SWZ(swizzle, 1),
-      c2 = GET_SWZ(swizzle, 2),
-      c3 = GET_SWZ(swizzle, 3);
-   if (c1 == SWIZZLE_NIL && c2 == SWIZZLE_NIL && c3 == SWIZZLE_NIL) {
-      /* smear first component across all positions */
-      c1 = c2 = c3 = c0;
-   }
-   else {
-      /* insert default swizzle components */
-      if (c0 == SWIZZLE_NIL)
-         c0 = SWIZZLE_X;
-      if (c1 == SWIZZLE_NIL)
-         c1 = SWIZZLE_Y;
-      if (c2 == SWIZZLE_NIL)
-         c2 = SWIZZLE_Z;
-      if (c3 == SWIZZLE_NIL)
-         c3 = SWIZZLE_W;
-   }
-   return MAKE_SWIZZLE4(c0, c1, c2, c3);
-}
-
-
-
-/**
- * Convert IR storage to an instruction dst register.
- */
-static void
-storage_to_dst_reg(struct prog_dst_register *dst, const slang_ir_storage *st)
-{
-   const GLboolean relAddr = st->RelAddr;
-   const GLint size = st->Size;
-   GLint index = st->Index;
-   GLuint swizzle = st->Swizzle;
-
-   assert(index >= 0);
-   /* if this is storage relative to some parent storage, walk up the tree */
-   while (st->Parent) {
-      st = st->Parent;
-      assert(st->Index >= 0);
-      index += st->Index;
-      swizzle = _slang_swizzle_swizzle(st->Swizzle, swizzle);
-   }
-
-   assert(st->File != PROGRAM_UNDEFINED);
-   dst->File = st->File;
-
-   assert(index >= 0);
-   dst->Index = index;
-
-   assert(size >= 1);
-   assert(size <= 4);
-
-   if (swizzle != SWIZZLE_XYZW) {
-      dst->WriteMask = swizzle_to_writemask(swizzle);
-   }
-   else {
-      switch (size) {
-      case 1:
-         dst->WriteMask = WRITEMASK_X << GET_SWZ(st->Swizzle, 0);
-         break;
-      case 2:
-         dst->WriteMask = WRITEMASK_XY;
-         break;
-      case 3:
-         dst->WriteMask = WRITEMASK_XYZ;
-         break;
-      case 4:
-         dst->WriteMask = WRITEMASK_XYZW;
-         break;
-      default:
-         ; /* error would have been caught above */
-      }
-   }
-
-   dst->RelAddr = relAddr;
-}
-
-
-/**
- * Convert IR storage to an instruction src register.
- */
-static void
-storage_to_src_reg(struct prog_src_register *src, const slang_ir_storage *st)
-{
-   const GLboolean relAddr = st->RelAddr;
-   GLint index = st->Index;
-   GLuint swizzle = st->Swizzle;
-
-   /* if this is storage relative to some parent storage, walk up the tree */
-   assert(index >= 0);
-   while (st->Parent) {
-      st = st->Parent;
-      if (st->Index < 0) {
-         /* an error should have been reported already */
-         return;
-      }
-      assert(st->Index >= 0);
-      index += st->Index;
-      swizzle = _slang_swizzle_swizzle(fix_swizzle(st->Swizzle), swizzle);
-   }
-
-   assert(st->File >= 0);
-#if 1 /* XXX temporary */
-   if (st->File == PROGRAM_UNDEFINED) {
-      slang_ir_storage *st0 = (slang_ir_storage *) st;
-      st0->File = PROGRAM_TEMPORARY;
-   }
-#endif
-   assert(st->File < PROGRAM_UNDEFINED);
-   src->File = st->File;
-
-   assert(index >= 0);
-   src->Index = index;
-
-   swizzle = fix_swizzle(swizzle);
-   assert(GET_SWZ(swizzle, 0) <= SWIZZLE_W);
-   assert(GET_SWZ(swizzle, 1) <= SWIZZLE_W);
-   assert(GET_SWZ(swizzle, 2) <= SWIZZLE_W);
-   assert(GET_SWZ(swizzle, 3) <= SWIZZLE_W);
-   src->Swizzle = swizzle;
-
-   src->RelAddr = relAddr;
-}
-
-
-/*
- * Setup storage pointing to a scalar constant/literal.
- */
-static void
-constant_to_storage(slang_emit_info *emitInfo,
-                    GLfloat val,
-                    slang_ir_storage *store)
-{
-   GLuint swizzle;
-   GLint reg;
-   GLfloat value[4];
-
-   value[0] = val;
-   reg = _mesa_add_unnamed_constant(emitInfo->prog->Parameters,
-                                        value, 1, &swizzle);
-
-   memset(store, 0, sizeof(*store));
-   store->File = PROGRAM_CONSTANT;
-   store->Index = reg;
-   store->Swizzle = swizzle;
-}
-
-
-/**
- * Add new instruction at end of given program.
- * \param prog  the program to append instruction onto
- * \param opcode  opcode for the new instruction
- * \return pointer to the new instruction
- */
-static struct prog_instruction *
-new_instruction(slang_emit_info *emitInfo, gl_inst_opcode opcode)
-{
-   struct gl_program *prog = emitInfo->prog;
-   struct prog_instruction *inst;
-
-#if 0
-   /* print prev inst */
-   if (prog->NumInstructions > 0) {
-      _mesa_print_instruction(prog->Instructions + prog->NumInstructions - 1);
-   }
-#endif
-   assert(prog->NumInstructions <= emitInfo->MaxInstructions);
-
-   if (prog->NumInstructions == emitInfo->MaxInstructions) {
-      /* grow the instruction buffer */
-      emitInfo->MaxInstructions += 20;
-      prog->Instructions =
-         _mesa_realloc_instructions(prog->Instructions,
-                                    prog->NumInstructions,
-                                    emitInfo->MaxInstructions);
-      if (!prog->Instructions) {
-         return NULL;
-      }
-   }
-
-   inst = prog->Instructions + prog->NumInstructions;
-   prog->NumInstructions++;
-   _mesa_init_instructions(inst, 1);
-   inst->Opcode = opcode;
-   inst->BranchTarget = -1; /* invalid */
-   /*
-   printf("New inst %d: %p %s\n", prog->NumInstructions-1,(void*)inst,
-          _mesa_opcode_string(inst->Opcode));
-   */
-   return inst;
-}
-
-
-static struct prog_instruction *
-emit_arl_load(slang_emit_info *emitInfo,
-              gl_register_file file, GLint index, GLuint swizzle)
-{
-   struct prog_instruction *inst = new_instruction(emitInfo, OPCODE_ARL);
-   if (inst) {
-      inst->SrcReg[0].File = file;
-      inst->SrcReg[0].Index = index;
-      inst->SrcReg[0].Swizzle = fix_swizzle(swizzle);
-      inst->DstReg.File = PROGRAM_ADDRESS;
-      inst->DstReg.Index = 0;
-      inst->DstReg.WriteMask = WRITEMASK_X;
-   }
-   return inst;
-}
-
-
-/**
- * Emit a new instruction with given opcode, operands.
- * At this point the instruction may have multiple indirect register
- * loads/stores.  We convert those into ARL loads and address-relative
- * operands.  See comments inside.
- * At some point in the future we could directly emit indirectly addressed
- * registers in Mesa GPU instructions.
- */
-static struct prog_instruction *
-emit_instruction(slang_emit_info *emitInfo,
-                 gl_inst_opcode opcode,
-                 const slang_ir_storage *dst,
-                 const slang_ir_storage *src0,
-                 const slang_ir_storage *src1,
-                 const slang_ir_storage *src2)
-{
-   struct prog_instruction *inst;
-   GLuint numIndirect = 0;
-   const slang_ir_storage *src[3];
-   slang_ir_storage newSrc[3], newDst;
-   GLuint i;
-   GLboolean isTemp[3];
-
-   isTemp[0] = isTemp[1] = isTemp[2] = GL_FALSE;
-
-   src[0] = src0;
-   src[1] = src1;
-   src[2] = src2;
-
-   /* count up how many operands are indirect loads */
-   for (i = 0; i < 3; i++) {
-      if (src[i] && src[i]->IsIndirect)
-         numIndirect++;
-   }
-   if (dst && dst->IsIndirect)
-      numIndirect++;
-
-   /* Take special steps for indirect register loads.
-    * If we had multiple address registers this would be simpler.
-    * For example, this GLSL code:
-    *    x[i] = y[j] + z[k];
-    * would translate into something like:
-    *    ARL ADDR.x, i;
-    *    ARL ADDR.y, j;
-    *    ARL ADDR.z, k;
-    *    ADD TEMP[ADDR.x+5], TEMP[ADDR.y+9], TEMP[ADDR.z+4];
-    * But since we currently only have one address register we have to do this:
-    *    ARL ADDR.x, i;
-    *    MOV t1, TEMP[ADDR.x+9];
-    *    ARL ADDR.x, j;
-    *    MOV t2, TEMP[ADDR.x+4];
-    *    ARL ADDR.x, k;
-    *    ADD TEMP[ADDR.x+5], t1, t2;
-    * The code here figures this out...
-    */
-   if (numIndirect > 0) {
-      for (i = 0; i < 3; i++) {
-         if (src[i] && src[i]->IsIndirect) {
-            /* load the ARL register with the indirect register */
-            emit_arl_load(emitInfo,
-                          src[i]->IndirectFile,
-                          src[i]->IndirectIndex,
-                          src[i]->IndirectSwizzle);
-
-            if (numIndirect > 1) {
-               /* Need to load src[i] into a temporary register */
-               slang_ir_storage srcRelAddr;
-               alloc_local_temp(emitInfo, &newSrc[i], src[i]->Size);
-               isTemp[i] = GL_TRUE;
-
-               /* set RelAddr flag on src register */
-               srcRelAddr = *src[i];
-               srcRelAddr.RelAddr = GL_TRUE;
-               srcRelAddr.IsIndirect = GL_FALSE; /* not really needed */
-
-               /* MOV newSrc, srcRelAddr; */
-               inst = emit_instruction(emitInfo,
-                                       OPCODE_MOV,
-                                       &newSrc[i],
-                                       &srcRelAddr,
-                                       NULL,
-                                       NULL);
-               if (!inst) {
-                  return NULL;
-               }
-
-               src[i] = &newSrc[i];
-            }
-            else {
-               /* just rewrite the src[i] storage to be ARL-relative */
-               newSrc[i] = *src[i];
-               newSrc[i].RelAddr = GL_TRUE;
-               newSrc[i].IsIndirect = GL_FALSE; /* not really needed */
-               src[i] = &newSrc[i];
-            }
-         }
-      }
-   }
-
-   /* Take special steps for indirect dest register write */
-   if (dst && dst->IsIndirect) {
-      /* load the ARL register with the indirect register */
-      emit_arl_load(emitInfo,
-                    dst->IndirectFile,
-                    dst->IndirectIndex,
-                    dst->IndirectSwizzle);
-      newDst = *dst;
-      newDst.RelAddr = GL_TRUE;
-      newDst.IsIndirect = GL_FALSE;
-      dst = &newDst;
-   }
-
-   /* OK, emit the instruction and its dst, src regs */
-   inst = new_instruction(emitInfo, opcode);
-   if (!inst)
-      return NULL;
-
-   if (dst)
-      storage_to_dst_reg(&inst->DstReg, dst);
-
-   for (i = 0; i < 3; i++) {
-      if (src[i])
-         storage_to_src_reg(&inst->SrcReg[i], src[i]);
-   }
-
-   /* Free any temp registers that we allocated above */
-   for (i = 0; i < 3; i++) {
-      if (isTemp[i])
-         _slang_free_temp(emitInfo->vt, &newSrc[i]);
-   }
-
-   return inst;
-}
-
-
-
-/**
- * Put a comment on the given instruction.
- */
-static void
-inst_comment(struct prog_instruction *inst, const char *comment)
-{
-   if (inst)
-      inst->Comment = _mesa_strdup(comment);
-}
-
-
-
-/**
- * Return pointer to last instruction in program.
- */
-static struct prog_instruction *
-prev_instruction(slang_emit_info *emitInfo)
-{
-   struct gl_program *prog = emitInfo->prog;
-   if (prog->NumInstructions == 0)
-      return NULL;
-   else
-      return prog->Instructions + prog->NumInstructions - 1;
-}
-
-
-static struct prog_instruction *
-emit(slang_emit_info *emitInfo, slang_ir_node *n);
-
-
-/**
- * Return an annotation string for given node's storage.
- */
-static char *
-storage_annotation(const slang_ir_node *n, const struct gl_program *prog)
-{
-#if ANNOTATE
-   const slang_ir_storage *st = n->Store;
-   static char s[100] = "";
-
-   if (!st)
-      return _mesa_strdup("");
-
-   switch (st->File) {
-   case PROGRAM_CONSTANT:
-      if (st->Index >= 0) {
-         const GLfloat *val = prog->Parameters->ParameterValues[st->Index];
-         if (st->Swizzle == SWIZZLE_NOOP)
-            sprintf(s, "{%g, %g, %g, %g}", val[0], val[1], val[2], val[3]);
-         else {
-            sprintf(s, "%g", val[GET_SWZ(st->Swizzle, 0)]);
-         }
-      }
-      break;
-   case PROGRAM_TEMPORARY:
-      if (n->Var)
-         sprintf(s, "%s", (char *) n->Var->a_name);
-      else
-         sprintf(s, "t[%d]", st->Index);
-      break;
-   case PROGRAM_STATE_VAR:
-   case PROGRAM_UNIFORM:
-      sprintf(s, "%s", prog->Parameters->Parameters[st->Index].Name);
-      break;
-   case PROGRAM_VARYING:
-      sprintf(s, "%s", prog->Varying->Parameters[st->Index].Name);
-      break;
-   case PROGRAM_INPUT:
-      sprintf(s, "input[%d]", st->Index);
-      break;
-   case PROGRAM_OUTPUT:
-      sprintf(s, "output[%d]", st->Index);
-      break;
-   default:
-      s[0] = 0;
-   }
-   return _mesa_strdup(s);
-#else
-   return NULL;
-#endif
-}
-
-
-/**
- * Return an annotation string for an instruction.
- */
-static char *
-instruction_annotation(gl_inst_opcode opcode, char *dstAnnot,
-                       char *srcAnnot0, char *srcAnnot1, char *srcAnnot2)
-{
-#if ANNOTATE
-   const char *operator;
-   char *s;
-   int len = 50;
-
-   if (dstAnnot)
-      len += strlen(dstAnnot);
-   else
-      dstAnnot = _mesa_strdup("");
-
-   if (srcAnnot0)
-      len += strlen(srcAnnot0);
-   else
-      srcAnnot0 = _mesa_strdup("");
-
-   if (srcAnnot1)
-      len += strlen(srcAnnot1);
-   else
-      srcAnnot1 = _mesa_strdup("");
-
-   if (srcAnnot2)
-      len += strlen(srcAnnot2);
-   else
-      srcAnnot2 = _mesa_strdup("");
-
-   switch (opcode) {
-   case OPCODE_ADD:
-      operator = "+";
-      break;
-   case OPCODE_SUB:
-      operator = "-";
-      break;
-   case OPCODE_MUL:
-      operator = "*";
-      break;
-   case OPCODE_DP2:
-      operator = "DP2";
-      break;
-   case OPCODE_DP3:
-      operator = "DP3";
-      break;
-   case OPCODE_DP4:
-      operator = "DP4";
-      break;
-   case OPCODE_XPD:
-      operator = "XPD";
-      break;
-   case OPCODE_RSQ:
-      operator = "RSQ";
-      break;
-   case OPCODE_SGT:
-      operator = ">";
-      break;
-   default:
-      operator = ",";
-   }
-
-   s = (char *) malloc(len);
-   sprintf(s, "%s = %s %s %s %s", dstAnnot,
-           srcAnnot0, operator, srcAnnot1, srcAnnot2);
-   assert(strlen(s) < len);
-
-   free(dstAnnot);
-   free(srcAnnot0);
-   free(srcAnnot1);
-   free(srcAnnot2);
-
-   return s;
-#else
-   return NULL;
-#endif
-}
-
-
-/**
- * Emit an instruction that's just a comment.
- */
-static struct prog_instruction *
-emit_comment(slang_emit_info *emitInfo, const char *comment)
-{
-   struct prog_instruction *inst = new_instruction(emitInfo, OPCODE_NOP);
-   if (inst) {
-      inst_comment(inst, comment);
-   }
-   return inst;
-}
-
-
-/**
- * Generate code for a simple arithmetic instruction.
- * Either 1, 2 or 3 operands.
- */
-static struct prog_instruction *
-emit_arith(slang_emit_info *emitInfo, slang_ir_node *n)
-{
-   const slang_ir_info *info = _slang_ir_info(n->Opcode);
-   struct prog_instruction *inst;
-   GLuint i;
-
-   assert(info);
-   assert(info->InstOpcode != OPCODE_NOP);
-
-#if PEEPHOLE_OPTIMIZATIONS
-   /* Look for MAD opportunity */
-   if (info->NumParams == 2 &&
-       n->Opcode == IR_ADD && n->Children[0]->Opcode == IR_MUL) {
-      /* found pattern IR_ADD(IR_MUL(A, B), C) */
-      emit(emitInfo, n->Children[0]->Children[0]);  /* A */
-      emit(emitInfo, n->Children[0]->Children[1]);  /* B */
-      emit(emitInfo, n->Children[1]);  /* C */
-      if (!alloc_node_storage(emitInfo, n, -1)) {  /* dest */
-         return NULL;
-      }
-
-      inst = emit_instruction(emitInfo,
-                              OPCODE_MAD,
-                              n->Store,
-                              n->Children[0]->Children[0]->Store,
-                              n->Children[0]->Children[1]->Store,
-                              n->Children[1]->Store);
-
-      free_node_storage(emitInfo->vt, n->Children[0]->Children[0]);
-      free_node_storage(emitInfo->vt, n->Children[0]->Children[1]);
-      free_node_storage(emitInfo->vt, n->Children[1]);
-      return inst;
-   }
-
-   if (info->NumParams == 2 &&
-       n->Opcode == IR_ADD && n->Children[1]->Opcode == IR_MUL) {
-      /* found pattern IR_ADD(A, IR_MUL(B, C)) */
-      emit(emitInfo, n->Children[0]);  /* A */
-      emit(emitInfo, n->Children[1]->Children[0]);  /* B */
-      emit(emitInfo, n->Children[1]->Children[1]);  /* C */
-      if (!alloc_node_storage(emitInfo, n, -1)) {  /* dest */
-         return NULL;
-      }
-
-      inst = emit_instruction(emitInfo,
-                              OPCODE_MAD,
-                              n->Store,
-                              n->Children[1]->Children[0]->Store,
-                              n->Children[1]->Children[1]->Store,
-                              n->Children[0]->Store);
-
-      free_node_storage(emitInfo->vt, n->Children[1]->Children[0]);
-      free_node_storage(emitInfo->vt, n->Children[1]->Children[1]);
-      free_node_storage(emitInfo->vt, n->Children[0]);
-      return inst;
-   }
-#endif
-
-   /* gen code for children, may involve temp allocation */
-   for (i = 0; i < info->NumParams; i++) {
-      emit(emitInfo, n->Children[i]);
-      if (!n->Children[i] || !n->Children[i]->Store) {
-         /* error recovery */
-         return NULL;
-      }
-   }
-
-   /* result storage */
-   if (!alloc_node_storage(emitInfo, n, -1)) {
-      return NULL;
-   }
-
-   inst = emit_instruction(emitInfo,
-                           info->InstOpcode,
-                           n->Store,  /* dest */
-                           (info->NumParams > 0 ? n->Children[0]->Store : NULL),
-                           (info->NumParams > 1 ? n->Children[1]->Store : NULL),
-                           (info->NumParams > 2 ? n->Children[2]->Store : NULL)
-                           );
-
-   /* free temps */
-   for (i = 0; i < info->NumParams; i++)
-      free_node_storage(emitInfo->vt, n->Children[i]);
-
-   return inst;
-}
-
-
-/**
- * Emit code for == and != operators.  These could normally be handled
- * by emit_arith() except we need to be able to handle structure comparisons.
- */
-static struct prog_instruction *
-emit_compare(slang_emit_info *emitInfo, slang_ir_node *n)
-{
-   struct prog_instruction *inst = NULL;
-   GLint size;
-
-   assert(n->Opcode == IR_EQUAL || n->Opcode == IR_NOTEQUAL);
-
-   /* gen code for children */
-   emit(emitInfo, n->Children[0]);
-   emit(emitInfo, n->Children[1]);
-
-   if (n->Children[0]->Store->Size != n->Children[1]->Store->Size) {
-      /* XXX this error should have been caught in slang_codegen.c */
-      slang_info_log_error(emitInfo->log, "invalid operands to == or !=");
-      n->Store = NULL;
-      return NULL;
-   }
-
-   /* final result is 1 bool */
-   if (!alloc_node_storage(emitInfo, n, 1))
-      return NULL;
-
-   size = n->Children[0]->Store->Size;
-
-   if (size == 1) {
-      gl_inst_opcode opcode = n->Opcode == IR_EQUAL ? OPCODE_SEQ : OPCODE_SNE;
-      inst =  emit_instruction(emitInfo,
-                               opcode,
-                               n->Store, /* dest */
-                               n->Children[0]->Store,
-                               n->Children[1]->Store,
-                               NULL);
-   }
-   else if (size <= 4) {
-      /* compare two vectors.
-       * Unfortunately, there's no instruction to compare vectors and
-       * return a scalar result.  Do it with some compare and dot product
-       * instructions...
-       */
-      GLuint swizzle;
-      gl_inst_opcode dotOp;
-      slang_ir_storage tempStore;
-
-      if (!alloc_local_temp(emitInfo, &tempStore, 4)) {
-         n->Store = NULL;
-         return NULL;
-         /* out of temps */
-      }
-
-      if (size == 4) {
-         dotOp = OPCODE_DP4;
-         swizzle = SWIZZLE_XYZW;
-      }
-      else if (size == 3) {
-         dotOp = OPCODE_DP3;
-         swizzle = SWIZZLE_XYZW;
-      }
-      else {
-         assert(size == 2);
-         dotOp = OPCODE_DP3; /* XXX use OPCODE_DP2 eventually */
-         swizzle = MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_Y, SWIZZLE_Y, SWIZZLE_Y);
-      }
-
-      /* Compute inequality (temp = (A != B)) */
-      inst = emit_instruction(emitInfo,
-                              OPCODE_SNE,
-                              &tempStore,
-                              n->Children[0]->Store,
-                              n->Children[1]->Store,
-                              NULL);
-      if (!inst) {
-         return NULL;
-      }
-      inst_comment(inst, "Compare values");
-
-      /* Compute val = DOT(temp, temp)  (reduction) */
-      inst = emit_instruction(emitInfo,
-                              dotOp,
-                              n->Store,
-                              &tempStore,
-                              &tempStore,
-                              NULL);
-      if (!inst) {
-         return NULL;
-      }
-      inst->SrcReg[0].Swizzle = inst->SrcReg[1].Swizzle = swizzle; /*override*/
-      inst_comment(inst, "Reduce vec to bool");
-
-      _slang_free_temp(emitInfo->vt, &tempStore); /* free temp */
-
-      if (n->Opcode == IR_EQUAL) {
-         /* compute val = !val.x  with SEQ val, val, 0; */
-         slang_ir_storage zero;
-         constant_to_storage(emitInfo, 0.0, &zero);
-         inst = emit_instruction(emitInfo,
-                                 OPCODE_SEQ,
-                                 n->Store, /* dest */
-                                 n->Store,
-                                 &zero,
-                                 NULL);
-         if (!inst) {
-            return NULL;
-         }
-         inst_comment(inst, "Invert true/false");
-      }
-   }
-   else {
-      /* size > 4, struct or array compare.
-       * XXX this won't work reliably for structs with padding!!
-       */
-      GLint i, num = (n->Children[0]->Store->Size + 3) / 4;
-      slang_ir_storage accTemp, sneTemp;
-
-      if (!alloc_local_temp(emitInfo, &accTemp, 4))
-         return NULL;
-
-      if (!alloc_local_temp(emitInfo, &sneTemp, 4))
-         return NULL;
-
-      for (i = 0; i < num; i++) {
-         slang_ir_storage srcStore0 = *n->Children[0]->Store;
-         slang_ir_storage srcStore1 = *n->Children[1]->Store;
-         srcStore0.Index += i;
-         srcStore1.Index += i;
-
-         if (i == 0) {
-            /* SNE accTemp, left[i], right[i] */
-            inst = emit_instruction(emitInfo, OPCODE_SNE,
-                                    &accTemp, /* dest */
-                                    &srcStore0,
-                                    &srcStore1,
-                                    NULL);
-            if (!inst) {
-               return NULL;
-            }
-            inst_comment(inst, "Begin struct/array comparison");
-         }
-         else {
-            /* SNE sneTemp, left[i], right[i] */
-            inst = emit_instruction(emitInfo, OPCODE_SNE,
-                                    &sneTemp, /* dest */
-                                    &srcStore0,
-                                    &srcStore1,
-                                    NULL);
-            if (!inst) {
-               return NULL;
-            }
-            /* ADD accTemp, accTemp, sneTemp; # like logical-OR */
-            inst = emit_instruction(emitInfo, OPCODE_ADD,
-                                    &accTemp, /* dest */
-                                    &accTemp,
-                                    &sneTemp,
-                                    NULL);
-            if (!inst) {
-               return NULL;
-            }
-         }
-      }
-
-      /* compute accTemp.x || accTemp.y || accTemp.z || accTemp.w with DOT4 */
-      inst = emit_instruction(emitInfo, OPCODE_DP4,
-                              n->Store,
-                              &accTemp,
-                              &accTemp,
-                              NULL);
-      if (!inst) {
-         return NULL;
-      }
-      inst_comment(inst, "End struct/array comparison");
-
-      if (n->Opcode == IR_EQUAL) {
-         /* compute tmp.x = !tmp.x  via tmp.x = (tmp.x == 0) */
-         slang_ir_storage zero;
-         constant_to_storage(emitInfo, 0.0, &zero);
-         inst = emit_instruction(emitInfo, OPCODE_SEQ,
-                                 n->Store, /* dest */
-                                 n->Store,
-                                 &zero,
-                                 NULL);
-         if (!inst) {
-            return NULL;
-         }
-         inst_comment(inst, "Invert true/false");
-      }
-
-      _slang_free_temp(emitInfo->vt, &accTemp);
-      _slang_free_temp(emitInfo->vt, &sneTemp);
-   }
-
-   /* free temps */
-   free_node_storage(emitInfo->vt, n->Children[0]);
-   free_node_storage(emitInfo->vt, n->Children[1]);
-
-   return inst;
-}
-
-
-
-/**
- * Generate code for an IR_CLAMP instruction.
- */
-static struct prog_instruction *
-emit_clamp(slang_emit_info *emitInfo, slang_ir_node *n)
-{
-   struct prog_instruction *inst;
-   slang_ir_node tmpNode;
-
-   assert(n->Opcode == IR_CLAMP);
-   /* ch[0] = value
-    * ch[1] = min limit
-    * ch[2] = max limit
-    */
-
-   inst = emit(emitInfo, n->Children[0]);
-
-   /* If lower limit == 0.0 and upper limit == 1.0,
-    *    set prev instruction's SaturateMode field to SATURATE_ZERO_ONE.
-    * Else,
-    *    emit OPCODE_MIN, OPCODE_MAX sequence.
-    */
-#if 0
-   /* XXX this isn't quite finished yet */
-   if (n->Children[1]->Opcode == IR_FLOAT &&
-       n->Children[1]->Value[0] == 0.0 &&
-       n->Children[1]->Value[1] == 0.0 &&
-       n->Children[1]->Value[2] == 0.0 &&
-       n->Children[1]->Value[3] == 0.0 &&
-       n->Children[2]->Opcode == IR_FLOAT &&
-       n->Children[2]->Value[0] == 1.0 &&
-       n->Children[2]->Value[1] == 1.0 &&
-       n->Children[2]->Value[2] == 1.0 &&
-       n->Children[2]->Value[3] == 1.0) {
-      if (!inst) {
-         inst = prev_instruction(prog);
-      }
-      if (inst && inst->Opcode != OPCODE_NOP) {
-         /* and prev instruction's DstReg matches n->Children[0]->Store */
-         inst->SaturateMode = SATURATE_ZERO_ONE;
-         n->Store = n->Children[0]->Store;
-         return inst;
-      }
-   }
-#else
-   (void) inst;
-#endif
-
-   if (!alloc_node_storage(emitInfo, n, n->Children[0]->Store->Size))
-      return NULL;
-
-   emit(emitInfo, n->Children[1]);
-   emit(emitInfo, n->Children[2]);
-
-   /* Some GPUs don't allow reading from output registers.  So if the
-    * dest for this clamp() is an output reg, we can't use that reg for
-    * the intermediate result.  Use a temp register instead.
-    */
-   memset(&tmpNode, 0, sizeof(tmpNode));
-   if (!alloc_node_storage(emitInfo, &tmpNode, n->Store->Size)) {
-      return NULL;
-   }
-
-   /* tmp = max(ch[0], ch[1]) */
-   inst = emit_instruction(emitInfo, OPCODE_MAX,
-                           tmpNode.Store, /* dest */
-                           n->Children[0]->Store,
-                           n->Children[1]->Store,
-                           NULL);
-   if (!inst) {
-      return NULL;
-   }
-
-   /* n->dest = min(tmp, ch[2]) */
-   inst = emit_instruction(emitInfo, OPCODE_MIN,
-                           n->Store, /* dest */
-                           tmpNode.Store,
-                           n->Children[2]->Store,
-                           NULL);
-
-   free_node_storage(emitInfo->vt, &tmpNode);
-
-   return inst;
-}
-
-
-static struct prog_instruction *
-emit_negation(slang_emit_info *emitInfo, slang_ir_node *n)
-{
-   /* Implement as MOV dst, -src; */
-   /* XXX we could look at the previous instruction and in some circumstances
-    * modify it to accomplish the negation.
-    */
-   struct prog_instruction *inst;
-
-   emit(emitInfo, n->Children[0]);
-
-   if (!alloc_node_storage(emitInfo, n, n->Children[0]->Store->Size))
-      return NULL;
-
-   inst = emit_instruction(emitInfo,
-                           OPCODE_MOV,
-                           n->Store, /* dest */
-                           n->Children[0]->Store,
-                           NULL,
-                           NULL);
-   if (inst) {
-      inst->SrcReg[0].Negate = NEGATE_XYZW;
-   }
-   return inst;
-}
-
-
-static struct prog_instruction *
-emit_label(slang_emit_info *emitInfo, const slang_ir_node *n)
-{
-   assert(n->Label);
-#if 0
-   /* XXX this fails in loop tail code - investigate someday */
-   assert(_slang_label_get_location(n->Label) < 0);
-   _slang_label_set_location(n->Label, emitInfo->prog->NumInstructions,
-                             emitInfo->prog);
-#else
-   if (_slang_label_get_location(n->Label) < 0)
-      _slang_label_set_location(n->Label, emitInfo->prog->NumInstructions,
-                                emitInfo->prog);
-#endif
-   return NULL;
-}
-
-
-/**
- * Emit code for a function call.
- * Note that for each time a function is called, we emit the function's
- * body code again because the set of available registers may be different.
- */
-static struct prog_instruction *
-emit_fcall(slang_emit_info *emitInfo, slang_ir_node *n)
-{
-   struct gl_program *progSave;
-   struct prog_instruction *inst;
-   GLuint subroutineId;
-   GLuint maxInstSave;
-
-   assert(n->Opcode == IR_CALL);
-   assert(n->Label);
-
-   /* save/push cur program */
-   maxInstSave = emitInfo->MaxInstructions;
-   progSave = emitInfo->prog;
-
-   emitInfo->prog = new_subroutine(emitInfo, &subroutineId);
-   emitInfo->MaxInstructions = emitInfo->prog->NumInstructions;
-
-   _slang_label_set_location(n->Label, emitInfo->prog->NumInstructions,
-                             emitInfo->prog);
-
-   if (emitInfo->EmitBeginEndSub) {
-      /* BGNSUB isn't a real instruction.
-       * We require a label (i.e. "foobar:") though, if we're going to
-       * print the program in the NV format.  The BNGSUB instruction is
-       * really just a NOP to attach the label to.
-       */
-      inst = new_instruction(emitInfo, OPCODE_BGNSUB);
-      if (!inst) {
-         return NULL;
-      }
-      inst_comment(inst, n->Label->Name);
-   }
-
-   /* body of function: */
-   emit(emitInfo, n->Children[0]);
-   n->Store = n->Children[0]->Store;
-
-   /* add RET instruction now, if needed */
-   inst = prev_instruction(emitInfo);
-   if (inst && inst->Opcode != OPCODE_RET) {
-      inst = new_instruction(emitInfo, OPCODE_RET);
-      if (!inst) {
-         return NULL;
-      }
-   }
-
-   if (emitInfo->EmitBeginEndSub) {
-      inst = new_instruction(emitInfo, OPCODE_ENDSUB);
-      if (!inst) {
-         return NULL;
-      }
-      inst_comment(inst, n->Label->Name);
-   }
-
-   /* pop/restore cur program */
-   emitInfo->prog = progSave;
-   emitInfo->MaxInstructions = maxInstSave;
-
-   /* emit the function call */
-   inst = new_instruction(emitInfo, OPCODE_CAL);
-   if (!inst) {
-      return NULL;
-   }
-   /* The branch target is just the subroutine number (changed later) */
-   inst->BranchTarget = subroutineId;
-   inst_comment(inst, n->Label->Name);
-   assert(inst->BranchTarget >= 0);
-
-   return inst;
-}
-
-
-/**
- * Emit code for a 'return' statement.
- */
-static struct prog_instruction *
-emit_return(slang_emit_info *emitInfo, slang_ir_node *n)
-{
-   struct prog_instruction *inst;
-   assert(n);
-   assert(n->Opcode == IR_RETURN);
-   assert(n->Label);
-   inst = new_instruction(emitInfo, OPCODE_RET);
-   if (inst) {
-      inst->DstReg.CondMask = COND_TR;  /* always return */
-   }
-   return inst;
-}
-
-
-static struct prog_instruction *
-emit_kill(slang_emit_info *emitInfo)
-{
-   struct gl_fragment_program *fp;
-   struct prog_instruction *inst;
-   /* NV-KILL - discard fragment depending on condition code.
-    * Note that ARB-KILL depends on sign of vector operand.
-    */
-   inst = new_instruction(emitInfo, OPCODE_KIL_NV);
-   if (!inst) {
-      return NULL;
-   }
-   inst->DstReg.CondMask = COND_TR;  /* always kill */
-
-   assert(emitInfo->prog->Target == GL_FRAGMENT_PROGRAM_ARB);
-   fp = (struct gl_fragment_program *) emitInfo->prog;
-   fp->UsesKill = GL_TRUE;
-
-   return inst;
-}
-
-
-static struct prog_instruction *
-emit_tex(slang_emit_info *emitInfo, slang_ir_node *n)
-{
-   struct prog_instruction *inst;
-   gl_inst_opcode opcode;
-   GLboolean shadow = GL_FALSE;
-
-   switch (n->Opcode) {
-   case IR_TEX:
-      opcode = OPCODE_TEX;
-      break;
-   case IR_TEX_SH:
-      opcode = OPCODE_TEX;
-      shadow = GL_TRUE;
-      break;
-   case IR_TEXB:
-      opcode = OPCODE_TXB;
-      break;
-   case IR_TEXB_SH:
-      opcode = OPCODE_TXB;
-      shadow = GL_TRUE;
-      break;
-   case IR_TEXP:
-      opcode = OPCODE_TXP;
-      break;
-   case IR_TEXP_SH:
-      opcode = OPCODE_TXP;
-      shadow = GL_TRUE;
-      break;
-   default:
-      _mesa_problem(NULL, "Bad IR TEX code");
-      return NULL;
-   }
-
-   if (n->Children[0]->Opcode == IR_ELEMENT) {
-      /* array is the sampler (a uniform which'll indicate the texture unit) */
-      assert(n->Children[0]->Children[0]->Store);
-      assert(n->Children[0]->Children[0]->Store->File == PROGRAM_SAMPLER);
-
-      emit(emitInfo, n->Children[0]);
-
-      n->Children[0]->Var = n->Children[0]->Children[0]->Var;
-   } else {
-      /* this is the sampler (a uniform which'll indicate the texture unit) */
-      assert(n->Children[0]->Store);
-      assert(n->Children[0]->Store->File == PROGRAM_SAMPLER);
-   }
-
-   /* emit code for the texcoord operand */
-   (void) emit(emitInfo, n->Children[1]);
-
-   /* alloc storage for result of texture fetch */
-   if (!alloc_node_storage(emitInfo, n, 4))
-      return NULL;
-
-   /* emit TEX instruction;  Child[1] is the texcoord */
-   inst = emit_instruction(emitInfo,
-                           opcode,
-                           n->Store,
-                           n->Children[1]->Store,
-                           NULL,
-                           NULL);
-   if (!inst) {
-      return NULL;
-   }
-
-   inst->TexShadow = shadow;
-
-   /* Store->Index is the uniform/sampler index */
-   assert(n->Children[0]->Store->Index >= 0);
-   inst->TexSrcUnit = n->Children[0]->Store->Index;
-   inst->TexSrcTarget = n->Children[0]->Store->TexTarget;
-
-   /* mark the sampler as being used */
-   _mesa_use_uniform(emitInfo->prog->Parameters,
-                     (char *) n->Children[0]->Var->a_name);
-
-   return inst;
-}
-
-
-/**
- * Assignment/copy
- */
-static struct prog_instruction *
-emit_copy(slang_emit_info *emitInfo, slang_ir_node *n)
-{
-   struct prog_instruction *inst;
-
-   assert(n->Opcode == IR_COPY);
-
-   /* lhs */
-   emit(emitInfo, n->Children[0]);
-   if (!n->Children[0]->Store || n->Children[0]->Store->Index < 0) {
-      /* an error should have been already recorded */
-      return NULL;
-   }
-
-   /* rhs */
-   assert(n->Children[1]);
-   inst = emit(emitInfo, n->Children[1]);
-
-   if (!n->Children[1]->Store || n->Children[1]->Store->Index < 0) {
-      if (!emitInfo->log->text && !emitInfo->UnresolvedFunctions) {
-         /* XXX this error should have been caught in slang_codegen.c */
-         slang_info_log_error(emitInfo->log, "invalid assignment");
-      }
-      return NULL;
-   }
-
-   assert(n->Children[1]->Store->Index >= 0);
-
-   /*assert(n->Children[0]->Store->Size == n->Children[1]->Store->Size);*/
-
-   n->Store = n->Children[0]->Store;
-
-   if (n->Store->File == PROGRAM_SAMPLER) {
-      /* no code generated for sampler assignments,
-       * just copy the sampler index/target at compile time.
-       */
-      n->Store->Index = n->Children[1]->Store->Index;
-      n->Store->TexTarget = n->Children[1]->Store->TexTarget;
-      return NULL;
-   }
-
-#if PEEPHOLE_OPTIMIZATIONS
-   if (inst &&
-       (n->Children[1]->Opcode != IR_SWIZZLE) &&
-       _slang_is_temp(emitInfo->vt, n->Children[1]->Store) &&
-       (inst->DstReg.File == n->Children[1]->Store->File) &&
-       (inst->DstReg.Index == n->Children[1]->Store->Index) &&
-       !n->Children[0]->Store->IsIndirect &&
-       n->Children[0]->Store->Size <= 4) {
-      /* Peephole optimization:
-       * The Right-Hand-Side has its results in a temporary place.
-       * Modify the RHS (and the prev instruction) to store its results
-       * in the destination specified by n->Children[0].
-       * Then, this MOVE is a no-op.
-       * Ex:
-       *   MUL tmp, x, y;
-       *   MOV a, tmp;
-       * becomes:
-       *   MUL a, x, y;
-       */
-
-      /* fixup the previous instruction (which stored the RHS result) */
-      assert(n->Children[0]->Store->Index >= 0);
-      storage_to_dst_reg(&inst->DstReg, n->Children[0]->Store);
-      return inst;
-   }
-   else
-#endif
-   {
-      if (n->Children[0]->Store->Size > 4) {
-         /* move matrix/struct etc (block of registers) */
-         slang_ir_storage dstStore = *n->Children[0]->Store;
-         slang_ir_storage srcStore = *n->Children[1]->Store;
-         GLint size = srcStore.Size;
-         ASSERT(n->Children[1]->Store->Swizzle == SWIZZLE_NOOP);
-         dstStore.Size = 4;
-         srcStore.Size = 4;
-         while (size >= 4) {
-            inst = emit_instruction(emitInfo, OPCODE_MOV,
-                                    &dstStore,
-                                    &srcStore,
-                                    NULL,
-                                    NULL);
-            if (!inst) {
-               return NULL;
-            }
-            inst_comment(inst, "IR_COPY block");
-            srcStore.Index++;
-            dstStore.Index++;
-            size -= 4;
-         }
-      }
-      else {
-         /* single register move */
-         char *srcAnnot, *dstAnnot;
-         assert(n->Children[0]->Store->Index >= 0);
-         inst = emit_instruction(emitInfo, OPCODE_MOV,
-                                 n->Children[0]->Store, /* dest */
-                                 n->Children[1]->Store,
-                                 NULL,
-                                 NULL);
-         if (!inst) {
-            return NULL;
-         }
-         dstAnnot = storage_annotation(n->Children[0], emitInfo->prog);
-         srcAnnot = storage_annotation(n->Children[1], emitInfo->prog);
-         inst->Comment = instruction_annotation(inst->Opcode, dstAnnot,
-                                                srcAnnot, NULL, NULL);
-      }
-      free_node_storage(emitInfo->vt, n->Children[1]);
-      return inst;
-   }
-}
-
-
-/**
- * An IR_COND node wraps a boolean expression which is used by an
- * IF or WHILE test.  This is where we'll set condition codes, if needed.
- */
-static struct prog_instruction *
-emit_cond(slang_emit_info *emitInfo, slang_ir_node *n)
-{
-   struct prog_instruction *inst;
-
-   assert(n->Opcode == IR_COND);
-
-   if (!n->Children[0])
-      return NULL;
-
-   /* emit code for the expression */
-   inst = emit(emitInfo, n->Children[0]);
-
-   if (!n->Children[0]->Store) {
-      /* error recovery */
-      return NULL;
-   }
-
-   assert(n->Children[0]->Store);
-   /*assert(n->Children[0]->Store->Size == 1);*/
-
-   if (emitInfo->EmitCondCodes) {
-      if (inst &&
-          n->Children[0]->Store &&
-          inst->DstReg.File == n->Children[0]->Store->File &&
-          inst->DstReg.Index == n->Children[0]->Store->Index) {
-         /* The previous instruction wrote to the register who's value
-          * we're testing.  Just fix that instruction so that the
-          * condition codes are computed.
-          */
-         inst->CondUpdate = GL_TRUE;
-         n->Store = n->Children[0]->Store;
-         return inst;
-      }
-      else {
-         /* This'll happen for things like "if (i) ..." where no code
-          * is normally generated for the expression "i".
-          * Generate a move instruction just to set condition codes.
-          */
-         if (!alloc_node_storage(emitInfo, n, 1))
-            return NULL;
-         inst = emit_instruction(emitInfo, OPCODE_MOV,
-                                 n->Store, /* dest */
-                                 n->Children[0]->Store,
-                                 NULL,
-                                 NULL);
-         if (!inst) {
-            return NULL;
-         }
-         inst->CondUpdate = GL_TRUE;
-         inst_comment(inst, "COND expr");
-         _slang_free_temp(emitInfo->vt, n->Store);
-         return inst;
-      }
-   }
-   else {
-      /* No-op: the boolean result of the expression is in a regular reg */
-      n->Store = n->Children[0]->Store;
-      return inst;
-   }
-}
-
-
-/**
- * Logical-NOT
- */
-static struct prog_instruction *
-emit_not(slang_emit_info *emitInfo, slang_ir_node *n)
-{
-   static const struct {
-      gl_inst_opcode op, opNot;
-   } operators[] = {
-      { OPCODE_SLT, OPCODE_SGE },
-      { OPCODE_SLE, OPCODE_SGT },
-      { OPCODE_SGT, OPCODE_SLE },
-      { OPCODE_SGE, OPCODE_SLT },
-      { OPCODE_SEQ, OPCODE_SNE },
-      { OPCODE_SNE, OPCODE_SEQ },
-      { 0, 0 }
-   };
-   struct prog_instruction *inst;
-   slang_ir_storage zero;
-   GLuint i;
-
-   /* child expr */
-   inst = emit(emitInfo, n->Children[0]);
-
-#if PEEPHOLE_OPTIMIZATIONS
-   if (inst) {
-      /* if the prev instruction was a comparison instruction, invert it */
-      for (i = 0; operators[i].op; i++) {
-         if (inst->Opcode == operators[i].op) {
-            inst->Opcode = operators[i].opNot;
-            n->Store = n->Children[0]->Store;
-            return inst;
-         }
-      }
-   }
-#endif
-
-   /* else, invert using SEQ (v = v == 0) */
-   if (!alloc_node_storage(emitInfo, n, n->Children[0]->Store->Size))
-      return NULL;
-
-   constant_to_storage(emitInfo, 0.0, &zero);
-   inst = emit_instruction(emitInfo,
-                           OPCODE_SEQ,
-                           n->Store,
-                           n->Children[0]->Store,
-                           &zero,
-                           NULL);
-   if (!inst) {
-      return NULL;
-   }
-   inst_comment(inst, "NOT");
-
-   free_node_storage(emitInfo->vt, n->Children[0]);
-
-   return inst;
-}
-
-
-static struct prog_instruction *
-emit_if(slang_emit_info *emitInfo, slang_ir_node *n)
-{
-   struct gl_program *prog = emitInfo->prog;
-   GLuint ifInstLoc, elseInstLoc = 0;
-   GLuint condWritemask = 0;
-
-   /* emit condition expression code */
-   {
-      struct prog_instruction *inst;
-      inst = emit(emitInfo, n->Children[0]);
-      if (emitInfo->EmitCondCodes) {
-         if (!inst) {
-            /* error recovery */
-            return NULL;
-         }
-         condWritemask = inst->DstReg.WriteMask;
-      }
-   }
-
-   if (!n->Children[0]->Store)
-      return NULL;
-
-#if 0
-   assert(n->Children[0]->Store->Size == 1); /* a bool! */
-#endif
-
-   ifInstLoc = prog->NumInstructions;
-   if (emitInfo->EmitHighLevelInstructions) {
-      if (emitInfo->EmitCondCodes) {
-         /* IF condcode THEN ... */
-         struct prog_instruction *ifInst = new_instruction(emitInfo, OPCODE_IF);
-         if (!ifInst) {
-            return NULL;
-         }
-         ifInst->DstReg.CondMask = COND_NE;  /* if cond is non-zero */
-         /* only test the cond code (1 of 4) that was updated by the
-          * previous instruction.
-          */
-         ifInst->DstReg.CondSwizzle = writemask_to_swizzle(condWritemask);
-      }
-      else {
-         struct prog_instruction *inst;
-
-         /* IF src[0] THEN ... */
-         inst = emit_instruction(emitInfo, OPCODE_IF,
-                                 NULL, /* dst */
-                                 n->Children[0]->Store, /* op0 */
-                                 NULL,
-                                 NULL);
-         if (!inst) {
-            return NULL;
-         }
-      }
-   }
-   else {
-      /* conditional jump to else, or endif */
-      struct prog_instruction *ifInst = new_instruction(emitInfo, OPCODE_BRA);
-      if (!ifInst) {
-         return NULL;
-      }
-      ifInst->DstReg.CondMask = COND_EQ;  /* BRA if cond is zero */
-      inst_comment(ifInst, "if zero");
-      ifInst->DstReg.CondSwizzle = writemask_to_swizzle(condWritemask);
-   }
-
-   /* if body */
-   emit(emitInfo, n->Children[1]);
-
-   if (n->Children[2]) {
-      /* have else body */
-      elseInstLoc = prog->NumInstructions;
-      if (emitInfo->EmitHighLevelInstructions) {
-         struct prog_instruction *inst = new_instruction(emitInfo, OPCODE_ELSE);
-         if (!inst) {
-            return NULL;
-         }
-         prog->Instructions[ifInstLoc].BranchTarget = prog->NumInstructions - 1;
-      }
-      else {
-         /* jump to endif instruction */
-         struct prog_instruction *inst = new_instruction(emitInfo, OPCODE_BRA);
-         if (!inst) {
-            return NULL;
-         }
-         inst_comment(inst, "else");
-         inst->DstReg.CondMask = COND_TR;  /* always branch */
-         prog->Instructions[ifInstLoc].BranchTarget = prog->NumInstructions;
-      }
-      emit(emitInfo, n->Children[2]);
-   }
-   else {
-      /* no else body */
-      prog->Instructions[ifInstLoc].BranchTarget = prog->NumInstructions;
-   }
-
-   if (emitInfo->EmitHighLevelInstructions) {
-      struct prog_instruction *inst = new_instruction(emitInfo, OPCODE_ENDIF);
-      if (!inst) {
-         return NULL;
-      }
-   }
-
-   if (elseInstLoc) {
-      /* point ELSE instruction BranchTarget at ENDIF */
-      if (emitInfo->EmitHighLevelInstructions) {
-         prog->Instructions[elseInstLoc].BranchTarget = prog->NumInstructions - 1;
-      }
-      else {
-         prog->Instructions[elseInstLoc].BranchTarget = prog->NumInstructions;
-      }
-   }
-   return NULL;
-}
-
-
-static struct prog_instruction *
-emit_loop(slang_emit_info *emitInfo, slang_ir_node *n)
-{
-   struct gl_program *prog = emitInfo->prog;
-   struct prog_instruction *endInst;
-   GLuint beginInstLoc, tailInstLoc, endInstLoc;
-   slang_ir_node *ir;
-
-   /* emit OPCODE_BGNLOOP */
-   beginInstLoc = prog->NumInstructions;
-   if (emitInfo->EmitHighLevelInstructions) {
-      struct prog_instruction *inst = new_instruction(emitInfo, OPCODE_BGNLOOP);
-      if (!inst) {
-         return NULL;
-      }
-   }
-
-   /* body */
-   emit(emitInfo, n->Children[0]);
-
-   /* tail */
-   tailInstLoc = prog->NumInstructions;
-   if (n->Children[1]) {
-      if (emitInfo->EmitComments)
-         emit_comment(emitInfo, "Loop tail code:");
-      emit(emitInfo, n->Children[1]);
-   }
-
-   endInstLoc = prog->NumInstructions;
-   if (emitInfo->EmitHighLevelInstructions) {
-      /* emit OPCODE_ENDLOOP */
-      endInst = new_instruction(emitInfo, OPCODE_ENDLOOP);
-      if (!endInst) {
-         return NULL;
-      }
-   }
-   else {
-      /* emit unconditional BRA-nch */
-      endInst = new_instruction(emitInfo, OPCODE_BRA);
-      if (!endInst) {
-         return NULL;
-      }
-      endInst->DstReg.CondMask = COND_TR;  /* always true */
-   }
-   /* ENDLOOP's BranchTarget points to the BGNLOOP inst */
-   endInst->BranchTarget = beginInstLoc;
-
-   if (emitInfo->EmitHighLevelInstructions) {
-      /* BGNLOOP's BranchTarget points to the ENDLOOP inst */
-      prog->Instructions[beginInstLoc].BranchTarget = prog->NumInstructions -1;
-   }
-
-   /* Done emitting loop code.  Now walk over the loop's linked list of
-    * BREAK and CONT nodes, filling in their BranchTarget fields (which
-    * will point to the corresponding ENDLOOP instruction.
-    */
-   for (ir = n->List; ir; ir = ir->List) {
-      struct prog_instruction *inst = prog->Instructions + ir->InstLocation;
-      assert(inst->BranchTarget < 0);
-      if (ir->Opcode == IR_BREAK ||
-          ir->Opcode == IR_BREAK_IF_TRUE) {
-         assert(inst->Opcode == OPCODE_BRK ||
-                inst->Opcode == OPCODE_BRA);
-         /* go to instruction at end of loop */
-         if (emitInfo->EmitHighLevelInstructions) {
-            inst->BranchTarget = endInstLoc;
-         }
-         else {
-            inst->BranchTarget = endInstLoc + 1;
-         }
-      }
-      else {
-         assert(ir->Opcode == IR_CONT ||
-                ir->Opcode == IR_CONT_IF_TRUE);
-         assert(inst->Opcode == OPCODE_CONT ||
-                inst->Opcode == OPCODE_BRA);
-         /* go to instruction at tail of loop */
-         inst->BranchTarget = endInstLoc;
-      }
-   }
-   return NULL;
-}
-
-
-/**
- * Unconditional "continue" or "break" statement.
- * Either OPCODE_CONT, OPCODE_BRK or OPCODE_BRA will be emitted.
- */
-static struct prog_instruction *
-emit_cont_break(slang_emit_info *emitInfo, slang_ir_node *n)
-{
-   gl_inst_opcode opcode;
-   struct prog_instruction *inst;
-
-   if (n->Opcode == IR_CONT) {
-      /* we need to execute the loop's tail code before doing CONT */
-      assert(n->Parent);
-      assert(n->Parent->Opcode == IR_LOOP);
-      if (n->Parent->Children[1]) {
-         /* emit tail code */
-         if (emitInfo->EmitComments) {
-            emit_comment(emitInfo, "continue - tail code:");
-         }
-         emit(emitInfo, n->Parent->Children[1]);
-      }
-   }
-
-   /* opcode selection */
-   if (emitInfo->EmitHighLevelInstructions) {
-      opcode = (n->Opcode == IR_CONT) ? OPCODE_CONT : OPCODE_BRK;
-   }
-   else {
-      opcode = OPCODE_BRA;
-   }
-   n->InstLocation = emitInfo->prog->NumInstructions;
-   inst = new_instruction(emitInfo, opcode);
-   if (inst) {
-      inst->DstReg.CondMask = COND_TR;  /* always true */
-   }
-   return inst;
-}
-
-
-/**
- * Conditional "continue" or "break" statement.
- * Either OPCODE_CONT, OPCODE_BRK or OPCODE_BRA will be emitted.
- */
-static struct prog_instruction *
-emit_cont_break_if_true(slang_emit_info *emitInfo, slang_ir_node *n)
-{
-   struct prog_instruction *inst;
-
-   assert(n->Opcode == IR_CONT_IF_TRUE ||
-          n->Opcode == IR_BREAK_IF_TRUE);
-
-   /* evaluate condition expr, setting cond codes */
-   inst = emit(emitInfo, n->Children[0]);
-   if (emitInfo->EmitCondCodes) {
-      assert(inst);
-      inst->CondUpdate = GL_TRUE;
-   }
-
-   n->InstLocation = emitInfo->prog->NumInstructions;
-
-   /* opcode selection */
-   if (emitInfo->EmitHighLevelInstructions) {
-      const gl_inst_opcode opcode
-         = (n->Opcode == IR_CONT_IF_TRUE) ? OPCODE_CONT : OPCODE_BRK;
-      if (emitInfo->EmitCondCodes) {
-         /* Get the writemask from the previous instruction which set
-          * the condcodes.  Use that writemask as the CondSwizzle.
-          */
-         const GLuint condWritemask = inst->DstReg.WriteMask;
-         inst = new_instruction(emitInfo, opcode);
-         if (inst) {
-            inst->DstReg.CondMask = COND_NE;
-            inst->DstReg.CondSwizzle = writemask_to_swizzle(condWritemask);
-         }
-         return inst;
-      }
-      else {
-         /* IF reg
-          *    BRK/CONT;
-          * ENDIF
-          */
-         GLint ifInstLoc;
-         ifInstLoc = emitInfo->prog->NumInstructions;
-         inst = emit_instruction(emitInfo, OPCODE_IF,
-                                 NULL, /* dest */
-                                 n->Children[0]->Store,
-                                 NULL,
-                                 NULL);
-         if (!inst) {
-            return NULL;
-         }
-         n->InstLocation = emitInfo->prog->NumInstructions;
-
-         inst = new_instruction(emitInfo, opcode);
-         if (!inst) {
-            return NULL;
-         }
-         inst = new_instruction(emitInfo, OPCODE_ENDIF);
-         if (!inst) {
-            return NULL;
-         }
-
-         emitInfo->prog->Instructions[ifInstLoc].BranchTarget
-            = emitInfo->prog->NumInstructions - 1;
-         return inst;
-      }
-   }
-   else {
-      const GLuint condWritemask = inst->DstReg.WriteMask;
-      assert(emitInfo->EmitCondCodes);
-      inst = new_instruction(emitInfo, OPCODE_BRA);
-      if (inst) {
-         inst->DstReg.CondMask = COND_NE;
-         inst->DstReg.CondSwizzle = writemask_to_swizzle(condWritemask);
-      }
-      return inst;
-   }
-}
-
-
-/**
- * Return the size of a swizzle mask given that some swizzle components
- * may be NIL/undefined.  For example:
- *  swizzle_size(".zzxx") = 4
- *  swizzle_size(".xy??") = 2
- *  swizzle_size(".w???") = 1
- */
-static GLuint
-swizzle_size(GLuint swizzle)
-{
-   GLuint i;
-   for (i = 0; i < 4; i++) {
-      if (GET_SWZ(swizzle, i) == SWIZZLE_NIL)
-         return i;
-   }
-   return 4;
-}
-
-
-static struct prog_instruction *
-emit_swizzle(slang_emit_info *emitInfo, slang_ir_node *n)
-{
-   struct prog_instruction *inst;
-
-   inst = emit(emitInfo, n->Children[0]);
-
-   if (!n->Store->Parent) {
-      /* this covers a case such as "(b ? p : q).x" */
-      n->Store->Parent = n->Children[0]->Store;
-      assert(n->Store->Parent);
-   }
-
-   {
-      const GLuint swizzle = n->Store->Swizzle;
-      /* new storage is parent storage with updated Swizzle + Size fields */
-      _slang_copy_ir_storage(n->Store, n->Store->Parent);
-      /* Apply this node's swizzle to parent's storage */
-      n->Store->Swizzle = _slang_swizzle_swizzle(n->Store->Swizzle, swizzle);
-      /* Update size */
-      n->Store->Size = swizzle_size(n->Store->Swizzle);
-   }
-
-   assert(!n->Store->Parent);
-   assert(n->Store->Index >= 0);
-
-   return inst;
-}
-
-
-/**
- * Dereference array element:  element == array[index]
- * This basically involves emitting code for computing the array index
- * and updating the node/element's storage info.
- */
-static struct prog_instruction *
-emit_array_element(slang_emit_info *emitInfo, slang_ir_node *n)
-{
-   slang_ir_storage *arrayStore, *indexStore;
-   const int elemSize = n->Store->Size;           /* number of floats */
-   const GLint elemSizeVec = (elemSize + 3) / 4;  /* number of vec4 */
-   struct prog_instruction *inst;
-
-   assert(n->Opcode == IR_ELEMENT);
-   assert(elemSize > 0);
-
-   /* special case for built-in state variables, like light state */
-   {
-      slang_ir_storage *root = n->Store;
-      assert(!root->Parent);
-      while (root->Parent)
-         root = root->Parent;
-
-      if (root->File == PROGRAM_STATE_VAR) {
-         GLboolean direct;
-         GLint index =
-            _slang_alloc_statevar(n, emitInfo->prog->Parameters, &direct);
-         if (index < 0) {
-            /* error */
-            return NULL;
-         }
-         if (direct) {
-            n->Store->Index = index;
-            return NULL; /* all done */
-         }
-      }
-   }
-
-   /* do codegen for array itself */
-   emit(emitInfo, n->Children[0]);
-   arrayStore = n->Children[0]->Store;
-
-   /* The initial array element storage is the array's storage,
-    * then modified below.
-    */
-   _slang_copy_ir_storage(n->Store, arrayStore);
-
-
-   if (n->Children[1]->Opcode == IR_FLOAT) {
-      /* Constant array index */
-      const GLint element = (GLint) n->Children[1]->Value[0];
-
-      /* this element's storage is the array's storage, plus constant offset */
-      n->Store->Index += elemSizeVec * element;
-   }
-   else {
-      /* Variable array index */
-
-      /* do codegen for array index expression */
-      emit(emitInfo, n->Children[1]);
-      indexStore = n->Children[1]->Store;
-
-      if (indexStore->IsIndirect) {
-         /* need to put the array index into a temporary since we can't
-          * directly support a[b[i]] constructs.
-          */
-
-
-         /*indexStore = tempstore();*/
-      }
-
-
-      if (elemSize > 4) {
-         /* need to multiply array index by array element size */
-         struct prog_instruction *inst;
-         slang_ir_storage *indexTemp;
-         slang_ir_storage elemSizeStore;
-
-         /* allocate 1 float indexTemp */
-         indexTemp = _slang_new_ir_storage(PROGRAM_TEMPORARY, -1, 1);
-         _slang_alloc_temp(emitInfo->vt, indexTemp);
-
-         /* allocate a constant containing the element size */
-         constant_to_storage(emitInfo, (float) elemSizeVec, &elemSizeStore);
-
-         /* multiply array index by element size */
-         inst = emit_instruction(emitInfo,
-                                 OPCODE_MUL,
-                                 indexTemp, /* dest */
-                                 indexStore, /* the index */
-                                 &elemSizeStore,
-                                 NULL);
-         if (!inst) {
-            return NULL;
-         }
-
-         indexStore = indexTemp;
-      }
-
-      if (arrayStore->IsIndirect) {
-         /* ex: in a[i][j], a[i] (the arrayStore) is indirect */
-         /* Need to add indexStore to arrayStore->Indirect store */
-         slang_ir_storage indirectArray;
-         slang_ir_storage *indexTemp;
-
-         _slang_init_ir_storage(&indirectArray,
-                                arrayStore->IndirectFile,
-                                arrayStore->IndirectIndex,
-                                1,
-                                arrayStore->IndirectSwizzle);
-
-         /* allocate 1 float indexTemp */
-         indexTemp = _slang_new_ir_storage(PROGRAM_TEMPORARY, -1, 1);
-         _slang_alloc_temp(emitInfo->vt, indexTemp);
-
-         inst = emit_instruction(emitInfo,
-                                 OPCODE_ADD,
-                                 indexTemp,      /* dest */
-                                 indexStore,     /* the index */
-                                 &indirectArray, /* indirect array base */
-                                 NULL);
-         if (!inst) {
-            return NULL;
-         }
-
-         indexStore = indexTemp;
-      }
-
-      /* update the array element storage info */
-      n->Store->IsIndirect = GL_TRUE;
-      n->Store->IndirectFile = indexStore->File;
-      n->Store->IndirectIndex = indexStore->Index;
-      n->Store->IndirectSwizzle = indexStore->Swizzle;
-   }
-
-   n->Store->Size = elemSize;
-   n->Store->Swizzle = _slang_var_swizzle(elemSize, 0);
-
-   return NULL; /* no instruction */
-}
-
-
-/**
- * Resolve storage for accessing a structure field.
- */
-static struct prog_instruction *
-emit_struct_field(slang_emit_info *emitInfo, slang_ir_node *n)
-{
-   slang_ir_storage *root = n->Store;
-   GLint fieldOffset, fieldSize;
-
-   assert(n->Opcode == IR_FIELD);
-
-   assert(!root->Parent);
-   while (root->Parent)
-      root = root->Parent;
-
-   /* If this is the field of a state var, allocate constant/uniform
-    * storage for it now if we haven't already.
-    * Note that we allocate storage (uniform/constant slots) for state
-    * variables here rather than at declaration time so we only allocate
-    * space for the ones that we actually use!
-    */
-   if (root->File == PROGRAM_STATE_VAR) {
-      GLboolean direct;
-      GLint index = _slang_alloc_statevar(n, emitInfo->prog->Parameters, &direct);
-      if (index < 0) {
-         slang_info_log_error(emitInfo->log, "Error parsing state variable");
-         return NULL;
-      }
-      if (direct) {
-         root->Index = index;
-         return NULL; /* all done */
-      }
-   }
-
-   /* do codegen for struct */
-   emit(emitInfo, n->Children[0]);
-   assert(n->Children[0]->Store->Index >= 0);
-
-
-   fieldOffset = n->Store->Index;
-   fieldSize = n->Store->Size;
-
-   _slang_copy_ir_storage(n->Store, n->Children[0]->Store);
-
-   n->Store->Index = n->Children[0]->Store->Index + fieldOffset / 4;
-   n->Store->Size = fieldSize;
-
-   switch (fieldSize) {
-   case 1:
-      {
-         GLint swz = fieldOffset % 4;
-         n->Store->Swizzle = MAKE_SWIZZLE4(swz, swz, swz, swz);
-      }
-      break;
-   case 2:
-      n->Store->Swizzle = MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_Y,
-                                        SWIZZLE_NIL, SWIZZLE_NIL);
-      break;
-   case 3:
-      n->Store->Swizzle = MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_Y,
-                                        SWIZZLE_Z, SWIZZLE_NIL);
-      break;
-   default:
-      n->Store->Swizzle = SWIZZLE_XYZW;
-   }
-
-   assert(n->Store->Index >= 0);
-
-   return NULL; /* no instruction */
-}
-
-
-/**
- * Emit code for a variable declaration.
- * This usually doesn't result in any code generation, but just
- * memory allocation.
- */
-static struct prog_instruction *
-emit_var_decl(slang_emit_info *emitInfo, slang_ir_node *n)
-{
-   assert(n->Store);
-   assert(n->Store->File != PROGRAM_UNDEFINED);
-   assert(n->Store->Size > 0);
-   /*assert(n->Store->Index < 0);*/
-
-   if (!n->Var || n->Var->isTemp) {
-      /* a nameless/temporary variable, will be freed after first use */
-      /*NEW*/
-      if (n->Store->Index < 0 && !_slang_alloc_temp(emitInfo->vt, n->Store)) {
-         slang_info_log_error(emitInfo->log,
-                              "Ran out of registers, too many temporaries");
-         return NULL;
-      }
-   }
-   else {
-      /* a regular variable */
-      _slang_add_variable(emitInfo->vt, n->Var);
-      if (!_slang_alloc_var(emitInfo->vt, n->Store)) {
-         slang_info_log_error(emitInfo->log,
-                              "Ran out of registers, too many variables");
-         return NULL;
-      }
-      /*
-        printf("IR_VAR_DECL %s %d store %p\n",
-        (char*) n->Var->a_name, n->Store->Index, (void*) n->Store);
-      */
-      assert(n->Var->store == n->Store);
-   }
-   if (emitInfo->EmitComments) {
-      /* emit NOP with comment describing the variable's storage location */
-      char s[1000];
-      sprintf(s, "TEMP[%d]%s = variable %s (size %d)",
-              n->Store->Index,
-              _mesa_swizzle_string(n->Store->Swizzle, 0, GL_FALSE), 
-              (n->Var ? (char *) n->Var->a_name : "anonymous"),
-              n->Store->Size);
-      emit_comment(emitInfo, s);
-   }
-   return NULL;
-}
-
-
-/**
- * Emit code for a reference to a variable.
- * Actually, no code is generated but we may do some memory allocation.
- * In particular, state vars (uniforms) are allocated on an as-needed basis.
- */
-static struct prog_instruction *
-emit_var_ref(slang_emit_info *emitInfo, slang_ir_node *n)
-{
-   assert(n->Store);
-   assert(n->Store->File != PROGRAM_UNDEFINED);
-
-   if (n->Store->File == PROGRAM_STATE_VAR && n->Store->Index < 0) {
-      GLboolean direct;
-      GLint index = _slang_alloc_statevar(n, emitInfo->prog->Parameters, &direct);
-      if (index < 0) {
-         /* error */
-         char s[100];
-         /* XXX isn't this really an out of memory/resources error? */
-         _mesa_snprintf(s, sizeof(s), "Undefined variable '%s'",
-		  (char *) n->Var->a_name);
-         slang_info_log_error(emitInfo->log, s);
-         return NULL;
-      }
-
-      n->Store->Index = index;
-   }
-   else if (n->Store->File == PROGRAM_UNIFORM ||
-            n->Store->File == PROGRAM_SAMPLER) {
-      /* mark var as used */
-      _mesa_use_uniform(emitInfo->prog->Parameters, (char *) n->Var->a_name);
-   }
-   else if (n->Store->File == PROGRAM_INPUT) {
-      assert(n->Store->Index >= 0);
-      emitInfo->prog->InputsRead |= (1 << n->Store->Index);
-   }
-
-   if (n->Store->Index < 0) {
-      /* probably ran out of registers */
-      return NULL;
-   }
-   assert(n->Store->Size > 0);
-
-   return NULL;
-}
-
-
-static struct prog_instruction *
-emit(slang_emit_info *emitInfo, slang_ir_node *n)
-{
-   struct prog_instruction *inst;
-   if (!n)
-      return NULL;
-
-   if (emitInfo->log->error_flag) {
-      return NULL;
-   }
-
-   if (n->Comment) {
-      inst = new_instruction(emitInfo, OPCODE_NOP);
-      if (inst) {
-         inst->Comment = _mesa_strdup(n->Comment);
-      }
-      inst = NULL;
-   }
-
-   switch (n->Opcode) {
-   case IR_SEQ:
-      /* sequence of two sub-trees */
-      assert(n->Children[0]);
-      assert(n->Children[1]);
-      emit(emitInfo, n->Children[0]);
-      if (emitInfo->log->error_flag)
-         return NULL;
-      inst = emit(emitInfo, n->Children[1]);
-#if 0
-      assert(!n->Store);
-#endif
-      n->Store = n->Children[1]->Store;
-      return inst;
-
-   case IR_SCOPE:
-      /* new variable scope */
-      _slang_push_var_table(emitInfo->vt);
-      inst = emit(emitInfo, n->Children[0]);
-      _slang_pop_var_table(emitInfo->vt);
-      return inst;
-
-   case IR_VAR_DECL:
-      /* Variable declaration - allocate a register for it */
-      inst = emit_var_decl(emitInfo, n);
-      return inst;
-
-   case IR_VAR:
-      /* Reference to a variable
-       * Storage should have already been resolved/allocated.
-       */
-      return emit_var_ref(emitInfo, n);
-
-   case IR_ELEMENT:
-      return emit_array_element(emitInfo, n);
-   case IR_FIELD:
-      return emit_struct_field(emitInfo, n);
-   case IR_SWIZZLE:
-      return emit_swizzle(emitInfo, n);
-
-   /* Simple arithmetic */
-   /* unary */
-   case IR_MOVE:
-   case IR_RSQ:
-   case IR_RCP:
-   case IR_FLOOR:
-   case IR_FRAC:
-   case IR_F_TO_I:
-   case IR_I_TO_F:
-   case IR_ABS:
-   case IR_SIN:
-   case IR_COS:
-   case IR_DDX:
-   case IR_DDY:
-   case IR_EXP:
-   case IR_EXP2:
-   case IR_LOG2:
-   case IR_NOISE1:
-   case IR_NOISE2:
-   case IR_NOISE3:
-   case IR_NOISE4:
-   case IR_NRM4:
-   case IR_NRM3:
-   /* binary */
-   case IR_ADD:
-   case IR_SUB:
-   case IR_MUL:
-   case IR_DOT4:
-   case IR_DOT3:
-   case IR_DOT2:
-   case IR_CROSS:
-   case IR_MIN:
-   case IR_MAX:
-   case IR_SEQUAL:
-   case IR_SNEQUAL:
-   case IR_SGE:
-   case IR_SGT:
-   case IR_SLE:
-   case IR_SLT:
-   case IR_POW:
-   /* trinary operators */
-   case IR_LRP:
-   case IR_CMP:
-      return emit_arith(emitInfo, n);
-
-   case IR_EQUAL:
-   case IR_NOTEQUAL:
-      return emit_compare(emitInfo, n);
-
-   case IR_CLAMP:
-      return emit_clamp(emitInfo, n);
-   case IR_TEX:
-   case IR_TEXB:
-   case IR_TEXP:
-   case IR_TEX_SH:
-   case IR_TEXB_SH:
-   case IR_TEXP_SH:
-      return emit_tex(emitInfo, n);
-   case IR_NEG:
-      return emit_negation(emitInfo, n);
-   case IR_FLOAT:
-      /* find storage location for this float constant */
-      n->Store->Index = _mesa_add_unnamed_constant(emitInfo->prog->Parameters,
-                                                   n->Value,
-                                                   n->Store->Size,
-                                                   &n->Store->Swizzle);
-      if (n->Store->Index < 0) {
-         slang_info_log_error(emitInfo->log, "Ran out of space for constants");
-         return NULL;
-      }
-      return NULL;
-
-   case IR_COPY:
-      return emit_copy(emitInfo, n);
-
-   case IR_COND:
-      return emit_cond(emitInfo, n);
-
-   case IR_NOT:
-      return emit_not(emitInfo, n);
-
-   case IR_LABEL:
-      return emit_label(emitInfo, n);
-
-   case IR_KILL:
-      return emit_kill(emitInfo);
-
-   case IR_CALL:
-      /* new variable scope for subroutines/function calls */
-      _slang_push_var_table(emitInfo->vt);
-      inst = emit_fcall(emitInfo, n);
-      _slang_pop_var_table(emitInfo->vt);
-      return inst;
-
-   case IR_IF:
-      return emit_if(emitInfo, n);
-
-   case IR_LOOP:
-      return emit_loop(emitInfo, n);
-   case IR_BREAK_IF_TRUE:
-   case IR_CONT_IF_TRUE:
-      return emit_cont_break_if_true(emitInfo, n);
-   case IR_BREAK:
-      /* fall-through */
-   case IR_CONT:
-      return emit_cont_break(emitInfo, n);
-
-   case IR_BEGIN_SUB:
-      return new_instruction(emitInfo, OPCODE_BGNSUB);
-   case IR_END_SUB:
-      return new_instruction(emitInfo, OPCODE_ENDSUB);
-   case IR_RETURN:
-      return emit_return(emitInfo, n);
-
-   case IR_NOP:
-      return NULL;
-
-   default:
-      _mesa_problem(NULL, "Unexpected IR opcode in emit()\n");
-   }
-   return NULL;
-}
-
-
-/**
- * After code generation, any subroutines will be in separate program
- * objects.  This function appends all the subroutines onto the main
- * program and resolves the linking of all the branch/call instructions.
- * XXX this logic should really be part of the linking process...
- */
-static void
-_slang_resolve_subroutines(slang_emit_info *emitInfo)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_program *mainP = emitInfo->prog;
-   GLuint *subroutineLoc, i, total;
-
-   subroutineLoc
-      = (GLuint *) malloc(emitInfo->NumSubroutines * sizeof(GLuint));
-
-   /* total number of instructions */
-   total = mainP->NumInstructions;
-   for (i = 0; i < emitInfo->NumSubroutines; i++) {
-      subroutineLoc[i] = total;
-      total += emitInfo->Subroutines[i]->NumInstructions;
-   }
-
-   /* adjust BranchTargets within the functions */
-   for (i = 0; i < emitInfo->NumSubroutines; i++) {
-      struct gl_program *sub = emitInfo->Subroutines[i];
-      GLuint j;
-      for (j = 0; j < sub->NumInstructions; j++) {
-         struct prog_instruction *inst = sub->Instructions + j;
-         if (inst->Opcode != OPCODE_CAL && inst->BranchTarget >= 0) {
-            inst->BranchTarget += subroutineLoc[i];
-         }
-      }
-   }
-
-   /* append subroutines' instructions after main's instructions */
-   mainP->Instructions = _mesa_realloc_instructions(mainP->Instructions,
-                                                    mainP->NumInstructions,
-                                                    total);
-   mainP->NumInstructions = total;
-   for (i = 0; i < emitInfo->NumSubroutines; i++) {
-      struct gl_program *sub = emitInfo->Subroutines[i];
-      _mesa_copy_instructions(mainP->Instructions + subroutineLoc[i],
-                              sub->Instructions,
-                              sub->NumInstructions);
-      /* delete subroutine code */
-      sub->Parameters = NULL; /* prevent double-free */
-      _mesa_reference_program(ctx, &emitInfo->Subroutines[i], NULL);
-   }
-
-   /* free subroutine list */
-   if (emitInfo->Subroutines) {
-      free(emitInfo->Subroutines);
-      emitInfo->Subroutines = NULL;
-   }
-   emitInfo->NumSubroutines = 0;
-
-   /* Examine CAL instructions.
-    * At this point, the BranchTarget field of the CAL instruction is
-    * the number/id of the subroutine to call (an index into the
-    * emitInfo->Subroutines list).
-    * Translate that into an actual instruction location now.
-    */
-   for (i = 0; i < mainP->NumInstructions; i++) {
-      struct prog_instruction *inst = mainP->Instructions + i;
-      if (inst->Opcode == OPCODE_CAL) {
-         const GLuint f = inst->BranchTarget;
-         inst->BranchTarget = subroutineLoc[f];
-      }
-   }
-
-   free(subroutineLoc);
-}
-
-
-
-/**
- * Convert the IR tree into GPU instructions.
- * \param n  root of IR tree
- * \param vt  variable table
- * \param prog  program to put GPU instructions into
- * \param pragmas  controls codegen options
- * \param withEnd  if true, emit END opcode at end
- * \param log  log for emitting errors/warnings/info
- */
-GLboolean
-_slang_emit_code(slang_ir_node *n, slang_var_table *vt,
-                 struct gl_program *prog,
-                 const struct gl_sl_pragmas *pragmas,
-                 GLboolean withEnd,
-                 slang_info_log *log)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLboolean success;
-   slang_emit_info emitInfo;
-   GLuint maxUniforms;
-
-   emitInfo.log = log;
-   emitInfo.vt = vt;
-   emitInfo.prog = prog;
-   emitInfo.Subroutines = NULL;
-   emitInfo.NumSubroutines = 0;
-   emitInfo.MaxInstructions = prog->NumInstructions;
-
-   emitInfo.EmitHighLevelInstructions = ctx->Shader.EmitHighLevelInstructions;
-   emitInfo.EmitCondCodes = ctx->Shader.EmitCondCodes;
-   emitInfo.EmitComments = ctx->Shader.EmitComments || pragmas->Debug;
-   emitInfo.EmitBeginEndSub = GL_TRUE;
-
-   if (!emitInfo.EmitCondCodes) {
-      emitInfo.EmitHighLevelInstructions = GL_TRUE;
-   }      
-
-   /* Check uniform/constant limits */
-   if (prog->Target == GL_FRAGMENT_PROGRAM_ARB) {
-      maxUniforms = ctx->Const.FragmentProgram.MaxUniformComponents / 4;
-   }
-   else {
-      assert(prog->Target == GL_VERTEX_PROGRAM_ARB);
-      maxUniforms = ctx->Const.VertexProgram.MaxUniformComponents / 4;
-   }
-   if (prog->Parameters->NumParameters > maxUniforms) {
-      slang_info_log_error(log, "Constant/uniform register limit exceeded "
-                           "(max=%u vec4)", maxUniforms);
-
-      return GL_FALSE;
-   }
-
-   (void) emit(&emitInfo, n);
-
-   /* finish up by adding the END opcode to program */
-   if (withEnd) {
-      struct prog_instruction *inst;
-      inst = new_instruction(&emitInfo, OPCODE_END);
-      if (!inst) {
-         return GL_FALSE;
-      }
-   }
-
-   _slang_resolve_subroutines(&emitInfo);
-
-   success = GL_TRUE;
-
-#if 0
-   printf("*********** End emit code (%u inst):\n", prog->NumInstructions);
-   _mesa_print_program(prog);
-   _mesa_print_program_parameters(ctx,prog);
-#endif
-
-   return success;
-}
diff --git a/mesalib/src/mesa/shader/slang/slang_emit.h b/mesalib/src/mesa/shader/slang/slang_emit.h
deleted file mode 100644
index ab4c202d6..000000000
--- a/mesalib/src/mesa/shader/slang/slang_emit.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.1
- *
- * Copyright (C) 2005-2008  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef SLANG_EMIT_H
-#define SLANG_EMIT_H
-
-
-#include "main/imports.h"
-#include "slang_compile.h"
-#include "slang_ir.h"
-#include "main/mtypes.h"
-
-
-extern GLuint
-_slang_swizzle_swizzle(GLuint swz1, GLuint swz2);
-
-
-extern GLuint
-_slang_var_swizzle(GLint size, GLint comp);
-
-
-extern GLboolean
-_slang_emit_code(slang_ir_node *n, slang_var_table *vartable,
-                 struct gl_program *prog,
-                 const struct gl_sl_pragmas *pragmas,
-                 GLboolean withEnd,
-                 slang_info_log *log);
-
-
-#endif /* SLANG_EMIT_H */
diff --git a/mesalib/src/mesa/shader/slang/slang_ir.c b/mesalib/src/mesa/shader/slang/slang_ir.c
deleted file mode 100644
index 62603503d..000000000
--- a/mesalib/src/mesa/shader/slang/slang_ir.c
+++ /dev/null
@@ -1,498 +0,0 @@
-/*
- * Mesa 3-D graphics library
- *
- * Copyright (C) 2005-2008  Brian Paul   All Rights Reserved.
- * Copyright (C) 2009  VMware, Inc.   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#include "main/imports.h"
-#include "main/context.h"
-#include "slang_ir.h"
-#include "slang_mem.h"
-#include "shader/prog_instruction.h"
-#include "shader/prog_print.h"
-
-
-static const slang_ir_info IrInfo[] = {
-   /* binary ops */
-   { IR_ADD, "IR_ADD", OPCODE_ADD, 4, 2 },
-   { IR_SUB, "IR_SUB", OPCODE_SUB, 4, 2 },
-   { IR_MUL, "IR_MUL", OPCODE_MUL, 4, 2 },
-   { IR_DIV, "IR_DIV", OPCODE_NOP, 0, 2 }, /* XXX broke */
-   { IR_DOT4, "IR_DOT4", OPCODE_DP4, 1, 2 },
-   { IR_DOT3, "IR_DOT3", OPCODE_DP3, 1, 2 },
-   { IR_DOT2, "IR_DOT2", OPCODE_DP2, 1, 2 },
-   { IR_NRM4, "IR_NRM4", OPCODE_NRM4, 1, 1 },
-   { IR_NRM3, "IR_NRM3", OPCODE_NRM3, 1, 1 },
-   { IR_CROSS, "IR_CROSS", OPCODE_XPD, 3, 2 },
-   { IR_LRP, "IR_LRP", OPCODE_LRP, 4, 3 },
-   { IR_MIN, "IR_MIN", OPCODE_MIN, 4, 2 },
-   { IR_MAX, "IR_MAX", OPCODE_MAX, 4, 2 },
-   { IR_CLAMP, "IR_CLAMP", OPCODE_NOP, 4, 3 }, /* special case: emit_clamp() */
-   { IR_SEQUAL, "IR_SEQUAL", OPCODE_SEQ, 4, 2 },
-   { IR_SNEQUAL, "IR_SNEQUAL", OPCODE_SNE, 4, 2 },
-   { IR_SGE, "IR_SGE", OPCODE_SGE, 4, 2 },
-   { IR_SGT, "IR_SGT", OPCODE_SGT, 4, 2 },
-   { IR_SLE, "IR_SLE", OPCODE_SLE, 4, 2 },
-   { IR_SLT, "IR_SLT", OPCODE_SLT, 4, 2 },
-   { IR_POW, "IR_POW", OPCODE_POW, 1, 2 },
-   { IR_EQUAL, "IR_EQUAL", OPCODE_NOP, 1, 2 },
-   { IR_NOTEQUAL, "IR_NOTEQUAL", OPCODE_NOP, 1, 2 },
-
-   /* unary ops */
-   { IR_MOVE, "IR_MOVE", OPCODE_MOV, 4, 1 },
-   { IR_I_TO_F, "IR_I_TO_F", OPCODE_MOV, 4, 1 },  /* int[4] to float[4] */
-   { IR_F_TO_I, "IR_F_TO_I", OPCODE_TRUNC, 4, 1 },
-   { IR_EXP, "IR_EXP", OPCODE_EXP, 1, 1 },
-   { IR_EXP2, "IR_EXP2", OPCODE_EX2, 1, 1 },
-   { IR_LOG2, "IR_LOG2", OPCODE_LG2, 1, 1 },
-   { IR_RSQ, "IR_RSQ", OPCODE_RSQ, 1, 1 },
-   { IR_RCP, "IR_RCP", OPCODE_RCP, 1, 1 },
-   { IR_FLOOR, "IR_FLOOR", OPCODE_FLR, 4, 1 },
-   { IR_FRAC, "IR_FRAC", OPCODE_FRC, 4, 1 },
-   { IR_ABS, "IR_ABS", OPCODE_ABS, 4, 1 },
-   { IR_NEG, "IR_NEG", OPCODE_NOP, 4, 1 }, /* special case: emit_negation() */
-   { IR_DDX, "IR_DDX", OPCODE_DDX, 4, 1 },
-   { IR_DDY, "IR_DDY", OPCODE_DDY, 4, 1 },
-   { IR_SIN, "IR_SIN", OPCODE_SIN, 1, 1 },
-   { IR_COS, "IR_COS", OPCODE_COS, 1, 1 },
-   { IR_NOISE1, "IR_NOISE1", OPCODE_NOISE1, 1, 1 },
-   { IR_NOISE2, "IR_NOISE2", OPCODE_NOISE2, 1, 1 },
-   { IR_NOISE3, "IR_NOISE3", OPCODE_NOISE3, 1, 1 },
-   { IR_NOISE4, "IR_NOISE4", OPCODE_NOISE4, 1, 1 },
-
-   /* other */
-   { IR_CMP, "IR_CMP", OPCODE_CMP, 4, 3 },  /* compare/select */
-   { IR_SEQ, "IR_SEQ", OPCODE_NOP, 0, 0 },
-   { IR_SCOPE, "IR_SCOPE", OPCODE_NOP, 0, 0 },
-   { IR_LABEL, "IR_LABEL", OPCODE_NOP, 0, 0 },
-   { IR_IF, "IR_IF", OPCODE_NOP, 0, 0 },
-   { IR_KILL, "IR_KILL", OPCODE_NOP, 0, 0 },
-   { IR_COND, "IR_COND", OPCODE_NOP, 0, 0 },
-   { IR_CALL, "IR_CALL", OPCODE_NOP, 0, 0 },
-   { IR_COPY, "IR_COPY", OPCODE_NOP, 0, 1 },
-   { IR_NOT, "IR_NOT", OPCODE_NOP, 1, 1 },
-   { IR_VAR, "IR_VAR", OPCODE_NOP, 0, 0 },
-   { IR_VAR_DECL, "IR_VAR_DECL", OPCODE_NOP, 0, 0 },
-   { IR_TEX, "IR_TEX", OPCODE_TEX, 4, 1 },
-   { IR_TEXB, "IR_TEXB", OPCODE_TXB, 4, 1 },
-   { IR_TEXP, "IR_TEXP", OPCODE_TXP, 4, 1 },
-   { IR_TEX_SH, "IR_TEX_SH", OPCODE_TEX, 4, 1 },
-   { IR_TEXB_SH, "IR_TEXB_SH", OPCODE_TXB, 4, 1 },
-   { IR_TEXP_SH, "IR_TEXP_SH", OPCODE_TXP, 4, 1 },
-   { IR_FLOAT, "IR_FLOAT", OPCODE_NOP, 0, 0 }, /* float literal */
-   { IR_FIELD, "IR_FIELD", OPCODE_NOP, 0, 0 },
-   { IR_ELEMENT, "IR_ELEMENT", OPCODE_NOP, 0, 0 },
-   { IR_SWIZZLE, "IR_SWIZZLE", OPCODE_NOP, 0, 0 },
-   { IR_NOP, "IR_NOP", OPCODE_NOP, 0, 0 },
-   { 0, NULL, 0, 0, 0 }
-};
-
-
-const slang_ir_info *
-_slang_ir_info(slang_ir_opcode opcode)
-{
-   GLuint i;
-   for (i = 0; IrInfo[i].IrName; i++) {
-      if (IrInfo[i].IrOpcode == opcode) {
-	 return IrInfo + i;
-      }
-   }
-   return NULL;
-}
-
-
-void
-_slang_init_ir_storage(slang_ir_storage *st,
-                       gl_register_file file, GLint index, GLint size,
-                       GLuint swizzle)
-{
-   st->File = file;
-   st->Index = index;
-   st->Size = size;
-   st->Swizzle = swizzle;
-   st->Parent = NULL;
-   st->IsIndirect = GL_FALSE;
-}
-
-
-/**
- * Return a new slang_ir_storage object.
- */
-slang_ir_storage *
-_slang_new_ir_storage(gl_register_file file, GLint index, GLint size)
-{
-   slang_ir_storage *st;
-   st = (slang_ir_storage *) _slang_alloc(sizeof(slang_ir_storage));
-   if (st) {
-      st->File = file;
-      st->Index = index;
-      st->Size = size;
-      st->Swizzle = SWIZZLE_NOOP;
-      st->Parent = NULL;
-      st->IsIndirect = GL_FALSE;
-   }
-   return st;
-}
-
-
-/**
- * Return a new slang_ir_storage object.
- */
-slang_ir_storage *
-_slang_new_ir_storage_swz(gl_register_file file, GLint index, GLint size,
-                          GLuint swizzle)
-{
-   slang_ir_storage *st;
-   st = (slang_ir_storage *) _slang_alloc(sizeof(slang_ir_storage));
-   if (st) {
-      st->File = file;
-      st->Index = index;
-      st->Size = size;
-      st->Swizzle = swizzle;
-      st->Parent = NULL;
-      st->IsIndirect = GL_FALSE;
-   }
-   return st;
-}
-
-
-/**
- * Return a new slang_ir_storage object.
- */
-slang_ir_storage *
-_slang_new_ir_storage_relative(GLint index, GLint size,
-                               slang_ir_storage *parent)
-{
-   slang_ir_storage *st;
-   st = (slang_ir_storage *) _slang_alloc(sizeof(slang_ir_storage));
-   if (st) {
-      st->File = PROGRAM_UNDEFINED;
-      st->Index = index;
-      st->Size = size;
-      st->Swizzle = SWIZZLE_NOOP;
-      st->Parent = parent;
-      st->IsIndirect = GL_FALSE;
-   }
-   return st;
-}
-
-
-slang_ir_storage *
-_slang_new_ir_storage_indirect(gl_register_file file,
-                               GLint index,
-                               GLint size,
-                               gl_register_file indirectFile,
-                               GLint indirectIndex,
-                               GLuint indirectSwizzle)
-{
-   slang_ir_storage *st;
-   st = (slang_ir_storage *) _slang_alloc(sizeof(slang_ir_storage));
-   if (st) {
-      st->File = file;
-      st->Index = index;
-      st->Size = size;
-      st->Swizzle = SWIZZLE_NOOP;
-      st->IsIndirect = GL_TRUE;
-      st->IndirectFile = indirectFile;
-      st->IndirectIndex = indirectIndex;
-      st->IndirectSwizzle = indirectSwizzle;
-   }
-   return st;
-}
-
-
-/**
- * Allocate IR storage for a texture sampler.
- * \param sampNum  the sampler number/index
- * \param texTarget  one of TEXTURE_x_INDEX values
- * \param size  number of samplers (in case of sampler array)
- */
-slang_ir_storage *
-_slang_new_ir_storage_sampler(GLint sampNum, GLuint texTarget, GLint size)
-{
-   slang_ir_storage *st;
-   assert(texTarget < NUM_TEXTURE_TARGETS);
-   st = _slang_new_ir_storage(PROGRAM_SAMPLER, sampNum, size);
-   if (st) {
-      st->TexTarget = texTarget;
-   }
-   return st;
-}
-
-
-
-/* XXX temporary function */
-void
-_slang_copy_ir_storage(slang_ir_storage *dst, const slang_ir_storage *src)
-{
-   *dst = *src;
-   dst->Parent = NULL;
-}
-
-
-
-static const char *
-_slang_ir_name(slang_ir_opcode opcode)
-{
-   return _slang_ir_info(opcode)->IrName;
-}
-
-
-
-#if 0 /* no longer needed with mempool */
-/**
- * Since many IR nodes might point to the same IR storage info, we need
- * to be careful when deleting things.
- * Before deleting an IR tree, traverse it and do refcounting on the
- * IR storage nodes.  Use the refcount info during delete to free things
- * properly.
- */
-static void
-_slang_refcount_storage(slang_ir_node *n)
-{
-   GLuint i;
-   if (!n)
-      return;
-   if (n->Store)
-      n->Store->RefCount++;
-   for (i = 0; i < 3; i++)
-      _slang_refcount_storage(n->Children[i]);
-}
-#endif
-
-
-static void
-_slang_free_ir(slang_ir_node *n)
-{
-   GLuint i;
-   if (!n)
-      return;
-
-#if 0
-   if (n->Store) {
-      n->Store->RefCount--;
-      if (n->Store->RefCount == 0) {
-         _slang_free(n->Store);
-         n->Store = NULL;
-      }
-   }
-#endif
-
-   for (i = 0; i < 3; i++)
-      _slang_free_ir(n->Children[i]);
-   /* Do not free n->List since it's a child elsewhere */
-   _slang_free(n);
-}
-
-
-/**
- * Recursively free an IR tree.
- */
-void
-_slang_free_ir_tree(slang_ir_node *n)
-{
-#if 0
-   _slang_refcount_storage(n);
-#endif
-   _slang_free_ir(n);
-}
-
-
-static const char *
-storage_string(const slang_ir_storage *st)
-{
-   static const char *files[] = {
-      "TEMP",
-      "LOCAL_PARAM",
-      "ENV_PARAM",
-      "STATE",
-      "INPUT",
-      "OUTPUT",
-      "NAMED_PARAM",
-      "CONSTANT",
-      "UNIFORM",
-      "VARYING",
-      "WRITE_ONLY",
-      "ADDRESS",
-      "SAMPLER",
-      "UNDEFINED"
-   };
-   static char s[100];
-   assert(Elements(files) == PROGRAM_FILE_MAX);
-#if 0
-   if (st->Size == 1)
-      sprintf(s, "%s[%d]", files[st->File], st->Index);
-   else
-      sprintf(s, "%s[%d..%d]", files[st->File], st->Index,
-              st->Index + st->Size - 1);
-#endif
-   assert(st->File < (GLint) (sizeof(files) / sizeof(files[0])));
-   sprintf(s, "%s[%d]", files[st->File], st->Index);
-   return s;
-}
-
-
-static void
-spaces(int n)
-{
-   while (n-- > 0) {
-      printf(" ");
-   }
-}
-
-
-void
-_slang_print_ir_tree(const slang_ir_node *n, int indent)
-{
-#define IND 0
-
-   if (!n)
-      return;
-#if !IND
-   if (n->Opcode != IR_SEQ)
-#else
-      printf("%3d:", indent);
-#endif
-      spaces(indent);
-
-   switch (n->Opcode) {
-   case IR_SEQ:
-#if IND
-      printf("SEQ  at %p\n", (void*) n);
-#endif
-      assert(n->Children[0]);
-      assert(n->Children[1]);
-      _slang_print_ir_tree(n->Children[0], indent + IND);
-      _slang_print_ir_tree(n->Children[1], indent + IND);
-      break;
-   case IR_SCOPE:
-      printf("NEW SCOPE\n");
-      assert(!n->Children[1]);
-      _slang_print_ir_tree(n->Children[0], indent + 3);
-      break;
-   case IR_COPY:
-      printf("COPY\n");
-      _slang_print_ir_tree(n->Children[0], indent+3);
-      _slang_print_ir_tree(n->Children[1], indent+3);
-      break;
-   case IR_LABEL:
-      printf("LABEL: %s\n", n->Label->Name);
-      break;
-   case IR_COND:
-      printf("COND\n");
-      _slang_print_ir_tree(n->Children[0], indent + 3);
-      break;
-
-   case IR_IF:
-      printf("IF \n");
-      _slang_print_ir_tree(n->Children[0], indent+3);
-      spaces(indent);
-      printf("THEN\n");
-      _slang_print_ir_tree(n->Children[1], indent+3);
-      if (n->Children[2]) {
-         spaces(indent);
-         printf("ELSE\n");
-         _slang_print_ir_tree(n->Children[2], indent+3);
-      }
-      spaces(indent);
-      printf("ENDIF\n");
-      break;
-
-   case IR_BEGIN_SUB:
-      printf("BEGIN_SUB\n");
-      break;
-   case IR_END_SUB:
-      printf("END_SUB\n");
-      break;
-   case IR_RETURN:
-      printf("RETURN\n");
-      break;
-   case IR_CALL:
-      printf("CALL %s\n", n->Label->Name);
-      break;
-
-   case IR_LOOP:
-      printf("LOOP\n");
-      _slang_print_ir_tree(n->Children[0], indent+3);
-      if (n->Children[1]) {
-         spaces(indent);
-         printf("TAIL:\n");
-         _slang_print_ir_tree(n->Children[1], indent+3);
-      }
-      spaces(indent);
-      printf("ENDLOOP\n");
-      break;
-   case IR_CONT:
-      printf("CONT\n");
-      break;
-   case IR_BREAK:
-      printf("BREAK\n");
-      break;
-   case IR_BREAK_IF_TRUE:
-      printf("BREAK_IF_TRUE\n");
-      _slang_print_ir_tree(n->Children[0], indent+3);
-      break;
-   case IR_CONT_IF_TRUE:
-      printf("CONT_IF_TRUE\n");
-      _slang_print_ir_tree(n->Children[0], indent+3);
-      break;
-
-   case IR_VAR:
-      printf("VAR %s%s at %s  store %p\n",
-             (n->Var ? (char *) n->Var->a_name : "TEMP"),
-             _mesa_swizzle_string(n->Store->Swizzle, 0, 0),
-             storage_string(n->Store), (void*) n->Store);
-      break;
-   case IR_VAR_DECL:
-      printf("VAR_DECL %s (%p) at %s  store %p\n",
-             (n->Var ? (char *) n->Var->a_name : "TEMP"),
-             (void*) n->Var, storage_string(n->Store),
-             (void*) n->Store);
-      break;
-   case IR_FIELD:
-      printf("FIELD %s of\n", n->Field);
-      _slang_print_ir_tree(n->Children[0], indent+3);
-      break;
-   case IR_FLOAT:
-      printf("FLOAT %g %g %g %g\n",
-             n->Value[0], n->Value[1], n->Value[2], n->Value[3]);
-      break;
-   case IR_I_TO_F:
-      printf("INT_TO_FLOAT\n");
-      _slang_print_ir_tree(n->Children[0], indent+3);
-      break;
-   case IR_F_TO_I:
-      printf("FLOAT_TO_INT\n");
-      _slang_print_ir_tree(n->Children[0], indent+3);
-      break;
-   case IR_SWIZZLE:
-      printf("SWIZZLE %s of  (store %p) \n",
-             _mesa_swizzle_string(n->Store->Swizzle, 0, 0), (void*) n->Store);
-      _slang_print_ir_tree(n->Children[0], indent + 3);
-      break;
-   default:
-      printf("%s (%p, %p)  (store %p)\n", _slang_ir_name(n->Opcode),
-             (void*) n->Children[0], (void*) n->Children[1], (void*) n->Store);
-      _slang_print_ir_tree(n->Children[0], indent+3);
-      _slang_print_ir_tree(n->Children[1], indent+3);
-   }
-}
diff --git a/mesalib/src/mesa/shader/slang/slang_ir.h b/mesalib/src/mesa/shader/slang/slang_ir.h
deleted file mode 100644
index 166b4e804..000000000
--- a/mesalib/src/mesa/shader/slang/slang_ir.h
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- * Mesa 3-D graphics library
- *
- * Copyright (C) 2005-2008  Brian Paul   All Rights Reserved.
- * Copyright (C) 2009  VMware, Inc.   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, 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 slang_ir.h
- * Mesa GLSL Intermediate Representation tree types and constants.
- * \author Brian Paul
- */
-
-
-#ifndef SLANG_IR_H
-#define SLANG_IR_H
-
-
-#include "main/imports.h"
-#include "slang_compile.h"
-#include "slang_label.h"
-#include "main/mtypes.h"
-
-
-/**
- * Intermediate Representation opcodes
- */
-typedef enum
-{
-   IR_NOP = 0,
-   IR_SEQ,     /* sequence (eval left, then right) */
-   IR_SCOPE,   /* new variable scope (one child) */
-
-   IR_LABEL,   /* target of a jump or cjump */
-
-   IR_COND,    /* conditional expression/predicate */
-
-   IR_IF,      /* high-level IF/then/else */
-               /* Children[0] = conditional expression */
-               /* Children[1] = if-true part */
-               /* Children[2] = if-else part, or NULL */
-
-   IR_BEGIN_SUB, /* begin subroutine */
-   IR_END_SUB,   /* end subroutine */
-   IR_RETURN,    /* return from subroutine */
-   IR_CALL,      /* call subroutine */
-
-   IR_LOOP,      /* high-level loop-begin / loop-end */
-                 /* Children[0] = loop body */
-                 /* Children[1] = loop tail code, or NULL */
-
-   IR_CONT,      /* continue loop */
-                 /* n->Parent = ptr to parent IR_LOOP Node */
-   IR_BREAK,     /* break loop */
-
-   IR_BREAK_IF_TRUE, /**< Children[0] = the condition expression */
-   IR_CONT_IF_TRUE,
-
-   IR_COPY,       /**< assignment/copy */
-   IR_MOVE,       /**< assembly MOV instruction */
-
-   /* vector ops: */
-   IR_ADD,        /**< assembly ADD instruction */
-   IR_SUB,
-   IR_MUL,
-   IR_DIV,
-   IR_DOT4,
-   IR_DOT3,
-   IR_DOT2,
-   IR_NRM4,
-   IR_NRM3,
-   IR_CROSS,   /* vec3 cross product */
-   IR_LRP,
-   IR_CLAMP,
-   IR_MIN,
-   IR_MAX,
-   IR_CMP,     /* = (op0 < 0) ? op1 : op2 */
-   IR_SEQUAL,  /* Set if args are equal (vector) */
-   IR_SNEQUAL, /* Set if args are not equal (vector) */
-   IR_SGE,     /* Set if greater or equal (vector) */
-   IR_SGT,     /* Set if greater than (vector) */
-   IR_SLE,     /* Set if less or equal (vector) */
-   IR_SLT,     /* Set if less than (vector) */
-   IR_POW,     /* x^y */
-   IR_EXP,     /* e^x */
-   IR_EXP2,    /* 2^x */
-   IR_LOG2,    /* log base 2 */
-   IR_RSQ,     /* 1/sqrt() */
-   IR_RCP,     /* reciprocol */
-   IR_FLOOR,
-   IR_FRAC,
-   IR_ABS,     /* absolute value */
-   IR_NEG,     /* negate */
-   IR_DDX,     /* derivative w.r.t. X */
-   IR_DDY,     /* derivative w.r.t. Y */
-   IR_SIN,     /* sine */
-   IR_COS,     /* cosine */
-   IR_NOISE1,  /* noise(x) */
-   IR_NOISE2,  /* noise(x, y) */
-   IR_NOISE3,  /* noise(x, y, z) */
-   IR_NOISE4,  /* noise(x, y, z, w) */
-
-   IR_EQUAL,   /* boolean equality */
-   IR_NOTEQUAL,/* boolean inequality */
-   IR_NOT,     /* boolean not */
-
-   IR_VAR,     /* variable reference */
-   IR_VAR_DECL,/* var declaration */
-
-   IR_ELEMENT, /* array element */
-   IR_FIELD,   /* struct field */
-   IR_SWIZZLE, /* swizzled storage access */
-
-   IR_TEX,     /* texture lookup */
-   IR_TEXB,    /* texture lookup with LOD bias */
-   IR_TEXP,    /* texture lookup with projection */
-
-   IR_TEX_SH,     /* texture lookup, shadow compare */
-   IR_TEXB_SH,    /* texture lookup with LOD bias, shadow compare */
-   IR_TEXP_SH,    /* texture lookup with projection, shadow compare */
-
-   IR_FLOAT,
-   IR_I_TO_F,  /* int[4] to float[4] conversion */
-   IR_F_TO_I,  /* float[4] to int[4] conversion */
-
-   IR_KILL     /* fragment kill/discard */
-} slang_ir_opcode;
-
-
-/**
- * Describes where data/variables are stored in the various register files.
- *
- * In the simple case, the File, Index and Size fields indicate where
- * a variable is stored.  For example, a vec3 variable may be stored
- * as (File=PROGRAM_TEMPORARY, Index=6, Size=3).  Or, File[Index].
- * Or, a program input like color may be stored as
- * (File=PROGRAM_INPUT,Index=3,Size=4);
- *
- * For single-float values, the Swizzle field indicates which component
- * of the vector contains the float.
- *
- * If IsIndirect is set, the storage is accessed through an indirect
- * register lookup.  The value in question will be located at:
- *   File[Index + IndirectFile[IndirectIndex]]
- *
- * This is primary used for indexing arrays.  For example, consider this
- * GLSL code:
- *   uniform int i;
- *   float a[10];
- *   float x = a[i];
- *
- * here, storage for a[i] would be described by (File=PROGRAM_TEMPORAY,
- * Index=aPos, IndirectFile=PROGRAM_UNIFORM, IndirectIndex=iPos), which
- * would mean TEMP[aPos + UNIFORM[iPos]]
- */
-struct slang_ir_storage_
-{
-   gl_register_file File;  /**< PROGRAM_TEMPORARY, PROGRAM_INPUT, etc */
-   GLint Index;    /**< -1 means unallocated */
-   GLint Size;     /**< number of floats or ints */
-   GLuint Swizzle; /**< Swizzle AND writemask info */
-   GLint RefCount; /**< Used during IR tree delete */
-
-   GLboolean RelAddr; /* we'll remove this eventually */
-
-   GLboolean IsIndirect;
-   gl_register_file IndirectFile;
-   GLint IndirectIndex;
-   GLuint IndirectSwizzle;
-   GLuint TexTarget;  /**< If File==PROGRAM_SAMPLER, one of TEXTURE_x_INDEX */
-
-   /** If Parent is non-null, Index is relative to parent.
-    * The other fields are ignored.
-    */
-   struct slang_ir_storage_ *Parent;
-};
-
-typedef struct slang_ir_storage_ slang_ir_storage;
-
-
-/**
- * Intermediate Representation (IR) tree node
- * Basically a binary tree, but IR_LRP and IR_CLAMP have three children.
- */
-typedef struct slang_ir_node_
-{
-   slang_ir_opcode Opcode;
-   struct slang_ir_node_ *Children[3];
-   slang_ir_storage *Store;  /**< location of result of this operation */
-   GLint InstLocation;  /**< Location of instruction emitted for this node */
-
-   /** special fields depending on Opcode: */
-   const char *Field;  /**< If Opcode == IR_FIELD */
-   GLfloat Value[4];    /**< If Opcode == IR_FLOAT */
-   slang_variable *Var;  /**< If Opcode == IR_VAR or IR_VAR_DECL */
-   struct slang_ir_node_ *List;  /**< For various linked lists */
-   struct slang_ir_node_ *Parent;  /**< Pointer to logical parent (ie. loop) */
-   slang_label *Label;  /**< Used for branches */
-   const char *Comment; /**< If Opcode == IR_COMMENT */
-} slang_ir_node;
-
-
-
-/**
- * Assembly and IR info
- */
-typedef struct
-{
-   slang_ir_opcode IrOpcode;
-   const char *IrName;
-   gl_inst_opcode InstOpcode;
-   GLuint ResultSize, NumParams;
-} slang_ir_info;
-
-
-
-extern const slang_ir_info *
-_slang_ir_info(slang_ir_opcode opcode);
-
-
-extern void
-_slang_init_ir_storage(slang_ir_storage *st,
-                       gl_register_file file, GLint index, GLint size,
-                       GLuint swizzle);
-
-extern slang_ir_storage *
-_slang_new_ir_storage(gl_register_file file, GLint index, GLint size);
-
-
-extern slang_ir_storage *
-_slang_new_ir_storage_swz(gl_register_file file, GLint index, GLint size,
-                          GLuint swizzle);
-
-extern slang_ir_storage *
-_slang_new_ir_storage_relative(GLint index, GLint size,
-                               slang_ir_storage *parent);
-
-
-extern slang_ir_storage *
-_slang_new_ir_storage_indirect(gl_register_file file,
-                               GLint index,
-                               GLint size,
-                               gl_register_file indirectFile,
-                               GLint indirectIndex,
-                               GLuint indirectSwizzle);
-
-extern slang_ir_storage *
-_slang_new_ir_storage_sampler(GLint sampNum, GLuint texTarget, GLint size);
-
-
-extern void
-_slang_copy_ir_storage(slang_ir_storage *dst, const slang_ir_storage *src);
-
-
-extern void
-_slang_free_ir_tree(slang_ir_node *n);
-
-
-extern void
-_slang_print_ir_tree(const slang_ir_node *n, int indent);
-
-
-#endif /* SLANG_IR_H */
diff --git a/mesalib/src/mesa/shader/slang/slang_label.c b/mesalib/src/mesa/shader/slang/slang_label.c
deleted file mode 100644
index 225612a93..000000000
--- a/mesalib/src/mesa/shader/slang/slang_label.c
+++ /dev/null
@@ -1,104 +0,0 @@
-
-
-/**
- * Functions for managing instruction labels.
- * Basically, this is used to manage the problem of forward branches where
- * we have a branch instruciton but don't know the target address yet.
- */
-
-
-#include "slang_label.h"
-#include "slang_mem.h"
-
-
-
-slang_label *
-_slang_label_new(const char *name)
-{
-   slang_label *l = (slang_label *) _slang_alloc(sizeof(slang_label));
-   if (l) {
-      l->Name = _slang_strdup(name);
-      l->Location = -1;
-   }
-   return l;
-}
-
-/**
- * As above, but suffix the name with a unique number.
- */
-slang_label *
-_slang_label_new_unique(const char *name)
-{
-   static int id = 1;
-   slang_label *l = (slang_label *) _slang_alloc(sizeof(slang_label));
-   if (l) {
-      l->Name = (char *) _slang_alloc(strlen(name) + 10);
-      if (!l->Name) {
-         free(l);
-         return NULL;
-      }
-      sprintf(l->Name, "%s_%d", name, id);
-      id++;
-      l->Location = -1;
-   }
-   return l;
-}
-
-void
-_slang_label_delete(slang_label *l)
-{
-   if (l->Name) {
-      _slang_free(l->Name);
-      l->Name = NULL;
-   }
-   if (l->References) {
-      _slang_free(l->References);
-      l->References = NULL;
-   }
-   _slang_free(l);
-}
-
-
-void
-_slang_label_add_reference(slang_label *l, GLuint inst)
-{
-   const GLuint oldSize = l->NumReferences * sizeof(GLuint);
-   assert(l->Location < 0);
-   l->References = _slang_realloc(l->References,
-                                  oldSize, oldSize + sizeof(GLuint));
-   if (l->References) {
-      l->References[l->NumReferences] = inst;
-      l->NumReferences++;
-   }
-}
-
-
-GLint
-_slang_label_get_location(const slang_label *l)
-{
-   return l->Location;
-}
-
-
-void
-_slang_label_set_location(slang_label *l, GLint location,
-                          struct gl_program *prog)
-{
-   GLuint i;
-
-   assert(l->Location < 0);
-   assert(location >= 0);
-
-   l->Location = location;
-
-   /* for the instructions that were waiting to learn the label's location: */
-   for (i = 0; i < l->NumReferences; i++) {
-      const GLuint j = l->References[i];
-      prog->Instructions[j].BranchTarget = location;
-   }
-
-   if (l->References) {
-      _slang_free(l->References);
-      l->References = NULL;
-   }
-}
diff --git a/mesalib/src/mesa/shader/slang/slang_label.h b/mesalib/src/mesa/shader/slang/slang_label.h
deleted file mode 100644
index 87068ae7a..000000000
--- a/mesalib/src/mesa/shader/slang/slang_label.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef SLANG_LABEL_H
-#define SLANG_LABEL_H 1
-
-#include "main/imports.h"
-#include "main/mtypes.h"
-#include "shader/prog_instruction.h"
-
-
-struct slang_label_
-{
-   char *Name;
-   GLint Location;
-   /**
-    * List of instruction references (numbered starting at zero) which need
-    * their BranchTarget field filled in with the location eventually
-    * assigned to the label.
-    */
-   GLuint NumReferences;
-   GLuint *References;   /** Array [NumReferences] */
-};
-
-typedef struct slang_label_ slang_label;
-
-
-extern slang_label *
-_slang_label_new(const char *name);
-
-extern slang_label *
-_slang_label_new_unique(const char *name);
-
-extern void
-_slang_label_delete(slang_label *l);
-
-extern void
-_slang_label_add_reference(slang_label *l, GLuint inst);
-
-extern GLint
-_slang_label_get_location(const slang_label *l);
-
-extern void
-_slang_label_set_location(slang_label *l, GLint location,
-                          struct gl_program *prog);
-
-
-#endif /* SLANG_LABEL_H */
diff --git a/mesalib/src/mesa/shader/slang/slang_link.c b/mesalib/src/mesa/shader/slang/slang_link.c
deleted file mode 100644
index e8dca0142..000000000
--- a/mesalib/src/mesa/shader/slang/slang_link.c
+++ /dev/null
@@ -1,933 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.3
- *
- * Copyright (C) 2008  Brian Paul   All Rights Reserved.
- * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, 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 slang_link.c
- * GLSL linker
- * \author Brian Paul
- */
-
-#include "main/imports.h"
-#include "main/context.h"
-#include "main/macros.h"
-#include "shader/program.h"
-#include "shader/prog_instruction.h"
-#include "shader/prog_parameter.h"
-#include "shader/prog_print.h"
-#include "shader/prog_statevars.h"
-#include "shader/prog_uniform.h"
-#include "shader/shader_api.h"
-#include "slang_builtin.h"
-#include "slang_link.h"
-
-
-/** cast wrapper */
-static struct gl_vertex_program *
-vertex_program(struct gl_program *prog)
-{
-   assert(prog->Target == GL_VERTEX_PROGRAM_ARB);
-   return (struct gl_vertex_program *) prog;
-}
-
-
-/** cast wrapper */
-static struct gl_fragment_program *
-fragment_program(struct gl_program *prog)
-{
-   assert(prog->Target == GL_FRAGMENT_PROGRAM_ARB);
-   return (struct gl_fragment_program *) prog;
-}
-
-
-/**
- * Record a linking error.
- */
-static void
-link_error(struct gl_shader_program *shProg, const char *msg)
-{
-   if (shProg->InfoLog) {
-      free(shProg->InfoLog);
-   }
-   shProg->InfoLog = _mesa_strdup(msg);
-   shProg->LinkStatus = GL_FALSE;
-}
-
-
-
-/**
- * Check if the given bit is either set or clear in both bitfields.
- */
-static GLboolean
-bits_agree(GLbitfield flags1, GLbitfield flags2, GLbitfield bit)
-{
-   return (flags1 & bit) == (flags2 & bit);
-}
-
-
-/**
- * Linking varying vars involves rearranging varying vars so that the
- * vertex program's output varyings matches the order of the fragment
- * program's input varyings.
- * We'll then rewrite instructions to replace PROGRAM_VARYING with either
- * PROGRAM_INPUT or PROGRAM_OUTPUT depending on whether it's a vertex or
- * fragment shader.
- * This is also where we set program Input/OutputFlags to indicate
- * which inputs are centroid-sampled, invariant, etc.
- */
-static GLboolean
-link_varying_vars(GLcontext *ctx,
-                  struct gl_shader_program *shProg, struct gl_program *prog)
-{
-   GLuint *map, i, firstVarying, newFile;
-   GLbitfield *inOutFlags;
-
-   map = (GLuint *) malloc(prog->Varying->NumParameters * sizeof(GLuint));
-   if (!map)
-      return GL_FALSE;
-
-   /* Varying variables are treated like other vertex program outputs
-    * (and like other fragment program inputs).  The position of the
-    * first varying differs for vertex/fragment programs...
-    * Also, replace File=PROGRAM_VARYING with File=PROGRAM_INPUT/OUTPUT.
-    */
-   if (prog->Target == GL_VERTEX_PROGRAM_ARB) {
-      firstVarying = VERT_RESULT_VAR0;
-      newFile = PROGRAM_OUTPUT;
-      inOutFlags = prog->OutputFlags;
-   }
-   else {
-      assert(prog->Target == GL_FRAGMENT_PROGRAM_ARB);
-      firstVarying = FRAG_ATTRIB_VAR0;
-      newFile = PROGRAM_INPUT;
-      inOutFlags = prog->InputFlags;
-   }
-
-   for (i = 0; i < prog->Varying->NumParameters; i++) {
-      /* see if this varying is in the linked varying list */
-      const struct gl_program_parameter *var = prog->Varying->Parameters + i;
-      GLint j = _mesa_lookup_parameter_index(shProg->Varying, -1, var->Name);
-      if (j >= 0) {
-         /* varying is already in list, do some error checking */
-         const struct gl_program_parameter *v =
-            &shProg->Varying->Parameters[j];
-         if (var->Size != v->Size) {
-            link_error(shProg, "mismatched varying variable types");
-            free(map);
-            return GL_FALSE;
-         }
-         if (!bits_agree(var->Flags, v->Flags, PROG_PARAM_BIT_CENTROID)) {
-            char msg[100];
-            _mesa_snprintf(msg, sizeof(msg),
-		     "centroid modifier mismatch for '%s'", var->Name);
-            link_error(shProg, msg);
-            free(map);
-            return GL_FALSE;
-         }
-         if (!bits_agree(var->Flags, v->Flags, PROG_PARAM_BIT_INVARIANT)) {
-            char msg[100];
-            _mesa_snprintf(msg, sizeof(msg),
-		     "invariant modifier mismatch for '%s'", var->Name);
-            link_error(shProg, msg);
-            free(map);
-            return GL_FALSE;
-         }
-      }
-      else {
-         /* not already in linked list */
-         j = _mesa_add_varying(shProg->Varying, var->Name, var->Size,
-                               var->Flags);
-      }
-
-      if (shProg->Varying->NumParameters > ctx->Const.MaxVarying) {
-         link_error(shProg, "Too many varying variables");
-         free(map);
-         return GL_FALSE;
-      }
-
-      /* Map varying[i] to varying[j].
-       * Note: the loop here takes care of arrays or large (sz>4) vars.
-       */
-      {
-         GLint sz = var->Size;
-         while (sz > 0) {
-            inOutFlags[firstVarying + j] = var->Flags;
-            /*printf("Link varying from %d to %d\n", i, j);*/
-            map[i++] = j++;
-            sz -= 4;
-         }
-         i--; /* go back one */
-      }
-   }
-
-
-   /* OK, now scan the program/shader instructions looking for varying vars,
-    * replacing the old index with the new index.
-    */
-   for (i = 0; i < prog->NumInstructions; i++) {
-      struct prog_instruction *inst = prog->Instructions + i;
-      GLuint j;
-
-      if (inst->DstReg.File == PROGRAM_VARYING) {
-         inst->DstReg.File = newFile;
-         inst->DstReg.Index = map[ inst->DstReg.Index ] + firstVarying;
-      }
-
-      for (j = 0; j < 3; j++) {
-         if (inst->SrcReg[j].File == PROGRAM_VARYING) {
-            inst->SrcReg[j].File = newFile;
-            inst->SrcReg[j].Index = map[ inst->SrcReg[j].Index ] + firstVarying;
-         }
-      }
-   }
-
-   free(map);
-
-   /* these will get recomputed before linking is completed */
-   prog->InputsRead = 0x0;
-   prog->OutputsWritten = 0x0;
-
-   return GL_TRUE;
-}
-
-
-/**
- * Build the shProg->Uniforms list.
- * This is basically a list/index of all uniforms found in either/both of
- * the vertex and fragment shaders.
- *
- * About uniforms:
- * Each uniform has two indexes, one that points into the vertex
- * program's parameter array and another that points into the fragment
- * program's parameter array.  When the user changes a uniform's value
- * we have to change the value in the vertex and/or fragment program's
- * parameter array.
- *
- * This function will be called twice to set up the two uniform->parameter
- * mappings.
- *
- * If a uniform is only present in the vertex program OR fragment program
- * then the fragment/vertex parameter index, respectively, will be -1.
- */
-static GLboolean
-link_uniform_vars(GLcontext *ctx,
-                  struct gl_shader_program *shProg,
-                  struct gl_program *prog,
-                  GLuint *numSamplers)
-{
-   GLuint samplerMap[200]; /* max number of samplers declared, not used */
-   GLuint i;
-
-   for (i = 0; i < prog->Parameters->NumParameters; i++) {
-      const struct gl_program_parameter *p = prog->Parameters->Parameters + i;
-
-      /*
-       * XXX FIX NEEDED HERE
-       * We should also be adding a uniform if p->Type == PROGRAM_STATE_VAR.
-       * For example, modelview matrix, light pos, etc.
-       * Also, we need to update the state-var name-generator code to
-       * generate GLSL-style names, like "gl_LightSource[0].position".
-       * Furthermore, we'll need to fix the state-var's size/datatype info.
-       */
-
-      if ((p->Type == PROGRAM_UNIFORM || p->Type == PROGRAM_SAMPLER)
-          && p->Used) {
-         /* add this uniform, indexing into the target's Parameters list */
-         struct gl_uniform *uniform =
-            _mesa_append_uniform(shProg->Uniforms, p->Name, prog->Target, i);
-         if (uniform)
-            uniform->Initialized = p->Initialized;
-      }
-
-      /* The samplerMap[] table we build here is used to remap/re-index
-       * sampler references by TEX instructions.
-       */
-      if (p->Type == PROGRAM_SAMPLER && p->Used) {
-         /* Allocate a new sampler index */
-         GLuint oldSampNum = (GLuint) prog->Parameters->ParameterValues[i][0];
-         GLuint newSampNum = *numSamplers;
-         if (newSampNum >= ctx->Const.MaxTextureImageUnits) {
-            char s[100];
-            sprintf(s, "Too many texture samplers (%u, max is %u)",
-		    newSampNum, ctx->Const.MaxTextureImageUnits);
-            link_error(shProg, s);
-            return GL_FALSE;
-         }
-         /* save old->new mapping in the table */
-         if (oldSampNum < Elements(samplerMap))
-            samplerMap[oldSampNum] = newSampNum;
-         /* update parameter's sampler index */
-         prog->Parameters->ParameterValues[i][0] = (GLfloat) newSampNum;
-         (*numSamplers)++;
-      }
-   }
-
-   /* OK, now scan the program/shader instructions looking for texture
-    * instructions using sampler vars.  Replace old sampler indexes with
-    * new ones.
-    */
-   prog->SamplersUsed = 0x0;
-   for (i = 0; i < prog->NumInstructions; i++) {
-      struct prog_instruction *inst = prog->Instructions + i;
-      if (_mesa_is_tex_instruction(inst->Opcode)) {
-         /* here, inst->TexSrcUnit is really the sampler unit */
-         const GLint oldSampNum = inst->TexSrcUnit;
-
-#if 0
-         printf("====== remap sampler from %d to %d\n",
-                inst->TexSrcUnit, samplerMap[ inst->TexSrcUnit ]);
-#endif
-
-         if (oldSampNum < Elements(samplerMap)) {
-            const GLuint newSampNum = samplerMap[oldSampNum];
-            inst->TexSrcUnit = newSampNum;
-            prog->SamplerTargets[newSampNum] = inst->TexSrcTarget;
-            prog->SamplersUsed |= (1 << newSampNum);
-            if (inst->TexShadow) {
-               prog->ShadowSamplers |= (1 << newSampNum);
-            }
-         }
-      }
-   }
-
-   return GL_TRUE;
-}
-
-
-/**
- * Resolve binding of generic vertex attributes.
- * For example, if the vertex shader declared "attribute vec4 foobar" we'll
- * allocate a generic vertex attribute for "foobar" and plug that value into
- * the vertex program instructions.
- * But if the user called glBindAttributeLocation(), those bindings will
- * have priority.
- */
-static GLboolean
-_slang_resolve_attributes(struct gl_shader_program *shProg,
-                          const struct gl_program *origProg,
-                          struct gl_program *linkedProg)
-{
-   GLint attribMap[MAX_VERTEX_GENERIC_ATTRIBS];
-   GLuint i, j;
-   GLbitfield usedAttributes; /* generics only, not legacy attributes */
-   GLbitfield inputsRead = 0x0;
-
-   assert(origProg != linkedProg);
-   assert(origProg->Target == GL_VERTEX_PROGRAM_ARB);
-   assert(linkedProg->Target == GL_VERTEX_PROGRAM_ARB);
-
-   if (!shProg->Attributes)
-      shProg->Attributes = _mesa_new_parameter_list();
-
-   if (linkedProg->Attributes) {
-      _mesa_free_parameter_list(linkedProg->Attributes);
-   }
-   linkedProg->Attributes = _mesa_new_parameter_list();
-
-
-   /* Build a bitmask indicating which attribute indexes have been
-    * explicitly bound by the user with glBindAttributeLocation().
-    */
-   usedAttributes = 0x0;
-   for (i = 0; i < shProg->Attributes->NumParameters; i++) {
-      GLint attr = shProg->Attributes->Parameters[i].StateIndexes[0];
-      usedAttributes |= (1 << attr);
-   }
-
-   /* If gl_Vertex is used, that actually counts against the limit
-    * on generic vertex attributes.  This avoids the ambiguity of
-    * whether glVertexAttrib4fv(0, v) sets legacy attribute 0 (vert pos)
-    * or generic attribute[0].  If gl_Vertex is used, we want the former.
-    */
-   if (origProg->InputsRead & VERT_BIT_POS) {
-      usedAttributes |= 0x1;
-   }
-
-   /* initialize the generic attribute map entries to -1 */
-   for (i = 0; i < MAX_VERTEX_GENERIC_ATTRIBS; i++) {
-      attribMap[i] = -1;
-   }
-
-   /*
-    * Scan program for generic attribute references
-    */
-   for (i = 0; i < linkedProg->NumInstructions; i++) {
-      struct prog_instruction *inst = linkedProg->Instructions + i;
-      for (j = 0; j < 3; j++) {
-         if (inst->SrcReg[j].File == PROGRAM_INPUT) {
-            inputsRead |= (1 << inst->SrcReg[j].Index);
-         }
-
-         if (inst->SrcReg[j].File == PROGRAM_INPUT &&
-             inst->SrcReg[j].Index >= VERT_ATTRIB_GENERIC0) {
-            /*
-             * OK, we've found a generic vertex attribute reference.
-             */
-            const GLint k = inst->SrcReg[j].Index - VERT_ATTRIB_GENERIC0;
-
-            GLint attr = attribMap[k];
-
-            if (attr < 0) {
-               /* Need to figure out attribute mapping now.
-                */
-               const char *name = origProg->Attributes->Parameters[k].Name;
-               const GLint size = origProg->Attributes->Parameters[k].Size;
-               const GLenum type =origProg->Attributes->Parameters[k].DataType;
-               GLint index;
-
-               /* See if there's a user-defined attribute binding for
-                * this name.
-                */
-               index = _mesa_lookup_parameter_index(shProg->Attributes,
-                                                    -1, name);
-               if (index >= 0) {
-                  /* Found a user-defined binding */
-                  attr = shProg->Attributes->Parameters[index].StateIndexes[0];
-               }
-               else {
-                  /* No user-defined binding, choose our own attribute number.
-                   * Start at 1 since generic attribute 0 always aliases
-                   * glVertex/position.
-                   */
-                  for (attr = 0; attr < MAX_VERTEX_GENERIC_ATTRIBS; attr++) {
-                     if (((1 << attr) & usedAttributes) == 0)
-                        break;
-                  }
-                  if (attr == MAX_VERTEX_GENERIC_ATTRIBS) {
-                     link_error(shProg, "Too many vertex attributes");
-                     return GL_FALSE;
-                  }
-
-                  /* mark this attribute as used */
-                  usedAttributes |= (1 << attr);
-               }
-
-               attribMap[k] = attr;
-
-               /* Save the final name->attrib binding so it can be queried
-                * with glGetAttributeLocation().
-                */
-               _mesa_add_attribute(linkedProg->Attributes, name,
-                                   size, type, attr);
-            }
-
-            assert(attr >= 0);
-
-            /* update the instruction's src reg */
-            inst->SrcReg[j].Index = VERT_ATTRIB_GENERIC0 + attr;
-         }
-      }
-   }
-
-   /* Handle pre-defined attributes here (gl_Vertex, gl_Normal, etc).
-    * When the user queries the active attributes we need to include both
-    * the user-defined attributes and the built-in ones.
-    */
-   for (i = VERT_ATTRIB_POS; i < VERT_ATTRIB_GENERIC0; i++) {
-      if (inputsRead & (1 << i)) {
-         _mesa_add_attribute(linkedProg->Attributes,
-                             _slang_vert_attrib_name(i),
-                             4, /* size in floats */
-                             _slang_vert_attrib_type(i),
-                             -1 /* attrib/input */);
-      }
-   }
-
-   return GL_TRUE;
-}
-
-
-/**
- * Scan program instructions to update the program's NumTemporaries field.
- * Note: this implemenation relies on the code generator allocating
- * temps in increasing order (0, 1, 2, ... ).
- */
-static void
-_slang_count_temporaries(struct gl_program *prog)
-{
-   GLuint i, j;
-   GLint maxIndex = -1;
-
-   for (i = 0; i < prog->NumInstructions; i++) {
-      const struct prog_instruction *inst = prog->Instructions + i;
-      const GLuint numSrc = _mesa_num_inst_src_regs(inst->Opcode);
-      for (j = 0; j < numSrc; j++) {
-         if (inst->SrcReg[j].File == PROGRAM_TEMPORARY) {
-            if (maxIndex < inst->SrcReg[j].Index)
-               maxIndex = inst->SrcReg[j].Index;
-         }
-         if (inst->DstReg.File == PROGRAM_TEMPORARY) {
-            if (maxIndex < (GLint) inst->DstReg.Index)
-               maxIndex = inst->DstReg.Index;
-         }
-      }
-   }
-
-   prog->NumTemporaries = (GLuint) (maxIndex + 1);
-}
-
-
-/**
- * Scan program instructions to update the program's InputsRead and
- * OutputsWritten fields.
- */
-static void
-_slang_update_inputs_outputs(struct gl_program *prog)
-{
-   GLuint i, j;
-   GLuint maxAddrReg = 0;
-
-   prog->InputsRead = 0x0;
-   prog->OutputsWritten = 0x0;
-
-   for (i = 0; i < prog->NumInstructions; i++) {
-      const struct prog_instruction *inst = prog->Instructions + i;
-      const GLuint numSrc = _mesa_num_inst_src_regs(inst->Opcode);
-      for (j = 0; j < numSrc; j++) {
-         if (inst->SrcReg[j].File == PROGRAM_INPUT) {
-            prog->InputsRead |= 1 << inst->SrcReg[j].Index;
-         }
-         else if (inst->SrcReg[j].File == PROGRAM_ADDRESS) {
-            maxAddrReg = MAX2(maxAddrReg, (GLuint) (inst->SrcReg[j].Index + 1));
-         }
-      }
-
-      if (inst->DstReg.File == PROGRAM_OUTPUT) {
-         prog->OutputsWritten |= BITFIELD64_BIT(inst->DstReg.Index);
-         if (inst->DstReg.RelAddr) {
-            /* If the output attribute is indexed with relative addressing
-             * we know that it must be a varying or texcoord such as
-             * gl_TexCoord[i] = v;  In this case, mark all the texcoords
-             * or varying outputs as being written.  It's not an error if
-             * a vertex shader writes varying vars that aren't used by the
-             * fragment shader.  But it is an error for a fragment shader
-             * to use varyings that are not written by the vertex shader.
-             */
-            if (prog->Target == GL_VERTEX_PROGRAM_ARB) {
-               if (inst->DstReg.Index == VERT_RESULT_TEX0) {
-                  /* mark all texcoord outputs as written */
-                  const GLbitfield64 mask =
-		     BITFIELD64_RANGE(VERT_RESULT_TEX0,
-				      (VERT_RESULT_TEX0
-				       + MAX_TEXTURE_COORD_UNITS - 1));
-                  prog->OutputsWritten |= mask;
-               }
-               else if (inst->DstReg.Index == VERT_RESULT_VAR0) {
-                  /* mark all generic varying outputs as written */
-                  const GLbitfield64 mask =
-		     BITFIELD64_RANGE(VERT_RESULT_VAR0,
-				      (VERT_RESULT_VAR0 + MAX_VARYING - 1));
-                  prog->OutputsWritten |= mask;
-               }
-            }
-         }
-      }
-      else if (inst->DstReg.File == PROGRAM_ADDRESS) {
-         maxAddrReg = MAX2(maxAddrReg, inst->DstReg.Index + 1);
-      }
-   }
-   prog->NumAddressRegs = maxAddrReg;
-}
-
-
-
-/**
- * Remove extra #version directives from the concatenated source string.
- * Disable the extra ones by converting first two chars to //, a comment.
- * This is a bit of hack to work around a preprocessor bug that only
- * allows one #version directive per source.
- */
-static void
-remove_extra_version_directives(GLchar *source)
-{
-   GLuint verCount = 0;
-   while (1) {
-      char *ver = strstr(source, "#version");
-      if (ver) {
-         verCount++;
-         if (verCount > 1) {
-            ver[0] = '/';
-            ver[1] = '/';
-         }
-         source += 8;
-      }
-      else {
-         break;
-      }
-   }
-}
-
-
-
-/**
- * Return a new shader whose source code is the concatenation of
- * all the shader sources of the given type.
- */
-static struct gl_shader *
-concat_shaders(struct gl_shader_program *shProg, GLenum shaderType)
-{
-   struct gl_shader *newShader;
-   const struct gl_shader *firstShader = NULL;
-   GLuint *shaderLengths;
-   GLchar *source;
-   GLuint totalLen = 0, len = 0;
-   GLuint i;
-
-   shaderLengths = (GLuint *)malloc(shProg->NumShaders * sizeof(GLuint));
-   if (!shaderLengths) {
-      return NULL;
-   }
-
-   /* compute total size of new shader source code */
-   for (i = 0; i < shProg->NumShaders; i++) {
-      const struct gl_shader *shader = shProg->Shaders[i];
-      if (shader->Type == shaderType) {
-         shaderLengths[i] = strlen(shader->Source);
-         totalLen += shaderLengths[i];
-         if (!firstShader)
-            firstShader = shader;
-      }
-   }
-
-   if (totalLen == 0) {
-      free(shaderLengths);
-      return NULL;
-   }
-
-   source = (GLchar *) malloc(totalLen + 1);
-   if (!source) {
-      free(shaderLengths);
-      return NULL;
-   }
-
-   /* concatenate shaders */
-   for (i = 0; i < shProg->NumShaders; i++) {
-      const struct gl_shader *shader = shProg->Shaders[i];
-      if (shader->Type == shaderType) {
-         memcpy(source + len, shader->Source, shaderLengths[i]);
-         len += shaderLengths[i];
-      }
-   }
-   source[len] = '\0';
-   /*
-   printf("---NEW CONCATENATED SHADER---:\n%s\n------------\n", source);
-   */
-
-   free(shaderLengths);
-
-   remove_extra_version_directives(source);
-
-   newShader = CALLOC_STRUCT(gl_shader);
-   if (!newShader) {
-      free(source);
-      return NULL;
-   }
-
-   newShader->Type = shaderType;
-   newShader->Source = source;
-   newShader->Pragmas = firstShader->Pragmas;
-
-   return newShader;
-}
-
-
-/**
- * Search the shader program's list of shaders to find the one that
- * defines main().
- * This will involve shader concatenation and recompilation if needed.
- */
-static struct gl_shader *
-get_main_shader(GLcontext *ctx,
-                struct gl_shader_program *shProg, GLenum type)
-{
-   struct gl_shader *shader = NULL;
-   GLuint i;
-
-   /*
-    * Look for a shader that defines main() and has no unresolved references.
-    */
-   for (i = 0; i < shProg->NumShaders; i++) {
-      shader = shProg->Shaders[i];
-      if (shader->Type == type &&
-          shader->Main &&
-          !shader->UnresolvedRefs) {
-         /* All set! */
-         return shader;
-      }
-   }
-
-   /*
-    * There must have been unresolved references during the original
-    * compilation.  Try concatenating all the shaders of the given type
-    * and recompile that.
-    */
-   shader = concat_shaders(shProg, type);
-
-   if (shader) {
-      _slang_compile(ctx, shader);
-
-      /* Finally, check if recompiling failed */
-      if (!shader->CompileStatus ||
-          !shader->Main ||
-          shader->UnresolvedRefs) {
-         link_error(shProg, "Unresolved symbols");
-         _mesa_free_shader(ctx, shader);
-         return NULL;
-      }
-   }
-
-   return shader;
-}
-
-
-/**
- * Shader linker.  Currently:
- *
- * 1. The last attached vertex shader and fragment shader are linked.
- * 2. Varying vars in the two shaders are combined so their locations
- *    agree between the vertex and fragment stages.  They're treated as
- *    vertex program output attribs and as fragment program input attribs.
- * 3. The vertex and fragment programs are cloned and modified to update
- *    src/dst register references so they use the new, linked varying
- *    storage locations.
- */
-void
-_slang_link(GLcontext *ctx,
-            GLhandleARB programObj,
-            struct gl_shader_program *shProg)
-{
-   const struct gl_vertex_program *vertProg = NULL;
-   const struct gl_fragment_program *fragProg = NULL;
-   GLboolean vertNotify = GL_TRUE, fragNotify = GL_TRUE;
-   GLuint numSamplers = 0;
-   GLuint i;
-
-   _mesa_clear_shader_program_data(ctx, shProg);
-
-   /* Initialize LinkStatus to "success".  Will be cleared if error. */
-   shProg->LinkStatus = GL_TRUE;
-
-   /* check that all programs compiled successfully */
-   for (i = 0; i < shProg->NumShaders; i++) {
-      if (!shProg->Shaders[i]->CompileStatus) {
-         link_error(shProg, "linking with uncompiled shader\n");
-         return;
-      }
-   }
-
-   shProg->Uniforms = _mesa_new_uniform_list();
-   shProg->Varying = _mesa_new_parameter_list();
-
-   /*
-    * Find the vertex and fragment shaders which define main()
-    */
-   {
-      struct gl_shader *vertShader, *fragShader;
-      vertShader = get_main_shader(ctx, shProg, GL_VERTEX_SHADER);
-      fragShader = get_main_shader(ctx, shProg, GL_FRAGMENT_SHADER);
-      if (vertShader)
-         vertProg = vertex_program(vertShader->Program);
-      if (fragShader)
-         fragProg = fragment_program(fragShader->Program);
-      if (!shProg->LinkStatus)
-         return;
-   }
-
-#if FEATURE_es2_glsl
-   /* must have both a vertex and fragment program for ES2 */
-   if (!vertProg) {
-      link_error(shProg, "missing vertex shader\n");
-      return;
-   }
-   if (!fragProg) {
-      link_error(shProg, "missing fragment shader\n");
-      return;
-   }
-#endif
-
-   /*
-    * Make copies of the vertex/fragment programs now since we'll be
-    * changing src/dst registers after merging the uniforms and varying vars.
-    */
-   _mesa_reference_vertprog(ctx, &shProg->VertexProgram, NULL);
-   if (vertProg) {
-      struct gl_vertex_program *linked_vprog =
-         _mesa_clone_vertex_program(ctx, vertProg);
-      shProg->VertexProgram = linked_vprog; /* refcount OK */
-      /* vertex program ID not significant; just set Id for debugging purposes */
-      shProg->VertexProgram->Base.Id = shProg->Name;
-      ASSERT(shProg->VertexProgram->Base.RefCount == 1);
-   }
-
-   _mesa_reference_fragprog(ctx, &shProg->FragmentProgram, NULL);
-   if (fragProg) {
-      struct gl_fragment_program *linked_fprog = 
-         _mesa_clone_fragment_program(ctx, fragProg);
-      shProg->FragmentProgram = linked_fprog; /* refcount OK */
-      /* vertex program ID not significant; just set Id for debugging purposes */
-      shProg->FragmentProgram->Base.Id = shProg->Name;
-      ASSERT(shProg->FragmentProgram->Base.RefCount == 1);
-   }
-
-   /* link varying vars */
-   if (shProg->VertexProgram) {
-      if (!link_varying_vars(ctx, shProg, &shProg->VertexProgram->Base))
-         return;
-   }
-   if (shProg->FragmentProgram) {
-      if (!link_varying_vars(ctx, shProg, &shProg->FragmentProgram->Base))
-         return;
-   }
-
-   /* link uniform vars */
-   if (shProg->VertexProgram) {
-      if (!link_uniform_vars(ctx, shProg, &shProg->VertexProgram->Base,
-                             &numSamplers)) {
-         return;
-      }
-   }
-   if (shProg->FragmentProgram) {
-      if (!link_uniform_vars(ctx, shProg, &shProg->FragmentProgram->Base,
-                             &numSamplers)) {
-         return;
-      }
-   }
-
-   /*_mesa_print_uniforms(shProg->Uniforms);*/
-
-   if (shProg->VertexProgram) {
-      if (!_slang_resolve_attributes(shProg, &vertProg->Base,
-                                     &shProg->VertexProgram->Base)) {
-         return;
-      }
-   }
-
-   if (shProg->VertexProgram) {
-      _slang_update_inputs_outputs(&shProg->VertexProgram->Base);
-      _slang_count_temporaries(&shProg->VertexProgram->Base);
-      if (!(shProg->VertexProgram->Base.OutputsWritten
-	    & BITFIELD64_BIT(VERT_RESULT_HPOS))) {
-         /* the vertex program did not compute a vertex position */
-         link_error(shProg,
-                    "gl_Position was not written by vertex shader\n");
-         return;
-      }
-   }
-   if (shProg->FragmentProgram) {
-      _slang_count_temporaries(&shProg->FragmentProgram->Base);
-      _slang_update_inputs_outputs(&shProg->FragmentProgram->Base);
-   }
-
-   /* Check that all the varying vars needed by the fragment shader are
-    * actually produced by the vertex shader.
-    */
-   if (shProg->FragmentProgram) {
-      const GLbitfield varyingRead
-         = shProg->FragmentProgram->Base.InputsRead >> FRAG_ATTRIB_VAR0;
-      const GLbitfield64 varyingWritten = shProg->VertexProgram ?
-         shProg->VertexProgram->Base.OutputsWritten >> VERT_RESULT_VAR0 : 0x0;
-      if ((varyingRead & varyingWritten) != varyingRead) {
-         link_error(shProg,
-          "Fragment program using varying vars not written by vertex shader\n");
-         return;
-      }         
-   }
-
-   /* check that gl_FragColor and gl_FragData are not both written to */
-   if (shProg->FragmentProgram) {
-      const GLbitfield64 outputsWritten =
-	 shProg->FragmentProgram->Base.OutputsWritten;
-      if ((outputsWritten & BITFIELD64_BIT(FRAG_RESULT_COLOR)) &&
-          (outputsWritten >= BITFIELD64_BIT(FRAG_RESULT_DATA0))) {
-         link_error(shProg, "Fragment program cannot write both gl_FragColor"
-                    " and gl_FragData[].\n");
-         return;
-      }         
-   }
-
-
-   if (fragProg && shProg->FragmentProgram) {
-      /* Compute initial program's TexturesUsed info */
-      _mesa_update_shader_textures_used(&shProg->FragmentProgram->Base);
-
-      /* notify driver that a new fragment program has been compiled/linked */
-      vertNotify = ctx->Driver.ProgramStringNotify(ctx, GL_FRAGMENT_PROGRAM_ARB,
-                                                 &shProg->FragmentProgram->Base);
-      if (ctx->Shader.Flags & GLSL_DUMP) {
-         printf("Mesa pre-link fragment program:\n");
-         _mesa_print_program(&fragProg->Base);
-         _mesa_print_program_parameters(ctx, &fragProg->Base);
-
-         printf("Mesa post-link fragment program:\n");
-         _mesa_print_program(&shProg->FragmentProgram->Base);
-         _mesa_print_program_parameters(ctx, &shProg->FragmentProgram->Base);
-      }
-   }
-
-   if (vertProg && shProg->VertexProgram) {
-      /* Compute initial program's TexturesUsed info */
-      _mesa_update_shader_textures_used(&shProg->VertexProgram->Base);
-
-      /* notify driver that a new vertex program has been compiled/linked */
-      fragNotify = ctx->Driver.ProgramStringNotify(ctx, GL_VERTEX_PROGRAM_ARB,
-                                                   &shProg->VertexProgram->Base);
-      if (ctx->Shader.Flags & GLSL_DUMP) {
-         printf("Mesa pre-link vertex program:\n");
-         _mesa_print_program(&vertProg->Base);
-         _mesa_print_program_parameters(ctx, &vertProg->Base);
-
-         printf("Mesa post-link vertex program:\n");
-         _mesa_print_program(&shProg->VertexProgram->Base);
-         _mesa_print_program_parameters(ctx, &shProg->VertexProgram->Base);
-      }
-   }
-
-   /* Debug: */
-   if (0) {
-      if (shProg->VertexProgram)
-         _mesa_postprocess_program(ctx, &shProg->VertexProgram->Base);
-      if (shProg->FragmentProgram)
-         _mesa_postprocess_program(ctx, &shProg->FragmentProgram->Base);
-   }
-
-   if (ctx->Shader.Flags & GLSL_DUMP) {
-      printf("Varying vars:\n");
-      _mesa_print_parameter_list(shProg->Varying);
-      if (shProg->InfoLog) {
-         printf("Info Log: %s\n", shProg->InfoLog);
-      }
-   }
-
-   if (!vertNotify || !fragNotify) {
-      /* driver rejected one/both of the vertex/fragment programs */
-      if (!shProg->InfoLog) {
-	 link_error(shProg,
-		    "Vertex and/or fragment program rejected by driver\n");
-      }
-   }
-   else {
-      shProg->LinkStatus = (shProg->VertexProgram || shProg->FragmentProgram);
-   }
-}
-
diff --git a/mesalib/src/mesa/shader/slang/slang_log.c b/mesalib/src/mesa/shader/slang/slang_log.c
deleted file mode 100644
index 9ff21417b..000000000
--- a/mesalib/src/mesa/shader/slang/slang_log.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.3
- *
- * Copyright (C) 2005-2007  Brian Paul   All Rights Reserved.
- * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include "main/imports.h"
-#include "slang_log.h"
-#include "slang_utility.h"
-
-
-
-static char *out_of_memory = "Error: Out of memory.\n";
-
-void
-slang_info_log_construct(slang_info_log * log)
-{
-   log->text = NULL;
-   log->dont_free_text = GL_FALSE;
-   log->error_flag = GL_FALSE;
-}
-
-void
-slang_info_log_destruct(slang_info_log * log)
-{
-   if (!log->dont_free_text)
-      free(log->text);
-}
-
-static int
-slang_info_log_message(slang_info_log * log, const char *prefix,
-                       const char *msg)
-{
-   GLuint size;
-
-   if (log->dont_free_text)
-      return 0;
-   size = slang_string_length(msg) + 2;
-   if (prefix != NULL)
-      size += slang_string_length(prefix) + 2;
-   if (log->text != NULL) {
-      GLuint old_len = slang_string_length(log->text);
-      log->text = (char *)
-	 _mesa_realloc(log->text, old_len + 1, old_len + size);
-   }
-   else {
-      log->text = (char *) (malloc(size));
-      if (log->text != NULL)
-         log->text[0] = '\0';
-   }
-   if (log->text == NULL)
-      return 0;
-   if (prefix != NULL) {
-      slang_string_concat(log->text, prefix);
-      slang_string_concat(log->text, ": ");
-   }
-   slang_string_concat(log->text, msg);
-   slang_string_concat(log->text, "\n");
-
-   return 1;
-}
-
-int
-slang_info_log_print(slang_info_log * log, const char *msg, ...)
-{
-   va_list va;
-   char buf[1024];
-
-   va_start(va, msg);
-   vsprintf(buf, msg, va);
-   va_end(va);
-   return slang_info_log_message(log, NULL, buf);
-}
-
-int
-slang_info_log_error(slang_info_log * log, const char *msg, ...)
-{
-   va_list va;
-   char buf[1024];
-
-   va_start(va, msg);
-   vsprintf(buf, msg, va);
-   va_end(va);
-   log->error_flag = GL_TRUE;
-   if (slang_info_log_message(log, "Error", buf))
-      return 1;
-   slang_info_log_memory(log);
-   return 0;
-}
-
-int
-slang_info_log_warning(slang_info_log * log, const char *msg, ...)
-{
-   va_list va;
-   char buf[1024];
-
-   va_start(va, msg);
-   vsprintf(buf, msg, va);
-   va_end(va);
-   if (slang_info_log_message(log, "Warning", buf))
-      return 1;
-   slang_info_log_memory(log);
-   return 0;
-}
-
-void
-slang_info_log_memory(slang_info_log * log)
-{
-   if (!slang_info_log_message(log, "Error", "Out of memory.")) {
-      log->dont_free_text = GL_TRUE;
-      log->error_flag = GL_TRUE;
-      log->text = out_of_memory;
-   }
-}
diff --git a/mesalib/src/mesa/shader/slang/slang_log.h b/mesalib/src/mesa/shader/slang/slang_log.h
deleted file mode 100644
index dcaba0285..000000000
--- a/mesalib/src/mesa/shader/slang/slang_log.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.3
- *
- * Copyright (C) 2005-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.
- */
-
-
-#ifndef SLANG_LOG_H
-#define SLANG_LOG_H
-
-
-typedef struct slang_info_log_
-{
-   char *text;
-   GLboolean dont_free_text;
-   GLboolean error_flag;
-} slang_info_log;
-
-
-extern void
-slang_info_log_construct(slang_info_log *);
-
-extern void
-slang_info_log_destruct(slang_info_log *);
-
-extern int
-slang_info_log_print(slang_info_log *, const char *, ...);
-
-extern int
-slang_info_log_error(slang_info_log *, const char *, ...);
-
-extern int
-slang_info_log_warning(slang_info_log *, const char *, ...);
-
-extern void
-slang_info_log_memory(slang_info_log *);
-
-
-#endif /* SLANG_LOG_H */
diff --git a/mesalib/src/mesa/shader/slang/slang_mem.c b/mesalib/src/mesa/shader/slang/slang_mem.c
deleted file mode 100644
index 5eaa7c442..000000000
--- a/mesalib/src/mesa/shader/slang/slang_mem.c
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.3
- *
- * Copyright (C) 2005-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 slang_mem.c
- *
- * Memory manager for GLSL compiler.  The general idea is to do all
- * allocations out of a large pool then just free the pool when done
- * compiling to avoid intricate malloc/free tracking and memory leaks.
- *
- * \author Brian Paul
- */
-
-#include "main/context.h"
-#include "main/macros.h"
-#include "slang_mem.h"
-
-
-#define GRANULARITY 8
-#define ROUND_UP(B)  ( ((B) + (GRANULARITY - 1)) & ~(GRANULARITY - 1) )
-
-
-/** If 1, use conventional malloc/free.  Helpful for debugging */
-#define USE_MALLOC_FREE 0
-
-
-struct slang_mempool_
-{
-   GLuint Size, Used, Count, Largest;
-   char *Data;
-   struct slang_mempool_ *Next;
-};
-
-
-slang_mempool *
-_slang_new_mempool(GLuint initialSize)
-{
-   slang_mempool *pool = (slang_mempool *) calloc(1, sizeof(slang_mempool));
-   if (pool) {
-      pool->Data = (char *) calloc(1, initialSize);
-      /*printf("ALLOC MEMPOOL %d at %p\n", initialSize, pool->Data);*/
-      if (!pool->Data) {
-         free(pool);
-         return NULL;
-      }
-      pool->Size = initialSize;
-      pool->Used = 0;
-   }
-   return pool;
-}
-
-
-void
-_slang_delete_mempool(slang_mempool *pool)
-{
-   GLuint total = 0;
-   while (pool) {
-      slang_mempool *next = pool->Next;
-      /*
-      printf("DELETE MEMPOOL %u / %u  count=%u largest=%u\n",
-             pool->Used, pool->Size, pool->Count, pool->Largest);
-      */
-      total += pool->Used;
-      free(pool->Data);
-      free(pool);
-      pool = next;
-   }
-   /*printf("TOTAL ALLOCATED: %u\n", total);*/
-}
-
-
-#ifdef DEBUG
-static void
-check_zero(const char *addr, GLuint n)
-{
-   GLuint i;
-   for (i = 0; i < n; i++) {
-      assert(addr[i]==0);
-   }
-}
-#endif
-
-
-#ifdef DEBUG
-static GLboolean
-is_valid_address(const slang_mempool *pool, void *addr)
-{
-   while (pool) {
-      if ((char *) addr >= pool->Data &&
-          (char *) addr < pool->Data + pool->Used)
-         return GL_TRUE;
-
-      pool = pool->Next;
-   }
-   return GL_FALSE;
-}
-#endif
-
-
-/**
- * Alloc 'bytes' from shader mempool.
- */
-void *
-_slang_alloc(GLuint bytes)
-{
-#if USE_MALLOC_FREE
-   return calloc(1, bytes);
-#else
-   slang_mempool *pool;
-   GET_CURRENT_CONTEXT(ctx);
-   pool = (slang_mempool *) ctx->Shader.MemPool;
-
-   if (bytes == 0)
-      bytes = 1;
-
-   while (pool) {
-      if (pool->Used + bytes <= pool->Size) {
-         /* found room */
-         void *addr = (void *) (pool->Data + pool->Used);
-#ifdef DEBUG
-         check_zero((char*) addr, bytes);
-#endif
-         pool->Used += ROUND_UP(bytes);
-         pool->Largest = MAX2(pool->Largest, bytes);
-         pool->Count++;
-         /*printf("alloc %u  Used %u\n", bytes, pool->Used);*/
-         return addr;
-      }
-      else if (pool->Next) {
-         /* try next block */
-         pool = pool->Next;
-      }
-      else {
-         /* alloc new pool */
-         const GLuint sz = MAX2(bytes, pool->Size);
-         pool->Next = _slang_new_mempool(sz);
-         if (!pool->Next) {
-            /* we're _really_ out of memory */
-            return NULL;
-         }
-         else {
-            pool = pool->Next;
-            pool->Largest = bytes;
-            pool->Count++;
-            pool->Used = ROUND_UP(bytes);
-#ifdef DEBUG
-            check_zero((char*) pool->Data, bytes);
-#endif
-            return (void *) pool->Data;
-         }
-      }
-   }
-   return NULL;
-#endif
-}
-
-
-void *
-_slang_realloc(void *oldBuffer, GLuint oldSize, GLuint newSize)
-{
-#if USE_MALLOC_FREE
-   return _mesa_realloc(oldBuffer, oldSize, newSize);
-#else
-   GET_CURRENT_CONTEXT(ctx);
-   slang_mempool *pool = (slang_mempool *) ctx->Shader.MemPool;
-   (void) pool;
-
-   if (newSize < oldSize) {
-      return oldBuffer;
-   }
-   else {
-      const GLuint copySize = (oldSize < newSize) ? oldSize : newSize;
-      void *newBuffer = _slang_alloc(newSize);
-
-      if (oldBuffer)
-         ASSERT(is_valid_address(pool, oldBuffer));
-
-      if (newBuffer && oldBuffer && copySize > 0)
-         memcpy(newBuffer, oldBuffer, copySize);
-
-      return newBuffer;
-   }
-#endif
-}
-
-
-/**
- * Clone string, storing in current mempool.
- */
-char *
-_slang_strdup(const char *s)
-{
-   if (s) {
-      size_t l = strlen(s);
-      char *s2 = (char *) _slang_alloc(l + 1);
-      if (s2)
-         strcpy(s2, s);
-      return s2;
-   }
-   else {
-      return NULL;
-   }
-}
-
-
-/**
- * Don't actually free memory, but mark it (for debugging).
- */
-void
-_slang_free(void *addr)
-{
-#if USE_MALLOC_FREE
-   free(addr);
-#else
-   if (addr) {
-      GET_CURRENT_CONTEXT(ctx);
-      slang_mempool *pool = (slang_mempool *) ctx->Shader.MemPool;
-      (void) pool;
-      ASSERT(is_valid_address(pool, addr));
-   }
-#endif
-}
diff --git a/mesalib/src/mesa/shader/slang/slang_mem.h b/mesalib/src/mesa/shader/slang/slang_mem.h
deleted file mode 100644
index b5bfae247..000000000
--- a/mesalib/src/mesa/shader/slang/slang_mem.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.3
- *
- * Copyright (C) 2005-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.
- */
-
-
-#ifndef SLANG_MEM_H
-#define SLANG_MEM_H
-
-
-#include "main/imports.h"
-
-
-typedef struct slang_mempool_ slang_mempool;
-
-
-extern slang_mempool *
-_slang_new_mempool(GLuint initialSize);
-
-extern void
-_slang_delete_mempool(slang_mempool *pool);
-
-extern void *
-_slang_alloc(GLuint bytes);
-
-extern void *
-_slang_realloc(void *oldBuffer, GLuint oldSize, GLuint newSize);
-
-extern char *
-_slang_strdup(const char *s);
-
-extern void
-_slang_free(void *addr);
-
-
-#endif
diff --git a/mesalib/src/mesa/shader/slang/slang_print.c b/mesalib/src/mesa/shader/slang/slang_print.c
deleted file mode 100644
index 3c75523c4..000000000
--- a/mesalib/src/mesa/shader/slang/slang_print.c
+++ /dev/null
@@ -1,883 +0,0 @@
-
-/**
- * Dump/print a slang_operation tree
- */
-
-
-#include "main/imports.h"
-#include "slang_compile.h"
-#include "slang_print.h"
-
-
-static void
-spaces(int n)
-{
-   while (n--)
-      printf(" ");
-}
-
-
-static void
-print_type(const slang_fully_specified_type *t)
-{
-   switch (t->qualifier) {
-   case SLANG_QUAL_NONE:
-      /*printf("");*/
-      break;
-   case SLANG_QUAL_CONST:
-      printf("const ");
-      break;
-   case SLANG_QUAL_ATTRIBUTE:
-      printf("attrib ");
-      break;
-   case SLANG_QUAL_VARYING:
-      printf("varying ");
-      break;
-   case SLANG_QUAL_UNIFORM:
-      printf("uniform ");
-      break;
-   case SLANG_QUAL_OUT:
-      printf("output ");
-      break;
-   case SLANG_QUAL_INOUT:
-      printf("inout ");
-      break;
-   case SLANG_QUAL_FIXEDOUTPUT:
-      printf("fixedoutput");
-      break;
-   case SLANG_QUAL_FIXEDINPUT:
-      printf("fixedinput");
-      break;
-   default:
-      printf("unknown qualifer!");
-   }
-
-   switch (t->specifier.type) {
-   case SLANG_SPEC_VOID:
-      printf("void");
-      break;
-   case SLANG_SPEC_BOOL:
-      printf("bool");
-      break;
-   case SLANG_SPEC_BVEC2:
-      printf("bvec2");
-      break;
-   case SLANG_SPEC_BVEC3:
-      printf("bvec3");
-      break;
-   case SLANG_SPEC_BVEC4:
-      printf("bvec4");
-      break;
-   case SLANG_SPEC_INT:
-      printf("int");
-      break;
-   case SLANG_SPEC_IVEC2:
-      printf("ivec2");
-      break;
-   case SLANG_SPEC_IVEC3:
-      printf("ivec3");
-      break;
-   case SLANG_SPEC_IVEC4:
-      printf("ivec4");
-      break;
-   case SLANG_SPEC_FLOAT:
-      printf("float");
-      break;
-   case SLANG_SPEC_VEC2:
-      printf("vec2");
-      break;
-   case SLANG_SPEC_VEC3:
-      printf("vec3");
-      break;
-   case SLANG_SPEC_VEC4:
-      printf("vec4");
-      break;
-   case SLANG_SPEC_MAT2:
-      printf("mat2");
-      break;
-   case SLANG_SPEC_MAT3:
-      printf("mat3");
-      break;
-   case SLANG_SPEC_MAT4:
-      printf("mat4");
-      break;
-   case SLANG_SPEC_MAT23:
-      printf("mat2x3");
-      break;
-   case SLANG_SPEC_MAT32:
-      printf("mat3x2");
-      break;
-   case SLANG_SPEC_MAT24:
-      printf("mat2x4");
-      break;
-   case SLANG_SPEC_MAT42:
-      printf("mat4x2");
-      break;
-   case SLANG_SPEC_MAT34:
-      printf("mat3x4");
-      break;
-   case SLANG_SPEC_MAT43:
-      printf("mat4x3");
-      break;
-   case SLANG_SPEC_SAMPLER_1D:
-      printf("sampler1D");
-      break;
-   case SLANG_SPEC_SAMPLER_2D:
-      printf("sampler2D");
-      break;
-   case SLANG_SPEC_SAMPLER_3D:
-      printf("sampler3D");
-      break;
-   case SLANG_SPEC_SAMPLER_CUBE:
-      printf("samplerCube");
-      break;
-   case SLANG_SPEC_SAMPLER_1D_SHADOW:
-      printf("sampler1DShadow");
-      break;
-   case SLANG_SPEC_SAMPLER_2D_SHADOW:
-      printf("sampler2DShadow");
-      break;
-   case SLANG_SPEC_STRUCT:
-      printf("struct");
-      break;
-   case SLANG_SPEC_ARRAY:
-      printf("array");
-      break;
-   default:
-      printf("unknown type");
-   }
-   /*printf("\n");*/
-}
-
-
-static void
-print_variable(const slang_variable *v, int indent)
-{
-   spaces(indent);
-   printf("VAR ");
-   print_type(&v->type);
-   printf(" %s (at %p)", (char *) v->a_name, (void *) v);
-   if (v->initializer) {
-      printf(" :=\n");
-      slang_print_tree(v->initializer, indent + 3);
-   }
-   else {
-      printf(";\n");
-   }
-}
-
-
-static void
-print_binary(const slang_operation *op, const char *oper, int indent)
-{
-   assert(op->num_children == 2);
-#if 0
-   printf("binary at %p locals=%p outer=%p\n",
-          (void *) op,
-          (void *) op->locals,
-          (void *) op->locals->outer_scope);
-#endif
-   slang_print_tree(&op->children[0], indent + 3);
-   spaces(indent);
-   printf("%s at %p locals=%p outer=%p\n",
-          oper, (void *) op, (void *) op->locals,
-          (void *) op->locals->outer_scope);
-   slang_print_tree(&op->children[1], indent + 3);
-}
-
-
-static void
-print_generic2(const slang_operation *op, const char *oper,
-               const char *s, int indent)
-{
-   GLuint i;
-   if (oper) {
-      spaces(indent);
-      printf("%s %s at %p locals=%p outer=%p\n",
-             oper, s, (void *) op, (void *) op->locals, 
-             (void *) op->locals->outer_scope);
-   }
-   for (i = 0; i < op->num_children; i++) {
-      spaces(indent);
-      printf("//child %u of %u:\n", i, op->num_children);
-      slang_print_tree(&op->children[i], indent);
-   }
-}
-
-static void
-print_generic(const slang_operation *op, const char *oper, int indent)
-{
-   print_generic2(op, oper, "", indent);
-}
-
-
-static const slang_variable_scope *
-find_scope(const slang_variable_scope *s, slang_atom name)
-{
-   GLuint i;
-   for (i = 0; i < s->num_variables; i++) {
-      if (s->variables[i]->a_name == name)
-         return s;
-   }
-   if (s->outer_scope)
-      return find_scope(s->outer_scope, name);
-   else
-      return NULL;
-}
-
-static const slang_variable *
-find_var(const slang_variable_scope *s, slang_atom name)
-{
-   GLuint i;
-   for (i = 0; i < s->num_variables; i++) {
-      if (s->variables[i]->a_name == name)
-         return s->variables[i];
-   }
-   if (s->outer_scope)
-      return find_var(s->outer_scope, name);
-   else
-      return NULL;
-}
-
-
-void
-slang_print_tree(const slang_operation *op, int indent)
-{
-   GLuint i;
-
-   switch (op->type) {
-
-   case SLANG_OPER_NONE:
-      spaces(indent);
-      printf("SLANG_OPER_NONE\n");
-      break;
-
-   case SLANG_OPER_BLOCK_NO_NEW_SCOPE:
-      spaces(indent);
-      printf("{ locals=%p  outer=%p\n", (void*)op->locals, (void*)op->locals->outer_scope);
-      print_generic(op, NULL, indent+3);
-      spaces(indent);
-      printf("}\n");
-      break;
-
-   case SLANG_OPER_BLOCK_NEW_SCOPE:
-   case SLANG_OPER_NON_INLINED_CALL:
-      spaces(indent);
-      printf("{{ // new scope  locals=%p outer=%p: ",
-             (void *) op->locals,
-             (void *) op->locals->outer_scope);
-      for (i = 0; i < op->locals->num_variables; i++) {
-         printf("%s ", (char *) op->locals->variables[i]->a_name);
-      }
-      printf("\n");
-      print_generic(op, NULL, indent+3);
-      spaces(indent);
-      printf("}}\n");
-      break;
-
-   case SLANG_OPER_VARIABLE_DECL:
-      assert(op->num_children == 0 || op->num_children == 1);
-      {
-         slang_variable *v;
-         v = _slang_variable_locate(op->locals, op->a_id, GL_TRUE);
-         if (v) {
-            const slang_variable_scope *scope;
-            spaces(indent);
-            printf("DECL (locals=%p outer=%p) ", (void*)op->locals, (void*) op->locals->outer_scope);
-            print_type(&v->type);
-            printf(" %s (%p)", (char *) op->a_id,
-                   (void *) find_var(op->locals, op->a_id));
-
-            scope = find_scope(op->locals, op->a_id);
-            printf(" (in scope %p) ", (void *) scope);
-            assert(scope);
-            if (op->num_children == 1) {
-               printf(" :=\n");
-               slang_print_tree(&op->children[0], indent + 3);
-            }
-            else if (v->initializer) {
-               printf(" := INITIALIZER\n");
-               slang_print_tree(v->initializer, indent + 3);
-            }
-            else {
-               printf(";\n");
-            }
-            /*
-            spaces(indent);
-            printf("TYPE: ");
-            print_type(&v->type);
-            spaces(indent);
-            printf("ADDR: %d  size: %d\n", v->address, v->size);
-            */
-         }
-         else {
-            spaces(indent);
-            printf("DECL %s (anonymous variable!!!!)\n", (char *) op->a_id);
-         }
-      }
-      break;
-
-   case SLANG_OPER_ASM:
-      spaces(indent);
-      printf("ASM: %s at %p locals=%p outer=%p\n",
-             (char *) op->a_id,
-             (void *) op,
-             (void *) op->locals,
-             (void *) op->locals->outer_scope);
-      print_generic(op, "ASM", indent+3);
-      break;
-
-   case SLANG_OPER_BREAK:
-      spaces(indent);
-      printf("BREAK\n");
-      break;
-
-   case SLANG_OPER_CONTINUE:
-      spaces(indent);
-      printf("CONTINUE\n");
-      break;
-
-   case SLANG_OPER_DISCARD:
-      spaces(indent);
-      printf("DISCARD\n");
-      break;
-
-   case SLANG_OPER_RETURN:
-      spaces(indent);
-      printf("RETURN\n");
-      if (op->num_children > 0)
-         slang_print_tree(&op->children[0], indent + 3);
-      break;
-
-   case SLANG_OPER_RETURN_INLINED:
-      spaces(indent);
-      printf("RETURN_INLINED\n");
-      if (op->num_children > 0)
-         slang_print_tree(&op->children[0], indent + 3);
-      break;
-
-   case SLANG_OPER_LABEL:
-      spaces(indent);
-      printf("LABEL %s\n", (char *) op->a_id);
-      break;
-
-   case SLANG_OPER_EXPRESSION:
-      spaces(indent);
-      printf("EXPR:  locals=%p outer=%p\n",
-             (void *) op->locals,
-             (void *) op->locals->outer_scope);
-      /*print_generic(op, "SLANG_OPER_EXPRESSION", indent);*/
-      slang_print_tree(&op->children[0], indent + 3);
-      break;
-
-   case SLANG_OPER_IF:
-      spaces(indent);
-      printf("IF\n");
-      slang_print_tree(&op->children[0], indent + 3);
-      spaces(indent);
-      printf("THEN\n");
-      slang_print_tree(&op->children[1], indent + 3);
-      spaces(indent);
-      printf("ELSE\n");
-      slang_print_tree(&op->children[2], indent + 3);
-      spaces(indent);
-      printf("ENDIF\n");
-      break;
-
-   case SLANG_OPER_WHILE:
-      assert(op->num_children == 2);
-      spaces(indent);
-      printf("WHILE LOOP: locals = %p\n", (void *) op->locals);
-      indent += 3;
-      spaces(indent);
-      printf("WHILE cond:\n");
-      slang_print_tree(&op->children[0], indent + 3);
-      spaces(indent);
-      printf("WHILE body:\n");
-      slang_print_tree(&op->children[1], indent + 3);
-      indent -= 3;
-      spaces(indent);
-      printf("END WHILE LOOP\n");
-      break;
-
-   case SLANG_OPER_DO:
-      spaces(indent);
-      printf("DO LOOP: locals = %p\n", (void *) op->locals);
-      indent += 3;
-      spaces(indent);
-      printf("DO body:\n");
-      slang_print_tree(&op->children[0], indent + 3);
-      spaces(indent);
-      printf("DO cond:\n");
-      slang_print_tree(&op->children[1], indent + 3);
-      indent -= 3;
-      spaces(indent);
-      printf("END DO LOOP\n");
-      break;
-
-   case SLANG_OPER_FOR:
-      spaces(indent);
-      printf("FOR LOOP: locals = %p\n", (void *) op->locals);
-      indent += 3;
-      spaces(indent);
-      printf("FOR init:\n");
-      slang_print_tree(&op->children[0], indent + 3);
-      spaces(indent);
-      printf("FOR condition:\n");
-      slang_print_tree(&op->children[1], indent + 3);
-      spaces(indent);
-      printf("FOR step:\n");
-      slang_print_tree(&op->children[2], indent + 3);
-      spaces(indent);
-      printf("FOR body:\n");
-      slang_print_tree(&op->children[3], indent + 3);
-      indent -= 3;
-      spaces(indent);
-      printf("ENDFOR\n");
-      /*
-      print_generic(op, "FOR", indent + 3);
-      */
-      break;
-
-   case SLANG_OPER_VOID:
-      spaces(indent);
-      printf("(oper-void)\n");
-      break;
-
-   case SLANG_OPER_LITERAL_BOOL:
-      spaces(indent);
-      printf("LITERAL (");
-      for (i = 0; i < op->literal_size; i++)
-         printf("%s ", op->literal[0] ? "TRUE" : "FALSE");
-      printf(")\n");
-
-      break;
-
-   case SLANG_OPER_LITERAL_INT:
-      spaces(indent);
-      printf("LITERAL (");
-      for (i = 0; i < op->literal_size; i++)
-         printf("%d ", (int) op->literal[i]);
-      printf(")\n");
-      break;
-
-   case SLANG_OPER_LITERAL_FLOAT:
-      spaces(indent);
-      printf("LITERAL (");
-      for (i = 0; i < op->literal_size; i++)
-         printf("%f ", op->literal[i]);
-      printf(")\n");
-      break;
-
-   case SLANG_OPER_IDENTIFIER:
-      {
-         const slang_variable_scope *scope;
-         spaces(indent);
-         if (op->var && op->var->a_name) {
-            scope = find_scope(op->locals, op->var->a_name);
-            printf("VAR %s  (in scope %p)\n", (char *) op->var->a_name,
-                   (void *) scope);
-            assert(scope);
-         }
-         else {
-            scope = find_scope(op->locals, op->a_id);
-            printf("VAR' %s  (in scope %p) locals=%p outer=%p\n",
-                   (char *) op->a_id,
-                   (void *) scope,
-                   (void *) op->locals,
-                   (void *) op->locals->outer_scope);
-            /*assert(scope);*/
-         }
-      }
-      break;
-
-   case SLANG_OPER_SEQUENCE:
-      print_generic(op, "COMMA-SEQ", indent+3);
-      break;
-
-   case SLANG_OPER_ASSIGN:
-      spaces(indent);
-      printf("ASSIGNMENT  locals=%p outer=%p\n",
-             (void *) op->locals,
-             (void *) op->locals->outer_scope);
-      print_binary(op, ":=", indent);
-      break;
-
-   case SLANG_OPER_ADDASSIGN:
-      spaces(indent);
-      printf("ASSIGN\n");
-      print_binary(op, "+=", indent);
-      break;
-
-   case SLANG_OPER_SUBASSIGN:
-      spaces(indent);
-      printf("ASSIGN\n");
-      print_binary(op, "-=", indent);
-      break;
-
-   case SLANG_OPER_MULASSIGN:
-      spaces(indent);
-      printf("ASSIGN\n");
-      print_binary(op, "*=", indent);
-      break;
-
-   case SLANG_OPER_DIVASSIGN:
-      spaces(indent);
-      printf("ASSIGN\n");
-      print_binary(op, "/=", indent);
-      break;
-
-	/*SLANG_OPER_MODASSIGN,*/
-	/*SLANG_OPER_LSHASSIGN,*/
-	/*SLANG_OPER_RSHASSIGN,*/
-	/*SLANG_OPER_ORASSIGN,*/
-	/*SLANG_OPER_XORASSIGN,*/
-	/*SLANG_OPER_ANDASSIGN,*/
-   case SLANG_OPER_SELECT:
-      spaces(indent);
-      printf("SLANG_OPER_SELECT n=%d\n", op->num_children);
-      assert(op->num_children == 3);
-      slang_print_tree(&op->children[0], indent+3);
-      spaces(indent);
-      printf("?\n");
-      slang_print_tree(&op->children[1], indent+3);
-      spaces(indent);
-      printf(":\n");
-      slang_print_tree(&op->children[2], indent+3);
-      break;
-
-   case SLANG_OPER_LOGICALOR:
-      print_binary(op, "||", indent);
-      break;
-
-   case SLANG_OPER_LOGICALXOR:
-      print_binary(op, "^^", indent);
-      break;
-
-   case SLANG_OPER_LOGICALAND:
-      print_binary(op, "&&", indent);
-      break;
-
-   /*SLANG_OPER_BITOR*/
-   /*SLANG_OPER_BITXOR*/
-   /*SLANG_OPER_BITAND*/
-   case SLANG_OPER_EQUAL:
-      print_binary(op, "==", indent);
-      break;
-
-   case SLANG_OPER_NOTEQUAL:
-      print_binary(op, "!=", indent);
-      break;
-
-   case SLANG_OPER_LESS:
-      print_binary(op, "<", indent);
-      break;
-
-   case SLANG_OPER_GREATER:
-      print_binary(op, ">", indent);
-      break;
-
-   case SLANG_OPER_LESSEQUAL:
-      print_binary(op, "<=", indent);
-      break;
-
-   case SLANG_OPER_GREATEREQUAL:
-      print_binary(op, ">=", indent);
-      break;
-
-   /*SLANG_OPER_LSHIFT*/
-   /*SLANG_OPER_RSHIFT*/
-   case SLANG_OPER_ADD:
-      print_binary(op, "+", indent);
-      break;
-
-   case SLANG_OPER_SUBTRACT:
-      print_binary(op, "-", indent);
-      break;
-
-   case SLANG_OPER_MULTIPLY:
-      print_binary(op, "*", indent);
-      break;
-
-   case SLANG_OPER_DIVIDE:
-      print_binary(op, "/", indent);
-      break;
-
-   /*SLANG_OPER_MODULUS*/
-   case SLANG_OPER_PREINCREMENT:
-      spaces(indent);
-      printf("PRE++\n");
-      slang_print_tree(&op->children[0], indent+3);
-      break;
-
-   case SLANG_OPER_PREDECREMENT:
-      spaces(indent);
-      printf("PRE--\n");
-      slang_print_tree(&op->children[0], indent+3);
-      break;
-
-   case SLANG_OPER_PLUS:
-      spaces(indent);
-      printf("SLANG_OPER_PLUS\n");
-      break;
-
-   case SLANG_OPER_MINUS:
-      spaces(indent);
-      printf("SLANG_OPER_MINUS\n");
-      break;
-
-   /*SLANG_OPER_COMPLEMENT*/
-   case SLANG_OPER_NOT:
-      spaces(indent);
-      printf("NOT\n");
-      slang_print_tree(&op->children[0], indent+3);
-      break;
-
-   case SLANG_OPER_SUBSCRIPT:
-      spaces(indent);
-      printf("SLANG_OPER_SUBSCRIPT locals=%p outer=%p\n",
-             (void *) op->locals,
-             (void *) op->locals->outer_scope);
-      print_generic(op, NULL, indent+3);
-      break;
-
-   case SLANG_OPER_CALL:
-#if 0
-         slang_function *fun
-            = _slang_function_locate(A->space.funcs, oper->a_id,
-                                     oper->children,
-                                     oper->num_children, &A->space, A->atoms);
-#endif
-      spaces(indent);
-      printf("CALL %s(\n", (char *) op->a_id);
-      for (i = 0; i < op->num_children; i++) {
-         slang_print_tree(&op->children[i], indent+3);
-         if (i + 1 < op->num_children) {
-            spaces(indent + 3);
-            printf(",\n");
-         }
-      }
-      spaces(indent);
-      printf(")\n");
-      break;
-
-   case SLANG_OPER_METHOD:
-      spaces(indent);
-      printf("METHOD CALL %s.%s\n", (char *) op->a_obj, (char *) op->a_id);
-      break;
-
-   case SLANG_OPER_FIELD:
-      spaces(indent);
-      printf("FIELD %s of\n", (char*) op->a_id);
-      slang_print_tree(&op->children[0], indent+3);
-      break;
-
-   case SLANG_OPER_POSTINCREMENT:
-      spaces(indent);
-      printf("POST++\n");
-      slang_print_tree(&op->children[0], indent+3);
-      break;
-
-   case SLANG_OPER_POSTDECREMENT:
-      spaces(indent);
-      printf("POST--\n");
-      slang_print_tree(&op->children[0], indent+3);
-      break;
-
-   default:
-      printf("unknown op->type %d\n", (int) op->type);
-   }
-
-}
-
-
-
-void
-slang_print_function(const slang_function *f, GLboolean body)
-{
-   GLuint i;
-
-#if 0
-   if (strcmp((char *) f->header.a_name, "main") != 0)
-     return;
-#endif
-
-   printf("FUNCTION %s ( scope=%p\n",
-          (char *) f->header.a_name, (void *) f->parameters);
-
-   for (i = 0; i < f->param_count; i++) {
-      print_variable(f->parameters->variables[i], 3);
-   }
-
-   printf(") param scope = %p\n", (void *) f->parameters);
-
-   if (body && f->body)
-      slang_print_tree(f->body, 0);
-}
-
-
-
-
-
-const char *
-slang_type_qual_string(slang_type_qualifier q)
-{
-   switch (q) {
-   case SLANG_QUAL_NONE:
-      return "none";
-   case SLANG_QUAL_CONST:
-      return "const";
-   case SLANG_QUAL_ATTRIBUTE:
-      return "attribute";
-   case SLANG_QUAL_VARYING:
-      return "varying";
-   case SLANG_QUAL_UNIFORM:
-      return "uniform";
-   case SLANG_QUAL_OUT:
-      return "out";
-   case SLANG_QUAL_INOUT:
-      return "inout";
-   case SLANG_QUAL_FIXEDOUTPUT:
-      return "fixedoutput";
-   case SLANG_QUAL_FIXEDINPUT:
-      return "fixedinputk";
-   default:
-      return "qual?";
-   }
-}
-
-
-static const char *
-slang_type_string(slang_type_specifier_type t)
-{
-   switch (t) {
-   case SLANG_SPEC_VOID:
-      return "void";
-   case SLANG_SPEC_BOOL:
-      return "bool";
-   case SLANG_SPEC_BVEC2:
-      return "bvec2";
-   case SLANG_SPEC_BVEC3:
-      return "bvec3";
-   case SLANG_SPEC_BVEC4:
-      return "bvec4";
-   case SLANG_SPEC_INT:
-      return "int";
-   case SLANG_SPEC_IVEC2:
-      return "ivec2";
-   case SLANG_SPEC_IVEC3:
-      return "ivec3";
-   case SLANG_SPEC_IVEC4:
-      return "ivec4";
-   case SLANG_SPEC_FLOAT:
-      return "float";
-   case SLANG_SPEC_VEC2:
-      return "vec2";
-   case SLANG_SPEC_VEC3:
-      return "vec3";
-   case SLANG_SPEC_VEC4:
-      return "vec4";
-   case SLANG_SPEC_MAT2:
-      return "mat2";
-   case SLANG_SPEC_MAT3:
-      return "mat3";
-   case SLANG_SPEC_MAT4:
-      return "mat4";
-   case SLANG_SPEC_SAMPLER_1D:
-      return "sampler1D";
-   case SLANG_SPEC_SAMPLER_2D:
-      return "sampler2D";
-   case SLANG_SPEC_SAMPLER_3D:
-      return "sampler3D";
-   case SLANG_SPEC_SAMPLER_CUBE:
-      return "samplerCube";
-   case SLANG_SPEC_SAMPLER_1D_SHADOW:
-      return "sampler1DShadow";
-   case SLANG_SPEC_SAMPLER_2D_SHADOW:
-      return "sampler2DShadow";
-   case SLANG_SPEC_SAMPLER_RECT:
-      return "sampler2DRect";
-   case SLANG_SPEC_SAMPLER_RECT_SHADOW:
-      return "sampler2DRectShadow";
-   case SLANG_SPEC_STRUCT:
-      return "struct";
-   case SLANG_SPEC_ARRAY:
-      return "array";
-   default:
-      return "type?";
-   }
-}
-
-
-static const char *
-slang_fq_type_string(const slang_fully_specified_type *t)
-{
-   static char str[1000];
-   sprintf(str, "%s %s", slang_type_qual_string(t->qualifier),
-      slang_type_string(t->specifier.type));
-   return str;
-}
-
-
-void
-slang_print_type(const slang_fully_specified_type *t)
-{
-   printf("%s %s", slang_type_qual_string(t->qualifier),
-      slang_type_string(t->specifier.type));
-}
-
-
-#if 0
-static char *
-slang_var_string(const slang_variable *v)
-{
-   static char str[1000];
-   sprintf(str, "%s : %s",
-           (char *) v->a_name,
-           slang_fq_type_string(&v->type));
-   return str;
-}
-#endif
-
-
-void
-slang_print_variable(const slang_variable *v)
-{
-   printf("Name: %s\n", (char *) v->a_name);
-   printf("Type: %s\n", slang_fq_type_string(&v->type));
-}
-
-
-void
-_slang_print_var_scope(const slang_variable_scope *vars, int indent)
-{
-   GLuint i;
-
-   spaces(indent);
-   printf("Var scope %p  %d vars:\n", (void *) vars, vars->num_variables);
-   for (i = 0; i < vars->num_variables; i++) {
-      spaces(indent + 3);
-      printf("%s (at %p)\n", (char *) vars->variables[i]->a_name, (void*) (vars->variables + i));
-   }
-   spaces(indent + 3);
-   printf("outer_scope = %p\n", (void*) vars->outer_scope);
-
-   if (vars->outer_scope) {
-      /*spaces(indent + 3);*/
-      _slang_print_var_scope(vars->outer_scope, indent + 3);
-   }
-}
-
-
-
-int
-slang_checksum_tree(const slang_operation *op)
-{
-   int s = op->num_children;
-   GLuint i;
-
-   for (i = 0; i < op->num_children; i++) {
-      s += slang_checksum_tree(&op->children[i]);
-   }
-   return s;
-}
diff --git a/mesalib/src/mesa/shader/slang/slang_print.h b/mesalib/src/mesa/shader/slang/slang_print.h
deleted file mode 100644
index 46605c806..000000000
--- a/mesalib/src/mesa/shader/slang/slang_print.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-#ifndef SLANG_PRINT
-#define SLANG_PRINT
-
-extern void
-slang_print_function(const slang_function *f, GLboolean body);
-
-extern void
-slang_print_tree(const slang_operation *op, int indent);
-
-extern const char *
-slang_type_qual_string(slang_type_qualifier q);
-
-extern void
-slang_print_type(const slang_fully_specified_type *t);
-
-extern void
-slang_print_variable(const slang_variable *v);
-
-extern void
-_slang_print_var_scope(const slang_variable_scope *s, int indent);
-
-
-extern int
-slang_checksum_tree(const slang_operation *op);
-
-#endif /* SLANG_PRINT */
-
diff --git a/mesalib/src/mesa/shader/slang/slang_simplify.c b/mesalib/src/mesa/shader/slang/slang_simplify.c
deleted file mode 100644
index 13b9ca3c8..000000000
--- a/mesalib/src/mesa/shader/slang/slang_simplify.c
+++ /dev/null
@@ -1,527 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.1
- *
- * Copyright (C) 2005-2008  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.
- */
-
-/**
- * Functions for constant folding, built-in constant lookup, and function
- * call casting.
- */
-
-
-#include "main/imports.h"
-#include "main/macros.h"
-#include "main/get.h"
-#include "slang_compile.h"
-#include "slang_codegen.h"
-#include "slang_simplify.h"
-#include "slang_print.h"
-
-
-#ifndef GL_MAX_FRAGMENT_UNIFORM_VECTORS
-#define GL_MAX_FRAGMENT_UNIFORM_VECTORS     0x8DFD
-#endif
-#ifndef GL_MAX_VERTEX_UNIFORM_VECTORS
-#define GL_MAX_VERTEX_UNIFORM_VECTORS       0x8DFB
-#endif
-#ifndef GL_MAX_VARYING_VECTORS
-#define GL_MAX_VARYING_VECTORS              0x8DFC
-#endif
-
-
-/**
- * Lookup the value of named constant, such as gl_MaxLights.
- * \return value of constant, or -1 if unknown
- */
-GLint
-_slang_lookup_constant(const char *name)
-{
-   struct constant_info {
-      const char *Name;
-      const GLenum Token;
-   };
-   static const struct constant_info info[] = {
-      { "gl_MaxClipPlanes", GL_MAX_CLIP_PLANES },
-      { "gl_MaxCombinedTextureImageUnits", GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS },
-      { "gl_MaxDrawBuffers", GL_MAX_DRAW_BUFFERS },
-      { "gl_MaxFragmentUniformComponents", GL_MAX_FRAGMENT_UNIFORM_COMPONENTS },
-      { "gl_MaxLights", GL_MAX_LIGHTS },
-      { "gl_MaxTextureUnits", GL_MAX_TEXTURE_UNITS },
-      { "gl_MaxTextureCoords", GL_MAX_TEXTURE_COORDS },
-      { "gl_MaxVertexAttribs", GL_MAX_VERTEX_ATTRIBS },
-      { "gl_MaxVertexUniformComponents", GL_MAX_VERTEX_UNIFORM_COMPONENTS },
-      { "gl_MaxVaryingFloats", GL_MAX_VARYING_FLOATS },
-      { "gl_MaxVertexTextureImageUnits", GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS },
-      { "gl_MaxTextureImageUnits", GL_MAX_TEXTURE_IMAGE_UNITS },
-#if FEATURE_es2_glsl
-      { "gl_MaxVertexUniformVectors", GL_MAX_VERTEX_UNIFORM_VECTORS },
-      { "gl_MaxVaryingVectors", GL_MAX_VARYING_VECTORS },
-      { "gl_MaxFragmentUniformVectors", GL_MAX_FRAGMENT_UNIFORM_VECTORS },
-#endif
-      { NULL, 0 }
-   };
-   GLuint i;
-
-   for (i = 0; info[i].Name; i++) {
-      if (strcmp(info[i].Name, name) == 0) {
-         /* found */
-         GLint values[16];
-         values[0] = -1;
-         _mesa_GetIntegerv(info[i].Token, values);
-         ASSERT(values[0] >= 0);  /* sanity check that glGetFloatv worked */
-         return values[0];
-      }
-   }
-   return -1;
-}
-
-
-static slang_operation_type
-literal_type(slang_operation_type t1, slang_operation_type t2)
-{
-   if (t1 == SLANG_OPER_LITERAL_FLOAT || t2 == SLANG_OPER_LITERAL_FLOAT)
-      return SLANG_OPER_LITERAL_FLOAT;
-   else
-      return SLANG_OPER_LITERAL_INT;
-}
-
-
-/**
- * Recursively traverse an AST tree, applying simplifications wherever
- * possible.
- * At the least, we do constant folding.  We need to do that much so that
- * compile-time expressions can be evaluated for things like array
- * declarations.  I.e.:  float foo[3 + 5];
- */
-void
-_slang_simplify(slang_operation *oper,
-                const slang_name_space * space,
-                slang_atom_pool * atoms)
-{
-   GLboolean isFloat[4];
-   GLboolean isBool[4];
-   GLuint i, n;
-
-   if (oper->type == SLANG_OPER_IDENTIFIER) {
-      /* see if it's a named constant */
-      GLint value = _slang_lookup_constant((char *) oper->a_id);
-      /*printf("value[%s] = %d\n", (char*) oper->a_id, value);*/
-      if (value >= 0) {
-         oper->literal[0] =
-         oper->literal[1] =
-         oper->literal[2] =
-         oper->literal[3] = (GLfloat) value;
-         oper->type = SLANG_OPER_LITERAL_INT;
-         return;
-      }
-      /* look for user-defined constant */
-      {
-         slang_variable *var;
-         var = _slang_variable_locate(oper->locals, oper->a_id, GL_TRUE);
-         if (var) {
-            if (var->type.qualifier == SLANG_QUAL_CONST &&
-                var->initializer &&
-                (var->initializer->type == SLANG_OPER_LITERAL_INT ||
-                 var->initializer->type == SLANG_OPER_LITERAL_FLOAT)) {
-               oper->literal[0] = var->initializer->literal[0];
-               oper->literal[1] = var->initializer->literal[1];
-               oper->literal[2] = var->initializer->literal[2];
-               oper->literal[3] = var->initializer->literal[3];
-               oper->literal_size = var->initializer->literal_size;
-               oper->type = var->initializer->type;
-               /*
-               printf("value[%s] = %f\n",
-                      (char*) oper->a_id, oper->literal[0]);
-               */
-               return;
-            }
-         }
-      }
-   }
-
-   /* first, simplify children */
-   for (i = 0; i < oper->num_children; i++) {
-      _slang_simplify(&oper->children[i], space, atoms);
-   }
-
-   /* examine children */
-   n = MIN2(oper->num_children, 4);
-   for (i = 0; i < n; i++) {
-      isFloat[i] = (oper->children[i].type == SLANG_OPER_LITERAL_FLOAT ||
-                   oper->children[i].type == SLANG_OPER_LITERAL_INT);
-      isBool[i] = (oper->children[i].type == SLANG_OPER_LITERAL_BOOL);
-   }
-                              
-   if (oper->num_children == 2 && isFloat[0] && isFloat[1]) {
-      /* probably simple arithmetic */
-      switch (oper->type) {
-      case SLANG_OPER_ADD:
-         for (i = 0; i < 4; i++) {
-            oper->literal[i]
-               = oper->children[0].literal[i] + oper->children[1].literal[i];
-         }
-         oper->literal_size = oper->children[0].literal_size;
-         oper->type = literal_type(oper->children[0].type, 
-                                   oper->children[1].type);
-         slang_operation_destruct(oper);  /* frees unused children */
-         return;
-      case SLANG_OPER_SUBTRACT:
-         for (i = 0; i < 4; i++) {
-            oper->literal[i]
-               = oper->children[0].literal[i] - oper->children[1].literal[i];
-         }
-         oper->literal_size = oper->children[0].literal_size;
-         oper->type = literal_type(oper->children[0].type, 
-                                   oper->children[1].type);
-         slang_operation_destruct(oper);
-         return;
-      case SLANG_OPER_MULTIPLY:
-         for (i = 0; i < 4; i++) {
-            oper->literal[i]
-               = oper->children[0].literal[i] * oper->children[1].literal[i];
-         }
-         oper->literal_size = oper->children[0].literal_size;
-         oper->type = literal_type(oper->children[0].type, 
-                                   oper->children[1].type);
-         slang_operation_destruct(oper);
-         return;
-      case SLANG_OPER_DIVIDE:
-         for (i = 0; i < 4; i++) {
-            oper->literal[i]
-               = oper->children[0].literal[i] / oper->children[1].literal[i];
-         }
-         oper->literal_size = oper->children[0].literal_size;
-         oper->type = literal_type(oper->children[0].type, 
-                                   oper->children[1].type);
-         slang_operation_destruct(oper);
-         return;
-      default:
-         ; /* nothing */
-      }
-   }
-
-   if (oper->num_children == 1 && isFloat[0]) {
-      switch (oper->type) {
-      case SLANG_OPER_MINUS:
-         for (i = 0; i < 4; i++) {
-            oper->literal[i] = -oper->children[0].literal[i];
-         }
-         oper->literal_size = oper->children[0].literal_size;
-         slang_operation_destruct(oper);
-         oper->type = SLANG_OPER_LITERAL_FLOAT;
-         return;
-      case SLANG_OPER_PLUS:
-         COPY_4V(oper->literal, oper->children[0].literal);
-         oper->literal_size = oper->children[0].literal_size;
-         slang_operation_destruct(oper);
-         oper->type = SLANG_OPER_LITERAL_FLOAT;
-         return;
-      default:
-         ; /* nothing */
-      }
-   }
-
-   if (oper->num_children == 2 && isBool[0] && isBool[1]) {
-      /* simple boolean expression */
-      switch (oper->type) {
-      case SLANG_OPER_LOGICALAND:
-         for (i = 0; i < 4; i++) {
-            const GLint a = oper->children[0].literal[i] ? 1 : 0;
-            const GLint b = oper->children[1].literal[i] ? 1 : 0;
-            oper->literal[i] = (GLfloat) (a && b);
-         }
-         oper->literal_size = oper->children[0].literal_size;
-         slang_operation_destruct(oper);
-         oper->type = SLANG_OPER_LITERAL_BOOL;
-         return;
-      case SLANG_OPER_LOGICALOR:
-         for (i = 0; i < 4; i++) {
-            const GLint a = oper->children[0].literal[i] ? 1 : 0;
-            const GLint b = oper->children[1].literal[i] ? 1 : 0;
-            oper->literal[i] = (GLfloat) (a || b);
-         }
-         oper->literal_size = oper->children[0].literal_size;
-         slang_operation_destruct(oper);
-         oper->type = SLANG_OPER_LITERAL_BOOL;
-         return;
-      case SLANG_OPER_LOGICALXOR:
-         for (i = 0; i < 4; i++) {
-            const GLint a = oper->children[0].literal[i] ? 1 : 0;
-            const GLint b = oper->children[1].literal[i] ? 1 : 0;
-            oper->literal[i] = (GLfloat) (a ^ b);
-         }
-         oper->literal_size = oper->children[0].literal_size;
-         slang_operation_destruct(oper);
-         oper->type = SLANG_OPER_LITERAL_BOOL;
-         return;
-      default:
-         ; /* nothing */
-      }
-   }
-
-   if (oper->num_children == 4
-       && isFloat[0] && isFloat[1] && isFloat[2] && isFloat[3]) {
-      /* vec4(flt, flt, flt, flt) constructor */
-      if (oper->type == SLANG_OPER_CALL) {
-         if (strcmp((char *) oper->a_id, "vec4") == 0) {
-            oper->literal[0] = oper->children[0].literal[0];
-            oper->literal[1] = oper->children[1].literal[0];
-            oper->literal[2] = oper->children[2].literal[0];
-            oper->literal[3] = oper->children[3].literal[0];
-            oper->literal_size = 4;
-            slang_operation_destruct(oper);
-            oper->type = SLANG_OPER_LITERAL_FLOAT;
-            return;
-         }
-      }
-   }
-
-   if (oper->num_children == 3 && isFloat[0] && isFloat[1] && isFloat[2]) {
-      /* vec3(flt, flt, flt) constructor */
-      if (oper->type == SLANG_OPER_CALL) {
-         if (strcmp((char *) oper->a_id, "vec3") == 0) {
-            oper->literal[0] = oper->children[0].literal[0];
-            oper->literal[1] = oper->children[1].literal[0];
-            oper->literal[2] = oper->children[2].literal[0];
-            oper->literal[3] = oper->literal[2];
-            oper->literal_size = 3;
-            slang_operation_destruct(oper);
-            oper->type = SLANG_OPER_LITERAL_FLOAT;
-            return;
-         }
-      }
-   }
-
-   if (oper->num_children == 2 && isFloat[0] && isFloat[1]) {
-      /* vec2(flt, flt) constructor */
-      if (oper->type == SLANG_OPER_CALL) {
-         if (strcmp((char *) oper->a_id, "vec2") == 0) {
-            oper->literal[0] = oper->children[0].literal[0];
-            oper->literal[1] = oper->children[1].literal[0];
-            oper->literal[2] = oper->literal[1];
-            oper->literal[3] = oper->literal[1];
-            oper->literal_size = 2;
-            slang_operation_destruct(oper); /* XXX oper->locals goes NULL! */
-            oper->type = SLANG_OPER_LITERAL_FLOAT;
-            assert(oper->num_children == 0);
-            return;
-         }
-      }
-   }
-
-   if (oper->num_children == 1 && isFloat[0]) {
-      /* vec2/3/4(flt, flt) constructor */
-      if (oper->type == SLANG_OPER_CALL) {
-         const char *func = (const char *) oper->a_id;
-         if (strncmp(func, "vec", 3) == 0 && func[3] >= '2' && func[3] <= '4') {
-            oper->literal[0] =
-            oper->literal[1] =
-            oper->literal[2] =
-            oper->literal[3] = oper->children[0].literal[0];
-            oper->literal_size = func[3] - '0';
-            assert(oper->literal_size >= 2);
-            assert(oper->literal_size <= 4);
-            slang_operation_destruct(oper); /* XXX oper->locals goes NULL! */
-            oper->type = SLANG_OPER_LITERAL_FLOAT;
-            assert(oper->num_children == 0);
-            return;
-         }
-      }
-   }
-}
-
-
-
-/**
- * Insert casts to try to adapt actual parameters to formal parameters for a
- * function call when an exact match for the parameter types is not found.
- * Example:
- *   void foo(int i, bool b) {}
- *   x = foo(3.15, 9);
- * Gets translated into:
- *   x = foo(int(3.15), bool(9))
- */
-GLboolean
-_slang_cast_func_params(slang_operation *callOper, const slang_function *fun,
-                        const slang_name_space * space,
-                        slang_atom_pool * atoms, slang_info_log *log)
-{
-   const GLboolean haveRetValue = _slang_function_has_return_value(fun);
-   const int numParams = fun->param_count - haveRetValue;
-   int i;
-   int dbg = 0;
-
-   if (dbg)
-      printf("Adapt call of %d args to func %s (%d params)\n",
-             callOper->num_children, (char*) fun->header.a_name, numParams);
-
-   for (i = 0; i < numParams; i++) {
-      slang_typeinfo argType;
-      slang_variable *paramVar = fun->parameters->variables[i];
-
-      /* Get type of arg[i] */
-      if (!slang_typeinfo_construct(&argType))
-         return GL_FALSE;
-      if (!_slang_typeof_operation(&callOper->children[i], space,
-                                    &argType, atoms, log)) {
-         slang_typeinfo_destruct(&argType);
-         return GL_FALSE;
-      }
-
-      /* see if arg type matches parameter type */
-      if (!slang_type_specifier_equal(&argType.spec,
-                                      &paramVar->type.specifier)) {
-         /* need to adapt arg type to match param type */
-         const char *constructorName =
-            slang_type_specifier_type_to_string(paramVar->type.specifier.type);
-         slang_operation *child = slang_operation_new(1);
-
-         if (dbg)
-            printf("Need to adapt types of arg %d\n", i);
-
-         slang_operation_copy(child, &callOper->children[i]);
-         child->locals->outer_scope = callOper->children[i].locals;
-
-#if 0
-         if (_slang_sizeof_type_specifier(&argType.spec) >
-             _slang_sizeof_type_specifier(&paramVar->type.specifier)) {
-         }
-#endif
-
-         callOper->children[i].type = SLANG_OPER_CALL;
-         callOper->children[i].a_id = slang_atom_pool_atom(atoms, constructorName);
-         callOper->children[i].num_children = 1;
-         callOper->children[i].children = child;
-      }
-
-      slang_typeinfo_destruct(&argType);
-   }
-
-   if (dbg) {
-      printf("===== New call to %s with cast arguments ===============\n",
-             (char*) fun->header.a_name);
-      slang_print_tree(callOper, 5);
-   }
-
-   return GL_TRUE;
-}
-
-
-/**
- * Adapt the arguments for a function call to match the parameters of
- * the given function.
- * This is for:
- * 1. converting/casting argument types to match parameters
- * 2. breaking up vector/matrix types into individual components to
- *    satisfy constructors.
- */
-GLboolean
-_slang_adapt_call(slang_operation *callOper, const slang_function *fun,
-                  const slang_name_space * space,
-                  slang_atom_pool * atoms, slang_info_log *log)
-{
-   const GLboolean haveRetValue = _slang_function_has_return_value(fun);
-   const int numParams = fun->param_count - haveRetValue;
-   int i;
-   int dbg = 0;
-
-   if (dbg)
-      printf("Adapt %d args to %d parameters for %s\n",
-             callOper->num_children, numParams, (char *) fun->header.a_name);
-
-   /* Only try adapting for constructors */
-   if (fun->kind != SLANG_FUNC_CONSTRUCTOR)
-      return GL_FALSE;
-
-   if (callOper->num_children != numParams) {
-      /* number of arguments doesn't match number of parameters */
-
-      /* For constructor calls, we can try to unroll vector/matrix args
-       * into individual floats/ints and try to match the function params.
-       */
-      for (i = 0; i < numParams; i++) {
-         slang_typeinfo argType;
-         GLint argSz, j;
-
-         /* Get type of arg[i] */
-         if (!slang_typeinfo_construct(&argType))
-            return GL_FALSE;
-         if (!_slang_typeof_operation(&callOper->children[i], space,
-                                       &argType, atoms, log)) {
-            slang_typeinfo_destruct(&argType);
-            return GL_FALSE;
-         }
-
-         /*
-           paramSz = _slang_sizeof_type_specifier(&paramVar->type.specifier);
-           assert(paramSz == 1);
-         */
-         argSz = _slang_sizeof_type_specifier(&argType.spec);
-         if (argSz > 1) {
-            slang_operation origArg;
-            /* break up arg[i] into components */
-            if (dbg)
-               printf("Break up arg %d from 1 to %d elements\n", i, argSz);
-
-            slang_operation_construct(&origArg);
-            slang_operation_copy(&origArg, &callOper->children[i]);
-
-            /* insert argSz-1 new children/args */
-            for (j = 0; j < argSz - 1; j++) {
-               (void) slang_operation_insert(&callOper->num_children,
-                                             &callOper->children, i);
-            }
-
-            /* replace arg[i+j] with subscript/index oper */
-            for (j = 0; j < argSz; j++) {
-               callOper->children[i + j].type = SLANG_OPER_SUBSCRIPT;
-               callOper->children[i + j].locals = _slang_variable_scope_new(callOper->locals);
-               callOper->children[i + j].num_children = 2;
-               callOper->children[i + j].children = slang_operation_new(2);
-               slang_operation_copy(&callOper->children[i + j].children[0],
-                                    &origArg);
-               callOper->children[i + j].children[1].type
-                  = SLANG_OPER_LITERAL_INT;
-               callOper->children[i + j].children[1].literal[0] = (GLfloat) j;
-            }
-         }
-      }
-   }
-
-   if (callOper->num_children < (GLuint) numParams) {
-      /* still not enough args for all params */
-      return GL_FALSE;
-   }
-   else if (callOper->num_children > (GLuint) numParams) {
-      /* now too many arguments */
-      /* just truncate */
-      callOper->num_children = (GLuint) numParams;
-   }
-
-   if (dbg) {
-      printf("===== New call to %s with adapted arguments ===============\n",
-             (char*) fun->header.a_name);
-      slang_print_tree(callOper, 5);
-   }
-
-   return GL_TRUE;
-}
diff --git a/mesalib/src/mesa/shader/slang/slang_simplify.h b/mesalib/src/mesa/shader/slang/slang_simplify.h
deleted file mode 100644
index 8689c23b1..000000000
--- a/mesalib/src/mesa/shader/slang/slang_simplify.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.1
- *
- * Copyright (C) 2005-2008  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef SLANG_SIMPLIFY_H
-#define SLANG_SIMPLIFY_H
-
-
-extern GLint
-_slang_lookup_constant(const char *name);
-
-
-extern void
-_slang_simplify(slang_operation *oper,
-                const slang_name_space * space,
-                slang_atom_pool * atoms);
-
-
-extern GLboolean
-_slang_cast_func_params(slang_operation *callOper, const slang_function *fun,
-                        const slang_name_space * space,
-                        slang_atom_pool * atoms, slang_info_log *log);
-
-extern GLboolean
-_slang_adapt_call(slang_operation *callOper, const slang_function *fun,
-                  const slang_name_space * space,
-                  slang_atom_pool * atoms, slang_info_log *log);
-
-
-#endif /* SLANG_SIMPLIFY_H */
diff --git a/mesalib/src/mesa/shader/slang/slang_storage.c b/mesalib/src/mesa/shader/slang/slang_storage.c
deleted file mode 100644
index 656e15670..000000000
--- a/mesalib/src/mesa/shader/slang/slang_storage.c
+++ /dev/null
@@ -1,321 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5
- *
- * Copyright (C) 2005-2006  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * \file slang_storage.c
- * slang variable storage
- * \author Michal Krol
- */
-
-#include "main/imports.h"
-#include "slang_storage.h"
-#include "slang_mem.h"
-
-/* slang_storage_array */
-
-GLboolean
-slang_storage_array_construct(slang_storage_array * arr)
-{
-   arr->type = SLANG_STORE_AGGREGATE;
-   arr->aggregate = NULL;
-   arr->length = 0;
-   return GL_TRUE;
-}
-
-GLvoid
-slang_storage_array_destruct(slang_storage_array * arr)
-{
-   if (arr->aggregate != NULL) {
-      slang_storage_aggregate_destruct(arr->aggregate);
-      _slang_free(arr->aggregate);
-   }
-}
-
-/* slang_storage_aggregate */
-
-GLboolean
-slang_storage_aggregate_construct(slang_storage_aggregate * agg)
-{
-   agg->arrays = NULL;
-   agg->count = 0;
-   return GL_TRUE;
-}
-
-GLvoid
-slang_storage_aggregate_destruct(slang_storage_aggregate * agg)
-{
-   GLuint i;
-
-   for (i = 0; i < agg->count; i++)
-      slang_storage_array_destruct(agg->arrays + i);
-   _slang_free(agg->arrays);
-}
-
-static slang_storage_array *
-slang_storage_aggregate_push_new(slang_storage_aggregate * agg)
-{
-   slang_storage_array *arr = NULL;
-
-   agg->arrays = (slang_storage_array *)
-      _slang_realloc(agg->arrays,
-                     agg->count * sizeof(slang_storage_array),
-                     (agg->count + 1) * sizeof(slang_storage_array));
-   if (agg->arrays != NULL) {
-      arr = agg->arrays + agg->count;
-      if (!slang_storage_array_construct(arr))
-         return NULL;
-      agg->count++;
-   }
-   return arr;
-}
-
-/* _slang_aggregate_variable() */
-
-static GLboolean
-aggregate_vector(slang_storage_aggregate * agg, slang_storage_type basic_type,
-                 GLuint row_count)
-{
-   slang_storage_array *arr = slang_storage_aggregate_push_new(agg);
-   if (arr == NULL)
-      return GL_FALSE;
-   arr->type = basic_type;
-   arr->length = row_count;
-   return GL_TRUE;
-}
-
-static GLboolean
-aggregate_matrix(slang_storage_aggregate * agg, slang_storage_type basic_type,
-                 GLuint columns, GLuint rows)
-{
-   slang_storage_array *arr = slang_storage_aggregate_push_new(agg);
-   if (arr == NULL)
-      return GL_FALSE;
-   arr->type = SLANG_STORE_AGGREGATE;
-   arr->length = columns;
-   arr->aggregate = (slang_storage_aggregate *)
-      _slang_alloc(sizeof(slang_storage_aggregate));
-   if (arr->aggregate == NULL)
-      return GL_FALSE;
-   if (!slang_storage_aggregate_construct(arr->aggregate)) {
-      _slang_free(arr->aggregate);
-      arr->aggregate = NULL;
-      return GL_FALSE;
-   }
-   if (!aggregate_vector(arr->aggregate, basic_type, rows))
-      return GL_FALSE;
-   return GL_TRUE;
-}
-
-
-static GLboolean
-aggregate_variables(slang_storage_aggregate * agg,
-                    slang_variable_scope * vars, slang_function_scope * funcs,
-                    slang_struct_scope * structs,
-                    slang_variable_scope * globals,
-                    slang_atom_pool * atoms)
-{
-   GLuint i;
-
-   for (i = 0; i < vars->num_variables; i++)
-      if (!_slang_aggregate_variable(agg, &vars->variables[i]->type.specifier,
-                                     vars->variables[i]->array_len, funcs,
-                                     structs, globals, atoms))
-         return GL_FALSE;
-   return GL_TRUE;
-}
-
-
-GLboolean
-_slang_aggregate_variable(slang_storage_aggregate * agg,
-                          slang_type_specifier * spec, GLuint array_len,
-                          slang_function_scope * funcs,
-                          slang_struct_scope * structs,
-                          slang_variable_scope * vars,
-                          slang_atom_pool * atoms)
-{
-   switch (spec->type) {
-   case SLANG_SPEC_BOOL:
-      return aggregate_vector(agg, SLANG_STORE_BOOL, 1);
-   case SLANG_SPEC_BVEC2:
-      return aggregate_vector(agg, SLANG_STORE_BOOL, 2);
-   case SLANG_SPEC_BVEC3:
-      return aggregate_vector(agg, SLANG_STORE_BOOL, 3);
-   case SLANG_SPEC_BVEC4:
-      return aggregate_vector(agg, SLANG_STORE_BOOL, 4);
-   case SLANG_SPEC_INT:
-      return aggregate_vector(agg, SLANG_STORE_INT, 1);
-   case SLANG_SPEC_IVEC2:
-      return aggregate_vector(agg, SLANG_STORE_INT, 2);
-   case SLANG_SPEC_IVEC3:
-      return aggregate_vector(agg, SLANG_STORE_INT, 3);
-   case SLANG_SPEC_IVEC4:
-      return aggregate_vector(agg, SLANG_STORE_INT, 4);
-   case SLANG_SPEC_FLOAT:
-      return aggregate_vector(agg, SLANG_STORE_FLOAT, 1);
-   case SLANG_SPEC_VEC2:
-      return aggregate_vector(agg, SLANG_STORE_FLOAT, 2);
-   case SLANG_SPEC_VEC3:
-      return aggregate_vector(agg, SLANG_STORE_FLOAT, 3);
-   case SLANG_SPEC_VEC4:
-      return aggregate_vector(agg, SLANG_STORE_FLOAT, 4);
-   case SLANG_SPEC_MAT2:
-      return aggregate_matrix(agg, SLANG_STORE_FLOAT, 2, 2);
-   case SLANG_SPEC_MAT3:
-      return aggregate_matrix(agg, SLANG_STORE_FLOAT, 3, 3);
-   case SLANG_SPEC_MAT4:
-      return aggregate_matrix(agg, SLANG_STORE_FLOAT, 4, 4);
-
-   case SLANG_SPEC_MAT23:
-      return aggregate_matrix(agg, SLANG_STORE_FLOAT, 2, 3);
-   case SLANG_SPEC_MAT32:
-      return aggregate_matrix(agg, SLANG_STORE_FLOAT, 3, 2);
-   case SLANG_SPEC_MAT24:
-      return aggregate_matrix(agg, SLANG_STORE_FLOAT, 2, 4);
-   case SLANG_SPEC_MAT42:
-      return aggregate_matrix(agg, SLANG_STORE_FLOAT, 4, 2);
-   case SLANG_SPEC_MAT34:
-      return aggregate_matrix(agg, SLANG_STORE_FLOAT, 3, 4);
-   case SLANG_SPEC_MAT43:
-      return aggregate_matrix(agg, SLANG_STORE_FLOAT, 4, 3);
-
-   case SLANG_SPEC_SAMPLER_1D:
-   case SLANG_SPEC_SAMPLER_2D:
-   case SLANG_SPEC_SAMPLER_3D:
-   case SLANG_SPEC_SAMPLER_CUBE:
-   case SLANG_SPEC_SAMPLER_1D_SHADOW:
-   case SLANG_SPEC_SAMPLER_2D_SHADOW:
-   case SLANG_SPEC_SAMPLER_RECT:
-   case SLANG_SPEC_SAMPLER_RECT_SHADOW:
-   case SLANG_SPEC_SAMPLER_1D_ARRAY:
-   case SLANG_SPEC_SAMPLER_2D_ARRAY:
-   case SLANG_SPEC_SAMPLER_1D_ARRAY_SHADOW:
-   case SLANG_SPEC_SAMPLER_2D_ARRAY_SHADOW:
-
-      return aggregate_vector(agg, SLANG_STORE_INT, 1);
-   case SLANG_SPEC_STRUCT:
-      return aggregate_variables(agg, spec->_struct->fields, funcs, structs,
-                                 vars, atoms);
-   case SLANG_SPEC_ARRAY:
-      {
-         slang_storage_array *arr;
-
-         arr = slang_storage_aggregate_push_new(agg);
-         if (arr == NULL)
-            return GL_FALSE;
-         arr->type = SLANG_STORE_AGGREGATE;
-         arr->aggregate = (slang_storage_aggregate *)
-            _slang_alloc(sizeof(slang_storage_aggregate));
-         if (arr->aggregate == NULL)
-            return GL_FALSE;
-         if (!slang_storage_aggregate_construct(arr->aggregate)) {
-            _slang_free(arr->aggregate);
-            arr->aggregate = NULL;
-            return GL_FALSE;
-         }
-         if (!_slang_aggregate_variable(arr->aggregate, spec->_array, 0,
-                                        funcs, structs, vars, atoms))
-            return GL_FALSE;
-         arr->length = array_len;
-         /* TODO: check if 0 < arr->length <= 65535 */
-      }
-      return GL_TRUE;
-   default:
-      return GL_FALSE;
-   }
-}
-
-
-GLuint
-_slang_sizeof_type(slang_storage_type type)
-{
-   if (type == SLANG_STORE_AGGREGATE)
-      return 0;
-   if (type == SLANG_STORE_VEC4)
-      return 4 * sizeof(GLfloat);
-   return sizeof(GLfloat);
-}
-
-
-GLuint
-_slang_sizeof_aggregate(const slang_storage_aggregate * agg)
-{
-   GLuint i, size = 0;
-
-   for (i = 0; i < agg->count; i++) {
-      slang_storage_array *arr = &agg->arrays[i];
-      GLuint element_size;
-
-      if (arr->type == SLANG_STORE_AGGREGATE)
-         element_size = _slang_sizeof_aggregate(arr->aggregate);
-      else
-         element_size = _slang_sizeof_type(arr->type);
-      size += element_size * arr->length;
-   }
-   return size;
-}
-
-
-#if 0
-GLboolean
-_slang_flatten_aggregate(slang_storage_aggregate * flat,
-                         const slang_storage_aggregate * agg)
-{
-   GLuint i;
-
-   for (i = 0; i < agg->count; i++) {
-      GLuint j;
-
-      for (j = 0; j < agg->arrays[i].length; j++) {
-         if (agg->arrays[i].type == SLANG_STORE_AGGREGATE) {
-            if (!_slang_flatten_aggregate(flat, agg->arrays[i].aggregate))
-               return GL_FALSE;
-         }
-         else {
-            GLuint k, count;
-            slang_storage_type type;
-
-            if (agg->arrays[i].type == SLANG_STORE_VEC4) {
-               count = 4;
-               type = SLANG_STORE_FLOAT;
-            }
-            else {
-               count = 1;
-               type = agg->arrays[i].type;
-            }
-
-            for (k = 0; k < count; k++) {
-               slang_storage_array *arr;
-
-               arr = slang_storage_aggregate_push_new(flat);
-               if (arr == NULL)
-                  return GL_FALSE;
-               arr->type = type;
-               arr->length = 1;
-            }
-         }
-      }
-   }
-   return GL_TRUE;
-}
-#endif
diff --git a/mesalib/src/mesa/shader/slang/slang_storage.h b/mesalib/src/mesa/shader/slang/slang_storage.h
deleted file mode 100644
index 1876a36dd..000000000
--- a/mesalib/src/mesa/shader/slang/slang_storage.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5
- *
- * Copyright (C) 2005-2006  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef SLANG_STORAGE_H
-#define SLANG_STORAGE_H
-
-#include "slang_compile.h"
-
-
-/*
- * Program variable data storage is kept completely transparent to the
- * front-end compiler. It is up to the back-end how the data is
- * actually allocated. The slang_storage_type enum provides the basic
- * information about how the memory is interpreted. This abstract
- * piece of memory is called a data slot. A data slot of a particular
- * type has a fixed size.
- *
- * For now, only the three basic types are supported, that is bool,
- * int and float. Other built-in types like vector or matrix can
- * easily be decomposed into a series of basic types.
- *
- * If the vec4 module is enabled, 4-component vectors of floats are
- * used when possible. 4x4 matrices are constructed of 4 vec4 slots.
- */
-typedef enum slang_storage_type_
-{
-   /* core */
-   SLANG_STORE_AGGREGATE,
-   SLANG_STORE_BOOL,
-   SLANG_STORE_INT,
-   SLANG_STORE_FLOAT,
-   /* vec4 */
-   SLANG_STORE_VEC4
-} slang_storage_type;
-
-
-/**
- * The slang_storage_array structure groups data slots of the same
- * type into an array. This array has a fixed length. Arrays are
- * required to have a size equal to the sum of sizes of its
- * elements. They are also required to support indirect
- * addressing. That is, if B references first data slot in the array,
- * S is the size of the data slot and I is the integral index that is
- * not known at compile time, B+I*S references I-th data slot.
- *
- * This structure is also used to break down built-in data types that
- * are not supported directly.  Vectors, like vec3, are constructed
- * from arrays of their basic types. Matrices are formed of an array
- * of column vectors, which are in turn processed as other vectors.
- */
-typedef struct slang_storage_array_
-{
-   slang_storage_type type;
-   struct slang_storage_aggregate_ *aggregate;
-   GLuint length;
-} slang_storage_array;
-
-GLboolean slang_storage_array_construct (slang_storage_array *);
-GLvoid slang_storage_array_destruct (slang_storage_array *);
-
-
-/**
- * The slang_storage_aggregate structure relaxes the indirect
- * addressing requirement for slang_storage_array
- * structure. Aggregates are always accessed statically - its member
- * addresses are well-known at compile time. For example, user-defined
- * types are implemented as aggregates. Aggregates can collect data of
- * a different type.
- */
-typedef struct slang_storage_aggregate_
-{
-   slang_storage_array *arrays;
-   GLuint count;
-} slang_storage_aggregate;
-
-GLboolean slang_storage_aggregate_construct (slang_storage_aggregate *);
-GLvoid slang_storage_aggregate_destruct (slang_storage_aggregate *);
-
-
-extern GLboolean
-_slang_aggregate_variable(slang_storage_aggregate *agg,
-                          slang_type_specifier *spec,
-                          GLuint array_len,
-                          slang_function_scope *funcs,
-                          slang_struct_scope *structs,
-                          slang_variable_scope *vars,
-                          slang_atom_pool *atoms);
-
-/*
- * Returns the size (in machine units) of the given storage type.
- * It is an error to pass-in SLANG_STORE_AGGREGATE.
- * Returns 0 on error.
- */
-extern GLuint
-_slang_sizeof_type (slang_storage_type);
-
-
-/**
- * Returns total size (in machine units) of the given aggregate.
- * Returns 0 on error.
- */
-extern GLuint
-_slang_sizeof_aggregate (const slang_storage_aggregate *);
-
-
-#if 0
-/**
- * Converts structured aggregate to a flat one, with arrays of generic
- * type being one-element long.  Returns GL_TRUE on success.  Returns
- * GL_FALSE otherwise.
- */
-extern GLboolean
-_slang_flatten_aggregate (slang_storage_aggregate *,
-                          const slang_storage_aggregate *);
-
-#endif
-
-#endif /* SLANG_STORAGE_H */
diff --git a/mesalib/src/mesa/shader/slang/slang_typeinfo.c b/mesalib/src/mesa/shader/slang/slang_typeinfo.c
deleted file mode 100644
index 0f96768b0..000000000
--- a/mesalib/src/mesa/shader/slang/slang_typeinfo.c
+++ /dev/null
@@ -1,1177 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5
- *
- * Copyright (C) 2005-2006  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * \file slang_typeinfo.c
- * slang type info
- * \author Michal Krol
- */
-
-#include "main/imports.h"
-#include "shader/prog_instruction.h"
-#include "slang_typeinfo.h"
-#include "slang_compile.h"
-#include "slang_log.h"
-#include "slang_mem.h"
-
-
-/**
- * Checks if a field selector is a general swizzle (an r-value swizzle
- * with replicated components or an l-value swizzle mask) for a
- * vector.  Returns GL_TRUE if this is the case, <swz> is filled with
- * swizzle information.  Returns GL_FALSE otherwise.
- */
-GLboolean
-_slang_is_swizzle(const char *field, GLuint rows, slang_swizzle * swz)
-{
-   GLuint i;
-   GLboolean xyzw = GL_FALSE, rgba = GL_FALSE, stpq = GL_FALSE;
-
-   /* init to undefined.
-    * We rely on undefined/nil values to distinguish between
-    * regular swizzles and writemasks.
-    * For example, the swizzle ".xNNN" is the writemask ".x".
-    * That's different than the swizzle ".xxxx".
-    */
-   for (i = 0; i < 4; i++)
-      swz->swizzle[i] = SWIZZLE_NIL;
-
-   /* the swizzle can be at most 4-component long */
-   swz->num_components = slang_string_length(field);
-   if (swz->num_components > 4)
-      return GL_FALSE;
-
-   for (i = 0; i < swz->num_components; i++) {
-      /* mark which swizzle group is used */
-      switch (field[i]) {
-      case 'x':
-      case 'y':
-      case 'z':
-      case 'w':
-         xyzw = GL_TRUE;
-         break;
-      case 'r':
-      case 'g':
-      case 'b':
-      case 'a':
-         rgba = GL_TRUE;
-         break;
-      case 's':
-      case 't':
-      case 'p':
-      case 'q':
-         stpq = GL_TRUE;
-         break;
-      default:
-         return GL_FALSE;
-      }
-
-      /* collect swizzle component */
-      switch (field[i]) {
-      case 'x':
-      case 'r':
-      case 's':
-         swz->swizzle[i] = 0;
-         break;
-      case 'y':
-      case 'g':
-      case 't':
-         swz->swizzle[i] = 1;
-         break;
-      case 'z':
-      case 'b':
-      case 'p':
-         swz->swizzle[i] = 2;
-         break;
-      case 'w':
-      case 'a':
-      case 'q':
-         swz->swizzle[i] = 3;
-         break;
-      }
-
-      /* check if the component is valid for given vector's row count */
-      if (rows <= swz->swizzle[i])
-         return GL_FALSE;
-   }
-
-   /* only one swizzle group can be used */
-   if ((xyzw && rgba) || (xyzw && stpq) || (rgba && stpq))
-      return GL_FALSE;
-
-   return GL_TRUE;
-}
-
-
-
-/**
- * Checks if a general swizzle is an l-value swizzle - these swizzles
- * do not have duplicated fields.  Returns GL_TRUE if this is a
- * swizzle mask.  Returns GL_FALSE otherwise
- */
-static GLboolean
-_slang_is_swizzle_mask(const slang_swizzle * swz, GLuint rows)
-{
-   GLuint i, c = 0;
-
-   /* the swizzle may not be longer than the vector dim */
-   if (swz->num_components > rows)
-      return GL_FALSE;
-
-   /* the swizzle components cannot be duplicated */
-   for (i = 0; i < swz->num_components; i++) {
-      if ((c & (1 << swz->swizzle[i])) != 0)
-         return GL_FALSE;
-      c |= 1 << swz->swizzle[i];
-   }
-
-   return GL_TRUE;
-}
-
-
-/**
- * Combines (multiplies) two swizzles to form single swizzle.
- * Example: "vec.wzyx.yx" --> "vec.zw".
- */
-static void
-_slang_multiply_swizzles(slang_swizzle * dst, const slang_swizzle * left,
-                         const slang_swizzle * right)
-{
-   GLuint i;
-
-   dst->num_components = right->num_components;
-   for (i = 0; i < right->num_components; i++)
-      dst->swizzle[i] = left->swizzle[right->swizzle[i]];
-}
-
-
-typedef struct
-{
-   const char *name;
-   slang_type_specifier_type type;
-} type_specifier_type_name;
-
-static const type_specifier_type_name type_specifier_type_names[] = {
-   {"void", SLANG_SPEC_VOID},
-   {"bool", SLANG_SPEC_BOOL},
-   {"bvec2", SLANG_SPEC_BVEC2},
-   {"bvec3", SLANG_SPEC_BVEC3},
-   {"bvec4", SLANG_SPEC_BVEC4},
-   {"int", SLANG_SPEC_INT},
-   {"ivec2", SLANG_SPEC_IVEC2},
-   {"ivec3", SLANG_SPEC_IVEC3},
-   {"ivec4", SLANG_SPEC_IVEC4},
-   {"float", SLANG_SPEC_FLOAT},
-   {"vec2", SLANG_SPEC_VEC2},
-   {"vec3", SLANG_SPEC_VEC3},
-   {"vec4", SLANG_SPEC_VEC4},
-   {"mat2", SLANG_SPEC_MAT2},
-   {"mat3", SLANG_SPEC_MAT3},
-   {"mat4", SLANG_SPEC_MAT4},
-   {"mat2x3", SLANG_SPEC_MAT23},
-   {"mat3x2", SLANG_SPEC_MAT32},
-   {"mat2x4", SLANG_SPEC_MAT24},
-   {"mat4x2", SLANG_SPEC_MAT42},
-   {"mat3x4", SLANG_SPEC_MAT34},
-   {"mat4x3", SLANG_SPEC_MAT43},
-   {"sampler1D", SLANG_SPEC_SAMPLER_1D},
-   {"sampler2D", SLANG_SPEC_SAMPLER_2D},
-   {"sampler3D", SLANG_SPEC_SAMPLER_3D},
-   {"samplerCube", SLANG_SPEC_SAMPLER_CUBE},
-   {"sampler1DShadow", SLANG_SPEC_SAMPLER_1D_SHADOW},
-   {"sampler2DShadow", SLANG_SPEC_SAMPLER_2D_SHADOW},
-   {"sampler2DRect", SLANG_SPEC_SAMPLER_RECT},
-   {"sampler2DRectShadow", SLANG_SPEC_SAMPLER_RECT_SHADOW},
-   {"sampler1DArray", SLANG_SPEC_SAMPLER_1D_ARRAY},
-   {"sampler2DArray", SLANG_SPEC_SAMPLER_2D_ARRAY},
-   {"sampler1DArrayShadow", SLANG_SPEC_SAMPLER_1D_ARRAY_SHADOW},
-   {"sampler2DArrayShadow", SLANG_SPEC_SAMPLER_2D_ARRAY_SHADOW},
-   {NULL, SLANG_SPEC_VOID}
-};
-
-slang_type_specifier_type
-slang_type_specifier_type_from_string(const char *name)
-{
-   const type_specifier_type_name *p = type_specifier_type_names;
-   while (p->name != NULL) {
-      if (slang_string_compare(p->name, name) == 0)
-         break;
-      p++;
-   }
-   return p->type;
-}
-
-const char *
-slang_type_specifier_type_to_string(slang_type_specifier_type type)
-{
-   const type_specifier_type_name *p = type_specifier_type_names;
-   while (p->name != NULL) {
-      if (p->type == type)
-         break;
-      p++;
-   }
-   return p->name;
-}
-
-/* slang_fully_specified_type */
-
-int
-slang_fully_specified_type_construct(slang_fully_specified_type * type)
-{
-   type->qualifier = SLANG_QUAL_NONE;
-   slang_type_specifier_ctr(&type->specifier);
-   return 1;
-}
-
-void
-slang_fully_specified_type_destruct(slang_fully_specified_type * type)
-{
-   slang_type_specifier_dtr(&type->specifier);
-}
-
-int
-slang_fully_specified_type_copy(slang_fully_specified_type * x,
-                                const slang_fully_specified_type * y)
-{
-   slang_fully_specified_type z;
-
-   if (!slang_fully_specified_type_construct(&z))
-      return 0;
-   z.qualifier = y->qualifier;
-   z.precision = y->precision;
-   z.variant = y->variant;
-   z.centroid = y->centroid;
-   z.layout = y->layout;
-   z.array_len = y->array_len;
-   if (!slang_type_specifier_copy(&z.specifier, &y->specifier)) {
-      slang_fully_specified_type_destruct(&z);
-      return 0;
-   }
-   slang_fully_specified_type_destruct(x);
-   *x = z;
-   return 1;
-}
-
-
-/**
- * Test if two fully specified types are compatible.  This is a bit
- * looser than testing for equality.  We don't check the precision,
- * variant, centroid, etc. information.
- * XXX this may need some tweaking.
- */
-GLboolean
-slang_fully_specified_types_compatible(const slang_fully_specified_type * x,
-                                       const slang_fully_specified_type * y)
-{
-   if (!slang_type_specifier_equal(&x->specifier, &y->specifier))
-      return GL_FALSE;
-
-   if (x->qualifier == SLANG_QUAL_FIXEDINPUT &&
-       y->qualifier == SLANG_QUAL_VARYING)
-      ; /* ok */
-   else if (x->qualifier != y->qualifier)
-      return GL_FALSE;
-
-   /* Note: don't compare precision, variant, centroid */
-
-   /* XXX array length? */
-
-   return GL_TRUE;
-}
-
-
-GLvoid
-slang_type_specifier_ctr(slang_type_specifier * self)
-{
-   self->type = SLANG_SPEC_VOID;
-   self->_struct = NULL;
-   self->_array = NULL;
-}
-
-GLvoid
-slang_type_specifier_dtr(slang_type_specifier * self)
-{
-   if (self->_struct != NULL) {
-      slang_struct_destruct(self->_struct);
-      _slang_free(self->_struct);
-   }
-   if (self->_array != NULL) {
-      slang_type_specifier_dtr(self->_array);
-      _slang_free(self->_array);
-   }
-}
-
-slang_type_specifier *
-slang_type_specifier_new(slang_type_specifier_type type,
-                         struct slang_struct_ *_struct,
-                         struct slang_type_specifier_ *_array)
-{
-   slang_type_specifier *spec =
-      (slang_type_specifier *) _slang_alloc(sizeof(slang_type_specifier));
-   if (spec) {
-      spec->type = type;
-      spec->_struct = _struct;
-      spec->_array = _array;
-   }
-   return spec;
-}
-
-GLboolean
-slang_type_specifier_copy(slang_type_specifier * x,
-                          const slang_type_specifier * y)
-{
-   slang_type_specifier z;
-
-   slang_type_specifier_ctr(&z);
-   z.type = y->type;
-   if (z.type == SLANG_SPEC_STRUCT) {
-      z._struct = (slang_struct *) _slang_alloc(sizeof(slang_struct));
-      if (z._struct == NULL) {
-         slang_type_specifier_dtr(&z);
-         return GL_FALSE;
-      }
-      if (!slang_struct_construct(z._struct)) {
-         _slang_free(z._struct);
-         slang_type_specifier_dtr(&z);
-         return GL_FALSE;
-      }
-      if (!slang_struct_copy(z._struct, y->_struct)) {
-         slang_type_specifier_dtr(&z);
-         return GL_FALSE;
-      }
-   }
-   else if (z.type == SLANG_SPEC_ARRAY) {
-      z._array = (slang_type_specifier *)
-         _slang_alloc(sizeof(slang_type_specifier));
-      if (z._array == NULL) {
-         slang_type_specifier_dtr(&z);
-         return GL_FALSE;
-      }
-      slang_type_specifier_ctr(z._array);
-      if (!slang_type_specifier_copy(z._array, y->_array)) {
-         slang_type_specifier_dtr(&z);
-         return GL_FALSE;
-      }
-   }
-   slang_type_specifier_dtr(x);
-   *x = z;
-   return GL_TRUE;
-}
-
-
-/**
- * Test if two types are equal.
- */
-GLboolean
-slang_type_specifier_equal(const slang_type_specifier * x,
-                           const slang_type_specifier * y)
-{
-   if (x->type != y->type)
-      return GL_FALSE;
-   if (x->type == SLANG_SPEC_STRUCT)
-      return slang_struct_equal(x->_struct, y->_struct);
-   if (x->type == SLANG_SPEC_ARRAY)
-      return slang_type_specifier_equal(x->_array, y->_array);
-   return GL_TRUE;
-}
-
-
-/**
- * As above, but allow float/int casting.
- */
-GLboolean
-slang_type_specifier_compatible(const slang_type_specifier * x,
-                                const slang_type_specifier * y)
-{
-   /* special case: float == int */
-   if (x->type == SLANG_SPEC_INT && y->type == SLANG_SPEC_FLOAT) {
-      return GL_TRUE;
-   }
-   /* XXX may need to add bool/int compatibility, etc */
-
-   if (x->type != y->type)
-      return GL_FALSE;
-   if (x->type == SLANG_SPEC_STRUCT)
-      return slang_struct_equal(x->_struct, y->_struct);
-   if (x->type == SLANG_SPEC_ARRAY)
-      return slang_type_specifier_compatible(x->_array, y->_array);
-   return GL_TRUE;
-}
-
-
-GLboolean
-slang_typeinfo_construct(slang_typeinfo * ti)
-{
-   memset(ti, 0, sizeof(*ti));
-   slang_type_specifier_ctr(&ti->spec);
-   ti->array_len = 0;
-   return GL_TRUE;
-}
-
-GLvoid
-slang_typeinfo_destruct(slang_typeinfo * ti)
-{
-   slang_type_specifier_dtr(&ti->spec);
-}
-
-
-
-/**
- * Determine the return type of a function.
- * \param a_name  the function name
- * \param param  function parameters (overloading)
- * \param num_params  number of parameters to function
- * \param space  namespace to search
- * \param spec  returns the type
- * \param funFound  returns pointer to the function, or NULL if not found.
- * \return GL_TRUE for success, GL_FALSE if failure (bad function name)
- */
-static GLboolean
-_slang_typeof_function(slang_atom a_name,
-                       slang_operation * params, GLuint num_params,
-                       const slang_name_space * space,
-                       slang_type_specifier * spec,
-                       slang_function **funFound,
-                       slang_atom_pool *atoms, slang_info_log *log)
-{
-   GLboolean error;
-
-   *funFound = _slang_function_locate(space->funcs, a_name, params,
-                                      num_params, space, atoms, log, &error);
-   if (error)
-      return GL_FALSE;
-
-   if (!*funFound)
-      return GL_TRUE;  /* yes, not false */
-
-   return slang_type_specifier_copy(spec, &(*funFound)->header.type.specifier);
-}
-
-
-/**
- * Determine the type of a math function.
- * \param name  name of the operator, one of +,-,*,/ or unary -
- * \param params  array of function parameters
- * \param num_params  number of parameters
- * \param space  namespace to use
- * \param spec  returns the function's type
- * \param atoms  atom pool
- * \return GL_TRUE for success, GL_FALSE if failure
- */
-static GLboolean
-typeof_math_call(const char *name, slang_operation *call,
-                 const slang_name_space * space,
-                 slang_type_specifier * spec,
-                 slang_atom_pool * atoms,
-                 slang_info_log *log)
-{
-   if (call->fun) {
-      /* we've previously resolved this function call */
-      slang_type_specifier_copy(spec, &call->fun->header.type.specifier);
-      return GL_TRUE;
-   }
-   else {
-      slang_atom atom;
-      slang_function *fun;
-
-      /* number of params: */
-      assert(call->num_children == 1 || call->num_children == 2);
-
-      atom = slang_atom_pool_atom(atoms, name);
-      if (!_slang_typeof_function(atom, call->children, call->num_children,
-                                  space, spec, &fun, atoms, log))
-         return GL_FALSE;
-
-      if (fun) {
-         /* Save pointer to save time in future */
-         call->fun = fun;
-         return GL_TRUE;
-      }
-      return GL_FALSE;
-   }
-}
-
-
-/**
- * Determine the return type of an operation.
- * \param op  the operation node
- * \param space  the namespace to use
- * \param ti  the returned type
- * \param atoms  atom pool
- * \return GL_TRUE for success, GL_FALSE if failure
- */
-GLboolean
-_slang_typeof_operation(slang_operation * op,
-                         const slang_name_space * space,
-                         slang_typeinfo * ti,
-                         slang_atom_pool * atoms,
-                         slang_info_log *log)
-{
-   ti->can_be_referenced = GL_FALSE;
-   ti->is_swizzled = GL_FALSE;
-
-   switch (op->type) {
-   case SLANG_OPER_BLOCK_NO_NEW_SCOPE:
-   case SLANG_OPER_BLOCK_NEW_SCOPE:
-   case SLANG_OPER_ASM:
-   case SLANG_OPER_BREAK:
-   case SLANG_OPER_CONTINUE:
-   case SLANG_OPER_DISCARD:
-   case SLANG_OPER_RETURN:
-   case SLANG_OPER_IF:
-   case SLANG_OPER_WHILE:
-   case SLANG_OPER_DO:
-   case SLANG_OPER_FOR:
-   case SLANG_OPER_VOID:
-      ti->spec.type = SLANG_SPEC_VOID;
-      break;
-   case SLANG_OPER_EXPRESSION:
-   case SLANG_OPER_ASSIGN:
-   case SLANG_OPER_ADDASSIGN:
-   case SLANG_OPER_SUBASSIGN:
-   case SLANG_OPER_MULASSIGN:
-   case SLANG_OPER_DIVASSIGN:
-   case SLANG_OPER_PREINCREMENT:
-   case SLANG_OPER_PREDECREMENT:
-      if (!_slang_typeof_operation(op->children, space, ti, atoms, log))
-         return GL_FALSE;
-      break;
-   case SLANG_OPER_LITERAL_BOOL:
-      if (op->literal_size == 1)
-         ti->spec.type = SLANG_SPEC_BOOL;
-      else if (op->literal_size == 2)
-         ti->spec.type = SLANG_SPEC_BVEC2;
-      else if (op->literal_size == 3)
-         ti->spec.type = SLANG_SPEC_BVEC3;
-      else if (op->literal_size == 4)
-         ti->spec.type = SLANG_SPEC_BVEC4;
-      else {
-         _mesa_problem(NULL,
-               "Unexpected bool literal_size %d in _slang_typeof_operation()",
-               op->literal_size);
-         ti->spec.type = SLANG_SPEC_BOOL;
-      }
-      break;
-   case SLANG_OPER_LOGICALOR:
-   case SLANG_OPER_LOGICALXOR:
-   case SLANG_OPER_LOGICALAND:
-   case SLANG_OPER_EQUAL:
-   case SLANG_OPER_NOTEQUAL:
-   case SLANG_OPER_LESS:
-   case SLANG_OPER_GREATER:
-   case SLANG_OPER_LESSEQUAL:
-   case SLANG_OPER_GREATEREQUAL:
-   case SLANG_OPER_NOT:
-      ti->spec.type = SLANG_SPEC_BOOL;
-      break;
-   case SLANG_OPER_LITERAL_INT:
-      if (op->literal_size == 1)
-         ti->spec.type = SLANG_SPEC_INT;
-      else if (op->literal_size == 2)
-         ti->spec.type = SLANG_SPEC_IVEC2;
-      else if (op->literal_size == 3)
-         ti->spec.type = SLANG_SPEC_IVEC3;
-      else if (op->literal_size == 4)
-         ti->spec.type = SLANG_SPEC_IVEC4;
-      else {
-         _mesa_problem(NULL,
-               "Unexpected int literal_size %d in _slang_typeof_operation()",
-               op->literal_size);
-         ti->spec.type = SLANG_SPEC_INT;
-      }
-      break;
-   case SLANG_OPER_LITERAL_FLOAT:
-      if (op->literal_size == 1)
-         ti->spec.type = SLANG_SPEC_FLOAT;
-      else if (op->literal_size == 2)
-         ti->spec.type = SLANG_SPEC_VEC2;
-      else if (op->literal_size == 3)
-         ti->spec.type = SLANG_SPEC_VEC3;
-      else if (op->literal_size == 4)
-         ti->spec.type = SLANG_SPEC_VEC4;
-      else {
-         _mesa_problem(NULL,
-               "Unexpected float literal_size %d in _slang_typeof_operation()",
-               op->literal_size);
-         ti->spec.type = SLANG_SPEC_FLOAT;
-      }
-      break;
-   case SLANG_OPER_IDENTIFIER:
-   case SLANG_OPER_VARIABLE_DECL:
-      {
-         slang_variable *var;
-         var = _slang_variable_locate(op->locals, op->a_id, GL_TRUE);
-         if (!var) {
-            slang_info_log_error(log, "undefined variable '%s'",
-                                 (char *) op->a_id);
-            return GL_FALSE;
-         }
-         if (!slang_type_specifier_copy(&ti->spec, &var->type.specifier)) {
-            slang_info_log_memory(log);
-            return GL_FALSE;
-         }
-         ti->can_be_referenced = GL_TRUE;
-         if (var->type.specifier.type == SLANG_SPEC_ARRAY &&
-             var->type.array_len >= 1) {
-            /* the datatype is an array, ex: float[3] x; */
-            ti->array_len = var->type.array_len;
-         }
-         else {
-            /* the variable is an array, ex: float x[3]; */
-            ti->array_len = var->array_len;
-         }
-      }
-      break;
-   case SLANG_OPER_SEQUENCE:
-      /* TODO: check [0] and [1] if they match */
-      if (!_slang_typeof_operation(&op->children[1], space, ti, atoms, log)) {
-         return GL_FALSE;
-      }
-      ti->can_be_referenced = GL_FALSE;
-      ti->is_swizzled = GL_FALSE;
-      break;
-      /*case SLANG_OPER_MODASSIGN: */
-      /*case SLANG_OPER_LSHASSIGN: */
-      /*case SLANG_OPER_RSHASSIGN: */
-      /*case SLANG_OPER_ORASSIGN: */
-      /*case SLANG_OPER_XORASSIGN: */
-      /*case SLANG_OPER_ANDASSIGN: */
-   case SLANG_OPER_SELECT:
-      /* TODO: check [1] and [2] if they match */
-      if (!_slang_typeof_operation(&op->children[1], space, ti, atoms, log)) {
-         return GL_FALSE;
-      }
-      ti->can_be_referenced = GL_FALSE;
-      ti->is_swizzled = GL_FALSE;
-      break;
-      /*case SLANG_OPER_BITOR: */
-      /*case SLANG_OPER_BITXOR: */
-      /*case SLANG_OPER_BITAND: */
-      /*case SLANG_OPER_LSHIFT: */
-      /*case SLANG_OPER_RSHIFT: */
-   case SLANG_OPER_ADD:
-      assert(op->num_children == 2);
-      if (!typeof_math_call("+", op, space, &ti->spec, atoms, log))
-         return GL_FALSE;
-      break;
-   case SLANG_OPER_SUBTRACT:
-      assert(op->num_children == 2);
-      if (!typeof_math_call("-", op, space, &ti->spec, atoms, log))
-         return GL_FALSE;
-      break;
-   case SLANG_OPER_MULTIPLY:
-      assert(op->num_children == 2);
-      if (!typeof_math_call("*", op, space, &ti->spec, atoms, log))
-         return GL_FALSE;
-      break;
-   case SLANG_OPER_DIVIDE:
-      assert(op->num_children == 2);
-      if (!typeof_math_call("/", op, space, &ti->spec, atoms, log))
-         return GL_FALSE;
-      break;
-   /*case SLANG_OPER_MODULUS: */
-   case SLANG_OPER_PLUS:
-      if (!_slang_typeof_operation(op->children, space, ti, atoms, log))
-         return GL_FALSE;
-      ti->can_be_referenced = GL_FALSE;
-      ti->is_swizzled = GL_FALSE;
-      break;
-   case SLANG_OPER_MINUS:
-      assert(op->num_children == 1);
-      if (!typeof_math_call("-", op, space, &ti->spec, atoms, log))
-         return GL_FALSE;
-      break;
-      /*case SLANG_OPER_COMPLEMENT: */
-   case SLANG_OPER_SUBSCRIPT:
-      {
-         slang_typeinfo _ti;
-
-         if (!slang_typeinfo_construct(&_ti))
-            return GL_FALSE;
-         if (!_slang_typeof_operation(op->children, space, &_ti, atoms, log)) {
-            slang_typeinfo_destruct(&_ti);
-            return GL_FALSE;
-         }
-         ti->can_be_referenced = _ti.can_be_referenced;
-         if (_ti.spec.type == SLANG_SPEC_ARRAY) {
-            if (!slang_type_specifier_copy(&ti->spec, _ti.spec._array)) {
-               slang_typeinfo_destruct(&_ti);
-               return GL_FALSE;
-            }
-         }
-         else {
-            if (!_slang_type_is_vector(_ti.spec.type)
-                && !_slang_type_is_matrix(_ti.spec.type)) {
-               slang_typeinfo_destruct(&_ti);
-               slang_info_log_error(log, "cannot index a non-array type");
-               return GL_FALSE;
-            }
-            ti->spec.type = _slang_type_base(_ti.spec.type);
-         }
-         slang_typeinfo_destruct(&_ti);
-      }
-      break;
-   case SLANG_OPER_CALL:
-      if (op->array_constructor) {
-         /* build array typeinfo */
-         ti->spec.type = SLANG_SPEC_ARRAY;
-         ti->spec._array = (slang_type_specifier *)
-            _slang_alloc(sizeof(slang_type_specifier));
-         slang_type_specifier_ctr(ti->spec._array);
-
-         ti->spec._array->type =
-            slang_type_specifier_type_from_string((char *) op->a_id);
-         ti->array_len = op->num_children;
-      }
-      else if (op->fun) {
-         /* we've resolved this call before */
-         slang_type_specifier_copy(&ti->spec, &op->fun->header.type.specifier);
-      }
-      else {
-         slang_function *fun;
-         if (!_slang_typeof_function(op->a_id, op->children, op->num_children,
-                                     space, &ti->spec, &fun, atoms, log))
-            return GL_FALSE;
-         if (fun) {
-            /* save result for future use */
-            op->fun = fun;
-         }
-         else {
-            slang_struct *s =
-               slang_struct_scope_find(space->structs, op->a_id, GL_TRUE);
-            if (s) {
-               /* struct initializer */
-               ti->spec.type = SLANG_SPEC_STRUCT;
-               ti->spec._struct =
-                  (slang_struct *) _slang_alloc(sizeof(slang_struct));
-               if (ti->spec._struct == NULL)
-                  return GL_FALSE;
-               if (!slang_struct_construct(ti->spec._struct)) {
-                  _slang_free(ti->spec._struct);
-                  ti->spec._struct = NULL;
-                  return GL_FALSE;
-               }
-               if (!slang_struct_copy(ti->spec._struct, s))
-                  return GL_FALSE;
-            }
-            else {
-               /* float, int, vec4, mat3, etc. constructor? */
-               const char *name;
-               slang_type_specifier_type type;
-
-               name = slang_atom_pool_id(atoms, op->a_id);
-               type = slang_type_specifier_type_from_string(name);
-               if (type == SLANG_SPEC_VOID) {
-                  slang_info_log_error(log, "undefined function '%s'", name);
-                  return GL_FALSE;
-               }
-               ti->spec.type = type;
-            }
-         }
-      }
-      break;
-   case SLANG_OPER_METHOD:
-      /* at this time, GLSL 1.20 only has one method: array.length()
-       * which returns an integer.
-       */
-      ti->spec.type = SLANG_SPEC_INT;
-      break;
-   case SLANG_OPER_FIELD:
-      {
-         slang_typeinfo _ti;
-
-         if (!slang_typeinfo_construct(&_ti))
-            return GL_FALSE;
-         if (!_slang_typeof_operation(op->children, space, &_ti, atoms, log)) {
-            slang_typeinfo_destruct(&_ti);
-            return GL_FALSE;
-         }
-         if (_ti.spec.type == SLANG_SPEC_STRUCT) {
-            slang_variable *field;
-
-            field = _slang_variable_locate(_ti.spec._struct->fields, op->a_id,
-                                           GL_FALSE);
-            if (field == NULL) {
-               slang_typeinfo_destruct(&_ti);
-               return GL_FALSE;
-            }
-            if (!slang_type_specifier_copy(&ti->spec, &field->type.specifier)) {
-               slang_typeinfo_destruct(&_ti);
-               return GL_FALSE;
-            }
-            ti->can_be_referenced = _ti.can_be_referenced;
-            ti->array_len = field->array_len;
-         }
-         else {
-            GLuint rows;
-            const char *swizzle;
-            slang_type_specifier_type base;
-
-            /* determine the swizzle of the field expression */
-            if (!_slang_type_is_vector(_ti.spec.type)) {
-               slang_typeinfo_destruct(&_ti);
-               slang_info_log_error(log, "Can't swizzle scalar expression");
-               return GL_FALSE;
-            }
-            rows = _slang_type_dim(_ti.spec.type);
-            swizzle = slang_atom_pool_id(atoms, op->a_id);
-            if (!_slang_is_swizzle(swizzle, rows, &ti->swz)) {
-               slang_typeinfo_destruct(&_ti);
-               slang_info_log_error(log, "bad swizzle '%s'", swizzle);
-               return GL_FALSE;
-            }
-            ti->is_swizzled = GL_TRUE;
-            ti->can_be_referenced = _ti.can_be_referenced
-               && _slang_is_swizzle_mask(&ti->swz, rows);
-            if (_ti.is_swizzled) {
-               slang_swizzle swz;
-
-               /* swizzle the swizzle */
-               _slang_multiply_swizzles(&swz, &_ti.swz, &ti->swz);
-               ti->swz = swz;
-            }
-            base = _slang_type_base(_ti.spec.type);
-            switch (ti->swz.num_components) {
-            case 1:
-               ti->spec.type = base;
-               break;
-            case 2:
-               switch (base) {
-               case SLANG_SPEC_FLOAT:
-                  ti->spec.type = SLANG_SPEC_VEC2;
-                  break;
-               case SLANG_SPEC_INT:
-                  ti->spec.type = SLANG_SPEC_IVEC2;
-                  break;
-               case SLANG_SPEC_BOOL:
-                  ti->spec.type = SLANG_SPEC_BVEC2;
-                  break;
-               default:
-                  break;
-               }
-               break;
-            case 3:
-               switch (base) {
-               case SLANG_SPEC_FLOAT:
-                  ti->spec.type = SLANG_SPEC_VEC3;
-                  break;
-               case SLANG_SPEC_INT:
-                  ti->spec.type = SLANG_SPEC_IVEC3;
-                  break;
-               case SLANG_SPEC_BOOL:
-                  ti->spec.type = SLANG_SPEC_BVEC3;
-                  break;
-               default:
-                  break;
-               }
-               break;
-            case 4:
-               switch (base) {
-               case SLANG_SPEC_FLOAT:
-                  ti->spec.type = SLANG_SPEC_VEC4;
-                  break;
-               case SLANG_SPEC_INT:
-                  ti->spec.type = SLANG_SPEC_IVEC4;
-                  break;
-               case SLANG_SPEC_BOOL:
-                  ti->spec.type = SLANG_SPEC_BVEC4;
-                  break;
-               default:
-                  break;
-               }
-               break;
-            default:
-               break;
-            }
-         }
-         slang_typeinfo_destruct(&_ti);
-      }
-      break;
-   case SLANG_OPER_POSTINCREMENT:
-   case SLANG_OPER_POSTDECREMENT:
-      if (!_slang_typeof_operation(op->children, space, ti, atoms, log))
-         return GL_FALSE;
-      ti->can_be_referenced = GL_FALSE;
-      ti->is_swizzled = GL_FALSE;
-      break;
-   default:
-      return GL_FALSE;
-   }
-
-   return GL_TRUE;
-}
-
-
-/**
- * Determine if a type is a matrix.
- * \return GL_TRUE if is a matrix, GL_FALSE otherwise.
- */
-GLboolean
-_slang_type_is_matrix(slang_type_specifier_type ty)
-{
-   switch (ty) {
-   case SLANG_SPEC_MAT2:
-   case SLANG_SPEC_MAT3:
-   case SLANG_SPEC_MAT4:
-   case SLANG_SPEC_MAT23:
-   case SLANG_SPEC_MAT32:
-   case SLANG_SPEC_MAT24:
-   case SLANG_SPEC_MAT42:
-   case SLANG_SPEC_MAT34:
-   case SLANG_SPEC_MAT43:
-      return GL_TRUE;
-   default:
-      return GL_FALSE;
-   }
-}
-
-
-/**
- * Determine if a type is a vector.
- * \return GL_TRUE if is a vector, GL_FALSE otherwise.
- */
-GLboolean
-_slang_type_is_vector(slang_type_specifier_type ty)
-{
-   switch (ty) {
-   case SLANG_SPEC_VEC2:
-   case SLANG_SPEC_VEC3:
-   case SLANG_SPEC_VEC4:
-   case SLANG_SPEC_IVEC2:
-   case SLANG_SPEC_IVEC3:
-   case SLANG_SPEC_IVEC4:
-   case SLANG_SPEC_BVEC2:
-   case SLANG_SPEC_BVEC3:
-   case SLANG_SPEC_BVEC4:
-      return GL_TRUE;
-   default:
-      return GL_FALSE;
-   }
-}
-
-
-/**
- * Determine if a type is a float, float vector or float matrix.
- * \return GL_TRUE if so, GL_FALSE otherwise
- */
-GLboolean
-_slang_type_is_float_vec_mat(slang_type_specifier_type ty)
-{
-   switch (ty) {
-   case SLANG_SPEC_FLOAT:
-   case SLANG_SPEC_VEC2:
-   case SLANG_SPEC_VEC3:
-   case SLANG_SPEC_VEC4:
-   case SLANG_SPEC_MAT2:
-   case SLANG_SPEC_MAT3:
-   case SLANG_SPEC_MAT4:
-   case SLANG_SPEC_MAT23:
-   case SLANG_SPEC_MAT32:
-   case SLANG_SPEC_MAT24:
-   case SLANG_SPEC_MAT42:
-   case SLANG_SPEC_MAT34:
-   case SLANG_SPEC_MAT43:
-      return GL_TRUE;
-   default:
-      return GL_FALSE;
-   }
-}
-
-
-/**
- * Given a vector type, return the type of the vector's elements.
- * For a matrix, return the type of the columns.
- */
-slang_type_specifier_type
-_slang_type_base(slang_type_specifier_type ty)
-{
-   switch (ty) {
-   case SLANG_SPEC_FLOAT:
-   case SLANG_SPEC_VEC2:
-   case SLANG_SPEC_VEC3:
-   case SLANG_SPEC_VEC4:
-      return SLANG_SPEC_FLOAT;
-   case SLANG_SPEC_INT:
-   case SLANG_SPEC_IVEC2:
-   case SLANG_SPEC_IVEC3:
-   case SLANG_SPEC_IVEC4:
-      return SLANG_SPEC_INT;
-   case SLANG_SPEC_BOOL:
-   case SLANG_SPEC_BVEC2:
-   case SLANG_SPEC_BVEC3:
-   case SLANG_SPEC_BVEC4:
-      return SLANG_SPEC_BOOL;
-   case SLANG_SPEC_MAT2:
-      return SLANG_SPEC_VEC2;
-   case SLANG_SPEC_MAT3:
-      return SLANG_SPEC_VEC3;
-   case SLANG_SPEC_MAT4:
-      return SLANG_SPEC_VEC4;
-   case SLANG_SPEC_MAT23:
-      return SLANG_SPEC_VEC3;
-   case SLANG_SPEC_MAT32:
-      return SLANG_SPEC_VEC2;
-   case SLANG_SPEC_MAT24:
-      return SLANG_SPEC_VEC4;
-   case SLANG_SPEC_MAT42:
-      return SLANG_SPEC_VEC2;
-   case SLANG_SPEC_MAT34:
-      return SLANG_SPEC_VEC4;
-   case SLANG_SPEC_MAT43:
-      return SLANG_SPEC_VEC3;
-   default:
-      return SLANG_SPEC_VOID;
-   }
-}
-
-
-/**
- * Return the dimensionality of a vector, or for a matrix, return number
- * of columns.
- */
-GLuint
-_slang_type_dim(slang_type_specifier_type ty)
-{
-   switch (ty) {
-   case SLANG_SPEC_FLOAT:
-   case SLANG_SPEC_INT:
-   case SLANG_SPEC_BOOL:
-      return 1;
-   case SLANG_SPEC_VEC2:
-   case SLANG_SPEC_IVEC2:
-   case SLANG_SPEC_BVEC2:
-   case SLANG_SPEC_MAT2:
-      return 2;
-   case SLANG_SPEC_VEC3:
-   case SLANG_SPEC_IVEC3:
-   case SLANG_SPEC_BVEC3:
-   case SLANG_SPEC_MAT3:
-      return 3;
-   case SLANG_SPEC_VEC4:
-   case SLANG_SPEC_IVEC4:
-   case SLANG_SPEC_BVEC4:
-   case SLANG_SPEC_MAT4:
-      return 4;
-
-   case SLANG_SPEC_MAT23:
-      return 2;
-   case SLANG_SPEC_MAT32:
-      return 3;
-   case SLANG_SPEC_MAT24:
-      return 2;
-   case SLANG_SPEC_MAT42:
-      return 4;
-   case SLANG_SPEC_MAT34:
-      return 3;
-   case SLANG_SPEC_MAT43:
-      return 4;
-
-   default:
-      return 0;
-   }
-}
-
-
-/**
- * Return the GL_* type that corresponds to a SLANG_SPEC_* type.
- */
-GLenum
-_slang_gltype_from_specifier(const slang_type_specifier *type)
-{
-   switch (type->type) {
-   case SLANG_SPEC_BOOL:
-      return GL_BOOL;
-   case SLANG_SPEC_BVEC2:
-      return GL_BOOL_VEC2;
-   case SLANG_SPEC_BVEC3:
-      return GL_BOOL_VEC3;
-   case SLANG_SPEC_BVEC4:
-      return GL_BOOL_VEC4;
-   case SLANG_SPEC_INT:
-      return GL_INT;
-   case SLANG_SPEC_IVEC2:
-      return GL_INT_VEC2;
-   case SLANG_SPEC_IVEC3:
-      return GL_INT_VEC3;
-   case SLANG_SPEC_IVEC4:
-      return GL_INT_VEC4;
-   case SLANG_SPEC_FLOAT:
-      return GL_FLOAT;
-   case SLANG_SPEC_VEC2:
-      return GL_FLOAT_VEC2;
-   case SLANG_SPEC_VEC3:
-      return GL_FLOAT_VEC3;
-   case SLANG_SPEC_VEC4:
-      return GL_FLOAT_VEC4;
-   case SLANG_SPEC_MAT2:
-      return GL_FLOAT_MAT2;
-   case SLANG_SPEC_MAT3:
-      return GL_FLOAT_MAT3;
-   case SLANG_SPEC_MAT4:
-      return GL_FLOAT_MAT4;
-   case SLANG_SPEC_MAT23:
-      return GL_FLOAT_MAT2x3;
-   case SLANG_SPEC_MAT32:
-      return GL_FLOAT_MAT3x2;
-   case SLANG_SPEC_MAT24:
-      return GL_FLOAT_MAT2x4;
-   case SLANG_SPEC_MAT42:
-      return GL_FLOAT_MAT4x2;
-   case SLANG_SPEC_MAT34:
-      return GL_FLOAT_MAT3x4;
-   case SLANG_SPEC_MAT43:
-      return GL_FLOAT_MAT4x3;
-   case SLANG_SPEC_SAMPLER_1D:
-      return GL_SAMPLER_1D;
-   case SLANG_SPEC_SAMPLER_2D:
-      return GL_SAMPLER_2D;
-   case SLANG_SPEC_SAMPLER_3D:
-      return GL_SAMPLER_3D;
-   case SLANG_SPEC_SAMPLER_CUBE:
-      return GL_SAMPLER_CUBE;
-   case SLANG_SPEC_SAMPLER_1D_SHADOW:
-      return GL_SAMPLER_1D_SHADOW;
-   case SLANG_SPEC_SAMPLER_2D_SHADOW:
-      return GL_SAMPLER_2D_SHADOW;
-   case SLANG_SPEC_SAMPLER_RECT:
-      return GL_SAMPLER_2D_RECT_ARB;
-   case SLANG_SPEC_SAMPLER_RECT_SHADOW:
-      return GL_SAMPLER_2D_RECT_SHADOW_ARB;
-   case SLANG_SPEC_SAMPLER_1D_ARRAY:
-      return GL_SAMPLER_1D_ARRAY_EXT;
-   case SLANG_SPEC_SAMPLER_2D_ARRAY:
-      return GL_SAMPLER_2D_ARRAY_EXT;
-   case SLANG_SPEC_SAMPLER_1D_ARRAY_SHADOW:
-      return GL_SAMPLER_1D_ARRAY_SHADOW_EXT;
-   case SLANG_SPEC_SAMPLER_2D_ARRAY_SHADOW:
-      return GL_SAMPLER_2D_ARRAY_SHADOW_EXT;
-   case SLANG_SPEC_ARRAY:
-      return _slang_gltype_from_specifier(type->_array);
-   case SLANG_SPEC_STRUCT:
-      /* fall-through */
-   default:
-      return GL_NONE;
-   }
-}
-
diff --git a/mesalib/src/mesa/shader/slang/slang_typeinfo.h b/mesalib/src/mesa/shader/slang/slang_typeinfo.h
deleted file mode 100644
index 9a6407a31..000000000
--- a/mesalib/src/mesa/shader/slang/slang_typeinfo.h
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5
- *
- * Copyright (C) 2005-2006  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef SLANG_TYPEINFO_H
-#define SLANG_TYPEINFO_H 1
-
-#include "main/imports.h"
-#include "main/mtypes.h"
-#include "slang_log.h"
-#include "slang_utility.h"
-#include "slang_vartable.h"
-
-
-struct slang_operation_;
-
-struct slang_name_space_;
-
-
-
-/**
- * Holds complete information about vector swizzle - the <swizzle>
- * array contains vector component source indices, where 0 is "x", 1
- * is "y", 2 is "z" and 3 is "w".
- * Example: "xwz" --> { 3, { 0, 3, 2, not used } }.
- */
-typedef struct slang_swizzle_
-{
-   GLuint num_components;
-   GLuint swizzle[4];
-} slang_swizzle;
-
-extern GLboolean
-_slang_is_swizzle(const char *field, GLuint rows, slang_swizzle *swz);
-
-
-typedef enum slang_type_variant_
-{
-   SLANG_VARIANT,    /* the default */
-   SLANG_INVARIANT   /* indicates the "invariant" keyword */
-} slang_type_variant;
-
-
-typedef enum slang_type_centroid_
-{
-   SLANG_CENTER,    /* the default */
-   SLANG_CENTROID   /* indicates the "centroid" keyword */
-} slang_type_centroid;
-
-
-/**
- * These only apply to gl_FragCoord, but other layout qualifiers may
- * appear in the future.
- */
-typedef enum slang_layout_qualifier_
-{
-   SLANG_LAYOUT_NONE                      = 0x0,
-   SLANG_LAYOUT_UPPER_LEFT_BIT            = 0x1,
-   SLANG_LAYOUT_PIXEL_CENTER_INTEGER_BIT  = 0x2
-} slang_layout_qualifier;
-
-
-typedef enum slang_type_qualifier_
-{
-   SLANG_QUAL_NONE,
-   SLANG_QUAL_CONST,
-   SLANG_QUAL_ATTRIBUTE,
-   SLANG_QUAL_VARYING,
-   SLANG_QUAL_UNIFORM,
-   SLANG_QUAL_OUT,
-   SLANG_QUAL_INOUT,
-   SLANG_QUAL_FIXEDOUTPUT,      /* internal */
-   SLANG_QUAL_FIXEDINPUT        /* internal */
-} slang_type_qualifier;
-
-
-typedef enum slang_type_precision_
-{
-   SLANG_PREC_DEFAULT,
-   SLANG_PREC_LOW,
-   SLANG_PREC_MEDIUM,
-   SLANG_PREC_HIGH
-} slang_type_precision;
-
-
-/**
- * The basic shading language types (float, vec4, mat3, etc)
- */
-typedef enum slang_type_specifier_type_
-{
-   SLANG_SPEC_VOID,
-   SLANG_SPEC_BOOL,
-   SLANG_SPEC_BVEC2,
-   SLANG_SPEC_BVEC3,
-   SLANG_SPEC_BVEC4,
-   SLANG_SPEC_INT,
-   SLANG_SPEC_IVEC2,
-   SLANG_SPEC_IVEC3,
-   SLANG_SPEC_IVEC4,
-   SLANG_SPEC_FLOAT,
-   SLANG_SPEC_VEC2,
-   SLANG_SPEC_VEC3,
-   SLANG_SPEC_VEC4,
-   SLANG_SPEC_MAT2,
-   SLANG_SPEC_MAT3,
-   SLANG_SPEC_MAT4,
-   SLANG_SPEC_MAT23,
-   SLANG_SPEC_MAT32,
-   SLANG_SPEC_MAT24,
-   SLANG_SPEC_MAT42,
-   SLANG_SPEC_MAT34,
-   SLANG_SPEC_MAT43,
-   SLANG_SPEC_SAMPLER_1D,
-   SLANG_SPEC_SAMPLER_2D,
-   SLANG_SPEC_SAMPLER_3D,
-   SLANG_SPEC_SAMPLER_CUBE,
-   SLANG_SPEC_SAMPLER_RECT,
-   SLANG_SPEC_SAMPLER_1D_SHADOW,
-   SLANG_SPEC_SAMPLER_2D_SHADOW,
-   SLANG_SPEC_SAMPLER_RECT_SHADOW,
-   SLANG_SPEC_SAMPLER_1D_ARRAY,
-   SLANG_SPEC_SAMPLER_2D_ARRAY,
-   SLANG_SPEC_SAMPLER_1D_ARRAY_SHADOW,
-   SLANG_SPEC_SAMPLER_2D_ARRAY_SHADOW,
-   SLANG_SPEC_STRUCT,
-   SLANG_SPEC_ARRAY
-} slang_type_specifier_type;
-
-
-extern slang_type_specifier_type
-slang_type_specifier_type_from_string(const char *);
-
-extern const char *
-slang_type_specifier_type_to_string(slang_type_specifier_type);
-
-
-/**
- * Describes more sophisticated types, like structs and arrays.
- */
-typedef struct slang_type_specifier_
-{
-   slang_type_specifier_type type;
-   struct slang_struct_ *_struct;         /**< if type == SLANG_SPEC_STRUCT */
-   struct slang_type_specifier_ *_array;  /**< if type == SLANG_SPEC_ARRAY */
-} slang_type_specifier;
-
-
-extern GLvoid
-slang_type_specifier_ctr(slang_type_specifier *);
-
-extern GLvoid
-slang_type_specifier_dtr(slang_type_specifier *);
-
-extern slang_type_specifier *
-slang_type_specifier_new(slang_type_specifier_type type,
-                         struct slang_struct_ *_struct,
-                         struct slang_type_specifier_ *_array);
-
-
-extern GLboolean
-slang_type_specifier_copy(slang_type_specifier *, const slang_type_specifier *);
-
-extern GLboolean
-slang_type_specifier_equal(const slang_type_specifier *,
-                           const slang_type_specifier *);
-
-
-extern GLboolean
-slang_type_specifier_compatible(const slang_type_specifier *x,
-                                const slang_type_specifier *y);
-
-
-typedef struct slang_fully_specified_type_
-{
-   slang_type_qualifier qualifier;
-   slang_type_specifier specifier;
-   slang_type_precision precision;
-   slang_type_variant variant;
-   slang_type_centroid centroid;
-   slang_layout_qualifier layout;
-   GLint array_len;           /**< -1 if not an array type */
-} slang_fully_specified_type;
-
-extern int
-slang_fully_specified_type_construct(slang_fully_specified_type *);
-
-extern void
-slang_fully_specified_type_destruct(slang_fully_specified_type *);
-
-extern int
-slang_fully_specified_type_copy(slang_fully_specified_type *,
-				const slang_fully_specified_type *);
-
-GLboolean
-slang_fully_specified_types_compatible(const slang_fully_specified_type * x,
-                                       const slang_fully_specified_type * y);
-
-
-typedef struct slang_typeinfo_
-{
-   GLboolean can_be_referenced;
-   GLboolean is_swizzled;
-   slang_swizzle swz;
-   slang_type_specifier spec;
-   GLuint array_len;
-} slang_typeinfo;
-
-extern GLboolean
-slang_typeinfo_construct(slang_typeinfo *);
-
-extern GLvoid
-slang_typeinfo_destruct(slang_typeinfo *);
-
-
-extern GLboolean
-_slang_typeof_operation(struct slang_operation_ *,
-                         const struct slang_name_space_ *,
-                         slang_typeinfo *, slang_atom_pool *,
-                         slang_info_log *log);
-
-extern GLboolean
-_slang_type_is_matrix(slang_type_specifier_type);
-
-extern GLboolean
-_slang_type_is_vector(slang_type_specifier_type);
-
-extern GLboolean
-_slang_type_is_float_vec_mat(slang_type_specifier_type);
-
-extern slang_type_specifier_type
-_slang_type_base(slang_type_specifier_type);
-
-extern GLuint
-_slang_type_dim(slang_type_specifier_type);
-
-extern GLenum
-_slang_gltype_from_specifier(const slang_type_specifier *type);
-
-#endif
diff --git a/mesalib/src/mesa/shader/slang/slang_utility.c b/mesalib/src/mesa/shader/slang/slang_utility.c
deleted file mode 100644
index e77404f69..000000000
--- a/mesalib/src/mesa/shader/slang/slang_utility.c
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.3
- *
- * Copyright (C) 2005-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 slang_utility.c
- * slang utilities
- * \author Michal Krol
- */
-
-#include "main/imports.h"
-#include "slang_utility.h"
-#include "slang_mem.h"
-
-char *
-slang_string_concat (char *dst, const char *src)
-{
-   return strcpy (dst + strlen (dst), src);
-}
-
-
-/* slang_string */
-
-GLvoid
-slang_string_init (slang_string *self)
-{
-   self->data = NULL;
-   self->capacity = 0;
-   self->length = 0;
-   self->fail = GL_FALSE;
-}
-
-GLvoid
-slang_string_free (slang_string *self)
-{
-   if (self->data != NULL)
-      free(self->data);
-}
-
-GLvoid
-slang_string_reset (slang_string *self)
-{
-   self->length = 0;
-   self->fail = GL_FALSE;
-}
-
-static GLboolean
-grow (slang_string *self, GLuint size)
-{
-   if (self->fail)
-      return GL_FALSE;
-   if (size > self->capacity) {
-      /* do not overflow 32-bit range */
-      assert (size < 0x80000000);
-
-      self->data = (char *) (_mesa_realloc (self->data, self->capacity, size * 2));
-      self->capacity = size * 2;
-      if (self->data == NULL) {
-         self->capacity = 0;
-         self->fail = GL_TRUE;
-         return GL_FALSE;
-      }
-   }
-   return GL_TRUE;
-}
-
-GLvoid
-slang_string_push (slang_string *self, const slang_string *str)
-{
-   if (str->fail) {
-      self->fail = GL_TRUE;
-      return;
-   }
-   if (grow (self, self->length + str->length)) {
-      memcpy (&self->data[self->length], str->data, str->length);
-      self->length += str->length;
-   }
-}
-
-GLvoid
-slang_string_pushc (slang_string *self, const char c)
-{
-   if (grow (self, self->length + 1)) {
-      self->data[self->length] = c;
-      self->length++;
-   }
-}
-
-GLvoid
-slang_string_pushs (slang_string *self, const char *cstr, GLuint len)
-{
-   if (grow (self, self->length + len)) {
-      memcpy (&self->data[self->length], cstr, len);
-      self->length += len;
-   }
-}
-
-GLvoid
-slang_string_pushi (slang_string *self, GLint i)
-{
-   char buffer[12];
-
-   sprintf (buffer, "%d", i);
-   slang_string_pushs (self, buffer, strlen (buffer));
-}
-
-const char *
-slang_string_cstr (slang_string *self)
-{
-   if (grow (self, self->length + 1))
-      self->data[self->length] = '\0';
-   return self->data;
-}
-
-/* slang_atom_pool */
-
-void
-slang_atom_pool_construct(slang_atom_pool * pool)
-{
-   GLuint i;
-
-   for (i = 0; i < SLANG_ATOM_POOL_SIZE; i++)
-      pool->entries[i] = NULL;
-}
-
-void
-slang_atom_pool_destruct (slang_atom_pool * pool)
-{
-   GLuint i;
-
-   for (i = 0; i < SLANG_ATOM_POOL_SIZE; i++) {
-      slang_atom_entry * entry;
-		
-      entry = pool->entries[i];
-      while (entry != NULL) {
-         slang_atom_entry *next = entry->next;
-         _slang_free(entry->id);
-         _slang_free(entry);
-         entry = next;
-      }
-   }
-}
-
-/*
- * Search the atom pool for an atom with a given name.
- * If atom is not found, create and add it to the pool.
- * Returns ATOM_NULL if the atom was not found and the function failed
- * to create a new atom.
- */
-slang_atom
-slang_atom_pool_atom(slang_atom_pool * pool, const char * id)
-{
-   GLuint hash;
-   const char * p = id;
-   slang_atom_entry ** entry;
-
-   /* Hash a given string to a number in the range [0, ATOM_POOL_SIZE). */
-   hash = 0;
-   while (*p != '\0') {
-      GLuint g;
-
-      hash = (hash << 4) + (GLuint) (*p++);
-      g = hash & 0xf0000000;
-      if (g != 0)
-         hash ^= g >> 24;
-      hash &= ~g;
-   }
-   hash %= SLANG_ATOM_POOL_SIZE;
-
-   /* Now the hash points to a linked list of atoms with names that
-    * have the same hash value.  Search the linked list for a given
-    * name.
-    */
-   entry = &pool->entries[hash];
-   while (*entry != NULL) {
-      /* If the same, return the associated atom. */
-      if (slang_string_compare((**entry).id, id) == 0)
-         return (slang_atom) (**entry).id;
-      /* Grab the next atom in the linked list. */
-      entry = &(**entry).next;
-   }
-
-   /* Okay, we have not found an atom. Create a new entry for it.
-    * Note that the <entry> points to the last entry's <next> field.
-    */
-   *entry = (slang_atom_entry *) _slang_alloc(sizeof(slang_atom_entry));
-   if (*entry == NULL)
-      return SLANG_ATOM_NULL;
-
-   /* Initialize a new entry. Because we'll need the actual name of
-    * the atom, we use the pointer to this string as an actual atom's
-    * value.
-    */
-   (**entry).next = NULL;
-   (**entry).id = _slang_strdup(id);
-   if ((**entry).id == NULL)
-      return SLANG_ATOM_NULL;
-   return (slang_atom) (**entry).id;
-}
-
-/**
- * Return the name of a given atom.
- */
-const char *
-slang_atom_pool_id(slang_atom_pool * pool, slang_atom atom)
-{
-   return (const char *) (atom);
-}
diff --git a/mesalib/src/mesa/shader/slang/slang_utility.h b/mesalib/src/mesa/shader/slang/slang_utility.h
deleted file mode 100644
index 2c0d0bcbb..000000000
--- a/mesalib/src/mesa/shader/slang/slang_utility.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.3
- *
- * Copyright (C) 2005-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.
- */
-
-#ifndef SLANG_UTILITY_H
-#define SLANG_UTILITY_H
-
-
-/* Compile-time assertions.  If the expression is zero, try to declare an
- * array of size [-1] to cause compilation error.
- */
-#define static_assert(expr) do { int _array[(expr) ? 1 : -1]; (void) _array[0]; } while (0)
-
-
-#define slang_string_compare(str1, str2) strcmp (str1, str2)
-#define slang_string_copy(dst, src) strcpy (dst, src)
-#define slang_string_length(str) strlen (str)
-
-char *slang_string_concat (char *, const char *);
-
-/* slang_string */
-
-typedef struct
-{
-   char *data;
-   GLuint length;
-   GLuint capacity;
-   GLboolean fail;
-} slang_string;
-
-GLvoid
-slang_string_init (slang_string *);
-
-GLvoid
-slang_string_free (slang_string *);
-
-GLvoid
-slang_string_reset (slang_string *);
-
-GLvoid
-slang_string_push (slang_string *, const slang_string *);
-
-GLvoid
-slang_string_pushc (slang_string *, const char);
-
-GLvoid
-slang_string_pushs (slang_string *, const char *, GLuint);
-
-GLvoid
-slang_string_pushi (slang_string *, GLint);
-
-const char *
-slang_string_cstr (slang_string *);
-
-/* slang_atom */
-
-typedef GLvoid *slang_atom;
-
-#define SLANG_ATOM_NULL ((slang_atom) 0)
-
-typedef struct slang_atom_entry_
-{
-	char *id;
-	struct slang_atom_entry_ *next;
-} slang_atom_entry;
-
-#define SLANG_ATOM_POOL_SIZE 1023
-
-typedef struct slang_atom_pool_
-{
-	slang_atom_entry *entries[SLANG_ATOM_POOL_SIZE];
-} slang_atom_pool;
-
-GLvoid slang_atom_pool_construct (slang_atom_pool *);
-GLvoid slang_atom_pool_destruct (slang_atom_pool *);
-slang_atom slang_atom_pool_atom (slang_atom_pool *, const char *);
-const char *slang_atom_pool_id (slang_atom_pool *, slang_atom);
-
-
-#endif
diff --git a/mesalib/src/mesa/shader/slang/slang_vartable.c b/mesalib/src/mesa/shader/slang/slang_vartable.c
deleted file mode 100644
index e07e3a226..000000000
--- a/mesalib/src/mesa/shader/slang/slang_vartable.c
+++ /dev/null
@@ -1,362 +0,0 @@
-
-#include "main/imports.h"
-#include "shader/program.h"
-#include "shader/prog_print.h"
-#include "slang_compile.h"
-#include "slang_compile_variable.h"
-#include "slang_emit.h"
-#include "slang_mem.h"
-#include "slang_vartable.h"
-#include "slang_ir.h"
-
-
-static int dbg = 0;
-
-
-typedef enum {
-   FREE,
-   VAR,
-   TEMP
-} TempState;
-
-
-/**
- * Variable/register info for one variable scope.
- */
-struct table
-{
-   int Level;
-   int NumVars;
-   slang_variable **Vars;  /* array [NumVars] */
-
-   TempState Temps[MAX_PROGRAM_TEMPS * 4];  /* per-component state */
-   int ValSize[MAX_PROGRAM_TEMPS * 4];     /**< For debug only */
-
-   struct table *Parent;  /** Parent scope table */
-};
-
-
-/**
- * A variable table is a stack of tables, one per scope.
- */
-struct slang_var_table_
-{
-   GLint CurLevel;
-   GLuint MaxRegisters;
-   struct table *Top;  /**< Table at top of stack */
-};
-
-
-
-slang_var_table *
-_slang_new_var_table(GLuint maxRegisters)
-{
-   slang_var_table *vt
-      = (slang_var_table *) _slang_alloc(sizeof(slang_var_table));
-   if (vt) {
-      vt->MaxRegisters = maxRegisters;
-   }
-   return vt;
-}
-
-
-void
-_slang_delete_var_table(slang_var_table *vt)
-{
-   if (vt->Top) {
-      _mesa_problem(NULL, "non-empty var table in _slang_delete_var_table()");
-      return;
-   }
-   _slang_free(vt);
-}
-
-
-
-/**
- * Create new table on top of vartable stack.
- * Used when we enter a {} block.
- */
-void
-_slang_push_var_table(slang_var_table *vt)
-{
-   struct table *t = (struct table *) _slang_alloc(sizeof(struct table));
-   if (t) {
-      t->Level = vt->CurLevel++;
-      t->Parent = vt->Top;
-      if (t->Parent) {
-         /* copy the info indicating which temp regs are in use */
-         memcpy(t->Temps, t->Parent->Temps, sizeof(t->Temps));
-         memcpy(t->ValSize, t->Parent->ValSize, sizeof(t->ValSize));
-      }
-      vt->Top = t;
-      if (dbg) printf("Pushing level %d\n", t->Level);
-   }
-}
-
-
-/**
- * Pop top entry from variable table.
- * Used when we leave a {} block.
- */
-void
-_slang_pop_var_table(slang_var_table *vt)
-{
-   struct table *t = vt->Top;
-   int i;
-
-   if (dbg) printf("Popping level %d\n", t->Level);
-
-   /* free the storage allocated for each variable */
-   for (i = 0; i < t->NumVars; i++) {
-      slang_ir_storage *store = t->Vars[i]->store;
-      GLint j;
-      GLuint comp;
-      if (dbg) printf("  Free var %s, size %d at %d.%s\n",
-                      (char*) t->Vars[i]->a_name, store->Size,
-                      store->Index,
-                      _mesa_swizzle_string(store->Swizzle, 0, 0));
-
-      if (store->File == PROGRAM_SAMPLER) {
-         /* samplers have no storage */
-         continue;
-      }
-
-      if (store->Size == 1)
-         comp = GET_SWZ(store->Swizzle, 0);
-      else
-         comp = 0;
-
-      /* store->Index may be -1 if we run out of registers */
-      if (store->Index >= 0) {
-         for (j = 0; j < store->Size; j++) {
-            assert(t->Temps[store->Index * 4 + j + comp] == VAR);
-            t->Temps[store->Index * 4 + j + comp] = FREE;
-         }
-      }
-      store->Index = -1;
-   }
-   if (t->Parent) {
-      /* just verify that any remaining allocations in this scope 
-       * were for temps
-       */
-      for (i = 0; i < (int) vt->MaxRegisters * 4; i++) {
-         if (t->Temps[i] != FREE && t->Parent->Temps[i] == FREE) {
-            if (dbg) printf("  Free reg %d\n", i/4);
-            assert(t->Temps[i] == TEMP);
-         }
-      }
-   }
-
-   if (t->Vars) {
-      _slang_free(t->Vars);
-      t->Vars = NULL;
-   }
-
-   vt->Top = t->Parent;
-   _slang_free(t);
-   vt->CurLevel--;
-}
-
-
-/**
- * Add a new variable to the given var/symbol table.
- */
-void
-_slang_add_variable(slang_var_table *vt, slang_variable *v)
-{
-   struct table *t;
-   assert(vt);
-   t = vt->Top;
-   assert(t);
-   if (dbg) printf("Adding var %s, store %p\n", (char *) v->a_name, (void *) v->store);
-   t->Vars = (slang_variable **)
-      _slang_realloc(t->Vars,
-                     t->NumVars * sizeof(slang_variable *),
-                     (t->NumVars + 1) * sizeof(slang_variable *));
-   t->Vars[t->NumVars] = v;
-   t->NumVars++;
-}
-
-
-/**
- * Look for variable by name in given table.
- * If not found, Parent table will be searched.
- */
-slang_variable *
-_slang_find_variable(const slang_var_table *vt, slang_atom name)
-{
-   struct table *t = vt->Top;
-   while (1) {
-      int i;
-      for (i = 0; i < t->NumVars; i++) {
-         if (t->Vars[i]->a_name == name)
-            return t->Vars[i];
-      }
-      if (t->Parent)
-         t = t->Parent;
-      else
-         return NULL;
-   }
-}
-
-
-/**
- * Allocation helper.
- * \param size  var size in floats
- * \return  position for var, measured in floats
- */
-static GLint
-alloc_reg(slang_var_table *vt, GLint size, GLboolean isTemp)
-{
-   struct table *t = vt->Top;
-   /* if size == 1, allocate anywhere, else, pos must be multiple of 4 */
-   const GLuint step = (size == 1) ? 1 : 4;
-   GLuint i, j;
-   assert(size > 0); /* number of floats */
-
-   for (i = 0; i <= vt->MaxRegisters * 4 - size; i += step) {
-      GLuint found = 0;
-      for (j = 0; j < (GLuint) size; j++) {
-         assert(i + j < 4 * MAX_PROGRAM_TEMPS);
-         if (i + j < vt->MaxRegisters * 4 && t->Temps[i + j] == FREE) {
-            found++;
-         }
-         else {
-            break;
-         }
-      }
-      if (found == size) {
-         /* found block of size free regs */
-         if (size > 1)
-            assert(i % 4 == 0);
-         for (j = 0; j < (GLuint) size; j++) {
-            assert(i + j < 4 * MAX_PROGRAM_TEMPS);
-            t->Temps[i + j] = isTemp ? TEMP : VAR;
-         }
-         assert(i < MAX_PROGRAM_TEMPS * 4);
-         t->ValSize[i] = size;
-         return i;
-      }
-   }
-
-   /* if we get here, we ran out of registers */
-   return -1;
-}
-
-
-/**
- * Allocate temp register(s) for storing a variable.
- * \param size  size needed, in floats
- * \param swizzle  returns swizzle mask for accessing var in register
- * \return  register allocated, or -1
- */
-GLboolean
-_slang_alloc_var(slang_var_table *vt, slang_ir_storage *store)
-{
-   struct table *t = vt->Top;
-   int i;
-
-   if (store->File == PROGRAM_SAMPLER) {
-      /* don't really allocate storage */
-      store->Index = 0;
-      return GL_TRUE;
-   }
-
-   i = alloc_reg(vt, store->Size, GL_FALSE);
-   if (i < 0)
-      return GL_FALSE;
-
-   store->Index = i / 4;
-   store->Swizzle = _slang_var_swizzle(store->Size, i % 4);
-
-   if (dbg)
-      printf("Alloc var storage sz %d at %d.%s (level %d) store %p\n",
-             store->Size, store->Index,
-             _mesa_swizzle_string(store->Swizzle, 0, 0),
-             t->Level,
-             (void*) store);
-
-   return GL_TRUE;
-}
-
-
-
-/**
- * Allocate temp register(s) for storing an unnamed intermediate value.
- */
-GLboolean
-_slang_alloc_temp(slang_var_table *vt, slang_ir_storage *store)
-{
-   struct table *t = vt->Top;
-   const int i = alloc_reg(vt, store->Size, GL_TRUE);
-   if (i < 0)
-      return GL_FALSE;
-
-   assert(store->Index < 0);
-
-   store->Index = i / 4;
-   store->Swizzle = _slang_var_swizzle(store->Size, i % 4);
-
-   if (dbg) printf("Alloc temp sz %d at %d.%s (level %d) store %p\n",
-                   store->Size, store->Index,
-                   _mesa_swizzle_string(store->Swizzle, 0, 0), t->Level,
-                   (void *) store);
-
-   return GL_TRUE;
-}
-
-
-void
-_slang_free_temp(slang_var_table *vt, slang_ir_storage *store)
-{
-   struct table *t = vt->Top;
-   GLuint i;
-   GLint r = store->Index;
-   assert(store->Size > 0);
-   assert(r >= 0);
-   assert((GLuint)r + store->Size <= vt->MaxRegisters * 4);
-   if (dbg) printf("Free temp sz %d at %d.%s (level %d) store %p\n",
-                   store->Size, r,
-                   _mesa_swizzle_string(store->Swizzle, 0, 0),
-                   t->Level, (void *) store);
-   if (store->Size == 1) {
-      const GLuint comp = GET_SWZ(store->Swizzle, 0);
-      /* we can actually fail some of these assertions because of the
-       * troublesome IR_SWIZZLE handling.
-       */
-#if 0
-      assert(store->Swizzle == MAKE_SWIZZLE4(comp, comp, comp, comp));
-      assert(comp < 4);
-      assert(t->ValSize[r * 4 + comp] == 1);
-#endif
-      assert(t->Temps[r * 4 + comp] == TEMP);
-      t->Temps[r * 4 + comp] = FREE;
-   }
-   else {
-      /*assert(store->Swizzle == SWIZZLE_NOOP);*/
-      assert(t->ValSize[r*4] == store->Size);
-      for (i = 0; i < (GLuint) store->Size; i++) {
-         assert(t->Temps[r * 4 + i] == TEMP);
-         t->Temps[r * 4 + i] = FREE;
-      }
-   }
-}
-
-
-GLboolean
-_slang_is_temp(const slang_var_table *vt, const slang_ir_storage *store)
-{
-   struct table *t = vt->Top;
-   GLuint comp;
-   assert(store->Index >= 0);
-   assert(store->Index < (int) vt->MaxRegisters);
-   if (store->Swizzle == SWIZZLE_NOOP)
-      comp = 0;
-   else
-      comp = GET_SWZ(store->Swizzle, 0);
-
-   if (t->Temps[store->Index * 4 + comp] == TEMP)
-      return GL_TRUE;
-   else
-      return GL_FALSE;
-}
diff --git a/mesalib/src/mesa/shader/slang/slang_vartable.h b/mesalib/src/mesa/shader/slang/slang_vartable.h
deleted file mode 100644
index 94bcd63f4..000000000
--- a/mesalib/src/mesa/shader/slang/slang_vartable.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-#ifndef SLANG_VARTABLE_H
-#define SLANG_VARTABLE_H
-
-struct slang_ir_storage_;
-
-typedef struct slang_var_table_ slang_var_table;
-
-struct slang_variable_;
-
-extern slang_var_table *
-_slang_new_var_table(GLuint maxRegisters);
-
-extern void
-_slang_delete_var_table(slang_var_table *vt);
-
-extern void
-_slang_push_var_table(slang_var_table *parent);
-
-extern void
-_slang_pop_var_table(slang_var_table *t);
-
-extern void
-_slang_add_variable(slang_var_table *t, struct slang_variable_ *v);
-
-extern struct slang_variable_ *
-_slang_find_variable(const slang_var_table *t, slang_atom name);
-
-extern GLboolean
-_slang_alloc_var(slang_var_table *t, struct slang_ir_storage_ *store);
-
-extern GLboolean
-_slang_alloc_temp(slang_var_table *t, struct slang_ir_storage_ *store);
-
-extern void
-_slang_free_temp(slang_var_table *t, struct slang_ir_storage_ *store);
-
-extern GLboolean
-_slang_is_temp(const slang_var_table *t, const struct slang_ir_storage_ *store);
-
-
-#endif /* SLANG_VARTABLE_H */
diff --git a/mesalib/src/mesa/shader/symbol_table.c b/mesalib/src/mesa/shader/symbol_table.c
deleted file mode 100644
index 6a5d68689..000000000
--- a/mesalib/src/mesa/shader/symbol_table.c
+++ /dev/null
@@ -1,362 +0,0 @@
-/*
- * Copyright © 2008 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/imports.h"
-#include "symbol_table.h"
-#include "hash_table.h"
-
-struct symbol {
-    /**
-     * Link to the next symbol in the table with the same name
-     *
-     * The linked list of symbols with the same name is ordered by scope
-     * from inner-most to outer-most.
-     */
-    struct symbol *next_with_same_name;
-
-
-    /**
-     * Link to the next symbol in the table with the same scope
-     *
-     * The linked list of symbols with the same scope is unordered.  Symbols
-     * in this list my have unique names.
-     */
-    struct symbol *next_with_same_scope;
-
-
-    /**
-     * Header information for the list of symbols with the same name.
-     */
-    struct symbol_header *hdr;
-
-
-    /**
-     * Name space of the symbol
-     *
-     * Name space are arbitrary user assigned integers.  No two symbols can
-     * exist in the same name space at the same scope level.
-     */
-    int name_space;
-
-    
-    /**
-     * Arbitrary user supplied data.
-     */
-    void *data;
-};
-
-
-/**
- */
-struct symbol_header {
-    /** Linkage in list of all headers in a given symbol table. */
-    struct symbol_header *next;
-
-    /** Symbol name. */
-    const char *name;
-
-    /** Linked list of symbols with the same name. */
-    struct symbol *symbols;
-};
-
-
-/**
- * Element of the scope stack.
- */
-struct scope_level {
-    /** Link to next (inner) scope level. */
-    struct scope_level *next;
-    
-    /** Linked list of symbols with the same scope. */
-    struct symbol *symbols;
-};
-
-
-/**
- *
- */
-struct _mesa_symbol_table {
-    /** Hash table containing all symbols in the symbol table. */
-    struct hash_table *ht;
-
-    /** Top of scope stack. */
-    struct scope_level *current_scope;
-
-    /** List of all symbol headers in the table. */
-    struct symbol_header *hdr;
-};
-
-
-struct _mesa_symbol_table_iterator {
-    /**
-     * Name space of symbols returned by this iterator.
-     */
-    int name_space;
-
-
-    /**
-     * Currently iterated symbol
-     *
-     * The next call to \c _mesa_symbol_table_iterator_get will return this
-     * value.  It will also update this value to the value that should be
-     * returned by the next call.
-     */
-    struct symbol *curr;
-};
-
-
-static void
-check_symbol_table(struct _mesa_symbol_table *table)
-{
-#if 1
-    struct scope_level *scope;
-
-    for (scope = table->current_scope; scope != NULL; scope = scope->next) {
-        struct symbol *sym;
-
-        for (sym = scope->symbols
-             ; sym != NULL
-             ; sym = sym->next_with_same_name) {
-            const struct symbol_header *const hdr = sym->hdr;
-            struct symbol *sym2;
-
-            for (sym2 = hdr->symbols
-                 ; sym2 != NULL
-                 ; sym2 = sym2->next_with_same_name) {
-                assert(sym2->hdr == hdr);
-            }
-        }
-    }
-#endif
-}
-
-void
-_mesa_symbol_table_pop_scope(struct _mesa_symbol_table *table)
-{
-    struct scope_level *const scope = table->current_scope;
-    struct symbol *sym = scope->symbols;
-
-    table->current_scope = scope->next;
-
-    free(scope);
-
-    while (sym != NULL) {
-        struct symbol *const next = sym->next_with_same_scope;
-        struct symbol_header *const hdr = sym->hdr;
-
-        assert(hdr->symbols == sym);
-
-        hdr->symbols = sym->next_with_same_name;
-
-        free(sym);
-
-        sym = next;
-    }
-
-    check_symbol_table(table);
-}
-
-
-void
-_mesa_symbol_table_push_scope(struct _mesa_symbol_table *table)
-{
-    struct scope_level *const scope = calloc(1, sizeof(*scope));
-    
-    scope->next = table->current_scope;
-    table->current_scope = scope;
-}
-
-
-static struct symbol_header *
-find_symbol(struct _mesa_symbol_table *table, const char *name)
-{
-    return (struct symbol_header *) hash_table_find(table->ht, name);
-}
-
-
-struct _mesa_symbol_table_iterator *
-_mesa_symbol_table_iterator_ctor(struct _mesa_symbol_table *table,
-                                 int name_space, const char *name)
-{
-    struct _mesa_symbol_table_iterator *iter = calloc(1, sizeof(*iter));
-    struct symbol_header *const hdr = find_symbol(table, name);
-    
-    iter->name_space = name_space;
-
-    if (hdr != NULL) {
-        struct symbol *sym;
-
-        for (sym = hdr->symbols; sym != NULL; sym = sym->next_with_same_name) {
-            assert(sym->hdr == hdr);
-
-            if ((name_space == -1) || (sym->name_space == name_space)) {
-                iter->curr = sym;
-                break;
-            }
-        }
-    }
-
-    return iter;
-}
-
-
-void
-_mesa_symbol_table_iterator_dtor(struct _mesa_symbol_table_iterator *iter)
-{
-    free(iter);
-}
-
-
-void *
-_mesa_symbol_table_iterator_get(struct _mesa_symbol_table_iterator *iter)
-{
-    return (iter->curr == NULL) ? NULL : iter->curr->data;
-}
-
-
-int
-_mesa_symbol_table_iterator_next(struct _mesa_symbol_table_iterator *iter)
-{
-    struct symbol_header *hdr;
-
-    if (iter->curr == NULL) {
-        return 0;
-    }
-
-    hdr = iter->curr->hdr;
-    iter->curr = iter->curr->next_with_same_name;
-
-    while (iter->curr != NULL) {
-        assert(iter->curr->hdr == hdr);
-
-        if ((iter->name_space == -1)
-            || (iter->curr->name_space == iter->name_space)) {
-            return 1;
-        }
-
-        iter->curr = iter->curr->next_with_same_name;
-    }
-
-    return 0;
-}
-
-
-void *
-_mesa_symbol_table_find_symbol(struct _mesa_symbol_table *table,
-                               int name_space, const char *name)
-{
-    struct symbol_header *const hdr = find_symbol(table, name);
-
-    if (hdr != NULL) {
-        struct symbol *sym;
-
-
-        for (sym = hdr->symbols; sym != NULL; sym = sym->next_with_same_name) {
-            assert(sym->hdr == hdr);
-
-            if ((name_space == -1) || (sym->name_space == name_space)) {
-                return sym->data;
-            }
-        }
-    }
-
-    return NULL;
-}
-
-
-int
-_mesa_symbol_table_add_symbol(struct _mesa_symbol_table *table,
-                              int name_space, const char *name,
-                              void *declaration)
-{
-    struct symbol_header *hdr;
-    struct symbol *sym;
-
-    check_symbol_table(table);
-
-    hdr = find_symbol(table, name);
-
-    check_symbol_table(table);
-
-    if (hdr == NULL) {
-        hdr = calloc(1, sizeof(*hdr));
-        hdr->name = name;
-
-        hash_table_insert(table->ht, hdr, name);
-	hdr->next = table->hdr;
-	table->hdr = hdr;
-    }
-
-    check_symbol_table(table);
-
-    sym = calloc(1, sizeof(*sym));
-    sym->next_with_same_name = hdr->symbols;
-    sym->next_with_same_scope = table->current_scope->symbols;
-    sym->hdr = hdr;
-    sym->name_space = name_space;
-    sym->data = declaration;
-
-    assert(sym->hdr == hdr);
-
-    hdr->symbols = sym;
-    table->current_scope->symbols = sym;
-
-    check_symbol_table(table);
-    return 0;
-}
-
-
-struct _mesa_symbol_table *
-_mesa_symbol_table_ctor(void)
-{
-    struct _mesa_symbol_table *table = calloc(1, sizeof(*table));
-
-    if (table != NULL) {
-       table->ht = hash_table_ctor(32, hash_table_string_hash,
-				   hash_table_string_compare);
-
-       _mesa_symbol_table_push_scope(table);
-    }
-
-    return table;
-}
-
-
-void
-_mesa_symbol_table_dtor(struct _mesa_symbol_table *table)
-{
-   struct symbol_header *hdr;
-   struct symbol_header *next;
-
-   while (table->current_scope != NULL) {
-      _mesa_symbol_table_pop_scope(table);
-   }
-
-   for (hdr = table->hdr; hdr != NULL; hdr = next) {
-       next = hdr->next;
-       free(hdr);
-   }
-
-   hash_table_dtor(table->ht);
-   free(table);
-}
diff --git a/mesalib/src/mesa/shader/symbol_table.h b/mesalib/src/mesa/shader/symbol_table.h
deleted file mode 100644
index 0c054ef13..000000000
--- a/mesalib/src/mesa/shader/symbol_table.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright © 2008 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.
- */
-#ifndef MESA_SYMBOL_TABLE_H
-#define MESA_SYMBOL_TABLE_H
-
-struct _mesa_symbol_table;
-struct _mesa_symbol_table_iterator;
-
-extern void _mesa_symbol_table_push_scope(struct _mesa_symbol_table *table);
-
-extern void _mesa_symbol_table_pop_scope(struct _mesa_symbol_table *table);
-
-extern int _mesa_symbol_table_add_symbol(struct _mesa_symbol_table *symtab,
-    int name_space, const char *name, void *declaration);
-
-extern void *_mesa_symbol_table_find_symbol(
-    struct _mesa_symbol_table *symtab, int name_space, const char *name);
-
-extern struct _mesa_symbol_table *_mesa_symbol_table_ctor(void);
-
-extern void _mesa_symbol_table_dtor(struct _mesa_symbol_table *);
-
-extern struct _mesa_symbol_table_iterator *_mesa_symbol_table_iterator_ctor(
-    struct _mesa_symbol_table *table, int name_space, const char *name);
-
-extern void _mesa_symbol_table_iterator_dtor(
-    struct _mesa_symbol_table_iterator *);
-
-extern void *_mesa_symbol_table_iterator_get(
-    struct _mesa_symbol_table_iterator *iter);
-
-extern int _mesa_symbol_table_iterator_next(
-    struct _mesa_symbol_table_iterator *iter);
-
-#endif /* MESA_SYMBOL_TABLE_H */
diff --git a/mesalib/src/mesa/sources.mak b/mesalib/src/mesa/sources.mak
index 9f2e4e515..b35d09335 100644
--- a/mesalib/src/mesa/sources.mak
+++ b/mesalib/src/mesa/sources.mak
@@ -1,5 +1,10 @@
 ### Lists of source files, included by Makefiles
 
+# this is part of MAIN_SOURCES
+MAIN_ES_SOURCES = \
+	main/api_exec_es1.c \
+	main/api_exec_es2.c
+
 MAIN_SOURCES = \
 	main/api_arrayelt.c \
 	main/api_exec.c \
@@ -7,6 +12,8 @@ MAIN_SOURCES = \
 	main/api_noop.c \
 	main/api_validate.c \
 	main/accum.c \
+	main/arbprogram.c \
+	main/atifragshader.c \
 	main/attrib.c \
 	main/arrayobj.c \
 	main/blend.c \
@@ -25,6 +32,7 @@ MAIN_SOURCES = \
 	main/dlist.c \
 	main/dlopen.c \
 	main/drawpix.c \
+	main/drawtex.c \
 	main/enable.c \
 	main/enums.c \
 	main/eval.c \
@@ -49,18 +57,20 @@ MAIN_SOURCES = \
 	main/mipmap.c \
 	main/mm.c \
 	main/multisample.c \
+	main/nvprogram.c \
 	main/pixel.c \
 	main/pixelstore.c \
 	main/points.c \
 	main/polygon.c \
 	main/queryobj.c \
+	main/querymatrix.c \
 	main/rastpos.c \
-	main/rbadaptors.c \
 	main/readpix.c \
 	main/remap.c \
 	main/renderbuffer.c \
 	main/scissor.c \
-	main/shaders.c \
+	main/shaderapi.c \
+	main/shaderobj.c \
 	main/shared.c \
 	main/state.c \
 	main/stencil.c \
@@ -76,21 +86,18 @@ MAIN_SOURCES = \
 	main/texgetimage.c \
 	main/teximage.c \
 	main/texobj.c \
+	main/texpal.c \
 	main/texparam.c \
 	main/texrender.c \
 	main/texstate.c \
 	main/texstore.c \
+	main/transformfeedback.c \
+	main/uniforms.c \
 	main/varray.c \
 	main/version.c \
 	main/viewport.c \
-	main/vtxfmt.c
-
-GLAPI_SOURCES = \
-	glapi/glapi.c \
-	glapi/glapi_dispatch.c \
-	glapi/glapi_getproc.c \
-	glapi/glapi_nop.c \
-	glapi/glthread.c
+	main/vtxfmt.c \
+	$(MAIN_ES_SOURCES)
 
 MATH_SOURCES = \
 	math/m_debug_clip.c \
@@ -180,6 +187,7 @@ STATETRACKER_SOURCES = \
 	state_tracker/st_atom_constbuf.c \
 	state_tracker/st_atom_depth.c \
 	state_tracker/st_atom_framebuffer.c \
+	state_tracker/st_atom_msaa.c \
 	state_tracker/st_atom_pixeltransfer.c \
 	state_tracker/st_atom_sampler.c \
 	state_tracker/st_atom_scissor.c \
@@ -196,6 +204,8 @@ STATETRACKER_SOURCES = \
 	state_tracker/st_cb_condrender.c \
 	state_tracker/st_cb_flush.c \
 	state_tracker/st_cb_drawpixels.c \
+	state_tracker/st_cb_drawtex.c \
+	state_tracker/st_cb_eglimage.c \
 	state_tracker/st_cb_fbo.c \
 	state_tracker/st_cb_feedback.c \
 	state_tracker/st_cb_program.c \
@@ -204,64 +214,44 @@ STATETRACKER_SOURCES = \
 	state_tracker/st_cb_readpixels.c \
 	state_tracker/st_cb_strings.c \
 	state_tracker/st_cb_texture.c \
+	state_tracker/st_cb_viewport.c \
+	state_tracker/st_cb_xformfb.c \
 	state_tracker/st_context.c \
 	state_tracker/st_debug.c \
 	state_tracker/st_draw.c \
 	state_tracker/st_draw_feedback.c \
 	state_tracker/st_extensions.c \
 	state_tracker/st_format.c \
-	state_tracker/st_framebuffer.c \
 	state_tracker/st_gen_mipmap.c \
+	state_tracker/st_manager.c \
 	state_tracker/st_mesa_to_tgsi.c \
 	state_tracker/st_program.c \
 	state_tracker/st_texture.c
 
-SHADER_SOURCES = \
-	shader/arbprogparse.c \
-	shader/arbprogram.c \
-	shader/atifragshader.c \
-	shader/hash_table.c \
-	shader/lex.yy.c \
-	shader/nvfragparse.c \
-	shader/nvprogram.c \
-	shader/nvvertparse.c \
-	shader/program.c \
-	shader/program_parse.tab.c \
-	shader/program_parse_extra.c \
-	shader/prog_cache.c \
-	shader/prog_execute.c \
-	shader/prog_instruction.c \
-	shader/prog_noise.c \
-	shader/prog_optimize.c \
-	shader/prog_parameter.c \
-	shader/prog_parameter_layout.c \
-	shader/prog_print.c \
-	shader/prog_statevars.c \
-	shader/prog_uniform.c \
-	shader/programopt.c \
-	shader/symbol_table.c \
-	shader/shader_api.c
-
-SLANG_SOURCES =	\
-	shader/slang/slang_builtin.c	\
-	shader/slang/slang_codegen.c	\
-	shader/slang/slang_compile.c	\
-	shader/slang/slang_compile_function.c	\
-	shader/slang/slang_compile_operation.c	\
-	shader/slang/slang_compile_struct.c	\
-	shader/slang/slang_compile_variable.c	\
-	shader/slang/slang_emit.c	\
-	shader/slang/slang_ir.c	\
-	shader/slang/slang_label.c	\
-	shader/slang/slang_link.c	\
-	shader/slang/slang_log.c	\
-	shader/slang/slang_mem.c	\
-	shader/slang/slang_print.c	\
-	shader/slang/slang_simplify.c	\
-	shader/slang/slang_storage.c	\
-	shader/slang/slang_typeinfo.c	\
-	shader/slang/slang_vartable.c	\
-	shader/slang/slang_utility.c
+PROGRAM_SOURCES = \
+	program/arbprogparse.c \
+	program/hash_table.c \
+	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 \
+	program/prog_instruction.c \
+	program/prog_noise.c \
+	program/prog_optimize.c \
+	program/prog_parameter.c \
+	program/prog_parameter_layout.c \
+	program/prog_print.c \
+	program/prog_statevars.c \
+	program/prog_uniform.c \
+	program/programopt.c \
+	program/symbol_table.c
+
+SHADER_CXX_SOURCES = \
+	program/ir_to_mesa.cpp
 
 ASM_C_SOURCES =	\
 	x86/common_x86.c \
@@ -292,23 +282,14 @@ X86_SOURCES =			\
 	x86/sse_normal.S	\
 	x86/read_rgba_span_x86.S
 
-X86_API =			\
-	x86/glapi_x86.S
-
 X86-64_SOURCES =		\
 	x86-64/xform4.S
 
-X86-64_API =			\
-	x86-64/glapi_x86-64.S
-
 SPARC_SOURCES =			\
 	sparc/clip.S		\
 	sparc/norm.S		\
 	sparc/xform.S
 
-SPARC_API =			\
-	sparc/glapi_sparc.S
-
 COMMON_DRIVER_SOURCES =			\
 	drivers/common/driverfuncs.c	\
 	drivers/common/meta.c
@@ -321,12 +302,14 @@ MESA_SOURCES = \
 	$(MATH_XFORM_SOURCES)	\
 	$(VBO_SOURCES)		\
 	$(TNL_SOURCES)		\
-	$(SHADER_SOURCES)	\
+	$(PROGRAM_SOURCES)	\
 	$(SWRAST_SOURCES)	\
 	$(SWRAST_SETUP_SOURCES)	\
 	$(COMMON_DRIVER_SOURCES)\
-	$(ASM_C_SOURCES)	\
-	$(SLANG_SOURCES)
+	$(ASM_C_SOURCES)
+
+MESA_CXX_SOURCES = \
+	 $(SHADER_CXX_SOURCES)
 
 # Sources for building Gallium drivers
 MESA_GALLIUM_SOURCES = \
@@ -334,15 +317,17 @@ MESA_GALLIUM_SOURCES = \
 	$(MATH_SOURCES)		\
 	$(VBO_SOURCES)		\
 	$(STATETRACKER_SOURCES)	\
-	$(SHADER_SOURCES)	\
+	$(PROGRAM_SOURCES)	\
 	ppc/common_ppc.c	\
-	x86/common_x86.c	\
-	$(SLANG_SOURCES)
+	x86/common_x86.c
+
+MESA_GALLIUM_CXX_SOURCES = \
+	 $(SHADER_CXX_SOURCES)
 
 # All the core C sources, for dependency checking
 ALL_SOURCES = \
 	$(MESA_SOURCES)		\
-	$(GLAPI_SOURCES)	\
+	$(MESA_CXX_SOURCES)	\
 	$(MESA_ASM_SOURCES)	\
 	$(STATETRACKER_SOURCES)
 
@@ -351,16 +336,14 @@ ALL_SOURCES = \
 
 MESA_OBJECTS = \
 	$(MESA_SOURCES:.c=.o) \
+	$(MESA_CXX_SOURCES:.cpp=.o) \
 	$(MESA_ASM_SOURCES:.S=.o)
 
 MESA_GALLIUM_OBJECTS = \
 	$(MESA_GALLIUM_SOURCES:.c=.o) \
+	$(MESA_GALLIUM_CXX_SOURCES:.cpp=.o) \
 	$(MESA_ASM_SOURCES:.S=.o)
 
-GLAPI_OBJECTS = \
-	$(GLAPI_SOURCES:.c=.o) \
-	$(GLAPI_ASM_SOURCES:.S=.o)
-
 
 COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_SOURCES:.c=.o)
 
@@ -368,14 +351,15 @@ COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_SOURCES:.c=.o)
 ### Other archives/libraries
 
 GLSL_LIBS = \
-	$(TOP)/src/glsl/pp/libglslpp.a \
-	$(TOP)/src/glsl/cl/libglslcl.a
+	$(TOP)/src/glsl/libglsl.a
 
 
 ### Include directories
 
 INCLUDE_DIRS = \
 	-I$(TOP)/include \
+	-I$(TOP)/src/glsl \
 	-I$(TOP)/src/mesa \
+	-I$(TOP)/src/mapi \
 	-I$(TOP)/src/gallium/include \
 	-I$(TOP)/src/gallium/auxiliary
diff --git a/mesalib/src/mesa/swrast/s_aaline.h b/mesalib/src/mesa/swrast/s_aaline.h
index f1d708ec8..922eb230e 100644
--- a/mesalib/src/mesa/swrast/s_aaline.h
+++ b/mesalib/src/mesa/swrast/s_aaline.h
@@ -28,7 +28,7 @@
 #define S_AALINE_H
 
 
-#include "swrast.h"
+#include "main/mtypes.h"
 
 
 extern void
diff --git a/mesalib/src/mesa/swrast/s_aatriangle.h b/mesalib/src/mesa/swrast/s_aatriangle.h
index 4b57fa73a..9aed41a19 100644
--- a/mesalib/src/mesa/swrast/s_aatriangle.h
+++ b/mesalib/src/mesa/swrast/s_aatriangle.h
@@ -28,7 +28,7 @@
 #define S_AATRIANGLE_H
 
 
-#include "swrast.h"
+#include "main/mtypes.h"
 
 
 extern void
diff --git a/mesalib/src/mesa/swrast/s_alpha.h b/mesalib/src/mesa/swrast/s_alpha.h
index 7a5b72e65..239484a97 100644
--- a/mesalib/src/mesa/swrast/s_alpha.h
+++ b/mesalib/src/mesa/swrast/s_alpha.h
@@ -28,7 +28,8 @@
 #define S_ALPHA_H
 
 
-#include "s_context.h"
+#include "main/mtypes.h"
+#include "s_span.h"
 
 
 extern GLint
diff --git a/mesalib/src/mesa/swrast/s_atifragshader.c b/mesalib/src/mesa/swrast/s_atifragshader.c
index 0f06cdf9f..1338b6802 100644
--- a/mesalib/src/mesa/swrast/s_atifragshader.c
+++ b/mesalib/src/mesa/swrast/s_atifragshader.c
@@ -21,10 +21,10 @@
 
 #include "main/glheader.h"
 #include "main/colormac.h"
-#include "main/context.h"
 #include "main/macros.h"
-#include "shader/atifragshader.h"
+#include "main/atifragshader.h"
 #include "swrast/s_atifragshader.h"
+#include "swrast/s_context.h"
 
 
 /**
diff --git a/mesalib/src/mesa/swrast/s_atifragshader.h b/mesalib/src/mesa/swrast/s_atifragshader.h
index 871a0c045..cce455a04 100644
--- a/mesalib/src/mesa/swrast/s_atifragshader.h
+++ b/mesalib/src/mesa/swrast/s_atifragshader.h
@@ -27,7 +27,8 @@
 #define S_ATIFRAGSHADER_H
 
 
-#include "s_context.h"
+#include "main/mtypes.h"
+#include "s_span.h"
 
 
 extern void
diff --git a/mesalib/src/mesa/swrast/s_blend.h b/mesalib/src/mesa/swrast/s_blend.h
index 8d5a81635..9cedde3bf 100644
--- a/mesalib/src/mesa/swrast/s_blend.h
+++ b/mesalib/src/mesa/swrast/s_blend.h
@@ -27,7 +27,8 @@
 #define S_BLEND_H
 
 
-#include "s_context.h"
+#include "main/mtypes.h"
+#include "s_span.h"
 
 
 extern void
diff --git a/mesalib/src/mesa/swrast/s_clear.c b/mesalib/src/mesa/swrast/s_clear.c
index 7b0a63391..efe500ae2 100644
--- a/mesalib/src/mesa/swrast/s_clear.c
+++ b/mesalib/src/mesa/swrast/s_clear.c
@@ -25,7 +25,6 @@
 #include "main/glheader.h"
 #include "main/colormac.h"
 #include "main/condrender.h"
-#include "main/formats.h"
 #include "main/macros.h"
 #include "main/imports.h"
 #include "main/mtypes.h"
diff --git a/mesalib/src/mesa/swrast/s_context.c b/mesalib/src/mesa/swrast/s_context.c
index 751966348..f76a2b68e 100644
--- a/mesalib/src/mesa/swrast/s_context.c
+++ b/mesalib/src/mesa/swrast/s_context.c
@@ -28,12 +28,11 @@
 
 #include "main/imports.h"
 #include "main/bufferobj.h"
-#include "main/context.h"
 #include "main/colormac.h"
 #include "main/mtypes.h"
 #include "main/teximage.h"
-#include "shader/prog_parameter.h"
-#include "shader/prog_statevars.h"
+#include "program/prog_parameter.h"
+#include "program/prog_statevars.h"
 #include "swrast.h"
 #include "s_blend.h"
 #include "s_context.h"
@@ -951,7 +950,7 @@ _swrast_print_vertex( GLcontext *ctx, const SWvertex *v )
                   v->attrib[FRAG_ATTRIB_COL1][2],
                   v->attrib[FRAG_ATTRIB_COL1][3]);
       _mesa_debug(ctx, "fog %f\n", v->attrib[FRAG_ATTRIB_FOGC][0]);
-      _mesa_debug(ctx, "index %d\n", v->attrib[FRAG_ATTRIB_CI][0]);
+      _mesa_debug(ctx, "index %f\n", v->attrib[FRAG_ATTRIB_CI][0]);
       _mesa_debug(ctx, "pointsize %f\n", v->pointSize);
       _mesa_debug(ctx, "\n");
    }
diff --git a/mesalib/src/mesa/swrast/s_context.h b/mesalib/src/mesa/swrast/s_context.h
index 9059f9b5e..6d81f7476 100644
--- a/mesalib/src/mesa/swrast/s_context.h
+++ b/mesalib/src/mesa/swrast/s_context.h
@@ -43,8 +43,9 @@
 #ifndef S_CONTEXT_H
 #define S_CONTEXT_H
 
+#include "main/compiler.h"
 #include "main/mtypes.h"
-#include "shader/prog_execute.h"
+#include "program/prog_execute.h"
 #include "swrast.h"
 #include "s_span.h"
 
diff --git a/mesalib/src/mesa/swrast/s_depth.c b/mesalib/src/mesa/swrast/s_depth.c
index ed637cac1..f952fd6ba 100644
--- a/mesalib/src/mesa/swrast/s_depth.c
+++ b/mesalib/src/mesa/swrast/s_depth.c
@@ -30,7 +30,6 @@
 #include "main/imports.h"
 
 #include "s_depth.h"
-#include "s_context.h"
 #include "s_span.h"
 
 
diff --git a/mesalib/src/mesa/swrast/s_depth.h b/mesalib/src/mesa/swrast/s_depth.h
index 7eae36674..878d242f5 100644
--- a/mesalib/src/mesa/swrast/s_depth.h
+++ b/mesalib/src/mesa/swrast/s_depth.h
@@ -27,7 +27,8 @@
 #define S_DEPTH_H
 
 
-#include "s_context.h"
+#include "main/mtypes.h"
+#include "s_span.h"
 
 
 extern GLuint
diff --git a/mesalib/src/mesa/swrast/s_feedback.c b/mesalib/src/mesa/swrast/s_feedback.c
index 373b1416e..6ac8ac73b 100644
--- a/mesalib/src/mesa/swrast/s_feedback.c
+++ b/mesalib/src/mesa/swrast/s_feedback.c
@@ -24,7 +24,6 @@
 
 #include "main/glheader.h"
 #include "main/colormac.h"
-#include "main/context.h"
 #include "main/feedback.h"
 #include "main/macros.h"
 
diff --git a/mesalib/src/mesa/swrast/s_fog.c b/mesalib/src/mesa/swrast/s_fog.c
index 3fc843921..689500a61 100644
--- a/mesalib/src/mesa/swrast/s_fog.c
+++ b/mesalib/src/mesa/swrast/s_fog.c
@@ -25,7 +25,6 @@
 
 #include "main/glheader.h"
 #include "main/colormac.h"
-#include "main/context.h"
 #include "main/macros.h"
 
 #include "s_context.h"
diff --git a/mesalib/src/mesa/swrast/s_fog.h b/mesalib/src/mesa/swrast/s_fog.h
index 06107de3f..a496746d1 100644
--- a/mesalib/src/mesa/swrast/s_fog.h
+++ b/mesalib/src/mesa/swrast/s_fog.h
@@ -28,7 +28,8 @@
 #define S_FOG_H
 
 
-#include "swrast.h"
+#include "main/mtypes.h"
+#include "s_span.h"
 
 
 extern GLfloat
diff --git a/mesalib/src/mesa/swrast/s_fragprog.c b/mesalib/src/mesa/swrast/s_fragprog.c
index 7c1de62e8..9facb44d9 100644
--- a/mesalib/src/mesa/swrast/s_fragprog.c
+++ b/mesalib/src/mesa/swrast/s_fragprog.c
@@ -24,9 +24,9 @@
 
 #include "main/glheader.h"
 #include "main/colormac.h"
-#include "main/context.h"
-#include "shader/prog_instruction.h"
+#include "program/prog_instruction.h"
 
+#include "s_context.h"
 #include "s_fragprog.h"
 #include "s_span.h"
 
diff --git a/mesalib/src/mesa/swrast/s_fragprog.h b/mesalib/src/mesa/swrast/s_fragprog.h
index e1b7e6791..92b9d01e1 100644
--- a/mesalib/src/mesa/swrast/s_fragprog.h
+++ b/mesalib/src/mesa/swrast/s_fragprog.h
@@ -27,7 +27,8 @@
 #define S_FRAGPROG_H
 
 
-#include "s_context.h"
+#include "main/mtypes.h"
+#include "s_span.h"
 
 
 extern void
diff --git a/mesalib/src/mesa/swrast/s_logic.h b/mesalib/src/mesa/swrast/s_logic.h
index e8cfae33f..d60951334 100644
--- a/mesalib/src/mesa/swrast/s_logic.h
+++ b/mesalib/src/mesa/swrast/s_logic.h
@@ -27,7 +27,8 @@
 #define S_LOGIC_H
 
 
-#include "swrast.h"
+#include "main/mtypes.h"
+#include "s_span.h"
 
 extern void
 _swrast_logicop_rgba_span(GLcontext *ctx, struct gl_renderbuffer *rb,
diff --git a/mesalib/src/mesa/swrast/s_masking.h b/mesalib/src/mesa/swrast/s_masking.h
index 3ba4f8356..cb000da0f 100644
--- a/mesalib/src/mesa/swrast/s_masking.h
+++ b/mesalib/src/mesa/swrast/s_masking.h
@@ -27,7 +27,8 @@
 #define S_MASKING_H
 
 
-#include "swrast.h"
+#include "main/mtypes.h"
+#include "s_span.h"
 
 
 extern void
diff --git a/mesalib/src/mesa/swrast/s_points.c b/mesalib/src/mesa/swrast/s_points.c
index 1663ece82..12431662c 100644
--- a/mesalib/src/mesa/swrast/s_points.c
+++ b/mesalib/src/mesa/swrast/s_points.c
@@ -25,7 +25,6 @@
 
 #include "main/glheader.h"
 #include "main/colormac.h"
-#include "main/context.h"
 #include "main/macros.h"
 #include "s_context.h"
 #include "s_feedback.h"
diff --git a/mesalib/src/mesa/swrast/s_readpix.c b/mesalib/src/mesa/swrast/s_readpix.c
index 368311e14..1de481248 100644
--- a/mesalib/src/mesa/swrast/s_readpix.c
+++ b/mesalib/src/mesa/swrast/s_readpix.c
@@ -27,7 +27,6 @@
 #include "main/bufferobj.h"
 #include "main/colormac.h"
 #include "main/convolve.h"
-#include "main/context.h"
 #include "main/feedback.h"
 #include "main/formats.h"
 #include "main/image.h"
@@ -192,7 +191,8 @@ fast_read_rgba_pixels( GLcontext *ctx,
    if (!rb)
       return GL_FALSE;
 
-   ASSERT(rb->_BaseFormat == GL_RGBA || rb->_BaseFormat == GL_RGB);
+   ASSERT(rb->_BaseFormat == GL_RGBA || rb->_BaseFormat == GL_RGB ||
+	  rb->_BaseFormat == GL_ALPHA);
 
    /* clipping should have already been done */
    ASSERT(x + width <= (GLint) rb->Width);
@@ -265,10 +265,18 @@ adjust_colors(const struct gl_framebuffer *fb, GLuint n, GLfloat rgba[][4])
    const GLuint rShift = 8 - fb->Visual.redBits;
    const GLuint gShift = 8 - fb->Visual.greenBits;
    const GLuint bShift = 8 - fb->Visual.blueBits;
-   const GLfloat rScale = 1.0F / (GLfloat) ((1 << fb->Visual.redBits  ) - 1);
-   const GLfloat gScale = 1.0F / (GLfloat) ((1 << fb->Visual.greenBits) - 1);
-   const GLfloat bScale = 1.0F / (GLfloat) ((1 << fb->Visual.blueBits ) - 1);
+   GLfloat rScale = 1.0F / (GLfloat) ((1 << fb->Visual.redBits  ) - 1);
+   GLfloat gScale = 1.0F / (GLfloat) ((1 << fb->Visual.greenBits) - 1);
+   GLfloat bScale = 1.0F / (GLfloat) ((1 << fb->Visual.blueBits ) - 1);
    GLuint i;
+
+   if (fb->Visual.redBits == 0)
+      rScale = 0;
+   if (fb->Visual.greenBits == 0)
+      gScale = 0;
+   if (fb->Visual.blueBits == 0)
+      bScale = 0;
+
    for (i = 0; i < n; i++) {
       GLint r, g, b;
       /* convert float back to ubyte */
diff --git a/mesalib/src/mesa/swrast/s_span.c b/mesalib/src/mesa/swrast/s_span.c
index 687c8eb0b..28c82990e 100644
--- a/mesalib/src/mesa/swrast/s_span.c
+++ b/mesalib/src/mesa/swrast/s_span.c
@@ -33,7 +33,6 @@
 
 #include "main/glheader.h"
 #include "main/colormac.h"
-#include "main/context.h"
 #include "main/macros.h"
 #include "main/imports.h"
 #include "main/image.h"
@@ -971,6 +970,10 @@ shade_texture_span(GLcontext *ctx, SWspan *span)
       if (span->primitive == GL_BITMAP && span->array->ChanType != GL_FLOAT) {
          convert_color_type(span, GL_FLOAT, 0);
       }
+      else {
+         span->array->rgba = (void *) span->array->attribs[FRAG_ATTRIB_COL0];
+      }
+
       if (span->primitive != GL_POINT ||
 	  (span->interpMask & SPAN_RGBA) ||
 	  ctx->Point.PointSprite) {
@@ -1222,9 +1225,22 @@ _swrast_write_rgba_span( GLcontext *ctx, SWspan *span)
             GLchan rgbaSave[MAX_WIDTH][4];
             const GLuint fragOutput = multiFragOutputs ? buf : 0;
 
+            /* set span->array->rgba to colors for render buffer's datatype */
             if (rb->DataType != span->array->ChanType || fragOutput > 0) {
                convert_color_type(span, rb->DataType, fragOutput);
             }
+            else {
+               if (rb->DataType == GL_UNSIGNED_BYTE) {
+                  span->array->rgba = span->array->rgba8;
+               }
+               else if (rb->DataType == GL_UNSIGNED_SHORT) {
+                  span->array->rgba = (void *) span->array->rgba16;
+               }
+               else {
+                  span->array->rgba = (void *)
+                     span->array->attribs[FRAG_ATTRIB_COL0];
+               }
+            }
 
             if (!multiFragOutputs && numBuffers > 1) {
                /* save colors for second, third renderbuffer writes */
@@ -1232,7 +1248,8 @@ _swrast_write_rgba_span( GLcontext *ctx, SWspan *span)
                       4 * span->end * sizeof(GLchan));
             }
 
-            ASSERT(rb->_BaseFormat == GL_RGBA || rb->_BaseFormat == GL_RGB);
+            ASSERT(rb->_BaseFormat == GL_RGBA || rb->_BaseFormat == GL_RGB ||
+		   rb->_BaseFormat == GL_ALPHA);
 
             if (ctx->Color._LogicOpEnabled) {
                _swrast_logicop_rgba_span(ctx, rb, span);
@@ -1330,7 +1347,8 @@ _swrast_read_rgba_span( GLcontext *ctx, struct gl_renderbuffer *rb,
 
       ASSERT(rb);
       ASSERT(rb->GetRow);
-      ASSERT(rb->_BaseFormat == GL_RGB || rb->_BaseFormat == GL_RGBA);
+      ASSERT(rb->_BaseFormat == GL_RGB || rb->_BaseFormat == GL_RGBA ||
+	     rb->_BaseFormat == GL_ALPHA);
 
       if (rb->DataType == dstType) {
          rb->GetRow(ctx, rb, length, x + skip, y,
diff --git a/mesalib/src/mesa/swrast/s_stencil.h b/mesalib/src/mesa/swrast/s_stencil.h
index cd6cbc57b..c076ebbe2 100644
--- a/mesalib/src/mesa/swrast/s_stencil.h
+++ b/mesalib/src/mesa/swrast/s_stencil.h
@@ -27,7 +27,8 @@
 #define S_STENCIL_H
 
 
-#include "swrast.h"
+#include "main/mtypes.h"
+#include "s_span.h"
 
 
 
diff --git a/mesalib/src/mesa/swrast/s_texcombine.c b/mesalib/src/mesa/swrast/s_texcombine.c
index f322663ad..2ac0aaa24 100644
--- a/mesalib/src/mesa/swrast/s_texcombine.c
+++ b/mesalib/src/mesa/swrast/s_texcombine.c
@@ -29,7 +29,7 @@
 #include "main/colormac.h"
 #include "main/image.h"
 #include "main/imports.h"
-#include "shader/prog_instruction.h"
+#include "program/prog_instruction.h"
 
 #include "s_context.h"
 #include "s_texcombine.h"
diff --git a/mesalib/src/mesa/swrast/s_texcombine.h b/mesalib/src/mesa/swrast/s_texcombine.h
index 9ed96efb8..4f5dfbe1a 100644
--- a/mesalib/src/mesa/swrast/s_texcombine.h
+++ b/mesalib/src/mesa/swrast/s_texcombine.h
@@ -27,7 +27,8 @@
 #define S_TEXCOMBINE_H
 
 
-#include "swrast.h"
+#include "main/mtypes.h"
+#include "s_span.h"
 
 extern void
 _swrast_texture_span( GLcontext *ctx, SWspan *span );
diff --git a/mesalib/src/mesa/swrast/s_texfilter.c b/mesalib/src/mesa/swrast/s_texfilter.c
index 997c2f4bb..3fc554c5a 100644
--- a/mesalib/src/mesa/swrast/s_texfilter.c
+++ b/mesalib/src/mesa/swrast/s_texfilter.c
@@ -488,14 +488,15 @@ tex_array_slice(GLfloat coord, GLsizei size)
 
 /**
  * Compute nearest integer texcoords for given texobj and coordinate.
+ * NOTE: only used for depth texture sampling.
  */
 static INLINE void
 nearest_texcoord(const struct gl_texture_object *texObj,
+                 GLuint level,
                  const GLfloat texcoord[4],
                  GLint *i, GLint *j, GLint *k)
 {
-   const GLint baseLevel = texObj->BaseLevel;
-   const struct gl_texture_image *img = texObj->Image[0][baseLevel];
+   const struct gl_texture_image *img = texObj->Image[0][level];
    const GLint width = img->Width;
    const GLint height = img->Height;
    const GLint depth = img->Depth;
@@ -534,15 +535,16 @@ nearest_texcoord(const struct gl_texture_object *texObj,
 
 /**
  * Compute linear integer texcoords for given texobj and coordinate.
+ * NOTE: only used for depth texture sampling.
  */
 static INLINE void
 linear_texcoord(const struct gl_texture_object *texObj,
+                GLuint level,
                 const GLfloat texcoord[4],
                 GLint *i0, GLint *i1, GLint *j0, GLint *j1, GLint *slice,
                 GLfloat *wi, GLfloat *wj)
 {
-   const GLint baseLevel = texObj->BaseLevel;
-   const struct gl_texture_image *img = texObj->Image[0][baseLevel];
+   const struct gl_texture_image *img = texObj->Image[0][level];
    const GLint width = img->Width;
    const GLint height = img->Height;
    const GLint depth = img->Depth;
@@ -2963,7 +2965,26 @@ shadow_compare4(GLenum function, GLfloat coord,
 
 
 /**
- * Sample a shadow/depth texture.
+ * Choose the mipmap level to use when sampling from a depth texture.
+ */
+static int
+choose_depth_texture_level(const struct gl_texture_object *tObj, GLfloat lambda)
+{
+   GLint level;
+
+   lambda = CLAMP(lambda, tObj->MinLod, tObj->MaxLod);
+
+   level = (GLint) lambda;
+
+   level = CLAMP(level, tObj->BaseLevel, tObj->_MaxLevel);
+
+   return level;
+}
+
+
+/**
+ * Sample a shadow/depth texture.  This function is incomplete.  It doesn't
+ * check for minification vs. magnification, etc.
  */
 static void
 sample_depth_texture( GLcontext *ctx,
@@ -2971,8 +2992,8 @@ sample_depth_texture( GLcontext *ctx,
                       const GLfloat texcoords[][4], const GLfloat lambda[],
                       GLfloat texel[][4] )
 {
-   const GLint baseLevel = tObj->BaseLevel;
-   const struct gl_texture_image *img = tObj->Image[0][baseLevel];
+   const GLint level = choose_depth_texture_level(tObj, lambda[0]);
+   const struct gl_texture_image *img = tObj->Image[0][level];
    const GLint width = img->Width;
    const GLint height = img->Height;
    const GLint depth = img->Depth;
@@ -2982,8 +3003,6 @@ sample_depth_texture( GLcontext *ctx,
    GLenum function;
    GLfloat result;
 
-   (void) lambda;
-
    ASSERT(img->_BaseFormat == GL_DEPTH_COMPONENT ||
           img->_BaseFormat == GL_DEPTH_STENCIL_EXT);
 
@@ -3006,7 +3025,7 @@ sample_depth_texture( GLcontext *ctx,
          GLfloat depthSample;
          GLint col, row, slice;
 
-         nearest_texcoord(tObj, texcoords[i], &col, &row, &slice);
+         nearest_texcoord(tObj, level, texcoords[i], &col, &row, &slice);
 
          if (col >= 0 && row >= 0 && col < width && row < height && 
              slice >= 0 && slice < depth) {
@@ -3044,7 +3063,7 @@ sample_depth_texture( GLcontext *ctx,
          GLfloat wi, wj;
          GLuint useBorderTexel;
 
-         linear_texcoord(tObj, texcoords[i], &i0, &i1, &j0, &j1, &slice,
+         linear_texcoord(tObj, level, texcoords[i], &i0, &i1, &j0, &j1, &slice,
                          &wi, &wj);
 
          useBorderTexel = 0;
diff --git a/mesalib/src/mesa/swrast/s_texfilter.h b/mesalib/src/mesa/swrast/s_texfilter.h
index 2e265d685..eceab5965 100644
--- a/mesalib/src/mesa/swrast/s_texfilter.h
+++ b/mesalib/src/mesa/swrast/s_texfilter.h
@@ -27,7 +27,8 @@
 #define S_TEXFILTER_H
 
 
-#include "swrast.h"
+#include "main/mtypes.h"
+#include "s_context.h"
 
 
 extern texture_sample_func
diff --git a/mesalib/src/mesa/swrast/s_triangle.c b/mesalib/src/mesa/swrast/s_triangle.c
index 812dddf15..d1b369bcd 100644
--- a/mesalib/src/mesa/swrast/s_triangle.c
+++ b/mesalib/src/mesa/swrast/s_triangle.c
@@ -35,7 +35,7 @@
 #include "main/imports.h"
 #include "main/macros.h"
 #include "main/texformat.h"
-#include "shader/prog_instruction.h"
+#include "program/prog_instruction.h"
 
 #include "s_aatriangle.h"
 #include "s_context.h"
diff --git a/mesalib/src/mesa/swrast/s_zoom.h b/mesalib/src/mesa/swrast/s_zoom.h
index 43917be65..09f624efa 100644
--- a/mesalib/src/mesa/swrast/s_zoom.h
+++ b/mesalib/src/mesa/swrast/s_zoom.h
@@ -25,7 +25,8 @@
 #ifndef S_ZOOM_H
 #define S_ZOOM_H
 
-#include "swrast.h"
+#include "main/mtypes.h"
+#include "s_span.h"
 
 
 extern void
diff --git a/mesalib/src/mesa/swrast_setup/ss_context.c b/mesalib/src/mesa/swrast_setup/ss_context.c
index ebd1574c4..0fcb7c77a 100644
--- a/mesalib/src/mesa/swrast_setup/ss_context.c
+++ b/mesalib/src/mesa/swrast_setup/ss_context.c
@@ -115,7 +115,7 @@ setup_vertex_format(GLcontext *ctx)
    GLboolean intColors = !ctx->FragmentProgram._Current
                       && !ctx->ATIFragmentShader._Enabled
                       && ctx->RenderMode == GL_RENDER
-                      && CHAN_TYPE == GL_UNSIGNED_BYTE;
+                      && CHAN_TYPE != GL_FLOAT;
 
    if (intColors != swsetup->intColors ||
        !RENDERINPUTS_EQUAL(tnl->render_inputs_bitset,
diff --git a/mesalib/src/mesa/swrast_setup/ss_context.h b/mesalib/src/mesa/swrast_setup/ss_context.h
index 1ec293fad..56551ab27 100644
--- a/mesalib/src/mesa/swrast_setup/ss_context.h
+++ b/mesalib/src/mesa/swrast_setup/ss_context.h
@@ -28,9 +28,8 @@
 #ifndef SS_CONTEXT_H
 #define SS_CONTEXT_H
 
-#include "main/mtypes.h"
+#include "main/glheader.h"
 #include "swrast/swrast.h"
-#include "swrast_setup.h"
 #include "tnl/t_context.h"
 
 typedef struct {
diff --git a/mesalib/src/mesa/swrast_setup/ss_triangle.c b/mesalib/src/mesa/swrast_setup/ss_triangle.c
index bad0d8194..f22bc52f0 100644
--- a/mesalib/src/mesa/swrast_setup/ss_triangle.c
+++ b/mesalib/src/mesa/swrast_setup/ss_triangle.c
@@ -159,7 +159,7 @@ static void _swsetup_render_tri(GLcontext *ctx,
 }
 
 #define SS_COLOR(a,b) UNCLAMPED_FLOAT_TO_RGBA_CHAN(a,b)
-#define SS_SPEC(a,b) UNCLAMPED_FLOAT_TO_RGB_CHAN(a,b)
+#define SS_SPEC(a,b) COPY_4V(a,b)
 #define SS_IND(a,b) (a = b)
 
 #define IND (0)
diff --git a/mesalib/src/mesa/swrast_setup/ss_triangle.h b/mesalib/src/mesa/swrast_setup/ss_triangle.h
index 007fa2e91..ac553cbd0 100644
--- a/mesalib/src/mesa/swrast_setup/ss_triangle.h
+++ b/mesalib/src/mesa/swrast_setup/ss_triangle.h
@@ -29,7 +29,7 @@
 #ifndef SS_TRIANGLE_H
 #define SS_TRIANGLE_H
 
-#include "ss_context.h"
+#include "main/mtypes.h"
 
 
 void _swsetup_trifuncs_init( GLcontext *ctx );
diff --git a/mesalib/src/mesa/swrast_setup/ss_vb.h b/mesalib/src/mesa/swrast_setup/ss_vb.h
index 2ad1f56f3..944a3b78d 100644
--- a/mesalib/src/mesa/swrast_setup/ss_vb.h
+++ b/mesalib/src/mesa/swrast_setup/ss_vb.h
@@ -30,7 +30,6 @@
 #define SS_VB_H
 
 #include "main/mtypes.h"
-#include "swrast_setup.h"
 
 void _swsetup_vb_init( GLcontext *ctx );
 void _swsetup_choose_rastersetup_func( GLcontext *ctx );
diff --git a/mesalib/src/mesa/tnl/t_context.h b/mesalib/src/mesa/tnl/t_context.h
index ebaae6335..258906f79 100644
--- a/mesalib/src/mesa/tnl/t_context.h
+++ b/mesalib/src/mesa/tnl/t_context.h
@@ -53,9 +53,7 @@
 #include "main/bitset.h"
 #include "main/mtypes.h"
 
-#include "math/m_matrix.h"
 #include "math/m_vector.h"
-#include "math/m_xform.h"
 
 #include "vbo/vbo.h"
 
diff --git a/mesalib/src/mesa/tnl/t_rasterpos.c b/mesalib/src/mesa/tnl/t_rasterpos.c
index 3596d162b..d82d5b507 100644
--- a/mesalib/src/mesa/tnl/t_rasterpos.c
+++ b/mesalib/src/mesa/tnl/t_rasterpos.c
@@ -25,7 +25,6 @@
 
 #include "main/glheader.h"
 #include "main/colormac.h"
-#include "main/context.h"
 #include "main/feedback.h"
 #include "main/light.h"
 #include "main/macros.h"
diff --git a/mesalib/src/mesa/tnl/t_vb_cull.c b/mesalib/src/mesa/tnl/t_vb_cull.c
index 712901acf..22df71667 100644
--- a/mesalib/src/mesa/tnl/t_vb_cull.c
+++ b/mesalib/src/mesa/tnl/t_vb_cull.c
@@ -28,7 +28,6 @@
 
 #include "main/glheader.h"
 #include "main/colormac.h"
-#include "main/context.h"
 #include "main/macros.h"
 #include "main/imports.h"
 #include "main/mtypes.h"
diff --git a/mesalib/src/mesa/tnl/t_vb_fog.c b/mesalib/src/mesa/tnl/t_vb_fog.c
index 4a0e6ad4f..9faae24ec 100644
--- a/mesalib/src/mesa/tnl/t_vb_fog.c
+++ b/mesalib/src/mesa/tnl/t_vb_fog.c
@@ -28,7 +28,6 @@
 
 #include "main/glheader.h"
 #include "main/colormac.h"
-#include "main/context.h"
 #include "main/macros.h"
 #include "main/imports.h"
 #include "main/mtypes.h"
diff --git a/mesalib/src/mesa/tnl/t_vb_normals.c b/mesalib/src/mesa/tnl/t_vb_normals.c
index 61ac40957..c2aa65567 100644
--- a/mesalib/src/mesa/tnl/t_vb_normals.c
+++ b/mesalib/src/mesa/tnl/t_vb_normals.c
@@ -28,7 +28,6 @@
 
 #include "main/glheader.h"
 #include "main/colormac.h"
-#include "main/context.h"
 #include "main/macros.h"
 #include "main/imports.h"
 #include "main/mtypes.h"
diff --git a/mesalib/src/mesa/tnl/t_vb_program.c b/mesalib/src/mesa/tnl/t_vb_program.c
index 0137e52fc..f3a338ef1 100644
--- a/mesalib/src/mesa/tnl/t_vb_program.c
+++ b/mesalib/src/mesa/tnl/t_vb_program.c
@@ -33,12 +33,12 @@
 
 #include "main/glheader.h"
 #include "main/colormac.h"
-#include "main/context.h"
 #include "main/macros.h"
 #include "main/imports.h"
-#include "shader/prog_instruction.h"
-#include "shader/prog_statevars.h"
-#include "shader/prog_execute.h"
+#include "math/m_xform.h"
+#include "program/prog_instruction.h"
+#include "program/prog_statevars.h"
+#include "program/prog_execute.h"
 #include "swrast/s_context.h"
 
 #include "tnl/tnl.h"
diff --git a/mesalib/src/mesa/tnl/t_vb_render.c b/mesalib/src/mesa/tnl/t_vb_render.c
index c1bebc994..7d991009a 100644
--- a/mesalib/src/mesa/tnl/t_vb_render.c
+++ b/mesalib/src/mesa/tnl/t_vb_render.c
@@ -44,6 +44,7 @@
 #include "main/macros.h"
 #include "main/imports.h"
 #include "main/mtypes.h"
+#include "math/m_xform.h"
 
 #include "t_pipeline.h"
 
diff --git a/mesalib/src/mesa/tnl/t_vb_texgen.c b/mesalib/src/mesa/tnl/t_vb_texgen.c
index 9ef13bc96..950e0f54e 100644
--- a/mesalib/src/mesa/tnl/t_vb_texgen.c
+++ b/mesalib/src/mesa/tnl/t_vb_texgen.c
@@ -37,7 +37,6 @@
 
 #include "main/glheader.h"
 #include "main/colormac.h"
-#include "main/context.h"
 #include "main/macros.h"
 #include "main/imports.h"
 #include "main/mtypes.h"
diff --git a/mesalib/src/mesa/tnl/t_vb_texmat.c b/mesalib/src/mesa/tnl/t_vb_texmat.c
index 83688290e..985d137e5 100644
--- a/mesalib/src/mesa/tnl/t_vb_texmat.c
+++ b/mesalib/src/mesa/tnl/t_vb_texmat.c
@@ -28,7 +28,6 @@
 
 #include "main/glheader.h"
 #include "main/colormac.h"
-#include "main/context.h"
 #include "main/macros.h"
 #include "main/imports.h"
 #include "main/mtypes.h"
diff --git a/mesalib/src/mesa/tnl/t_vb_vertex.c b/mesalib/src/mesa/tnl/t_vb_vertex.c
index a27534256..453479227 100644
--- a/mesalib/src/mesa/tnl/t_vb_vertex.c
+++ b/mesalib/src/mesa/tnl/t_vb_vertex.c
@@ -28,7 +28,6 @@
 
 #include "main/glheader.h"
 #include "main/colormac.h"
-#include "main/context.h"
 #include "main/macros.h"
 #include "main/imports.h"
 #include "main/mtypes.h"
diff --git a/mesalib/src/mesa/vbo/vbo.h b/mesalib/src/mesa/vbo/vbo.h
index b24ecfd7c..07d31f6ce 100644
--- a/mesalib/src/mesa/vbo/vbo.h
+++ b/mesalib/src/mesa/vbo/vbo.h
@@ -45,6 +45,7 @@ struct _mesa_prim {
    GLuint start;
    GLuint count;
    GLint basevertex;
+   GLsizei num_instances;
 };
 
 /* Would like to call this a "vbo_index_buffer", but this would be
@@ -138,6 +139,30 @@ void GLAPIENTRY
 _vbo_Materialfv(GLenum face, GLenum pname, const GLfloat *params);
 
 void GLAPIENTRY
+_vbo_Materialf(GLenum face, GLenum pname, GLfloat param);
+
+void GLAPIENTRY
 _vbo_VertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
 
+void GLAPIENTRY
+_vbo_VertexAttrib1f(GLuint indx, GLfloat x);
+
+void GLAPIENTRY
+_vbo_VertexAttrib1fv(GLuint indx, const GLfloat* values);
+
+void GLAPIENTRY
+_vbo_VertexAttrib2f(GLuint indx, GLfloat x, GLfloat y);
+
+void GLAPIENTRY
+_vbo_VertexAttrib2fv(GLuint indx, const GLfloat* values);
+
+void GLAPIENTRY
+_vbo_VertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z);
+
+void GLAPIENTRY
+_vbo_VertexAttrib3fv(GLuint indx, const GLfloat* values);
+
+void GLAPIENTRY
+_vbo_VertexAttrib4fv(GLuint indx, const GLfloat* values);
+
 #endif
diff --git a/mesalib/src/mesa/vbo/vbo_context.c b/mesalib/src/mesa/vbo/vbo_context.c
index e3be39a34..580850574 100644
--- a/mesalib/src/mesa/vbo/vbo_context.c
+++ b/mesalib/src/mesa/vbo/vbo_context.c
@@ -198,9 +198,8 @@ GLboolean _vbo_CreateContext( GLcontext *ctx )
     * vtxfmt mechanism can be removed now.
     */
    vbo_exec_init( ctx );
-#if FEATURE_dlist
-   vbo_save_init( ctx );
-#endif
+   if (ctx->API == API_OPENGL)
+      vbo_save_init( ctx );
 
    _math_init_eval();
 
@@ -232,9 +231,8 @@ void _vbo_DestroyContext( GLcontext *ctx )
       }
 
       vbo_exec_destroy(ctx);
-#if FEATURE_dlist
-      vbo_save_destroy(ctx);
-#endif
+      if (ctx->API == API_OPENGL)
+         vbo_save_destroy(ctx);
       FREE(vbo);
       ctx->swtnl_im = NULL;
    }
diff --git a/mesalib/src/mesa/vbo/vbo_context.h b/mesalib/src/mesa/vbo/vbo_context.h
index 8b726dc8a..00cfc522a 100644
--- a/mesalib/src/mesa/vbo/vbo_context.h
+++ b/mesalib/src/mesa/vbo/vbo_context.h
@@ -54,9 +54,7 @@
 #include "vbo.h"
 #include "vbo_attrib.h"
 #include "vbo_exec.h"
-#if FEATURE_dlist
 #include "vbo_save.h"
-#endif
 
 
 struct vbo_context {
diff --git a/mesalib/src/mesa/vbo/vbo_exec.c b/mesalib/src/mesa/vbo/vbo_exec.c
index a057befed..046fa8105 100644
--- a/mesalib/src/mesa/vbo/vbo_exec.c
+++ b/mesalib/src/mesa/vbo/vbo_exec.c
@@ -30,9 +30,10 @@
 #include "main/glheader.h"
 #include "main/mtypes.h"
 #include "main/vtxfmt.h"
-
 #include "vbo_context.h"
 
+
+
 void vbo_exec_init( GLcontext *ctx )
 {
    struct vbo_exec_context *exec = &vbo_context(ctx)->exec;
@@ -74,7 +75,9 @@ void vbo_exec_destroy( GLcontext *ctx )
    vbo_exec_array_destroy( exec );
 }
 
-/* Really want to install these callbacks to a central facility to be
+
+/**
+ * Really want to install these callbacks to a central facility to be
  * invoked according to the state flags.  That will have to wait for a
  * mesa rework:
  */ 
@@ -87,8 +90,3 @@ void vbo_exec_invalidate_state( GLcontext *ctx, GLuint new_state )
 
    _ae_invalidate_state(ctx, new_state);
 }
-
-
-
-
-
diff --git a/mesalib/src/mesa/vbo/vbo_exec.h b/mesalib/src/mesa/vbo/vbo_exec.h
index 98c1f363d..33494f0ce 100644
--- a/mesalib/src/mesa/vbo/vbo_exec.h
+++ b/mesalib/src/mesa/vbo/vbo_exec.h
@@ -195,7 +195,4 @@ void vbo_exec_do_EvalCoord2f( struct vbo_exec_context *exec,
 void vbo_exec_do_EvalCoord1f( struct vbo_exec_context *exec,
 				     GLfloat u);
 
-extern GLboolean 
-vbo_validate_shaders(GLcontext *ctx);
-
 #endif
diff --git a/mesalib/src/mesa/vbo/vbo_exec_api.c b/mesalib/src/mesa/vbo/vbo_exec_api.c
index e40f5f9dc..9df75a840 100644
--- a/mesalib/src/mesa/vbo/vbo_exec_api.c
+++ b/mesalib/src/mesa/vbo/vbo_exec_api.c
@@ -531,6 +531,7 @@ static void GLAPIENTRY vbo_exec_Begin( GLenum mode )
       exec->vtx.prim[i].pad = 0;
       exec->vtx.prim[i].start = exec->vtx.vert_count;
       exec->vtx.prim[i].count = 0;
+      exec->vtx.prim[i].num_instances = 1;
 
       ctx->Driver.CurrentExecPrimitive = mode;
    }
@@ -849,8 +850,11 @@ void vbo_exec_vtx_destroy( struct vbo_exec_context *exec )
                                     NULL);
    }
 
-   /* Free the vertex buffer:
+   /* Free the vertex buffer.  Unmap first if needed.
     */
+   if (_mesa_bufferobj_mapped(exec->vtx.bufferobj)) {
+      ctx->Driver.UnmapBuffer(ctx, GL_ARRAY_BUFFER, exec->vtx.bufferobj);
+   }
    _mesa_reference_buffer_object(ctx, &exec->vtx.bufferobj, NULL);
 }
 
@@ -954,6 +958,7 @@ _vbo_MultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q)
    vbo_MultiTexCoord4f(target, s, t, r, q);
 }
 
+
 void GLAPIENTRY
 _vbo_Materialfv(GLenum face, GLenum pname, const GLfloat *params)
 {
@@ -962,7 +967,66 @@ _vbo_Materialfv(GLenum face, GLenum pname, const GLfloat *params)
 
 
 void GLAPIENTRY
+_vbo_Materialf(GLenum face, GLenum pname, GLfloat param)
+{
+   GLfloat p[4];
+   p[0] = param;
+   p[1] = p[2] = p[3] = 0.0F;
+   vbo_Materialfv(face, pname, p);
+}
+
+
+void GLAPIENTRY
 _vbo_VertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
    vbo_VertexAttrib4fARB(index, x, y, z, w);
 }
+
+
+void GLAPIENTRY
+_vbo_VertexAttrib1f(GLuint indx, GLfloat x)
+{
+   vbo_VertexAttrib1fARB(indx, x);
+}
+
+
+void GLAPIENTRY
+_vbo_VertexAttrib1fv(GLuint indx, const GLfloat* values)
+{
+   vbo_VertexAttrib1fvARB(indx, values);
+}
+
+
+void GLAPIENTRY
+_vbo_VertexAttrib2f(GLuint indx, GLfloat x, GLfloat y)
+{
+   vbo_VertexAttrib2fARB(indx, x, y);
+}
+
+
+void GLAPIENTRY
+_vbo_VertexAttrib2fv(GLuint indx, const GLfloat* values)
+{
+   vbo_VertexAttrib2fvARB(indx, values);
+}
+
+
+void GLAPIENTRY
+_vbo_VertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z)
+{
+   vbo_VertexAttrib3fARB(indx, x, y, z);
+}
+
+
+void GLAPIENTRY
+_vbo_VertexAttrib3fv(GLuint indx, const GLfloat* values)
+{
+   vbo_VertexAttrib3fvARB(indx, values);
+}
+
+
+void GLAPIENTRY
+_vbo_VertexAttrib4fv(GLuint indx, const GLfloat* values)
+{
+   vbo_VertexAttrib4fvARB(indx, values);
+}
diff --git a/mesalib/src/mesa/vbo/vbo_exec_array.c b/mesalib/src/mesa/vbo/vbo_exec_array.c
index 90474da7c..1759e5788 100644
--- a/mesalib/src/mesa/vbo/vbo_exec_array.c
+++ b/mesalib/src/mesa/vbo/vbo_exec_array.c
@@ -30,7 +30,6 @@
 #include "main/context.h"
 #include "main/state.h"
 #include "main/api_validate.h"
-#include "main/api_noop.h"
 #include "main/varray.h"
 #include "main/bufferobj.h"
 #include "main/enums.h"
@@ -40,7 +39,8 @@
 
 
 /**
- * Compute min and max elements for glDraw[Range]Elements() calls.
+ * Compute min and max elements by scanning the index buffer for
+ * glDraw[Range]Elements() calls.
  */
 void
 vbo_get_minmax_index(GLcontext *ctx,
@@ -112,6 +112,7 @@ vbo_get_minmax_index(GLcontext *ctx,
 /**
  * Check that element 'j' of the array has reasonable data.
  * Map VBO if needed.
+ * For debugging purposes; not normally used.
  */
 static void
 check_array_data(GLcontext *ctx, struct gl_client_array *array,
@@ -172,6 +173,7 @@ unmap_array_buffer(GLcontext *ctx, struct gl_client_array *array)
 
 /**
  * Examine the array's data for NaNs, etc.
+ * For debug purposes; not normally used.
  */
 static void
 check_draw_elements_data(GLcontext *ctx, GLsizei count, GLenum elemType,
@@ -249,7 +251,7 @@ check_draw_arrays_data(GLcontext *ctx, GLint start, GLsizei count)
 
 
 /**
- * Print info/data for glDrawArrays().
+ * Print info/data for glDrawArrays(), for debugging.
  */
 static void
 print_draw_arrays(GLcontext *ctx, struct vbo_exec_context *exec,
@@ -295,6 +297,9 @@ print_draw_arrays(GLcontext *ctx, struct vbo_exec_context *exec,
 
 
 /**
+ * Bind the VBO executor to the current vertex array object prior
+ * to drawing.
+ *
  * Just translate the arrayobj into a sane layout.
  */
 static void
@@ -334,6 +339,14 @@ bind_array_obj(GLcontext *ctx)
 }
 
 
+/**
+ * Set the vbo->exec->inputs[] pointers to point to the enabled
+ * vertex arrays.  This depends on the current vertex program/shader
+ * being executed because of whether or not generic vertex arrays
+ * alias the conventional vertex arrays.
+ * For arrays that aren't enabled, we set the input[attrib] pointer
+ * to point at a zero-stride current value "array".
+ */
 static void
 recalculate_input_bindings(GLcontext *ctx)
 {
@@ -453,27 +466,15 @@ recalculate_input_bindings(GLcontext *ctx)
 static void
 bind_arrays(GLcontext *ctx)
 {
-#if 0
-   if (ctx->Array.ArrayObj.Name != exec->array.array_obj) {
-      bind_array_obj(ctx);
-      recalculate_input_bindings(ctx);
-   }
-   else if (exec->array.program_mode != get_program_mode(ctx) ||
-	    exec->array.enabled_flags != ctx->Array.ArrayObj->_Enabled) {
-      recalculate_input_bindings(ctx);
-   }
-#else
    bind_array_obj(ctx);
    recalculate_input_bindings(ctx);
-#endif
 }
 
 
 
-/***********************************************************************
- * API functions.
+/**
+ * Called from glDrawArrays when in immediate mode (not display list mode).
  */
-
 static void GLAPIENTRY
 vbo_exec_DrawArrays(GLenum mode, GLint start, GLsizei count)
 {
@@ -520,6 +521,7 @@ vbo_exec_DrawArrays(GLenum mode, GLint start, GLsizei count)
    prim[0].count = count;
    prim[0].indexed = 0;
    prim[0].basevertex = 0;
+   prim[0].num_instances = 1;
 
    vbo->draw_prims( ctx, exec->array.inputs, prim, 1, NULL,
                     GL_TRUE, start, start + count - 1 );
@@ -533,7 +535,68 @@ vbo_exec_DrawArrays(GLenum mode, GLint start, GLsizei count)
 
 
 /**
+ * Called from glDrawArraysInstanced when in immediate mode (not
+ * display list mode).
+ */
+static void GLAPIENTRY
+vbo_exec_DrawArraysInstanced(GLenum mode, GLint start, GLsizei count,
+                             GLsizei primcount)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct vbo_context *vbo = vbo_context(ctx);
+   struct vbo_exec_context *exec = &vbo->exec;
+   struct _mesa_prim prim[1];
+
+   if (MESA_VERBOSE & VERBOSE_DRAW)
+      _mesa_debug(ctx, "glDrawArraysInstanced(%s, %d, %d, %d)\n",
+                  _mesa_lookup_enum_by_nr(mode), start, count, primcount);
+
+   if (!_mesa_validate_DrawArraysInstanced(ctx, mode, start, count, primcount))
+      return;
+
+   FLUSH_CURRENT( ctx, 0 );
+
+   if (!_mesa_valid_to_render(ctx, "glDrawArraysInstanced")) {
+      return;
+   }
+
+#if 0 /* debug */
+   check_draw_arrays_data(ctx, start, count);
+#endif
+
+   bind_arrays( ctx );
+
+   /* Again... because we may have changed the bitmask of per-vertex varying
+    * attributes.  If we regenerate the fixed-function vertex program now
+    * we may be able to prune down the number of vertex attributes which we
+    * need in the shader.
+    */
+   if (ctx->NewState)
+      _mesa_update_state( ctx );
+
+   prim[0].begin = 1;
+   prim[0].end = 1;
+   prim[0].weak = 0;
+   prim[0].pad = 0;
+   prim[0].mode = mode;
+   prim[0].start = start;
+   prim[0].count = count;
+   prim[0].indexed = 0;
+   prim[0].basevertex = 0;
+   prim[0].num_instances = primcount;
+
+   vbo->draw_prims( ctx, exec->array.inputs, prim, 1, NULL,
+                    GL_TRUE, start, start + count - 1 );
+
+#if 0 /* debug */
+   print_draw_arrays(ctx, exec, mode, start, count);
+#endif
+}
+
+
+/**
  * Map GL_ELEMENT_ARRAY_BUFFER and print contents.
+ * For debugging.
  */
 static void
 dump_element_buffer(GLcontext *ctx, GLenum type)
@@ -588,14 +651,18 @@ dump_element_buffer(GLcontext *ctx, GLenum type)
 }
 
 
-/* Inner support for both _mesa_DrawElements and _mesa_DrawRangeElements */
+/**
+ * Inner support for both _mesa_DrawElements and _mesa_DrawRangeElements.
+ * Do the rendering for a glDrawElements or glDrawRangeElements call after
+ * we've validated buffer bounds, etc.
+ */
 static void
 vbo_validated_drawrangeelements(GLcontext *ctx, GLenum mode,
 				GLboolean index_bounds_valid,
 				GLuint start, GLuint end,
 				GLsizei count, GLenum type,
 				const GLvoid *indices,
-				GLint basevertex)
+				GLint basevertex, GLint primcount)
 {
    struct vbo_context *vbo = vbo_context(ctx);
    struct vbo_exec_context *exec = &vbo->exec;
@@ -628,6 +695,7 @@ vbo_validated_drawrangeelements(GLcontext *ctx, GLenum mode,
    prim[0].count = count;
    prim[0].indexed = 1;
    prim[0].basevertex = basevertex;
+   prim[0].num_instances = primcount;
 
    /* Need to give special consideration to rendering a range of
     * indices starting somewhere above zero.  Typically the
@@ -664,6 +732,10 @@ vbo_validated_drawrangeelements(GLcontext *ctx, GLenum mode,
 		    index_bounds_valid, start, end );
 }
 
+
+/**
+ * Called by glDrawRangeElementsBaseVertex() in immediate mode.
+ */
 static void GLAPIENTRY
 vbo_exec_DrawRangeElementsBaseVertex(GLenum mode,
 				     GLuint start, GLuint end,
@@ -713,7 +785,7 @@ vbo_exec_DrawRangeElementsBaseVertex(GLenum mode,
                        start, end, count, type, indices,
                        ctx->Array.ArrayObj->_MaxElement - 1,
                        ctx->Array.ElementArrayBufferObj->Name,
-                       ctx->Array.ElementArrayBufferObj->Size);
+                       (int) ctx->Array.ElementArrayBufferObj->Size);
       }
 
       if (0)
@@ -739,7 +811,7 @@ vbo_exec_DrawRangeElementsBaseVertex(GLenum mode,
                              start, end, count, type, indices, max,
                              ctx->Array.ArrayObj->_MaxElement - 1,
                              ctx->Array.ElementArrayBufferObj->Name,
-                             ctx->Array.ElementArrayBufferObj->Size);
+                             (int) ctx->Array.ElementArrayBufferObj->Size);
             }
          }
          /* XXX we could also find the min index and compare to 'start'
@@ -769,10 +841,13 @@ vbo_exec_DrawRangeElementsBaseVertex(GLenum mode,
 #endif
 
    vbo_validated_drawrangeelements(ctx, mode, GL_TRUE, start, end,
-				   count, type, indices, basevertex);
+				   count, type, indices, basevertex, 1);
 }
 
 
+/**
+ * Called by glDrawRangeElements() in immediate mode.
+ */
 static void GLAPIENTRY
 vbo_exec_DrawRangeElements(GLenum mode, GLuint start, GLuint end,
                            GLsizei count, GLenum type, const GLvoid *indices)
@@ -790,6 +865,9 @@ vbo_exec_DrawRangeElements(GLenum mode, GLuint start, GLuint end,
 }
 
 
+/**
+ * Called by glDrawElements() in immediate mode.
+ */
 static void GLAPIENTRY
 vbo_exec_DrawElements(GLenum mode, GLsizei count, GLenum type,
                       const GLvoid *indices)
@@ -805,10 +883,13 @@ vbo_exec_DrawElements(GLenum mode, GLsizei count, GLenum type,
       return;
 
    vbo_validated_drawrangeelements(ctx, mode, GL_FALSE, ~0, ~0,
-				   count, type, indices, 0);
+				   count, type, indices, 0, 1);
 }
 
 
+/**
+ * Called by glDrawElementsBaseVertex() in immediate mode.
+ */
 static void GLAPIENTRY
 vbo_exec_DrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type,
 				const GLvoid *indices, GLint basevertex)
@@ -825,11 +906,38 @@ vbo_exec_DrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type,
       return;
 
    vbo_validated_drawrangeelements(ctx, mode, GL_FALSE, ~0, ~0,
-				   count, type, indices, basevertex);
+				   count, type, indices, basevertex, 1);
+}
+
+
+/**
+ * Called by glDrawElementsInstanced() in immediate mode.
+ */
+static void GLAPIENTRY
+vbo_exec_DrawElementsInstanced(GLenum mode, GLsizei count, GLenum type,
+                               const GLvoid *indices, GLsizei primcount)
+{
+   GET_CURRENT_CONTEXT(ctx);
+
+   if (MESA_VERBOSE & VERBOSE_DRAW)
+      _mesa_debug(ctx, "glDrawElementsInstanced(%s, %d, %s, %p, %d)\n",
+                  _mesa_lookup_enum_by_nr(mode), count,
+                  _mesa_lookup_enum_by_nr(type), indices, primcount);
+
+   if (!_mesa_validate_DrawElementsInstanced(ctx, mode, count, type, indices,
+                                             primcount))
+      return;
+
+   vbo_validated_drawrangeelements(ctx, mode, GL_FALSE, ~0, ~0,
+				   count, type, indices, 0, primcount);
 }
 
 
-/** Inner support for both _mesa_DrawElements and _mesa_DrawRangeElements */
+/**
+ * Inner support for both _mesa_MultiDrawElements() and
+ * _mesa_MultiDrawRangeElements().
+ * This does the actual rendering after we've checked array indexes, etc.
+ */
 static void
 vbo_validated_multidrawelements(GLcontext *ctx, GLenum mode,
 				const GLsizei *count, GLenum type,
@@ -861,7 +969,8 @@ vbo_validated_multidrawelements(GLcontext *ctx, GLenum mode,
    }
 
    /* Decide if we can do this all as one set of primitives sharing the
-    * same index buffer, or if we have to reset the index pointer per primitive.
+    * same index buffer, or if we have to reset the index pointer per
+    * primitive.
     */
    bind_arrays( ctx );
 
@@ -926,6 +1035,7 @@ vbo_validated_multidrawelements(GLcontext *ctx, GLenum mode,
 	 prim[i].start = ((uintptr_t)indices[i] - min_index_ptr) / index_type_size;
 	 prim[i].count = count[i];
 	 prim[i].indexed = 1;
+         prim[i].num_instances = 1;
 	 if (basevertex != NULL)
 	    prim[i].basevertex = basevertex[i];
 	 else
@@ -950,6 +1060,7 @@ vbo_validated_multidrawelements(GLcontext *ctx, GLenum mode,
 	 prim[0].start = 0;
 	 prim[0].count = count[i];
 	 prim[0].indexed = 1;
+         prim[0].num_instances = 1;
 	 if (basevertex != NULL)
 	    prim[0].basevertex = basevertex[i];
 	 else
@@ -1009,14 +1120,13 @@ vbo_exec_MultiDrawElementsBaseVertex(GLenum mode,
 }
 
 
-/***********************************************************************
- * Initialization
+/**
+ * Plug in the immediate-mode vertex array drawing commands into the
+ * givven vbo_exec_context object.
  */
-
 void
 vbo_exec_array_init( struct vbo_exec_context *exec )
 {
-#if 1
    exec->vtxfmt.DrawArrays = vbo_exec_DrawArrays;
    exec->vtxfmt.DrawElements = vbo_exec_DrawElements;
    exec->vtxfmt.DrawRangeElements = vbo_exec_DrawRangeElements;
@@ -1024,15 +1134,8 @@ vbo_exec_array_init( struct vbo_exec_context *exec )
    exec->vtxfmt.DrawElementsBaseVertex = vbo_exec_DrawElementsBaseVertex;
    exec->vtxfmt.DrawRangeElementsBaseVertex = vbo_exec_DrawRangeElementsBaseVertex;
    exec->vtxfmt.MultiDrawElementsBaseVertex = vbo_exec_MultiDrawElementsBaseVertex;
-#else
-   exec->vtxfmt.DrawArrays = _mesa_noop_DrawArrays;
-   exec->vtxfmt.DrawElements = _mesa_noop_DrawElements;
-   exec->vtxfmt.DrawRangeElements = _mesa_noop_DrawRangeElements;
-   exec->vtxfmt.MultiDrawElementsEXT = _mesa_noop_MultiDrawElements;
-   exec->vtxfmt.DrawElementsBaseVertex = _mesa_noop_DrawElementsBaseVertex;
-   exec->vtxfmt.DrawRangeElementsBaseVertex = _mesa_noop_DrawRangeElementsBaseVertex;
-   exec->vtxfmt.MultiDrawElementsBaseVertex = _mesa_noop_MultiDrawElementsBaseVertex;
-#endif
+   exec->vtxfmt.DrawArraysInstanced = vbo_exec_DrawArraysInstanced;
+   exec->vtxfmt.DrawElementsInstanced = vbo_exec_DrawElementsInstanced;
 }
 
 
@@ -1043,7 +1146,13 @@ vbo_exec_array_destroy( struct vbo_exec_context *exec )
 }
 
 
-/* This API entrypoint is not ordinarily used */
+
+/**
+ * The following functions are only used for OpenGL ES 1/2 support.
+ * And some aren't even supported (yet) in ES 1/2.
+ */
+
+
 void GLAPIENTRY
 _mesa_DrawArrays(GLenum mode, GLint first, GLsizei count)
 {
@@ -1051,7 +1160,6 @@ _mesa_DrawArrays(GLenum mode, GLint first, GLsizei count)
 }
 
 
-/* This API entrypoint is not ordinarily used */
 void GLAPIENTRY
 _mesa_DrawElements(GLenum mode, GLsizei count, GLenum type,
                    const GLvoid *indices)
@@ -1059,6 +1167,7 @@ _mesa_DrawElements(GLenum mode, GLsizei count, GLenum type,
    vbo_exec_DrawElements(mode, count, type, indices);
 }
 
+
 void GLAPIENTRY
 _mesa_DrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type,
 			     const GLvoid *indices, GLint basevertex)
@@ -1067,7 +1176,6 @@ _mesa_DrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type,
 }
 
 
-/* This API entrypoint is not ordinarily used */
 void GLAPIENTRY
 _mesa_DrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count,
                         GLenum type, const GLvoid *indices)
@@ -1086,7 +1194,6 @@ _mesa_DrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end,
 }
 
 
-/* GL_EXT_multi_draw_arrays */
 void GLAPIENTRY
 _mesa_MultiDrawElementsEXT(GLenum mode, const GLsizei *count, GLenum type,
 			   const GLvoid **indices, GLsizei primcount)
diff --git a/mesalib/src/mesa/vbo/vbo_exec_draw.c b/mesalib/src/mesa/vbo/vbo_exec_draw.c
index 045af46da..84ae1b87f 100644
--- a/mesalib/src/mesa/vbo/vbo_exec_draw.c
+++ b/mesalib/src/mesa/vbo/vbo_exec_draw.c
@@ -27,7 +27,7 @@
 
 #include "main/glheader.h"
 #include "main/bufferobj.h"
-#include "main/context.h"
+#include "main/compiler.h"
 #include "main/enums.h"
 #include "main/state.h"
 
diff --git a/mesalib/src/mesa/vbo/vbo_save.c b/mesalib/src/mesa/vbo/vbo_save.c
index fd9a13027..dd5570689 100644
--- a/mesalib/src/mesa/vbo/vbo_save.c
+++ b/mesalib/src/mesa/vbo/vbo_save.c
@@ -33,6 +33,8 @@
 #include "vbo_context.h"
 
 
+#if FEATURE_dlist
+
 
 static void vbo_save_callback_init( GLcontext *ctx )
 {
@@ -117,3 +119,4 @@ void vbo_save_fallback( GLcontext *ctx, GLboolean fallback )
 }
 
 
+#endif /* FEATURE_dlist */
diff --git a/mesalib/src/mesa/vbo/vbo_save.h b/mesalib/src/mesa/vbo/vbo_save.h
index 86bbd24f7..82ba6c8af 100644
--- a/mesalib/src/mesa/vbo/vbo_save.h
+++ b/mesalib/src/mesa/vbo/vbo_save.h
@@ -153,6 +153,7 @@ struct vbo_save_context {
    GLubyte *currentsz[VBO_ATTRIB_MAX];
 };
 
+#if FEATURE_dlist
 
 void vbo_save_init( GLcontext *ctx );
 void vbo_save_destroy( GLcontext *ctx );
@@ -181,4 +182,18 @@ void vbo_save_playback_vertex_list( GLcontext *ctx, void *data );
 
 void vbo_save_api_init( struct vbo_save_context *save );
 
-#endif
+#else /* FEATURE_dlist */
+
+static INLINE void
+vbo_save_init( GLcontext *ctx )
+{
+}
+
+static INLINE void
+vbo_save_destroy( GLcontext *ctx )
+{
+}
+
+#endif /* FEATURE_dlist */
+
+#endif /* VBO_SAVE_H */
diff --git a/mesalib/src/mesa/vbo/vbo_save_api.c b/mesalib/src/mesa/vbo/vbo_save_api.c
index a5d027982..c3727cb52 100644
--- a/mesalib/src/mesa/vbo/vbo_save_api.c
+++ b/mesalib/src/mesa/vbo/vbo_save_api.c
@@ -83,6 +83,9 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "vbo_context.h"
 
 
+#if FEATURE_dlist
+
+
 #ifdef ERROR
 #undef ERROR
 #endif
@@ -418,6 +421,7 @@ static void _save_wrap_buffers( GLcontext *ctx )
    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;
 }
 
@@ -773,6 +777,7 @@ GLboolean vbo_save_NotifyBegin( GLcontext *ctx, GLenum mode )
    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;
@@ -1261,3 +1266,5 @@ void vbo_save_api_init( struct vbo_save_context *save )
    _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );
 }
 
+
+#endif /* FEATURE_dlist */
diff --git a/mesalib/src/mesa/vbo/vbo_save_draw.c b/mesalib/src/mesa/vbo/vbo_save_draw.c
index a7cf29acd..297fd8705 100644
--- a/mesalib/src/mesa/vbo/vbo_save_draw.c
+++ b/mesalib/src/mesa/vbo/vbo_save_draw.c
@@ -38,12 +38,16 @@
 #include "vbo_context.h"
 
 
-/*
+#if FEATURE_dlist
+
+
+/**
  * After playback, copy everything but the position from the
  * last vertex to the saved state
  */
-static void _playback_copy_to_current( GLcontext *ctx,
-				       const struct vbo_save_vertex_list *node )
+static void
+_playback_copy_to_current(GLcontext *ctx,
+                          const struct vbo_save_vertex_list *node)
 {
    struct vbo_context *vbo = vbo_context(ctx);
    GLfloat vertex[VBO_ATTRIB_MAX * 4];
@@ -81,8 +85,7 @@ static void _playback_copy_to_current( GLcontext *ctx,
                        node->attrsz[i], 
                        data);
          
-         if (memcmp(current, tmp, 4 * sizeof(GLfloat)) != 0)
-         {
+         if (memcmp(current, tmp, 4 * sizeof(GLfloat)) != 0) {
             memcpy(current, tmp, 4 * sizeof(GLfloat));
 
             vbo->currval[i].Size = node->attrsz[i];
@@ -117,11 +120,12 @@ static void _playback_copy_to_current( GLcontext *ctx,
 
 
 
-/* Treat the vertex storage as a VBO, define vertex arrays pointing
+/**
+ * Treat the vertex storage as a VBO, define vertex arrays pointing
  * into it:
  */
-static void vbo_bind_vertex_list( GLcontext *ctx,
-                                   const struct vbo_save_vertex_list *node )
+static void vbo_bind_vertex_list(GLcontext *ctx,
+                                 const struct vbo_save_vertex_list *node)
 {
    struct vbo_context *vbo = vbo_context(ctx);
    struct vbo_save_context *save = &vbo->save;
@@ -175,7 +179,7 @@ static void vbo_bind_vertex_list( GLcontext *ctx,
    }
 
    for (attr = 0; attr < VERT_ATTRIB_MAX; attr++) {
-      GLuint src = map[attr];
+      const GLuint src = map[attr];
 
       if (node_attrsz[src]) {
          /* override the default array set above */
@@ -203,21 +207,23 @@ static void vbo_bind_vertex_list( GLcontext *ctx,
    _mesa_set_varying_vp_inputs( ctx, varying_inputs );
 }
 
-static void vbo_save_loopback_vertex_list( GLcontext *ctx,
-					   const struct vbo_save_vertex_list *list )
+
+static void
+vbo_save_loopback_vertex_list(GLcontext *ctx,
+                              const struct vbo_save_vertex_list *list)
 {
    const char *buffer = ctx->Driver.MapBuffer(ctx, 
 					      GL_ARRAY_BUFFER_ARB, 
 					      GL_READ_ONLY, /* ? */
-					       list->vertex_store->bufferobj);
+                                              list->vertex_store->bufferobj);
 
-   vbo_loopback_vertex_list( ctx,
-			     (const GLfloat *)(buffer + list->buffer_offset),
-			     list->attrsz,
-			     list->prim,
-			     list->prim_count,
-			     list->wrap_count,
-			     list->vertex_size);
+   vbo_loopback_vertex_list(ctx,
+                            (const GLfloat *)(buffer + list->buffer_offset),
+                            list->attrsz,
+                            list->prim,
+                            list->prim_count,
+                            list->wrap_count,
+                            list->vertex_size);
 
    ctx->Driver.UnmapBuffer(ctx, GL_ARRAY_BUFFER_ARB, 
 			   list->vertex_store->bufferobj);
@@ -226,10 +232,14 @@ static void vbo_save_loopback_vertex_list( GLcontext *ctx,
 
 /**
  * Execute the buffer and save copied verts.
+ * This is called from the display list code when executing
+ * a drawing command.
  */
-void vbo_save_playback_vertex_list( GLcontext *ctx, void *data )
+void
+vbo_save_playback_vertex_list(GLcontext *ctx, void *data)
 {
-   const struct vbo_save_vertex_list *node = (const struct vbo_save_vertex_list *) data;
+   const struct vbo_save_vertex_list *node =
+      (const struct vbo_save_vertex_list *) data;
    struct vbo_save_context *save = &vbo_context(ctx)->save;
 
    FLUSH_CURRENT(ctx, 0);
@@ -274,17 +284,20 @@ void vbo_save_playback_vertex_list( GLcontext *ctx, void *data )
       if (ctx->NewState)
 	 _mesa_update_state( ctx );
 
-      vbo_context(ctx)->draw_prims( ctx, 
-				    save->inputs, 
-				    node->prim, 
-				    node->prim_count,
-				    NULL,
-				    GL_TRUE,
-				    0,	/* Node is a VBO, so this is ok */
-				    node->count - 1);
+      vbo_context(ctx)->draw_prims(ctx, 
+                                   save->inputs, 
+                                   node->prim, 
+                                   node->prim_count,
+                                   NULL,
+                                   GL_TRUE,
+                                   0,	/* Node is a VBO, so this is ok */
+                                   node->count - 1);
    }
 
    /* Copy to current?
     */
    _playback_copy_to_current( ctx, node );
 }
+
+
+#endif /* FEATURE_dlist */
diff --git a/mesalib/src/mesa/vbo/vbo_save_loopback.c b/mesalib/src/mesa/vbo/vbo_save_loopback.c
index 3f581ea02..5d1c7e481 100644
--- a/mesalib/src/mesa/vbo/vbo_save_loopback.c
+++ b/mesalib/src/mesa/vbo/vbo_save_loopback.c
@@ -36,6 +36,8 @@
 #include "vbo_context.h"
 
 
+#if FEATURE_dlist
+
 
 typedef void (*attr_func)( GLcontext *ctx, GLint target, const GLfloat * );
 
@@ -188,3 +190,6 @@ void vbo_loopback_vertex_list( GLcontext *ctx,
       }
    }
 }
+
+
+#endif /* FEATURE_dlist */