Apitrace updates, DSA fixes, NV_bindless_texture, NV_draw_texture, AMD_sparse_texture.

Regal gl.py fixups. Initial build target support for wrangler-mode Regal. GLEW refresh.
2013-11-22 15:02:03 -06:00 · 2013-11-22 15:02:03 -06:00 · ce35076e59
commit ce35076e59
parent a985d61e42
62 changed files with 2386 additions and 924 deletions
--- a/2
+++ b/2
@ -24,7 +24,9 @@ include Makefile.zlib
 include Makefile.libpng
 include Makefile.snappy
 include Makefile.apitrace
+# include Makefile.glslopt
 include Makefile.regal
+include Makefile.regalw
 include Makefile.glu
 include Makefile.glut
 include Makefile.glew
--- a/Makefile.glslopt
+++ b/Makefile.glslopt
@ -0,0 +1,77 @@
+#
+# Makefile for the GLSL Optimizer component of the Regal runtime.
+# The GLSL Optimizer is always build into Regal, but you can build
+# just this target static library with:
+# make -f Makefile.glslopt
+#
+
+ifndef MAKEFILE_GLSLOPT_INCLUDED
+MAKEFILE_GLSLOPT_INCLUDED := 1
+
+.PHONY: glslopt.lib glslopt.clean
+
+include build/common.inc
+include build/glslopt.inc
+
+ifdef GLSLOPT.STATIC
+
+all:: glslopt.lib
+
+clean:: glslopt.clean
+
+GLSLOPT.SRCS       := $(GLSLOPT.CXX)
+GLSLOPT.SRCS       := $(filter %.c,$(GLSLOPT.SRCS)) $(filter %.cc,$(GLSLOPT.SRCS)) $(filter %.cpp,$(GLSLOPT.SRCS))
+GLSLOPT.SRCS.NAMES := $(notdir $(GLSLOPT.SRCS))
+GLSLOPT.OBJS       := $(addprefix tmp/$(SYSTEM)/glslopt/static/,$(GLSLOPT.SRCS.NAMES))
+GLSLOPT.OBJS       := $(GLSLOPT.OBJS:.c=.o) $(GLSLOPT.OBJS:.cpp=.o)
+GLSLOPT.OBJS       := $(filter %.o,$(GLSLOPT.OBJS))
+GLSLOPT.DEPS       := $(GLSLOPT.OBJS:.o=.d)
+GLSLOPT.CFLAGS     := $(GLSLOPT.INCLUDE)
+# quiet build for this thirdparty code for now
+GLSLOPT.CFLAGS     += -Wno-ignored-qualifiers -Wno-sign-compare -Wno-unneeded-internal-declaration -Wno-overloaded-virtual -Wno-unused-private-field
+
+ifeq ($(MODE),release)
+GLSLOPT.CFLAGS  += -DNDEBUG
+GLSLOPT.CFLAGS  += -DREGAL_NO_ASSERT=1
+endif
+
+-include $(GLSLOPT.DEPS) #seth: do I need ot set this?
+
+glslopt.lib: lib/$(SYSTEM)/$(GLSLOPT.STATIC)
+
+glslopt.clean:
+	$(RM) -r tmp/$(SYSTEM)/glslopt/static
+	$(RM) -r lib/$(SYSTEM)/$(GLSLOPT.STATIC)
+
+tmp/$(SYSTEM)/glslopt/static/%.o: src/glsl/src/mesa/main/%.c
+	@mkdir -p $(dir $@)
+	$(LOG_CC)$(CCACHE) $(CC) $(CFLAGS) $(GLSLOPT.CFLAGS) $(PICFLAG) -o $@ -c $<
+
+tmp/$(SYSTEM)/glslopt/static/%.o: src/glsl/src/mesa/program/%.c
+	@mkdir -p $(dir $@)
+	$(LOG_CC)$(CCACHE) $(CC) $(CFLAGS) $(GLSLOPT.CFLAGS) $(PICFLAG) -o $@ -c $<
+
+tmp/$(SYSTEM)/glslopt/static/%.o: src/glsl/src/glsl/glcpp/%.c
+	@mkdir -p $(dir $@)
+	$(LOG_CC)$(CCACHE) $(CC) $(CFLAGS) $(GLSLOPT.CFLAGS) $(PICFLAG) -o $@ -c $<
+
+tmp/$(SYSTEM)/glslopt/static/%.o: src/glsl/src/glsl/%.c
+	@mkdir -p $(dir $@)
+	$(LOG_CC)$(CCACHE) $(CC) $(CFLAGS) $(GLSLOPT.CFLAGS) $(PICFLAG) -o $@ -c $<
+
+tmp/$(SYSTEM)/glslopt/static/%.o: src/glsl/src/glsl/%.cpp
+	@mkdir -p $(dir $@)
+	$(LOG_CXX)$(CCACHE) $(CXX) $(CFLAGS) $(GLSLOPT.CFLAGS) $(PICFLAG) -o $@ -c $<
+
+lib/$(SYSTEM)/$(GLSLOPT.STATIC): $(GLSLOPT.OBJS)
+	@mkdir -p $(dir $@)
+	$(LOG_AR)$(CCACHE) $(AR) cr $@ $(GLSLOPT.OBJS)
+ifneq ($(RANLIB),)
+	$(LOG_RANLIB)$(RANLIB) $@
+endif
+ifneq ($(STRIP),)
+	$(LOG_STRIP)$(STRIP) -x $@
+endif
+
+endif
+endif
--- a/Makefile.regal
+++ b/Makefile.regal
@ -195,7 +195,7 @@ ifneq ($(filter linux%,$(SYSTEM)),)
 REGAL.SONAME     := lib$(NAME).so.$(SO_MAJOR)
 REGAL.DEVLNK     := lib$(NAME).so
 REGAL.SHARED     := lib$(NAME).so.$(SO_VERSION)
-LDFLAGS.SO   := $(LDFLAGS.DYNAMIC) -Wl,-soname=$(REGAL.SONAME)
+REGAL.LDFLAGS.SO := $(LDFLAGS.SO) $(LDFLAGS.DYNAMIC) -Wl,-soname=$(REGAL.SONAME)
 endif

 ifneq ($(filter darwin%,$(SYSTEM)),)
@ -203,7 +203,7 @@ REGAL.SONAME    := lib$(NAME).$(SO_MAJOR).dylib
 REGAL.DEVLNK     := lib$(NAME).dylib
 REGAL.SHARED     := lib$(NAME).$(SO_VERSION).dylib
 REGAL.FRAMEWORK  := $(NAME)
-LDFLAGS.SO      := $(LDFLAGS.DYNAMIC) -current_version $(SO_VERSION) -compatibility_version $(SO_MAJOR)
+REGAL.LDFLAGS.SO := $(LDFLAGS.SO) $(LDFLAGS.DYNAMIC) -current_version $(SO_VERSION) -compatibility_version $(SO_MAJOR)
 #LDFLAGS.SO     += -install_name $(REGAL_DEST)/lib/$(REGAL.SHARED)
 REGAL.LDFLAGS    += -Wl,-reexport-lGLU -L/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries
 endif
@ -256,9 +256,9 @@ endif
 ifdef REGAL.SHARED
 lib/$(SYSTEM)/$(REGAL.SHARED): $(REGAL.SHARED.DEPEND) $(REGAL.SOBJS)
 ifdef APITRACE.STATIC
-	$(LOG_LD)$(CCACHE) $(LD) $(LDFLAGS.EXTRA) $(LDFLAGS.SO) -o $@ $(LDFLAGS.STARTGROUP) $(REGAL.SOBJS) lib/$(SYSTEM)/$(APITRACE.STATIC) $(LDFLAGS.ENDGROUP) $(REGAL.SHARED.DEPEND) $(REGAL.LIBS) $(REGAL.LDFLAGS)
+	$(LOG_LD)$(CCACHE) $(LD) $(LDFLAGS.EXTRA) $(REGAL.LDFLAGS.SO) -o $@ $(LDFLAGS.STARTGROUP) $(REGAL.SOBJS) lib/$(SYSTEM)/$(APITRACE.STATIC) $(LDFLAGS.ENDGROUP) $(REGAL.SHARED.DEPEND) $(REGAL.LIBS) $(REGAL.LDFLAGS)
 else
-	$(LOG_LD)$(CCACHE) $(LD) $(LDFLAGS.EXTRA) $(LDFLAGS.SO) -o $@ $(REGAL.SOBJS) $(REGAL.SHARED.DEPEND) $(REGAL.LIBS) $(REGAL.LDFLAGS)
+	$(LOG_LD)$(CCACHE) $(LD) $(LDFLAGS.EXTRA) $(REGAL.LDFLAGS.SO) -o $@ $(REGAL.SOBJS) $(REGAL.SHARED.DEPEND) $(REGAL.LIBS) $(REGAL.LDFLAGS)
 endif
 ifneq ($(LN),)
 	$(LN) $(REGAL.SHARED) lib/$(SYSTEM)/$(REGAL.SONAME)
--- a/Makefile.regalw
+++ b/Makefile.regalw
@ -0,0 +1,167 @@
+ifndef MAKEFILE_REGALW_INCLUDED
+MAKEFILE_REGALW_INCLUDED := 1
+
+.PHONY: regalw.lib regalw.clean
+
+include build/common.inc
+
+include build/regal.inc
+
+#
+# Regal Wrangler
+#
+
+REGALW.STATIC    ?= libRegalW.a
+REGALW.SHARED    ?= libRegal.so
+
+# Static library target not yet supported
+
+REGALW.STATIC :=
+
+# Shared library target not currently supported for NaCL or emscripten
+
+ifneq ($(filter nacl% emscripten%,$(SYSTEM)),)
+REGALW.SHARED :=
+endif
+
+
+ifdef REGALW.SHARED
+
+all:: regalw.lib
+
+clean:: regalw.clean
+
+REGALW.LDFLAGS        := -lstdc++ -pthread -lm
+REGALW.LIBS           :=
+
+REGALW.SRCS           := $(REGAL.CXX)
+REGALW.SRCS           += src/md5/src/md5.c
+REGALW.SRCS           += src/jsonsl/jsonsl.c
+
+REGALW.CFLAGS         += -DREGAL_WRANGLER=1
+REGALW.INCLUDE        := $(REGAL.INCLUDE)
+
+# Optional flags
+
+ifeq ($(MODE),release)
+REGALW.CFLAGS       += -DNDEBUG
+#REGALW.CFLAGS       += -DREGAL_NO_TLS=0       # 1 for single threaded
+endif
+
+#
+# Flags for custom mode
+#
+
+ifeq ($(MODE),custom)
+endif
+
+
+REGALW.CFLAGS         += -fvisibility=hidden
+
+REGALW.SRCS.NAMES     := $(notdir $(REGALW.SRCS))
+
+REGALW.HEADERS        :=
+REGALW.HEADERS        += include/GL/Regal.h
+REGALW.HEADERS        += src/regal/RegalPrivate.h
+
+REGALW.OBJS           := $(addprefix tmp/$(SYSTEM)/regalw/static/,$(REGALW.SRCS.NAMES))
+REGALW.OBJS           := $(REGALW.OBJS:.c=.o)
+REGALW.OBJS           := $(REGALW.OBJS:.cpp=.o)
+REGALW.DEPS           := $(REGALW.OBJS:.o=.d)
+
+REGALW.SOBJS          := $(addprefix tmp/$(SYSTEM)/regalw/shared/,$(REGALW.SRCS.NAMES))
+REGALW.SOBJS          := $(REGALW.SOBJS:.c=.o)
+REGALW.SOBJS          := $(REGALW.SOBJS:.cpp=.o)
+REGALW.SDEPS          := $(LIBS.SOBJS:.o=.d)
+
+-include $(REGALW.DEPS) $(REGALW.SDEPS)
+
+REGALW.LIBS           += $(LDFLAGS.X11)
+
+ifneq ($(filter linux%,$(SYSTEM)),)
+REGALW.SONAME     := libRegalW.so.$(SO_MAJOR)
+REGALW.DEVLNK     := libRegalW.so
+REGALW.SHARED     := libRegalW.so.$(SO_VERSION)
+REGALW.LDFLAGS.SO := $(LDFLAGS.SO) $(LDFLAGS.DYNAMIC) -Wl,-soname=$(REGALW.SONAME)
+endif
+
+ifneq ($(filter darwin%,$(SYSTEM)),)
+REGALW.SONAME     := libRegalW.$(SO_MAJOR).dylib
+REGALW.DEVLNK     := libRegalW.dylib
+REGALW.SHARED     := libRegalW.$(SO_VERSION).dylib
+REGALW.FRAMEWORK  := RegalWrangler
+REGALW.LDFLAGS.SO := $(LDFLAGS.SO) $(LDFLAGS.DYNAMIC) -current_version $(SO_VERSION) -compatibility_version $(SO_MAJOR)
+REGALW.LDFLAGS    += -Wl,-reexport-lGLU -L/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries
+endif
+
+ifdef REGALW.STATIC
+regalw.lib: lib/$(SYSTEM)/$(REGALW.STATIC)
+endif
+
+ifdef REGALW.SHARED
+regalw.lib: lib/$(SYSTEM)/$(REGALW.SHARED)
+endif
+
+regalw.clean:
+	$(RM) -r tmp/$(SYSTEM)/regalw/static
+	$(RM) -r tmp/$(SYSTEM)/regalw/shared
+ifdef REGALW.STATIC
+	$(RM) -r lib/$(SYSTEM)/$(REGALW.STATIC)
+endif
+ifdef REGALW.SHARED
+	$(RM) -r bin/$(SYSTEM)/$(REGALW.SHARED)
+endif
+
+lib/$(SYSTEM)/$(REGALW.STATIC): $(REGALW.OBJS)
+	@mkdir -p $(dir $@)
+	$(LOG_AR)$(CCACHE) $(AR) cr $@ $(REGALW.OBJS)
+ifneq ($(RANLIB),)
+	$(LOG_RANLIB)$(RANLIB) $@
+endif
+ifneq ($(STRIP),)
+	$(LOG_STRIP)$(STRIP) -x $@
+endif
+
+REGALW.SHARED.DEPEND :=
+
+ifdef REGALW.SHARED
+lib/$(SYSTEM)/$(REGALW.SHARED): $(REGALW.SHARED.DEPEND) $(REGALW.SOBJS)
+	$(LOG_LD)$(CCACHE) $(LD) $(LDFLAGS.EXTRA) $(REGALW.LDFLAGS.SO) -o $@ $(REGALW.SOBJS) $(REGALW.SHARED.DEPEND) $(REGALW.LIBS) $(REGALW.LDFLAGS)
+ifneq ($(LN),)
+	$(LN) $(REGALW.SHARED) lib/$(SYSTEM)/$(REGALW.SONAME)
+	$(LN) $(REGALW.SHARED) lib/$(SYSTEM)/$(REGALW.DEVLNK)
+ifneq ($(REGALW.FRAMEWORK),)
+	$(LN) $(REGALW.SHARED) lib/$(SYSTEM)/$(REGALW.FRAMEWORK)
+endif
+endif
+ifneq ($(STRIP),)
+	$(LOG_STRIP)$(STRIP) -x $@
+endif
+endif
+
+tmp/$(SYSTEM)/regalw/static/%.o: src/regal/%.cpp $(REGALW.HEADERS)
+	@mkdir -p $(dir $@)
+	$(LOG_CXX)$(CCACHE) $(CXX) $(REGALW.CFLAGS) $(CFLAGS) $(CFLAGS.SO) $(REGALW.INCLUDE) -o $@ -c $<
+
+tmp/$(SYSTEM)/regalw/shared/%.o: src/regal/%.cpp $(REGALW.HEADERS)
+	@mkdir -p $(dir $@)
+	$(LOG_CXX)$(CCACHE) $(CXX) $(REGALW.CFLAGS) $(CFLAGS) $(PICFLAG) $(CFLAGS.SO) $(REGALW.INCLUDE) -o $@ -c $<
+
+tmp/$(SYSTEM)/regalw/static/%.o: src/md5/src/%.c $(REGALW.HEADERS)
+	@mkdir -p $(dir $@)
+	$(LOG_CC)$(CCACHE) $(CC) $(REGALW.CFLAGS) $(CFLAGS) $(CFLAGS.SO) $(REGALW.INCLUDE) -o $@ -c $<
+
+tmp/$(SYSTEM)/regalw/shared/%.o: src/md5/src/%.c $(REGALW.HEADERS)
+	@mkdir -p $(dir $@)
+	$(LOG_CC)$(CCACHE) $(CC) $(REGALW.CFLAGS) $(CFLAGS) $(PICFLAG) $(CFLAGS.SO) $(REGALW.INCLUDE) -o $@ -c $<
+
+tmp/$(SYSTEM)/regalw/static/%.o: src/jsonsl/%.c $(REGALW.HEADERS)
+	@mkdir -p $(dir $@)
+	$(LOG_CC)$(CCACHE) $(CC) $(REGALW.CFLAGS) $(CFLAGS) $(CFLAGS.SO) $(REGALW.INCLUDE) -o $@ -c $<
+
+tmp/$(SYSTEM)/regalw/shared/%.o: src/jsonsl/%.c $(REGALW.HEADERS)
+	@mkdir -p $(dir $@)
+	$(LOG_CC)$(CCACHE) $(CC) $(REGALW.CFLAGS) $(CFLAGS) $(PICFLAG) $(CFLAGS.SO) $(REGALW.INCLUDE) -o $@ -c $<
+
+endif
+endif
--- a/README.rst
+++ b/README.rst
@ -18,21 +18,27 @@ Regal
 Recent News
 ===========

-* July 30th 2013 - New binaries available for Windows and Mac.
-* July 26th 2013 - `Emscripten <https://github.com/kripken/emscripten>`_ support in progress.
-* July 22nd 2013 - `OpenGL 4.4 <http://www.opengl.org/registry/>`_ API support added.
-* July 21st 2013 - `apitrace <http://apitrace.github.io/>`_ support added.
+* November 2013 - Regal Wrangler support added.
+* October 2013 - `Emscripten <https://github.com/kripken/emscripten>`_ support added.
+* July 2013 - New binaries available for Windows and Mac.
+* July 2013 - `OpenGL 4.4 <http://www.opengl.org/registry/>`_ API support added.
+* July 2013 - `apitrace <http://apitrace.github.io/>`_ support added.

 Summary
 =======

-OpenGL portability layer for OpenGL 2.x, 3.x, 4.x, Core contexts and ES 2.0
+Regal is a user-space OpenGL layer for OpenGL 2.x, 3.x, 4.x, Core contexts and ES 2.0.
+Regal implements OpenGL loading, emulation for ES and Core contexts and tools for debugging.

-+---------------+----------------------------------------------------------------------+
-|  **Warning**  |  Regal is pre-alpha software, it is available here for evaluation    |
-|               |  and to play with the examples.  Don't use it in your projects yet.  |
-|               |  You have been warned.                                               |
-+---------------+----------------------------------------------------------------------+
+Status
+======
+
+Regal has been in active development on github since May of 2012 ---
+it is in deployment for internal projects, and has received significant
+external contributions.
+
+Features such as emulation might not be complete or bug-free enough for
+every situation, milage may vary, contributions welcome.

 .. contents::

@ -98,101 +104,107 @@ Features
 Emulation
 ---------

-  - Fixed function texturing, lighting and fog.
-  - Direct State Access extension
+- Fixed function texturing, lighting and fog.
+- Direct State Access extension

  http://www.opengl.org/registry/specs/EXT/direct_state_access.txt

-  - GL_EXT_debug_marker extension
+- GL_EXT_debug_marker extension

  http://www.khronos.org/registry/gles/extensions/EXT/EXT_debug_marker.txt

-  - Fixed function and DSA emulation enabled by default, except when compatibility context
+- Fixed function and DSA emulation enabled by default, except when compatibility context
  with DSA extension detected.

-  - Build-time configuration:
+- Build-time configuration:

  - **REGAL_EMULATION**         -- Enable/disable the use of emulation
  - **REGAL_FORCE_EMULATION**   -- Force the use of emulation, even for compatibility contexts with DSA

-  - Environment variable configuration:
+- Environment variable configuration:

  - **REGAL_EMULATION**         -- Enable/disable the use of emulation
  - **REGAL_FORCE_EMULATION**   -- Force the use of emulation, even for compatibility contexts with DSA

-  - Runime configuration via GL_REGAL_enable_:
+- Runime configuration via GL_REGAL_enable_:

  - **GL_EMULATION_REGAL**      -- glEnable/glDisable emulation

+.. NOTE:: Emulation is not supported in REGAL_WRANGLER=1 mode.
+
 OpenGL error checking
 ---------------------

-  - Disabled by default.
+- Disabled by default.

-  - Build-time configuration: **REGAL_ERROR**
+- Build-time configuration: **REGAL_ERROR**

-  - Environment variable configuration: **REGAL_ERROR**
+- Environment variable configuration: **REGAL_ERROR**

-  - Runtime configuration via GL_REGAL_enable_: **GL_ERROR_REGAL**
+- Runtime configuration via GL_REGAL_enable_: **GL_ERROR_REGAL**
+
+.. NOTE:: OpenGL error checking is not supported in REGAL_WRANGLER=1 mode.

 Logging
 -------

-  Regal supports detailed logging for development purposes.
+Regal supports detailed logging for development purposes.

-  - **Error**       -- Fatal and non-fatal Regal runtime errors.
-  - **Warning**     -- Non-fatal Regal warnings.
-  - **Info**        -- Informational messages.
-  - **App**         -- Application calls into Regal.
-  - **Driver**      -- Regal calls into OpenGL.
-  - **Internal**    -- Internal Regal calls.
-  - **Http**        -- HTTP traffic logging.
+- **Error**       -- Fatal and non-fatal Regal runtime errors.
+- **Warning**     -- Non-fatal Regal warnings.
+- **Info**        -- Informational messages.
+- **App**         -- Application calls into Regal.
+- **Driver**      -- Regal calls into OpenGL.
+- **Internal**    -- Internal Regal calls.
+- **Http**        -- HTTP traffic logging.

-  Build-time configuration:
+Build-time configuration:

-  - **REGAL_LOG_ERROR**
-  - **REGAL_LOG_WARNING**
-  - **REGAL_LOG_INFO**
-  - **REGAL_LOG_APP**
-  - **REGAL_LOG_DRIVER**
-  - **REGAL_LOG_INTERNAL**
-  - **REGAL_LOG_HTTP**
+- **REGAL_LOG_ERROR**
+- **REGAL_LOG_WARNING**
+- **REGAL_LOG_INFO**
+- **REGAL_LOG_APP**
+- **REGAL_LOG_DRIVER**
+- **REGAL_LOG_INTERNAL**
+- **REGAL_LOG_HTTP**

-  * Debug mode: All logging supported with error, warning, info and http logging enabled.
-  * Release mode: Support for application, driver and internal logging disabled by default.
+* Debug mode: All logging supported with error, warning, info and http logging enabled.
+* Release mode: Support for application, driver and internal logging disabled by default.

-  Environment variable configuration:
+Environment variable configuration:

-  - **REGAL_LOG_ERROR**
-  - **REGAL_LOG_WARNING**
-  - **REGAL_LOG_INFO**
-  - **REGAL_LOG_APP**
-  - **REGAL_LOG_DRIVER**
-  - **REGAL_LOG_INTERNAL**
-  - **REGAL_LOG_HTTP**
-  - **REGAL_LOG_API**       --- Application + Driver OpenGL logging
-  - **REGAL_LOG_NONE**      --- enable or disable all logging
+- **REGAL_LOG_ERROR**
+- **REGAL_LOG_WARNING**
+- **REGAL_LOG_INFO**
+- **REGAL_LOG_APP**
+- **REGAL_LOG_DRIVER**
+- **REGAL_LOG_INTERNAL**
+- **REGAL_LOG_HTTP**
+- **REGAL_LOG_API**       --- Application + Driver OpenGL logging
+- **REGAL_LOG_NONE**      --- enable or disable all logging

-  Environment variable lookup is globally disabled by defining **REGAL_NO_GETENV**
-  at compile-time.
+Environment variable lookup is globally disabled by defining **REGAL_NO_GETENV**
+at compile-time.

-  Runtime configuration via GL_REGAL_log_ extension: (**glEnable/glDisable/glIsEnabled**)
+Runtime configuration via GL_REGAL_log_ extension: (**glEnable/glDisable/glIsEnabled**)

-  - **GL_LOG_ERROR_REGAL**
-  - **GL_LOG_WARNING_REGAL**
-  - **GL_LOG_INFO_REGAL**
-  - **GL_LOG_APP_REGAL**
-  - **GL_LOG_DRIVER_REGAL**
-  - **GL_LOG_INTERNAL_REGAL**
-  - **GL_LOG_HTTP_REGAL**
+- **GL_LOG_ERROR_REGAL**
+- **GL_LOG_WARNING_REGAL**
+- **GL_LOG_INFO_REGAL**
+- **GL_LOG_APP_REGAL**
+- **GL_LOG_DRIVER_REGAL**
+- **GL_LOG_INTERNAL_REGAL**
+- **GL_LOG_HTTP_REGAL**

-  Other compile-time or runtime configuration of logging:
+Other compile-time or runtime configuration of logging:

-  - **REGAL_LOG**           --- enable or disable logging
-  - **REGAL_LOG_FILE**      --- log to specified filename
-  - **REGAL_LOG_MAX_LINES** --- limit the number of lines of multi-line messages (shaders, etc)
-  - **REGAL_LOG_JSON**      --- log in JSON mode
-  - **REGAL_LOG_JSON_FILE** --- JSON log to specified filename
+- **REGAL_LOG**           --- enable or disable logging
+- **REGAL_LOG_FILE**      --- log to specified filename
+- **REGAL_LOG_MAX_LINES** --- limit the number of lines of multi-line messages (shaders, etc)
+- **REGAL_LOG_JSON**      --- log in JSON mode
+- **REGAL_LOG_JSON_FILE** --- JSON log to specified filename
+
+.. NOTE:: API logging is not supported in REGAL_WRANGLER=1 mode.

 Multi-threading support
 -----------------------
@ -228,22 +240,24 @@ Spoofing OpenGL vendor, renderer, version and extension strings
 Browser-based interface
 -----------------------

-  - Enabled by default.
+- Enabled by default.

-  - **REGAL_NO_HTTP**         --- Build-time and environment variable enable/disable.
-  - **REGAL_HTTP_PORT**       --- Port for HTTP connections (8080 by default)
-  - **REGAL_HTTP_LOG_LIMIT**  --- Number of lines of logging buffered
+- **REGAL_NO_HTTP**         --- Build-time and environment variable enable/disable.
+- **REGAL_HTTP_PORT**       --- Port for HTTP connections (8080 by default)
+- **REGAL_HTTP_LOG_LIMIT**  --- Number of lines of logging buffered

-  - `http://127.0.0.1:8080/log`_                          --- View log
-  - `http://127.0.0.1:8080/glEnable?GL_LOG_APP_REGAL`_    --- Enable/disable application logging
-  - `http://127.0.0.1:8080/glEnable?GL_LOG_DRIVER_REGAL`_ --- Enable/disable driver logging
-  - `http://127.0.0.1:8080`_                              --- State information
+- `http://127.0.0.1:8080/log`_                          --- View log
+- `http://127.0.0.1:8080/glEnable?GL_LOG_APP_REGAL`_    --- Enable/disable application logging
+- `http://127.0.0.1:8080/glEnable?GL_LOG_DRIVER_REGAL`_ --- Enable/disable driver logging
+- `http://127.0.0.1:8080`_                              --- State information

 .. _http://127.0.0.1:8080/log:                          http://127.0.0.1:8080/log
 .. _http://127.0.0.1:8080/glEnable?GL_LOG_APP_REGAL:    http://127.0.0.1:8080/glEnable?GL_LOG_APP_REGAL
 .. _http://127.0.0.1:8080/glEnable?GL_LOG_DRIVER_REGAL: http://127.0.0.1:8080/glEnable?GL_LOG_DRIVER_REGAL
 .. _http://127.0.0.1:8080:                              http://127.0.0.1:8080

+.. NOTE:: Browser interface is not supported in REGAL_WRANGLER=1 mode.
+
 Regal OpenGL extensions
 -----------------------

@ -263,22 +277,24 @@ Regal API
 In Progress
 ===========

+* Light-weight loader-only "wrangler" mode along the lines of GLEW.
 * Context sharing support
-* Pointer-based API
 * glPushAttrib emulation

 Planned Features
 ================

+* NV_path_rendering emulation.
+* GLSL to GLSL translation.
+* ES 3.0 support
 * Debug label.
 * Debug output.
-* Web browser-based debugging tools.
 * Display list emulation.
+* Web browser-based debugging tools.

 Limitations
 ===========

-* Incomplete implementation, so far.
 * Shared OpenGL contexts supported for single-threaded only.
 * Limited GLSL language support.
 * GL_QUADS only works in immediate mode or with DrawArrays for ES and core profiles.
@ -296,6 +312,7 @@ Contact Information
 Other Information
 =================

+* Big Android BBQ 2013: `Developing for Dedicated Android Gaming Systems <https://developer.nvidia.com/content/nvidia-shield-and-bbq-big-android-bbq-hurst-tx>`_ `(.pdf slides) <https://developer.nvidia.com/sites/default/files/akamai/mobile/docs/NVIDIA_Dedicated_Android_Gaming_2013_updated.pdf>`_.
 * #AltDevBlogADay blog: `Bringing Regal OpenGL to Native Client <http://www.altdevblogaday.com/2012/09/04/bringing-regal-opengl-to-native-client/>`_.
 * opengl.org forum thread: `Introducing Regal <http://www.opengl.org/discussion_boards/showthread.php/178678-Introducing-Regal?p=1241199>`_.
 * Slides - `Regal for Software Development <http://www.slideshare.net/nigelstewart1/regal-tlf>`_.
--- a/build/android/Regal/jni/Android.mk
+++ b/build/android/Regal/jni/Android.mk
@ -22,6 +22,7 @@ regal_path   := $(LOCAL_PATH)/../../../..
 include $(regal_path)/build/zlib.inc
 include $(regal_path)/build/snappy.inc
 include $(regal_path)/build/apitrace.inc
+include $(regal_path)/build/glslopt.inc
 include $(regal_path)/build/regal.inc

 #
@ -64,6 +65,15 @@ apitrace_c_includes := $(patsubst $(LOCAL_PATH)/../%,%,$(apitrace_c_includes))

 apitrace_export_c_includes := $(regal_path)/include

+#
+#
+# glsl optimizer
+#
+
+glslopt_src_files := $(patsubst %,$(regal_path)/%,$(GLSLOPT.CXX))
+glslopt_src_files := $(patsubst $(LOCAL_PATH)/%,%,$(glslopt_src_files))
+glslopt_c_includes := $(patsubst -I%,$(regal_path)/%,$(GLSLOPT.INCLUDE))
+
 #
 # regal
 #
@ -128,6 +138,15 @@ LOCAL_EXPORT_LDLIBS :=
 LOCAL_ARM_MODE  := arm
 include $(BUILD_STATIC_LIBRARY)

+# include $(CLEAR_VARS)
+# LOCAL_MODULE := glslopt 
+# LOCAL_SRC_FILES := $(glslopt_src_files)
+# LOCAL_CFLAGS := $(regal_cflags)
+# LOCAL_C_INCLUDES := $(glslopt_c_includes)
+# LOCAL_EXPORT_LDLIBS :=
+# LOCAL_ARM_MODE  := arm
+# include $(BUILD_STATIC_LIBRARY)
+
 include $(CLEAR_VARS)
 LOCAL_MODULE := Regal_static
 LOCAL_SRC_FILES := $(regal_src_files)
--- a/build/glslopt.inc
+++ b/build/glslopt.inc
@ -0,0 +1,111 @@
+# glslopt.inc
+#
+# Generic gnumake .inc for building GLSL Optimizer 
+#
+
+# Sources
+
+GLSLOPT.CXX :=
+GLSLOPT.CXX += src/glsl/src/glsl/ast_array_index.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/ast_expr.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/ast_function.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/ast_to_hir.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/ast_type.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/builtin_function.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/builtin_variables.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/glsl_lexer.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/glsl_optimizer.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/glsl_parser.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/glsl_parser_extras.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/glsl_symbol_table.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/glsl_types.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/hir_field_selection.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/ir.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/ir_basic_block.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/ir_builder.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/ir_clone.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/ir_constant_expression.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/ir_expression_flattening.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/ir_function.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/ir_function_can_inline.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/ir_function_detect_recursion.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/ir_hierarchical_visitor.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/ir_hv_accept.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/ir_import_prototypes.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/ir_print_glsl_visitor.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/ir_print_visitor.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/ir_reader.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/ir_rvalue_visitor.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/ir_unused_structs.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/ir_validate.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/ir_variable_refcount.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/link_functions.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/link_uniform_block_active_visitor.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/link_uniform_blocks.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/link_uniform_initializers.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/link_uniforms.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/link_varyings.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/linker.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/loop_analysis.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/loop_controls.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/loop_unroll.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/lower_clip_distance.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/lower_discard.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/lower_discard_flow.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/lower_if_to_cond_assign.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/lower_instructions.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/lower_jumps.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/lower_mat_op_to_vec.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/lower_noise.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/lower_packed_varyings.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/lower_variable_index_to_cond_assign.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/lower_vec_index_to_cond_assign.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/lower_vec_index_to_swizzle.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/lower_vector.cpp
+#GLSLOPT.CXX += src/glsl/src/glsl/main.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/opt_algebraic.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/opt_array_splitting.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/opt_constant_folding.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/opt_constant_propagation.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/opt_constant_variable.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/opt_copy_propagation.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/opt_copy_propagation_elements.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/opt_dead_code.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/opt_dead_code_local.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/opt_dead_functions.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/opt_flatten_nested_if_blocks.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/opt_function_inlining.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/opt_if_simplification.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/opt_noop_swizzle.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/opt_redundant_jumps.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/opt_structure_splitting.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/opt_swizzle_swizzle.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/opt_tree_grafting.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/ralloc.c
+GLSLOPT.CXX += src/glsl/src/glsl/s_expression.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/standalone_scaffolding.cpp
+GLSLOPT.CXX += src/glsl/src/glsl/strtod.c
+GLSLOPT.CXX += src/glsl/src/glsl/glcpp/glcpp-lex.c
+GLSLOPT.CXX += src/glsl/src/glsl/glcpp/glcpp-parse.c
+GLSLOPT.CXX += src/glsl/src/glsl/glcpp/pp.c
+GLSLOPT.CXX += src/glsl/src/glsl/../mesa/main/imports.c
+GLSLOPT.CXX += src/glsl/src/glsl/../mesa/main/hash_table.c
+GLSLOPT.CXX += src/glsl/src/glsl/../mesa/program/symbol_table.c
+GLSLOPT.CXX += src/glsl/src/glsl/../mesa/program/prog_hash_table.c
+
+# Internal Headers
+# seth: is this used for dependencies?
+GLSLOPT.H :=
+
+# Other Headers
+# seth: do all of these need to be specified?
+GLSLOPT.H.OTHER :=
+
+#
+
+GLSLOPT.INCLUDE :=
+GLSLOPT.INCLUDE += -Isrc/glsl/include
+GLSLOPT.INCLUDE += -Isrc/glsl/src/glsl
+GLSLOPT.INCLUDE += -Isrc/glsl/src/mesa
+
+GLSLOPT.STATIC ?= libglslopt.a
--- a/build/win32/vs2010/Regal/All.sln
+++ b/build/win32/vs2010/Regal/All.sln
@ -32,6 +32,11 @@ Project("{CF05FE22-B763-D96E-C64D-312608111C07}") = "Regalmlib", "Regalmlib.vcxp
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
+Project("{CF05FE22-B763-D96E-C64D-312608111C07}") = "Regalw", "Regalw.vcxproj", "{324CD1C8-680A-9A1D-EFE7-A93D7EFFE858}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B2F73D1B-8FA3-518D-0F85-9AAD20EF1E1C} = {B2F73D1B-8FA3-518D-0F85-9AAD20EF1E1C}
+	EndProjectSection
+EndProject
 Project("{CF05FE22-B763-D96E-C64D-312608111C07}") = "mongooselib", "mongooselib.vcxproj", "{256E64B8-F766-061C-45F8-25B51B7CA24E}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
@ -182,6 +187,14 @@ Global
 		{5C0D9EFE-80E2-1DA1-7A53-D640CAE643C0}.Release|Win32.ActiveCfg = Release|Win32
 		{5C0D9EFE-80E2-1DA1-7A53-D640CAE643C0}.Release|x64.Build.0 = Release|x64
 		{5C0D9EFE-80E2-1DA1-7A53-D640CAE643C0}.Release|x64.ActiveCfg = Release|x64
+		{324CD1C8-680A-9A1D-EFE7-A93D7EFFE858}.Debug|Win32.Build.0 = Debug|Win32
+		{324CD1C8-680A-9A1D-EFE7-A93D7EFFE858}.Debug|Win32.ActiveCfg = Debug|Win32
+		{324CD1C8-680A-9A1D-EFE7-A93D7EFFE858}.Debug|x64.Build.0 = Debug|x64
+		{324CD1C8-680A-9A1D-EFE7-A93D7EFFE858}.Debug|x64.ActiveCfg = Debug|x64
+		{324CD1C8-680A-9A1D-EFE7-A93D7EFFE858}.Release|Win32.Build.0 = Release|Win32
+		{324CD1C8-680A-9A1D-EFE7-A93D7EFFE858}.Release|Win32.ActiveCfg = Release|Win32
+		{324CD1C8-680A-9A1D-EFE7-A93D7EFFE858}.Release|x64.Build.0 = Release|x64
+		{324CD1C8-680A-9A1D-EFE7-A93D7EFFE858}.Release|x64.ActiveCfg = Release|x64
 		{256E64B8-F766-061C-45F8-25B51B7CA24E}.Debug|Win32.Build.0 = Debug|Win32
 		{256E64B8-F766-061C-45F8-25B51B7CA24E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{256E64B8-F766-061C-45F8-25B51B7CA24E}.Debug|x64.Build.0 = Debug|x64
@ -351,6 +364,7 @@ Global
 		{863337BC-C6F9-E4E8-C27D-2D6BAFF72E18} = {E5C5BB03-8E38-94D5-C4F7-7A59153EF8F2}
 		{687DE0BC-8B42-53E9-FB1A-C750ED5CD57C} = {E5C5BB03-8E38-94D5-C4F7-7A59153EF8F2}
 		{5C0D9EFE-80E2-1DA1-7A53-D640CAE643C0} = {E5C5BB03-8E38-94D5-C4F7-7A59153EF8F2}
+		{324CD1C8-680A-9A1D-EFE7-A93D7EFFE858} = {E5C5BB03-8E38-94D5-C4F7-7A59153EF8F2}
 		{256E64B8-F766-061C-45F8-25B51B7CA24E} = {AEB42855-4A0A-CC6C-C503-A2E4DA6AE61A}
 		{EF516F6A-1965-7089-C2CA-65778D394F08} = {AEB42855-4A0A-CC6C-C503-A2E4DA6AE61A}
 		{12EBE7B9-A6BF-51C2-BC7A-A743E21C7B99} = {AEB42855-4A0A-CC6C-C503-A2E4DA6AE61A}
--- a/build/win32/vs2010/Regal/Regal.sln
+++ b/build/win32/vs2010/Regal/Regal.sln
@ -32,6 +32,11 @@ Project("{CF05FE22-B763-D96E-C64D-312608111C07}") = "Regalmlib", "Regalmlib.vcxp
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
+Project("{CF05FE22-B763-D96E-C64D-312608111C07}") = "Regalw", "Regalw.vcxproj", "{324CD1C8-680A-9A1D-EFE7-A93D7EFFE858}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B2F73D1B-8FA3-518D-0F85-9AAD20EF1E1C} = {B2F73D1B-8FA3-518D-0F85-9AAD20EF1E1C}
+	EndProjectSection
+EndProject
 Project("{CF05FE22-B763-D96E-C64D-312608111C07}") = "mongooselib", "mongooselib.vcxproj", "{256E64B8-F766-061C-45F8-25B51B7CA24E}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
@ -105,6 +110,14 @@ Global
 		{5C0D9EFE-80E2-1DA1-7A53-D640CAE643C0}.Release|Win32.ActiveCfg = Release|Win32
 		{5C0D9EFE-80E2-1DA1-7A53-D640CAE643C0}.Release|x64.Build.0 = Release|x64
 		{5C0D9EFE-80E2-1DA1-7A53-D640CAE643C0}.Release|x64.ActiveCfg = Release|x64
+		{324CD1C8-680A-9A1D-EFE7-A93D7EFFE858}.Debug|Win32.Build.0 = Debug|Win32
+		{324CD1C8-680A-9A1D-EFE7-A93D7EFFE858}.Debug|Win32.ActiveCfg = Debug|Win32
+		{324CD1C8-680A-9A1D-EFE7-A93D7EFFE858}.Debug|x64.Build.0 = Debug|x64
+		{324CD1C8-680A-9A1D-EFE7-A93D7EFFE858}.Debug|x64.ActiveCfg = Debug|x64
+		{324CD1C8-680A-9A1D-EFE7-A93D7EFFE858}.Release|Win32.Build.0 = Release|Win32
+		{324CD1C8-680A-9A1D-EFE7-A93D7EFFE858}.Release|Win32.ActiveCfg = Release|Win32
+		{324CD1C8-680A-9A1D-EFE7-A93D7EFFE858}.Release|x64.Build.0 = Release|x64
+		{324CD1C8-680A-9A1D-EFE7-A93D7EFFE858}.Release|x64.ActiveCfg = Release|x64
 		{256E64B8-F766-061C-45F8-25B51B7CA24E}.Debug|Win32.Build.0 = Debug|Win32
 		{256E64B8-F766-061C-45F8-25B51B7CA24E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{256E64B8-F766-061C-45F8-25B51B7CA24E}.Debug|x64.Build.0 = Debug|x64
--- a/build/win32/vs2010/Regal/Regalw.vcxproj
+++ b/build/win32/vs2010/Regal/Regalw.vcxproj
@ -0,0 +1,358 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>Regalw</ProjectName>
+    <ProjectGuid>{324CD1C8-680A-9A1D-EFE7-A93D7EFFE858}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\Win32\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Release\x64\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\Win32\Regalw\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Release\x64\Regalw\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\Win32\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Debug\x64\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\Win32\Regalw\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Debug\x64\Regalw\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">regalw</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">regalw</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">regalw</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">regalw</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../../../src/boost;../../../../include;../../../../src/mongoose;../../../../src/lookup3;../../../../src/md5/include;../../../../src/libpng/include;../../../../src/zlib/include;../../../../src/squish;../../../../src/jsonsl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>REGAL_NO_SQUISH=1;REGAL_SYS_WGL_DECLARE_WGL;REGAL_WIN_TLS=1;REGAL_WRANGLER=1;_ITERATOR_DEBUG_LEVEL=0;_CRT_SECURE_NO_WARNINGS=1;WIN32;_WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <AssemblerListingLocation>Release\Win32\Regalw\</AssemblerListingLocation>
+      <ObjectFileName>Release\Win32\Regalw\</ObjectFileName>
+      <ProgramDataBaseFileName>Release\Win32\regalw.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
+      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>jsonsllib.lib;advapi32.lib;gdi32.lib;user32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>Release\Win32\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>../../../../src/regal/Regal.def</ModuleDefinitionFile>
+      <ProgramDatabaseFile>Release\Win32\regalw.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImportLibrary>Release\Win32\regalw.lib</ImportLibrary>
+    </Link>
+    <Midl>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../../../src/boost;../../../../include;../../../../src/mongoose;../../../../src/lookup3;../../../../src/md5/include;../../../../src/libpng/include;../../../../src/zlib/include;../../../../src/squish;../../../../src/jsonsl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>REGAL_NO_SQUISH=1;REGAL_SYS_WGL_DECLARE_WGL;REGAL_WIN_TLS=1;REGAL_WRANGLER=1;_ITERATOR_DEBUG_LEVEL=0;_CRT_SECURE_NO_WARNINGS=1;WIN32;_WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <AssemblerListingLocation>Release\x64\Regalw\</AssemblerListingLocation>
+      <ObjectFileName>Release\x64\Regalw\</ObjectFileName>
+      <ProgramDataBaseFileName>Release\x64\regalw.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>jsonsllib.lib;advapi32.lib;gdi32.lib;user32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>Release\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>../../../../src/regal/Regal.def</ModuleDefinitionFile>
+      <ProgramDatabaseFile>Release\x64\regalw.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>Release\x64\regalw.lib</ImportLibrary>
+    </Link>
+    <Midl>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../../../src/boost;../../../../include;../../../../src/mongoose;../../../../src/lookup3;../../../../src/md5/include;../../../../src/libpng/include;../../../../src/zlib/include;../../../../src/squish;../../../../src/jsonsl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>REGAL_NO_SQUISH=1;REGAL_SYS_WGL_DECLARE_WGL;REGAL_WIN_TLS=1;REGAL_WRANGLER=1;_ITERATOR_DEBUG_LEVEL=0;_CRT_SECURE_NO_WARNINGS=1;WIN32;_WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <AssemblerListingLocation>Debug\Win32\Regalw\</AssemblerListingLocation>
+      <ObjectFileName>Debug\Win32\Regalw\</ObjectFileName>
+      <ProgramDataBaseFileName>Debug\Win32\regalw.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
+      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>jsonsllib.lib;advapi32.lib;gdi32.lib;user32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>Debug\Win32\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>../../../../src/regal/Regal.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>Debug\Win32\regalw.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImportLibrary>Debug\Win32\regalw.lib</ImportLibrary>
+    </Link>
+    <Midl>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../../../src/boost;../../../../include;../../../../src/mongoose;../../../../src/lookup3;../../../../src/md5/include;../../../../src/libpng/include;../../../../src/zlib/include;../../../../src/squish;../../../../src/jsonsl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>REGAL_NO_SQUISH=1;REGAL_SYS_WGL_DECLARE_WGL;REGAL_WIN_TLS=1;REGAL_WRANGLER=1;_ITERATOR_DEBUG_LEVEL=0;_CRT_SECURE_NO_WARNINGS=1;WIN32;_WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <AssemblerListingLocation>Debug\x64\Regalw\</AssemblerListingLocation>
+      <ObjectFileName>Debug\x64\Regalw\</ObjectFileName>
+      <ProgramDataBaseFileName>Debug\x64\regalw.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>jsonsllib.lib;advapi32.lib;gdi32.lib;user32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>Debug\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>../../../../src/regal/Regal.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>Debug\x64\regalw.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>Debug\x64\regalw.lib</ImportLibrary>
+    </Link>
+    <Midl>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\src\regal\Regal.cpp" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalBin.h" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalBreak.cpp" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalBreak.h" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalCacheShader.cpp" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalCacheShader.h" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalCacheTexture.cpp" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalCacheTexture.h" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalConfig.cpp" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalConfig.h" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalContext.cpp" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalContext.h" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalContextInfo.cpp" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalContextInfo.h" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalDebugInfo.h" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalDispatch.cpp" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalDispatch.h" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalDispatchCache.cpp" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalDispatchCode.cpp" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalDispatchDebug.cpp" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalDispatchEmu.cpp" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalDispatchError.cpp" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalDispatchError.h" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalDispatchGLX.cpp" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalDispatchGlobal.cpp" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalDispatchLoader.cpp" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalDispatchLog.cpp" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalDispatchMissing.cpp" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalDispatchPpapi.cpp" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalDispatchStaticEGL.cpp" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalDispatchStaticES2.cpp" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalDispatchStatistics.cpp" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalDispatchTrace.cpp" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalDispatcher.cpp" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalDispatcher.h" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalDispatcherGL.cpp" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalDispatcherGL.h" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalDispatcherGlobal.cpp" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalDispatcherGlobal.h" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalDllMain.cpp" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalDsa.h" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalEmu.cpp" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalEmu.h" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalEmuInfo.cpp" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalEmuInfo.h" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalEnum.h" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalFavicon.cpp" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalFavicon.h" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalFilt.cpp" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalFilt.h" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalFrame.cpp" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalFrame.h" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalHelper.cpp" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalHelper.h" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalHttp.cpp" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalHttp.h" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalIff.cpp" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalIff.h" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalInit.cpp" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalInit.h" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalJson.cpp" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalJson.h" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalJson.inl" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalLog.cpp" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalLog.h" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalLookup.cpp" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalLookup.h" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalMac.cpp" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalMac.h" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalMarker.cpp" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalMarker.h" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalNamespace.h" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalObj.h" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalPixelConversions.cpp" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalPixelConversions.h" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalPixelConversions.inl" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalPlugin.cpp" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalPpa.h" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalPpca.h" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalPrecompile.h" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalPrivate.h" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalPush.h" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalQuads.cpp" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalQuads.h" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalScopedPtr.h" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalSharedList.h" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalSharedMap.h" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalSharedPtr.h" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalSo.cpp" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalSo.h" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalState.h" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalStatistics.cpp" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalStatistics.h" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalSystem.h" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalTexC.cpp" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalTexC.h" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalTexSto.h" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalThread.h" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalTimer.h" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalToken.cpp" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalToken.h" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalUtil.cpp" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalUtil.h" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalVao.h" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalX11.cpp" />
+    <ClCompile Include="..\..\..\..\src\regal\RegalXfer.cpp" />
+    <ClInclude Include="..\..\..\..\src\regal\RegalXfer.h" />
+    <ClInclude Include="..\..\..\..\src\regal\linear.h" />
+    <ClInclude Include="..\..\..\..\src\regal\pch.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\..\include\GL\Regal.h" />
+    <None Include="..\..\..\..\src\lookup3\lookup3.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\..\src\regal\Regal.def" />
+  </ItemGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
--- a/include/GL/Regal.h
+++ b/include/GL/Regal.h
@ -16631,8 +16631,8 @@ REGAL_DECL void REGAL_CALL plugin_glGetColorTableParameterivEXT(GLenum target, G
 #endif

 #ifndef REGAL_NO_TYPEDEF_GL_EXT_PIXEL_TRANSFORM
-typedef void (REGAL_CALL *PFNGLGETPIXELTRANSFORMPARAMETERFVEXTPROC)(GLenum target, GLenum pname, const GLfloat *params);
-typedef void (REGAL_CALL *PFNGLGETPIXELTRANSFORMPARAMETERIVEXTPROC)(GLenum target, GLenum pname, const GLint *params);
+typedef void (REGAL_CALL *PFNGLGETPIXELTRANSFORMPARAMETERFVEXTPROC)(GLenum target, GLenum pname, GLfloat *params);
+typedef void (REGAL_CALL *PFNGLGETPIXELTRANSFORMPARAMETERIVEXTPROC)(GLenum target, GLenum pname, GLint *params);
 typedef void (REGAL_CALL *PFNGLPIXELTRANSFORMPARAMETERFEXTPROC)(GLenum target, GLenum pname, const GLfloat param);
 typedef void (REGAL_CALL *PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC)(GLenum target, GLenum pname, const GLfloat *params);
 typedef void (REGAL_CALL *PFNGLPIXELTRANSFORMPARAMETERIEXTPROC)(GLenum target, GLenum pname, const GLint param);
@ -16649,8 +16649,8 @@ typedef void (REGAL_CALL *PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC)(GLenum target,
 #endif

 #ifndef REGAL_NO_DECLARATION_GL_EXT_PIXEL_TRANSFORM
-REGAL_DECL void REGAL_CALL glGetPixelTransformParameterfvEXT(GLenum target, GLenum pname, const GLfloat *params);
-REGAL_DECL void REGAL_CALL glGetPixelTransformParameterivEXT(GLenum target, GLenum pname, const GLint *params);
+REGAL_DECL void REGAL_CALL glGetPixelTransformParameterfvEXT(GLenum target, GLenum pname, GLfloat *params);
+REGAL_DECL void REGAL_CALL glGetPixelTransformParameterivEXT(GLenum target, GLenum pname, GLint *params);
 REGAL_DECL void REGAL_CALL glPixelTransformParameterfEXT(GLenum target, GLenum pname, const GLfloat param);
 REGAL_DECL void REGAL_CALL glPixelTransformParameterfvEXT(GLenum target, GLenum pname, const GLfloat *params);
 REGAL_DECL void REGAL_CALL glPixelTransformParameteriEXT(GLenum target, GLenum pname, const GLint param);
@ -16658,8 +16658,8 @@ REGAL_DECL void REGAL_CALL glPixelTransformParameterivEXT(GLenum target, GLenum
 #endif

 #ifndef REGAL_NO_PLUGIN_GL_EXT_PIXEL_TRANSFORM
-REGAL_DECL void REGAL_CALL plugin_glGetPixelTransformParameterfvEXT(GLenum target, GLenum pname, const GLfloat *params);
-REGAL_DECL void REGAL_CALL plugin_glGetPixelTransformParameterivEXT(GLenum target, GLenum pname, const GLint *params);
+REGAL_DECL void REGAL_CALL plugin_glGetPixelTransformParameterfvEXT(GLenum target, GLenum pname, GLfloat *params);
+REGAL_DECL void REGAL_CALL plugin_glGetPixelTransformParameterivEXT(GLenum target, GLenum pname, GLint *params);
 REGAL_DECL void REGAL_CALL plugin_glPixelTransformParameterfEXT(GLenum target, GLenum pname, const GLfloat param);
 REGAL_DECL void REGAL_CALL plugin_glPixelTransformParameterfvEXT(GLenum target, GLenum pname, const GLfloat *params);
 REGAL_DECL void REGAL_CALL plugin_glPixelTransformParameteriEXT(GLenum target, GLenum pname, const GLint param);
@ -36083,7 +36083,6 @@ REGAL_DECL void REGAL_CALL plugin_glTexBuffer(GLenum target, GLenum internalform
 #endif

 #ifndef REGAL_NO_TYPEDEF_GL_VERSION_3_2
-typedef void (REGAL_CALL *PFNGLFRAMEBUFFERTEXTUREFACEPROC)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
 typedef void (REGAL_CALL *PFNGLFRAMEBUFFERTEXTUREPROC)(GLenum target, GLenum attachment, GLuint texture, GLint level);
 typedef void (REGAL_CALL *PFNGLGETBUFFERPARAMETERI64VPROC)(GLenum target, GLenum pname, GLint64 *params);
 typedef void (REGAL_CALL *PFNGLGETINTEGER64I_VPROC)(GLenum target, GLuint index, GLint64 *data);
@ -36091,21 +36090,18 @@ typedef void (REGAL_CALL *PFNGLGETINTEGER64I_VPROC)(GLenum target, GLuint index,

 #ifndef REGAL_NO_NAMESPACE_GL_VERSION_3_2
 #define glFramebufferTexture                rglFramebufferTexture
-#define glFramebufferTextureFace            rglFramebufferTextureFace
 #define glGetBufferParameteri64v            rglGetBufferParameteri64v
 #define glGetInteger64i_v                   rglGetInteger64i_v
 #endif

 #ifndef REGAL_NO_DECLARATION_GL_VERSION_3_2
 REGAL_DECL void REGAL_CALL glFramebufferTexture(GLenum target, GLenum attachment, GLuint texture, GLint level);
-REGAL_DECL void REGAL_CALL glFramebufferTextureFace(GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
 REGAL_DECL void REGAL_CALL glGetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params);
 REGAL_DECL void REGAL_CALL glGetInteger64i_v(GLenum target, GLuint index, GLint64 *data);
 #endif

 #ifndef REGAL_NO_PLUGIN_GL_VERSION_3_2
 REGAL_DECL void REGAL_CALL plugin_glFramebufferTexture(GLenum target, GLenum attachment, GLuint texture, GLint level);
-REGAL_DECL void REGAL_CALL plugin_glFramebufferTextureFace(GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
 REGAL_DECL void REGAL_CALL plugin_glGetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params);
 REGAL_DECL void REGAL_CALL plugin_glGetInteger64i_v(GLenum target, GLuint index, GLint64 *data);
 #endif
--- a/include/GL/RegalGLEW.h
+++ b/include/GL/RegalGLEW.h
@ -8278,6 +8278,28 @@ typedef void (GLAPIENTRY * PFNGLCULLPARAMETERFVEXTPROC) (GLenum pname, GLfloat*

 #endif /* GL_EXT_cull_vertex */

+/* --------------------------- GL_EXT_debug_label -------------------------- */
+
+#ifndef GL_EXT_debug_label
+#define GL_EXT_debug_label 1
+
+#define GL_PROGRAM_PIPELINE_OBJECT_EXT 0x8A4F
+#define GL_PROGRAM_OBJECT_EXT 0x8B40
+#define GL_SHADER_OBJECT_EXT 0x8B48
+#define GL_BUFFER_OBJECT_EXT 0x9151
+#define GL_QUERY_OBJECT_EXT 0x9153
+#define GL_VERTEX_ARRAY_OBJECT_EXT 0x9154
+
+typedef void (GLAPIENTRY * PFNGLGETOBJECTLABELEXTPROC) (GLenum type, GLuint object, GLsizei bufSize, GLsizei* length, GLchar *label);
+typedef void (GLAPIENTRY * PFNGLLABELOBJECTEXTPROC) (GLenum type, GLuint object, GLsizei length, const GLchar* label);
+
+#define glGetObjectLabelEXT GLEW_GET_FUN(__glewGetObjectLabelEXT)
+#define glLabelObjectEXT GLEW_GET_FUN(__glewLabelObjectEXT)
+
+#define GLEW_EXT_debug_label GLEW_GET_VAR(__GLEW_EXT_debug_label)
+
+#endif /* GL_EXT_debug_label */
+
 /* -------------------------- GL_EXT_debug_marker -------------------------- */

 #ifndef GL_EXT_debug_marker
@ -9344,7 +9366,7 @@ typedef void (GLAPIENTRY * PFNGLTEXTUREMATERIALEXTPROC) (GLenum face, GLenum mod
 #define GL_EXT_multi_draw_arrays 1

 typedef void (GLAPIENTRY * PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, const GLint* first, const GLsizei *count, GLsizei primcount);
-typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, GLsizei* count, GLenum type, const GLvoid * const *indices, GLsizei primcount);
+typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, GLsizei* count, GLenum type, const GLvoid* const *indices, GLsizei primcount);

 #define glMultiDrawArraysEXT GLEW_GET_FUN(__glewMultiDrawArraysEXT)
 #define glMultiDrawElementsEXT GLEW_GET_FUN(__glewMultiDrawElementsEXT)
@ -9762,6 +9784,15 @@ typedef void (GLAPIENTRY * PFNGLMEMORYBARRIEREXTPROC) (GLbitfield barriers);

 #endif /* GL_EXT_shader_image_load_store */

+/* ----------------------- GL_EXT_shader_integer_mix ----------------------- */
+
+#ifndef GL_EXT_shader_integer_mix
+#define GL_EXT_shader_integer_mix 1
+
+#define GLEW_EXT_shader_integer_mix GLEW_GET_VAR(__GLEW_EXT_shader_integer_mix)
+
+#endif /* GL_EXT_shader_integer_mix */
+
 /* -------------------------- GL_EXT_shadow_funcs -------------------------- */

 #ifndef GL_EXT_shadow_funcs
@ -10891,7 +10922,7 @@ typedef void (GLAPIENTRY * PFNGLIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target,
 #define GL_IBM_multimode_draw_arrays 1

 typedef void (GLAPIENTRY * PFNGLMULTIMODEDRAWARRAYSIBMPROC) (const GLenum* mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
-typedef void (GLAPIENTRY * PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum* mode, const GLsizei *count, GLenum type, const GLvoid * const *indices, GLsizei primcount, GLint modestride);
+typedef void (GLAPIENTRY * PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum* mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount, GLint modestride);

 #define glMultiModeDrawArraysIBM GLEW_GET_FUN(__glewMultiModeDrawArraysIBM)
 #define glMultiModeDrawElementsIBM GLEW_GET_FUN(__glewMultiModeDrawElementsIBM)
@ -10956,14 +10987,14 @@ typedef void (GLAPIENTRY * PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum* mod
 #define GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM 103086
 #define GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM 103087

-typedef void (GLAPIENTRY * PFNGLCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid ** pointer, GLint ptrstride);
+typedef void (GLAPIENTRY * PFNGLCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid** pointer, GLint ptrstride);
 typedef void (GLAPIENTRY * PFNGLEDGEFLAGPOINTERLISTIBMPROC) (GLint stride, const GLboolean ** pointer, GLint ptrstride);
-typedef void (GLAPIENTRY * PFNGLFOGCOORDPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid ** pointer, GLint ptrstride);
-typedef void (GLAPIENTRY * PFNGLINDEXPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid ** pointer, GLint ptrstride);
-typedef void (GLAPIENTRY * PFNGLNORMALPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid ** pointer, GLint ptrstride);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid ** pointer, GLint ptrstride);
-typedef void (GLAPIENTRY * PFNGLTEXCOORDPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid ** pointer, GLint ptrstride);
-typedef void (GLAPIENTRY * PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid ** pointer, GLint ptrstride);
+typedef void (GLAPIENTRY * PFNGLFOGCOORDPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid** pointer, GLint ptrstride);
+typedef void (GLAPIENTRY * PFNGLINDEXPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid** pointer, GLint ptrstride);
+typedef void (GLAPIENTRY * PFNGLNORMALPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid** pointer, GLint ptrstride);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid** pointer, GLint ptrstride);
+typedef void (GLAPIENTRY * PFNGLTEXCOORDPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid** pointer, GLint ptrstride);
+typedef void (GLAPIENTRY * PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid** pointer, GLint ptrstride);

 #define glColorPointerListIBM GLEW_GET_FUN(__glewColorPointerListIBM)
 #define glEdgeFlagPointerListIBM GLEW_GET_FUN(__glewEdgeFlagPointerListIBM)
@ -11007,6 +11038,15 @@ typedef void (GLAPIENTRY * PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum ty

 #endif /* GL_INGR_interlace_read */

+/* ------------------- GL_INTEL_fragment_shader_ordering ------------------- */
+
+#ifndef GL_INTEL_fragment_shader_ordering
+#define GL_INTEL_fragment_shader_ordering 1
+
+#define GLEW_INTEL_fragment_shader_ordering GLEW_GET_VAR(__GLEW_INTEL_fragment_shader_ordering)
+
+#endif /* GL_INTEL_fragment_shader_ordering */
+
 /* -------------------------- GL_INTEL_map_texture ------------------------- */

 #ifndef GL_INTEL_map_texture
@ -11143,6 +11183,44 @@ typedef void (GLAPIENTRY * PFNGLPUSHDEBUGGROUPPROC) (GLenum source, GLuint id, G

 #endif /* GL_KHR_debug */

+/* ------------------ GL_KHR_texture_compression_astc_hdr ------------------ */
+
+#ifndef GL_KHR_texture_compression_astc_hdr
+#define GL_KHR_texture_compression_astc_hdr 1
+
+#define GL_COMPRESSED_RGBA_ASTC_4x4_KHR 0x93B0
+#define GL_COMPRESSED_RGBA_ASTC_5x4_KHR 0x93B1
+#define GL_COMPRESSED_RGBA_ASTC_5x5_KHR 0x93B2
+#define GL_COMPRESSED_RGBA_ASTC_6x5_KHR 0x93B3
+#define GL_COMPRESSED_RGBA_ASTC_6x6_KHR 0x93B4
+#define GL_COMPRESSED_RGBA_ASTC_8x5_KHR 0x93B5
+#define GL_COMPRESSED_RGBA_ASTC_8x6_KHR 0x93B6
+#define GL_COMPRESSED_RGBA_ASTC_8x8_KHR 0x93B7
+#define GL_COMPRESSED_RGBA_ASTC_10x5_KHR 0x93B8
+#define GL_COMPRESSED_RGBA_ASTC_10x6_KHR 0x93B9
+#define GL_COMPRESSED_RGBA_ASTC_10x8_KHR 0x93BA
+#define GL_COMPRESSED_RGBA_ASTC_10x10_KHR 0x93BB
+#define GL_COMPRESSED_RGBA_ASTC_12x10_KHR 0x93BC
+#define GL_COMPRESSED_RGBA_ASTC_12x12_KHR 0x93BD
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR 0x93D0
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR 0x93D1
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR 0x93D2
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR 0x93D3
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR 0x93D4
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR 0x93D5
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR 0x93D6
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR 0x93D7
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR 0x93D8
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR 0x93D9
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR 0x93DA
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR 0x93DB
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR 0x93DC
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR 0x93DD
+
+#define GLEW_KHR_texture_compression_astc_hdr GLEW_GET_VAR(__GLEW_KHR_texture_compression_astc_hdr)
+
+#endif /* GL_KHR_texture_compression_astc_hdr */
+
 /* ------------------ GL_KHR_texture_compression_astc_ldr ------------------ */

 #ifndef GL_KHR_texture_compression_astc_ldr
@ -11406,6 +11484,10 @@ typedef void (GLAPIENTRY * PFNGLUNIFORMHANDLEUI64VNVPROC) (GLint location, GLsiz
 #ifndef GL_NV_blend_equation_advanced
 #define GL_NV_blend_equation_advanced 1

+#define GL_XOR_NV 0x1506
+#define GL_RED_NV 0x1903
+#define GL_GREEN_NV 0x1904
+#define GL_BLUE_NV 0x1905
 #define GL_BLEND_PREMULTIPLIED_SRC_NV 0x9280
 #define GL_BLEND_OVERLAP_NV 0x9281
 #define GL_UNCORRELATED_NV 0x9282
@ -16293,6 +16375,9 @@ GLEW_FUN_EXPORT PFNGLCOPYTEXSUBIMAGE3DEXTPROC __glewCopyTexSubImage3DEXT;
 GLEW_FUN_EXPORT PFNGLCULLPARAMETERDVEXTPROC __glewCullParameterdvEXT;
 GLEW_FUN_EXPORT PFNGLCULLPARAMETERFVEXTPROC __glewCullParameterfvEXT;

+GLEW_FUN_EXPORT PFNGLGETOBJECTLABELEXTPROC __glewGetObjectLabelEXT;
+GLEW_FUN_EXPORT PFNGLLABELOBJECTEXTPROC __glewLabelObjectEXT;
+
 GLEW_FUN_EXPORT PFNGLINSERTEVENTMARKEREXTPROC __glewInsertEventMarkerEXT;
 GLEW_FUN_EXPORT PFNGLPOPGROUPMARKEREXTPROC __glewPopGroupMarkerEXT;
 GLEW_FUN_EXPORT PFNGLPUSHGROUPMARKEREXTPROC __glewPushGroupMarkerEXT;
@ -17751,6 +17836,7 @@ GLEW_VAR_EXPORT GLboolean __GLEW_EXT_convolution;
 GLEW_VAR_EXPORT GLboolean __GLEW_EXT_coordinate_frame;
 GLEW_VAR_EXPORT GLboolean __GLEW_EXT_copy_texture;
 GLEW_VAR_EXPORT GLboolean __GLEW_EXT_cull_vertex;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_debug_label;
 GLEW_VAR_EXPORT GLboolean __GLEW_EXT_debug_marker;
 GLEW_VAR_EXPORT GLboolean __GLEW_EXT_depth_bounds_test;
 GLEW_VAR_EXPORT GLboolean __GLEW_EXT_direct_state_access;
@ -17792,6 +17878,7 @@ GLEW_VAR_EXPORT GLboolean __GLEW_EXT_secondary_color;
 GLEW_VAR_EXPORT GLboolean __GLEW_EXT_separate_shader_objects;
 GLEW_VAR_EXPORT GLboolean __GLEW_EXT_separate_specular_color;
 GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shader_image_load_store;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shader_integer_mix;
 GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shadow_funcs;
 GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shared_texture_palette;
 GLEW_VAR_EXPORT GLboolean __GLEW_EXT_stencil_clear_tag;
@ -17846,10 +17933,12 @@ GLEW_VAR_EXPORT GLboolean __GLEW_IBM_texture_mirrored_repeat;
 GLEW_VAR_EXPORT GLboolean __GLEW_IBM_vertex_array_lists;
 GLEW_VAR_EXPORT GLboolean __GLEW_INGR_color_clamp;
 GLEW_VAR_EXPORT GLboolean __GLEW_INGR_interlace_read;
+GLEW_VAR_EXPORT GLboolean __GLEW_INTEL_fragment_shader_ordering;
 GLEW_VAR_EXPORT GLboolean __GLEW_INTEL_map_texture;
 GLEW_VAR_EXPORT GLboolean __GLEW_INTEL_parallel_arrays;
 GLEW_VAR_EXPORT GLboolean __GLEW_INTEL_texture_scissor;
 GLEW_VAR_EXPORT GLboolean __GLEW_KHR_debug;
+GLEW_VAR_EXPORT GLboolean __GLEW_KHR_texture_compression_astc_hdr;
 GLEW_VAR_EXPORT GLboolean __GLEW_KHR_texture_compression_astc_ldr;
 GLEW_VAR_EXPORT GLboolean __GLEW_KTX_buffer_region;
 GLEW_VAR_EXPORT GLboolean __GLEW_MESAX_texture_stack;
--- a/scripts/Emu.py
+++ b/scripts/Emu.py
@ -29,7 +29,7 @@
 #     }
 #  }

-from ApiCodeGen import typeCode, wrapCIf
+from ApiCodeGen import typeCode, wrapIf, wrapCIf
 from ApiUtil import typeIsVoid
 import re
 from string import Template
@ -107,7 +107,7 @@ def addSubstitution(name, formula, subs):
 #   A dictionary of stuff, the "emue"
 #   { 'name' : name, 'member' : member, 'impl' : { ... }, ... }

-def emuFindEntry(func, emuFormulae, member):
+def emuFindEntry(func, emuFormulae, member, ifdef = None):

  if emuFormulae==None:
    return None
@ -161,7 +161,7 @@ def emuFindEntry(func, emuFormulae, member):
    dummyRetVal = ''
    if not typeIsVoid(rType):
      dummyRetVal = '(( %s )0)' % rType
-    emue = { 'name' : name, 'member' : member, 'dummyretval' : dummyRetVal }
+    emue = { 'name' : name, 'member' : member, 'ifdef' : ifdef, 'dummyretval' : dummyRetVal }
    subs = deepcopy(arg)
    for l in range( len(match.groups()) + 1):
      subs['m%d' % l] = match.group( l )
@ -205,7 +205,7 @@ def emuCodeGen(emue,section):
        code = code.strip().split('\n')

      if i.get('member')!=None:
-        tmp.extend(wrapCIf('_context->%s'%i['member'],code))
+        tmp.extend(wrapIf(i.get('ifdef'),wrapCIf('_context->%s'%i['member'],code)))
      else:
        tmp.extend(code)

--- a/scripts/EmuFrame.py
+++ b/scripts/EmuFrame.py
@ -8,7 +8,8 @@ formulae = {
      'entries' : [ 'glFinish' ],
      'post' : '''
 // Notify Regal::Frame about the glFinish() event
-_context->frame->glFinish(*_context);'''
+_context->frame->glFinish(*_context);
+'''
  }

 #  # Capture images or md5s for other functions too, such as glViewport
@ -28,80 +29,91 @@ formulaeGlobal = {

    'GL_GREMEDY_frame_terminator' : {
        'entries' : [ 'glFrameTerminatorGREMEDY' ],
-        'impl' : [
-                   '// Notify Regal::Frame about the frame terminator event.',
-                   'if (_context && _context->frame)',
-                   '  _context->frame->glFrameTerminatorGREMEDY(*_context);',
-                   'RegalAssert(_context->info);',
-                   '// Return to application unless GL_GREMEDY_frame_terminator is supported by the driver.',
-                   'if (!_context->info->gl_gremedy_frame_terminator) return;' ]
+        'impl' : '''
+#if REGAL_FRAME
+// Notify Regal::Frame about the frame terminator event.
+if (_context && _context->frame)
+  _context->frame->glFrameTerminatorGREMEDY(*_context);
+#endif
+RegalAssert(_context->info);
+// Return to application unless GL_GREMEDY_frame_terminator is supported by the driver.
+if (!_context->info->gl_gremedy_frame_terminator) return;
+'''
    },

    # wglSwapBuffers

    'wglSwapBuffers' : {
        'entries' : [ 'wglSwapBuffers' ],
-        'impl' : [ 'RegalContext *_context = REGAL_GET_CONTEXT();',
-                   '// Notify Regal::Frame about the swap buffers event.',
-                   'if (_context && _context->frame)',
-                   '    _context->frame->wglSwapBuffers(*_context);'
-                 ]
+        'impl' : '''
+#if REGAL_FRAME
+RegalContext *_context = REGAL_GET_CONTEXT();
+// Notify Regal::Frame about the swap buffers event.
+if (_context && _context->frame)
+    _context->frame->wglSwapBuffers(*_context);
+#endif'''
    },

    # glXSwapBuffers

    'glXSwapBuffers' : {
        'entries' : [ 'glXSwapBuffers' ],
-        'impl' : [ '// Keep track of X11 Display and GLXDrawable for logging purposes.',
-                   'RegalContext *_context = REGAL_GET_CONTEXT();',
-                   'if (_context)',
-                   '{',
-                   '    #if REGAL_SYS_X11',
-                   '    _context->x11Display  = dpy;',
-                   '    #endif',
-                   '    _context->x11Drawable = drawable;',
-                   '}',
-                   '// Notify Regal::Frame about the swap buffers event.',
-                   'if (_context && _context->frame)',
-                   '    _context->frame->glXSwapBuffers(*_context);'
-                 ]
+        'impl' : '''
+// Keep track of X11 Display and GLXDrawable for logging purposes.
+RegalContext *_context = REGAL_GET_CONTEXT();
+if (_context)
+{
+    #if REGAL_SYS_X11
+    _context->x11Display  = dpy;
+    #endif
+    _context->x11Drawable = drawable;
+}
+#if REGAL_FRAME
+// Notify Regal::Frame about the swap buffers event.
+if (_context && _context->frame)
+    _context->frame->glXSwapBuffers(*_context);
+#endif'''
    },

    # glXMakeCurrent

    'glXMakeCurrent' : {
        'entries' : [ 'glXMakeCurrent' ],
-        'impl' : [ '// Keep track of X11 Display and GLXDrawable for logging purposes.',
-                   'RegalContext *_context = REGAL_GET_CONTEXT();',
-                   'if (_context)',
-                   '{',
-                   '    #if REGAL_SYS_X11',
-                   '    _context->x11Display  = dpy;',
-                   '    #endif',
-                   '    _context->x11Drawable = drawable;',
-                   '}'
-                 ]
+        'impl' : '''
+// Keep track of X11 Display and GLXDrawable for logging purposes.
+RegalContext *_context = REGAL_GET_CONTEXT();
+if (_context)
+{
+    #if REGAL_SYS_X11
+    _context->x11Display  = dpy;
+    #endif
+    _context->x11Drawable = drawable;
+}'''
    },

    # eglSwapBuffers

    'eglSwapBuffers' : {
        'entries' : [ 'eglSwapBuffers' ],
-        'impl' : [ 'RegalContext *_context = REGAL_GET_CONTEXT();',
-                   '// Notify Regal::Frame about the swap buffers event.',
-                   'if (_context && _context->frame)',
-                   '    _context->frame->eglSwapBuffers(*_context);'
-                 ]
+        'impl' : '''
+#if REGAL_FRAME
+RegalContext *_context = REGAL_GET_CONTEXT();
+// Notify Regal::Frame about the swap buffers event.
+if (_context && _context->frame)
+    _context->frame->eglSwapBuffers(*_context);
+#endif'''
    },

    # CGLFlushDrawable

    'CGLFlushDrawable' : {
        'entries' : [ 'CGLFlushDrawable' ],
-        'impl' : [ 'RegalContext *_context = REGAL_GET_CONTEXT();',
-                   '// Notify Regal::Frame about the flush drawable event.',
-                   'if (_context && _context->frame)',
-                   '    _context->frame->CGLFlushDrawable(*_context);'
-                 ]
+        'impl' : '''
+#if REGAL_FRAME
+RegalContext *_context = REGAL_GET_CONTEXT();
+// Notify Regal::Frame about the flush drawable event.
+if (_context && _context->frame)
+    _context->frame->CGLFlushDrawable(*_context);
+#endif'''
    }
 }
--- a/scripts/EmuIff.py
+++ b/scripts/EmuIff.py
@ -270,14 +270,5 @@ iffFormulae = {
    'CreateShader' : {
        'entries' : [ 'glCreateShader(ObjectARB)?', ],
        'impl' : [ 'return _context->iff->CreateShader( _context, ${arg0} );', ],
-    },
-    'Hint' : {
-        'entries' : [ 'glHint' ],
-        'impl' : [ ],
-    },
-    'TexSubImage' : {
-        'entries' : [ 'glTexSubImage2D' ],
-        'impl' : [ ],
    }
 }
-
--- a/scripts/api/gl.py
+++ b/scripts/api/gl.py
@ -18751,19 +18751,6 @@ glFramebufferTexture.trace = True
 glFramebufferTexture.play = True
 gl.add(glFramebufferTexture)

-glFramebufferTextureFace = Function('glFramebufferTextureFace')
-glFramebufferTextureFace.ret = Return('void')
-glFramebufferTextureFace.add( Input( 'target','GLenum' ))
-glFramebufferTextureFace.add( Input( 'attachment','GLenum' ))
-glFramebufferTextureFace.add( Input( 'texture','GLuint' ))
-glFramebufferTextureFace.add( Input( 'level','GLint' ))
-glFramebufferTextureFace.add( Input( 'face','GLenum' ))
-glFramebufferTextureFace.version = '3.2'
-glFramebufferTextureFace.category = 'GL_VERSION_3_2'
-glFramebufferTextureFace.trace = True
-glFramebufferTextureFace.play = True
-gl.add(glFramebufferTextureFace)
-
 glGetBufferParameteri64v = Function('glGetBufferParameteri64v')
 glGetBufferParameteri64v.ret = Return('void')
 glGetBufferParameteri64v.add( Input( 'target','GLenum' ))
@ -33268,7 +33255,7 @@ glGetPixelTransformParameterfvEXT = Function('glGetPixelTransformParameterfvEXT'
 glGetPixelTransformParameterfvEXT.ret = Return('void')
 glGetPixelTransformParameterfvEXT.add( Input( 'target','GLenum' ))
 glGetPixelTransformParameterfvEXT.add( Input( 'pname','GLenum' ))
-glGetPixelTransformParameterfvEXT.add( Input( 'params','const GLfloat *' ))
+glGetPixelTransformParameterfvEXT.add( Output( 'params','GLfloat *' ))
 glGetPixelTransformParameterfvEXT.version = ''
 glGetPixelTransformParameterfvEXT.category = 'GL_EXT_pixel_transform'
 glGetPixelTransformParameterfvEXT.trace = True
@ -33279,7 +33266,7 @@ glGetPixelTransformParameterivEXT = Function('glGetPixelTransformParameterivEXT'
 glGetPixelTransformParameterivEXT.ret = Return('void')
 glGetPixelTransformParameterivEXT.add( Input( 'target','GLenum' ))
 glGetPixelTransformParameterivEXT.add( Input( 'pname','GLenum' ))
-glGetPixelTransformParameterivEXT.add( Input( 'params','const GLint *' ))
+glGetPixelTransformParameterivEXT.add( Output( 'params','GLint *' ))
 glGetPixelTransformParameterivEXT.version = ''
 glGetPixelTransformParameterivEXT.category = 'GL_EXT_pixel_transform'
 glGetPixelTransformParameterivEXT.trace = True
--- a/scripts/regal/Regal.py
+++ b/scripts/regal/Regal.py
@ -361,7 +361,7 @@ def apiFuncDefineCode(apis, args):
      c = ''
      c += 'REGAL_DECL %sREGAL_CALL %s(%s) \n{\n' % (rType, name, params)

-      emue = [ emuFindEntry( function, i['formulae'], i['member'] ) for i in emuRegal ]
+      emue = [ emuFindEntry( function, i['formulae'], i['member'], i['ifdef'] ) for i in emuRegal ]

      if function.needsContext:
        c += '  RegalContext *_context = REGAL_GET_CONTEXT();\n'
--- a/scripts/regal/RegalContext.py
+++ b/scripts/regal/RegalContext.py
@ -54,8 +54,8 @@ emuRegal = [
    { 'type' : None,       'include' : None,            'member' : None,     'conditional' : None,  'ifdef' : None,  'formulae' : lookupFormulae },
    { 'type' : 'Marker',   'include' : 'RegalMarker.h', 'member' : 'marker', 'conditional' : None,  'ifdef' : None,  'formulae' : markerFormulae },
    { 'type' : None,       'include' : None,            'member' : None,     'conditional' : None,  'ifdef' : None,  'formulae' : markerFormulaeGlobal },
-    { 'type' : 'Frame',    'include' : 'RegalFrame.h',  'member' : 'frame',  'conditional' : None,  'ifdef' : None,  'formulae' : frameFormulae },
-    { 'type' : None,       'include' : None,            'member' : None,     'conditional' : None,  'ifdef' : None,  'formulae' : frameFormulaeGlobal },
+    { 'type' : 'Frame',    'include' : 'RegalFrame.h',  'member' : 'frame',  'conditional' : None,  'ifdef' : 'REGAL_FRAME',  'formulae' : frameFormulae },
+    { 'type' : None,       'include' : None,            'member' : None,     'conditional' : None,  'ifdef' : 'REGAL_FRAME',  'formulae' : frameFormulaeGlobal },
    { 'type' : None,       'include' : None,            'member' : None,     'conditional' : None,  'ifdef' : None,  'formulae' : extensionQueryFormulae },
    { 'type' : None,       'include' : None,            'member' : None,     'conditional' : None,  'ifdef' : None,  'formulae' : errorStringFormulae },
    { 'type' : None,       'include' : None,            'member' : None,     'conditional' : None,  'ifdef' : None,  'formulae' : logFormulae    },
@ -64,7 +64,7 @@ emuRegal = [
 ]


-# RegalDispathEmu.cpp fixed-function emulation
+# RegalDispatchEmu.cpp fixed-function emulation

 emu = [
    { 'type' : 'Emu::Obj',        'include' : 'RegalObj.h',        'member' : 'obj',    'plugin' : False, 'forced' : 'Config::forceEmuObj        || REGAL_FORCE_EMU_OBJ',        'conditional' : 'Config::enableEmuObj       ', 'ifdef' : 'REGAL_EMU_OBJ',        'formulae' : objFormulae        },
@ -494,7 +494,7 @@ def generateContextHeader(apis, args):
    for i in emuRegal:
      if i.get('member')!=None:
        emuForwardDeclare += 'struct %s;\n' % i['type']
-        emuMemberDeclare  += '  scoped_ptr<%-18s> %s;\n' % ( i['type'], i['member'] )
+        emuMemberDeclare  += wrapIf(i['ifdef'],'  scoped_ptr<%-18s> %s;\n' % ( i['type'], i['member'] ))

    emuForwardDeclare += '#if REGAL_EMULATION\n'
    emuMemberDeclare  += '#if REGAL_EMULATION\n'
@ -563,7 +563,6 @@ def generateContextSource(apis, args):
    emuMemberConstruct = ''
    emuMemberInit      = ''
    emuMemberCleanup   = ''
-    emuMemberDestruct  = ''
    emulatedExtensions = []
    emuEmulationForced = ''
    emuEmulationEnabled = ''
@ -572,15 +571,14 @@ def generateContextSource(apis, args):
      if i['include']:
        includes        += '#include "%s"\n' % i['include']
      if i['member']:
-        memberConstruct += '  %s(NULL),\n' % ( i['member'] )
-        memberInit      += indent(wrapCIf('!%s' % i['member'],'%s = new %s;\n'%(i['member'],i['type'])),'  ')
+        memberConstruct += wrapIf(i['ifdef'],'  %s(NULL),\n' %i['member'])
+        memberInit      += indent(wrapIf(i['ifdef'],wrapCIf('!%s' % i['member'],'%s = new %s;\n'%(i['member'],i['type']))),'  ')

    emuMemberConstruct += '  emuLevel(0),\n'

    emuMemberInit += '    // emu\n'
    emuMemberInit += '    emuLevel = %d;\n' % ( len( emu ) - 1 )
    emuMemberCleanup  += '  // emu\n'
-    emuMemberDestruct += '  // emu\n'

    for api in apis:
      for extension in api.extensions:
--- a/scripts/regal/RegalDispatchTraceExclude.py
+++ b/scripts/regal/RegalDispatchTraceExclude.py
@ -1,22 +1,9 @@
 # we need to exclude these functions from the dispatch becuse they do not exist in apitrace
 exclude = [
-  'glFramebufferTextureFace',
-  'glClearNamedBufferSubDataEXT',

  'glMatrixIndexPointerOES',
  'glWeightPointerOES',

-  # DSA
-
-  'glDisableClientStateiEXT',
-  'glEnableClientStateiEXT',
-  'glGetDoublei_vEXT',
-  'glGetFloati_vEXT',
-  'glGetPointeri_vEXT',
-  'glMultiTexImage1DEXT',
-  'glMultiTexImage2DEXT',
-  'glMultiTexImage3DEXT',
-
  'GL_AMD_stencil_operation_extended',
  'GL_ARB_cl_event',

@ -33,9 +20,6 @@ exclude = [
  'GL_APPLE_sync',
  'GL_APPLE_copy_texture_levels',

-  'GL_NV_bindless_texture',
-  'GL_NV_draw_texture',
-
  'GL_EXT_fragment_lighting',
  'GL_EXT_map_buffer_range',
  'GL_EXT_multiview_draw_buffers',
@ -47,18 +31,12 @@ exclude = [

  'GL_INTEL_texture_scissor',

-  'GL_NVX_conditional_render',
-
  'GL_NV_framebuffer_blit',
  'GL_NV_vdpau_interop',

  'GL_OES_single_precision',

-# 'GL_EXT_pixel_transform',
-  'glGetPixelTransformParameterfvEXT',
-  'glGetPixelTransformParameterivEXT',
-
-# ES
+  # ES

  'GL_NV_non_square_matrices',
  'GL_NV_copy_buffer',
@ -102,16 +80,9 @@ exclude = [
  'wglGetPixelFormatAttribivEXT',
  'wglEnumGpuDevicesNV',

-  # https://github.com/apitrace/apitrace/pull/130
-
-  'glTextureImage1DEXT',
-  'glTextureImage2DEXT',
-  'glTextureImage3DEXT',
-
  # GL 4.4 and new extensions not in apitrace yet

  'GL_AMD_interleaved_elements',
-  'GL_AMD_sparse_texture',
  'GL_ARB_bindless_texture',
  'GL_ARB_compute_variable_group_size',
  'GL_ARB_indirect_parameters',
--- a/src/apitrace/dispatch/compat.h
+++ b/src/apitrace/dispatch/compat.h
@ -725,7 +725,7 @@


 #ifndef __inline
-#define __inline static __inline__
+#define __inline __inline__
 #endif

 #ifndef DECLSPEC_DEPRECATED
--- a/src/apitrace/dispatch/glproc.hpp
+++ b/src/apitrace/dispatch/glproc.hpp
@ -22757,8 +22757,12 @@ static inline GLuint APIENTRY _glGetDebugMessageLogARB(GLuint count, GLsizei buf
    if (!_glGetDebugMessageLogARB_ptr) {
        _glGetDebugMessageLogARB_ptr = (PFN_GLGETDEBUGMESSAGELOGARB)_getPrivateProcAddress(_name);
        if (!_glGetDebugMessageLogARB_ptr) {
-            os::log("error: unavailable function %s\n", _name);
-            os::abort();
+    if (sources != 0) *sources = 0;
+    if (types != 0) *types = 0;
+    if (ids != 0) *ids = 0;
+    if (severities != 0) *severities = 0;
+    if (lengths != 0) *lengths = 0;
+    if (messageLog != 0 && bufsize > 0) *messageLog = 0;
        }
    }
    return _glGetDebugMessageLogARB_ptr(count, bufsize, sources, types, ids, severities, lengths, messageLog);
@ -23342,8 +23346,12 @@ static inline GLuint APIENTRY _glGetDebugMessageLog(GLuint count, GLsizei bufsiz
    if (!_glGetDebugMessageLog_ptr) {
        _glGetDebugMessageLog_ptr = (PFN_GLGETDEBUGMESSAGELOG)_getPrivateProcAddress(_name);
        if (!_glGetDebugMessageLog_ptr) {
-            os::log("error: unavailable function %s\n", _name);
-            os::abort();
+    if (sources != 0) *sources = 0;
+    if (types != 0) *types = 0;
+    if (ids != 0) *ids = 0;
+    if (severities != 0) *severities = 0;
+    if (lengths != 0) *lengths = 0;
+    if (messageLog != 0 && bufsize > 0) *messageLog = 0;
        }
    }
    return _glGetDebugMessageLog_ptr(count, bufsize, sources, types, ids, severities, lengths, messageLog);
@ -23402,8 +23410,8 @@ static inline void APIENTRY _glGetObjectLabel(GLenum identifier, GLuint name, GL
    if (!_glGetObjectLabel_ptr) {
        _glGetObjectLabel_ptr = (PFN_GLGETOBJECTLABEL)_getPrivateProcAddress(_name);
        if (!_glGetObjectLabel_ptr) {
-            os::log("warning: ignoring call to unavailable function %s\n", _name);
-            return;
+    if (length != 0) *length = 0;
+    if (label != 0 && bufSize > 0) *label = 0;
        }
    }
    _glGetObjectLabel_ptr(identifier, name, bufSize, length, label);
@ -23432,8 +23440,8 @@ static inline void APIENTRY _glGetObjectPtrLabel(const void * ptr, GLsizei bufSi
    if (!_glGetObjectPtrLabel_ptr) {
        _glGetObjectPtrLabel_ptr = (PFN_GLGETOBJECTPTRLABEL)_getPrivateProcAddress(_name);
        if (!_glGetObjectPtrLabel_ptr) {
-            os::log("warning: ignoring call to unavailable function %s\n", _name);
-            return;
+    if (length != 0) *length = 0;
+    if (label != 0 && bufSize > 0) *label = 0;
        }
    }
    _glGetObjectPtrLabel_ptr(ptr, bufSize, length, label);
@ -23484,10 +23492,10 @@ static inline void APIENTRY _glClearNamedBufferDataEXT(GLuint buffer, GLenum int
    _glClearNamedBufferDataEXT_ptr(buffer, internalformat, format, type, data);
 }

-typedef void (APIENTRY * PFN_GLCLEARNAMEDBUFFERSUBDATAEXT)(GLuint buffer, GLenum internalformat, GLenum format, GLenum type, GLsizeiptr offset, GLsizeiptr size, const void * data);
+typedef void (APIENTRY * PFN_GLCLEARNAMEDBUFFERSUBDATAEXT)(GLuint buffer, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void * data);
 static PFN_GLCLEARNAMEDBUFFERSUBDATAEXT _glClearNamedBufferSubDataEXT_ptr = NULL;

-static inline void APIENTRY _glClearNamedBufferSubDataEXT(GLuint buffer, GLenum internalformat, GLenum format, GLenum type, GLsizeiptr offset, GLsizeiptr size, const void * data) {
+static inline void APIENTRY _glClearNamedBufferSubDataEXT(GLuint buffer, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void * data) {
    const char *_name = "glClearNamedBufferSubDataEXT";
    if (!_glClearNamedBufferSubDataEXT_ptr) {
        _glClearNamedBufferSubDataEXT_ptr = (PFN_GLCLEARNAMEDBUFFERSUBDATAEXT)_getPrivateProcAddress(_name);
@ -23496,7 +23504,7 @@ static inline void APIENTRY _glClearNamedBufferSubDataEXT(GLuint buffer, GLenum
            return;
        }
    }
-    _glClearNamedBufferSubDataEXT_ptr(buffer, internalformat, format, type, offset, size, data);
+    _glClearNamedBufferSubDataEXT_ptr(buffer, internalformat, offset, size, format, type, data);
 }

 typedef void (APIENTRY * PFN_GLDISPATCHCOMPUTE)(GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z);
@ -28584,10 +28592,10 @@ static inline GLboolean APIENTRY _glIsPathNV(GLuint path) {
    return _glIsPathNV_ptr(path);
 }

-typedef void (APIENTRY * PFN_GLPATHCOMMANDSNV)(GLuint path, GLsizei numCommands, const GLubyte * commands, GLsizei numCoords, GLenum coordType, const GLvoid * coord);
+typedef void (APIENTRY * PFN_GLPATHCOMMANDSNV)(GLuint path, GLsizei numCommands, const GLubyte * commands, GLsizei numCoords, GLenum coordType, const GLvoid * coords);
 static PFN_GLPATHCOMMANDSNV _glPathCommandsNV_ptr = NULL;

-static inline void APIENTRY _glPathCommandsNV(GLuint path, GLsizei numCommands, const GLubyte * commands, GLsizei numCoords, GLenum coordType, const GLvoid * coord) {
+static inline void APIENTRY _glPathCommandsNV(GLuint path, GLsizei numCommands, const GLubyte * commands, GLsizei numCoords, GLenum coordType, const GLvoid * coords) {
    const char *_name = "glPathCommandsNV";
    if (!_glPathCommandsNV_ptr) {
        _glPathCommandsNV_ptr = (PFN_GLPATHCOMMANDSNV)_getPrivateProcAddress(_name);
@ -28596,7 +28604,7 @@ static inline void APIENTRY _glPathCommandsNV(GLuint path, GLsizei numCommands,
            return;
        }
    }
-    _glPathCommandsNV_ptr(path, numCommands, commands, numCoords, coordType, coord);
+    _glPathCommandsNV_ptr(path, numCommands, commands, numCoords, coordType, coords);
 }

 typedef void (APIENTRY * PFN_GLPATHCOORDSNV)(GLuint path, GLsizei numCoords, GLenum coordType, const GLvoid * coords);
@ -28914,10 +28922,10 @@ static inline void APIENTRY _glStencilStrokePathInstancedNV(GLsizei numPaths, GL
    _glStencilStrokePathInstancedNV_ptr(numPaths, pathNameType, paths, pathBase, reference, mask, transformType, transformValues);
 }

-typedef void (APIENTRY * PFN_GLPATHCOVERDEPTHFUNCNV)(GLenum func);
+typedef void (APIENTRY * PFN_GLPATHCOVERDEPTHFUNCNV)(GLenum zfunc);
 static PFN_GLPATHCOVERDEPTHFUNCNV _glPathCoverDepthFuncNV_ptr = NULL;

-static inline void APIENTRY _glPathCoverDepthFuncNV(GLenum func) {
+static inline void APIENTRY _glPathCoverDepthFuncNV(GLenum zfunc) {
    const char *_name = "glPathCoverDepthFuncNV";
    if (!_glPathCoverDepthFuncNV_ptr) {
        _glPathCoverDepthFuncNV_ptr = (PFN_GLPATHCOVERDEPTHFUNCNV)_getPrivateProcAddress(_name);
@ -28926,7 +28934,7 @@ static inline void APIENTRY _glPathCoverDepthFuncNV(GLenum func) {
            return;
        }
    }
-    _glPathCoverDepthFuncNV_ptr(func);
+    _glPathCoverDepthFuncNV_ptr(zfunc);
 }

 typedef void (APIENTRY * PFN_GLPATHCOLORGENNV)(GLenum color, GLenum genMode, GLenum colorFormat, const GLfloat * coeffs);
@ -36834,10 +36842,10 @@ static inline void APIENTRY _glTextureParameterivEXT(GLuint texture, GLenum targ
    _glTextureParameterivEXT_ptr(texture, target, pname, params);
 }

-typedef void (APIENTRY * PFN_GLTEXTUREIMAGE1DEXT)(GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid * pixels);
+typedef void (APIENTRY * PFN_GLTEXTUREIMAGE1DEXT)(GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid * pixels);
 static PFN_GLTEXTUREIMAGE1DEXT _glTextureImage1DEXT_ptr = NULL;

-static inline void APIENTRY _glTextureImage1DEXT(GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid * pixels) {
+static inline void APIENTRY _glTextureImage1DEXT(GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid * pixels) {
    const char *_name = "glTextureImage1DEXT";
    if (!_glTextureImage1DEXT_ptr) {
        _glTextureImage1DEXT_ptr = (PFN_GLTEXTUREIMAGE1DEXT)_getPrivateProcAddress(_name);
@ -36849,10 +36857,10 @@ static inline void APIENTRY _glTextureImage1DEXT(GLuint texture, GLenum target,
    _glTextureImage1DEXT_ptr(texture, target, level, internalformat, width, border, format, type, pixels);
 }

-typedef void (APIENTRY * PFN_GLTEXTUREIMAGE2DEXT)(GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid * pixels);
+typedef void (APIENTRY * PFN_GLTEXTUREIMAGE2DEXT)(GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid * pixels);
 static PFN_GLTEXTUREIMAGE2DEXT _glTextureImage2DEXT_ptr = NULL;

-static inline void APIENTRY _glTextureImage2DEXT(GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid * pixels) {
+static inline void APIENTRY _glTextureImage2DEXT(GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid * pixels) {
    const char *_name = "glTextureImage2DEXT";
    if (!_glTextureImage2DEXT_ptr) {
        _glTextureImage2DEXT_ptr = (PFN_GLTEXTUREIMAGE2DEXT)_getPrivateProcAddress(_name);
@ -37029,10 +37037,10 @@ static inline void APIENTRY _glGetTextureLevelParameterivEXT(GLuint texture, GLe
    _glGetTextureLevelParameterivEXT_ptr(texture, target, level, pname, params);
 }

-typedef void (APIENTRY * PFN_GLTEXTUREIMAGE3DEXT)(GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid * pixels);
+typedef void (APIENTRY * PFN_GLTEXTUREIMAGE3DEXT)(GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid * pixels);
 static PFN_GLTEXTUREIMAGE3DEXT _glTextureImage3DEXT_ptr = NULL;

-static inline void APIENTRY _glTextureImage3DEXT(GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid * pixels) {
+static inline void APIENTRY _glTextureImage3DEXT(GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid * pixels) {
    const char *_name = "glTextureImage3DEXT";
    if (!_glTextureImage3DEXT_ptr) {
        _glTextureImage3DEXT_ptr = (PFN_GLTEXTUREIMAGE3DEXT)_getPrivateProcAddress(_name);
@ -37134,10 +37142,10 @@ static inline void APIENTRY _glMultiTexParameterivEXT(GLenum texunit, GLenum tar
    _glMultiTexParameterivEXT_ptr(texunit, target, pname, params);
 }

-typedef void (APIENTRY * PFN_GLMULTITEXIMAGE1DEXT)(GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid * pixels);
+typedef void (APIENTRY * PFN_GLMULTITEXIMAGE1DEXT)(GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid * pixels);
 static PFN_GLMULTITEXIMAGE1DEXT _glMultiTexImage1DEXT_ptr = NULL;

-static inline void APIENTRY _glMultiTexImage1DEXT(GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid * pixels) {
+static inline void APIENTRY _glMultiTexImage1DEXT(GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid * pixels) {
    const char *_name = "glMultiTexImage1DEXT";
    if (!_glMultiTexImage1DEXT_ptr) {
        _glMultiTexImage1DEXT_ptr = (PFN_GLMULTITEXIMAGE1DEXT)_getPrivateProcAddress(_name);
@ -37149,10 +37157,10 @@ static inline void APIENTRY _glMultiTexImage1DEXT(GLenum texunit, GLenum target,
    _glMultiTexImage1DEXT_ptr(texunit, target, level, internalformat, width, border, format, type, pixels);
 }

-typedef void (APIENTRY * PFN_GLMULTITEXIMAGE2DEXT)(GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid * pixels);
+typedef void (APIENTRY * PFN_GLMULTITEXIMAGE2DEXT)(GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid * pixels);
 static PFN_GLMULTITEXIMAGE2DEXT _glMultiTexImage2DEXT_ptr = NULL;

-static inline void APIENTRY _glMultiTexImage2DEXT(GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid * pixels) {
+static inline void APIENTRY _glMultiTexImage2DEXT(GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid * pixels) {
    const char *_name = "glMultiTexImage2DEXT";
    if (!_glMultiTexImage2DEXT_ptr) {
        _glMultiTexImage2DEXT_ptr = (PFN_GLMULTITEXIMAGE2DEXT)_getPrivateProcAddress(_name);
@ -37329,10 +37337,10 @@ static inline void APIENTRY _glGetMultiTexLevelParameterivEXT(GLenum texunit, GL
    _glGetMultiTexLevelParameterivEXT_ptr(texunit, target, level, pname, params);
 }

-typedef void (APIENTRY * PFN_GLMULTITEXIMAGE3DEXT)(GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid * pixels);
+typedef void (APIENTRY * PFN_GLMULTITEXIMAGE3DEXT)(GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid * pixels);
 static PFN_GLMULTITEXIMAGE3DEXT _glMultiTexImage3DEXT_ptr = NULL;

-static inline void APIENTRY _glMultiTexImage3DEXT(GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid * pixels) {
+static inline void APIENTRY _glMultiTexImage3DEXT(GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid * pixels) {
    const char *_name = "glMultiTexImage3DEXT";
    if (!_glMultiTexImage3DEXT_ptr) {
        _glMultiTexImage3DEXT_ptr = (PFN_GLMULTITEXIMAGE3DEXT)_getPrivateProcAddress(_name);
@ -42257,8 +42265,11 @@ static inline GLuint APIENTRY _glGetDebugMessageLogAMD(GLuint count, GLsizei buf
    if (!_glGetDebugMessageLogAMD_ptr) {
        _glGetDebugMessageLogAMD_ptr = (PFN_GLGETDEBUGMESSAGELOGAMD)_getPrivateProcAddress(_name);
        if (!_glGetDebugMessageLogAMD_ptr) {
-            os::log("error: unavailable function %s\n", _name);
-            os::abort();
+    if (categories != 0) *categories = 0;
+    if (ids != 0) *ids = 0;
+    if (severities != 0) *severities = 0;
+    if (lengths != 0) *lengths = 0;
+    if (message != 0 && bufsize > 0) *message = 0;
        }
    }
    return _glGetDebugMessageLogAMD_ptr(count, bufsize, categories, severities, ids, lengths, message);
@ -47210,6 +47221,51 @@ static inline void GL_APIENTRY _glFramebufferTexture2DMultisampleEXT(GLenum targ
    _glFramebufferTexture2DMultisampleEXT_ptr(target, attachment, textarget, texture, level, samples);
 }

+typedef void (GL_APIENTRY * PFN_GLTEXSTORAGE1DEXT)(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
+static PFN_GLTEXSTORAGE1DEXT _glTexStorage1DEXT_ptr = NULL;
+
+static inline void GL_APIENTRY _glTexStorage1DEXT(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width) {
+    const char *_name = "glTexStorage1DEXT";
+    if (!_glTexStorage1DEXT_ptr) {
+        _glTexStorage1DEXT_ptr = (PFN_GLTEXSTORAGE1DEXT)_getPrivateProcAddress(_name);
+        if (!_glTexStorage1DEXT_ptr) {
+            os::log("warning: ignoring call to unavailable function %s\n", _name);
+            return;
+        }
+    }
+    _glTexStorage1DEXT_ptr(target, levels, internalformat, width);
+}
+
+typedef void (GL_APIENTRY * PFN_GLTEXSTORAGE2DEXT)(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+static PFN_GLTEXSTORAGE2DEXT _glTexStorage2DEXT_ptr = NULL;
+
+static inline void GL_APIENTRY _glTexStorage2DEXT(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height) {
+    const char *_name = "glTexStorage2DEXT";
+    if (!_glTexStorage2DEXT_ptr) {
+        _glTexStorage2DEXT_ptr = (PFN_GLTEXSTORAGE2DEXT)_getPrivateProcAddress(_name);
+        if (!_glTexStorage2DEXT_ptr) {
+            os::log("warning: ignoring call to unavailable function %s\n", _name);
+            return;
+        }
+    }
+    _glTexStorage2DEXT_ptr(target, levels, internalformat, width, height);
+}
+
+typedef void (GL_APIENTRY * PFN_GLTEXSTORAGE3DEXT)(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+static PFN_GLTEXSTORAGE3DEXT _glTexStorage3DEXT_ptr = NULL;
+
+static inline void GL_APIENTRY _glTexStorage3DEXT(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth) {
+    const char *_name = "glTexStorage3DEXT";
+    if (!_glTexStorage3DEXT_ptr) {
+        _glTexStorage3DEXT_ptr = (PFN_GLTEXSTORAGE3DEXT)_getPrivateProcAddress(_name);
+        if (!_glTexStorage3DEXT_ptr) {
+            os::log("warning: ignoring call to unavailable function %s\n", _name);
+            return;
+        }
+    }
+    _glTexStorage3DEXT_ptr(target, levels, internalformat, width, height, depth);
+}
+
 #ifdef RETRACE
 #define glFrustumf _glFrustumf
 #define glOrthof _glOrthof
@ -47342,6 +47398,9 @@ static inline void GL_APIENTRY _glFramebufferTexture2DMultisampleEXT(GLenum targ
 #define glValidateProgramPipelineEXT _glValidateProgramPipelineEXT
 #define glGetProgramPipelineInfoLogEXT _glGetProgramPipelineInfoLogEXT
 #define glFramebufferTexture2DMultisampleEXT _glFramebufferTexture2DMultisampleEXT
+#define glTexStorage1DEXT _glTexStorage1DEXT
+#define glTexStorage2DEXT _glTexStorage2DEXT
+#define glTexStorage3DEXT _glTexStorage3DEXT
 #endif /* RETRACE */


--- a/src/apitrace/specs/glapi.py
+++ b/src/apitrace/specs/glapi.py
@ -1376,7 +1376,7 @@ glapi.addFunctions([
    GlFunction(Void, "glClearBufferData", [(GLenum, "target"), (GLenum, "internalformat"), (GLenum, "format"), (GLenum, "type"), (Blob(Const(Void), "_glClearBufferData_size(format, type)"), "data")]),
    GlFunction(Void, "glClearBufferSubData", [(GLenum, "target"), (GLenum, "internalformat"), (GLintptr, "offset"), (GLsizeiptr, "size"), (GLenum, "format"), (GLenum, "type"), (Blob(Const(Void), "_glClearBufferData_size(format, type)"), "data")]),
    GlFunction(Void, "glClearNamedBufferDataEXT", [(GLbuffer, "buffer"), (GLenum, "internalformat"), (GLenum, "format"), (GLenum, "type"), (Blob(Const(Void), "_glClearBufferData_size(format, type)"), "data")]),
-    GlFunction(Void, "glClearNamedBufferSubDataEXT", [(GLbuffer, "buffer"), (GLenum, "internalformat"), (GLenum, "format"), (GLenum, "type"), (GLsizeiptr, "offset"), (GLsizeiptr, "size"), (Blob(Const(Void), "_glClearBufferData_size(format, type)"), "data")]),
+    GlFunction(Void, "glClearNamedBufferSubDataEXT", [(GLbuffer, "buffer"), (GLenum, "internalformat"), (GLintptr, "offset"), (GLsizeiptr, "size"), (GLenum, "format"), (GLenum, "type"), (Blob(Const(Void), "_glClearBufferData_size(format, type)"), "data")]),

    # GL_ARB_compute_shader
    GlFunction(Void, "glDispatchCompute", [(GLuint, "num_groups_x"), (GLuint, "num_groups_y"), (GLuint, "num_groups_z")]),
@ -2543,8 +2543,8 @@ glapi.addFunctions([
    GlFunction(Void, "glTextureParameterfvEXT", [(GLtexture, "texture"), (GLenum, "target"), (GLenum, "pname"), (Array(Const(GLfloat), "_gl_param_size(pname)"), "params")]),
    GlFunction(Void, "glTextureParameteriEXT", [(GLtexture, "texture"), (GLenum, "target"), (GLenum, "pname"), (GLint, "param")]),
    GlFunction(Void, "glTextureParameterivEXT", [(GLtexture, "texture"), (GLenum, "target"), (GLenum, "pname"), (Array(Const(GLint), "_gl_param_size(pname)"), "params")]),
-    GlFunction(Void, "glTextureImage1DEXT", [(GLtexture, "texture"), (GLenum, "target"), (GLint, "level"), (GLenum, "internalformat"), (GLsizei, "width"), (GLint, "border"), (GLenum, "format"), (GLenum, "type"), (Blob(Const(GLvoid), "_glTextureImage1DEXT_size(format, type, width)"), "pixels")]),
-    GlFunction(Void, "glTextureImage2DEXT", [(GLtexture, "texture"), (GLenum, "target"), (GLint, "level"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height"), (GLint, "border"), (GLenum, "format"), (GLenum, "type"), (Blob(Const(GLvoid), "_glTextureImage2DEXT_size(format, type, width, height)"), "pixels")]),
+    GlFunction(Void, "glTextureImage1DEXT", [(GLtexture, "texture"), (GLenum, "target"), (GLint, "level"), (GLenum_int, "internalformat"), (GLsizei, "width"), (GLint, "border"), (GLenum, "format"), (GLenum, "type"), (Blob(Const(GLvoid), "_glTextureImage1DEXT_size(format, type, width)"), "pixels")]),
+    GlFunction(Void, "glTextureImage2DEXT", [(GLtexture, "texture"), (GLenum, "target"), (GLint, "level"), (GLenum_int, "internalformat"), (GLsizei, "width"), (GLsizei, "height"), (GLint, "border"), (GLenum, "format"), (GLenum, "type"), (Blob(Const(GLvoid), "_glTextureImage2DEXT_size(format, type, width, height)"), "pixels")]),
    GlFunction(Void, "glTextureSubImage1DEXT", [(GLtexture, "texture"), (GLenum, "target"), (GLint, "level"), (GLint, "xoffset"), (GLsizei, "width"), (GLenum, "format"), (GLenum, "type"), (Blob(Const(GLvoid), "_glTextureSubImage1DEXT_size(format, type, width)"), "pixels")]),
    GlFunction(Void, "glTextureSubImage2DEXT", [(GLtexture, "texture"), (GLenum, "target"), (GLint, "level"), (GLint, "xoffset"), (GLint, "yoffset"), (GLsizei, "width"), (GLsizei, "height"), (GLenum, "format"), (GLenum, "type"), (Blob(Const(GLvoid), "_glTextureSubImage2DEXT_size(format, type, width, height)"), "pixels")]),
    GlFunction(Void, "glCopyTextureImage1DEXT", [(GLtexture, "texture"), (GLenum, "target"), (GLint, "level"), (GLenum, "internalformat"), (GLint, "x"), (GLint, "y"), (GLsizei, "width"), (GLint, "border")]),
@ -2556,15 +2556,15 @@ glapi.addFunctions([
    GlFunction(Void, "glGetTextureParameterivEXT", [(GLtexture, "texture"), (GLenum, "target"), (GLenum, "pname"), Out(Array(GLint, "_gl_param_size(pname)"), "params")], sideeffects=False),
    GlFunction(Void, "glGetTextureLevelParameterfvEXT", [(GLtexture, "texture"), (GLenum, "target"), (GLint, "level"), (GLenum, "pname"), Out(Array(GLfloat, "_gl_param_size(pname)"), "params")], sideeffects=False),
    GlFunction(Void, "glGetTextureLevelParameterivEXT", [(GLtexture, "texture"), (GLenum, "target"), (GLint, "level"), (GLenum, "pname"), Out(Array(GLint, "_gl_param_size(pname)"), "params")], sideeffects=False),
-    GlFunction(Void, "glTextureImage3DEXT", [(GLtexture, "texture"), (GLenum, "target"), (GLint, "level"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height"), (GLsizei, "depth"), (GLint, "border"), (GLenum, "format"), (GLenum, "type"), (Blob(Const(GLvoid), "_glTextureImage3DEXT_size(format, type, width, height, depth)"), "pixels")]),
+    GlFunction(Void, "glTextureImage3DEXT", [(GLtexture, "texture"), (GLenum, "target"), (GLint, "level"), (GLenum_int, "internalformat"), (GLsizei, "width"), (GLsizei, "height"), (GLsizei, "depth"), (GLint, "border"), (GLenum, "format"), (GLenum, "type"), (Blob(Const(GLvoid), "_glTextureImage3DEXT_size(format, type, width, height, depth)"), "pixels")]),
    GlFunction(Void, "glTextureSubImage3DEXT", [(GLtexture, "texture"), (GLenum, "target"), (GLint, "level"), (GLint, "xoffset"), (GLint, "yoffset"), (GLint, "zoffset"), (GLsizei, "width"), (GLsizei, "height"), (GLsizei, "depth"), (GLenum, "format"), (GLenum, "type"), (Blob(Const(GLvoid), "_glTextureSubImage3DEXT_size(format, type, width, height, depth)"), "pixels")]),
    GlFunction(Void, "glCopyTextureSubImage3DEXT", [(GLtexture, "texture"), (GLenum, "target"), (GLint, "level"), (GLint, "xoffset"), (GLint, "yoffset"), (GLint, "zoffset"), (GLint, "x"), (GLint, "y"), (GLsizei, "width"), (GLsizei, "height")]),
    GlFunction(Void, "glMultiTexParameterfEXT", [(GLenum, "texunit"), (GLenum, "target"), (GLenum, "pname"), (GLfloat, "param")]),
    GlFunction(Void, "glMultiTexParameterfvEXT", [(GLenum, "texunit"), (GLenum, "target"), (GLenum, "pname"), (Array(Const(GLfloat), "_gl_param_size(pname)"), "params")]),
    GlFunction(Void, "glMultiTexParameteriEXT", [(GLenum, "texunit"), (GLenum, "target"), (GLenum, "pname"), (GLint, "param")]),
    GlFunction(Void, "glMultiTexParameterivEXT", [(GLenum, "texunit"), (GLenum, "target"), (GLenum, "pname"), (Array(Const(GLint), "_gl_param_size(pname)"), "params")]),
-    GlFunction(Void, "glMultiTexImage1DEXT", [(GLenum, "texunit"), (GLenum, "target"), (GLint, "level"), (GLenum, "internalformat"), (GLsizei, "width"), (GLint, "border"), (GLenum, "format"), (GLenum, "type"), (Blob(Const(GLvoid), "_glMultiTexImage1DEXT_size(format, type, width)"), "pixels")]),
-    GlFunction(Void, "glMultiTexImage2DEXT", [(GLenum, "texunit"), (GLenum, "target"), (GLint, "level"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height"), (GLint, "border"), (GLenum, "format"), (GLenum, "type"), (Blob(Const(GLvoid), "_glMultiTexImage2DEXT_size(format, type, width, height)"), "pixels")]),
+    GlFunction(Void, "glMultiTexImage1DEXT", [(GLenum, "texunit"), (GLenum, "target"), (GLint, "level"), (GLenum_int, "internalformat"), (GLsizei, "width"), (GLint, "border"), (GLenum, "format"), (GLenum, "type"), (Blob(Const(GLvoid), "_glMultiTexImage1DEXT_size(format, type, width)"), "pixels")]),
+    GlFunction(Void, "glMultiTexImage2DEXT", [(GLenum, "texunit"), (GLenum, "target"), (GLint, "level"), (GLenum_int, "internalformat"), (GLsizei, "width"), (GLsizei, "height"), (GLint, "border"), (GLenum, "format"), (GLenum, "type"), (Blob(Const(GLvoid), "_glMultiTexImage2DEXT_size(format, type, width, height)"), "pixels")]),
    GlFunction(Void, "glMultiTexSubImage1DEXT", [(GLenum, "texunit"), (GLenum, "target"), (GLint, "level"), (GLint, "xoffset"), (GLsizei, "width"), (GLenum, "format"), (GLenum, "type"), (Blob(Const(GLvoid), "_glMultiTexSubImage1DEXT_size(format, type, width)"), "pixels")]),
    GlFunction(Void, "glMultiTexSubImage2DEXT", [(GLenum, "texunit"), (GLenum, "target"), (GLint, "level"), (GLint, "xoffset"), (GLint, "yoffset"), (GLsizei, "width"), (GLsizei, "height"), (GLenum, "format"), (GLenum, "type"), (Blob(Const(GLvoid), "_glMultiTexSubImage2DEXT_size(format, type, width, height)"), "pixels")]),
    GlFunction(Void, "glCopyMultiTexImage1DEXT", [(GLenum, "texunit"), (GLenum, "target"), (GLint, "level"), (GLenum, "internalformat"), (GLint, "x"), (GLint, "y"), (GLsizei, "width"), (GLint, "border")]),
@ -2576,7 +2576,7 @@ glapi.addFunctions([
    GlFunction(Void, "glGetMultiTexParameterivEXT", [(GLenum, "texunit"), (GLenum, "target"), (GLenum, "pname"), Out(Array(GLint, "_gl_param_size(pname)"), "params")], sideeffects=False),
    GlFunction(Void, "glGetMultiTexLevelParameterfvEXT", [(GLenum, "texunit"), (GLenum, "target"), (GLint, "level"), (GLenum, "pname"), Out(Array(GLfloat, "_gl_param_size(pname)"), "params")], sideeffects=False),
    GlFunction(Void, "glGetMultiTexLevelParameterivEXT", [(GLenum, "texunit"), (GLenum, "target"), (GLint, "level"), (GLenum, "pname"), Out(Array(GLint, "_gl_param_size(pname)"), "params")], sideeffects=False),
-    GlFunction(Void, "glMultiTexImage3DEXT", [(GLenum, "texunit"), (GLenum, "target"), (GLint, "level"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height"), (GLsizei, "depth"), (GLint, "border"), (GLenum, "format"), (GLenum, "type"), (Blob(Const(GLvoid), "_glMultiTexImage3DEXT_size(format, type, width, height, depth)"), "pixels")]),
+    GlFunction(Void, "glMultiTexImage3DEXT", [(GLenum, "texunit"), (GLenum, "target"), (GLint, "level"), (GLenum_int, "internalformat"), (GLsizei, "width"), (GLsizei, "height"), (GLsizei, "depth"), (GLint, "border"), (GLenum, "format"), (GLenum, "type"), (Blob(Const(GLvoid), "_glMultiTexImage3DEXT_size(format, type, width, height, depth)"), "pixels")]),
    GlFunction(Void, "glMultiTexSubImage3DEXT", [(GLenum, "texunit"), (GLenum, "target"), (GLint, "level"), (GLint, "xoffset"), (GLint, "yoffset"), (GLint, "zoffset"), (GLsizei, "width"), (GLsizei, "height"), (GLsizei, "depth"), (GLenum, "format"), (GLenum, "type"), (Blob(Const(GLvoid), "_glMultiTexSubImage3DEXT_size(format, type, width, height, depth)"), "pixels")]),
    GlFunction(Void, "glCopyMultiTexSubImage3DEXT", [(GLenum, "texunit"), (GLenum, "target"), (GLint, "level"), (GLint, "xoffset"), (GLint, "yoffset"), (GLint, "zoffset"), (GLint, "x"), (GLint, "y"), (GLsizei, "width"), (GLsizei, "height")]),
    GlFunction(Void, "glBindMultiTextureEXT", [(GLenum, "texunit"), (GLenum, "target"), (GLtexture, "texture")]),
--- a/src/apitrace/specs/glesapi.py
+++ b/src/apitrace/specs/glesapi.py
@ -259,4 +259,12 @@ glesapi.addFunctions([
    # GL_EXT_multisampled_render_to_texture
    #GlFunction(Void, "glRenderbufferStorageMultisampleEXT", [(GLenum, "target"), (GLsizei, "samples"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height")]),
    GlFunction(Void, "glFramebufferTexture2DMultisampleEXT", [(GLenum, "target"), (GLenum, "attachment"), (GLenum, "textarget"), (GLtexture, "texture"), (GLint, "level"), (GLsizei, "samples")]),
+
+    # GL_EXT_texture_storage
+    GlFunction(Void, "glTexStorage1DEXT", [(GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width")]),
+    GlFunction(Void, "glTexStorage2DEXT", [(GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height")]),
+    GlFunction(Void, "glTexStorage3DEXT", [(GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height"), (GLsizei, "depth")]),
+    #GlFunction(Void, "glTextureStorage1DEXT", [(GLtexture, "texture"), (GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width")]),
+    #GlFunction(Void, "glTextureStorage2DEXT", [(GLtexture, "texture"), (GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height")]),
+    #GlFunction(Void, "glTextureStorage3DEXT", [(GLtexture, "texture"), (GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height"), (GLsizei, "depth")]),
 ])
--- a/src/apitrace/thirdparty/khronos/GL/glext.h
+++ b/src/apitrace/thirdparty/khronos/GL/glext.h
@ -8685,12 +8685,12 @@ typedef void (APIENTRYP PFNGLGETOBJECTPTRLABELPROC) (const void *ptr, GLsizei bu
 GLAPI void APIENTRY glClearBufferData (GLenum target, GLenum internalformat, GLenum format, GLenum type, const void *data);
 GLAPI void APIENTRY glClearBufferSubData (GLenum target, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data);
 GLAPI void APIENTRY glClearNamedBufferDataEXT (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void *data);
-GLAPI void APIENTRY glClearNamedBufferSubDataEXT (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, GLsizeiptr offset, GLsizeiptr size, const void *data);
+GLAPI void APIENTRY glClearNamedBufferSubDataEXT (GLuint buffer, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data);
 #endif /* GL_GLEXT_PROTOTYPES */
 typedef void (APIENTRYP PFNGLCLEARBUFFERDATAPROC) (GLenum target, GLenum internalformat, GLenum format, GLenum type, const void *data);
 typedef void (APIENTRYP PFNGLCLEARBUFFERSUBDATAPROC) (GLenum target, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data);
 typedef void (APIENTRYP PFNGLCLEARNAMEDBUFFERDATAEXTPROC) (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void *data);
-typedef void (APIENTRYP PFNGLCLEARNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, GLsizeiptr offset, GLsizeiptr size, const void *data);
+typedef void (APIENTRYP PFNGLCLEARNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data);
 #endif

 #ifndef GL_ARB_compute_shader
@ -9636,11 +9636,15 @@ GLAPI void APIENTRY glPixelTransformParameteriEXT (GLenum target, GLenum pname,
 GLAPI void APIENTRY glPixelTransformParameterfEXT (GLenum target, GLenum pname, GLfloat param);
 GLAPI void APIENTRY glPixelTransformParameterivEXT (GLenum target, GLenum pname, const GLint *params);
 GLAPI void APIENTRY glPixelTransformParameterfvEXT (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glGetPixelTransformParameterivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetPixelTransformParameterfvEXT (GLenum target, GLenum pname, GLfloat *params);
 #endif /* GL_GLEXT_PROTOTYPES */
 typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint param);
 typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat param);
 typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
 typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
 #endif

 #ifndef GL_EXT_pixel_transform_color_table
@ -11667,8 +11671,8 @@ GLAPI void APIENTRY glTextureParameterfEXT (GLuint texture, GLenum target, GLenu
 GLAPI void APIENTRY glTextureParameterfvEXT (GLuint texture, GLenum target, GLenum pname, const GLfloat *params);
 GLAPI void APIENTRY glTextureParameteriEXT (GLuint texture, GLenum target, GLenum pname, GLint param);
 GLAPI void APIENTRY glTextureParameterivEXT (GLuint texture, GLenum target, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glTextureImage2DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glTextureImage2DEXT (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
 GLAPI void APIENTRY glTextureSubImage1DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
 GLAPI void APIENTRY glTextureSubImage2DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
 GLAPI void APIENTRY glCopyTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
@ -11680,15 +11684,15 @@ GLAPI void APIENTRY glGetTextureParameterfvEXT (GLuint texture, GLenum target, G
 GLAPI void APIENTRY glGetTextureParameterivEXT (GLuint texture, GLenum target, GLenum pname, GLint *params);
 GLAPI void APIENTRY glGetTextureLevelParameterfvEXT (GLuint texture, GLenum target, GLint level, GLenum pname, GLfloat *params);
 GLAPI void APIENTRY glGetTextureLevelParameterivEXT (GLuint texture, GLenum target, GLint level, GLenum pname, GLint *params);
-GLAPI void APIENTRY glTextureImage3DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glTextureImage3DEXT (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
 GLAPI void APIENTRY glTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
 GLAPI void APIENTRY glCopyTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
 GLAPI void APIENTRY glMultiTexParameterfEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
 GLAPI void APIENTRY glMultiTexParameterfvEXT (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
 GLAPI void APIENTRY glMultiTexParameteriEXT (GLenum texunit, GLenum target, GLenum pname, GLint param);
 GLAPI void APIENTRY glMultiTexParameterivEXT (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
 GLAPI void APIENTRY glMultiTexSubImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
 GLAPI void APIENTRY glMultiTexSubImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
 GLAPI void APIENTRY glCopyMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
@ -11700,7 +11704,7 @@ GLAPI void APIENTRY glGetMultiTexParameterfvEXT (GLenum texunit, GLenum target,
 GLAPI void APIENTRY glGetMultiTexParameterivEXT (GLenum texunit, GLenum target, GLenum pname, GLint *params);
 GLAPI void APIENTRY glGetMultiTexLevelParameterfvEXT (GLenum texunit, GLenum target, GLint level, GLenum pname, GLfloat *params);
 GLAPI void APIENTRY glGetMultiTexLevelParameterivEXT (GLenum texunit, GLenum target, GLint level, GLenum pname, GLint *params);
-GLAPI void APIENTRY glMultiTexImage3DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glMultiTexImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
 GLAPI void APIENTRY glMultiTexSubImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
 GLAPI void APIENTRY glCopyMultiTexSubImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
 GLAPI void APIENTRY glBindMultiTextureEXT (GLenum texunit, GLenum target, GLuint texture);
@ -11874,8 +11878,8 @@ typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFEXTPROC) (GLuint texture, GLenum t
 typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLfloat *params);
 typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint param);
 typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
 typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
 typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
 typedef void (APIENTRYP PFNGLCOPYTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
@ -11887,7 +11891,7 @@ typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLen
 typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint *params);
 typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLfloat *params);
 typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
 typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
 typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
 typedef void (APIENTRYP PFNGLMULTITEXPARAMETERFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
--- a/src/apitrace/wrappers/.gitignore
+++ b/src/apitrace/wrappers/.gitignore
@ -1,4 +1,3 @@
-OpenGL
 cgltrace.cpp
 d2d1trace.cpp
 d3d8trace.cpp
--- a/src/apitrace/wrappers/glxtrace.py
+++ b/src/apitrace/wrappers/glxtrace.py
@ -32,6 +32,7 @@ from gltrace import GlTracer
 from specs.stdapi import Module, API
 from specs.glapi import glapi
 from specs.glxapi import glxapi
+from specs.glesapi import glesapi


 class GlxTracer(GlTracer):
@ -174,6 +175,7 @@ if __name__ == '__main__':
    module = Module()
    module.mergeModule(glxapi)
    module.mergeModule(glapi)
+    module.mergeModule(glesapi)
    api = API()
    api.addModule(module)
    tracer = GlxTracer()
--- a/src/apitrace/wrappers/regaltrace.cpp
+++ b/src/apitrace/wrappers/regaltrace.cpp
--- a/src/glew/include/GL/glew.h
+++ b/src/glew/include/GL/glew.h
@ -8278,6 +8278,28 @@ typedef void (GLAPIENTRY * PFNGLCULLPARAMETERFVEXTPROC) (GLenum pname, GLfloat*

 #endif /* GL_EXT_cull_vertex */

+/* --------------------------- GL_EXT_debug_label -------------------------- */
+
+#ifndef GL_EXT_debug_label
+#define GL_EXT_debug_label 1
+
+#define GL_PROGRAM_PIPELINE_OBJECT_EXT 0x8A4F
+#define GL_PROGRAM_OBJECT_EXT 0x8B40
+#define GL_SHADER_OBJECT_EXT 0x8B48
+#define GL_BUFFER_OBJECT_EXT 0x9151
+#define GL_QUERY_OBJECT_EXT 0x9153
+#define GL_VERTEX_ARRAY_OBJECT_EXT 0x9154
+
+typedef void (GLAPIENTRY * PFNGLGETOBJECTLABELEXTPROC) (GLenum type, GLuint object, GLsizei bufSize, GLsizei* length, GLchar *label);
+typedef void (GLAPIENTRY * PFNGLLABELOBJECTEXTPROC) (GLenum type, GLuint object, GLsizei length, const GLchar* label);
+
+#define glGetObjectLabelEXT GLEW_GET_FUN(__glewGetObjectLabelEXT)
+#define glLabelObjectEXT GLEW_GET_FUN(__glewLabelObjectEXT)
+
+#define GLEW_EXT_debug_label GLEW_GET_VAR(__GLEW_EXT_debug_label)
+
+#endif /* GL_EXT_debug_label */
+
 /* -------------------------- GL_EXT_debug_marker -------------------------- */

 #ifndef GL_EXT_debug_marker
@ -9344,7 +9366,7 @@ typedef void (GLAPIENTRY * PFNGLTEXTUREMATERIALEXTPROC) (GLenum face, GLenum mod
 #define GL_EXT_multi_draw_arrays 1

 typedef void (GLAPIENTRY * PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, const GLint* first, const GLsizei *count, GLsizei primcount);
-typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, GLsizei* count, GLenum type, const GLvoid * const *indices, GLsizei primcount);
+typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, GLsizei* count, GLenum type, const GLvoid* const *indices, GLsizei primcount);

 #define glMultiDrawArraysEXT GLEW_GET_FUN(__glewMultiDrawArraysEXT)
 #define glMultiDrawElementsEXT GLEW_GET_FUN(__glewMultiDrawElementsEXT)
@ -9762,6 +9784,15 @@ typedef void (GLAPIENTRY * PFNGLMEMORYBARRIEREXTPROC) (GLbitfield barriers);

 #endif /* GL_EXT_shader_image_load_store */

+/* ----------------------- GL_EXT_shader_integer_mix ----------------------- */
+
+#ifndef GL_EXT_shader_integer_mix
+#define GL_EXT_shader_integer_mix 1
+
+#define GLEW_EXT_shader_integer_mix GLEW_GET_VAR(__GLEW_EXT_shader_integer_mix)
+
+#endif /* GL_EXT_shader_integer_mix */
+
 /* -------------------------- GL_EXT_shadow_funcs -------------------------- */

 #ifndef GL_EXT_shadow_funcs
@ -10891,7 +10922,7 @@ typedef void (GLAPIENTRY * PFNGLIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target,
 #define GL_IBM_multimode_draw_arrays 1

 typedef void (GLAPIENTRY * PFNGLMULTIMODEDRAWARRAYSIBMPROC) (const GLenum* mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
-typedef void (GLAPIENTRY * PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum* mode, const GLsizei *count, GLenum type, const GLvoid * const *indices, GLsizei primcount, GLint modestride);
+typedef void (GLAPIENTRY * PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum* mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount, GLint modestride);

 #define glMultiModeDrawArraysIBM GLEW_GET_FUN(__glewMultiModeDrawArraysIBM)
 #define glMultiModeDrawElementsIBM GLEW_GET_FUN(__glewMultiModeDrawElementsIBM)
@ -10956,14 +10987,14 @@ typedef void (GLAPIENTRY * PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum* mod
 #define GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM 103086
 #define GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM 103087

-typedef void (GLAPIENTRY * PFNGLCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid ** pointer, GLint ptrstride);
+typedef void (GLAPIENTRY * PFNGLCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid** pointer, GLint ptrstride);
 typedef void (GLAPIENTRY * PFNGLEDGEFLAGPOINTERLISTIBMPROC) (GLint stride, const GLboolean ** pointer, GLint ptrstride);
-typedef void (GLAPIENTRY * PFNGLFOGCOORDPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid ** pointer, GLint ptrstride);
-typedef void (GLAPIENTRY * PFNGLINDEXPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid ** pointer, GLint ptrstride);
-typedef void (GLAPIENTRY * PFNGLNORMALPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid ** pointer, GLint ptrstride);
-typedef void (GLAPIENTRY * PFNGLSECONDARYCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid ** pointer, GLint ptrstride);
-typedef void (GLAPIENTRY * PFNGLTEXCOORDPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid ** pointer, GLint ptrstride);
-typedef void (GLAPIENTRY * PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid ** pointer, GLint ptrstride);
+typedef void (GLAPIENTRY * PFNGLFOGCOORDPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid** pointer, GLint ptrstride);
+typedef void (GLAPIENTRY * PFNGLINDEXPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid** pointer, GLint ptrstride);
+typedef void (GLAPIENTRY * PFNGLNORMALPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid** pointer, GLint ptrstride);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid** pointer, GLint ptrstride);
+typedef void (GLAPIENTRY * PFNGLTEXCOORDPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid** pointer, GLint ptrstride);
+typedef void (GLAPIENTRY * PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid** pointer, GLint ptrstride);

 #define glColorPointerListIBM GLEW_GET_FUN(__glewColorPointerListIBM)
 #define glEdgeFlagPointerListIBM GLEW_GET_FUN(__glewEdgeFlagPointerListIBM)
@ -11007,6 +11038,15 @@ typedef void (GLAPIENTRY * PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum ty

 #endif /* GL_INGR_interlace_read */

+/* ------------------- GL_INTEL_fragment_shader_ordering ------------------- */
+
+#ifndef GL_INTEL_fragment_shader_ordering
+#define GL_INTEL_fragment_shader_ordering 1
+
+#define GLEW_INTEL_fragment_shader_ordering GLEW_GET_VAR(__GLEW_INTEL_fragment_shader_ordering)
+
+#endif /* GL_INTEL_fragment_shader_ordering */
+
 /* -------------------------- GL_INTEL_map_texture ------------------------- */

 #ifndef GL_INTEL_map_texture
@ -11143,6 +11183,44 @@ typedef void (GLAPIENTRY * PFNGLPUSHDEBUGGROUPPROC) (GLenum source, GLuint id, G

 #endif /* GL_KHR_debug */

+/* ------------------ GL_KHR_texture_compression_astc_hdr ------------------ */
+
+#ifndef GL_KHR_texture_compression_astc_hdr
+#define GL_KHR_texture_compression_astc_hdr 1
+
+#define GL_COMPRESSED_RGBA_ASTC_4x4_KHR 0x93B0
+#define GL_COMPRESSED_RGBA_ASTC_5x4_KHR 0x93B1
+#define GL_COMPRESSED_RGBA_ASTC_5x5_KHR 0x93B2
+#define GL_COMPRESSED_RGBA_ASTC_6x5_KHR 0x93B3
+#define GL_COMPRESSED_RGBA_ASTC_6x6_KHR 0x93B4
+#define GL_COMPRESSED_RGBA_ASTC_8x5_KHR 0x93B5
+#define GL_COMPRESSED_RGBA_ASTC_8x6_KHR 0x93B6
+#define GL_COMPRESSED_RGBA_ASTC_8x8_KHR 0x93B7
+#define GL_COMPRESSED_RGBA_ASTC_10x5_KHR 0x93B8
+#define GL_COMPRESSED_RGBA_ASTC_10x6_KHR 0x93B9
+#define GL_COMPRESSED_RGBA_ASTC_10x8_KHR 0x93BA
+#define GL_COMPRESSED_RGBA_ASTC_10x10_KHR 0x93BB
+#define GL_COMPRESSED_RGBA_ASTC_12x10_KHR 0x93BC
+#define GL_COMPRESSED_RGBA_ASTC_12x12_KHR 0x93BD
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR 0x93D0
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR 0x93D1
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR 0x93D2
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR 0x93D3
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR 0x93D4
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR 0x93D5
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR 0x93D6
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR 0x93D7
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR 0x93D8
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR 0x93D9
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR 0x93DA
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR 0x93DB
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR 0x93DC
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR 0x93DD
+
+#define GLEW_KHR_texture_compression_astc_hdr GLEW_GET_VAR(__GLEW_KHR_texture_compression_astc_hdr)
+
+#endif /* GL_KHR_texture_compression_astc_hdr */
+
 /* ------------------ GL_KHR_texture_compression_astc_ldr ------------------ */

 #ifndef GL_KHR_texture_compression_astc_ldr
@ -11406,6 +11484,10 @@ typedef void (GLAPIENTRY * PFNGLUNIFORMHANDLEUI64VNVPROC) (GLint location, GLsiz
 #ifndef GL_NV_blend_equation_advanced
 #define GL_NV_blend_equation_advanced 1

+#define GL_XOR_NV 0x1506
+#define GL_RED_NV 0x1903
+#define GL_GREEN_NV 0x1904
+#define GL_BLUE_NV 0x1905
 #define GL_BLEND_PREMULTIPLIED_SRC_NV 0x9280
 #define GL_BLEND_OVERLAP_NV 0x9281
 #define GL_UNCORRELATED_NV 0x9282
@ -16293,6 +16375,9 @@ GLEW_FUN_EXPORT PFNGLCOPYTEXSUBIMAGE3DEXTPROC __glewCopyTexSubImage3DEXT;
 GLEW_FUN_EXPORT PFNGLCULLPARAMETERDVEXTPROC __glewCullParameterdvEXT;
 GLEW_FUN_EXPORT PFNGLCULLPARAMETERFVEXTPROC __glewCullParameterfvEXT;

+GLEW_FUN_EXPORT PFNGLGETOBJECTLABELEXTPROC __glewGetObjectLabelEXT;
+GLEW_FUN_EXPORT PFNGLLABELOBJECTEXTPROC __glewLabelObjectEXT;
+
 GLEW_FUN_EXPORT PFNGLINSERTEVENTMARKEREXTPROC __glewInsertEventMarkerEXT;
 GLEW_FUN_EXPORT PFNGLPOPGROUPMARKEREXTPROC __glewPopGroupMarkerEXT;
 GLEW_FUN_EXPORT PFNGLPUSHGROUPMARKEREXTPROC __glewPushGroupMarkerEXT;
@ -17751,6 +17836,7 @@ GLEW_VAR_EXPORT GLboolean __GLEW_EXT_convolution;
 GLEW_VAR_EXPORT GLboolean __GLEW_EXT_coordinate_frame;
 GLEW_VAR_EXPORT GLboolean __GLEW_EXT_copy_texture;
 GLEW_VAR_EXPORT GLboolean __GLEW_EXT_cull_vertex;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_debug_label;
 GLEW_VAR_EXPORT GLboolean __GLEW_EXT_debug_marker;
 GLEW_VAR_EXPORT GLboolean __GLEW_EXT_depth_bounds_test;
 GLEW_VAR_EXPORT GLboolean __GLEW_EXT_direct_state_access;
@ -17792,6 +17878,7 @@ GLEW_VAR_EXPORT GLboolean __GLEW_EXT_secondary_color;
 GLEW_VAR_EXPORT GLboolean __GLEW_EXT_separate_shader_objects;
 GLEW_VAR_EXPORT GLboolean __GLEW_EXT_separate_specular_color;
 GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shader_image_load_store;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shader_integer_mix;
 GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shadow_funcs;
 GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shared_texture_palette;
 GLEW_VAR_EXPORT GLboolean __GLEW_EXT_stencil_clear_tag;
@ -17846,10 +17933,12 @@ GLEW_VAR_EXPORT GLboolean __GLEW_IBM_texture_mirrored_repeat;
 GLEW_VAR_EXPORT GLboolean __GLEW_IBM_vertex_array_lists;
 GLEW_VAR_EXPORT GLboolean __GLEW_INGR_color_clamp;
 GLEW_VAR_EXPORT GLboolean __GLEW_INGR_interlace_read;
+GLEW_VAR_EXPORT GLboolean __GLEW_INTEL_fragment_shader_ordering;
 GLEW_VAR_EXPORT GLboolean __GLEW_INTEL_map_texture;
 GLEW_VAR_EXPORT GLboolean __GLEW_INTEL_parallel_arrays;
 GLEW_VAR_EXPORT GLboolean __GLEW_INTEL_texture_scissor;
 GLEW_VAR_EXPORT GLboolean __GLEW_KHR_debug;
+GLEW_VAR_EXPORT GLboolean __GLEW_KHR_texture_compression_astc_hdr;
 GLEW_VAR_EXPORT GLboolean __GLEW_KHR_texture_compression_astc_ldr;
 GLEW_VAR_EXPORT GLboolean __GLEW_KTX_buffer_region;
 GLEW_VAR_EXPORT GLboolean __GLEW_MESAX_texture_stack;
--- a/src/glew/src/glew.c
+++ b/src/glew/src/glew.c
@ -1510,6 +1510,9 @@ PFNGLCOPYTEXSUBIMAGE3DEXTPROC __glewCopyTexSubImage3DEXT = NULL;
 PFNGLCULLPARAMETERDVEXTPROC __glewCullParameterdvEXT = NULL;
 PFNGLCULLPARAMETERFVEXTPROC __glewCullParameterfvEXT = NULL;

+PFNGLGETOBJECTLABELEXTPROC __glewGetObjectLabelEXT = NULL;
+PFNGLLABELOBJECTEXTPROC __glewLabelObjectEXT = NULL;
+
 PFNGLINSERTEVENTMARKEREXTPROC __glewInsertEventMarkerEXT = NULL;
 PFNGLPOPGROUPMARKEREXTPROC __glewPopGroupMarkerEXT = NULL;
 PFNGLPUSHGROUPMARKEREXTPROC __glewPushGroupMarkerEXT = NULL;
@ -2967,6 +2970,7 @@ GLboolean __GLEW_EXT_convolution = GL_FALSE;
 GLboolean __GLEW_EXT_coordinate_frame = GL_FALSE;
 GLboolean __GLEW_EXT_copy_texture = GL_FALSE;
 GLboolean __GLEW_EXT_cull_vertex = GL_FALSE;
+GLboolean __GLEW_EXT_debug_label = GL_FALSE;
 GLboolean __GLEW_EXT_debug_marker = GL_FALSE;
 GLboolean __GLEW_EXT_depth_bounds_test = GL_FALSE;
 GLboolean __GLEW_EXT_direct_state_access = GL_FALSE;
@ -3008,6 +3012,7 @@ GLboolean __GLEW_EXT_secondary_color = GL_FALSE;
 GLboolean __GLEW_EXT_separate_shader_objects = GL_FALSE;
 GLboolean __GLEW_EXT_separate_specular_color = GL_FALSE;
 GLboolean __GLEW_EXT_shader_image_load_store = GL_FALSE;
+GLboolean __GLEW_EXT_shader_integer_mix = GL_FALSE;
 GLboolean __GLEW_EXT_shadow_funcs = GL_FALSE;
 GLboolean __GLEW_EXT_shared_texture_palette = GL_FALSE;
 GLboolean __GLEW_EXT_stencil_clear_tag = GL_FALSE;
@ -3062,10 +3067,12 @@ GLboolean __GLEW_IBM_texture_mirrored_repeat = GL_FALSE;
 GLboolean __GLEW_IBM_vertex_array_lists = GL_FALSE;
 GLboolean __GLEW_INGR_color_clamp = GL_FALSE;
 GLboolean __GLEW_INGR_interlace_read = GL_FALSE;
+GLboolean __GLEW_INTEL_fragment_shader_ordering = GL_FALSE;
 GLboolean __GLEW_INTEL_map_texture = GL_FALSE;
 GLboolean __GLEW_INTEL_parallel_arrays = GL_FALSE;
 GLboolean __GLEW_INTEL_texture_scissor = GL_FALSE;
 GLboolean __GLEW_KHR_debug = GL_FALSE;
+GLboolean __GLEW_KHR_texture_compression_astc_hdr = GL_FALSE;
 GLboolean __GLEW_KHR_texture_compression_astc_ldr = GL_FALSE;
 GLboolean __GLEW_KTX_buffer_region = GL_FALSE;
 GLboolean __GLEW_MESAX_texture_stack = GL_FALSE;
@ -6394,6 +6401,20 @@ static GLboolean _glewInit_GL_EXT_cull_vertex (GLEW_CONTEXT_ARG_DEF_INIT)

 #endif /* GL_EXT_cull_vertex */

+#ifdef GL_EXT_debug_label
+
+static GLboolean _glewInit_GL_EXT_debug_label (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetObjectLabelEXT = (PFNGLGETOBJECTLABELEXTPROC)glewGetProcAddress((const GLubyte*)"glGetObjectLabelEXT")) == NULL) || r;
+  r = ((glLabelObjectEXT = (PFNGLLABELOBJECTEXTPROC)glewGetProcAddress((const GLubyte*)"glLabelObjectEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_debug_label */
+
 #ifdef GL_EXT_debug_marker

 static GLboolean _glewInit_GL_EXT_debug_marker (GLEW_CONTEXT_ARG_DEF_INIT)
@ -7154,6 +7175,10 @@ static GLboolean _glewInit_GL_EXT_shader_image_load_store (GLEW_CONTEXT_ARG_DEF_

 #endif /* GL_EXT_shader_image_load_store */

+#ifdef GL_EXT_shader_integer_mix
+
+#endif /* GL_EXT_shader_integer_mix */
+
 #ifdef GL_EXT_shadow_funcs

 #endif /* GL_EXT_shadow_funcs */
@ -7642,6 +7667,10 @@ static GLboolean _glewInit_GL_IBM_vertex_array_lists (GLEW_CONTEXT_ARG_DEF_INIT)

 #endif /* GL_INGR_interlace_read */

+#ifdef GL_INTEL_fragment_shader_ordering
+
+#endif /* GL_INTEL_fragment_shader_ordering */
+
 #ifdef GL_INTEL_map_texture

 static GLboolean _glewInit_GL_INTEL_map_texture (GLEW_CONTEXT_ARG_DEF_INIT)
@ -7709,6 +7738,10 @@ static GLboolean _glewInit_GL_KHR_debug (GLEW_CONTEXT_ARG_DEF_INIT)

 #endif /* GL_KHR_debug */

+#ifdef GL_KHR_texture_compression_astc_hdr
+
+#endif /* GL_KHR_texture_compression_astc_hdr */
+
 #ifdef GL_KHR_texture_compression_astc_ldr

 #endif /* GL_KHR_texture_compression_astc_ldr */
@ -10432,6 +10465,10 @@ GLenum GLEWAPIENTRY glewContextInit (GLEW_CONTEXT_ARG_DEF_LIST)
  CONST_CAST(GLEW_EXT_cull_vertex) = _glewSearchExtension("GL_EXT_cull_vertex", extStart, extEnd);
  if (glewExperimental || GLEW_EXT_cull_vertex) CONST_CAST(GLEW_EXT_cull_vertex) = !_glewInit_GL_EXT_cull_vertex(GLEW_CONTEXT_ARG_VAR_INIT);
 #endif /* GL_EXT_cull_vertex */
+#ifdef GL_EXT_debug_label
+  CONST_CAST(GLEW_EXT_debug_label) = _glewSearchExtension("GL_EXT_debug_label", extStart, extEnd);
+  if (glewExperimental || GLEW_EXT_debug_label) CONST_CAST(GLEW_EXT_debug_label) = !_glewInit_GL_EXT_debug_label(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_EXT_debug_label */
 #ifdef GL_EXT_debug_marker
  CONST_CAST(GLEW_EXT_debug_marker) = _glewSearchExtension("GL_EXT_debug_marker", extStart, extEnd);
  if (glewExperimental || GLEW_EXT_debug_marker) CONST_CAST(GLEW_EXT_debug_marker) = !_glewInit_GL_EXT_debug_marker(GLEW_CONTEXT_ARG_VAR_INIT);
@ -10584,6 +10621,9 @@ GLenum GLEWAPIENTRY glewContextInit (GLEW_CONTEXT_ARG_DEF_LIST)
  CONST_CAST(GLEW_EXT_shader_image_load_store) = _glewSearchExtension("GL_EXT_shader_image_load_store", extStart, extEnd);
  if (glewExperimental || GLEW_EXT_shader_image_load_store) CONST_CAST(GLEW_EXT_shader_image_load_store) = !_glewInit_GL_EXT_shader_image_load_store(GLEW_CONTEXT_ARG_VAR_INIT);
 #endif /* GL_EXT_shader_image_load_store */
+#ifdef GL_EXT_shader_integer_mix
+  CONST_CAST(GLEW_EXT_shader_integer_mix) = _glewSearchExtension("GL_EXT_shader_integer_mix", extStart, extEnd);
+#endif /* GL_EXT_shader_integer_mix */
 #ifdef GL_EXT_shadow_funcs
  CONST_CAST(GLEW_EXT_shadow_funcs) = _glewSearchExtension("GL_EXT_shadow_funcs", extStart, extEnd);
 #endif /* GL_EXT_shadow_funcs */
@ -10766,6 +10806,9 @@ GLenum GLEWAPIENTRY glewContextInit (GLEW_CONTEXT_ARG_DEF_LIST)
 #ifdef GL_INGR_interlace_read
  CONST_CAST(GLEW_INGR_interlace_read) = _glewSearchExtension("GL_INGR_interlace_read", extStart, extEnd);
 #endif /* GL_INGR_interlace_read */
+#ifdef GL_INTEL_fragment_shader_ordering
+  CONST_CAST(GLEW_INTEL_fragment_shader_ordering) = _glewSearchExtension("GL_INTEL_fragment_shader_ordering", extStart, extEnd);
+#endif /* GL_INTEL_fragment_shader_ordering */
 #ifdef GL_INTEL_map_texture
  CONST_CAST(GLEW_INTEL_map_texture) = _glewSearchExtension("GL_INTEL_map_texture", extStart, extEnd);
  if (glewExperimental || GLEW_INTEL_map_texture) CONST_CAST(GLEW_INTEL_map_texture) = !_glewInit_GL_INTEL_map_texture(GLEW_CONTEXT_ARG_VAR_INIT);
@ -10782,6 +10825,9 @@ GLenum GLEWAPIENTRY glewContextInit (GLEW_CONTEXT_ARG_DEF_LIST)
  CONST_CAST(GLEW_KHR_debug) = _glewSearchExtension("GL_KHR_debug", extStart, extEnd);
  if (glewExperimental || GLEW_KHR_debug) CONST_CAST(GLEW_KHR_debug) = !_glewInit_GL_KHR_debug(GLEW_CONTEXT_ARG_VAR_INIT);
 #endif /* GL_KHR_debug */
+#ifdef GL_KHR_texture_compression_astc_hdr
+  CONST_CAST(GLEW_KHR_texture_compression_astc_hdr) = _glewSearchExtension("GL_KHR_texture_compression_astc_hdr", extStart, extEnd);
+#endif /* GL_KHR_texture_compression_astc_hdr */
 #ifdef GL_KHR_texture_compression_astc_ldr
  CONST_CAST(GLEW_KHR_texture_compression_astc_ldr) = _glewSearchExtension("GL_KHR_texture_compression_astc_ldr", extStart, extEnd);
 #endif /* GL_KHR_texture_compression_astc_ldr */
@ -15348,6 +15394,13 @@ GLboolean GLEWAPIENTRY glewIsSupported (const char* name)
          continue;
        }
 #endif
+#ifdef GL_EXT_debug_label
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"debug_label", 11))
+        {
+          ret = GLEW_EXT_debug_label;
+          continue;
+        }
+#endif
 #ifdef GL_EXT_debug_marker
        if (_glewStrSame3(&pos, &len, (const GLubyte*)"debug_marker", 12))
        {
@ -15635,6 +15688,13 @@ GLboolean GLEWAPIENTRY glewIsSupported (const char* name)
          continue;
        }
 #endif
+#ifdef GL_EXT_shader_integer_mix
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_integer_mix", 18))
+        {
+          ret = GLEW_EXT_shader_integer_mix;
+          continue;
+        }
+#endif
 #ifdef GL_EXT_shadow_funcs
        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shadow_funcs", 12))
        {
@ -16028,6 +16088,13 @@ GLboolean GLEWAPIENTRY glewIsSupported (const char* name)
      }
      if (_glewStrSame2(&pos, &len, (const GLubyte*)"INTEL_", 6))
      {
+#ifdef GL_INTEL_fragment_shader_ordering
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_shader_ordering", 24))
+        {
+          ret = GLEW_INTEL_fragment_shader_ordering;
+          continue;
+        }
+#endif
 #ifdef GL_INTEL_map_texture
        if (_glewStrSame3(&pos, &len, (const GLubyte*)"map_texture", 11))
        {
@ -16059,6 +16126,13 @@ GLboolean GLEWAPIENTRY glewIsSupported (const char* name)
          continue;
        }
 #endif
+#ifdef GL_KHR_texture_compression_astc_hdr
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_astc_hdr", 28))
+        {
+          ret = GLEW_KHR_texture_compression_astc_hdr;
+          continue;
+        }
+#endif
 #ifdef GL_KHR_texture_compression_astc_ldr
        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_astc_ldr", 28))
        {
--- a/src/glew/src/glewinfo.c
+++ b/src/glew/src/glewinfo.c
@ -3626,6 +3626,18 @@ static void _glewInfo_GL_EXT_cull_vertex (void)

 #endif /* GL_EXT_cull_vertex */

+#ifdef GL_EXT_debug_label
+
+static void _glewInfo_GL_EXT_debug_label (void)
+{
+  glewPrintExt("GL_EXT_debug_label", GLEW_EXT_debug_label, glewIsSupported("GL_EXT_debug_label"), glewGetExtension("GL_EXT_debug_label"));
+
+  glewInfoFunc("glGetObjectLabelEXT", glGetObjectLabelEXT == NULL);
+  glewInfoFunc("glLabelObjectEXT", glLabelObjectEXT == NULL);
+}
+
+#endif /* GL_EXT_debug_label */
+
 #ifdef GL_EXT_debug_marker

 static void _glewInfo_GL_EXT_debug_marker (void)
@ -4388,6 +4400,15 @@ static void _glewInfo_GL_EXT_shader_image_load_store (void)

 #endif /* GL_EXT_shader_image_load_store */

+#ifdef GL_EXT_shader_integer_mix
+
+static void _glewInfo_GL_EXT_shader_integer_mix (void)
+{
+  glewPrintExt("GL_EXT_shader_integer_mix", GLEW_EXT_shader_integer_mix, glewIsSupported("GL_EXT_shader_integer_mix"), glewGetExtension("GL_EXT_shader_integer_mix"));
+}
+
+#endif /* GL_EXT_shader_integer_mix */
+
 #ifdef GL_EXT_shadow_funcs

 static void _glewInfo_GL_EXT_shadow_funcs (void)
@ -5006,6 +5027,15 @@ static void _glewInfo_GL_INGR_interlace_read (void)

 #endif /* GL_INGR_interlace_read */

+#ifdef GL_INTEL_fragment_shader_ordering
+
+static void _glewInfo_GL_INTEL_fragment_shader_ordering (void)
+{
+  glewPrintExt("GL_INTEL_fragment_shader_ordering", GLEW_INTEL_fragment_shader_ordering, glewIsSupported("GL_INTEL_fragment_shader_ordering"), glewGetExtension("GL_INTEL_fragment_shader_ordering"));
+}
+
+#endif /* GL_INTEL_fragment_shader_ordering */
+
 #ifdef GL_INTEL_map_texture

 static void _glewInfo_GL_INTEL_map_texture (void)
@ -5065,6 +5095,15 @@ static void _glewInfo_GL_KHR_debug (void)

 #endif /* GL_KHR_debug */

+#ifdef GL_KHR_texture_compression_astc_hdr
+
+static void _glewInfo_GL_KHR_texture_compression_astc_hdr (void)
+{
+  glewPrintExt("GL_KHR_texture_compression_astc_hdr", GLEW_KHR_texture_compression_astc_hdr, glewIsSupported("GL_KHR_texture_compression_astc_hdr"), glewGetExtension("GL_KHR_texture_compression_astc_hdr"));
+}
+
+#endif /* GL_KHR_texture_compression_astc_hdr */
+
 #ifdef GL_KHR_texture_compression_astc_ldr

 static void _glewInfo_GL_KHR_texture_compression_astc_ldr (void)
@ -9283,6 +9322,9 @@ static void glewInfo (void)
 #ifdef GL_EXT_cull_vertex
  _glewInfo_GL_EXT_cull_vertex();
 #endif /* GL_EXT_cull_vertex */
+#ifdef GL_EXT_debug_label
+  _glewInfo_GL_EXT_debug_label();
+#endif /* GL_EXT_debug_label */
 #ifdef GL_EXT_debug_marker
  _glewInfo_GL_EXT_debug_marker();
 #endif /* GL_EXT_debug_marker */
@ -9406,6 +9448,9 @@ static void glewInfo (void)
 #ifdef GL_EXT_shader_image_load_store
  _glewInfo_GL_EXT_shader_image_load_store();
 #endif /* GL_EXT_shader_image_load_store */
+#ifdef GL_EXT_shader_integer_mix
+  _glewInfo_GL_EXT_shader_integer_mix();
+#endif /* GL_EXT_shader_integer_mix */
 #ifdef GL_EXT_shadow_funcs
  _glewInfo_GL_EXT_shadow_funcs();
 #endif /* GL_EXT_shadow_funcs */
@ -9568,6 +9613,9 @@ static void glewInfo (void)
 #ifdef GL_INGR_interlace_read
  _glewInfo_GL_INGR_interlace_read();
 #endif /* GL_INGR_interlace_read */
+#ifdef GL_INTEL_fragment_shader_ordering
+  _glewInfo_GL_INTEL_fragment_shader_ordering();
+#endif /* GL_INTEL_fragment_shader_ordering */
 #ifdef GL_INTEL_map_texture
  _glewInfo_GL_INTEL_map_texture();
 #endif /* GL_INTEL_map_texture */
@ -9580,6 +9628,9 @@ static void glewInfo (void)
 #ifdef GL_KHR_debug
  _glewInfo_GL_KHR_debug();
 #endif /* GL_KHR_debug */
+#ifdef GL_KHR_texture_compression_astc_hdr
+  _glewInfo_GL_KHR_texture_compression_astc_hdr();
+#endif /* GL_KHR_texture_compression_astc_hdr */
 #ifdef GL_KHR_texture_compression_astc_ldr
  _glewInfo_GL_KHR_texture_compression_astc_ldr();
 #endif /* GL_KHR_texture_compression_astc_ldr */
--- a/src/regal/Regal.cpp
+++ b/src/regal/Regal.cpp
@ -1070,11 +1070,13 @@ extern "C" {
    DispatchTableGL *_next = &_context->dispatcher.front();
    RegalAssert(_next);
    _next->call(&_next->glFinish)();
+    #if REGAL_FRAME
    if (_context->frame)
    {
      // Notify Regal::Frame about the glFinish() event
      _context->frame->glFinish(*_context);
    }
+    #endif /* REGAL_FRAME */
  }

  REGAL_DECL void REGAL_CALL glFlush(void)
@ -7099,17 +7101,6 @@ extern "C" {
    _next->call(&_next->glFramebufferTexture)(target, attachment, texture, level);
  }

-  REGAL_DECL void REGAL_CALL glFramebufferTextureFace(GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face)
-  {
-    RegalContext *_context = REGAL_GET_CONTEXT();
-    RegalAssert(Init::isInitialized());
-    App("glFramebufferTextureFace","(", toString(target), ", ", toString(attachment), ", ", texture, ", ", level, ", ", toString(face), ")");
-    if (!_context) return;
-    DispatchTableGL *_next = &_context->dispatcher.front();
-    RegalAssert(_next);
-    _next->call(&_next->glFramebufferTextureFace)(target, attachment, texture, level, face);
-  }
-
  REGAL_DECL void REGAL_CALL glGetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)
  {
    RegalContext *_context = REGAL_GET_CONTEXT();
@ -20922,22 +20913,22 @@ extern "C" {

  /* GL_EXT_pixel_transform */

-  REGAL_DECL void REGAL_CALL glGetPixelTransformParameterfvEXT(GLenum target, GLenum pname, const GLfloat *params)
+  REGAL_DECL void REGAL_CALL glGetPixelTransformParameterfvEXT(GLenum target, GLenum pname, GLfloat *params)
  {
    RegalContext *_context = REGAL_GET_CONTEXT();
    RegalAssert(Init::isInitialized());
-    App("glGetPixelTransformParameterfvEXT","(", toString(target), ", ", toString(pname), ", ", boost::print::optional(params,Logging::pointers), ")");
+    App("glGetPixelTransformParameterfvEXT","(", toString(target), ", ", toString(pname), ")");
    if (!_context) return;
    DispatchTableGL *_next = &_context->dispatcher.front();
    RegalAssert(_next);
    _next->call(&_next->glGetPixelTransformParameterfvEXT)(target, pname, params);
  }

-  REGAL_DECL void REGAL_CALL glGetPixelTransformParameterivEXT(GLenum target, GLenum pname, const GLint *params)
+  REGAL_DECL void REGAL_CALL glGetPixelTransformParameterivEXT(GLenum target, GLenum pname, GLint *params)
  {
    RegalContext *_context = REGAL_GET_CONTEXT();
    RegalAssert(Init::isInitialized());
-    App("glGetPixelTransformParameterivEXT","(", toString(target), ", ", toString(pname), ", ", boost::print::optional(params,Logging::pointers), ")");
+    App("glGetPixelTransformParameterivEXT","(", toString(target), ", ", toString(pname), ")");
    if (!_context) return;
    DispatchTableGL *_next = &_context->dispatcher.front();
    RegalAssert(_next);
@ -22476,9 +22467,11 @@ extern "C" {
    RegalAssert(Init::isInitialized());
    App("glFrameTerminatorGREMEDY","()");
    if (!_context) return;
+    #if REGAL_FRAME
    // Notify Regal::Frame about the frame terminator event.
    if (_context && _context->frame)
      _context->frame->glFrameTerminatorGREMEDY(*_context);
+    #endif
    RegalAssert(_context->info);
    // Return to application unless GL_GREMEDY_frame_terminator is supported by the driver.
    if (!_context->info->gl_gremedy_frame_terminator) return;
@ -31671,10 +31664,12 @@ extern "C" {
    DispatchTableGlobal *_next = &dispatcherGlobal.front();
    RegalAssert(_next);
    BOOL ret = 0;
+    #if REGAL_FRAME
    RegalContext *_context = REGAL_GET_CONTEXT();
    // Notify Regal::Frame about the swap buffers event.
    if (_context && _context->frame)
        _context->frame->wglSwapBuffers(*_context);
+    #endif
    ret = _next->call(&_next->wglSwapBuffers)(hDC);
    return ret;
  }
@ -32941,9 +32936,11 @@ extern "C" {
        #endif
        _context->x11Drawable = drawable;
    }
+    #if REGAL_FRAME
    // Notify Regal::Frame about the swap buffers event.
    if (_context && _context->frame)
        _context->frame->glXSwapBuffers(*_context);
+    #endif
    _next->call(&_next->glXSwapBuffers)(dpy, drawable);
  }

@ -34319,10 +34316,12 @@ extern "C" {
    DispatchTableGlobal *_next = &dispatcherGlobal.front();
    RegalAssert(_next);
    CGLError ret = (CGLError) 0;
+    #if REGAL_FRAME
    RegalContext *_context = REGAL_GET_CONTEXT();
    // Notify Regal::Frame about the flush drawable event.
    if (_context && _context->frame)
        _context->frame->CGLFlushDrawable(*_context);
+    #endif
    ret = _next->call(&_next->CGLFlushDrawable)(ctx);
    return ret;
  }
@ -35360,10 +35359,12 @@ extern "C" {
    DispatchTableGlobal *_next = &dispatcherGlobal.front();
    RegalAssert(_next);
    EGLBoolean ret = 0;
+    #if REGAL_FRAME
    RegalContext *_context = REGAL_GET_CONTEXT();
    // Notify Regal::Frame about the swap buffers event.
    if (_context && _context->frame)
        _context->frame->eglSwapBuffers(*_context);
+    #endif
    ret = _next->call(&_next->eglSwapBuffers)(dpy, surface);
    return ret;
  }
--- a/src/regal/Regal.def
+++ b/src/regal/Regal.def
@ -639,7 +639,6 @@ EXPORTS
  glFramebufferTexture3DOES
  glFramebufferTextureARB
  glFramebufferTextureEXT
-  glFramebufferTextureFace
  glFramebufferTextureFaceARB
  glFramebufferTextureFaceEXT
  glFramebufferTextureLayer
--- a/src/regal/RegalContext.cpp
+++ b/src/regal/RegalContext.cpp
@ -87,7 +87,9 @@ RegalContext::RegalContext()
  statistics(new Statistics()),
 #endif
  marker(NULL),
+#if REGAL_FRAME
  frame(NULL),
+#endif /* REGAL_FRAME */
 #if REGAL_EMULATION
  emuLevel(0),
  obj(NULL),
@ -173,10 +175,12 @@ RegalContext::Init()
  {
    marker = new Marker;
  }
+  #if REGAL_FRAME
  if (!frame)
  {
    frame = new Frame;
  }
+  #endif /* REGAL_FRAME */

 #if REGAL_EMULATION
  const bool forceEmuObj     = Config::forceEmuObj        || REGAL_FORCE_EMU_OBJ;
--- a/src/regal/RegalContext.h
+++ b/src/regal/RegalContext.h
@ -119,7 +119,9 @@ struct RegalContext
  //

  scoped_ptr<Marker            > marker;
+#if REGAL_FRAME
  scoped_ptr<Frame             > frame;
+#endif /* REGAL_FRAME */
 #if REGAL_EMULATION
  // Fixed function emulation
  int emuLevel;
--- a/src/regal/RegalDispatch.h
+++ b/src/regal/RegalDispatch.h
@ -1367,7 +1367,6 @@ namespace Dispatch
    // GL_VERSION_3_2

    void (REGAL_CALL *glFramebufferTexture)(GLenum target, GLenum attachment, GLuint texture, GLint level);
-    void (REGAL_CALL *glFramebufferTextureFace)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
    void (REGAL_CALL *glGetBufferParameteri64v)(GLenum target, GLenum pname, GLint64 *params);
    void (REGAL_CALL *glGetInteger64i_v)(GLenum target, GLuint index, GLint64 *data);

@ -3059,8 +3058,8 @@ namespace Dispatch

    // GL_EXT_pixel_transform

-    void (REGAL_CALL *glGetPixelTransformParameterfvEXT)(GLenum target, GLenum pname, const GLfloat *params);
-    void (REGAL_CALL *glGetPixelTransformParameterivEXT)(GLenum target, GLenum pname, const GLint *params);
+    void (REGAL_CALL *glGetPixelTransformParameterfvEXT)(GLenum target, GLenum pname, GLfloat *params);
+    void (REGAL_CALL *glGetPixelTransformParameterivEXT)(GLenum target, GLenum pname, GLint *params);
    void (REGAL_CALL *glPixelTransformParameterfEXT)(GLenum target, GLenum pname, const GLfloat param);
    void (REGAL_CALL *glPixelTransformParameterfvEXT)(GLenum target, GLenum pname, const GLfloat *params);
    void (REGAL_CALL *glPixelTransformParameteriEXT)(GLenum target, GLenum pname, const GLint param);
--- a/src/regal/RegalDispatchCode.cpp
+++ b/src/regal/RegalDispatchCode.cpp
@ -11192,26 +11192,6 @@ static void REGAL_CALL code_glFramebufferTexture(GLenum target, GLenum attachmen
      fprintf(_context->codeSource,"%s",_code.str().c_str());
 }

-static void REGAL_CALL code_glFramebufferTextureFace(GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face)
-{
-    RegalContext *_context = REGAL_GET_CONTEXT();
-    RegalAssert(_context);
-    DispatchTableGL *_next = _context->dispatcher.code.next();
-    RegalAssert(_next);
-    _next->call(&_next->glFramebufferTextureFace)(target, attachment, texture, level, face);
-    std::string indent((_context->depthBeginEnd + _context->depthPushAttrib + 1)*2,' ');
-    string_list< ::std::string > _code;
-    _code << indent << "glFramebufferTextureFace(";
-                   _code << toString(target);
-    _code << ", "; _code << toString(attachment);
-    _code << ", "; _code << texture;
-    _code << ", "; _code << level;
-    _code << ", "; _code << toString(face);
-    _code << ");\n";
-    if (_context->codeSource)
-      fprintf(_context->codeSource,"%s",_code.str().c_str());
-}
-
 static void REGAL_CALL code_glGetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)
 {
    RegalContext *_context = REGAL_GET_CONTEXT();
@ -34692,7 +34672,7 @@ static void REGAL_CALL code_glGetColorTableParameterivEXT(GLenum target, GLenum
      fprintf(_context->codeSource,"%s",_code.str().c_str());
 }

-static void REGAL_CALL code_glGetPixelTransformParameterfvEXT(GLenum target, GLenum pname, const GLfloat *params)
+static void REGAL_CALL code_glGetPixelTransformParameterfvEXT(GLenum target, GLenum pname, GLfloat *params)
 {
    RegalContext *_context = REGAL_GET_CONTEXT();
    RegalAssert(_context);
@ -34710,7 +34690,7 @@ static void REGAL_CALL code_glGetPixelTransformParameterfvEXT(GLenum target, GLe
      fprintf(_context->codeSource,"%s",_code.str().c_str());
 }

-static void REGAL_CALL code_glGetPixelTransformParameterivEXT(GLenum target, GLenum pname, const GLint *params)
+static void REGAL_CALL code_glGetPixelTransformParameterivEXT(GLenum target, GLenum pname, GLint *params)
 {
    RegalContext *_context = REGAL_GET_CONTEXT();
    RegalAssert(_context);
@ -51552,7 +51532,6 @@ void InitDispatchTableCode(DispatchTableGL &tbl)
  tbl.glPrimitiveRestartIndex = code_glPrimitiveRestartIndex;
  tbl.glTexBuffer = code_glTexBuffer;
  tbl.glFramebufferTexture = code_glFramebufferTexture;
-  tbl.glFramebufferTextureFace = code_glFramebufferTextureFace;
  tbl.glGetBufferParameteri64v = code_glGetBufferParameteri64v;
  tbl.glGetInteger64i_v = code_glGetInteger64i_v;
  tbl.glVertexAttribDivisor = code_glVertexAttribDivisor;
--- a/src/regal/RegalDispatchDebug.cpp
+++ b/src/regal/RegalDispatchDebug.cpp
@ -5611,15 +5611,6 @@ static void REGAL_CALL debug_glFramebufferTexture(GLenum target, GLenum attachme
  _next->call(&_next->glFramebufferTexture)(target, attachment, texture, level);
 }

-static void REGAL_CALL debug_glFramebufferTextureFace(GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face)
-{
-  RegalContext *_context = REGAL_GET_CONTEXT();
-  RegalAssert(_context);
-  DispatchTableGL *_next = _context->dispatcher.debug.next();
-  RegalAssert(_next);
-  _next->call(&_next->glFramebufferTextureFace)(target, attachment, texture, level, face);
-}
-
 static void REGAL_CALL debug_glGetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)
 {
  RegalContext *_context = REGAL_GET_CONTEXT();
@ -17009,7 +17000,7 @@ static void REGAL_CALL debug_glGetColorTableParameterivEXT(GLenum target, GLenum

 // GL_EXT_pixel_transform

-static void REGAL_CALL debug_glGetPixelTransformParameterfvEXT(GLenum target, GLenum pname, const GLfloat *params)
+static void REGAL_CALL debug_glGetPixelTransformParameterfvEXT(GLenum target, GLenum pname, GLfloat *params)
 {
  RegalContext *_context = REGAL_GET_CONTEXT();
  RegalAssert(_context);
@ -17018,7 +17009,7 @@ static void REGAL_CALL debug_glGetPixelTransformParameterfvEXT(GLenum target, GL
  _next->call(&_next->glGetPixelTransformParameterfvEXT)(target, pname, params);
 }

-static void REGAL_CALL debug_glGetPixelTransformParameterivEXT(GLenum target, GLenum pname, const GLint *params)
+static void REGAL_CALL debug_glGetPixelTransformParameterivEXT(GLenum target, GLenum pname, GLint *params)
 {
  RegalContext *_context = REGAL_GET_CONTEXT();
  RegalAssert(_context);
@ -25728,7 +25719,6 @@ void InitDispatchTableDebug(DispatchTableGL &tbl)
  // GL_VERSION_3_2

  tbl.glFramebufferTexture = debug_glFramebufferTexture;
-  tbl.glFramebufferTextureFace = debug_glFramebufferTextureFace;
  tbl.glGetBufferParameteri64v = debug_glGetBufferParameteri64v;
  tbl.glGetInteger64i_v = debug_glGetInteger64i_v;

--- a/src/regal/RegalDispatchEmu.cpp
+++ b/src/regal/RegalDispatchEmu.cpp
@ -6999,16 +6999,6 @@ static void REGAL_CALL emu_glHint(GLenum target, GLenum mode)
        _context->ppa->glHint( target, mode );
      }
      #endif
-    case 13 :
-    case 12 :
-    case 11 :
-    case 10 :
-    case 9 :
-    case 8 :
-    case 7 :
-      #if REGAL_EMU_IFF
-      if (_context->iff) break;
-      #endif
    case 1 :
    default:
      break;
@ -20744,9 +20734,6 @@ static void REGAL_CALL emu_glTexSubImage2D(GLenum target, GLint level, GLint xof
    case 9 :
    case 8 :
    case 7 :
-      #if REGAL_EMU_IFF
-      if (_context->iff) break;
-      #endif
    case 6 :
    case 5 :
    case 4 :
@ -31993,46 +31980,6 @@ static void REGAL_CALL emu_glFramebufferTexture(GLenum target, GLenum attachment
  _next->call(& _next->glFramebufferTexture)(target, attachment, texture, level);
 }

-static void REGAL_CALL emu_glFramebufferTextureFace(GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face)
-{
-  RegalContext *_context = REGAL_GET_CONTEXT();
-  RegalAssert(_context);
-  DispatchTableGL &_dispatch = _context->dispatcher.emulation;
-
-  // prefix
-  switch( _context->emuLevel )
-  {
-    case 16 :
-    case 15 :
-    case 14 :
-    case 13 :
-    case 12 :
-    case 11 :
-    case 10 :
-    case 9 :
-    case 8 :
-    case 7 :
-    case 6 :
-    case 5 :
-    case 4 :
-      #if REGAL_EMU_DSA
-      if (_context->dsa)
-      {
-        Push<int> pushLevel(_context->emuLevel);
-        _context->emuLevel = 3;
-        _context->dsa->RestoreFramebuffer( _context );
-      }
-      #endif
-    case 1 :
-    default:
-      break;
-  }
-
-  DispatchTableGL *_next = _dispatch.next();
-  RegalAssert(_next);
-  _next->call(& _next->glFramebufferTextureFace)(target, attachment, texture, level, face);
-}
-
 // GL_VERSION_3_3

 static void REGAL_CALL emu_glVertexAttribDivisor(GLuint index, GLuint divisor)
@ -69900,7 +69847,6 @@ void InitDispatchTableEmu(DispatchTableGL &tbl)
 // GL_VERSION_3_2

   tbl.glFramebufferTexture = emu_glFramebufferTexture;
-   tbl.glFramebufferTextureFace = emu_glFramebufferTextureFace;

 // GL_VERSION_3_3

--- a/src/regal/RegalDispatchError.cpp
+++ b/src/regal/RegalDispatchError.cpp
@ -15369,31 +15369,6 @@ static void REGAL_CALL error_glFramebufferTexture(GLenum target, GLenum attachme
  }
 }

-static void REGAL_CALL error_glFramebufferTextureFace(GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face)
-{
-  Internal("error_glFramebufferTextureFace","()");
-  RegalContext *_context = REGAL_GET_CONTEXT();
-  RegalAssert(_context);
-  DispatchTableGL *_next = _context->dispatcher.error.next();
-  RegalAssert(_next);
-  GLenum _error = GL_NO_ERROR;
-  if (!_context->err.inBeginEnd)
-    _error = _next->call(&_next->glGetError)();
-  RegalAssert(_error==GL_NO_ERROR);
-  _next->call(&_next->glFramebufferTextureFace)(target, attachment, texture, level, face);
-  if (!_context->err.inBeginEnd) {
-    _error = _next->call(&_next->glGetError)();
-    if (_error!=GL_NO_ERROR) {
-      Error("glFramebufferTextureFace : ",Token::GLerrorToString(_error));
-      #if REGAL_BREAK
-      Break::ErrorCB(_error);
-      #endif
-      if (_context->err.callback)
-        _context->err.callback( _error );
-    }
-  }
-}
-
 static void REGAL_CALL error_glGetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)
 {
  Internal("error_glGetBufferParameteri64v","()");
@ -46349,7 +46324,7 @@ static void REGAL_CALL error_glGetColorTableParameterivEXT(GLenum target, GLenum

 // GL_EXT_pixel_transform

-static void REGAL_CALL error_glGetPixelTransformParameterfvEXT(GLenum target, GLenum pname, const GLfloat *params)
+static void REGAL_CALL error_glGetPixelTransformParameterfvEXT(GLenum target, GLenum pname, GLfloat *params)
 {
  Internal("error_glGetPixelTransformParameterfvEXT","()");
  RegalContext *_context = REGAL_GET_CONTEXT();
@ -46374,7 +46349,7 @@ static void REGAL_CALL error_glGetPixelTransformParameterfvEXT(GLenum target, GL
  }
 }

-static void REGAL_CALL error_glGetPixelTransformParameterivEXT(GLenum target, GLenum pname, const GLint *params)
+static void REGAL_CALL error_glGetPixelTransformParameterivEXT(GLenum target, GLenum pname, GLint *params)
 {
  Internal("error_glGetPixelTransformParameterivEXT","()");
  RegalContext *_context = REGAL_GET_CONTEXT();
@ -68860,7 +68835,6 @@ void InitDispatchTableError(DispatchTableGL &tbl)
  // GL_VERSION_3_2

  tbl.glFramebufferTexture = error_glFramebufferTexture;
-  tbl.glFramebufferTextureFace = error_glFramebufferTextureFace;
  tbl.glGetBufferParameteri64v = error_glGetBufferParameteri64v;
  tbl.glGetInteger64i_v = error_glGetInteger64i_v;

--- a/src/regal/RegalDispatchLoader.cpp
+++ b/src/regal/RegalDispatchLoader.cpp
@ -4383,13 +4383,6 @@ namespace Loader
    _driver.call(&_driver.glFramebufferTexture)(target, attachment, texture, level);
  }

-  static void REGAL_CALL glFramebufferTextureFace(GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face)
-  {
-    DispatchTableGL &_driver = _getDispatchGL();
-    _getProcAddress(reinterpret_cast<void (**)()>(&_driver.glFramebufferTextureFace),reinterpret_cast<void (*)()>(glFramebufferTextureFace),"glFramebufferTextureFace");
-    _driver.call(&_driver.glFramebufferTextureFace)(target, attachment, texture, level, face);
-  }
-
  static void REGAL_CALL glGetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)
  {
    DispatchTableGL &_driver = _getDispatchGL();
@ -13263,14 +13256,14 @@ namespace Loader

 // GL_EXT_pixel_transform

-  static void REGAL_CALL glGetPixelTransformParameterfvEXT(GLenum target, GLenum pname, const GLfloat *params)
+  static void REGAL_CALL glGetPixelTransformParameterfvEXT(GLenum target, GLenum pname, GLfloat *params)
  {
    DispatchTableGL &_driver = _getDispatchGL();
    _getProcAddress(reinterpret_cast<void (**)()>(&_driver.glGetPixelTransformParameterfvEXT),reinterpret_cast<void (*)()>(glGetPixelTransformParameterfvEXT),"glGetPixelTransformParameterfvEXT");
    _driver.call(&_driver.glGetPixelTransformParameterfvEXT)(target, pname, params);
  }

-  static void REGAL_CALL glGetPixelTransformParameterivEXT(GLenum target, GLenum pname, const GLint *params)
+  static void REGAL_CALL glGetPixelTransformParameterivEXT(GLenum target, GLenum pname, GLint *params)
  {
    DispatchTableGL &_driver = _getDispatchGL();
    _getProcAddress(reinterpret_cast<void (**)()>(&_driver.glGetPixelTransformParameterivEXT),reinterpret_cast<void (*)()>(glGetPixelTransformParameterivEXT),"glGetPixelTransformParameterivEXT");
@ -23057,7 +23050,6 @@ namespace Loader
  // GL_VERSION_3_2

    tbl.glFramebufferTexture = glFramebufferTexture;
-    tbl.glFramebufferTextureFace = glFramebufferTextureFace;
    tbl.glGetBufferParameteri64v = glGetBufferParameteri64v;
    tbl.glGetInteger64i_v = glGetInteger64i_v;

--- a/src/regal/RegalDispatchLog.cpp
+++ b/src/regal/RegalDispatchLog.cpp
@ -6232,16 +6232,6 @@ static void REGAL_CALL log_glFramebufferTexture(GLenum target, GLenum attachment
    Driver("glFramebufferTexture","(", toString(target), ", ", toString(attachment), ", ", texture, ", ", level, ")");
 }

-static void REGAL_CALL log_glFramebufferTextureFace(GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face)
-{
-    RegalContext *_context = REGAL_GET_CONTEXT();
-    RegalAssert(_context);
-    DispatchTableGL *_next = _context->dispatcher.logging.next();
-    RegalAssert(_next);
-    _next->call(&_next->glFramebufferTextureFace)(target, attachment, texture, level, face);
-    Driver("glFramebufferTextureFace","(", toString(target), ", ", toString(attachment), ", ", texture, ", ", level, ", ", toString(face), ")");
-}
-
 static void REGAL_CALL log_glGetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)
 {
    RegalContext *_context = REGAL_GET_CONTEXT();
@ -18852,7 +18842,7 @@ static void REGAL_CALL log_glGetColorTableParameterivEXT(GLenum target, GLenum p

 // GL_EXT_pixel_transform

-static void REGAL_CALL log_glGetPixelTransformParameterfvEXT(GLenum target, GLenum pname, const GLfloat *params)
+static void REGAL_CALL log_glGetPixelTransformParameterfvEXT(GLenum target, GLenum pname, GLfloat *params)
 {
    RegalContext *_context = REGAL_GET_CONTEXT();
    RegalAssert(_context);
@ -18862,7 +18852,7 @@ static void REGAL_CALL log_glGetPixelTransformParameterfvEXT(GLenum target, GLen
    Driver("glGetPixelTransformParameterfvEXT","(", toString(target), ", ", toString(pname), ", ", boost::print::optional(params,Logging::pointers), ")");
 }

-static void REGAL_CALL log_glGetPixelTransformParameterivEXT(GLenum target, GLenum pname, const GLint *params)
+static void REGAL_CALL log_glGetPixelTransformParameterivEXT(GLenum target, GLenum pname, GLint *params)
 {
    RegalContext *_context = REGAL_GET_CONTEXT();
    RegalAssert(_context);
@ -32002,7 +31992,6 @@ void InitDispatchTableLog(DispatchTableGL &tbl)
  // GL_VERSION_3_2

  tbl.glFramebufferTexture = log_glFramebufferTexture;
-  tbl.glFramebufferTextureFace = log_glFramebufferTextureFace;
  tbl.glGetBufferParameteri64v = log_glGetBufferParameteri64v;
  tbl.glGetInteger64i_v = log_glGetInteger64i_v;

--- a/src/regal/RegalDispatchMissing.cpp
+++ b/src/regal/RegalDispatchMissing.cpp
@ -4732,16 +4732,6 @@ namespace Missing
    Warning( "glFramebufferTexture", " not available." );
  }

-  static void REGAL_CALL glFramebufferTextureFace(GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face)
-{
-    UNUSED_PARAMETER(target);
-    UNUSED_PARAMETER(attachment);
-    UNUSED_PARAMETER(texture);
-    UNUSED_PARAMETER(level);
-    UNUSED_PARAMETER(face);
-    Warning( "glFramebufferTextureFace", " not available." );
-  }
-
  static void REGAL_CALL glGetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)
 {
    UNUSED_PARAMETER(target);
@ -15607,7 +15597,7 @@ namespace Missing

 // GL_EXT_pixel_transform

-  static void REGAL_CALL glGetPixelTransformParameterfvEXT(GLenum target, GLenum pname, const GLfloat *params)
+  static void REGAL_CALL glGetPixelTransformParameterfvEXT(GLenum target, GLenum pname, GLfloat *params)
 {
    UNUSED_PARAMETER(target);
    UNUSED_PARAMETER(pname);
@ -15615,7 +15605,7 @@ namespace Missing
    Warning( "glGetPixelTransformParameterfvEXT", " not available." );
  }

-  static void REGAL_CALL glGetPixelTransformParameterivEXT(GLenum target, GLenum pname, const GLint *params)
+  static void REGAL_CALL glGetPixelTransformParameterivEXT(GLenum target, GLenum pname, GLint *params)
 {
    UNUSED_PARAMETER(target);
    UNUSED_PARAMETER(pname);
@ -27091,7 +27081,6 @@ namespace Missing
  // GL_VERSION_3_2

    tbl.glFramebufferTexture = glFramebufferTexture;
-    tbl.glFramebufferTextureFace = glFramebufferTextureFace;
    tbl.glGetBufferParameteri64v = glGetBufferParameteri64v;
    tbl.glGetInteger64i_v = glGetInteger64i_v;

--- a/src/regal/RegalDispatchStatistics.cpp
+++ b/src/regal/RegalDispatchStatistics.cpp
@ -8742,20 +8742,6 @@ static void REGAL_CALL statistics_glFramebufferTexture(GLenum target, GLenum att
  _next->call(&_next->glFramebufferTexture)(target, attachment, texture, level);
 }

-static void REGAL_CALL statistics_glFramebufferTextureFace(GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face)
-{
-  RegalContext *_context = REGAL_GET_CONTEXT();
-  RegalAssert(_context);
-
-  RegalAssert(_context->statistics);
-  Statistics &statistics = *_context->statistics;
-  statistics.glFramebufferTextureFace++;
-
-  DispatchTableGL *_next = _context->dispatcher.statistics.next();
-  RegalAssert(_next);
-  _next->call(&_next->glFramebufferTextureFace)(target, attachment, texture, level, face);
-}
-
 static void REGAL_CALL statistics_glGetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)
 {
  RegalContext *_context = REGAL_GET_CONTEXT();
@ -28488,7 +28474,7 @@ static void REGAL_CALL statistics_glGetColorTableParameterivEXT(GLenum target, G

 // GL_EXT_pixel_transform

-static void REGAL_CALL statistics_glGetPixelTransformParameterfvEXT(GLenum target, GLenum pname, const GLfloat *params)
+static void REGAL_CALL statistics_glGetPixelTransformParameterfvEXT(GLenum target, GLenum pname, GLfloat *params)
 {
  RegalContext *_context = REGAL_GET_CONTEXT();
  RegalAssert(_context);
@ -28504,7 +28490,7 @@ static void REGAL_CALL statistics_glGetPixelTransformParameterfvEXT(GLenum targe
  _next->call(&_next->glGetPixelTransformParameterfvEXT)(target, pname, params);
 }

-static void REGAL_CALL statistics_glGetPixelTransformParameterivEXT(GLenum target, GLenum pname, const GLint *params)
+static void REGAL_CALL statistics_glGetPixelTransformParameterivEXT(GLenum target, GLenum pname, GLint *params)
 {
  RegalContext *_context = REGAL_GET_CONTEXT();
  RegalAssert(_context);
@ -43019,7 +43005,6 @@ void InitDispatchTableStatistics(DispatchTableGL &tbl)
  // GL_VERSION_3_2

  tbl.glFramebufferTexture = statistics_glFramebufferTexture;
-  tbl.glFramebufferTextureFace = statistics_glFramebufferTextureFace;
  tbl.glGetBufferParameteri64v = statistics_glGetBufferParameteri64v;
  tbl.glGetInteger64i_v = statistics_glGetInteger64i_v;

--- a/src/regal/RegalDispatchTrace.cpp
+++ b/src/regal/RegalDispatchTrace.cpp
@ -776,6 +776,11 @@ namespace Trace

  void  glSetMultisamplefvAMD(GLenum pname, GLuint index, const GLfloat *val);

+// GL_AMD_sparse_texture
+
+  void  glTexStorageSparseAMD(GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLsizei layers, GLbitfield flags);
+  void  glTextureStorageSparseAMD(GLuint texture, GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLsizei layers, GLbitfield flags);
+
 // GL_AMD_vertex_shader_tessellator

  void  glTessellationFactorAMD(GLfloat factor);
@ -887,6 +892,7 @@ namespace Trace
  void  glClearBufferData(GLenum target, GLenum internalformat, GLenum format, GLenum type, const GLvoid *data);
  void  glClearBufferSubData(GLenum target, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const GLvoid *data);
  void  glClearNamedBufferDataEXT(GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const GLvoid *data);
+  void  glClearNamedBufferSubDataEXT(GLuint buffer, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const GLvoid *data);

 // GL_ARB_clear_texture

@ -1909,9 +1915,11 @@ namespace Trace
  void  glCopyTextureSubImage2DEXT(GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
  void  glCopyTextureSubImage3DEXT(GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
  void  glDisableClientStateIndexedEXT(GLenum array, GLuint index);
+  void  glDisableClientStateiEXT(GLenum array, GLuint index);
  void  glDisableVertexArrayAttribEXT(GLuint vaobj, GLenum array);
  void  glDisableVertexArrayEXT(GLuint vaobj, GLenum array);
  void  glEnableClientStateIndexedEXT(GLenum array, GLuint index);
+  void  glEnableClientStateiEXT(GLenum array, GLuint index);
  void  glEnableVertexArrayAttribEXT(GLuint vaobj, GLenum array);
  void  glEnableVertexArrayEXT(GLuint vaobj, GLenum array);
  void  glFlushMappedNamedBufferRangeEXT(GLuint buffer, GLintptr offset, GLsizeiptr length);
@ -1923,7 +1931,9 @@ namespace Trace
  void  glGetCompressedMultiTexImageEXT(GLenum texunit, GLenum target, GLint lod, GLvoid *img);
  void  glGetCompressedTextureImageEXT(GLuint texture, GLenum target, GLint lod, GLvoid *img);
  void  glGetDoubleIndexedvEXT(GLenum target, GLuint index, GLdouble *data);
+  void  glGetDoublei_vEXT(GLenum target, GLuint index, GLdouble *data);
  void  glGetFloatIndexedvEXT(GLenum target, GLuint index, GLfloat *data);
+  void  glGetFloati_vEXT(GLenum target, GLuint index, GLfloat *data);
  void  glGetFramebufferParameterivEXT(GLuint framebuffer, GLenum pname, GLint *params);
  void  glGetMultiTexEnvfvEXT(GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
  void  glGetMultiTexEnvivEXT(GLenum texunit, GLenum target, GLenum pname, GLint *params);
@ -1949,6 +1959,7 @@ namespace Trace
  void  glGetNamedProgramivEXT(GLuint program, GLenum target, GLenum pname, GLint *params);
  void  glGetNamedRenderbufferParameterivEXT(GLuint renderbuffer, GLenum pname, GLint *params);
  void  glGetPointerIndexedvEXT(GLenum target, GLuint index, GLvoid **data);
+  void  glGetPointeri_vEXT(GLenum pname, GLuint index, GLvoid **params);
  void  glGetTextureImageEXT(GLuint texture, GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
  void  glGetTextureLevelParameterfvEXT(GLuint texture, GLenum target, GLint level, GLenum pname, GLfloat *params);
  void  glGetTextureLevelParameterivEXT(GLuint texture, GLenum target, GLint level, GLenum pname, GLint *params);
@ -1993,6 +2004,9 @@ namespace Trace
  void  glMultiTexGenfvEXT(GLenum texunit, GLenum coord, GLenum pname, const GLfloat *params);
  void  glMultiTexGeniEXT(GLenum texunit, GLenum coord, GLenum pname, GLint param);
  void  glMultiTexGenivEXT(GLenum texunit, GLenum coord, GLenum pname, const GLint *params);
+  void  glMultiTexImage1DEXT(GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+  void  glMultiTexImage2DEXT(GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+  void  glMultiTexImage3DEXT(GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
  void  glMultiTexParameterIivEXT(GLenum texunit, GLenum target, GLenum pname, const GLint *params);
  void  glMultiTexParameterIuivEXT(GLenum texunit, GLenum target, GLenum pname, const GLuint *params);
  void  glMultiTexParameterfEXT(GLenum texunit, GLenum target, GLenum pname, GLfloat param);
@ -2080,6 +2094,9 @@ namespace Trace
  void  glProgramUniformMatrix4x3fvEXT(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
  void  glPushClientAttribDefaultEXT(GLbitfield mask);
  void  glTextureBufferEXT(GLuint texture, GLenum target, GLenum internalformat, GLuint buffer);
+  void  glTextureImage1DEXT(GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+  void  glTextureImage2DEXT(GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+  void  glTextureImage3DEXT(GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
  void  glTextureParameterIivEXT(GLuint texture, GLenum target, GLenum pname, const GLint *params);
  void  glTextureParameterIuivEXT(GLuint texture, GLenum target, GLenum pname, const GLuint *params);
  void  glTextureParameterfEXT(GLuint texture, GLenum target, GLenum pname, GLfloat param);
@ -2265,6 +2282,8 @@ namespace Trace

 // GL_EXT_pixel_transform

+  void  glGetPixelTransformParameterfvEXT(GLenum target, GLenum pname, GLfloat *params);
+  void  glGetPixelTransformParameterivEXT(GLenum target, GLenum pname, GLint *params);
  void  glPixelTransformParameterfEXT(GLenum target, GLenum pname, const GLfloat param);
  void  glPixelTransformParameterfvEXT(GLenum target, GLenum pname, const GLfloat *params);
  void  glPixelTransformParameteriEXT(GLenum target, GLenum pname, const GLint param);
@ -2559,6 +2578,27 @@ namespace Trace
  void  glWindowPos4sMESA(GLshort x, GLshort y, GLshort z, GLshort w);
  void  glWindowPos4svMESA(const GLshort *v);

+// GL_NVX_conditional_render
+
+  void  glBeginConditionalRenderNVX(GLuint id);
+  void  glEndConditionalRenderNVX(void);
+
+// GL_NV_bindless_texture
+
+  GLuint64  glGetImageHandleNV(GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum format);
+  GLuint64  glGetTextureHandleNV(GLuint texture);
+  GLuint64  glGetTextureSamplerHandleNV(GLuint texture, GLuint sampler);
+  GLboolean  glIsImageHandleResidentNV(GLuint64 handle);
+  GLboolean  glIsTextureHandleResidentNV(GLuint64 handle);
+  void  glMakeImageHandleNonResidentNV(GLuint64 handle);
+  void  glMakeImageHandleResidentNV(GLuint64 handle, GLenum access);
+  void  glMakeTextureHandleNonResidentNV(GLuint64 handle);
+  void  glMakeTextureHandleResidentNV(GLuint64 handle);
+  void  glProgramUniformHandleui64NV(GLuint program, GLint location, GLuint64 value);
+  void  glProgramUniformHandleui64vNV(GLuint program, GLint location, GLsizei count, const GLuint64 *values);
+  void  glUniformHandleui64NV(GLint location, GLuint64 value);
+  void  glUniformHandleui64vNV(GLint location, GLsizei count, const GLuint64 *value);
+
 // GL_NV_conditional_render

  void  glBeginConditionalRenderNV(GLuint id, GLenum mode);
@ -2583,6 +2623,10 @@ namespace Trace

  void  glDrawBuffersNV(GLsizei n, const GLenum *bufs);

+// GL_NV_draw_texture
+
+  void  glDrawTextureNV(GLuint texture, GLuint sampler, GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1, GLfloat z, GLfloat s0, GLfloat t0, GLfloat s1, GLfloat t1);
+
 // GL_NV_evaluators

  void  glEvalMapsNV(GLenum target, GLenum mode);
@ -10472,6 +10516,28 @@ static void REGAL_CALL trace_glSetMultisamplefvAMD(GLenum pname, GLuint index, c
  Trace::glSetMultisamplefvAMD(pname, index, val);
 }

+// GL_AMD_sparse_texture
+
+static void REGAL_CALL trace_glTexStorageSparseAMD(GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLsizei layers, GLbitfield flags)
+{
+  Internal("trace_glTexStorageSparseAMD","()");
+  Thread::ThreadLocal &_instance = Thread::ThreadLocal::instance();
+  RegalAssert(_instance.currentContext);
+  Push<DispatchTableGL *> _push(_instance.nextDispatchTable);
+  _instance.nextDispatchTable = _instance.currentContext->dispatcher.trace.next();
+  Trace::glTexStorageSparseAMD(target, internalFormat, width, height, depth, layers, flags);
+}
+
+static void REGAL_CALL trace_glTextureStorageSparseAMD(GLuint texture, GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLsizei layers, GLbitfield flags)
+{
+  Internal("trace_glTextureStorageSparseAMD","()");
+  Thread::ThreadLocal &_instance = Thread::ThreadLocal::instance();
+  RegalAssert(_instance.currentContext);
+  Push<DispatchTableGL *> _push(_instance.nextDispatchTable);
+  _instance.nextDispatchTable = _instance.currentContext->dispatcher.trace.next();
+  Trace::glTextureStorageSparseAMD(texture, target, internalFormat, width, height, depth, layers, flags);
+}
+
 // GL_AMD_vertex_shader_tessellator

 static void REGAL_CALL trace_glTessellationFactorAMD(GLfloat factor)
@ -11096,6 +11162,16 @@ static void REGAL_CALL trace_glClearNamedBufferDataEXT(GLuint buffer, GLenum int
  Trace::glClearNamedBufferDataEXT(buffer, internalformat, format, type, data);
 }

+static void REGAL_CALL trace_glClearNamedBufferSubDataEXT(GLuint buffer, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const GLvoid *data)
+{
+  Internal("trace_glClearNamedBufferSubDataEXT","()");
+  Thread::ThreadLocal &_instance = Thread::ThreadLocal::instance();
+  RegalAssert(_instance.currentContext);
+  Push<DispatchTableGL *> _push(_instance.nextDispatchTable);
+  _instance.nextDispatchTable = _instance.currentContext->dispatcher.trace.next();
+  Trace::glClearNamedBufferSubDataEXT(buffer, internalformat, offset, size, format, type, data);
+}
+
 // GL_ARB_clear_texture

 static void REGAL_CALL trace_glClearTexImage(GLuint texture, GLint level, GLenum format, GLenum type, const GLvoid *data)
@ -18806,6 +18882,16 @@ static void REGAL_CALL trace_glDisableClientStateIndexedEXT(GLenum array, GLuint
  Trace::glDisableClientStateIndexedEXT(array, index);
 }

+static void REGAL_CALL trace_glDisableClientStateiEXT(GLenum array, GLuint index)
+{
+  Internal("trace_glDisableClientStateiEXT","()");
+  Thread::ThreadLocal &_instance = Thread::ThreadLocal::instance();
+  RegalAssert(_instance.currentContext);
+  Push<DispatchTableGL *> _push(_instance.nextDispatchTable);
+  _instance.nextDispatchTable = _instance.currentContext->dispatcher.trace.next();
+  Trace::glDisableClientStateiEXT(array, index);
+}
+
 static void REGAL_CALL trace_glDisableVertexArrayAttribEXT(GLuint vaobj, GLenum array)
 {
  Internal("trace_glDisableVertexArrayAttribEXT","()");
@ -18836,6 +18922,16 @@ static void REGAL_CALL trace_glEnableClientStateIndexedEXT(GLenum array, GLuint
  Trace::glEnableClientStateIndexedEXT(array, index);
 }

+static void REGAL_CALL trace_glEnableClientStateiEXT(GLenum array, GLuint index)
+{
+  Internal("trace_glEnableClientStateiEXT","()");
+  Thread::ThreadLocal &_instance = Thread::ThreadLocal::instance();
+  RegalAssert(_instance.currentContext);
+  Push<DispatchTableGL *> _push(_instance.nextDispatchTable);
+  _instance.nextDispatchTable = _instance.currentContext->dispatcher.trace.next();
+  Trace::glEnableClientStateiEXT(array, index);
+}
+
 static void REGAL_CALL trace_glEnableVertexArrayAttribEXT(GLuint vaobj, GLenum array)
 {
  Internal("trace_glEnableVertexArrayAttribEXT","()");
@ -18946,6 +19042,16 @@ static void REGAL_CALL trace_glGetDoubleIndexedvEXT(GLenum target, GLuint index,
  Trace::glGetDoubleIndexedvEXT(target, index, data);
 }

+static void REGAL_CALL trace_glGetDoublei_vEXT(GLenum target, GLuint index, GLdouble *data)
+{
+  Internal("trace_glGetDoublei_vEXT","()");
+  Thread::ThreadLocal &_instance = Thread::ThreadLocal::instance();
+  RegalAssert(_instance.currentContext);
+  Push<DispatchTableGL *> _push(_instance.nextDispatchTable);
+  _instance.nextDispatchTable = _instance.currentContext->dispatcher.trace.next();
+  Trace::glGetDoublei_vEXT(target, index, data);
+}
+
 static void REGAL_CALL trace_glGetFloatIndexedvEXT(GLenum target, GLuint index, GLfloat *data)
 {
  Internal("trace_glGetFloatIndexedvEXT","()");
@ -18956,6 +19062,16 @@ static void REGAL_CALL trace_glGetFloatIndexedvEXT(GLenum target, GLuint index,
  Trace::glGetFloatIndexedvEXT(target, index, data);
 }

+static void REGAL_CALL trace_glGetFloati_vEXT(GLenum target, GLuint index, GLfloat *data)
+{
+  Internal("trace_glGetFloati_vEXT","()");
+  Thread::ThreadLocal &_instance = Thread::ThreadLocal::instance();
+  RegalAssert(_instance.currentContext);
+  Push<DispatchTableGL *> _push(_instance.nextDispatchTable);
+  _instance.nextDispatchTable = _instance.currentContext->dispatcher.trace.next();
+  Trace::glGetFloati_vEXT(target, index, data);
+}
+
 static void REGAL_CALL trace_glGetFramebufferParameterivEXT(GLuint framebuffer, GLenum pname, GLint *params)
 {
  Internal("trace_glGetFramebufferParameterivEXT","()");
@ -19206,6 +19322,16 @@ static void REGAL_CALL trace_glGetPointerIndexedvEXT(GLenum target, GLuint index
  Trace::glGetPointerIndexedvEXT(target, index, data);
 }

+static void REGAL_CALL trace_glGetPointeri_vEXT(GLenum pname, GLuint index, GLvoid **params)
+{
+  Internal("trace_glGetPointeri_vEXT","()");
+  Thread::ThreadLocal &_instance = Thread::ThreadLocal::instance();
+  RegalAssert(_instance.currentContext);
+  Push<DispatchTableGL *> _push(_instance.nextDispatchTable);
+  _instance.nextDispatchTable = _instance.currentContext->dispatcher.trace.next();
+  Trace::glGetPointeri_vEXT(pname, index, params);
+}
+
 static void REGAL_CALL trace_glGetTextureImageEXT(GLuint texture, GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels)
 {
  Internal("trace_glGetTextureImageEXT","()");
@ -19648,6 +19774,36 @@ static void REGAL_CALL trace_glMultiTexGenivEXT(GLenum texunit, GLenum coord, GL
  Trace::glMultiTexGenivEXT(texunit, coord, pname, params);
 }

+static void REGAL_CALL trace_glMultiTexImage1DEXT(GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+  Internal("trace_glMultiTexImage1DEXT","()");
+  Thread::ThreadLocal &_instance = Thread::ThreadLocal::instance();
+  RegalAssert(_instance.currentContext);
+  Push<DispatchTableGL *> _push(_instance.nextDispatchTable);
+  _instance.nextDispatchTable = _instance.currentContext->dispatcher.trace.next();
+  Trace::glMultiTexImage1DEXT(texunit, target, level, internalformat, width, border, format, type, pixels);
+}
+
+static void REGAL_CALL trace_glMultiTexImage2DEXT(GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+  Internal("trace_glMultiTexImage2DEXT","()");
+  Thread::ThreadLocal &_instance = Thread::ThreadLocal::instance();
+  RegalAssert(_instance.currentContext);
+  Push<DispatchTableGL *> _push(_instance.nextDispatchTable);
+  _instance.nextDispatchTable = _instance.currentContext->dispatcher.trace.next();
+  Trace::glMultiTexImage2DEXT(texunit, target, level, internalformat, width, height, border, format, type, pixels);
+}
+
+static void REGAL_CALL trace_glMultiTexImage3DEXT(GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+  Internal("trace_glMultiTexImage3DEXT","()");
+  Thread::ThreadLocal &_instance = Thread::ThreadLocal::instance();
+  RegalAssert(_instance.currentContext);
+  Push<DispatchTableGL *> _push(_instance.nextDispatchTable);
+  _instance.nextDispatchTable = _instance.currentContext->dispatcher.trace.next();
+  Trace::glMultiTexImage3DEXT(texunit, target, level, internalformat, width, height, depth, border, format, type, pixels);
+}
+
 static void REGAL_CALL trace_glMultiTexParameterIivEXT(GLenum texunit, GLenum target, GLenum pname, const GLint *params)
 {
  Internal("trace_glMultiTexParameterIivEXT","()");
@ -20518,6 +20674,36 @@ static void REGAL_CALL trace_glTextureBufferEXT(GLuint texture, GLenum target, G
  Trace::glTextureBufferEXT(texture, target, internalformat, buffer);
 }

+static void REGAL_CALL trace_glTextureImage1DEXT(GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+  Internal("trace_glTextureImage1DEXT","()");
+  Thread::ThreadLocal &_instance = Thread::ThreadLocal::instance();
+  RegalAssert(_instance.currentContext);
+  Push<DispatchTableGL *> _push(_instance.nextDispatchTable);
+  _instance.nextDispatchTable = _instance.currentContext->dispatcher.trace.next();
+  Trace::glTextureImage1DEXT(texture, target, level, internalformat, width, border, format, type, pixels);
+}
+
+static void REGAL_CALL trace_glTextureImage2DEXT(GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+  Internal("trace_glTextureImage2DEXT","()");
+  Thread::ThreadLocal &_instance = Thread::ThreadLocal::instance();
+  RegalAssert(_instance.currentContext);
+  Push<DispatchTableGL *> _push(_instance.nextDispatchTable);
+  _instance.nextDispatchTable = _instance.currentContext->dispatcher.trace.next();
+  Trace::glTextureImage2DEXT(texture, target, level, internalformat, width, height, border, format, type, pixels);
+}
+
+static void REGAL_CALL trace_glTextureImage3DEXT(GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+  Internal("trace_glTextureImage3DEXT","()");
+  Thread::ThreadLocal &_instance = Thread::ThreadLocal::instance();
+  RegalAssert(_instance.currentContext);
+  Push<DispatchTableGL *> _push(_instance.nextDispatchTable);
+  _instance.nextDispatchTable = _instance.currentContext->dispatcher.trace.next();
+  Trace::glTextureImage3DEXT(texture, target, level, internalformat, width, height, depth, border, format, type, pixels);
+}
+
 static void REGAL_CALL trace_glTextureParameterIivEXT(GLuint texture, GLenum target, GLenum pname, const GLint *params)
 {
  Internal("trace_glTextureParameterIivEXT","()");
@ -21815,6 +22001,26 @@ static void REGAL_CALL trace_glGetColorTableParameterivEXT(GLenum target, GLenum

 // GL_EXT_pixel_transform

+static void REGAL_CALL trace_glGetPixelTransformParameterfvEXT(GLenum target, GLenum pname, GLfloat *params)
+{
+  Internal("trace_glGetPixelTransformParameterfvEXT","()");
+  Thread::ThreadLocal &_instance = Thread::ThreadLocal::instance();
+  RegalAssert(_instance.currentContext);
+  Push<DispatchTableGL *> _push(_instance.nextDispatchTable);
+  _instance.nextDispatchTable = _instance.currentContext->dispatcher.trace.next();
+  Trace::glGetPixelTransformParameterfvEXT(target, pname, params);
+}
+
+static void REGAL_CALL trace_glGetPixelTransformParameterivEXT(GLenum target, GLenum pname, GLint *params)
+{
+  Internal("trace_glGetPixelTransformParameterivEXT","()");
+  Thread::ThreadLocal &_instance = Thread::ThreadLocal::instance();
+  RegalAssert(_instance.currentContext);
+  Push<DispatchTableGL *> _push(_instance.nextDispatchTable);
+  _instance.nextDispatchTable = _instance.currentContext->dispatcher.trace.next();
+  Trace::glGetPixelTransformParameterivEXT(target, pname, params);
+}
+
 static void REGAL_CALL trace_glPixelTransformParameterfEXT(GLenum target, GLenum pname, const GLfloat param)
 {
  Internal("trace_glPixelTransformParameterfEXT","()");
@ -23808,6 +24014,165 @@ static void REGAL_CALL trace_glWindowPos4svMESA(const GLshort *v)
  Trace::glWindowPos4svMESA(v);
 }

+// GL_NVX_conditional_render
+
+static void REGAL_CALL trace_glBeginConditionalRenderNVX(GLuint id)
+{
+  Internal("trace_glBeginConditionalRenderNVX","()");
+  Thread::ThreadLocal &_instance = Thread::ThreadLocal::instance();
+  RegalAssert(_instance.currentContext);
+  Push<DispatchTableGL *> _push(_instance.nextDispatchTable);
+  _instance.nextDispatchTable = _instance.currentContext->dispatcher.trace.next();
+  Trace::glBeginConditionalRenderNVX(id);
+}
+
+static void REGAL_CALL trace_glEndConditionalRenderNVX(void)
+{
+  Internal("trace_glEndConditionalRenderNVX","()");
+  Thread::ThreadLocal &_instance = Thread::ThreadLocal::instance();
+  RegalAssert(_instance.currentContext);
+  Push<DispatchTableGL *> _push(_instance.nextDispatchTable);
+  _instance.nextDispatchTable = _instance.currentContext->dispatcher.trace.next();
+  Trace::glEndConditionalRenderNVX();
+}
+
+// GL_NV_bindless_texture
+
+static GLuint64 REGAL_CALL trace_glGetImageHandleNV(GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum format)
+{
+  Internal("trace_glGetImageHandleNV","()");
+  Thread::ThreadLocal &_instance = Thread::ThreadLocal::instance();
+  RegalAssert(_instance.currentContext);
+  Push<DispatchTableGL *> _push(_instance.nextDispatchTable);
+  _instance.nextDispatchTable = _instance.currentContext->dispatcher.trace.next();
+  GLuint64  ret = Trace::glGetImageHandleNV(texture, level, layered, layer, format);
+  return ret;
+}
+
+static GLuint64 REGAL_CALL trace_glGetTextureHandleNV(GLuint texture)
+{
+  Internal("trace_glGetTextureHandleNV","()");
+  Thread::ThreadLocal &_instance = Thread::ThreadLocal::instance();
+  RegalAssert(_instance.currentContext);
+  Push<DispatchTableGL *> _push(_instance.nextDispatchTable);
+  _instance.nextDispatchTable = _instance.currentContext->dispatcher.trace.next();
+  GLuint64  ret = Trace::glGetTextureHandleNV(texture);
+  return ret;
+}
+
+static GLuint64 REGAL_CALL trace_glGetTextureSamplerHandleNV(GLuint texture, GLuint sampler)
+{
+  Internal("trace_glGetTextureSamplerHandleNV","()");
+  Thread::ThreadLocal &_instance = Thread::ThreadLocal::instance();
+  RegalAssert(_instance.currentContext);
+  Push<DispatchTableGL *> _push(_instance.nextDispatchTable);
+  _instance.nextDispatchTable = _instance.currentContext->dispatcher.trace.next();
+  GLuint64  ret = Trace::glGetTextureSamplerHandleNV(texture, sampler);
+  return ret;
+}
+
+static GLboolean REGAL_CALL trace_glIsImageHandleResidentNV(GLuint64 handle)
+{
+  Internal("trace_glIsImageHandleResidentNV","()");
+  Thread::ThreadLocal &_instance = Thread::ThreadLocal::instance();
+  RegalAssert(_instance.currentContext);
+  Push<DispatchTableGL *> _push(_instance.nextDispatchTable);
+  _instance.nextDispatchTable = _instance.currentContext->dispatcher.trace.next();
+  GLboolean  ret = Trace::glIsImageHandleResidentNV(handle);
+  return ret;
+}
+
+static GLboolean REGAL_CALL trace_glIsTextureHandleResidentNV(GLuint64 handle)
+{
+  Internal("trace_glIsTextureHandleResidentNV","()");
+  Thread::ThreadLocal &_instance = Thread::ThreadLocal::instance();
+  RegalAssert(_instance.currentContext);
+  Push<DispatchTableGL *> _push(_instance.nextDispatchTable);
+  _instance.nextDispatchTable = _instance.currentContext->dispatcher.trace.next();
+  GLboolean  ret = Trace::glIsTextureHandleResidentNV(handle);
+  return ret;
+}
+
+static void REGAL_CALL trace_glMakeImageHandleNonResidentNV(GLuint64 handle)
+{
+  Internal("trace_glMakeImageHandleNonResidentNV","()");
+  Thread::ThreadLocal &_instance = Thread::ThreadLocal::instance();
+  RegalAssert(_instance.currentContext);
+  Push<DispatchTableGL *> _push(_instance.nextDispatchTable);
+  _instance.nextDispatchTable = _instance.currentContext->dispatcher.trace.next();
+  Trace::glMakeImageHandleNonResidentNV(handle);
+}
+
+static void REGAL_CALL trace_glMakeImageHandleResidentNV(GLuint64 handle, GLenum access)
+{
+  Internal("trace_glMakeImageHandleResidentNV","()");
+  Thread::ThreadLocal &_instance = Thread::ThreadLocal::instance();
+  RegalAssert(_instance.currentContext);
+  Push<DispatchTableGL *> _push(_instance.nextDispatchTable);
+  _instance.nextDispatchTable = _instance.currentContext->dispatcher.trace.next();
+  Trace::glMakeImageHandleResidentNV(handle, access);
+}
+
+static void REGAL_CALL trace_glMakeTextureHandleNonResidentNV(GLuint64 handle)
+{
+  Internal("trace_glMakeTextureHandleNonResidentNV","()");
+  Thread::ThreadLocal &_instance = Thread::ThreadLocal::instance();
+  RegalAssert(_instance.currentContext);
+  Push<DispatchTableGL *> _push(_instance.nextDispatchTable);
+  _instance.nextDispatchTable = _instance.currentContext->dispatcher.trace.next();
+  Trace::glMakeTextureHandleNonResidentNV(handle);
+}
+
+static void REGAL_CALL trace_glMakeTextureHandleResidentNV(GLuint64 handle)
+{
+  Internal("trace_glMakeTextureHandleResidentNV","()");
+  Thread::ThreadLocal &_instance = Thread::ThreadLocal::instance();
+  RegalAssert(_instance.currentContext);
+  Push<DispatchTableGL *> _push(_instance.nextDispatchTable);
+  _instance.nextDispatchTable = _instance.currentContext->dispatcher.trace.next();
+  Trace::glMakeTextureHandleResidentNV(handle);
+}
+
+static void REGAL_CALL trace_glProgramUniformHandleui64NV(GLuint program, GLint location, GLuint64 value)
+{
+  Internal("trace_glProgramUniformHandleui64NV","()");
+  Thread::ThreadLocal &_instance = Thread::ThreadLocal::instance();
+  RegalAssert(_instance.currentContext);
+  Push<DispatchTableGL *> _push(_instance.nextDispatchTable);
+  _instance.nextDispatchTable = _instance.currentContext->dispatcher.trace.next();
+  Trace::glProgramUniformHandleui64NV(program, location, value);
+}
+
+static void REGAL_CALL trace_glProgramUniformHandleui64vNV(GLuint program, GLint location, GLsizei count, const GLuint64 *values)
+{
+  Internal("trace_glProgramUniformHandleui64vNV","()");
+  Thread::ThreadLocal &_instance = Thread::ThreadLocal::instance();
+  RegalAssert(_instance.currentContext);
+  Push<DispatchTableGL *> _push(_instance.nextDispatchTable);
+  _instance.nextDispatchTable = _instance.currentContext->dispatcher.trace.next();
+  Trace::glProgramUniformHandleui64vNV(program, location, count, values);
+}
+
+static void REGAL_CALL trace_glUniformHandleui64NV(GLint location, GLuint64 value)
+{
+  Internal("trace_glUniformHandleui64NV","()");
+  Thread::ThreadLocal &_instance = Thread::ThreadLocal::instance();
+  RegalAssert(_instance.currentContext);
+  Push<DispatchTableGL *> _push(_instance.nextDispatchTable);
+  _instance.nextDispatchTable = _instance.currentContext->dispatcher.trace.next();
+  Trace::glUniformHandleui64NV(location, value);
+}
+
+static void REGAL_CALL trace_glUniformHandleui64vNV(GLint location, GLsizei count, const GLuint64 *value)
+{
+  Internal("trace_glUniformHandleui64vNV","()");
+  Thread::ThreadLocal &_instance = Thread::ThreadLocal::instance();
+  RegalAssert(_instance.currentContext);
+  Push<DispatchTableGL *> _push(_instance.nextDispatchTable);
+  _instance.nextDispatchTable = _instance.currentContext->dispatcher.trace.next();
+  Trace::glUniformHandleui64vNV(location, count, value);
+}
+
 // GL_NV_conditional_render

 static void REGAL_CALL trace_glBeginConditionalRenderNV(GLuint id, GLenum mode)
@ -23908,6 +24273,18 @@ static void REGAL_CALL trace_glDrawBuffersNV(GLsizei n, const GLenum *bufs)
  Trace::glDrawBuffersNV(n, bufs);
 }

+// GL_NV_draw_texture
+
+static void REGAL_CALL trace_glDrawTextureNV(GLuint texture, GLuint sampler, GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1, GLfloat z, GLfloat s0, GLfloat t0, GLfloat s1, GLfloat t1)
+{
+  Internal("trace_glDrawTextureNV","()");
+  Thread::ThreadLocal &_instance = Thread::ThreadLocal::instance();
+  RegalAssert(_instance.currentContext);
+  Push<DispatchTableGL *> _push(_instance.nextDispatchTable);
+  _instance.nextDispatchTable = _instance.currentContext->dispatcher.trace.next();
+  Trace::glDrawTextureNV(texture, sampler, x0, y0, x1, y1, z, s0, t0, s1, t1);
+}
+
 // GL_NV_evaluators

 static void REGAL_CALL trace_glEvalMapsNV(GLenum target, GLenum mode)
@ -34198,6 +34575,11 @@ void InitDispatchTableTrace(DispatchTableGL &tbl)

  tbl.glSetMultisamplefvAMD = trace_glSetMultisamplefvAMD;

+  // GL_AMD_sparse_texture
+
+  tbl.glTexStorageSparseAMD = trace_glTexStorageSparseAMD;
+  tbl.glTextureStorageSparseAMD = trace_glTextureStorageSparseAMD;
+
  // GL_AMD_vertex_shader_tessellator

  tbl.glTessellationFactorAMD = trace_glTessellationFactorAMD;
@ -34309,6 +34691,7 @@ void InitDispatchTableTrace(DispatchTableGL &tbl)
  tbl.glClearBufferData = trace_glClearBufferData;
  tbl.glClearBufferSubData = trace_glClearBufferSubData;
  tbl.glClearNamedBufferDataEXT = trace_glClearNamedBufferDataEXT;
+  tbl.glClearNamedBufferSubDataEXT = trace_glClearNamedBufferSubDataEXT;

  // GL_ARB_clear_texture

@ -35331,9 +35714,11 @@ void InitDispatchTableTrace(DispatchTableGL &tbl)
  tbl.glCopyTextureSubImage2DEXT = trace_glCopyTextureSubImage2DEXT;
  tbl.glCopyTextureSubImage3DEXT = trace_glCopyTextureSubImage3DEXT;
  tbl.glDisableClientStateIndexedEXT = trace_glDisableClientStateIndexedEXT;
+  tbl.glDisableClientStateiEXT = trace_glDisableClientStateiEXT;
  tbl.glDisableVertexArrayAttribEXT = trace_glDisableVertexArrayAttribEXT;
  tbl.glDisableVertexArrayEXT = trace_glDisableVertexArrayEXT;
  tbl.glEnableClientStateIndexedEXT = trace_glEnableClientStateIndexedEXT;
+  tbl.glEnableClientStateiEXT = trace_glEnableClientStateiEXT;
  tbl.glEnableVertexArrayAttribEXT = trace_glEnableVertexArrayAttribEXT;
  tbl.glEnableVertexArrayEXT = trace_glEnableVertexArrayEXT;
  tbl.glFlushMappedNamedBufferRangeEXT = trace_glFlushMappedNamedBufferRangeEXT;
@ -35345,7 +35730,9 @@ void InitDispatchTableTrace(DispatchTableGL &tbl)
  tbl.glGetCompressedMultiTexImageEXT = trace_glGetCompressedMultiTexImageEXT;
  tbl.glGetCompressedTextureImageEXT = trace_glGetCompressedTextureImageEXT;
  tbl.glGetDoubleIndexedvEXT = trace_glGetDoubleIndexedvEXT;
+  tbl.glGetDoublei_vEXT = trace_glGetDoublei_vEXT;
  tbl.glGetFloatIndexedvEXT = trace_glGetFloatIndexedvEXT;
+  tbl.glGetFloati_vEXT = trace_glGetFloati_vEXT;
  tbl.glGetFramebufferParameterivEXT = trace_glGetFramebufferParameterivEXT;
  tbl.glGetMultiTexEnvfvEXT = trace_glGetMultiTexEnvfvEXT;
  tbl.glGetMultiTexEnvivEXT = trace_glGetMultiTexEnvivEXT;
@ -35371,6 +35758,7 @@ void InitDispatchTableTrace(DispatchTableGL &tbl)
  tbl.glGetNamedProgramivEXT = trace_glGetNamedProgramivEXT;
  tbl.glGetNamedRenderbufferParameterivEXT = trace_glGetNamedRenderbufferParameterivEXT;
  tbl.glGetPointerIndexedvEXT = trace_glGetPointerIndexedvEXT;
+  tbl.glGetPointeri_vEXT = trace_glGetPointeri_vEXT;
  tbl.glGetTextureImageEXT = trace_glGetTextureImageEXT;
  tbl.glGetTextureLevelParameterfvEXT = trace_glGetTextureLevelParameterfvEXT;
  tbl.glGetTextureLevelParameterivEXT = trace_glGetTextureLevelParameterivEXT;
@ -35415,6 +35803,9 @@ void InitDispatchTableTrace(DispatchTableGL &tbl)
  tbl.glMultiTexGenfvEXT = trace_glMultiTexGenfvEXT;
  tbl.glMultiTexGeniEXT = trace_glMultiTexGeniEXT;
  tbl.glMultiTexGenivEXT = trace_glMultiTexGenivEXT;
+  tbl.glMultiTexImage1DEXT = trace_glMultiTexImage1DEXT;
+  tbl.glMultiTexImage2DEXT = trace_glMultiTexImage2DEXT;
+  tbl.glMultiTexImage3DEXT = trace_glMultiTexImage3DEXT;
  tbl.glMultiTexParameterIivEXT = trace_glMultiTexParameterIivEXT;
  tbl.glMultiTexParameterIuivEXT = trace_glMultiTexParameterIuivEXT;
  tbl.glMultiTexParameterfEXT = trace_glMultiTexParameterfEXT;
@ -35502,6 +35893,9 @@ void InitDispatchTableTrace(DispatchTableGL &tbl)
  tbl.glProgramUniformMatrix4x3fvEXT = trace_glProgramUniformMatrix4x3fvEXT;
  tbl.glPushClientAttribDefaultEXT = trace_glPushClientAttribDefaultEXT;
  tbl.glTextureBufferEXT = trace_glTextureBufferEXT;
+  tbl.glTextureImage1DEXT = trace_glTextureImage1DEXT;
+  tbl.glTextureImage2DEXT = trace_glTextureImage2DEXT;
+  tbl.glTextureImage3DEXT = trace_glTextureImage3DEXT;
  tbl.glTextureParameterIivEXT = trace_glTextureParameterIivEXT;
  tbl.glTextureParameterIuivEXT = trace_glTextureParameterIuivEXT;
  tbl.glTextureParameterfEXT = trace_glTextureParameterfEXT;
@ -35687,6 +36081,8 @@ void InitDispatchTableTrace(DispatchTableGL &tbl)

  // GL_EXT_pixel_transform

+  tbl.glGetPixelTransformParameterfvEXT = trace_glGetPixelTransformParameterfvEXT;
+  tbl.glGetPixelTransformParameterivEXT = trace_glGetPixelTransformParameterivEXT;
  tbl.glPixelTransformParameterfEXT = trace_glPixelTransformParameterfEXT;
  tbl.glPixelTransformParameterfvEXT = trace_glPixelTransformParameterfvEXT;
  tbl.glPixelTransformParameteriEXT = trace_glPixelTransformParameteriEXT;
@ -35981,6 +36377,27 @@ void InitDispatchTableTrace(DispatchTableGL &tbl)
  tbl.glWindowPos4sMESA = trace_glWindowPos4sMESA;
  tbl.glWindowPos4svMESA = trace_glWindowPos4svMESA;

+  // GL_NVX_conditional_render
+
+  tbl.glBeginConditionalRenderNVX = trace_glBeginConditionalRenderNVX;
+  tbl.glEndConditionalRenderNVX = trace_glEndConditionalRenderNVX;
+
+  // GL_NV_bindless_texture
+
+  tbl.glGetImageHandleNV = trace_glGetImageHandleNV;
+  tbl.glGetTextureHandleNV = trace_glGetTextureHandleNV;
+  tbl.glGetTextureSamplerHandleNV = trace_glGetTextureSamplerHandleNV;
+  tbl.glIsImageHandleResidentNV = trace_glIsImageHandleResidentNV;
+  tbl.glIsTextureHandleResidentNV = trace_glIsTextureHandleResidentNV;
+  tbl.glMakeImageHandleNonResidentNV = trace_glMakeImageHandleNonResidentNV;
+  tbl.glMakeImageHandleResidentNV = trace_glMakeImageHandleResidentNV;
+  tbl.glMakeTextureHandleNonResidentNV = trace_glMakeTextureHandleNonResidentNV;
+  tbl.glMakeTextureHandleResidentNV = trace_glMakeTextureHandleResidentNV;
+  tbl.glProgramUniformHandleui64NV = trace_glProgramUniformHandleui64NV;
+  tbl.glProgramUniformHandleui64vNV = trace_glProgramUniformHandleui64vNV;
+  tbl.glUniformHandleui64NV = trace_glUniformHandleui64NV;
+  tbl.glUniformHandleui64vNV = trace_glUniformHandleui64vNV;
+
  // GL_NV_conditional_render

  tbl.glBeginConditionalRenderNV = trace_glBeginConditionalRenderNV;
@ -36005,6 +36422,10 @@ void InitDispatchTableTrace(DispatchTableGL &tbl)

  tbl.glDrawBuffersNV = trace_glDrawBuffersNV;

+  // GL_NV_draw_texture
+
+  tbl.glDrawTextureNV = trace_glDrawTextureNV;
+
  // GL_NV_evaluators

  tbl.glEvalMapsNV = trace_glEvalMapsNV;
--- a/src/regal/RegalFrame.cpp
+++ b/src/regal/RegalFrame.cpp
@ -32,6 +32,8 @@

 #include "RegalUtil.h"

+#if REGAL_FRAME
+
 REGAL_GLOBAL_BEGIN

 #include "md5.h"
@ -203,3 +205,5 @@ void Frame::capture(RegalContext &context,const bool frameTerminator)
 }

 REGAL_NAMESPACE_END
+
+#endif // REGAL_FRAME
--- a/src/regal/RegalFrame.h
+++ b/src/regal/RegalFrame.h
@ -40,6 +40,8 @@

 #include "RegalUtil.h"

+#if REGAL_FRAME
+
 REGAL_GLOBAL_BEGIN

 #include "RegalTimer.h"
@ -102,4 +104,6 @@ private:

 REGAL_NAMESPACE_END

+#endif // REGAL_FRAME
+
 #endif
--- a/src/regal/RegalLookup.cpp
+++ b/src/regal/RegalLookup.cpp
@ -53,7 +53,7 @@ REGAL_NAMESPACE_BEGIN

 namespace Lookup {

-const char * const gl_Name[2701] = {
+const char * const gl_Name[2700] = {
  "glAccum",
  "glActiveProgramEXT",
  "glActiveShaderProgram",
@ -693,7 +693,6 @@ const char * const gl_Name[2701] = {
  "glFramebufferTexture3DOES",
  "glFramebufferTextureARB",
  "glFramebufferTextureEXT",
-  "glFramebufferTextureFace",
  "glFramebufferTextureFaceARB",
  "glFramebufferTextureFaceEXT",
  "glFramebufferTextureLayer",
@ -2757,7 +2756,7 @@ const char * const gl_Name[2701] = {
  NULL
 };

-const void *gl_Value[2701] = {
+const void *gl_Value[2700] = {
  (void *)(glAccum),
  (void *)(glActiveProgramEXT),
  (void *)(glActiveShaderProgram),
@ -3397,7 +3396,6 @@ const void *gl_Value[2701] = {
  (void *)(glFramebufferTexture3DOES),
  (void *)(glFramebufferTextureARB),
  (void *)(glFramebufferTextureEXT),
-  (void *)(glFramebufferTextureFace),
  (void *)(glFramebufferTextureFaceARB),
  (void *)(glFramebufferTextureFaceEXT),
  (void *)(glFramebufferTextureLayer),
@ -5461,7 +5459,7 @@ const void *gl_Value[2701] = {
  NULL
 };

-const size_t gl_Offset[2701] = {
+const size_t gl_Offset[2700] = {
  offsetof(Dispatch::GL,glAccum)/sizeof(void *),
  offsetof(Dispatch::GL,glActiveProgramEXT)/sizeof(void *),
  offsetof(Dispatch::GL,glActiveShaderProgram)/sizeof(void *),
@ -6101,7 +6099,6 @@ const size_t gl_Offset[2701] = {
  offsetof(Dispatch::GL,glFramebufferTexture3DOES)/sizeof(void *),
  offsetof(Dispatch::GL,glFramebufferTextureARB)/sizeof(void *),
  offsetof(Dispatch::GL,glFramebufferTextureEXT)/sizeof(void *),
-  offsetof(Dispatch::GL,glFramebufferTextureFace)/sizeof(void *),
  offsetof(Dispatch::GL,glFramebufferTextureFaceARB)/sizeof(void *),
  offsetof(Dispatch::GL,glFramebufferTextureFaceEXT)/sizeof(void *),
  offsetof(Dispatch::GL,glFramebufferTextureLayer)/sizeof(void *),
--- a/src/regal/RegalLookup.h
+++ b/src/regal/RegalLookup.h
@ -59,22 +59,22 @@ inline int NameCmp(const void *a, const void *b)
  return std::strcmp(*(const char **) a, *(const char **) b);
 }

-extern const char * const gl_Name[2701];
-extern const void *gl_Value[2701];
+extern const char * const gl_Name[2700];
+extern const void *gl_Value[2700];

 template<typename T>
 T
 gl_Lookup(const char *name, T def = NULL)
 {
-  const char **res = (const char **) std::bsearch(&name, gl_Name, 2700, sizeof(const char *), NameCmp);
+  const char **res = (const char **) std::bsearch(&name, gl_Name, 2699, sizeof(const char *), NameCmp);
  return res ? reinterpret_cast<T>(const_cast<void *>(gl_Value[(size_t) (res - gl_Name)])) : def;
 }

-extern const size_t gl_Offset[2701];
+extern const size_t gl_Offset[2700];

 inline size_t gl_LookupOffset(const char *name)
 {
-  const char **res = (const char **) std::bsearch(&name, gl_Name, 2700, sizeof(const char *), NameCmp);
+  const char **res = (const char **) std::bsearch(&name, gl_Name, 2699, sizeof(const char *), NameCmp);
  return res ? gl_Offset[(size_t) (res - gl_Name)] : 0;
 }

--- a/src/regal/RegalPPAPI.def
+++ b/src/regal/RegalPPAPI.def
@ -620,7 +620,6 @@ EXPORTS
  glFramebufferTexture3DOES
  glFramebufferTextureARB
  glFramebufferTextureEXT
-  glFramebufferTextureFace
  glFramebufferTextureFaceARB
  glFramebufferTextureFaceEXT
  glFramebufferTextureLayer
--- a/src/regal/RegalPlugin.cpp
+++ b/src/regal/RegalPlugin.cpp
@ -4964,14 +4964,6 @@ extern "C" {
    _next->call(&_next->glFramebufferTexture)(target, attachment, texture, level);
  }

-  void REGAL_CALL plugin_glFramebufferTextureFace(GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face)
-  {
-    ::REGAL_NAMESPACE_INTERNAL::Thread::ThreadLocal &_instance = ::REGAL_NAMESPACE_INTERNAL::Thread::ThreadLocal::instance();
-    ::REGAL_NAMESPACE_INTERNAL::DispatchTableGL *_next = _instance.nextDispatchTable;
-    RegalAssert(_next);
-    _next->call(&_next->glFramebufferTextureFace)(target, attachment, texture, level, face);
-  }
-
  void REGAL_CALL plugin_glGetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)
  {
    ::REGAL_NAMESPACE_INTERNAL::Thread::ThreadLocal &_instance = ::REGAL_NAMESPACE_INTERNAL::Thread::ThreadLocal::instance();
@ -15068,7 +15060,7 @@ extern "C" {

  /* GL_EXT_pixel_transform */

-  void REGAL_CALL plugin_glGetPixelTransformParameterfvEXT(GLenum target, GLenum pname, const GLfloat *params)
+  void REGAL_CALL plugin_glGetPixelTransformParameterfvEXT(GLenum target, GLenum pname, GLfloat *params)
  {
    ::REGAL_NAMESPACE_INTERNAL::Thread::ThreadLocal &_instance = ::REGAL_NAMESPACE_INTERNAL::Thread::ThreadLocal::instance();
    ::REGAL_NAMESPACE_INTERNAL::DispatchTableGL *_next = _instance.nextDispatchTable;
@ -15076,7 +15068,7 @@ extern "C" {
    _next->call(&_next->glGetPixelTransformParameterfvEXT)(target, pname, params);
  }

-  void REGAL_CALL plugin_glGetPixelTransformParameterivEXT(GLenum target, GLenum pname, const GLint *params)
+  void REGAL_CALL plugin_glGetPixelTransformParameterivEXT(GLenum target, GLenum pname, GLint *params)
  {
    ::REGAL_NAMESPACE_INTERNAL::Thread::ThreadLocal &_instance = ::REGAL_NAMESPACE_INTERNAL::Thread::ThreadLocal::instance();
    ::REGAL_NAMESPACE_INTERNAL::DispatchTableGL *_next = _instance.nextDispatchTable;
@ -25463,7 +25455,7 @@ REGAL_NAMESPACE_BEGIN

 namespace Plugin {

-  const char * const lookup_gl_Name[2698] = {
+  const char * const lookup_gl_Name[2697] = {
    "glAccum",
    "glActiveProgramEXT",
    "glActiveShaderProgram",
@ -26102,7 +26094,6 @@ namespace Plugin {
    "glFramebufferTexture3DOES",
    "glFramebufferTextureARB",
    "glFramebufferTextureEXT",
-    "glFramebufferTextureFace",
    "glFramebufferTextureFaceARB",
    "glFramebufferTextureFaceEXT",
    "glFramebufferTextureLayer",
@ -28164,7 +28155,7 @@ namespace Plugin {
    NULL
  };

-  const void *lookup_gl_Value[2698] = {
+  const void *lookup_gl_Value[2697] = {
    (void *)(plugin_glAccum),
    (void *)(plugin_glActiveProgramEXT),
    (void *)(plugin_glActiveShaderProgram),
@ -28803,7 +28794,6 @@ namespace Plugin {
    (void *)(plugin_glFramebufferTexture3DOES),
    (void *)(plugin_glFramebufferTextureARB),
    (void *)(plugin_glFramebufferTextureEXT),
-    (void *)(plugin_glFramebufferTextureFace),
    (void *)(plugin_glFramebufferTextureFaceARB),
    (void *)(plugin_glFramebufferTextureFaceEXT),
    (void *)(plugin_glFramebufferTextureLayer),
@ -31681,7 +31671,7 @@ extern "C" {
  {
    const char **res;

-    res = (const char **) std::bsearch(&name, lookup_gl_Name, 2696, sizeof(const char *), NameCmp);
+    res = (const char **) std::bsearch(&name, lookup_gl_Name, 2695, sizeof(const char *), NameCmp);
    if (res) return const_cast<void *>(lookup_gl_Value[(size_t) (res - lookup_gl_Name)]);

 #if REGAL_SYS_WGL
--- a/src/regal/RegalStatistics.cpp
+++ b/src/regal/RegalStatistics.cpp
@ -1423,7 +1423,6 @@ Statistics::log() const
 /* GL_VERSION_3_2 */

  log("glFramebufferTexture",glFramebufferTexture);
-  log("glFramebufferTextureFace",glFramebufferTextureFace);
  log("glGetBufferParameteri64v",glGetBufferParameteri64v);
  log("glGetInteger64i_v",glGetInteger64i_v);

--- a/src/regal/RegalStatistics.h
+++ b/src/regal/RegalStatistics.h
@ -1408,7 +1408,6 @@ struct Statistics
  /* GL_VERSION_3_2 */

  GLuint glFramebufferTexture;
-  GLuint glFramebufferTextureFace;
  GLuint glGetBufferParameteri64v;
  GLuint glGetInteger64i_v;

--- a/src/regal/RegalUtil.h
+++ b/src/regal/RegalUtil.h
@ -122,6 +122,16 @@
 #  endif
 #endif

+// Support for per-frame capture, etc
+
+#ifndef REGAL_FRAME
+#  if REGAL_WRANGLER
+#    define REGAL_FRAME 0
+#  else
+#    define REGAL_FRAME 1
+#  endif
+#endif
+
 // Compile-time configuration
 // - Emulation not forced by default
 // - All emulation layers enabled by default
--- a/src/regal/Regalm.def
+++ b/src/regal/Regalm.def
@ -639,7 +639,6 @@ EXPORTS
  rglFramebufferTexture3DOES
  rglFramebufferTextureARB
  rglFramebufferTextureEXT
-  rglFramebufferTextureFace
  rglFramebufferTextureFaceARB
  rglFramebufferTextureFaceEXT
  rglFramebufferTextureLayer
--- a/src/regal/export_list_mac.txt
+++ b/src/regal/export_list_mac.txt
@ -690,7 +690,6 @@ _glFramebufferTexture3DEXT
 _glFramebufferTexture3DOES
 _glFramebufferTextureARB
 _glFramebufferTextureEXT
-_glFramebufferTextureFace
 _glFramebufferTextureFaceARB
 _glFramebufferTextureFaceEXT
 _glFramebufferTextureLayer