diff --git a/Makefile b/Makefile index 47073d2..720cbdd 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/Makefile.dreamtorus b/Makefile.dreamtorus index 30c3b7c..5734059 100644 --- a/Makefile.dreamtorus +++ b/Makefile.dreamtorus @@ -50,8 +50,8 @@ tmp/$(SYSTEM)/dreamtorus/static/%.o: examples/dreamtorus/glut/code/%.cpp @mkdir -p $(dir $@) $(LOG_CXX)$(CCACHE) $(CXX) $(DREAMTORUS.CFLAGS) $(CFLAGS) $(CFLAGS.SO) -o $@ -c $< -DREAMTORUS.DEPEND := -DREAMTORUS.DEPEND += lib/$(SYSTEM)/$(REGAL.SHARED) +DREAMTORUS.DEPEND := +DREAMTORUS.DEPEND += lib/$(SYSTEM)/$(REGAL.SHARED) ifdef GLUT.SHARED bin/$(SYSTEM)/dreamtorus: lib/$(SYSTEM)/$(GLUT.SHARED) lib/$(SYSTEM)/$(GLU.SHARED) diff --git a/Makefile.dreamtorus_static b/Makefile.dreamtorus_static index fdcae03..e2b7254 100644 --- a/Makefile.dreamtorus_static +++ b/Makefile.dreamtorus_static @@ -49,7 +49,7 @@ DREAMTORUS_STATIC.CFLAGS := -Iinclude -Iexamples/dreamtorus/src DREAMTORUS_STATIC.LIBS += -Llib/$(SYSTEM) ifndef GLUT.STATIC -DREAMTORUS_STATIC.LIBS += $(LDFLAGS.GLUT) $(LDFLAGS.GLU) +DREAMTORUS_STATIC.LIBS += $(LDFLAGS.GLUT) $(LDFLAGS.GLU) endif DREAMTORUS_STATIC.LIBS += $(LDFLAGS.X11) @@ -66,8 +66,8 @@ tmp/$(SYSTEM)/dreamtorus_static/static/%.o: examples/dreamtorus/glut/code/%.cpp @mkdir -p $(dir $@) $(LOG_CXX)$(CCACHE) $(CXX) $(DREAMTORUS_STATIC.CFLAGS) $(CFLAGS) $(CFLAGS.SO) -o $@ -c $< -DREAMTORUS_STATIC.DEPEND := -DREAMTORUS_STATIC.DEPEND += lib/$(SYSTEM)/$(REGAL.STATIC) +DREAMTORUS_STATIC.DEPEND := +DREAMTORUS_STATIC.DEPEND += lib/$(SYSTEM)/$(REGAL.STATIC) ifdef GLUT.STATIC DREAMTORUS_STATIC.DEPEND += lib/$(SYSTEM)/$(GLUT.STATIC) lib/$(SYSTEM)/$(GLU.STATIC) @@ -76,9 +76,9 @@ endif bin/$(SYSTEM)/$(DREAMTORUS_STATIC.EXE): $(DREAMTORUS_STATIC.OBJS) $(DREAMTORUS_STATIC.DEPEND) @mkdir -p $(dir $@) ifdef APITRACE.STATIC - $(LOG_LD)$(CCACHE) $(LD) $(LDFLAGS.EXTRA) -o $@ $(DREAMTORUS_STATIC.OBJS) $(LDFLAGS.STARTGROUP) lib/$(SYSTEM)/$(REGAL.STATIC) lib/$(SYSTEM)/$(APITRACE.STATIC) $(LDFLAGS.ENDGROUP) $(REGAL.SHARED.DEPEND) $(DREAMTORUS_STATIC.DEPEND) $(REGAL.LIBS) $(REGAL.LDFLAGS) $(DREAMTORUS_STATIC.LIBS) + $(LOG_LD)$(CCACHE) $(LD) $(LDFLAGS.EXTRA) -o $@ $(DREAMTORUS_STATIC.OBJS) $(LDFLAGS.STARTGROUP) lib/$(SYSTEM)/$(REGAL.STATIC) lib/$(SYSTEM)/$(APITRACE.STATIC) $(LDFLAGS.ENDGROUP) $(REGAL.SHARED.DEPEND) $(DREAMTORUS_STATIC.DEPEND) $(REGAL.LIBS) $(REGAL.LDFLAGS) $(DREAMTORUS_STATIC.LIBS) else - $(LOG_LD)$(CCACHE) $(LD) $(LDFLAGS.EXTRA) -o $@ $(DREAMTORUS_STATIC.OBJS) lib/$(SYSTEM)/$(REGAL.STATIC) $(REGAL.SHARED.DEPEND) $(DREAMTORUS_STATIC.DEPEND) $(REGAL.LDFLAGS) $(DREAMTORUS_STATIC.LIBS) + $(LOG_LD)$(CCACHE) $(LD) $(LDFLAGS.EXTRA) -o $@ $(DREAMTORUS_STATIC.OBJS) lib/$(SYSTEM)/$(REGAL.STATIC) $(REGAL.SHARED.DEPEND) $(DREAMTORUS_STATIC.DEPEND) $(REGAL.LDFLAGS) $(DREAMTORUS_STATIC.LIBS) endif ifneq ($(STRIP),) $(LOG_STRIP)$(STRIP) -x $@ diff --git a/Makefile.glslopt b/Makefile.glslopt new file mode 100644 index 0000000..20b7d24 --- /dev/null +++ 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 diff --git a/Makefile.regal b/Makefile.regal index dd52b2b..28998ee 100644 --- a/Makefile.regal +++ b/Makefile.regal @@ -192,20 +192,20 @@ REGAL.SDEPS := $(LIBS.SOBJS:.o=.d) REGAL.LIBS += $(LDFLAGS.X11) 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.SONAME := lib$(NAME).so.$(SO_MAJOR) +REGAL.DEVLNK := lib$(NAME).so +REGAL.SHARED := lib$(NAME).so.$(SO_VERSION) +REGAL.LDFLAGS.SO := $(LDFLAGS.SO) $(LDFLAGS.DYNAMIC) -Wl,-soname=$(REGAL.SONAME) endif ifneq ($(filter darwin%,$(SYSTEM)),) -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) -#LDFLAGS.SO += -install_name $(REGAL_DEST)/lib/$(REGAL.SHARED) -REGAL.LDFLAGS += -Wl,-reexport-lGLU -L/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries +REGAL.SONAME := lib$(NAME).$(SO_MAJOR).dylib +REGAL.DEVLNK := lib$(NAME).dylib +REGAL.SHARED := lib$(NAME).$(SO_VERSION).dylib +REGAL.FRAMEWORK := $(NAME) +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 ifdef REGAL.STATIC @@ -246,8 +246,8 @@ ifneq ($(STRIP),) $(LOG_STRIP)$(STRIP) -x $@ endif -REGAL.SHARED.DEPEND := -REGAL.SHARED.DEPEND += lib/$(SYSTEM)/$(LIBPNG.STATIC) lib/$(SYSTEM)/$(ZLIB.STATIC) +REGAL.SHARED.DEPEND := +REGAL.SHARED.DEPEND += lib/$(SYSTEM)/$(LIBPNG.STATIC) lib/$(SYSTEM)/$(ZLIB.STATIC) ifdef APITRACE.STATIC REGAL.SHARED.DEPEND += lib/$(SYSTEM)/$(APITRACE.STATIC) lib/$(SYSTEM)/$(SNAPPY.STATIC) @@ -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) diff --git a/Makefile.regaltest b/Makefile.regaltest index e6ac4b1..ce084cf 100644 --- a/Makefile.regaltest +++ b/Makefile.regaltest @@ -59,9 +59,9 @@ tmp/$(SYSTEM)/regaltest/static/%.o: tests/%.cpp bin/$(SYSTEM)/regaltest$(BIN_EXTENSION): $(REGALTEST.OBJS) lib/$(SYSTEM)/$(GTEST.STATIC) lib/$(SYSTEM)/$(REGAL.STATIC) $(REGAL.SHARED.DEPEND) @mkdir -p $(dir $@) ifdef APITRACE.STATIC - $(LOG_LD)$(CCACHE) $(LD) $(LDFLAGS.EXTRA) -o $@ $(REGALTEST.OBJS) $(REGALTEST.LIBS) $(LDFLAGS.STARTGROUP) lib/$(SYSTEM)/$(REGAL.STATIC) lib/$(SYSTEM)/$(APITRACE.STATIC) $(LDFLAGS.ENDGROUP) $(REGAL.SHARED.DEPEND) $(REGAL.LIBS) lib/$(SYSTEM)/$(GTEST.STATIC) $(REGAL.LDFLAGS) + $(LOG_LD)$(CCACHE) $(LD) $(LDFLAGS.EXTRA) -o $@ $(REGALTEST.OBJS) $(REGALTEST.LIBS) $(LDFLAGS.STARTGROUP) lib/$(SYSTEM)/$(REGAL.STATIC) lib/$(SYSTEM)/$(APITRACE.STATIC) $(LDFLAGS.ENDGROUP) $(REGAL.SHARED.DEPEND) $(REGAL.LIBS) lib/$(SYSTEM)/$(GTEST.STATIC) $(REGAL.LDFLAGS) else - $(LOG_LD)$(CCACHE) $(LD) $(LDFLAGS.EXTRA) -o $@ $(REGALTEST.OBJS) $(REGALTEST.LIBS) lib/$(SYSTEM)/$(REGAL.STATIC) $(REGAL.SHARED.DEPEND) $(REGAL.LIBS) lib/$(SYSTEM)/$(GTEST.STATIC) $(REGAL.LDFLAGS) + $(LOG_LD)$(CCACHE) $(LD) $(LDFLAGS.EXTRA) -o $@ $(REGALTEST.OBJS) $(REGALTEST.LIBS) lib/$(SYSTEM)/$(REGAL.STATIC) $(REGAL.SHARED.DEPEND) $(REGAL.LIBS) lib/$(SYSTEM)/$(GTEST.STATIC) $(REGAL.LDFLAGS) endif ifneq ($(STRIP),) $(LOG_STRIP)$(STRIP) -x $@ diff --git a/Makefile.regalw b/Makefile.regalw new file mode 100644 index 0000000..3577769 --- /dev/null +++ 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 diff --git a/Makefile.tiger b/Makefile.tiger index cb1e67f..a7de574 100644 --- a/Makefile.tiger +++ b/Makefile.tiger @@ -35,7 +35,7 @@ tiger.clean: $(RM) -r tmp/$(SYSTEM)/tiger/static $(RM) -r bin/$(SYSTEM)/tiger -TIGER.SRCS += examples/tiger/nvpr_tiger.c +TIGER.SRCS += examples/tiger/nvpr_tiger.c TIGER.SRCS += examples/tiger/tiger.c TIGER.SRCS += examples/tiger/xform.c TIGER.SRCS.NAMES := $(notdir $(TIGER.SRCS)) @@ -53,8 +53,8 @@ tmp/$(SYSTEM)/tiger/static/%.o: examples/tiger/%.c @mkdir -p $(dir $@) $(LOG_CC)$(CCACHE) $(CC) $(TIGER.CFLAGS) $(CFLAGS) $(CFLAGS.SO) -o $@ -c $< -TIGER.DEPEND := -TIGER.DEPEND += lib/$(SYSTEM)/$(REGAL.SHARED) +TIGER.DEPEND := +TIGER.DEPEND += lib/$(SYSTEM)/$(REGAL.SHARED) ifdef GLUT.SHARED bin/$(SYSTEM)/tiger: lib/$(SYSTEM)/$(GLUT.SHARED) lib/$(SYSTEM)/$(GLU.SHARED) diff --git a/README.rst b/README.rst index b9bc309..b20eda8 100644 --- 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 `_ support in progress. -* July 22nd 2013 - `OpenGL 4.4 `_ API support added. -* July 21st 2013 - `apitrace `_ support added. +* November 2013 - Regal Wrangler support added. +* October 2013 - `Emscripten `_ support added. +* July 2013 - New binaries available for Windows and Mac. +* July 2013 - `OpenGL 4.4 `_ API support added. +* July 2013 - `apitrace `_ 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 + 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 + http://www.khronos.org/registry/gles/extensions/EXT/EXT_debug_marker.txt - - Fixed function and DSA emulation enabled by default, except when compatibility context - with DSA extension detected. +- 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 + - **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 + - **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 + - **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: - - - **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 +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 + +.. 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 `_ `(.pdf slides) `_. * #AltDevBlogADay blog: `Bringing Regal OpenGL to Native Client `_. * opengl.org forum thread: `Introducing Regal `_. * Slides - `Regal for Software Development `_. diff --git a/build/android/Regal/jni/Android.mk b/build/android/Regal/jni/Android.mk index 57a47b6..204f753 100644 --- 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) diff --git a/build/glslopt.inc b/build/glslopt.inc new file mode 100644 index 0000000..ec08b38 --- /dev/null +++ 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 diff --git a/build/win32/vs2010/Regal/All.sln b/build/win32/vs2010/Regal/All.sln index 68709c9..4618799 100644 --- 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} diff --git a/build/win32/vs2010/Regal/Regal.sln b/build/win32/vs2010/Regal/Regal.sln index 34228d8..e4ad01b 100755 --- 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 diff --git a/build/win32/vs2010/Regal/Regalw.vcxproj b/build/win32/vs2010/Regal/Regalw.vcxproj new file mode 100644 index 0000000..eb87839 --- /dev/null +++ b/build/win32/vs2010/Regal/Regalw.vcxproj @@ -0,0 +1,358 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + Regalw + {324CD1C8-680A-9A1D-EFE7-A93D7EFFE858} + + + + DynamicLibrary + false + Unicode + + + DynamicLibrary + false + Unicode + + + DynamicLibrary + false + Unicode + + + DynamicLibrary + false + Unicode + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + Release\Win32\ + Release\x64\ + Release\Win32\Regalw\ + Release\x64\Regalw\ + Debug\Win32\ + Debug\x64\ + Debug\Win32\Regalw\ + Debug\x64\Regalw\ + regalw + regalw + regalw + regalw + + + + MaxSpeed + OnlyExplicitInline + ../../../../src/boost;../../../../include;../../../../src/mongoose;../../../../src/lookup3;../../../../src/md5/include;../../../../src/libpng/include;../../../../src/zlib/include;../../../../src/squish;../../../../src/jsonsl;%(AdditionalIncludeDirectories) + 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) + true + MultiThreaded + true + + + Release\Win32\Regalw\ + Release\Win32\Regalw\ + Release\Win32\regalw.pdb + Level4 + true + Default + 4996 + %(AdditionalOptions) + true + + + jsonsllib.lib;advapi32.lib;gdi32.lib;user32.lib;ws2_32.lib;%(AdditionalDependencies) + true + Release\Win32\;%(AdditionalLibraryDirectories) + ../../../../src/regal/Regal.def + Release\Win32\regalw.pdb + Console + MachineX86 + Release\Win32\regalw.lib + + + + + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + + MaxSpeed + OnlyExplicitInline + ../../../../src/boost;../../../../include;../../../../src/mongoose;../../../../src/lookup3;../../../../src/md5/include;../../../../src/libpng/include;../../../../src/zlib/include;../../../../src/squish;../../../../src/jsonsl;%(AdditionalIncludeDirectories) + 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) + true + MultiThreaded + true + + + Release\x64\Regalw\ + Release\x64\Regalw\ + Release\x64\regalw.pdb + Level4 + true + Default + 4996 + ProgramDatabase + %(AdditionalOptions) + true + + + jsonsllib.lib;advapi32.lib;gdi32.lib;user32.lib;ws2_32.lib;%(AdditionalDependencies) + true + Release\x64\;%(AdditionalLibraryDirectories) + ../../../../src/regal/Regal.def + Release\x64\regalw.pdb + Console + Release\x64\regalw.lib + + + + + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + + Disabled + ../../../../src/boost;../../../../include;../../../../src/mongoose;../../../../src/lookup3;../../../../src/md5/include;../../../../src/libpng/include;../../../../src/zlib/include;../../../../src/squish;../../../../src/jsonsl;%(AdditionalIncludeDirectories) + 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) + EnableFastChecks + MultiThreadedDebug + + + Debug\Win32\Regalw\ + Debug\Win32\Regalw\ + Debug\Win32\regalw.pdb + Level4 + true + EditAndContinue + Default + 4996 + %(AdditionalOptions) + true + + + jsonsllib.lib;advapi32.lib;gdi32.lib;user32.lib;ws2_32.lib;%(AdditionalDependencies) + true + Debug\Win32\;%(AdditionalLibraryDirectories) + ../../../../src/regal/Regal.def + true + Debug\Win32\regalw.pdb + Console + MachineX86 + Debug\Win32\regalw.lib + + + + + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + + Disabled + ../../../../src/boost;../../../../include;../../../../src/mongoose;../../../../src/lookup3;../../../../src/md5/include;../../../../src/libpng/include;../../../../src/zlib/include;../../../../src/squish;../../../../src/jsonsl;%(AdditionalIncludeDirectories) + 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) + EnableFastChecks + MultiThreadedDebug + + + Debug\x64\Regalw\ + Debug\x64\Regalw\ + Debug\x64\regalw.pdb + Level4 + true + Default + 4996 + ProgramDatabase + %(AdditionalOptions) + true + + + jsonsllib.lib;advapi32.lib;gdi32.lib;user32.lib;ws2_32.lib;%(AdditionalDependencies) + true + Debug\x64\;%(AdditionalLibraryDirectories) + ../../../../src/regal/Regal.def + true + Debug\x64\regalw.pdb + Console + Debug\x64\regalw.lib + + + + + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/include/GL/Regal.h b/include/GL/Regal.h index 58e1f58..27e685a 100644 --- 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 diff --git a/include/GL/RegalGLEW.h b/include/GL/RegalGLEW.h index 06b8e98..9253d07 100644 --- 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; diff --git a/scripts/Emu.py b/scripts/Emu.py index 930e628..6a5990f 100644 --- 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) diff --git a/scripts/EmuFrame.py b/scripts/EmuFrame.py index 24e6e0d..68a1ac2 100644 --- 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''' } } diff --git a/scripts/EmuIff.py b/scripts/EmuIff.py index a0a5d62..6fcb996 100644 --- 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' : [ ], } } - diff --git a/scripts/EmuInit.py b/scripts/EmuInit.py index 7fa66bf..55b9760 100644 --- a/scripts/EmuInit.py +++ b/scripts/EmuInit.py @@ -2,7 +2,7 @@ formulae = { - # For all of GL API, check that Regal is initialized either via + # For all of GL API, check that Regal is initialized either via # RegalMakeCurrent, or via the selective CGL/EGL/GLX/WGL functions # in the global scope below. @@ -11,7 +11,7 @@ formulae = { 'entries' : [ '.*' ], 'prefix' : 'RegalAssert(Init::isInitialized());' } - + } # @@ -32,7 +32,7 @@ formulaeGlobal = { # glXChooseVisual is needed for Linux eihort Minecraft world viewer # wglCreateContext, wglGetCurrentContext, wglGetProcAddress for a start - 'init' : + 'init' : { 'entries' : [ 'CGLChoosePixelFormat', 'CGLGetCurrentContext', @@ -42,7 +42,7 @@ formulaeGlobal = { ], 'prefix' : 'Init::init();' }, - + # WGL 'wglMakeCurrent' : { diff --git a/scripts/api/gl.py b/scripts/api/gl.py index d38d145..fd75ab5 100644 --- 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 diff --git a/scripts/regal/Regal.py b/scripts/regal/Regal.py index 88855e9..c31b961 100755 --- 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' diff --git a/scripts/regal/RegalContext.py b/scripts/regal/RegalContext.py index 92cde7a..e7ee94a 100755 --- 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: diff --git a/scripts/regal/RegalDispatchTraceExclude.py b/scripts/regal/RegalDispatchTraceExclude.py index aacbff4..5bf2ab8 100644 --- 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', diff --git a/scripts/regal/RegalLookup.py b/scripts/regal/RegalLookup.py index 701f1da..0b3c3b4 100755 --- a/scripts/regal/RegalLookup.py +++ b/scripts/regal/RegalLookup.py @@ -175,7 +175,7 @@ def generateLookupHeader(apis, args, offsetLookup = True, ifFunction = lambda i names = [ j.name for j in i.functions if getattr(j,'regalOnly',False)==True or j.category=='GL_REGAL_ES1_0_compatibility'] # code.extend(pointerLookupHeader('regal',names)) # code.extend(offsetLookupHeader('regal',names)) - + names = [ j.name for j in i.functions ] conditional = None if i.name in cond: diff --git a/src/apitrace/dispatch/compat.h b/src/apitrace/dispatch/compat.h index 3fc9730..6f55ca5 100644 --- 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 diff --git a/src/apitrace/dispatch/glproc.hpp b/src/apitrace/dispatch/glproc.hpp index bbc101f..4a346b7 100644 --- 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 */ diff --git a/src/apitrace/specs/glapi.py b/src/apitrace/specs/glapi.py index 6029231..6c428f3 100644 --- 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")]), diff --git a/src/apitrace/specs/glesapi.py b/src/apitrace/specs/glesapi.py index 16f83cb..38df24c 100644 --- 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")]), ]) diff --git a/src/apitrace/thirdparty/khronos/GL/glext.h b/src/apitrace/thirdparty/khronos/GL/glext.h index 67551cf..47abd4f 100644 --- 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); diff --git a/src/apitrace/wrappers/.gitignore b/src/apitrace/wrappers/.gitignore index dfd8c30..c4724d2 100644 --- a/src/apitrace/wrappers/.gitignore +++ b/src/apitrace/wrappers/.gitignore @@ -1,4 +1,3 @@ -OpenGL cgltrace.cpp d2d1trace.cpp d3d8trace.cpp diff --git a/src/apitrace/wrappers/glxtrace.py b/src/apitrace/wrappers/glxtrace.py index e9c43a9..c61b937 100644 --- 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() diff --git a/src/apitrace/wrappers/regaltrace.cpp b/src/apitrace/wrappers/regaltrace.cpp index b442173..55a2d7b 100644 --- a/src/apitrace/wrappers/regaltrace.cpp +++ b/src/apitrace/wrappers/regaltrace.cpp @@ -10098,7 +10098,7 @@ static const trace::FunctionSig _glClearBufferSubData_sig = {1167, "glClearBuffe static const char * _glClearNamedBufferDataEXT_args[5] = {"buffer", "internalformat", "format", "type", "data"}; static const trace::FunctionSig _glClearNamedBufferDataEXT_sig = {1168, "glClearNamedBufferDataEXT", 5, _glClearNamedBufferDataEXT_args}; -static const char * _glClearNamedBufferSubDataEXT_args[7] = {"buffer", "internalformat", "format", "type", "offset", "size", "data"}; +static const char * _glClearNamedBufferSubDataEXT_args[7] = {"buffer", "internalformat", "offset", "size", "format", "type", "data"}; static const trace::FunctionSig _glClearNamedBufferSubDataEXT_sig = {1169, "glClearNamedBufferSubDataEXT", 7, _glClearNamedBufferSubDataEXT_args}; static const char * _glDispatchCompute_args[3] = {"num_groups_x", "num_groups_y", "num_groups_z"}; @@ -14352,1102 +14352,1111 @@ static const trace::FunctionSig _glGetProgramPipelineInfoLogEXT_sig = {2585, "gl static const char * _glFramebufferTexture2DMultisampleEXT_args[6] = {"target", "attachment", "textarget", "texture", "level", "samples"}; static const trace::FunctionSig _glFramebufferTexture2DMultisampleEXT_sig = {2586, "glFramebufferTexture2DMultisampleEXT", 6, _glFramebufferTexture2DMultisampleEXT_args}; +static const char * _glTexStorage1DEXT_args[4] = {"target", "levels", "internalformat", "width"}; +static const trace::FunctionSig _glTexStorage1DEXT_sig = {2587, "glTexStorage1DEXT", 4, _glTexStorage1DEXT_args}; + +static const char * _glTexStorage2DEXT_args[5] = {"target", "levels", "internalformat", "width", "height"}; +static const trace::FunctionSig _glTexStorage2DEXT_sig = {2588, "glTexStorage2DEXT", 5, _glTexStorage2DEXT_args}; + +static const char * _glTexStorage3DEXT_args[6] = {"target", "levels", "internalformat", "width", "height", "depth"}; +static const trace::FunctionSig _glTexStorage3DEXT_sig = {2589, "glTexStorage3DEXT", 6, _glTexStorage3DEXT_args}; + #if REGAL_SYS_OSX static const char * _CGLSetCurrentContext_args[1] = {"ctx"}; -static const trace::FunctionSig _CGLSetCurrentContext_sig = {2587, "CGLSetCurrentContext", 1, _CGLSetCurrentContext_args}; +static const trace::FunctionSig _CGLSetCurrentContext_sig = {2590, "CGLSetCurrentContext", 1, _CGLSetCurrentContext_args}; static const char ** _CGLGetCurrentContext_args = NULL; -static const trace::FunctionSig _CGLGetCurrentContext_sig = {2588, "CGLGetCurrentContext", 0, _CGLGetCurrentContext_args}; +static const trace::FunctionSig _CGLGetCurrentContext_sig = {2591, "CGLGetCurrentContext", 0, _CGLGetCurrentContext_args}; static const char * _CGLChoosePixelFormat_args[3] = {"attribs", "pix", "npix"}; -static const trace::FunctionSig _CGLChoosePixelFormat_sig = {2589, "CGLChoosePixelFormat", 3, _CGLChoosePixelFormat_args}; +static const trace::FunctionSig _CGLChoosePixelFormat_sig = {2592, "CGLChoosePixelFormat", 3, _CGLChoosePixelFormat_args}; static const char * _CGLDestroyPixelFormat_args[1] = {"pix"}; -static const trace::FunctionSig _CGLDestroyPixelFormat_sig = {2590, "CGLDestroyPixelFormat", 1, _CGLDestroyPixelFormat_args}; +static const trace::FunctionSig _CGLDestroyPixelFormat_sig = {2593, "CGLDestroyPixelFormat", 1, _CGLDestroyPixelFormat_args}; static const char * _CGLDescribePixelFormat_args[4] = {"pix", "pix_num", "attrib", "value"}; -static const trace::FunctionSig _CGLDescribePixelFormat_sig = {2591, "CGLDescribePixelFormat", 4, _CGLDescribePixelFormat_args}; +static const trace::FunctionSig _CGLDescribePixelFormat_sig = {2594, "CGLDescribePixelFormat", 4, _CGLDescribePixelFormat_args}; static const char * _CGLReleasePixelFormat_args[1] = {"pix"}; -static const trace::FunctionSig _CGLReleasePixelFormat_sig = {2592, "CGLReleasePixelFormat", 1, _CGLReleasePixelFormat_args}; +static const trace::FunctionSig _CGLReleasePixelFormat_sig = {2595, "CGLReleasePixelFormat", 1, _CGLReleasePixelFormat_args}; static const char * _CGLRetainPixelFormat_args[1] = {"pix"}; -static const trace::FunctionSig _CGLRetainPixelFormat_sig = {2593, "CGLRetainPixelFormat", 1, _CGLRetainPixelFormat_args}; +static const trace::FunctionSig _CGLRetainPixelFormat_sig = {2596, "CGLRetainPixelFormat", 1, _CGLRetainPixelFormat_args}; static const char * _CGLGetPixelFormatRetainCount_args[1] = {"pix"}; -static const trace::FunctionSig _CGLGetPixelFormatRetainCount_sig = {2594, "CGLGetPixelFormatRetainCount", 1, _CGLGetPixelFormatRetainCount_args}; +static const trace::FunctionSig _CGLGetPixelFormatRetainCount_sig = {2597, "CGLGetPixelFormatRetainCount", 1, _CGLGetPixelFormatRetainCount_args}; static const char * _CGLQueryRendererInfo_args[3] = {"display_mask", "rend", "nrend"}; -static const trace::FunctionSig _CGLQueryRendererInfo_sig = {2595, "CGLQueryRendererInfo", 3, _CGLQueryRendererInfo_args}; +static const trace::FunctionSig _CGLQueryRendererInfo_sig = {2598, "CGLQueryRendererInfo", 3, _CGLQueryRendererInfo_args}; static const char * _CGLDestroyRendererInfo_args[1] = {"rend"}; -static const trace::FunctionSig _CGLDestroyRendererInfo_sig = {2596, "CGLDestroyRendererInfo", 1, _CGLDestroyRendererInfo_args}; +static const trace::FunctionSig _CGLDestroyRendererInfo_sig = {2599, "CGLDestroyRendererInfo", 1, _CGLDestroyRendererInfo_args}; static const char * _CGLDescribeRenderer_args[4] = {"rend", "rend_num", "prop", "value"}; -static const trace::FunctionSig _CGLDescribeRenderer_sig = {2597, "CGLDescribeRenderer", 4, _CGLDescribeRenderer_args}; +static const trace::FunctionSig _CGLDescribeRenderer_sig = {2600, "CGLDescribeRenderer", 4, _CGLDescribeRenderer_args}; static const char * _CGLCreateContext_args[3] = {"pix", "share", "ctx"}; -static const trace::FunctionSig _CGLCreateContext_sig = {2598, "CGLCreateContext", 3, _CGLCreateContext_args}; +static const trace::FunctionSig _CGLCreateContext_sig = {2601, "CGLCreateContext", 3, _CGLCreateContext_args}; static const char * _CGLDestroyContext_args[1] = {"ctx"}; -static const trace::FunctionSig _CGLDestroyContext_sig = {2599, "CGLDestroyContext", 1, _CGLDestroyContext_args}; +static const trace::FunctionSig _CGLDestroyContext_sig = {2602, "CGLDestroyContext", 1, _CGLDestroyContext_args}; static const char * _CGLCopyContext_args[3] = {"src", "dst", "mask"}; -static const trace::FunctionSig _CGLCopyContext_sig = {2600, "CGLCopyContext", 3, _CGLCopyContext_args}; +static const trace::FunctionSig _CGLCopyContext_sig = {2603, "CGLCopyContext", 3, _CGLCopyContext_args}; static const char * _CGLRetainContext_args[1] = {"ctx"}; -static const trace::FunctionSig _CGLRetainContext_sig = {2601, "CGLRetainContext", 1, _CGLRetainContext_args}; +static const trace::FunctionSig _CGLRetainContext_sig = {2604, "CGLRetainContext", 1, _CGLRetainContext_args}; static const char * _CGLReleaseContext_args[1] = {"ctx"}; -static const trace::FunctionSig _CGLReleaseContext_sig = {2602, "CGLReleaseContext", 1, _CGLReleaseContext_args}; +static const trace::FunctionSig _CGLReleaseContext_sig = {2605, "CGLReleaseContext", 1, _CGLReleaseContext_args}; static const char * _CGLGetContextRetainCount_args[1] = {"ctx"}; -static const trace::FunctionSig _CGLGetContextRetainCount_sig = {2603, "CGLGetContextRetainCount", 1, _CGLGetContextRetainCount_args}; +static const trace::FunctionSig _CGLGetContextRetainCount_sig = {2606, "CGLGetContextRetainCount", 1, _CGLGetContextRetainCount_args}; static const char * _CGLGetPixelFormat_args[1] = {"ctx"}; -static const trace::FunctionSig _CGLGetPixelFormat_sig = {2604, "CGLGetPixelFormat", 1, _CGLGetPixelFormat_args}; +static const trace::FunctionSig _CGLGetPixelFormat_sig = {2607, "CGLGetPixelFormat", 1, _CGLGetPixelFormat_args}; static const char * _CGLCreatePBuffer_args[6] = {"width", "height", "target", "internalFormat", "max_level", "pbuffer"}; -static const trace::FunctionSig _CGLCreatePBuffer_sig = {2605, "CGLCreatePBuffer", 6, _CGLCreatePBuffer_args}; +static const trace::FunctionSig _CGLCreatePBuffer_sig = {2608, "CGLCreatePBuffer", 6, _CGLCreatePBuffer_args}; static const char * _CGLDestroyPBuffer_args[1] = {"pbuffer"}; -static const trace::FunctionSig _CGLDestroyPBuffer_sig = {2606, "CGLDestroyPBuffer", 1, _CGLDestroyPBuffer_args}; +static const trace::FunctionSig _CGLDestroyPBuffer_sig = {2609, "CGLDestroyPBuffer", 1, _CGLDestroyPBuffer_args}; static const char * _CGLDescribePBuffer_args[6] = {"obj", "width", "height", "target", "internalFormat", "mipmap"}; -static const trace::FunctionSig _CGLDescribePBuffer_sig = {2607, "CGLDescribePBuffer", 6, _CGLDescribePBuffer_args}; +static const trace::FunctionSig _CGLDescribePBuffer_sig = {2610, "CGLDescribePBuffer", 6, _CGLDescribePBuffer_args}; static const char * _CGLTexImagePBuffer_args[3] = {"ctx", "pbuffer", "source"}; -static const trace::FunctionSig _CGLTexImagePBuffer_sig = {2608, "CGLTexImagePBuffer", 3, _CGLTexImagePBuffer_args}; +static const trace::FunctionSig _CGLTexImagePBuffer_sig = {2611, "CGLTexImagePBuffer", 3, _CGLTexImagePBuffer_args}; static const char * _CGLRetainPBuffer_args[1] = {"pbuffer"}; -static const trace::FunctionSig _CGLRetainPBuffer_sig = {2609, "CGLRetainPBuffer", 1, _CGLRetainPBuffer_args}; +static const trace::FunctionSig _CGLRetainPBuffer_sig = {2612, "CGLRetainPBuffer", 1, _CGLRetainPBuffer_args}; static const char * _CGLReleasePBuffer_args[1] = {"pbuffer"}; -static const trace::FunctionSig _CGLReleasePBuffer_sig = {2610, "CGLReleasePBuffer", 1, _CGLReleasePBuffer_args}; +static const trace::FunctionSig _CGLReleasePBuffer_sig = {2613, "CGLReleasePBuffer", 1, _CGLReleasePBuffer_args}; static const char * _CGLGetPBufferRetainCount_args[1] = {"pbuffer"}; -static const trace::FunctionSig _CGLGetPBufferRetainCount_sig = {2611, "CGLGetPBufferRetainCount", 1, _CGLGetPBufferRetainCount_args}; +static const trace::FunctionSig _CGLGetPBufferRetainCount_sig = {2614, "CGLGetPBufferRetainCount", 1, _CGLGetPBufferRetainCount_args}; static const char * _CGLSetOffScreen_args[5] = {"ctx", "width", "height", "rowbytes", "baseaddr"}; -static const trace::FunctionSig _CGLSetOffScreen_sig = {2612, "CGLSetOffScreen", 5, _CGLSetOffScreen_args}; +static const trace::FunctionSig _CGLSetOffScreen_sig = {2615, "CGLSetOffScreen", 5, _CGLSetOffScreen_args}; static const char * _CGLGetOffScreen_args[5] = {"ctx", "width", "height", "rowbytes", "baseaddr"}; -static const trace::FunctionSig _CGLGetOffScreen_sig = {2613, "CGLGetOffScreen", 5, _CGLGetOffScreen_args}; +static const trace::FunctionSig _CGLGetOffScreen_sig = {2616, "CGLGetOffScreen", 5, _CGLGetOffScreen_args}; static const char * _CGLSetFullScreen_args[1] = {"ctx"}; -static const trace::FunctionSig _CGLSetFullScreen_sig = {2614, "CGLSetFullScreen", 1, _CGLSetFullScreen_args}; +static const trace::FunctionSig _CGLSetFullScreen_sig = {2617, "CGLSetFullScreen", 1, _CGLSetFullScreen_args}; static const char * _CGLSetFullScreenOnDisplay_args[2] = {"ctx", "display_mask"}; -static const trace::FunctionSig _CGLSetFullScreenOnDisplay_sig = {2615, "CGLSetFullScreenOnDisplay", 2, _CGLSetFullScreenOnDisplay_args}; +static const trace::FunctionSig _CGLSetFullScreenOnDisplay_sig = {2618, "CGLSetFullScreenOnDisplay", 2, _CGLSetFullScreenOnDisplay_args}; static const char * _CGLSetPBuffer_args[5] = {"ctx", "pbuffer", "face", "level", "screen"}; -static const trace::FunctionSig _CGLSetPBuffer_sig = {2616, "CGLSetPBuffer", 5, _CGLSetPBuffer_args}; +static const trace::FunctionSig _CGLSetPBuffer_sig = {2619, "CGLSetPBuffer", 5, _CGLSetPBuffer_args}; static const char * _CGLGetPBuffer_args[5] = {"ctx", "pbuffer", "face", "level", "screen"}; -static const trace::FunctionSig _CGLGetPBuffer_sig = {2617, "CGLGetPBuffer", 5, _CGLGetPBuffer_args}; +static const trace::FunctionSig _CGLGetPBuffer_sig = {2620, "CGLGetPBuffer", 5, _CGLGetPBuffer_args}; static const char * _CGLClearDrawable_args[1] = {"ctx"}; -static const trace::FunctionSig _CGLClearDrawable_sig = {2618, "CGLClearDrawable", 1, _CGLClearDrawable_args}; +static const trace::FunctionSig _CGLClearDrawable_sig = {2621, "CGLClearDrawable", 1, _CGLClearDrawable_args}; static const char * _CGLFlushDrawable_args[1] = {"ctx"}; -static const trace::FunctionSig _CGLFlushDrawable_sig = {2619, "CGLFlushDrawable", 1, _CGLFlushDrawable_args}; +static const trace::FunctionSig _CGLFlushDrawable_sig = {2622, "CGLFlushDrawable", 1, _CGLFlushDrawable_args}; static const char * _CGLEnable_args[2] = {"ctx", "pname"}; -static const trace::FunctionSig _CGLEnable_sig = {2620, "CGLEnable", 2, _CGLEnable_args}; +static const trace::FunctionSig _CGLEnable_sig = {2623, "CGLEnable", 2, _CGLEnable_args}; static const char * _CGLDisable_args[2] = {"ctx", "pname"}; -static const trace::FunctionSig _CGLDisable_sig = {2621, "CGLDisable", 2, _CGLDisable_args}; +static const trace::FunctionSig _CGLDisable_sig = {2624, "CGLDisable", 2, _CGLDisable_args}; static const char * _CGLIsEnabled_args[3] = {"ctx", "pname", "enable"}; -static const trace::FunctionSig _CGLIsEnabled_sig = {2622, "CGLIsEnabled", 3, _CGLIsEnabled_args}; +static const trace::FunctionSig _CGLIsEnabled_sig = {2625, "CGLIsEnabled", 3, _CGLIsEnabled_args}; static const char * _CGLSetParameter_args[3] = {"ctx", "pname", "params"}; -static const trace::FunctionSig _CGLSetParameter_sig = {2623, "CGLSetParameter", 3, _CGLSetParameter_args}; +static const trace::FunctionSig _CGLSetParameter_sig = {2626, "CGLSetParameter", 3, _CGLSetParameter_args}; static const char * _CGLGetParameter_args[3] = {"ctx", "pname", "params"}; -static const trace::FunctionSig _CGLGetParameter_sig = {2624, "CGLGetParameter", 3, _CGLGetParameter_args}; +static const trace::FunctionSig _CGLGetParameter_sig = {2627, "CGLGetParameter", 3, _CGLGetParameter_args}; static const char * _CGLSetVirtualScreen_args[2] = {"ctx", "screen"}; -static const trace::FunctionSig _CGLSetVirtualScreen_sig = {2625, "CGLSetVirtualScreen", 2, _CGLSetVirtualScreen_args}; +static const trace::FunctionSig _CGLSetVirtualScreen_sig = {2628, "CGLSetVirtualScreen", 2, _CGLSetVirtualScreen_args}; static const char * _CGLGetVirtualScreen_args[2] = {"ctx", "screen"}; -static const trace::FunctionSig _CGLGetVirtualScreen_sig = {2626, "CGLGetVirtualScreen", 2, _CGLGetVirtualScreen_args}; +static const trace::FunctionSig _CGLGetVirtualScreen_sig = {2629, "CGLGetVirtualScreen", 2, _CGLGetVirtualScreen_args}; static const char * _CGLSetGlobalOption_args[2] = {"pname", "params"}; -static const trace::FunctionSig _CGLSetGlobalOption_sig = {2627, "CGLSetGlobalOption", 2, _CGLSetGlobalOption_args}; +static const trace::FunctionSig _CGLSetGlobalOption_sig = {2630, "CGLSetGlobalOption", 2, _CGLSetGlobalOption_args}; static const char * _CGLGetGlobalOption_args[2] = {"pname", "params"}; -static const trace::FunctionSig _CGLGetGlobalOption_sig = {2628, "CGLGetGlobalOption", 2, _CGLGetGlobalOption_args}; +static const trace::FunctionSig _CGLGetGlobalOption_sig = {2631, "CGLGetGlobalOption", 2, _CGLGetGlobalOption_args}; static const char * _CGLSetOption_args[2] = {"pname", "param"}; -static const trace::FunctionSig _CGLSetOption_sig = {2629, "CGLSetOption", 2, _CGLSetOption_args}; +static const trace::FunctionSig _CGLSetOption_sig = {2632, "CGLSetOption", 2, _CGLSetOption_args}; static const char * _CGLGetOption_args[2] = {"pname", "param"}; -static const trace::FunctionSig _CGLGetOption_sig = {2630, "CGLGetOption", 2, _CGLGetOption_args}; +static const trace::FunctionSig _CGLGetOption_sig = {2633, "CGLGetOption", 2, _CGLGetOption_args}; static const char * _CGLLockContext_args[1] = {"ctx"}; -static const trace::FunctionSig _CGLLockContext_sig = {2631, "CGLLockContext", 1, _CGLLockContext_args}; +static const trace::FunctionSig _CGLLockContext_sig = {2634, "CGLLockContext", 1, _CGLLockContext_args}; static const char * _CGLUnlockContext_args[1] = {"ctx"}; -static const trace::FunctionSig _CGLUnlockContext_sig = {2632, "CGLUnlockContext", 1, _CGLUnlockContext_args}; +static const trace::FunctionSig _CGLUnlockContext_sig = {2635, "CGLUnlockContext", 1, _CGLUnlockContext_args}; static const char * _CGLGetVersion_args[2] = {"majorvers", "minorvers"}; -static const trace::FunctionSig _CGLGetVersion_sig = {2633, "CGLGetVersion", 2, _CGLGetVersion_args}; +static const trace::FunctionSig _CGLGetVersion_sig = {2636, "CGLGetVersion", 2, _CGLGetVersion_args}; static const char * _CGLErrorString_args[1] = {"error"}; -static const trace::FunctionSig _CGLErrorString_sig = {2634, "CGLErrorString", 1, _CGLErrorString_args}; +static const trace::FunctionSig _CGLErrorString_sig = {2637, "CGLErrorString", 1, _CGLErrorString_args}; static const char * _CGLTexImageIOSurface2D_args[9] = {"ctx", "target", "internal_format", "width", "height", "format", "type", "ioSurface", "plane"}; -static const trace::FunctionSig _CGLTexImageIOSurface2D_sig = {2635, "CGLTexImageIOSurface2D", 9, _CGLTexImageIOSurface2D_args}; +static const trace::FunctionSig _CGLTexImageIOSurface2D_sig = {2638, "CGLTexImageIOSurface2D", 9, _CGLTexImageIOSurface2D_args}; static const char * _CGLGetShareGroup_args[1] = {"ctx"}; -static const trace::FunctionSig _CGLGetShareGroup_sig = {2636, "CGLGetShareGroup", 1, _CGLGetShareGroup_args}; +static const trace::FunctionSig _CGLGetShareGroup_sig = {2639, "CGLGetShareGroup", 1, _CGLGetShareGroup_args}; static const char * _CGLSetSurface_args[4] = {"ctx", "cid", "wid", "sid"}; -static const trace::FunctionSig _CGLSetSurface_sig = {2637, "CGLSetSurface", 4, _CGLSetSurface_args}; +static const trace::FunctionSig _CGLSetSurface_sig = {2640, "CGLSetSurface", 4, _CGLSetSurface_args}; static const char * _CGLGetSurface_args[4] = {"ctx", "cid", "wid", "sid"}; -static const trace::FunctionSig _CGLGetSurface_sig = {2638, "CGLGetSurface", 4, _CGLGetSurface_args}; +static const trace::FunctionSig _CGLGetSurface_sig = {2641, "CGLGetSurface", 4, _CGLGetSurface_args}; static const char * _CGLUpdateContext_args[1] = {"ctx"}; -static const trace::FunctionSig _CGLUpdateContext_sig = {2639, "CGLUpdateContext", 1, _CGLUpdateContext_args}; +static const trace::FunctionSig _CGLUpdateContext_sig = {2642, "CGLUpdateContext", 1, _CGLUpdateContext_args}; #endif // REGAL_SYS_OSX #if REGAL_SYS_EGL static const char ** _eglGetError_args = NULL; -static const trace::FunctionSig _eglGetError_sig = {2640, "eglGetError", 0, _eglGetError_args}; +static const trace::FunctionSig _eglGetError_sig = {2643, "eglGetError", 0, _eglGetError_args}; static const char * _eglGetDisplay_args[1] = {"display_id"}; -static const trace::FunctionSig _eglGetDisplay_sig = {2641, "eglGetDisplay", 1, _eglGetDisplay_args}; +static const trace::FunctionSig _eglGetDisplay_sig = {2644, "eglGetDisplay", 1, _eglGetDisplay_args}; static const char * _eglInitialize_args[3] = {"dpy", "major", "minor"}; -static const trace::FunctionSig _eglInitialize_sig = {2642, "eglInitialize", 3, _eglInitialize_args}; +static const trace::FunctionSig _eglInitialize_sig = {2645, "eglInitialize", 3, _eglInitialize_args}; static const char * _eglTerminate_args[1] = {"dpy"}; -static const trace::FunctionSig _eglTerminate_sig = {2643, "eglTerminate", 1, _eglTerminate_args}; +static const trace::FunctionSig _eglTerminate_sig = {2646, "eglTerminate", 1, _eglTerminate_args}; static const char * _eglQueryString_args[2] = {"dpy", "name"}; -static const trace::FunctionSig _eglQueryString_sig = {2644, "eglQueryString", 2, _eglQueryString_args}; +static const trace::FunctionSig _eglQueryString_sig = {2647, "eglQueryString", 2, _eglQueryString_args}; static const char * _eglGetConfigs_args[4] = {"dpy", "configs", "config_size", "num_config"}; -static const trace::FunctionSig _eglGetConfigs_sig = {2645, "eglGetConfigs", 4, _eglGetConfigs_args}; +static const trace::FunctionSig _eglGetConfigs_sig = {2648, "eglGetConfigs", 4, _eglGetConfigs_args}; static const char * _eglChooseConfig_args[5] = {"dpy", "attrib_list", "configs", "config_size", "num_config"}; -static const trace::FunctionSig _eglChooseConfig_sig = {2646, "eglChooseConfig", 5, _eglChooseConfig_args}; +static const trace::FunctionSig _eglChooseConfig_sig = {2649, "eglChooseConfig", 5, _eglChooseConfig_args}; static const char * _eglGetConfigAttrib_args[4] = {"dpy", "config", "attribute", "value"}; -static const trace::FunctionSig _eglGetConfigAttrib_sig = {2647, "eglGetConfigAttrib", 4, _eglGetConfigAttrib_args}; +static const trace::FunctionSig _eglGetConfigAttrib_sig = {2650, "eglGetConfigAttrib", 4, _eglGetConfigAttrib_args}; static const char * _eglCreateWindowSurface_args[4] = {"dpy", "config", "win", "attrib_list"}; -static const trace::FunctionSig _eglCreateWindowSurface_sig = {2648, "eglCreateWindowSurface", 4, _eglCreateWindowSurface_args}; +static const trace::FunctionSig _eglCreateWindowSurface_sig = {2651, "eglCreateWindowSurface", 4, _eglCreateWindowSurface_args}; static const char * _eglCreatePbufferSurface_args[3] = {"dpy", "config", "attrib_list"}; -static const trace::FunctionSig _eglCreatePbufferSurface_sig = {2649, "eglCreatePbufferSurface", 3, _eglCreatePbufferSurface_args}; +static const trace::FunctionSig _eglCreatePbufferSurface_sig = {2652, "eglCreatePbufferSurface", 3, _eglCreatePbufferSurface_args}; static const char * _eglCreatePixmapSurface_args[4] = {"dpy", "config", "pixmap", "attrib_list"}; -static const trace::FunctionSig _eglCreatePixmapSurface_sig = {2650, "eglCreatePixmapSurface", 4, _eglCreatePixmapSurface_args}; +static const trace::FunctionSig _eglCreatePixmapSurface_sig = {2653, "eglCreatePixmapSurface", 4, _eglCreatePixmapSurface_args}; static const char * _eglDestroySurface_args[2] = {"dpy", "surface"}; -static const trace::FunctionSig _eglDestroySurface_sig = {2651, "eglDestroySurface", 2, _eglDestroySurface_args}; +static const trace::FunctionSig _eglDestroySurface_sig = {2654, "eglDestroySurface", 2, _eglDestroySurface_args}; static const char * _eglQuerySurface_args[4] = {"dpy", "surface", "attribute", "value"}; -static const trace::FunctionSig _eglQuerySurface_sig = {2652, "eglQuerySurface", 4, _eglQuerySurface_args}; +static const trace::FunctionSig _eglQuerySurface_sig = {2655, "eglQuerySurface", 4, _eglQuerySurface_args}; static const char * _eglBindAPI_args[1] = {"api"}; -static const trace::FunctionSig _eglBindAPI_sig = {2653, "eglBindAPI", 1, _eglBindAPI_args}; +static const trace::FunctionSig _eglBindAPI_sig = {2656, "eglBindAPI", 1, _eglBindAPI_args}; static const char ** _eglQueryAPI_args = NULL; -static const trace::FunctionSig _eglQueryAPI_sig = {2654, "eglQueryAPI", 0, _eglQueryAPI_args}; +static const trace::FunctionSig _eglQueryAPI_sig = {2657, "eglQueryAPI", 0, _eglQueryAPI_args}; static const char ** _eglWaitClient_args = NULL; -static const trace::FunctionSig _eglWaitClient_sig = {2655, "eglWaitClient", 0, _eglWaitClient_args}; +static const trace::FunctionSig _eglWaitClient_sig = {2658, "eglWaitClient", 0, _eglWaitClient_args}; static const char ** _eglReleaseThread_args = NULL; -static const trace::FunctionSig _eglReleaseThread_sig = {2656, "eglReleaseThread", 0, _eglReleaseThread_args}; +static const trace::FunctionSig _eglReleaseThread_sig = {2659, "eglReleaseThread", 0, _eglReleaseThread_args}; static const char * _eglCreatePbufferFromClientBuffer_args[5] = {"dpy", "buftype", "buffer", "config", "attrib_list"}; -static const trace::FunctionSig _eglCreatePbufferFromClientBuffer_sig = {2657, "eglCreatePbufferFromClientBuffer", 5, _eglCreatePbufferFromClientBuffer_args}; +static const trace::FunctionSig _eglCreatePbufferFromClientBuffer_sig = {2660, "eglCreatePbufferFromClientBuffer", 5, _eglCreatePbufferFromClientBuffer_args}; static const char * _eglSurfaceAttrib_args[4] = {"dpy", "surface", "attribute", "value"}; -static const trace::FunctionSig _eglSurfaceAttrib_sig = {2658, "eglSurfaceAttrib", 4, _eglSurfaceAttrib_args}; +static const trace::FunctionSig _eglSurfaceAttrib_sig = {2661, "eglSurfaceAttrib", 4, _eglSurfaceAttrib_args}; static const char * _eglBindTexImage_args[3] = {"dpy", "surface", "buffer"}; -static const trace::FunctionSig _eglBindTexImage_sig = {2659, "eglBindTexImage", 3, _eglBindTexImage_args}; +static const trace::FunctionSig _eglBindTexImage_sig = {2662, "eglBindTexImage", 3, _eglBindTexImage_args}; static const char * _eglReleaseTexImage_args[3] = {"dpy", "surface", "buffer"}; -static const trace::FunctionSig _eglReleaseTexImage_sig = {2660, "eglReleaseTexImage", 3, _eglReleaseTexImage_args}; +static const trace::FunctionSig _eglReleaseTexImage_sig = {2663, "eglReleaseTexImage", 3, _eglReleaseTexImage_args}; static const char * _eglSwapInterval_args[2] = {"dpy", "interval"}; -static const trace::FunctionSig _eglSwapInterval_sig = {2661, "eglSwapInterval", 2, _eglSwapInterval_args}; +static const trace::FunctionSig _eglSwapInterval_sig = {2664, "eglSwapInterval", 2, _eglSwapInterval_args}; static const char * _eglCreateContext_args[4] = {"dpy", "config", "share_context", "attrib_list"}; -static const trace::FunctionSig _eglCreateContext_sig = {2662, "eglCreateContext", 4, _eglCreateContext_args}; +static const trace::FunctionSig _eglCreateContext_sig = {2665, "eglCreateContext", 4, _eglCreateContext_args}; static const char * _eglDestroyContext_args[2] = {"dpy", "ctx"}; -static const trace::FunctionSig _eglDestroyContext_sig = {2663, "eglDestroyContext", 2, _eglDestroyContext_args}; +static const trace::FunctionSig _eglDestroyContext_sig = {2666, "eglDestroyContext", 2, _eglDestroyContext_args}; static const char * _eglMakeCurrent_args[4] = {"dpy", "draw", "read", "ctx"}; -static const trace::FunctionSig _eglMakeCurrent_sig = {2664, "eglMakeCurrent", 4, _eglMakeCurrent_args}; +static const trace::FunctionSig _eglMakeCurrent_sig = {2667, "eglMakeCurrent", 4, _eglMakeCurrent_args}; static const char ** _eglGetCurrentContext_args = NULL; -static const trace::FunctionSig _eglGetCurrentContext_sig = {2665, "eglGetCurrentContext", 0, _eglGetCurrentContext_args}; +static const trace::FunctionSig _eglGetCurrentContext_sig = {2668, "eglGetCurrentContext", 0, _eglGetCurrentContext_args}; static const char * _eglGetCurrentSurface_args[1] = {"readdraw"}; -static const trace::FunctionSig _eglGetCurrentSurface_sig = {2666, "eglGetCurrentSurface", 1, _eglGetCurrentSurface_args}; +static const trace::FunctionSig _eglGetCurrentSurface_sig = {2669, "eglGetCurrentSurface", 1, _eglGetCurrentSurface_args}; static const char ** _eglGetCurrentDisplay_args = NULL; -static const trace::FunctionSig _eglGetCurrentDisplay_sig = {2667, "eglGetCurrentDisplay", 0, _eglGetCurrentDisplay_args}; +static const trace::FunctionSig _eglGetCurrentDisplay_sig = {2670, "eglGetCurrentDisplay", 0, _eglGetCurrentDisplay_args}; static const char * _eglQueryContext_args[4] = {"dpy", "ctx", "attribute", "value"}; -static const trace::FunctionSig _eglQueryContext_sig = {2668, "eglQueryContext", 4, _eglQueryContext_args}; +static const trace::FunctionSig _eglQueryContext_sig = {2671, "eglQueryContext", 4, _eglQueryContext_args}; static const char ** _eglWaitGL_args = NULL; -static const trace::FunctionSig _eglWaitGL_sig = {2669, "eglWaitGL", 0, _eglWaitGL_args}; +static const trace::FunctionSig _eglWaitGL_sig = {2672, "eglWaitGL", 0, _eglWaitGL_args}; static const char * _eglWaitNative_args[1] = {"engine"}; -static const trace::FunctionSig _eglWaitNative_sig = {2670, "eglWaitNative", 1, _eglWaitNative_args}; +static const trace::FunctionSig _eglWaitNative_sig = {2673, "eglWaitNative", 1, _eglWaitNative_args}; static const char * _eglSwapBuffers_args[2] = {"dpy", "surface"}; -static const trace::FunctionSig _eglSwapBuffers_sig = {2671, "eglSwapBuffers", 2, _eglSwapBuffers_args}; +static const trace::FunctionSig _eglSwapBuffers_sig = {2674, "eglSwapBuffers", 2, _eglSwapBuffers_args}; static const char * _eglCopyBuffers_args[3] = {"dpy", "surface", "target"}; -static const trace::FunctionSig _eglCopyBuffers_sig = {2672, "eglCopyBuffers", 3, _eglCopyBuffers_args}; +static const trace::FunctionSig _eglCopyBuffers_sig = {2675, "eglCopyBuffers", 3, _eglCopyBuffers_args}; static const char * _eglGetProcAddress_args[1] = {"procname"}; -static const trace::FunctionSig _eglGetProcAddress_sig = {2673, "eglGetProcAddress", 1, _eglGetProcAddress_args}; +static const trace::FunctionSig _eglGetProcAddress_sig = {2676, "eglGetProcAddress", 1, _eglGetProcAddress_args}; static const char * _eglLockSurfaceKHR_args[3] = {"display", "surface", "attrib_list"}; -static const trace::FunctionSig _eglLockSurfaceKHR_sig = {2674, "eglLockSurfaceKHR", 3, _eglLockSurfaceKHR_args}; +static const trace::FunctionSig _eglLockSurfaceKHR_sig = {2677, "eglLockSurfaceKHR", 3, _eglLockSurfaceKHR_args}; static const char * _eglUnlockSurfaceKHR_args[2] = {"display", "surface"}; -static const trace::FunctionSig _eglUnlockSurfaceKHR_sig = {2675, "eglUnlockSurfaceKHR", 2, _eglUnlockSurfaceKHR_args}; +static const trace::FunctionSig _eglUnlockSurfaceKHR_sig = {2678, "eglUnlockSurfaceKHR", 2, _eglUnlockSurfaceKHR_args}; static const char * _eglCreateImageKHR_args[5] = {"dpy", "ctx", "target", "buffer", "attrib_list"}; -static const trace::FunctionSig _eglCreateImageKHR_sig = {2676, "eglCreateImageKHR", 5, _eglCreateImageKHR_args}; +static const trace::FunctionSig _eglCreateImageKHR_sig = {2679, "eglCreateImageKHR", 5, _eglCreateImageKHR_args}; static const char * _eglDestroyImageKHR_args[2] = {"dpy", "image"}; -static const trace::FunctionSig _eglDestroyImageKHR_sig = {2677, "eglDestroyImageKHR", 2, _eglDestroyImageKHR_args}; +static const trace::FunctionSig _eglDestroyImageKHR_sig = {2680, "eglDestroyImageKHR", 2, _eglDestroyImageKHR_args}; static const char * _eglCreateSyncKHR_args[3] = {"dpy", "type", "attrib_list"}; -static const trace::FunctionSig _eglCreateSyncKHR_sig = {2678, "eglCreateSyncKHR", 3, _eglCreateSyncKHR_args}; +static const trace::FunctionSig _eglCreateSyncKHR_sig = {2681, "eglCreateSyncKHR", 3, _eglCreateSyncKHR_args}; static const char * _eglDestroySyncKHR_args[2] = {"dpy", "sync"}; -static const trace::FunctionSig _eglDestroySyncKHR_sig = {2679, "eglDestroySyncKHR", 2, _eglDestroySyncKHR_args}; +static const trace::FunctionSig _eglDestroySyncKHR_sig = {2682, "eglDestroySyncKHR", 2, _eglDestroySyncKHR_args}; static const char * _eglClientWaitSyncKHR_args[4] = {"dpy", "sync", "flags", "timeout"}; -static const trace::FunctionSig _eglClientWaitSyncKHR_sig = {2680, "eglClientWaitSyncKHR", 4, _eglClientWaitSyncKHR_args}; +static const trace::FunctionSig _eglClientWaitSyncKHR_sig = {2683, "eglClientWaitSyncKHR", 4, _eglClientWaitSyncKHR_args}; static const char * _eglSignalSyncKHR_args[3] = {"dpy", "sync", "mode"}; -static const trace::FunctionSig _eglSignalSyncKHR_sig = {2681, "eglSignalSyncKHR", 3, _eglSignalSyncKHR_args}; +static const trace::FunctionSig _eglSignalSyncKHR_sig = {2684, "eglSignalSyncKHR", 3, _eglSignalSyncKHR_args}; static const char * _eglGetSyncAttribKHR_args[4] = {"dpy", "sync", "attribute", "value"}; -static const trace::FunctionSig _eglGetSyncAttribKHR_sig = {2682, "eglGetSyncAttribKHR", 4, _eglGetSyncAttribKHR_args}; +static const trace::FunctionSig _eglGetSyncAttribKHR_sig = {2685, "eglGetSyncAttribKHR", 4, _eglGetSyncAttribKHR_args}; static const char * _eglCreateFenceSyncNV_args[3] = {"dpy", "condition", "attrib_list"}; -static const trace::FunctionSig _eglCreateFenceSyncNV_sig = {2683, "eglCreateFenceSyncNV", 3, _eglCreateFenceSyncNV_args}; +static const trace::FunctionSig _eglCreateFenceSyncNV_sig = {2686, "eglCreateFenceSyncNV", 3, _eglCreateFenceSyncNV_args}; static const char * _eglDestroySyncNV_args[1] = {"sync"}; -static const trace::FunctionSig _eglDestroySyncNV_sig = {2684, "eglDestroySyncNV", 1, _eglDestroySyncNV_args}; +static const trace::FunctionSig _eglDestroySyncNV_sig = {2687, "eglDestroySyncNV", 1, _eglDestroySyncNV_args}; static const char * _eglFenceNV_args[1] = {"sync"}; -static const trace::FunctionSig _eglFenceNV_sig = {2685, "eglFenceNV", 1, _eglFenceNV_args}; +static const trace::FunctionSig _eglFenceNV_sig = {2688, "eglFenceNV", 1, _eglFenceNV_args}; static const char * _eglClientWaitSyncNV_args[3] = {"sync", "flags", "timeout"}; -static const trace::FunctionSig _eglClientWaitSyncNV_sig = {2686, "eglClientWaitSyncNV", 3, _eglClientWaitSyncNV_args}; +static const trace::FunctionSig _eglClientWaitSyncNV_sig = {2689, "eglClientWaitSyncNV", 3, _eglClientWaitSyncNV_args}; static const char * _eglSignalSyncNV_args[2] = {"sync", "mode"}; -static const trace::FunctionSig _eglSignalSyncNV_sig = {2687, "eglSignalSyncNV", 2, _eglSignalSyncNV_args}; +static const trace::FunctionSig _eglSignalSyncNV_sig = {2690, "eglSignalSyncNV", 2, _eglSignalSyncNV_args}; static const char * _eglGetSyncAttribNV_args[3] = {"sync", "attribute", "value"}; -static const trace::FunctionSig _eglGetSyncAttribNV_sig = {2688, "eglGetSyncAttribNV", 3, _eglGetSyncAttribNV_args}; +static const trace::FunctionSig _eglGetSyncAttribNV_sig = {2691, "eglGetSyncAttribNV", 3, _eglGetSyncAttribNV_args}; static const char * _eglCreatePixmapSurfaceHI_args[3] = {"dpy", "config", "pixmap"}; -static const trace::FunctionSig _eglCreatePixmapSurfaceHI_sig = {2689, "eglCreatePixmapSurfaceHI", 3, _eglCreatePixmapSurfaceHI_args}; +static const trace::FunctionSig _eglCreatePixmapSurfaceHI_sig = {2692, "eglCreatePixmapSurfaceHI", 3, _eglCreatePixmapSurfaceHI_args}; static const char * _eglCreateDRMImageMESA_args[2] = {"dpy", "attrib_list"}; -static const trace::FunctionSig _eglCreateDRMImageMESA_sig = {2690, "eglCreateDRMImageMESA", 2, _eglCreateDRMImageMESA_args}; +static const trace::FunctionSig _eglCreateDRMImageMESA_sig = {2693, "eglCreateDRMImageMESA", 2, _eglCreateDRMImageMESA_args}; static const char * _eglExportDRMImageMESA_args[5] = {"dpy", "image", "name", "handle", "stride"}; -static const trace::FunctionSig _eglExportDRMImageMESA_sig = {2691, "eglExportDRMImageMESA", 5, _eglExportDRMImageMESA_args}; +static const trace::FunctionSig _eglExportDRMImageMESA_sig = {2694, "eglExportDRMImageMESA", 5, _eglExportDRMImageMESA_args}; static const char * _eglPostSubBufferNV_args[6] = {"dpy", "surface", "x", "y", "width", "height"}; -static const trace::FunctionSig _eglPostSubBufferNV_sig = {2692, "eglPostSubBufferNV", 6, _eglPostSubBufferNV_args}; +static const trace::FunctionSig _eglPostSubBufferNV_sig = {2695, "eglPostSubBufferNV", 6, _eglPostSubBufferNV_args}; static const char * _eglQuerySurfacePointerANGLE_args[4] = {"dpy", "surface", "attribute", "value"}; -static const trace::FunctionSig _eglQuerySurfacePointerANGLE_sig = {2693, "eglQuerySurfacePointerANGLE", 4, _eglQuerySurfacePointerANGLE_args}; +static const trace::FunctionSig _eglQuerySurfacePointerANGLE_sig = {2696, "eglQuerySurfacePointerANGLE", 4, _eglQuerySurfacePointerANGLE_args}; static const char ** _eglGetSystemTimeFrequencyNV_args = NULL; -static const trace::FunctionSig _eglGetSystemTimeFrequencyNV_sig = {2694, "eglGetSystemTimeFrequencyNV", 0, _eglGetSystemTimeFrequencyNV_args}; +static const trace::FunctionSig _eglGetSystemTimeFrequencyNV_sig = {2697, "eglGetSystemTimeFrequencyNV", 0, _eglGetSystemTimeFrequencyNV_args}; static const char ** _eglGetSystemTimeNV_args = NULL; -static const trace::FunctionSig _eglGetSystemTimeNV_sig = {2695, "eglGetSystemTimeNV", 0, _eglGetSystemTimeNV_args}; +static const trace::FunctionSig _eglGetSystemTimeNV_sig = {2698, "eglGetSystemTimeNV", 0, _eglGetSystemTimeNV_args}; static const char * _glEGLImageTargetTexture2DOES_args[2] = {"target", "image"}; -static const trace::FunctionSig _glEGLImageTargetTexture2DOES_sig = {2696, "glEGLImageTargetTexture2DOES", 2, _glEGLImageTargetTexture2DOES_args}; +static const trace::FunctionSig _glEGLImageTargetTexture2DOES_sig = {2699, "glEGLImageTargetTexture2DOES", 2, _glEGLImageTargetTexture2DOES_args}; static const char * _glEGLImageTargetRenderbufferStorageOES_args[2] = {"target", "image"}; -static const trace::FunctionSig _glEGLImageTargetRenderbufferStorageOES_sig = {2697, "glEGLImageTargetRenderbufferStorageOES", 2, _glEGLImageTargetRenderbufferStorageOES_args}; +static const trace::FunctionSig _glEGLImageTargetRenderbufferStorageOES_sig = {2700, "glEGLImageTargetRenderbufferStorageOES", 2, _glEGLImageTargetRenderbufferStorageOES_args}; #endif // REGAL_SYS_EGL #if REGAL_SYS_GLX static const char * _glXChooseVisual_args[3] = {"dpy", "screen", "attribList"}; -static const trace::FunctionSig _glXChooseVisual_sig = {2698, "glXChooseVisual", 3, _glXChooseVisual_args}; +static const trace::FunctionSig _glXChooseVisual_sig = {2701, "glXChooseVisual", 3, _glXChooseVisual_args}; static const char * _glXCreateContext_args[4] = {"dpy", "vis", "shareList", "direct"}; -static const trace::FunctionSig _glXCreateContext_sig = {2699, "glXCreateContext", 4, _glXCreateContext_args}; +static const trace::FunctionSig _glXCreateContext_sig = {2702, "glXCreateContext", 4, _glXCreateContext_args}; static const char * _glXDestroyContext_args[2] = {"dpy", "ctx"}; -static const trace::FunctionSig _glXDestroyContext_sig = {2700, "glXDestroyContext", 2, _glXDestroyContext_args}; +static const trace::FunctionSig _glXDestroyContext_sig = {2703, "glXDestroyContext", 2, _glXDestroyContext_args}; static const char * _glXMakeCurrent_args[3] = {"dpy", "drawable", "ctx"}; -static const trace::FunctionSig _glXMakeCurrent_sig = {2701, "glXMakeCurrent", 3, _glXMakeCurrent_args}; +static const trace::FunctionSig _glXMakeCurrent_sig = {2704, "glXMakeCurrent", 3, _glXMakeCurrent_args}; static const char * _glXCopyContext_args[4] = {"dpy", "src", "dst", "mask"}; -static const trace::FunctionSig _glXCopyContext_sig = {2702, "glXCopyContext", 4, _glXCopyContext_args}; +static const trace::FunctionSig _glXCopyContext_sig = {2705, "glXCopyContext", 4, _glXCopyContext_args}; static const char * _glXSwapBuffers_args[2] = {"dpy", "drawable"}; -static const trace::FunctionSig _glXSwapBuffers_sig = {2703, "glXSwapBuffers", 2, _glXSwapBuffers_args}; +static const trace::FunctionSig _glXSwapBuffers_sig = {2706, "glXSwapBuffers", 2, _glXSwapBuffers_args}; static const char * _glXCreateGLXPixmap_args[3] = {"dpy", "visual", "pixmap"}; -static const trace::FunctionSig _glXCreateGLXPixmap_sig = {2704, "glXCreateGLXPixmap", 3, _glXCreateGLXPixmap_args}; +static const trace::FunctionSig _glXCreateGLXPixmap_sig = {2707, "glXCreateGLXPixmap", 3, _glXCreateGLXPixmap_args}; static const char * _glXDestroyGLXPixmap_args[2] = {"dpy", "pixmap"}; -static const trace::FunctionSig _glXDestroyGLXPixmap_sig = {2705, "glXDestroyGLXPixmap", 2, _glXDestroyGLXPixmap_args}; +static const trace::FunctionSig _glXDestroyGLXPixmap_sig = {2708, "glXDestroyGLXPixmap", 2, _glXDestroyGLXPixmap_args}; static const char * _glXQueryExtension_args[3] = {"dpy", "errorb", "event"}; -static const trace::FunctionSig _glXQueryExtension_sig = {2706, "glXQueryExtension", 3, _glXQueryExtension_args}; +static const trace::FunctionSig _glXQueryExtension_sig = {2709, "glXQueryExtension", 3, _glXQueryExtension_args}; static const char * _glXQueryVersion_args[3] = {"dpy", "maj", "min"}; -static const trace::FunctionSig _glXQueryVersion_sig = {2707, "glXQueryVersion", 3, _glXQueryVersion_args}; +static const trace::FunctionSig _glXQueryVersion_sig = {2710, "glXQueryVersion", 3, _glXQueryVersion_args}; static const char * _glXIsDirect_args[2] = {"dpy", "ctx"}; -static const trace::FunctionSig _glXIsDirect_sig = {2708, "glXIsDirect", 2, _glXIsDirect_args}; +static const trace::FunctionSig _glXIsDirect_sig = {2711, "glXIsDirect", 2, _glXIsDirect_args}; static const char * _glXGetConfig_args[4] = {"dpy", "visual", "attrib", "value"}; -static const trace::FunctionSig _glXGetConfig_sig = {2709, "glXGetConfig", 4, _glXGetConfig_args}; +static const trace::FunctionSig _glXGetConfig_sig = {2712, "glXGetConfig", 4, _glXGetConfig_args}; static const char ** _glXGetCurrentContext_args = NULL; -static const trace::FunctionSig _glXGetCurrentContext_sig = {2710, "glXGetCurrentContext", 0, _glXGetCurrentContext_args}; +static const trace::FunctionSig _glXGetCurrentContext_sig = {2713, "glXGetCurrentContext", 0, _glXGetCurrentContext_args}; static const char ** _glXGetCurrentDrawable_args = NULL; -static const trace::FunctionSig _glXGetCurrentDrawable_sig = {2711, "glXGetCurrentDrawable", 0, _glXGetCurrentDrawable_args}; +static const trace::FunctionSig _glXGetCurrentDrawable_sig = {2714, "glXGetCurrentDrawable", 0, _glXGetCurrentDrawable_args}; static const char ** _glXWaitGL_args = NULL; -static const trace::FunctionSig _glXWaitGL_sig = {2712, "glXWaitGL", 0, _glXWaitGL_args}; +static const trace::FunctionSig _glXWaitGL_sig = {2715, "glXWaitGL", 0, _glXWaitGL_args}; static const char ** _glXWaitX_args = NULL; -static const trace::FunctionSig _glXWaitX_sig = {2713, "glXWaitX", 0, _glXWaitX_args}; +static const trace::FunctionSig _glXWaitX_sig = {2716, "glXWaitX", 0, _glXWaitX_args}; static const char * _glXUseXFont_args[4] = {"font", "first", "count", "list"}; -static const trace::FunctionSig _glXUseXFont_sig = {2714, "glXUseXFont", 4, _glXUseXFont_args}; +static const trace::FunctionSig _glXUseXFont_sig = {2717, "glXUseXFont", 4, _glXUseXFont_args}; static const char * _glXQueryExtensionsString_args[2] = {"dpy", "screen"}; -static const trace::FunctionSig _glXQueryExtensionsString_sig = {2715, "glXQueryExtensionsString", 2, _glXQueryExtensionsString_args}; +static const trace::FunctionSig _glXQueryExtensionsString_sig = {2718, "glXQueryExtensionsString", 2, _glXQueryExtensionsString_args}; static const char * _glXQueryServerString_args[3] = {"dpy", "screen", "name"}; -static const trace::FunctionSig _glXQueryServerString_sig = {2716, "glXQueryServerString", 3, _glXQueryServerString_args}; +static const trace::FunctionSig _glXQueryServerString_sig = {2719, "glXQueryServerString", 3, _glXQueryServerString_args}; static const char * _glXGetClientString_args[2] = {"dpy", "name"}; -static const trace::FunctionSig _glXGetClientString_sig = {2717, "glXGetClientString", 2, _glXGetClientString_args}; +static const trace::FunctionSig _glXGetClientString_sig = {2720, "glXGetClientString", 2, _glXGetClientString_args}; static const char ** _glXGetCurrentDisplay_args = NULL; -static const trace::FunctionSig _glXGetCurrentDisplay_sig = {2718, "glXGetCurrentDisplay", 0, _glXGetCurrentDisplay_args}; +static const trace::FunctionSig _glXGetCurrentDisplay_sig = {2721, "glXGetCurrentDisplay", 0, _glXGetCurrentDisplay_args}; static const char * _glXChooseFBConfig_args[4] = {"dpy", "screen", "attribList", "nitems"}; -static const trace::FunctionSig _glXChooseFBConfig_sig = {2719, "glXChooseFBConfig", 4, _glXChooseFBConfig_args}; +static const trace::FunctionSig _glXChooseFBConfig_sig = {2722, "glXChooseFBConfig", 4, _glXChooseFBConfig_args}; static const char * _glXGetFBConfigAttrib_args[4] = {"dpy", "config", "attribute", "value"}; -static const trace::FunctionSig _glXGetFBConfigAttrib_sig = {2720, "glXGetFBConfigAttrib", 4, _glXGetFBConfigAttrib_args}; +static const trace::FunctionSig _glXGetFBConfigAttrib_sig = {2723, "glXGetFBConfigAttrib", 4, _glXGetFBConfigAttrib_args}; static const char * _glXGetFBConfigs_args[3] = {"dpy", "screen", "nelements"}; -static const trace::FunctionSig _glXGetFBConfigs_sig = {2721, "glXGetFBConfigs", 3, _glXGetFBConfigs_args}; +static const trace::FunctionSig _glXGetFBConfigs_sig = {2724, "glXGetFBConfigs", 3, _glXGetFBConfigs_args}; static const char * _glXGetVisualFromFBConfig_args[2] = {"dpy", "config"}; -static const trace::FunctionSig _glXGetVisualFromFBConfig_sig = {2722, "glXGetVisualFromFBConfig", 2, _glXGetVisualFromFBConfig_args}; +static const trace::FunctionSig _glXGetVisualFromFBConfig_sig = {2725, "glXGetVisualFromFBConfig", 2, _glXGetVisualFromFBConfig_args}; static const char * _glXCreateWindow_args[4] = {"dpy", "config", "win", "attribList"}; -static const trace::FunctionSig _glXCreateWindow_sig = {2723, "glXCreateWindow", 4, _glXCreateWindow_args}; +static const trace::FunctionSig _glXCreateWindow_sig = {2726, "glXCreateWindow", 4, _glXCreateWindow_args}; static const char * _glXDestroyWindow_args[2] = {"dpy", "window"}; -static const trace::FunctionSig _glXDestroyWindow_sig = {2724, "glXDestroyWindow", 2, _glXDestroyWindow_args}; +static const trace::FunctionSig _glXDestroyWindow_sig = {2727, "glXDestroyWindow", 2, _glXDestroyWindow_args}; static const char * _glXCreatePixmap_args[4] = {"dpy", "config", "pixmap", "attribList"}; -static const trace::FunctionSig _glXCreatePixmap_sig = {2725, "glXCreatePixmap", 4, _glXCreatePixmap_args}; +static const trace::FunctionSig _glXCreatePixmap_sig = {2728, "glXCreatePixmap", 4, _glXCreatePixmap_args}; static const char * _glXDestroyPixmap_args[2] = {"dpy", "pixmap"}; -static const trace::FunctionSig _glXDestroyPixmap_sig = {2726, "glXDestroyPixmap", 2, _glXDestroyPixmap_args}; +static const trace::FunctionSig _glXDestroyPixmap_sig = {2729, "glXDestroyPixmap", 2, _glXDestroyPixmap_args}; static const char * _glXCreatePbuffer_args[3] = {"dpy", "config", "attribList"}; -static const trace::FunctionSig _glXCreatePbuffer_sig = {2727, "glXCreatePbuffer", 3, _glXCreatePbuffer_args}; +static const trace::FunctionSig _glXCreatePbuffer_sig = {2730, "glXCreatePbuffer", 3, _glXCreatePbuffer_args}; static const char * _glXDestroyPbuffer_args[2] = {"dpy", "pbuf"}; -static const trace::FunctionSig _glXDestroyPbuffer_sig = {2728, "glXDestroyPbuffer", 2, _glXDestroyPbuffer_args}; +static const trace::FunctionSig _glXDestroyPbuffer_sig = {2731, "glXDestroyPbuffer", 2, _glXDestroyPbuffer_args}; static const char * _glXQueryDrawable_args[4] = {"dpy", "draw", "attribute", "value"}; -static const trace::FunctionSig _glXQueryDrawable_sig = {2729, "glXQueryDrawable", 4, _glXQueryDrawable_args}; +static const trace::FunctionSig _glXQueryDrawable_sig = {2732, "glXQueryDrawable", 4, _glXQueryDrawable_args}; static const char * _glXCreateNewContext_args[5] = {"dpy", "config", "renderType", "shareList", "direct"}; -static const trace::FunctionSig _glXCreateNewContext_sig = {2730, "glXCreateNewContext", 5, _glXCreateNewContext_args}; +static const trace::FunctionSig _glXCreateNewContext_sig = {2733, "glXCreateNewContext", 5, _glXCreateNewContext_args}; static const char * _glXMakeContextCurrent_args[4] = {"dpy", "draw", "read", "ctx"}; -static const trace::FunctionSig _glXMakeContextCurrent_sig = {2731, "glXMakeContextCurrent", 4, _glXMakeContextCurrent_args}; +static const trace::FunctionSig _glXMakeContextCurrent_sig = {2734, "glXMakeContextCurrent", 4, _glXMakeContextCurrent_args}; static const char ** _glXGetCurrentReadDrawable_args = NULL; -static const trace::FunctionSig _glXGetCurrentReadDrawable_sig = {2732, "glXGetCurrentReadDrawable", 0, _glXGetCurrentReadDrawable_args}; +static const trace::FunctionSig _glXGetCurrentReadDrawable_sig = {2735, "glXGetCurrentReadDrawable", 0, _glXGetCurrentReadDrawable_args}; static const char * _glXQueryContext_args[4] = {"dpy", "ctx", "attribute", "value"}; -static const trace::FunctionSig _glXQueryContext_sig = {2733, "glXQueryContext", 4, _glXQueryContext_args}; +static const trace::FunctionSig _glXQueryContext_sig = {2736, "glXQueryContext", 4, _glXQueryContext_args}; static const char * _glXSelectEvent_args[3] = {"dpy", "drawable", "mask"}; -static const trace::FunctionSig _glXSelectEvent_sig = {2734, "glXSelectEvent", 3, _glXSelectEvent_args}; +static const trace::FunctionSig _glXSelectEvent_sig = {2737, "glXSelectEvent", 3, _glXSelectEvent_args}; static const char * _glXGetSelectedEvent_args[3] = {"dpy", "drawable", "mask"}; -static const trace::FunctionSig _glXGetSelectedEvent_sig = {2735, "glXGetSelectedEvent", 3, _glXGetSelectedEvent_args}; +static const trace::FunctionSig _glXGetSelectedEvent_sig = {2738, "glXGetSelectedEvent", 3, _glXGetSelectedEvent_args}; static const char * _glXCreateContextAttribsARB_args[5] = {"dpy", "config", "share_context", "direct", "attrib_list"}; -static const trace::FunctionSig _glXCreateContextAttribsARB_sig = {2736, "glXCreateContextAttribsARB", 5, _glXCreateContextAttribsARB_args}; +static const trace::FunctionSig _glXCreateContextAttribsARB_sig = {2739, "glXCreateContextAttribsARB", 5, _glXCreateContextAttribsARB_args}; static const char * _glXSwapIntervalSGI_args[1] = {"interval"}; -static const trace::FunctionSig _glXSwapIntervalSGI_sig = {2737, "glXSwapIntervalSGI", 1, _glXSwapIntervalSGI_args}; +static const trace::FunctionSig _glXSwapIntervalSGI_sig = {2740, "glXSwapIntervalSGI", 1, _glXSwapIntervalSGI_args}; static const char * _glXGetVideoSyncSGI_args[1] = {"count"}; -static const trace::FunctionSig _glXGetVideoSyncSGI_sig = {2738, "glXGetVideoSyncSGI", 1, _glXGetVideoSyncSGI_args}; +static const trace::FunctionSig _glXGetVideoSyncSGI_sig = {2741, "glXGetVideoSyncSGI", 1, _glXGetVideoSyncSGI_args}; static const char * _glXWaitVideoSyncSGI_args[3] = {"divisor", "remainder", "count"}; -static const trace::FunctionSig _glXWaitVideoSyncSGI_sig = {2739, "glXWaitVideoSyncSGI", 3, _glXWaitVideoSyncSGI_args}; +static const trace::FunctionSig _glXWaitVideoSyncSGI_sig = {2742, "glXWaitVideoSyncSGI", 3, _glXWaitVideoSyncSGI_args}; static const char * _glXMakeCurrentReadSGI_args[4] = {"dpy", "draw", "read", "ctx"}; -static const trace::FunctionSig _glXMakeCurrentReadSGI_sig = {2740, "glXMakeCurrentReadSGI", 4, _glXMakeCurrentReadSGI_args}; +static const trace::FunctionSig _glXMakeCurrentReadSGI_sig = {2743, "glXMakeCurrentReadSGI", 4, _glXMakeCurrentReadSGI_args}; static const char ** _glXGetCurrentReadDrawableSGI_args = NULL; -static const trace::FunctionSig _glXGetCurrentReadDrawableSGI_sig = {2741, "glXGetCurrentReadDrawableSGI", 0, _glXGetCurrentReadDrawableSGI_args}; +static const trace::FunctionSig _glXGetCurrentReadDrawableSGI_sig = {2744, "glXGetCurrentReadDrawableSGI", 0, _glXGetCurrentReadDrawableSGI_args}; static const char ** _glXGetCurrentDisplayEXT_args = NULL; -static const trace::FunctionSig _glXGetCurrentDisplayEXT_sig = {2742, "glXGetCurrentDisplayEXT", 0, _glXGetCurrentDisplayEXT_args}; +static const trace::FunctionSig _glXGetCurrentDisplayEXT_sig = {2745, "glXGetCurrentDisplayEXT", 0, _glXGetCurrentDisplayEXT_args}; static const char * _glXQueryContextInfoEXT_args[4] = {"dpy", "context", "attribute", "value"}; -static const trace::FunctionSig _glXQueryContextInfoEXT_sig = {2743, "glXQueryContextInfoEXT", 4, _glXQueryContextInfoEXT_args}; +static const trace::FunctionSig _glXQueryContextInfoEXT_sig = {2746, "glXQueryContextInfoEXT", 4, _glXQueryContextInfoEXT_args}; static const char * _glXGetContextIDEXT_args[1] = {"context"}; -static const trace::FunctionSig _glXGetContextIDEXT_sig = {2744, "glXGetContextIDEXT", 1, _glXGetContextIDEXT_args}; +static const trace::FunctionSig _glXGetContextIDEXT_sig = {2747, "glXGetContextIDEXT", 1, _glXGetContextIDEXT_args}; static const char * _glXImportContextEXT_args[2] = {"dpy", "contextID"}; -static const trace::FunctionSig _glXImportContextEXT_sig = {2745, "glXImportContextEXT", 2, _glXImportContextEXT_args}; +static const trace::FunctionSig _glXImportContextEXT_sig = {2748, "glXImportContextEXT", 2, _glXImportContextEXT_args}; static const char * _glXFreeContextEXT_args[2] = {"dpy", "context"}; -static const trace::FunctionSig _glXFreeContextEXT_sig = {2746, "glXFreeContextEXT", 2, _glXFreeContextEXT_args}; +static const trace::FunctionSig _glXFreeContextEXT_sig = {2749, "glXFreeContextEXT", 2, _glXFreeContextEXT_args}; static const char * _glXGetFBConfigAttribSGIX_args[4] = {"dpy", "config", "attribute", "value"}; -static const trace::FunctionSig _glXGetFBConfigAttribSGIX_sig = {2747, "glXGetFBConfigAttribSGIX", 4, _glXGetFBConfigAttribSGIX_args}; +static const trace::FunctionSig _glXGetFBConfigAttribSGIX_sig = {2750, "glXGetFBConfigAttribSGIX", 4, _glXGetFBConfigAttribSGIX_args}; static const char * _glXChooseFBConfigSGIX_args[4] = {"dpy", "screen", "attrib_list", "nelements"}; -static const trace::FunctionSig _glXChooseFBConfigSGIX_sig = {2748, "glXChooseFBConfigSGIX", 4, _glXChooseFBConfigSGIX_args}; +static const trace::FunctionSig _glXChooseFBConfigSGIX_sig = {2751, "glXChooseFBConfigSGIX", 4, _glXChooseFBConfigSGIX_args}; static const char * _glXCreateGLXPixmapWithConfigSGIX_args[3] = {"dpy", "config", "pixmap"}; -static const trace::FunctionSig _glXCreateGLXPixmapWithConfigSGIX_sig = {2749, "glXCreateGLXPixmapWithConfigSGIX", 3, _glXCreateGLXPixmapWithConfigSGIX_args}; +static const trace::FunctionSig _glXCreateGLXPixmapWithConfigSGIX_sig = {2752, "glXCreateGLXPixmapWithConfigSGIX", 3, _glXCreateGLXPixmapWithConfigSGIX_args}; static const char * _glXCreateContextWithConfigSGIX_args[5] = {"dpy", "config", "render_type", "share_list", "direct"}; -static const trace::FunctionSig _glXCreateContextWithConfigSGIX_sig = {2750, "glXCreateContextWithConfigSGIX", 5, _glXCreateContextWithConfigSGIX_args}; +static const trace::FunctionSig _glXCreateContextWithConfigSGIX_sig = {2753, "glXCreateContextWithConfigSGIX", 5, _glXCreateContextWithConfigSGIX_args}; static const char * _glXGetVisualFromFBConfigSGIX_args[2] = {"dpy", "config"}; -static const trace::FunctionSig _glXGetVisualFromFBConfigSGIX_sig = {2751, "glXGetVisualFromFBConfigSGIX", 2, _glXGetVisualFromFBConfigSGIX_args}; +static const trace::FunctionSig _glXGetVisualFromFBConfigSGIX_sig = {2754, "glXGetVisualFromFBConfigSGIX", 2, _glXGetVisualFromFBConfigSGIX_args}; static const char * _glXGetFBConfigFromVisualSGIX_args[2] = {"dpy", "vis"}; -static const trace::FunctionSig _glXGetFBConfigFromVisualSGIX_sig = {2752, "glXGetFBConfigFromVisualSGIX", 2, _glXGetFBConfigFromVisualSGIX_args}; +static const trace::FunctionSig _glXGetFBConfigFromVisualSGIX_sig = {2755, "glXGetFBConfigFromVisualSGIX", 2, _glXGetFBConfigFromVisualSGIX_args}; static const char * _glXCreateGLXPbufferSGIX_args[5] = {"dpy", "config", "width", "height", "attrib_list"}; -static const trace::FunctionSig _glXCreateGLXPbufferSGIX_sig = {2753, "glXCreateGLXPbufferSGIX", 5, _glXCreateGLXPbufferSGIX_args}; +static const trace::FunctionSig _glXCreateGLXPbufferSGIX_sig = {2756, "glXCreateGLXPbufferSGIX", 5, _glXCreateGLXPbufferSGIX_args}; static const char * _glXDestroyGLXPbufferSGIX_args[2] = {"dpy", "pbuf"}; -static const trace::FunctionSig _glXDestroyGLXPbufferSGIX_sig = {2754, "glXDestroyGLXPbufferSGIX", 2, _glXDestroyGLXPbufferSGIX_args}; +static const trace::FunctionSig _glXDestroyGLXPbufferSGIX_sig = {2757, "glXDestroyGLXPbufferSGIX", 2, _glXDestroyGLXPbufferSGIX_args}; static const char * _glXQueryGLXPbufferSGIX_args[4] = {"dpy", "pbuf", "attribute", "value"}; -static const trace::FunctionSig _glXQueryGLXPbufferSGIX_sig = {2755, "glXQueryGLXPbufferSGIX", 4, _glXQueryGLXPbufferSGIX_args}; +static const trace::FunctionSig _glXQueryGLXPbufferSGIX_sig = {2758, "glXQueryGLXPbufferSGIX", 4, _glXQueryGLXPbufferSGIX_args}; static const char * _glXSelectEventSGIX_args[3] = {"dpy", "drawable", "mask"}; -static const trace::FunctionSig _glXSelectEventSGIX_sig = {2756, "glXSelectEventSGIX", 3, _glXSelectEventSGIX_args}; +static const trace::FunctionSig _glXSelectEventSGIX_sig = {2759, "glXSelectEventSGIX", 3, _glXSelectEventSGIX_args}; static const char * _glXGetSelectedEventSGIX_args[3] = {"dpy", "drawable", "mask"}; -static const trace::FunctionSig _glXGetSelectedEventSGIX_sig = {2757, "glXGetSelectedEventSGIX", 3, _glXGetSelectedEventSGIX_args}; +static const trace::FunctionSig _glXGetSelectedEventSGIX_sig = {2760, "glXGetSelectedEventSGIX", 3, _glXGetSelectedEventSGIX_args}; static const char * _glXCushionSGI_args[3] = {"dpy", "window", "cushion"}; -static const trace::FunctionSig _glXCushionSGI_sig = {2758, "glXCushionSGI", 3, _glXCushionSGI_args}; +static const trace::FunctionSig _glXCushionSGI_sig = {2761, "glXCushionSGI", 3, _glXCushionSGI_args}; static const char * _glXBindChannelToWindowSGIX_args[4] = {"display", "screen", "channel", "window"}; -static const trace::FunctionSig _glXBindChannelToWindowSGIX_sig = {2759, "glXBindChannelToWindowSGIX", 4, _glXBindChannelToWindowSGIX_args}; +static const trace::FunctionSig _glXBindChannelToWindowSGIX_sig = {2762, "glXBindChannelToWindowSGIX", 4, _glXBindChannelToWindowSGIX_args}; static const char * _glXChannelRectSGIX_args[7] = {"display", "screen", "channel", "x", "y", "w", "h"}; -static const trace::FunctionSig _glXChannelRectSGIX_sig = {2760, "glXChannelRectSGIX", 7, _glXChannelRectSGIX_args}; +static const trace::FunctionSig _glXChannelRectSGIX_sig = {2763, "glXChannelRectSGIX", 7, _glXChannelRectSGIX_args}; static const char * _glXQueryChannelRectSGIX_args[7] = {"display", "screen", "channel", "dx", "dy", "dw", "dh"}; -static const trace::FunctionSig _glXQueryChannelRectSGIX_sig = {2761, "glXQueryChannelRectSGIX", 7, _glXQueryChannelRectSGIX_args}; +static const trace::FunctionSig _glXQueryChannelRectSGIX_sig = {2764, "glXQueryChannelRectSGIX", 7, _glXQueryChannelRectSGIX_args}; static const char * _glXQueryChannelDeltasSGIX_args[7] = {"display", "screen", "channel", "x", "y", "w", "h"}; -static const trace::FunctionSig _glXQueryChannelDeltasSGIX_sig = {2762, "glXQueryChannelDeltasSGIX", 7, _glXQueryChannelDeltasSGIX_args}; +static const trace::FunctionSig _glXQueryChannelDeltasSGIX_sig = {2765, "glXQueryChannelDeltasSGIX", 7, _glXQueryChannelDeltasSGIX_args}; static const char * _glXChannelRectSyncSGIX_args[4] = {"display", "screen", "channel", "synctype"}; -static const trace::FunctionSig _glXChannelRectSyncSGIX_sig = {2763, "glXChannelRectSyncSGIX", 4, _glXChannelRectSyncSGIX_args}; +static const trace::FunctionSig _glXChannelRectSyncSGIX_sig = {2766, "glXChannelRectSyncSGIX", 4, _glXChannelRectSyncSGIX_args}; static const char * _glXJoinSwapGroupSGIX_args[3] = {"dpy", "drawable", "member"}; -static const trace::FunctionSig _glXJoinSwapGroupSGIX_sig = {2764, "glXJoinSwapGroupSGIX", 3, _glXJoinSwapGroupSGIX_args}; +static const trace::FunctionSig _glXJoinSwapGroupSGIX_sig = {2767, "glXJoinSwapGroupSGIX", 3, _glXJoinSwapGroupSGIX_args}; static const char * _glXBindSwapBarrierSGIX_args[3] = {"dpy", "drawable", "barrier"}; -static const trace::FunctionSig _glXBindSwapBarrierSGIX_sig = {2765, "glXBindSwapBarrierSGIX", 3, _glXBindSwapBarrierSGIX_args}; +static const trace::FunctionSig _glXBindSwapBarrierSGIX_sig = {2768, "glXBindSwapBarrierSGIX", 3, _glXBindSwapBarrierSGIX_args}; static const char * _glXQueryMaxSwapBarriersSGIX_args[3] = {"dpy", "screen", "max"}; -static const trace::FunctionSig _glXQueryMaxSwapBarriersSGIX_sig = {2766, "glXQueryMaxSwapBarriersSGIX", 3, _glXQueryMaxSwapBarriersSGIX_args}; +static const trace::FunctionSig _glXQueryMaxSwapBarriersSGIX_sig = {2769, "glXQueryMaxSwapBarriersSGIX", 3, _glXQueryMaxSwapBarriersSGIX_args}; static const char * _glXCopySubBufferMESA_args[6] = {"dpy", "drawable", "x", "y", "width", "height"}; -static const trace::FunctionSig _glXCopySubBufferMESA_sig = {2767, "glXCopySubBufferMESA", 6, _glXCopySubBufferMESA_args}; +static const trace::FunctionSig _glXCopySubBufferMESA_sig = {2770, "glXCopySubBufferMESA", 6, _glXCopySubBufferMESA_args}; static const char * _glXCreateGLXPixmapMESA_args[4] = {"dpy", "visual", "pixmap", "cmap"}; -static const trace::FunctionSig _glXCreateGLXPixmapMESA_sig = {2768, "glXCreateGLXPixmapMESA", 4, _glXCreateGLXPixmapMESA_args}; +static const trace::FunctionSig _glXCreateGLXPixmapMESA_sig = {2771, "glXCreateGLXPixmapMESA", 4, _glXCreateGLXPixmapMESA_args}; static const char * _glXReleaseBuffersMESA_args[2] = {"dpy", "drawable"}; -static const trace::FunctionSig _glXReleaseBuffersMESA_sig = {2769, "glXReleaseBuffersMESA", 2, _glXReleaseBuffersMESA_args}; +static const trace::FunctionSig _glXReleaseBuffersMESA_sig = {2772, "glXReleaseBuffersMESA", 2, _glXReleaseBuffersMESA_args}; static const char * _glXSet3DfxModeMESA_args[1] = {"mode"}; -static const trace::FunctionSig _glXSet3DfxModeMESA_sig = {2770, "glXSet3DfxModeMESA", 1, _glXSet3DfxModeMESA_args}; +static const trace::FunctionSig _glXSet3DfxModeMESA_sig = {2773, "glXSet3DfxModeMESA", 1, _glXSet3DfxModeMESA_args}; static const char * _glXSwapIntervalMESA_args[1] = {"interval"}; -static const trace::FunctionSig _glXSwapIntervalMESA_sig = {2771, "glXSwapIntervalMESA", 1, _glXSwapIntervalMESA_args}; +static const trace::FunctionSig _glXSwapIntervalMESA_sig = {2774, "glXSwapIntervalMESA", 1, _glXSwapIntervalMESA_args}; static const char ** _glXGetSwapIntervalMESA_args = NULL; -static const trace::FunctionSig _glXGetSwapIntervalMESA_sig = {2772, "glXGetSwapIntervalMESA", 0, _glXGetSwapIntervalMESA_args}; +static const trace::FunctionSig _glXGetSwapIntervalMESA_sig = {2775, "glXGetSwapIntervalMESA", 0, _glXGetSwapIntervalMESA_args}; static const char * _glXGetSyncValuesOML_args[5] = {"dpy", "drawable", "ust", "msc", "sbc"}; -static const trace::FunctionSig _glXGetSyncValuesOML_sig = {2773, "glXGetSyncValuesOML", 5, _glXGetSyncValuesOML_args}; +static const trace::FunctionSig _glXGetSyncValuesOML_sig = {2776, "glXGetSyncValuesOML", 5, _glXGetSyncValuesOML_args}; static const char * _glXGetMscRateOML_args[4] = {"dpy", "drawable", "numerator", "denominator"}; -static const trace::FunctionSig _glXGetMscRateOML_sig = {2774, "glXGetMscRateOML", 4, _glXGetMscRateOML_args}; +static const trace::FunctionSig _glXGetMscRateOML_sig = {2777, "glXGetMscRateOML", 4, _glXGetMscRateOML_args}; static const char * _glXSwapBuffersMscOML_args[5] = {"dpy", "drawable", "target_msc", "divisor", "remainder"}; -static const trace::FunctionSig _glXSwapBuffersMscOML_sig = {2775, "glXSwapBuffersMscOML", 5, _glXSwapBuffersMscOML_args}; +static const trace::FunctionSig _glXSwapBuffersMscOML_sig = {2778, "glXSwapBuffersMscOML", 5, _glXSwapBuffersMscOML_args}; static const char * _glXWaitForMscOML_args[8] = {"dpy", "drawable", "target_msc", "divisor", "remainder", "ust", "msc", "sbc"}; -static const trace::FunctionSig _glXWaitForMscOML_sig = {2776, "glXWaitForMscOML", 8, _glXWaitForMscOML_args}; +static const trace::FunctionSig _glXWaitForMscOML_sig = {2779, "glXWaitForMscOML", 8, _glXWaitForMscOML_args}; static const char * _glXWaitForSbcOML_args[6] = {"dpy", "drawable", "target_sbc", "ust", "msc", "sbc"}; -static const trace::FunctionSig _glXWaitForSbcOML_sig = {2777, "glXWaitForSbcOML", 6, _glXWaitForSbcOML_args}; +static const trace::FunctionSig _glXWaitForSbcOML_sig = {2780, "glXWaitForSbcOML", 6, _glXWaitForSbcOML_args}; static const char * _glXGetAGPOffsetMESA_args[1] = {"pointer"}; -static const trace::FunctionSig _glXGetAGPOffsetMESA_sig = {2778, "glXGetAGPOffsetMESA", 1, _glXGetAGPOffsetMESA_args}; +static const trace::FunctionSig _glXGetAGPOffsetMESA_sig = {2781, "glXGetAGPOffsetMESA", 1, _glXGetAGPOffsetMESA_args}; static const char * _glXBindTexImageEXT_args[4] = {"display", "drawable", "buffer", "attrib_list"}; -static const trace::FunctionSig _glXBindTexImageEXT_sig = {2779, "glXBindTexImageEXT", 4, _glXBindTexImageEXT_args}; +static const trace::FunctionSig _glXBindTexImageEXT_sig = {2782, "glXBindTexImageEXT", 4, _glXBindTexImageEXT_args}; static const char * _glXReleaseTexImageEXT_args[3] = {"display", "drawable", "buffer"}; -static const trace::FunctionSig _glXReleaseTexImageEXT_sig = {2780, "glXReleaseTexImageEXT", 3, _glXReleaseTexImageEXT_args}; +static const trace::FunctionSig _glXReleaseTexImageEXT_sig = {2783, "glXReleaseTexImageEXT", 3, _glXReleaseTexImageEXT_args}; static const char * _glXEnumerateVideoDevicesNV_args[3] = {"dpy", "screen", "nelements"}; -static const trace::FunctionSig _glXEnumerateVideoDevicesNV_sig = {2781, "glXEnumerateVideoDevicesNV", 3, _glXEnumerateVideoDevicesNV_args}; +static const trace::FunctionSig _glXEnumerateVideoDevicesNV_sig = {2784, "glXEnumerateVideoDevicesNV", 3, _glXEnumerateVideoDevicesNV_args}; static const char * _glXBindVideoDeviceNV_args[4] = {"dpy", "video_slot", "video_device", "attrib_list"}; -static const trace::FunctionSig _glXBindVideoDeviceNV_sig = {2782, "glXBindVideoDeviceNV", 4, _glXBindVideoDeviceNV_args}; +static const trace::FunctionSig _glXBindVideoDeviceNV_sig = {2785, "glXBindVideoDeviceNV", 4, _glXBindVideoDeviceNV_args}; static const char * _glXGetVideoDeviceNV_args[4] = {"dpy", "screen", "numVideoDevices", "pVideoDevice"}; -static const trace::FunctionSig _glXGetVideoDeviceNV_sig = {2783, "glXGetVideoDeviceNV", 4, _glXGetVideoDeviceNV_args}; +static const trace::FunctionSig _glXGetVideoDeviceNV_sig = {2786, "glXGetVideoDeviceNV", 4, _glXGetVideoDeviceNV_args}; static const char * _glXReleaseVideoDeviceNV_args[3] = {"dpy", "screen", "VideoDevice"}; -static const trace::FunctionSig _glXReleaseVideoDeviceNV_sig = {2784, "glXReleaseVideoDeviceNV", 3, _glXReleaseVideoDeviceNV_args}; +static const trace::FunctionSig _glXReleaseVideoDeviceNV_sig = {2787, "glXReleaseVideoDeviceNV", 3, _glXReleaseVideoDeviceNV_args}; static const char * _glXBindVideoImageNV_args[4] = {"dpy", "VideoDevice", "pbuf", "iVideoBuffer"}; -static const trace::FunctionSig _glXBindVideoImageNV_sig = {2785, "glXBindVideoImageNV", 4, _glXBindVideoImageNV_args}; +static const trace::FunctionSig _glXBindVideoImageNV_sig = {2788, "glXBindVideoImageNV", 4, _glXBindVideoImageNV_args}; static const char * _glXReleaseVideoImageNV_args[2] = {"dpy", "pbuf"}; -static const trace::FunctionSig _glXReleaseVideoImageNV_sig = {2786, "glXReleaseVideoImageNV", 2, _glXReleaseVideoImageNV_args}; +static const trace::FunctionSig _glXReleaseVideoImageNV_sig = {2789, "glXReleaseVideoImageNV", 2, _glXReleaseVideoImageNV_args}; static const char * _glXSendPbufferToVideoNV_args[5] = {"dpy", "pbuf", "iBufferType", "pulCounterPbuffer", "bBlock"}; -static const trace::FunctionSig _glXSendPbufferToVideoNV_sig = {2787, "glXSendPbufferToVideoNV", 5, _glXSendPbufferToVideoNV_args}; +static const trace::FunctionSig _glXSendPbufferToVideoNV_sig = {2790, "glXSendPbufferToVideoNV", 5, _glXSendPbufferToVideoNV_args}; static const char * _glXGetVideoInfoNV_args[5] = {"dpy", "screen", "VideoDevice", "pulCounterOutputPbuffer", "pulCounterOutputVideo"}; -static const trace::FunctionSig _glXGetVideoInfoNV_sig = {2788, "glXGetVideoInfoNV", 5, _glXGetVideoInfoNV_args}; +static const trace::FunctionSig _glXGetVideoInfoNV_sig = {2791, "glXGetVideoInfoNV", 5, _glXGetVideoInfoNV_args}; static const char * _glXJoinSwapGroupNV_args[3] = {"dpy", "drawable", "group"}; -static const trace::FunctionSig _glXJoinSwapGroupNV_sig = {2789, "glXJoinSwapGroupNV", 3, _glXJoinSwapGroupNV_args}; +static const trace::FunctionSig _glXJoinSwapGroupNV_sig = {2792, "glXJoinSwapGroupNV", 3, _glXJoinSwapGroupNV_args}; static const char * _glXBindSwapBarrierNV_args[3] = {"dpy", "group", "barrier"}; -static const trace::FunctionSig _glXBindSwapBarrierNV_sig = {2790, "glXBindSwapBarrierNV", 3, _glXBindSwapBarrierNV_args}; +static const trace::FunctionSig _glXBindSwapBarrierNV_sig = {2793, "glXBindSwapBarrierNV", 3, _glXBindSwapBarrierNV_args}; static const char * _glXQuerySwapGroupNV_args[4] = {"dpy", "drawable", "group", "barrier"}; -static const trace::FunctionSig _glXQuerySwapGroupNV_sig = {2791, "glXQuerySwapGroupNV", 4, _glXQuerySwapGroupNV_args}; +static const trace::FunctionSig _glXQuerySwapGroupNV_sig = {2794, "glXQuerySwapGroupNV", 4, _glXQuerySwapGroupNV_args}; static const char * _glXQueryMaxSwapGroupsNV_args[4] = {"dpy", "screen", "maxGroups", "maxBarriers"}; -static const trace::FunctionSig _glXQueryMaxSwapGroupsNV_sig = {2792, "glXQueryMaxSwapGroupsNV", 4, _glXQueryMaxSwapGroupsNV_args}; +static const trace::FunctionSig _glXQueryMaxSwapGroupsNV_sig = {2795, "glXQueryMaxSwapGroupsNV", 4, _glXQueryMaxSwapGroupsNV_args}; static const char * _glXQueryFrameCountNV_args[3] = {"dpy", "screen", "count"}; -static const trace::FunctionSig _glXQueryFrameCountNV_sig = {2793, "glXQueryFrameCountNV", 3, _glXQueryFrameCountNV_args}; +static const trace::FunctionSig _glXQueryFrameCountNV_sig = {2796, "glXQueryFrameCountNV", 3, _glXQueryFrameCountNV_args}; static const char * _glXResetFrameCountNV_args[2] = {"dpy", "screen"}; -static const trace::FunctionSig _glXResetFrameCountNV_sig = {2794, "glXResetFrameCountNV", 2, _glXResetFrameCountNV_args}; +static const trace::FunctionSig _glXResetFrameCountNV_sig = {2797, "glXResetFrameCountNV", 2, _glXResetFrameCountNV_args}; static const char * _glXBindVideoCaptureDeviceNV_args[3] = {"dpy", "video_capture_slot", "device"}; -static const trace::FunctionSig _glXBindVideoCaptureDeviceNV_sig = {2795, "glXBindVideoCaptureDeviceNV", 3, _glXBindVideoCaptureDeviceNV_args}; +static const trace::FunctionSig _glXBindVideoCaptureDeviceNV_sig = {2798, "glXBindVideoCaptureDeviceNV", 3, _glXBindVideoCaptureDeviceNV_args}; static const char * _glXEnumerateVideoCaptureDevicesNV_args[3] = {"dpy", "screen", "nelements"}; -static const trace::FunctionSig _glXEnumerateVideoCaptureDevicesNV_sig = {2796, "glXEnumerateVideoCaptureDevicesNV", 3, _glXEnumerateVideoCaptureDevicesNV_args}; +static const trace::FunctionSig _glXEnumerateVideoCaptureDevicesNV_sig = {2799, "glXEnumerateVideoCaptureDevicesNV", 3, _glXEnumerateVideoCaptureDevicesNV_args}; static const char * _glXLockVideoCaptureDeviceNV_args[2] = {"dpy", "device"}; -static const trace::FunctionSig _glXLockVideoCaptureDeviceNV_sig = {2797, "glXLockVideoCaptureDeviceNV", 2, _glXLockVideoCaptureDeviceNV_args}; +static const trace::FunctionSig _glXLockVideoCaptureDeviceNV_sig = {2800, "glXLockVideoCaptureDeviceNV", 2, _glXLockVideoCaptureDeviceNV_args}; static const char * _glXQueryVideoCaptureDeviceNV_args[4] = {"dpy", "device", "attribute", "value"}; -static const trace::FunctionSig _glXQueryVideoCaptureDeviceNV_sig = {2798, "glXQueryVideoCaptureDeviceNV", 4, _glXQueryVideoCaptureDeviceNV_args}; +static const trace::FunctionSig _glXQueryVideoCaptureDeviceNV_sig = {2801, "glXQueryVideoCaptureDeviceNV", 4, _glXQueryVideoCaptureDeviceNV_args}; static const char * _glXReleaseVideoCaptureDeviceNV_args[2] = {"dpy", "device"}; -static const trace::FunctionSig _glXReleaseVideoCaptureDeviceNV_sig = {2799, "glXReleaseVideoCaptureDeviceNV", 2, _glXReleaseVideoCaptureDeviceNV_args}; +static const trace::FunctionSig _glXReleaseVideoCaptureDeviceNV_sig = {2802, "glXReleaseVideoCaptureDeviceNV", 2, _glXReleaseVideoCaptureDeviceNV_args}; static const char * _glXSwapIntervalEXT_args[3] = {"dpy", "drawable", "interval"}; -static const trace::FunctionSig _glXSwapIntervalEXT_sig = {2800, "glXSwapIntervalEXT", 3, _glXSwapIntervalEXT_args}; +static const trace::FunctionSig _glXSwapIntervalEXT_sig = {2803, "glXSwapIntervalEXT", 3, _glXSwapIntervalEXT_args}; static const char * _glXCopyImageSubDataNV_args[18] = {"dpy", "srcCtx", "srcName", "srcTarget", "srcLevel", "srcX", "srcY", "srcZ", "dstCtx", "dstName", "dstTarget", "dstLevel", "dstX", "dstY", "dstZ", "width", "height", "depth"}; -static const trace::FunctionSig _glXCopyImageSubDataNV_sig = {2801, "glXCopyImageSubDataNV", 18, _glXCopyImageSubDataNV_args}; +static const trace::FunctionSig _glXCopyImageSubDataNV_sig = {2804, "glXCopyImageSubDataNV", 18, _glXCopyImageSubDataNV_args}; static const char * _glXAllocateMemoryNV_args[4] = {"size", "readfreq", "writefreq", "priority"}; -static const trace::FunctionSig _glXAllocateMemoryNV_sig = {2802, "glXAllocateMemoryNV", 4, _glXAllocateMemoryNV_args}; +static const trace::FunctionSig _glXAllocateMemoryNV_sig = {2805, "glXAllocateMemoryNV", 4, _glXAllocateMemoryNV_args}; static const char * _glXFreeMemoryNV_args[1] = {"pointer"}; -static const trace::FunctionSig _glXFreeMemoryNV_sig = {2803, "glXFreeMemoryNV", 1, _glXFreeMemoryNV_args}; +static const trace::FunctionSig _glXFreeMemoryNV_sig = {2806, "glXFreeMemoryNV", 1, _glXFreeMemoryNV_args}; static const char * _glXGetProcAddressARB_args[1] = {"procName"}; -static const trace::FunctionSig _glXGetProcAddressARB_sig = {2804, "glXGetProcAddressARB", 1, _glXGetProcAddressARB_args}; +static const trace::FunctionSig _glXGetProcAddressARB_sig = {2807, "glXGetProcAddressARB", 1, _glXGetProcAddressARB_args}; static const char * _glXGetProcAddress_args[1] = {"procName"}; -static const trace::FunctionSig _glXGetProcAddress_sig = {2805, "glXGetProcAddress", 1, _glXGetProcAddress_args}; +static const trace::FunctionSig _glXGetProcAddress_sig = {2808, "glXGetProcAddress", 1, _glXGetProcAddress_args}; #endif // REGAL_SYS_GLX #if REGAL_SYS_WGL static const char * _wglCreateContext_args[1] = {"hdc"}; -static const trace::FunctionSig _wglCreateContext_sig = {2806, "wglCreateContext", 1, _wglCreateContext_args}; +static const trace::FunctionSig _wglCreateContext_sig = {2809, "wglCreateContext", 1, _wglCreateContext_args}; static const char * _wglDeleteContext_args[1] = {"hglrc"}; -static const trace::FunctionSig _wglDeleteContext_sig = {2807, "wglDeleteContext", 1, _wglDeleteContext_args}; +static const trace::FunctionSig _wglDeleteContext_sig = {2810, "wglDeleteContext", 1, _wglDeleteContext_args}; static const char ** _wglGetCurrentContext_args = NULL; -static const trace::FunctionSig _wglGetCurrentContext_sig = {2808, "wglGetCurrentContext", 0, _wglGetCurrentContext_args}; +static const trace::FunctionSig _wglGetCurrentContext_sig = {2811, "wglGetCurrentContext", 0, _wglGetCurrentContext_args}; static const char * _wglMakeCurrent_args[2] = {"hdc", "hglrc"}; -static const trace::FunctionSig _wglMakeCurrent_sig = {2809, "wglMakeCurrent", 2, _wglMakeCurrent_args}; +static const trace::FunctionSig _wglMakeCurrent_sig = {2812, "wglMakeCurrent", 2, _wglMakeCurrent_args}; static const char * _wglCopyContext_args[3] = {"hglrcSrc", "hglrcDst", "mask"}; -static const trace::FunctionSig _wglCopyContext_sig = {2810, "wglCopyContext", 3, _wglCopyContext_args}; +static const trace::FunctionSig _wglCopyContext_sig = {2813, "wglCopyContext", 3, _wglCopyContext_args}; static const char * _wglChoosePixelFormat_args[2] = {"hdc", "ppfd"}; -static const trace::FunctionSig _wglChoosePixelFormat_sig = {2811, "wglChoosePixelFormat", 2, _wglChoosePixelFormat_args}; +static const trace::FunctionSig _wglChoosePixelFormat_sig = {2814, "wglChoosePixelFormat", 2, _wglChoosePixelFormat_args}; static const char * _wglDescribePixelFormat_args[4] = {"hdc", "iPixelFormat", "nBytes", "ppfd"}; -static const trace::FunctionSig _wglDescribePixelFormat_sig = {2812, "wglDescribePixelFormat", 4, _wglDescribePixelFormat_args}; +static const trace::FunctionSig _wglDescribePixelFormat_sig = {2815, "wglDescribePixelFormat", 4, _wglDescribePixelFormat_args}; static const char ** _wglGetCurrentDC_args = NULL; -static const trace::FunctionSig _wglGetCurrentDC_sig = {2813, "wglGetCurrentDC", 0, _wglGetCurrentDC_args}; +static const trace::FunctionSig _wglGetCurrentDC_sig = {2816, "wglGetCurrentDC", 0, _wglGetCurrentDC_args}; static const char * _wglGetDefaultProcAddress_args[1] = {"lpszProc"}; -static const trace::FunctionSig _wglGetDefaultProcAddress_sig = {2814, "wglGetDefaultProcAddress", 1, _wglGetDefaultProcAddress_args}; +static const trace::FunctionSig _wglGetDefaultProcAddress_sig = {2817, "wglGetDefaultProcAddress", 1, _wglGetDefaultProcAddress_args}; static const char * _wglGetPixelFormat_args[1] = {"hdc"}; -static const trace::FunctionSig _wglGetPixelFormat_sig = {2815, "wglGetPixelFormat", 1, _wglGetPixelFormat_args}; +static const trace::FunctionSig _wglGetPixelFormat_sig = {2818, "wglGetPixelFormat", 1, _wglGetPixelFormat_args}; static const char * _wglSetPixelFormat_args[3] = {"hdc", "iPixelFormat", "ppfd"}; -static const trace::FunctionSig _wglSetPixelFormat_sig = {2816, "wglSetPixelFormat", 3, _wglSetPixelFormat_args}; +static const trace::FunctionSig _wglSetPixelFormat_sig = {2819, "wglSetPixelFormat", 3, _wglSetPixelFormat_args}; static const char * _wglSwapBuffers_args[1] = {"hdc"}; -static const trace::FunctionSig _wglSwapBuffers_sig = {2817, "wglSwapBuffers", 1, _wglSwapBuffers_args}; +static const trace::FunctionSig _wglSwapBuffers_sig = {2820, "wglSwapBuffers", 1, _wglSwapBuffers_args}; static const char * _wglShareLists_args[2] = {"hglrc1", "hglrc2"}; -static const trace::FunctionSig _wglShareLists_sig = {2818, "wglShareLists", 2, _wglShareLists_args}; +static const trace::FunctionSig _wglShareLists_sig = {2821, "wglShareLists", 2, _wglShareLists_args}; static const char * _wglCreateLayerContext_args[2] = {"hdc", "iLayerPlane"}; -static const trace::FunctionSig _wglCreateLayerContext_sig = {2819, "wglCreateLayerContext", 2, _wglCreateLayerContext_args}; +static const trace::FunctionSig _wglCreateLayerContext_sig = {2822, "wglCreateLayerContext", 2, _wglCreateLayerContext_args}; static const char * _wglDescribeLayerPlane_args[5] = {"hdc", "iPixelFormat", "iLayerPlane", "nBytes", "plpd"}; -static const trace::FunctionSig _wglDescribeLayerPlane_sig = {2820, "wglDescribeLayerPlane", 5, _wglDescribeLayerPlane_args}; +static const trace::FunctionSig _wglDescribeLayerPlane_sig = {2823, "wglDescribeLayerPlane", 5, _wglDescribeLayerPlane_args}; static const char * _wglSetLayerPaletteEntries_args[5] = {"hdc", "iLayerPlane", "iStart", "cEntries", "pcr"}; -static const trace::FunctionSig _wglSetLayerPaletteEntries_sig = {2821, "wglSetLayerPaletteEntries", 5, _wglSetLayerPaletteEntries_args}; +static const trace::FunctionSig _wglSetLayerPaletteEntries_sig = {2824, "wglSetLayerPaletteEntries", 5, _wglSetLayerPaletteEntries_args}; static const char * _wglGetLayerPaletteEntries_args[5] = {"hdc", "iLayerPlane", "iStart", "cEntries", "pcr"}; -static const trace::FunctionSig _wglGetLayerPaletteEntries_sig = {2822, "wglGetLayerPaletteEntries", 5, _wglGetLayerPaletteEntries_args}; +static const trace::FunctionSig _wglGetLayerPaletteEntries_sig = {2825, "wglGetLayerPaletteEntries", 5, _wglGetLayerPaletteEntries_args}; static const char * _wglRealizeLayerPalette_args[3] = {"hdc", "iLayerPlane", "bRealize"}; -static const trace::FunctionSig _wglRealizeLayerPalette_sig = {2823, "wglRealizeLayerPalette", 3, _wglRealizeLayerPalette_args}; +static const trace::FunctionSig _wglRealizeLayerPalette_sig = {2826, "wglRealizeLayerPalette", 3, _wglRealizeLayerPalette_args}; static const char * _wglSwapLayerBuffers_args[2] = {"hdc", "fuPlanes"}; -static const trace::FunctionSig _wglSwapLayerBuffers_sig = {2824, "wglSwapLayerBuffers", 2, _wglSwapLayerBuffers_args}; +static const trace::FunctionSig _wglSwapLayerBuffers_sig = {2827, "wglSwapLayerBuffers", 2, _wglSwapLayerBuffers_args}; static const char * _wglUseFontBitmapsA_args[4] = {"hdc", "first", "count", "listBase"}; -static const trace::FunctionSig _wglUseFontBitmapsA_sig = {2825, "wglUseFontBitmapsA", 4, _wglUseFontBitmapsA_args}; +static const trace::FunctionSig _wglUseFontBitmapsA_sig = {2828, "wglUseFontBitmapsA", 4, _wglUseFontBitmapsA_args}; static const char * _wglUseFontBitmapsW_args[4] = {"hdc", "first", "count", "listBase"}; -static const trace::FunctionSig _wglUseFontBitmapsW_sig = {2826, "wglUseFontBitmapsW", 4, _wglUseFontBitmapsW_args}; +static const trace::FunctionSig _wglUseFontBitmapsW_sig = {2829, "wglUseFontBitmapsW", 4, _wglUseFontBitmapsW_args}; static const char * _wglSwapMultipleBuffers_args[2] = {"n", "ps"}; -static const trace::FunctionSig _wglSwapMultipleBuffers_sig = {2827, "wglSwapMultipleBuffers", 2, _wglSwapMultipleBuffers_args}; +static const trace::FunctionSig _wglSwapMultipleBuffers_sig = {2830, "wglSwapMultipleBuffers", 2, _wglSwapMultipleBuffers_args}; static const char * _wglUseFontOutlinesA_args[8] = {"hdc", "first", "count", "listBase", "deviation", "extrusion", "format", "lpgmf"}; -static const trace::FunctionSig _wglUseFontOutlinesA_sig = {2828, "wglUseFontOutlinesA", 8, _wglUseFontOutlinesA_args}; +static const trace::FunctionSig _wglUseFontOutlinesA_sig = {2831, "wglUseFontOutlinesA", 8, _wglUseFontOutlinesA_args}; static const char * _wglUseFontOutlinesW_args[8] = {"hdc", "first", "count", "listBase", "deviation", "extrusion", "format", "lpgmf"}; -static const trace::FunctionSig _wglUseFontOutlinesW_sig = {2829, "wglUseFontOutlinesW", 8, _wglUseFontOutlinesW_args}; +static const trace::FunctionSig _wglUseFontOutlinesW_sig = {2832, "wglUseFontOutlinesW", 8, _wglUseFontOutlinesW_args}; static const char * _wglCreateBufferRegionARB_args[3] = {"hDC", "iLayerPlane", "uType"}; -static const trace::FunctionSig _wglCreateBufferRegionARB_sig = {2830, "wglCreateBufferRegionARB", 3, _wglCreateBufferRegionARB_args}; +static const trace::FunctionSig _wglCreateBufferRegionARB_sig = {2833, "wglCreateBufferRegionARB", 3, _wglCreateBufferRegionARB_args}; static const char * _wglDeleteBufferRegionARB_args[1] = {"hRegion"}; -static const trace::FunctionSig _wglDeleteBufferRegionARB_sig = {2831, "wglDeleteBufferRegionARB", 1, _wglDeleteBufferRegionARB_args}; +static const trace::FunctionSig _wglDeleteBufferRegionARB_sig = {2834, "wglDeleteBufferRegionARB", 1, _wglDeleteBufferRegionARB_args}; static const char * _wglSaveBufferRegionARB_args[5] = {"hRegion", "x", "y", "width", "height"}; -static const trace::FunctionSig _wglSaveBufferRegionARB_sig = {2832, "wglSaveBufferRegionARB", 5, _wglSaveBufferRegionARB_args}; +static const trace::FunctionSig _wglSaveBufferRegionARB_sig = {2835, "wglSaveBufferRegionARB", 5, _wglSaveBufferRegionARB_args}; static const char * _wglRestoreBufferRegionARB_args[7] = {"hRegion", "x", "y", "width", "height", "xSrc", "ySrc"}; -static const trace::FunctionSig _wglRestoreBufferRegionARB_sig = {2833, "wglRestoreBufferRegionARB", 7, _wglRestoreBufferRegionARB_args}; +static const trace::FunctionSig _wglRestoreBufferRegionARB_sig = {2836, "wglRestoreBufferRegionARB", 7, _wglRestoreBufferRegionARB_args}; static const char * _wglGetExtensionsStringARB_args[1] = {"hdc"}; -static const trace::FunctionSig _wglGetExtensionsStringARB_sig = {2834, "wglGetExtensionsStringARB", 1, _wglGetExtensionsStringARB_args}; +static const trace::FunctionSig _wglGetExtensionsStringARB_sig = {2837, "wglGetExtensionsStringARB", 1, _wglGetExtensionsStringARB_args}; static const char * _wglGetPixelFormatAttribivARB_args[6] = {"hdc", "iPixelFormat", "iLayerPlane", "nAttributes", "piAttributes", "piValues"}; -static const trace::FunctionSig _wglGetPixelFormatAttribivARB_sig = {2835, "wglGetPixelFormatAttribivARB", 6, _wglGetPixelFormatAttribivARB_args}; +static const trace::FunctionSig _wglGetPixelFormatAttribivARB_sig = {2838, "wglGetPixelFormatAttribivARB", 6, _wglGetPixelFormatAttribivARB_args}; static const char * _wglGetPixelFormatAttribfvARB_args[6] = {"hdc", "iPixelFormat", "iLayerPlane", "nAttributes", "piAttributes", "pfValues"}; -static const trace::FunctionSig _wglGetPixelFormatAttribfvARB_sig = {2836, "wglGetPixelFormatAttribfvARB", 6, _wglGetPixelFormatAttribfvARB_args}; +static const trace::FunctionSig _wglGetPixelFormatAttribfvARB_sig = {2839, "wglGetPixelFormatAttribfvARB", 6, _wglGetPixelFormatAttribfvARB_args}; static const char * _wglChoosePixelFormatARB_args[6] = {"hdc", "piAttribIList", "pfAttribFList", "nMaxFormats", "piFormats", "nNumFormats"}; -static const trace::FunctionSig _wglChoosePixelFormatARB_sig = {2837, "wglChoosePixelFormatARB", 6, _wglChoosePixelFormatARB_args}; +static const trace::FunctionSig _wglChoosePixelFormatARB_sig = {2840, "wglChoosePixelFormatARB", 6, _wglChoosePixelFormatARB_args}; static const char * _wglMakeContextCurrentARB_args[3] = {"hDrawDC", "hReadDC", "hglrc"}; -static const trace::FunctionSig _wglMakeContextCurrentARB_sig = {2838, "wglMakeContextCurrentARB", 3, _wglMakeContextCurrentARB_args}; +static const trace::FunctionSig _wglMakeContextCurrentARB_sig = {2841, "wglMakeContextCurrentARB", 3, _wglMakeContextCurrentARB_args}; static const char ** _wglGetCurrentReadDCARB_args = NULL; -static const trace::FunctionSig _wglGetCurrentReadDCARB_sig = {2839, "wglGetCurrentReadDCARB", 0, _wglGetCurrentReadDCARB_args}; +static const trace::FunctionSig _wglGetCurrentReadDCARB_sig = {2842, "wglGetCurrentReadDCARB", 0, _wglGetCurrentReadDCARB_args}; static const char * _wglCreatePbufferARB_args[5] = {"hDC", "iPixelFormat", "iWidth", "iHeight", "piAttribList"}; -static const trace::FunctionSig _wglCreatePbufferARB_sig = {2840, "wglCreatePbufferARB", 5, _wglCreatePbufferARB_args}; +static const trace::FunctionSig _wglCreatePbufferARB_sig = {2843, "wglCreatePbufferARB", 5, _wglCreatePbufferARB_args}; static const char * _wglGetPbufferDCARB_args[1] = {"hPbuffer"}; -static const trace::FunctionSig _wglGetPbufferDCARB_sig = {2841, "wglGetPbufferDCARB", 1, _wglGetPbufferDCARB_args}; +static const trace::FunctionSig _wglGetPbufferDCARB_sig = {2844, "wglGetPbufferDCARB", 1, _wglGetPbufferDCARB_args}; static const char * _wglReleasePbufferDCARB_args[2] = {"hPbuffer", "hDC"}; -static const trace::FunctionSig _wglReleasePbufferDCARB_sig = {2842, "wglReleasePbufferDCARB", 2, _wglReleasePbufferDCARB_args}; +static const trace::FunctionSig _wglReleasePbufferDCARB_sig = {2845, "wglReleasePbufferDCARB", 2, _wglReleasePbufferDCARB_args}; static const char * _wglDestroyPbufferARB_args[1] = {"hPbuffer"}; -static const trace::FunctionSig _wglDestroyPbufferARB_sig = {2843, "wglDestroyPbufferARB", 1, _wglDestroyPbufferARB_args}; +static const trace::FunctionSig _wglDestroyPbufferARB_sig = {2846, "wglDestroyPbufferARB", 1, _wglDestroyPbufferARB_args}; static const char * _wglQueryPbufferARB_args[3] = {"hPbuffer", "iAttribute", "piValue"}; -static const trace::FunctionSig _wglQueryPbufferARB_sig = {2844, "wglQueryPbufferARB", 3, _wglQueryPbufferARB_args}; +static const trace::FunctionSig _wglQueryPbufferARB_sig = {2847, "wglQueryPbufferARB", 3, _wglQueryPbufferARB_args}; static const char * _wglBindTexImageARB_args[2] = {"hPbuffer", "iBuffer"}; -static const trace::FunctionSig _wglBindTexImageARB_sig = {2845, "wglBindTexImageARB", 2, _wglBindTexImageARB_args}; +static const trace::FunctionSig _wglBindTexImageARB_sig = {2848, "wglBindTexImageARB", 2, _wglBindTexImageARB_args}; static const char * _wglReleaseTexImageARB_args[2] = {"hPbuffer", "iBuffer"}; -static const trace::FunctionSig _wglReleaseTexImageARB_sig = {2846, "wglReleaseTexImageARB", 2, _wglReleaseTexImageARB_args}; +static const trace::FunctionSig _wglReleaseTexImageARB_sig = {2849, "wglReleaseTexImageARB", 2, _wglReleaseTexImageARB_args}; static const char * _wglSetPbufferAttribARB_args[2] = {"hPbuffer", "piAttribList"}; -static const trace::FunctionSig _wglSetPbufferAttribARB_sig = {2847, "wglSetPbufferAttribARB", 2, _wglSetPbufferAttribARB_args}; +static const trace::FunctionSig _wglSetPbufferAttribARB_sig = {2850, "wglSetPbufferAttribARB", 2, _wglSetPbufferAttribARB_args}; static const char * _wglCreateContextAttribsARB_args[3] = {"hDC", "hShareContext", "attribList"}; -static const trace::FunctionSig _wglCreateContextAttribsARB_sig = {2848, "wglCreateContextAttribsARB", 3, _wglCreateContextAttribsARB_args}; +static const trace::FunctionSig _wglCreateContextAttribsARB_sig = {2851, "wglCreateContextAttribsARB", 3, _wglCreateContextAttribsARB_args}; static const char * _wglCreateDisplayColorTableEXT_args[1] = {"id"}; -static const trace::FunctionSig _wglCreateDisplayColorTableEXT_sig = {2849, "wglCreateDisplayColorTableEXT", 1, _wglCreateDisplayColorTableEXT_args}; +static const trace::FunctionSig _wglCreateDisplayColorTableEXT_sig = {2852, "wglCreateDisplayColorTableEXT", 1, _wglCreateDisplayColorTableEXT_args}; static const char * _wglLoadDisplayColorTableEXT_args[2] = {"table", "length"}; -static const trace::FunctionSig _wglLoadDisplayColorTableEXT_sig = {2850, "wglLoadDisplayColorTableEXT", 2, _wglLoadDisplayColorTableEXT_args}; +static const trace::FunctionSig _wglLoadDisplayColorTableEXT_sig = {2853, "wglLoadDisplayColorTableEXT", 2, _wglLoadDisplayColorTableEXT_args}; static const char * _wglBindDisplayColorTableEXT_args[1] = {"id"}; -static const trace::FunctionSig _wglBindDisplayColorTableEXT_sig = {2851, "wglBindDisplayColorTableEXT", 1, _wglBindDisplayColorTableEXT_args}; +static const trace::FunctionSig _wglBindDisplayColorTableEXT_sig = {2854, "wglBindDisplayColorTableEXT", 1, _wglBindDisplayColorTableEXT_args}; static const char * _wglDestroyDisplayColorTableEXT_args[1] = {"id"}; -static const trace::FunctionSig _wglDestroyDisplayColorTableEXT_sig = {2852, "wglDestroyDisplayColorTableEXT", 1, _wglDestroyDisplayColorTableEXT_args}; +static const trace::FunctionSig _wglDestroyDisplayColorTableEXT_sig = {2855, "wglDestroyDisplayColorTableEXT", 1, _wglDestroyDisplayColorTableEXT_args}; static const char ** _wglGetExtensionsStringEXT_args = NULL; -static const trace::FunctionSig _wglGetExtensionsStringEXT_sig = {2853, "wglGetExtensionsStringEXT", 0, _wglGetExtensionsStringEXT_args}; +static const trace::FunctionSig _wglGetExtensionsStringEXT_sig = {2856, "wglGetExtensionsStringEXT", 0, _wglGetExtensionsStringEXT_args}; static const char * _wglMakeContextCurrentEXT_args[3] = {"hDrawDC", "hReadDC", "hglrc"}; -static const trace::FunctionSig _wglMakeContextCurrentEXT_sig = {2854, "wglMakeContextCurrentEXT", 3, _wglMakeContextCurrentEXT_args}; +static const trace::FunctionSig _wglMakeContextCurrentEXT_sig = {2857, "wglMakeContextCurrentEXT", 3, _wglMakeContextCurrentEXT_args}; static const char ** _wglGetCurrentReadDCEXT_args = NULL; -static const trace::FunctionSig _wglGetCurrentReadDCEXT_sig = {2855, "wglGetCurrentReadDCEXT", 0, _wglGetCurrentReadDCEXT_args}; +static const trace::FunctionSig _wglGetCurrentReadDCEXT_sig = {2858, "wglGetCurrentReadDCEXT", 0, _wglGetCurrentReadDCEXT_args}; static const char * _wglCreatePbufferEXT_args[5] = {"hDC", "iPixelFormat", "iWidth", "iHeight", "piAttribList"}; -static const trace::FunctionSig _wglCreatePbufferEXT_sig = {2856, "wglCreatePbufferEXT", 5, _wglCreatePbufferEXT_args}; +static const trace::FunctionSig _wglCreatePbufferEXT_sig = {2859, "wglCreatePbufferEXT", 5, _wglCreatePbufferEXT_args}; static const char * _wglGetPbufferDCEXT_args[1] = {"hPbuffer"}; -static const trace::FunctionSig _wglGetPbufferDCEXT_sig = {2857, "wglGetPbufferDCEXT", 1, _wglGetPbufferDCEXT_args}; +static const trace::FunctionSig _wglGetPbufferDCEXT_sig = {2860, "wglGetPbufferDCEXT", 1, _wglGetPbufferDCEXT_args}; static const char * _wglReleasePbufferDCEXT_args[2] = {"hPbuffer", "hDC"}; -static const trace::FunctionSig _wglReleasePbufferDCEXT_sig = {2858, "wglReleasePbufferDCEXT", 2, _wglReleasePbufferDCEXT_args}; +static const trace::FunctionSig _wglReleasePbufferDCEXT_sig = {2861, "wglReleasePbufferDCEXT", 2, _wglReleasePbufferDCEXT_args}; static const char * _wglDestroyPbufferEXT_args[1] = {"hPbuffer"}; -static const trace::FunctionSig _wglDestroyPbufferEXT_sig = {2859, "wglDestroyPbufferEXT", 1, _wglDestroyPbufferEXT_args}; +static const trace::FunctionSig _wglDestroyPbufferEXT_sig = {2862, "wglDestroyPbufferEXT", 1, _wglDestroyPbufferEXT_args}; static const char * _wglQueryPbufferEXT_args[3] = {"hPbuffer", "iAttribute", "piValue"}; -static const trace::FunctionSig _wglQueryPbufferEXT_sig = {2860, "wglQueryPbufferEXT", 3, _wglQueryPbufferEXT_args}; +static const trace::FunctionSig _wglQueryPbufferEXT_sig = {2863, "wglQueryPbufferEXT", 3, _wglQueryPbufferEXT_args}; static const char * _wglGetPixelFormatAttribivEXT_args[6] = {"hdc", "iPixelFormat", "iLayerPlane", "nAttributes", "piAttributes", "piValues"}; -static const trace::FunctionSig _wglGetPixelFormatAttribivEXT_sig = {2861, "wglGetPixelFormatAttribivEXT", 6, _wglGetPixelFormatAttribivEXT_args}; +static const trace::FunctionSig _wglGetPixelFormatAttribivEXT_sig = {2864, "wglGetPixelFormatAttribivEXT", 6, _wglGetPixelFormatAttribivEXT_args}; static const char * _wglGetPixelFormatAttribfvEXT_args[6] = {"hdc", "iPixelFormat", "iLayerPlane", "nAttributes", "piAttributes", "pfValues"}; -static const trace::FunctionSig _wglGetPixelFormatAttribfvEXT_sig = {2862, "wglGetPixelFormatAttribfvEXT", 6, _wglGetPixelFormatAttribfvEXT_args}; +static const trace::FunctionSig _wglGetPixelFormatAttribfvEXT_sig = {2865, "wglGetPixelFormatAttribfvEXT", 6, _wglGetPixelFormatAttribfvEXT_args}; static const char * _wglChoosePixelFormatEXT_args[6] = {"hdc", "piAttribIList", "pfAttribFList", "nMaxFormats", "piFormats", "nNumFormats"}; -static const trace::FunctionSig _wglChoosePixelFormatEXT_sig = {2863, "wglChoosePixelFormatEXT", 6, _wglChoosePixelFormatEXT_args}; +static const trace::FunctionSig _wglChoosePixelFormatEXT_sig = {2866, "wglChoosePixelFormatEXT", 6, _wglChoosePixelFormatEXT_args}; static const char * _wglSwapIntervalEXT_args[1] = {"interval"}; -static const trace::FunctionSig _wglSwapIntervalEXT_sig = {2864, "wglSwapIntervalEXT", 1, _wglSwapIntervalEXT_args}; +static const trace::FunctionSig _wglSwapIntervalEXT_sig = {2867, "wglSwapIntervalEXT", 1, _wglSwapIntervalEXT_args}; static const char ** _wglGetSwapIntervalEXT_args = NULL; -static const trace::FunctionSig _wglGetSwapIntervalEXT_sig = {2865, "wglGetSwapIntervalEXT", 0, _wglGetSwapIntervalEXT_args}; +static const trace::FunctionSig _wglGetSwapIntervalEXT_sig = {2868, "wglGetSwapIntervalEXT", 0, _wglGetSwapIntervalEXT_args}; static const char * _wglAllocateMemoryNV_args[4] = {"size", "readfreq", "writefreq", "priority"}; -static const trace::FunctionSig _wglAllocateMemoryNV_sig = {2866, "wglAllocateMemoryNV", 4, _wglAllocateMemoryNV_args}; +static const trace::FunctionSig _wglAllocateMemoryNV_sig = {2869, "wglAllocateMemoryNV", 4, _wglAllocateMemoryNV_args}; static const char * _wglFreeMemoryNV_args[1] = {"pointer"}; -static const trace::FunctionSig _wglFreeMemoryNV_sig = {2867, "wglFreeMemoryNV", 1, _wglFreeMemoryNV_args}; +static const trace::FunctionSig _wglFreeMemoryNV_sig = {2870, "wglFreeMemoryNV", 1, _wglFreeMemoryNV_args}; static const char * _wglGetSyncValuesOML_args[4] = {"hdc", "ust", "msc", "sbc"}; -static const trace::FunctionSig _wglGetSyncValuesOML_sig = {2868, "wglGetSyncValuesOML", 4, _wglGetSyncValuesOML_args}; +static const trace::FunctionSig _wglGetSyncValuesOML_sig = {2871, "wglGetSyncValuesOML", 4, _wglGetSyncValuesOML_args}; static const char * _wglGetMscRateOML_args[3] = {"hdc", "numerator", "denominator"}; -static const trace::FunctionSig _wglGetMscRateOML_sig = {2869, "wglGetMscRateOML", 3, _wglGetMscRateOML_args}; +static const trace::FunctionSig _wglGetMscRateOML_sig = {2872, "wglGetMscRateOML", 3, _wglGetMscRateOML_args}; static const char * _wglSwapBuffersMscOML_args[4] = {"hdc", "target_msc", "divisor", "remainder"}; -static const trace::FunctionSig _wglSwapBuffersMscOML_sig = {2870, "wglSwapBuffersMscOML", 4, _wglSwapBuffersMscOML_args}; +static const trace::FunctionSig _wglSwapBuffersMscOML_sig = {2873, "wglSwapBuffersMscOML", 4, _wglSwapBuffersMscOML_args}; static const char * _wglSwapLayerBuffersMscOML_args[5] = {"hdc", "fuPlanes", "target_msc", "divisor", "remainder"}; -static const trace::FunctionSig _wglSwapLayerBuffersMscOML_sig = {2871, "wglSwapLayerBuffersMscOML", 5, _wglSwapLayerBuffersMscOML_args}; +static const trace::FunctionSig _wglSwapLayerBuffersMscOML_sig = {2874, "wglSwapLayerBuffersMscOML", 5, _wglSwapLayerBuffersMscOML_args}; static const char * _wglWaitForMscOML_args[7] = {"hdc", "target_msc", "divisor", "remainder", "ust", "msc", "sbc"}; -static const trace::FunctionSig _wglWaitForMscOML_sig = {2872, "wglWaitForMscOML", 7, _wglWaitForMscOML_args}; +static const trace::FunctionSig _wglWaitForMscOML_sig = {2875, "wglWaitForMscOML", 7, _wglWaitForMscOML_args}; static const char * _wglWaitForSbcOML_args[5] = {"hdc", "target_sbc", "ust", "msc", "sbc"}; -static const trace::FunctionSig _wglWaitForSbcOML_sig = {2873, "wglWaitForSbcOML", 5, _wglWaitForSbcOML_args}; +static const trace::FunctionSig _wglWaitForSbcOML_sig = {2876, "wglWaitForSbcOML", 5, _wglWaitForSbcOML_args}; static const char * _wglGetDigitalVideoParametersI3D_args[3] = {"hDC", "iAttribute", "piValue"}; -static const trace::FunctionSig _wglGetDigitalVideoParametersI3D_sig = {2874, "wglGetDigitalVideoParametersI3D", 3, _wglGetDigitalVideoParametersI3D_args}; +static const trace::FunctionSig _wglGetDigitalVideoParametersI3D_sig = {2877, "wglGetDigitalVideoParametersI3D", 3, _wglGetDigitalVideoParametersI3D_args}; static const char * _wglSetDigitalVideoParametersI3D_args[3] = {"hDC", "iAttribute", "piValue"}; -static const trace::FunctionSig _wglSetDigitalVideoParametersI3D_sig = {2875, "wglSetDigitalVideoParametersI3D", 3, _wglSetDigitalVideoParametersI3D_args}; +static const trace::FunctionSig _wglSetDigitalVideoParametersI3D_sig = {2878, "wglSetDigitalVideoParametersI3D", 3, _wglSetDigitalVideoParametersI3D_args}; static const char * _wglGetGammaTableParametersI3D_args[3] = {"hDC", "iAttribute", "piValue"}; -static const trace::FunctionSig _wglGetGammaTableParametersI3D_sig = {2876, "wglGetGammaTableParametersI3D", 3, _wglGetGammaTableParametersI3D_args}; +static const trace::FunctionSig _wglGetGammaTableParametersI3D_sig = {2879, "wglGetGammaTableParametersI3D", 3, _wglGetGammaTableParametersI3D_args}; static const char * _wglSetGammaTableParametersI3D_args[3] = {"hDC", "iAttribute", "piValue"}; -static const trace::FunctionSig _wglSetGammaTableParametersI3D_sig = {2877, "wglSetGammaTableParametersI3D", 3, _wglSetGammaTableParametersI3D_args}; +static const trace::FunctionSig _wglSetGammaTableParametersI3D_sig = {2880, "wglSetGammaTableParametersI3D", 3, _wglSetGammaTableParametersI3D_args}; static const char * _wglGetGammaTableI3D_args[5] = {"hDC", "iEntries", "puRed", "puGreen", "puBlue"}; -static const trace::FunctionSig _wglGetGammaTableI3D_sig = {2878, "wglGetGammaTableI3D", 5, _wglGetGammaTableI3D_args}; +static const trace::FunctionSig _wglGetGammaTableI3D_sig = {2881, "wglGetGammaTableI3D", 5, _wglGetGammaTableI3D_args}; static const char * _wglSetGammaTableI3D_args[5] = {"hDC", "iEntries", "puRed", "puGreen", "puBlue"}; -static const trace::FunctionSig _wglSetGammaTableI3D_sig = {2879, "wglSetGammaTableI3D", 5, _wglSetGammaTableI3D_args}; +static const trace::FunctionSig _wglSetGammaTableI3D_sig = {2882, "wglSetGammaTableI3D", 5, _wglSetGammaTableI3D_args}; static const char * _wglEnableGenlockI3D_args[1] = {"hDC"}; -static const trace::FunctionSig _wglEnableGenlockI3D_sig = {2880, "wglEnableGenlockI3D", 1, _wglEnableGenlockI3D_args}; +static const trace::FunctionSig _wglEnableGenlockI3D_sig = {2883, "wglEnableGenlockI3D", 1, _wglEnableGenlockI3D_args}; static const char * _wglDisableGenlockI3D_args[1] = {"hDC"}; -static const trace::FunctionSig _wglDisableGenlockI3D_sig = {2881, "wglDisableGenlockI3D", 1, _wglDisableGenlockI3D_args}; +static const trace::FunctionSig _wglDisableGenlockI3D_sig = {2884, "wglDisableGenlockI3D", 1, _wglDisableGenlockI3D_args}; static const char * _wglIsEnabledGenlockI3D_args[2] = {"hDC", "pFlag"}; -static const trace::FunctionSig _wglIsEnabledGenlockI3D_sig = {2882, "wglIsEnabledGenlockI3D", 2, _wglIsEnabledGenlockI3D_args}; +static const trace::FunctionSig _wglIsEnabledGenlockI3D_sig = {2885, "wglIsEnabledGenlockI3D", 2, _wglIsEnabledGenlockI3D_args}; static const char * _wglGenlockSourceI3D_args[2] = {"hDC", "uSource"}; -static const trace::FunctionSig _wglGenlockSourceI3D_sig = {2883, "wglGenlockSourceI3D", 2, _wglGenlockSourceI3D_args}; +static const trace::FunctionSig _wglGenlockSourceI3D_sig = {2886, "wglGenlockSourceI3D", 2, _wglGenlockSourceI3D_args}; static const char * _wglGetGenlockSourceI3D_args[2] = {"hDC", "uSource"}; -static const trace::FunctionSig _wglGetGenlockSourceI3D_sig = {2884, "wglGetGenlockSourceI3D", 2, _wglGetGenlockSourceI3D_args}; +static const trace::FunctionSig _wglGetGenlockSourceI3D_sig = {2887, "wglGetGenlockSourceI3D", 2, _wglGetGenlockSourceI3D_args}; static const char * _wglGenlockSourceEdgeI3D_args[2] = {"hDC", "uEdge"}; -static const trace::FunctionSig _wglGenlockSourceEdgeI3D_sig = {2885, "wglGenlockSourceEdgeI3D", 2, _wglGenlockSourceEdgeI3D_args}; +static const trace::FunctionSig _wglGenlockSourceEdgeI3D_sig = {2888, "wglGenlockSourceEdgeI3D", 2, _wglGenlockSourceEdgeI3D_args}; static const char * _wglGetGenlockSourceEdgeI3D_args[2] = {"hDC", "uEdge"}; -static const trace::FunctionSig _wglGetGenlockSourceEdgeI3D_sig = {2886, "wglGetGenlockSourceEdgeI3D", 2, _wglGetGenlockSourceEdgeI3D_args}; +static const trace::FunctionSig _wglGetGenlockSourceEdgeI3D_sig = {2889, "wglGetGenlockSourceEdgeI3D", 2, _wglGetGenlockSourceEdgeI3D_args}; static const char * _wglGenlockSampleRateI3D_args[2] = {"hDC", "uRate"}; -static const trace::FunctionSig _wglGenlockSampleRateI3D_sig = {2887, "wglGenlockSampleRateI3D", 2, _wglGenlockSampleRateI3D_args}; +static const trace::FunctionSig _wglGenlockSampleRateI3D_sig = {2890, "wglGenlockSampleRateI3D", 2, _wglGenlockSampleRateI3D_args}; static const char * _wglGetGenlockSampleRateI3D_args[2] = {"hDC", "uRate"}; -static const trace::FunctionSig _wglGetGenlockSampleRateI3D_sig = {2888, "wglGetGenlockSampleRateI3D", 2, _wglGetGenlockSampleRateI3D_args}; +static const trace::FunctionSig _wglGetGenlockSampleRateI3D_sig = {2891, "wglGetGenlockSampleRateI3D", 2, _wglGetGenlockSampleRateI3D_args}; static const char * _wglGenlockSourceDelayI3D_args[2] = {"hDC", "uDelay"}; -static const trace::FunctionSig _wglGenlockSourceDelayI3D_sig = {2889, "wglGenlockSourceDelayI3D", 2, _wglGenlockSourceDelayI3D_args}; +static const trace::FunctionSig _wglGenlockSourceDelayI3D_sig = {2892, "wglGenlockSourceDelayI3D", 2, _wglGenlockSourceDelayI3D_args}; static const char * _wglGetGenlockSourceDelayI3D_args[2] = {"hDC", "uDelay"}; -static const trace::FunctionSig _wglGetGenlockSourceDelayI3D_sig = {2890, "wglGetGenlockSourceDelayI3D", 2, _wglGetGenlockSourceDelayI3D_args}; +static const trace::FunctionSig _wglGetGenlockSourceDelayI3D_sig = {2893, "wglGetGenlockSourceDelayI3D", 2, _wglGetGenlockSourceDelayI3D_args}; static const char * _wglQueryGenlockMaxSourceDelayI3D_args[3] = {"hDC", "uMaxLineDelay", "uMaxPixelDelay"}; -static const trace::FunctionSig _wglQueryGenlockMaxSourceDelayI3D_sig = {2891, "wglQueryGenlockMaxSourceDelayI3D", 3, _wglQueryGenlockMaxSourceDelayI3D_args}; +static const trace::FunctionSig _wglQueryGenlockMaxSourceDelayI3D_sig = {2894, "wglQueryGenlockMaxSourceDelayI3D", 3, _wglQueryGenlockMaxSourceDelayI3D_args}; static const char * _wglCreateImageBufferI3D_args[3] = {"hDC", "dwSize", "uFlags"}; -static const trace::FunctionSig _wglCreateImageBufferI3D_sig = {2892, "wglCreateImageBufferI3D", 3, _wglCreateImageBufferI3D_args}; +static const trace::FunctionSig _wglCreateImageBufferI3D_sig = {2895, "wglCreateImageBufferI3D", 3, _wglCreateImageBufferI3D_args}; static const char * _wglDestroyImageBufferI3D_args[2] = {"hDC", "pAddress"}; -static const trace::FunctionSig _wglDestroyImageBufferI3D_sig = {2893, "wglDestroyImageBufferI3D", 2, _wglDestroyImageBufferI3D_args}; +static const trace::FunctionSig _wglDestroyImageBufferI3D_sig = {2896, "wglDestroyImageBufferI3D", 2, _wglDestroyImageBufferI3D_args}; static const char * _wglAssociateImageBufferEventsI3D_args[5] = {"hDC", "pEvent", "pAddress", "pSize", "count"}; -static const trace::FunctionSig _wglAssociateImageBufferEventsI3D_sig = {2894, "wglAssociateImageBufferEventsI3D", 5, _wglAssociateImageBufferEventsI3D_args}; +static const trace::FunctionSig _wglAssociateImageBufferEventsI3D_sig = {2897, "wglAssociateImageBufferEventsI3D", 5, _wglAssociateImageBufferEventsI3D_args}; static const char * _wglReleaseImageBufferEventsI3D_args[3] = {"hDC", "pAddress", "count"}; -static const trace::FunctionSig _wglReleaseImageBufferEventsI3D_sig = {2895, "wglReleaseImageBufferEventsI3D", 3, _wglReleaseImageBufferEventsI3D_args}; +static const trace::FunctionSig _wglReleaseImageBufferEventsI3D_sig = {2898, "wglReleaseImageBufferEventsI3D", 3, _wglReleaseImageBufferEventsI3D_args}; static const char ** _wglEnableFrameLockI3D_args = NULL; -static const trace::FunctionSig _wglEnableFrameLockI3D_sig = {2896, "wglEnableFrameLockI3D", 0, _wglEnableFrameLockI3D_args}; +static const trace::FunctionSig _wglEnableFrameLockI3D_sig = {2899, "wglEnableFrameLockI3D", 0, _wglEnableFrameLockI3D_args}; static const char ** _wglDisableFrameLockI3D_args = NULL; -static const trace::FunctionSig _wglDisableFrameLockI3D_sig = {2897, "wglDisableFrameLockI3D", 0, _wglDisableFrameLockI3D_args}; +static const trace::FunctionSig _wglDisableFrameLockI3D_sig = {2900, "wglDisableFrameLockI3D", 0, _wglDisableFrameLockI3D_args}; static const char * _wglIsEnabledFrameLockI3D_args[1] = {"pFlag"}; -static const trace::FunctionSig _wglIsEnabledFrameLockI3D_sig = {2898, "wglIsEnabledFrameLockI3D", 1, _wglIsEnabledFrameLockI3D_args}; +static const trace::FunctionSig _wglIsEnabledFrameLockI3D_sig = {2901, "wglIsEnabledFrameLockI3D", 1, _wglIsEnabledFrameLockI3D_args}; static const char * _wglQueryFrameLockMasterI3D_args[1] = {"pFlag"}; -static const trace::FunctionSig _wglQueryFrameLockMasterI3D_sig = {2899, "wglQueryFrameLockMasterI3D", 1, _wglQueryFrameLockMasterI3D_args}; +static const trace::FunctionSig _wglQueryFrameLockMasterI3D_sig = {2902, "wglQueryFrameLockMasterI3D", 1, _wglQueryFrameLockMasterI3D_args}; static const char * _wglGetFrameUsageI3D_args[1] = {"pUsage"}; -static const trace::FunctionSig _wglGetFrameUsageI3D_sig = {2900, "wglGetFrameUsageI3D", 1, _wglGetFrameUsageI3D_args}; +static const trace::FunctionSig _wglGetFrameUsageI3D_sig = {2903, "wglGetFrameUsageI3D", 1, _wglGetFrameUsageI3D_args}; static const char ** _wglBeginFrameTrackingI3D_args = NULL; -static const trace::FunctionSig _wglBeginFrameTrackingI3D_sig = {2901, "wglBeginFrameTrackingI3D", 0, _wglBeginFrameTrackingI3D_args}; +static const trace::FunctionSig _wglBeginFrameTrackingI3D_sig = {2904, "wglBeginFrameTrackingI3D", 0, _wglBeginFrameTrackingI3D_args}; static const char ** _wglEndFrameTrackingI3D_args = NULL; -static const trace::FunctionSig _wglEndFrameTrackingI3D_sig = {2902, "wglEndFrameTrackingI3D", 0, _wglEndFrameTrackingI3D_args}; +static const trace::FunctionSig _wglEndFrameTrackingI3D_sig = {2905, "wglEndFrameTrackingI3D", 0, _wglEndFrameTrackingI3D_args}; static const char * _wglQueryFrameTrackingI3D_args[3] = {"pFrameCount", "pMissedFrames", "pLastMissedUsage"}; -static const trace::FunctionSig _wglQueryFrameTrackingI3D_sig = {2903, "wglQueryFrameTrackingI3D", 3, _wglQueryFrameTrackingI3D_args}; +static const trace::FunctionSig _wglQueryFrameTrackingI3D_sig = {2906, "wglQueryFrameTrackingI3D", 3, _wglQueryFrameTrackingI3D_args}; static const char * _wglSetStereoEmitterState3DL_args[2] = {"hDC", "uState"}; -static const trace::FunctionSig _wglSetStereoEmitterState3DL_sig = {2904, "wglSetStereoEmitterState3DL", 2, _wglSetStereoEmitterState3DL_args}; +static const trace::FunctionSig _wglSetStereoEmitterState3DL_sig = {2907, "wglSetStereoEmitterState3DL", 2, _wglSetStereoEmitterState3DL_args}; static const char * _wglEnumerateVideoDevicesNV_args[2] = {"hDC", "phDeviceList"}; -static const trace::FunctionSig _wglEnumerateVideoDevicesNV_sig = {2905, "wglEnumerateVideoDevicesNV", 2, _wglEnumerateVideoDevicesNV_args}; +static const trace::FunctionSig _wglEnumerateVideoDevicesNV_sig = {2908, "wglEnumerateVideoDevicesNV", 2, _wglEnumerateVideoDevicesNV_args}; static const char * _wglBindVideoDeviceNV_args[4] = {"hDC", "uVideoSlot", "hVideoDevice", "piAttribList"}; -static const trace::FunctionSig _wglBindVideoDeviceNV_sig = {2906, "wglBindVideoDeviceNV", 4, _wglBindVideoDeviceNV_args}; +static const trace::FunctionSig _wglBindVideoDeviceNV_sig = {2909, "wglBindVideoDeviceNV", 4, _wglBindVideoDeviceNV_args}; static const char * _wglQueryCurrentContextNV_args[2] = {"iAttribute", "piValue"}; -static const trace::FunctionSig _wglQueryCurrentContextNV_sig = {2907, "wglQueryCurrentContextNV", 2, _wglQueryCurrentContextNV_args}; +static const trace::FunctionSig _wglQueryCurrentContextNV_sig = {2910, "wglQueryCurrentContextNV", 2, _wglQueryCurrentContextNV_args}; static const char * _wglGetVideoDeviceNV_args[3] = {"hDC", "numDevices", "hVideoDevice"}; -static const trace::FunctionSig _wglGetVideoDeviceNV_sig = {2908, "wglGetVideoDeviceNV", 3, _wglGetVideoDeviceNV_args}; +static const trace::FunctionSig _wglGetVideoDeviceNV_sig = {2911, "wglGetVideoDeviceNV", 3, _wglGetVideoDeviceNV_args}; static const char * _wglReleaseVideoDeviceNV_args[1] = {"hVideoDevice"}; -static const trace::FunctionSig _wglReleaseVideoDeviceNV_sig = {2909, "wglReleaseVideoDeviceNV", 1, _wglReleaseVideoDeviceNV_args}; +static const trace::FunctionSig _wglReleaseVideoDeviceNV_sig = {2912, "wglReleaseVideoDeviceNV", 1, _wglReleaseVideoDeviceNV_args}; static const char * _wglBindVideoImageNV_args[3] = {"hVideoDevice", "hPbuffer", "iVideoBuffer"}; -static const trace::FunctionSig _wglBindVideoImageNV_sig = {2910, "wglBindVideoImageNV", 3, _wglBindVideoImageNV_args}; +static const trace::FunctionSig _wglBindVideoImageNV_sig = {2913, "wglBindVideoImageNV", 3, _wglBindVideoImageNV_args}; static const char * _wglReleaseVideoImageNV_args[2] = {"hPbuffer", "iVideoBuffer"}; -static const trace::FunctionSig _wglReleaseVideoImageNV_sig = {2911, "wglReleaseVideoImageNV", 2, _wglReleaseVideoImageNV_args}; +static const trace::FunctionSig _wglReleaseVideoImageNV_sig = {2914, "wglReleaseVideoImageNV", 2, _wglReleaseVideoImageNV_args}; static const char * _wglSendPbufferToVideoNV_args[4] = {"hPbuffer", "iBufferType", "pulCounterPbuffer", "bBlock"}; -static const trace::FunctionSig _wglSendPbufferToVideoNV_sig = {2912, "wglSendPbufferToVideoNV", 4, _wglSendPbufferToVideoNV_args}; +static const trace::FunctionSig _wglSendPbufferToVideoNV_sig = {2915, "wglSendPbufferToVideoNV", 4, _wglSendPbufferToVideoNV_args}; static const char * _wglGetVideoInfoNV_args[3] = {"hpVideoDevice", "pulCounterOutputPbuffer", "pulCounterOutputVideo"}; -static const trace::FunctionSig _wglGetVideoInfoNV_sig = {2913, "wglGetVideoInfoNV", 3, _wglGetVideoInfoNV_args}; +static const trace::FunctionSig _wglGetVideoInfoNV_sig = {2916, "wglGetVideoInfoNV", 3, _wglGetVideoInfoNV_args}; static const char * _wglJoinSwapGroupNV_args[2] = {"hDC", "group"}; -static const trace::FunctionSig _wglJoinSwapGroupNV_sig = {2914, "wglJoinSwapGroupNV", 2, _wglJoinSwapGroupNV_args}; +static const trace::FunctionSig _wglJoinSwapGroupNV_sig = {2917, "wglJoinSwapGroupNV", 2, _wglJoinSwapGroupNV_args}; static const char * _wglBindSwapBarrierNV_args[2] = {"group", "barrier"}; -static const trace::FunctionSig _wglBindSwapBarrierNV_sig = {2915, "wglBindSwapBarrierNV", 2, _wglBindSwapBarrierNV_args}; +static const trace::FunctionSig _wglBindSwapBarrierNV_sig = {2918, "wglBindSwapBarrierNV", 2, _wglBindSwapBarrierNV_args}; static const char * _wglQuerySwapGroupNV_args[3] = {"hDC", "group", "barrier"}; -static const trace::FunctionSig _wglQuerySwapGroupNV_sig = {2916, "wglQuerySwapGroupNV", 3, _wglQuerySwapGroupNV_args}; +static const trace::FunctionSig _wglQuerySwapGroupNV_sig = {2919, "wglQuerySwapGroupNV", 3, _wglQuerySwapGroupNV_args}; static const char * _wglQueryMaxSwapGroupsNV_args[3] = {"hDC", "maxGroups", "maxBarriers"}; -static const trace::FunctionSig _wglQueryMaxSwapGroupsNV_sig = {2917, "wglQueryMaxSwapGroupsNV", 3, _wglQueryMaxSwapGroupsNV_args}; +static const trace::FunctionSig _wglQueryMaxSwapGroupsNV_sig = {2920, "wglQueryMaxSwapGroupsNV", 3, _wglQueryMaxSwapGroupsNV_args}; static const char * _wglQueryFrameCountNV_args[2] = {"hDC", "count"}; -static const trace::FunctionSig _wglQueryFrameCountNV_sig = {2918, "wglQueryFrameCountNV", 2, _wglQueryFrameCountNV_args}; +static const trace::FunctionSig _wglQueryFrameCountNV_sig = {2921, "wglQueryFrameCountNV", 2, _wglQueryFrameCountNV_args}; static const char * _wglResetFrameCountNV_args[1] = {"hDC"}; -static const trace::FunctionSig _wglResetFrameCountNV_sig = {2919, "wglResetFrameCountNV", 1, _wglResetFrameCountNV_args}; +static const trace::FunctionSig _wglResetFrameCountNV_sig = {2922, "wglResetFrameCountNV", 1, _wglResetFrameCountNV_args}; static const char * _wglEnumGpusNV_args[2] = {"iGpuIndex", "phGpu"}; -static const trace::FunctionSig _wglEnumGpusNV_sig = {2920, "wglEnumGpusNV", 2, _wglEnumGpusNV_args}; +static const trace::FunctionSig _wglEnumGpusNV_sig = {2923, "wglEnumGpusNV", 2, _wglEnumGpusNV_args}; static const char * _wglEnumGpuDevicesNV_args[3] = {"hGpu", "iDeviceIndex", "lpGpuDevice"}; -static const trace::FunctionSig _wglEnumGpuDevicesNV_sig = {2921, "wglEnumGpuDevicesNV", 3, _wglEnumGpuDevicesNV_args}; +static const trace::FunctionSig _wglEnumGpuDevicesNV_sig = {2924, "wglEnumGpuDevicesNV", 3, _wglEnumGpuDevicesNV_args}; static const char * _wglCreateAffinityDCNV_args[1] = {"phGpuList"}; -static const trace::FunctionSig _wglCreateAffinityDCNV_sig = {2922, "wglCreateAffinityDCNV", 1, _wglCreateAffinityDCNV_args}; +static const trace::FunctionSig _wglCreateAffinityDCNV_sig = {2925, "wglCreateAffinityDCNV", 1, _wglCreateAffinityDCNV_args}; static const char * _wglEnumGpusFromAffinityDCNV_args[3] = {"hAffinityDC", "iGpuIndex", "hGpu"}; -static const trace::FunctionSig _wglEnumGpusFromAffinityDCNV_sig = {2923, "wglEnumGpusFromAffinityDCNV", 3, _wglEnumGpusFromAffinityDCNV_args}; +static const trace::FunctionSig _wglEnumGpusFromAffinityDCNV_sig = {2926, "wglEnumGpusFromAffinityDCNV", 3, _wglEnumGpusFromAffinityDCNV_args}; static const char * _wglDeleteDCNV_args[1] = {"hdc"}; -static const trace::FunctionSig _wglDeleteDCNV_sig = {2924, "wglDeleteDCNV", 1, _wglDeleteDCNV_args}; +static const trace::FunctionSig _wglDeleteDCNV_sig = {2927, "wglDeleteDCNV", 1, _wglDeleteDCNV_args}; static const char * _wglGetGPUIDsAMD_args[2] = {"maxCount", "ids"}; -static const trace::FunctionSig _wglGetGPUIDsAMD_sig = {2925, "wglGetGPUIDsAMD", 2, _wglGetGPUIDsAMD_args}; +static const trace::FunctionSig _wglGetGPUIDsAMD_sig = {2928, "wglGetGPUIDsAMD", 2, _wglGetGPUIDsAMD_args}; static const char * _wglGetGPUInfoAMD_args[5] = {"id", "property", "dataType", "size", "data"}; -static const trace::FunctionSig _wglGetGPUInfoAMD_sig = {2926, "wglGetGPUInfoAMD", 5, _wglGetGPUInfoAMD_args}; +static const trace::FunctionSig _wglGetGPUInfoAMD_sig = {2929, "wglGetGPUInfoAMD", 5, _wglGetGPUInfoAMD_args}; static const char * _wglGetContextGPUIDAMD_args[1] = {"hglrc"}; -static const trace::FunctionSig _wglGetContextGPUIDAMD_sig = {2927, "wglGetContextGPUIDAMD", 1, _wglGetContextGPUIDAMD_args}; +static const trace::FunctionSig _wglGetContextGPUIDAMD_sig = {2930, "wglGetContextGPUIDAMD", 1, _wglGetContextGPUIDAMD_args}; static const char * _wglCreateAssociatedContextAMD_args[1] = {"id"}; -static const trace::FunctionSig _wglCreateAssociatedContextAMD_sig = {2928, "wglCreateAssociatedContextAMD", 1, _wglCreateAssociatedContextAMD_args}; +static const trace::FunctionSig _wglCreateAssociatedContextAMD_sig = {2931, "wglCreateAssociatedContextAMD", 1, _wglCreateAssociatedContextAMD_args}; static const char * _wglCreateAssociatedContextAttribsAMD_args[3] = {"id", "hShareContext", "attribList"}; -static const trace::FunctionSig _wglCreateAssociatedContextAttribsAMD_sig = {2929, "wglCreateAssociatedContextAttribsAMD", 3, _wglCreateAssociatedContextAttribsAMD_args}; +static const trace::FunctionSig _wglCreateAssociatedContextAttribsAMD_sig = {2932, "wglCreateAssociatedContextAttribsAMD", 3, _wglCreateAssociatedContextAttribsAMD_args}; static const char * _wglDeleteAssociatedContextAMD_args[1] = {"hglrc"}; -static const trace::FunctionSig _wglDeleteAssociatedContextAMD_sig = {2930, "wglDeleteAssociatedContextAMD", 1, _wglDeleteAssociatedContextAMD_args}; +static const trace::FunctionSig _wglDeleteAssociatedContextAMD_sig = {2933, "wglDeleteAssociatedContextAMD", 1, _wglDeleteAssociatedContextAMD_args}; static const char * _wglMakeAssociatedContextCurrentAMD_args[1] = {"hglrc"}; -static const trace::FunctionSig _wglMakeAssociatedContextCurrentAMD_sig = {2931, "wglMakeAssociatedContextCurrentAMD", 1, _wglMakeAssociatedContextCurrentAMD_args}; +static const trace::FunctionSig _wglMakeAssociatedContextCurrentAMD_sig = {2934, "wglMakeAssociatedContextCurrentAMD", 1, _wglMakeAssociatedContextCurrentAMD_args}; static const char ** _wglGetCurrentAssociatedContextAMD_args = NULL; -static const trace::FunctionSig _wglGetCurrentAssociatedContextAMD_sig = {2932, "wglGetCurrentAssociatedContextAMD", 0, _wglGetCurrentAssociatedContextAMD_args}; +static const trace::FunctionSig _wglGetCurrentAssociatedContextAMD_sig = {2935, "wglGetCurrentAssociatedContextAMD", 0, _wglGetCurrentAssociatedContextAMD_args}; static const char * _wglBlitContextFramebufferAMD_args[11] = {"dstCtx", "srcX0", "srcY0", "srcX1", "srcY1", "dstX0", "dstY0", "dstX1", "dstY1", "mask", "filter"}; -static const trace::FunctionSig _wglBlitContextFramebufferAMD_sig = {2933, "wglBlitContextFramebufferAMD", 11, _wglBlitContextFramebufferAMD_args}; +static const trace::FunctionSig _wglBlitContextFramebufferAMD_sig = {2936, "wglBlitContextFramebufferAMD", 11, _wglBlitContextFramebufferAMD_args}; static const char * _wglBindVideoCaptureDeviceNV_args[2] = {"uVideoSlot", "hDevice"}; -static const trace::FunctionSig _wglBindVideoCaptureDeviceNV_sig = {2934, "wglBindVideoCaptureDeviceNV", 2, _wglBindVideoCaptureDeviceNV_args}; +static const trace::FunctionSig _wglBindVideoCaptureDeviceNV_sig = {2937, "wglBindVideoCaptureDeviceNV", 2, _wglBindVideoCaptureDeviceNV_args}; static const char * _wglEnumerateVideoCaptureDevicesNV_args[2] = {"hDc", "phDeviceList"}; -static const trace::FunctionSig _wglEnumerateVideoCaptureDevicesNV_sig = {2935, "wglEnumerateVideoCaptureDevicesNV", 2, _wglEnumerateVideoCaptureDevicesNV_args}; +static const trace::FunctionSig _wglEnumerateVideoCaptureDevicesNV_sig = {2938, "wglEnumerateVideoCaptureDevicesNV", 2, _wglEnumerateVideoCaptureDevicesNV_args}; static const char * _wglLockVideoCaptureDeviceNV_args[2] = {"hDc", "hDevice"}; -static const trace::FunctionSig _wglLockVideoCaptureDeviceNV_sig = {2936, "wglLockVideoCaptureDeviceNV", 2, _wglLockVideoCaptureDeviceNV_args}; +static const trace::FunctionSig _wglLockVideoCaptureDeviceNV_sig = {2939, "wglLockVideoCaptureDeviceNV", 2, _wglLockVideoCaptureDeviceNV_args}; static const char * _wglQueryVideoCaptureDeviceNV_args[4] = {"hDc", "hDevice", "iAttribute", "piValue"}; -static const trace::FunctionSig _wglQueryVideoCaptureDeviceNV_sig = {2937, "wglQueryVideoCaptureDeviceNV", 4, _wglQueryVideoCaptureDeviceNV_args}; +static const trace::FunctionSig _wglQueryVideoCaptureDeviceNV_sig = {2940, "wglQueryVideoCaptureDeviceNV", 4, _wglQueryVideoCaptureDeviceNV_args}; static const char * _wglReleaseVideoCaptureDeviceNV_args[2] = {"hDc", "hDevice"}; -static const trace::FunctionSig _wglReleaseVideoCaptureDeviceNV_sig = {2938, "wglReleaseVideoCaptureDeviceNV", 2, _wglReleaseVideoCaptureDeviceNV_args}; +static const trace::FunctionSig _wglReleaseVideoCaptureDeviceNV_sig = {2941, "wglReleaseVideoCaptureDeviceNV", 2, _wglReleaseVideoCaptureDeviceNV_args}; static const char * _wglCopyImageSubDataNV_args[17] = {"hSrcRC", "srcName", "srcTarget", "srcLevel", "srcX", "srcY", "srcZ", "hDstRC", "dstName", "dstTarget", "dstLevel", "dstX", "dstY", "dstZ", "width", "height", "depth"}; -static const trace::FunctionSig _wglCopyImageSubDataNV_sig = {2939, "wglCopyImageSubDataNV", 17, _wglCopyImageSubDataNV_args}; +static const trace::FunctionSig _wglCopyImageSubDataNV_sig = {2942, "wglCopyImageSubDataNV", 17, _wglCopyImageSubDataNV_args}; static const char * _wglDXSetResourceShareHandleNV_args[2] = {"dxObject", "shareHandle"}; -static const trace::FunctionSig _wglDXSetResourceShareHandleNV_sig = {2940, "wglDXSetResourceShareHandleNV", 2, _wglDXSetResourceShareHandleNV_args}; +static const trace::FunctionSig _wglDXSetResourceShareHandleNV_sig = {2943, "wglDXSetResourceShareHandleNV", 2, _wglDXSetResourceShareHandleNV_args}; static const char * _wglDXOpenDeviceNV_args[1] = {"dxDevice"}; -static const trace::FunctionSig _wglDXOpenDeviceNV_sig = {2941, "wglDXOpenDeviceNV", 1, _wglDXOpenDeviceNV_args}; +static const trace::FunctionSig _wglDXOpenDeviceNV_sig = {2944, "wglDXOpenDeviceNV", 1, _wglDXOpenDeviceNV_args}; static const char * _wglDXCloseDeviceNV_args[1] = {"hDevice"}; -static const trace::FunctionSig _wglDXCloseDeviceNV_sig = {2942, "wglDXCloseDeviceNV", 1, _wglDXCloseDeviceNV_args}; +static const trace::FunctionSig _wglDXCloseDeviceNV_sig = {2945, "wglDXCloseDeviceNV", 1, _wglDXCloseDeviceNV_args}; static const char * _wglDXRegisterObjectNV_args[5] = {"hDevice", "dxObject", "name", "type", "access"}; -static const trace::FunctionSig _wglDXRegisterObjectNV_sig = {2943, "wglDXRegisterObjectNV", 5, _wglDXRegisterObjectNV_args}; +static const trace::FunctionSig _wglDXRegisterObjectNV_sig = {2946, "wglDXRegisterObjectNV", 5, _wglDXRegisterObjectNV_args}; static const char * _wglDXUnregisterObjectNV_args[2] = {"hDevice", "hObject"}; -static const trace::FunctionSig _wglDXUnregisterObjectNV_sig = {2944, "wglDXUnregisterObjectNV", 2, _wglDXUnregisterObjectNV_args}; +static const trace::FunctionSig _wglDXUnregisterObjectNV_sig = {2947, "wglDXUnregisterObjectNV", 2, _wglDXUnregisterObjectNV_args}; static const char * _wglDXObjectAccessNV_args[2] = {"hObject", "access"}; -static const trace::FunctionSig _wglDXObjectAccessNV_sig = {2945, "wglDXObjectAccessNV", 2, _wglDXObjectAccessNV_args}; +static const trace::FunctionSig _wglDXObjectAccessNV_sig = {2948, "wglDXObjectAccessNV", 2, _wglDXObjectAccessNV_args}; static const char * _wglDXLockObjectsNV_args[3] = {"hDevice", "count", "hObjects"}; -static const trace::FunctionSig _wglDXLockObjectsNV_sig = {2946, "wglDXLockObjectsNV", 3, _wglDXLockObjectsNV_args}; +static const trace::FunctionSig _wglDXLockObjectsNV_sig = {2949, "wglDXLockObjectsNV", 3, _wglDXLockObjectsNV_args}; static const char * _wglDXUnlockObjectsNV_args[3] = {"hDevice", "count", "hObjects"}; -static const trace::FunctionSig _wglDXUnlockObjectsNV_sig = {2947, "wglDXUnlockObjectsNV", 3, _wglDXUnlockObjectsNV_args}; +static const trace::FunctionSig _wglDXUnlockObjectsNV_sig = {2950, "wglDXUnlockObjectsNV", 3, _wglDXUnlockObjectsNV_args}; static const char * _wglGetProcAddress_args[1] = {"lpszProc"}; -static const trace::FunctionSig _wglGetProcAddress_sig = {2948, "wglGetProcAddress", 1, _wglGetProcAddress_args}; +static const trace::FunctionSig _wglGetProcAddress_sig = {2951, "wglGetProcAddress", 1, _wglGetProcAddress_args}; #endif // REGAL_SYS_WGL @@ -44434,7 +44443,7 @@ void glClearNamedBufferDataEXT( GLuint buffer, GLenum internalformat, GLenum for trace::localWriter.endLeave(); } -void glClearNamedBufferSubDataEXT( GLuint buffer, GLenum internalformat, GLenum format, GLenum type, GLsizeiptr offset, GLsizeiptr size, const void * data ) { +void glClearNamedBufferSubDataEXT( GLuint buffer, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void * data ) { unsigned _call = trace::localWriter.beginEnter(&_glClearNamedBufferSubDataEXT_sig); trace::localWriter.beginArg(0); trace::localWriter.writeUInt(buffer); @@ -44443,22 +44452,22 @@ void glClearNamedBufferSubDataEXT( GLuint buffer, GLenum internalformat, GLenum trace::localWriter.writeEnum(&_enumGLenum_sig, internalformat); trace::localWriter.endArg(); trace::localWriter.beginArg(2); - trace::localWriter.writeEnum(&_enumGLenum_sig, format); - trace::localWriter.endArg(); - trace::localWriter.beginArg(3); - trace::localWriter.writeEnum(&_enumGLenum_sig, type); - trace::localWriter.endArg(); - trace::localWriter.beginArg(4); trace::localWriter.writeSInt(offset); trace::localWriter.endArg(); - trace::localWriter.beginArg(5); + trace::localWriter.beginArg(3); trace::localWriter.writeSInt(size); trace::localWriter.endArg(); + trace::localWriter.beginArg(4); + trace::localWriter.writeEnum(&_enumGLenum_sig, format); + trace::localWriter.endArg(); + trace::localWriter.beginArg(5); + trace::localWriter.writeEnum(&_enumGLenum_sig, type); + trace::localWriter.endArg(); trace::localWriter.beginArg(6); trace::localWriter.writeBlob(data, _glClearBufferData_size(format, type)); trace::localWriter.endArg(); trace::localWriter.endEnter(); - _glClearNamedBufferSubDataEXT(buffer, internalformat, format, type, offset, size, data); + _glClearNamedBufferSubDataEXT(buffer, internalformat, offset, size, format, type, data); trace::localWriter.beginLeave(_call); if (true) { } @@ -66955,7 +66964,7 @@ void glTextureParameterivEXT( GLuint texture, GLenum target, GLenum pname, const trace::localWriter.endLeave(); } -void glTextureImage1DEXT( GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid * pixels ) { +void glTextureImage1DEXT( GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid * pixels ) { unsigned _call = trace::localWriter.beginEnter(&_glTextureImage1DEXT_sig); trace::localWriter.beginArg(0); trace::localWriter.writeUInt(texture); @@ -67002,7 +67011,7 @@ void glTextureImage1DEXT( GLuint texture, GLenum target, GLint level, GLenum int trace::localWriter.endLeave(); } -void glTextureImage2DEXT( GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, 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 ) { unsigned _call = trace::localWriter.beginEnter(&_glTextureImage2DEXT_sig); trace::localWriter.beginArg(0); trace::localWriter.writeUInt(texture); @@ -67451,7 +67460,7 @@ void glGetTextureLevelParameterivEXT( GLuint texture, GLenum target, GLint level trace::localWriter.endLeave(); } -void glTextureImage3DEXT( GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, 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 ) { unsigned _call = trace::localWriter.beginEnter(&_glTextureImage3DEXT_sig); trace::localWriter.beginArg(0); trace::localWriter.writeUInt(texture); @@ -67718,7 +67727,7 @@ void glMultiTexParameterivEXT( GLenum texunit, GLenum target, GLenum pname, cons trace::localWriter.endLeave(); } -void glMultiTexImage1DEXT( GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid * pixels ) { +void glMultiTexImage1DEXT( GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid * pixels ) { unsigned _call = trace::localWriter.beginEnter(&_glMultiTexImage1DEXT_sig); trace::localWriter.beginArg(0); trace::localWriter.writeEnum(&_enumGLenum_sig, texunit); @@ -67765,7 +67774,7 @@ void glMultiTexImage1DEXT( GLenum texunit, GLenum target, GLint level, GLenum in trace::localWriter.endLeave(); } -void glMultiTexImage2DEXT( GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, 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 ) { unsigned _call = trace::localWriter.beginEnter(&_glMultiTexImage2DEXT_sig); trace::localWriter.beginArg(0); trace::localWriter.writeEnum(&_enumGLenum_sig, texunit); @@ -68214,7 +68223,7 @@ void glGetMultiTexLevelParameterivEXT( GLenum texunit, GLenum target, GLint leve trace::localWriter.endLeave(); } -void glMultiTexImage3DEXT( GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, 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 ) { unsigned _call = trace::localWriter.beginEnter(&_glMultiTexImage3DEXT_sig); trace::localWriter.beginArg(0); trace::localWriter.writeEnum(&_enumGLenum_sig, texunit); @@ -81306,6 +81315,81 @@ void glFramebufferTexture2DMultisampleEXT( GLenum target, GLenum attachment, GLe trace::localWriter.endLeave(); } +void glTexStorage1DEXT( GLenum target, GLsizei levels, GLenum internalformat, GLsizei width ) { + unsigned _call = trace::localWriter.beginEnter(&_glTexStorage1DEXT_sig); + trace::localWriter.beginArg(0); + trace::localWriter.writeEnum(&_enumGLenum_sig, target); + trace::localWriter.endArg(); + trace::localWriter.beginArg(1); + trace::localWriter.writeSInt(levels); + trace::localWriter.endArg(); + trace::localWriter.beginArg(2); + trace::localWriter.writeEnum(&_enumGLenum_sig, internalformat); + trace::localWriter.endArg(); + trace::localWriter.beginArg(3); + trace::localWriter.writeSInt(width); + trace::localWriter.endArg(); + trace::localWriter.endEnter(); + _glTexStorage1DEXT(target, levels, internalformat, width); + trace::localWriter.beginLeave(_call); + if (true) { + } + trace::localWriter.endLeave(); +} + +void glTexStorage2DEXT( GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height ) { + unsigned _call = trace::localWriter.beginEnter(&_glTexStorage2DEXT_sig); + trace::localWriter.beginArg(0); + trace::localWriter.writeEnum(&_enumGLenum_sig, target); + trace::localWriter.endArg(); + trace::localWriter.beginArg(1); + trace::localWriter.writeSInt(levels); + trace::localWriter.endArg(); + trace::localWriter.beginArg(2); + trace::localWriter.writeEnum(&_enumGLenum_sig, internalformat); + trace::localWriter.endArg(); + trace::localWriter.beginArg(3); + trace::localWriter.writeSInt(width); + trace::localWriter.endArg(); + trace::localWriter.beginArg(4); + trace::localWriter.writeSInt(height); + trace::localWriter.endArg(); + trace::localWriter.endEnter(); + _glTexStorage2DEXT(target, levels, internalformat, width, height); + trace::localWriter.beginLeave(_call); + if (true) { + } + trace::localWriter.endLeave(); +} + +void glTexStorage3DEXT( GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth ) { + unsigned _call = trace::localWriter.beginEnter(&_glTexStorage3DEXT_sig); + trace::localWriter.beginArg(0); + trace::localWriter.writeEnum(&_enumGLenum_sig, target); + trace::localWriter.endArg(); + trace::localWriter.beginArg(1); + trace::localWriter.writeSInt(levels); + trace::localWriter.endArg(); + trace::localWriter.beginArg(2); + trace::localWriter.writeEnum(&_enumGLenum_sig, internalformat); + trace::localWriter.endArg(); + trace::localWriter.beginArg(3); + trace::localWriter.writeSInt(width); + trace::localWriter.endArg(); + trace::localWriter.beginArg(4); + trace::localWriter.writeSInt(height); + trace::localWriter.endArg(); + trace::localWriter.beginArg(5); + trace::localWriter.writeSInt(depth); + trace::localWriter.endArg(); + trace::localWriter.endEnter(); + _glTexStorage3DEXT(target, levels, internalformat, width, height, depth); + trace::localWriter.beginLeave(_call); + if (true) { + } + trace::localWriter.endLeave(); +} + } /* namespace Trace */ } /* namespace Regal */ diff --git a/src/glew/include/GL/glew.h b/src/glew/include/GL/glew.h index 06b8e98..9253d07 100644 --- 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; diff --git a/src/glew/src/glew.c b/src/glew/src/glew.c index d00ba1a..e0680b8 100644 --- 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)) { diff --git a/src/glew/src/glewinfo.c b/src/glew/src/glewinfo.c index 9f8f4cb..c7a5313 100644 --- 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 */ diff --git a/src/regal/Regal.cpp b/src/regal/Regal.cpp index a6efc86..1be3361 100644 --- 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; } diff --git a/src/regal/Regal.def b/src/regal/Regal.def index c3f3ae5..956c81a 100644 --- a/src/regal/Regal.def +++ b/src/regal/Regal.def @@ -639,7 +639,6 @@ EXPORTS glFramebufferTexture3DOES glFramebufferTextureARB glFramebufferTextureEXT - glFramebufferTextureFace glFramebufferTextureFaceARB glFramebufferTextureFaceEXT glFramebufferTextureLayer diff --git a/src/regal/RegalContext.cpp b/src/regal/RegalContext.cpp index cd69ebd..00c81b5 100644 --- 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; diff --git a/src/regal/RegalContext.h b/src/regal/RegalContext.h index bc7a5f8..8a7e88c 100644 --- a/src/regal/RegalContext.h +++ b/src/regal/RegalContext.h @@ -119,7 +119,9 @@ struct RegalContext // scoped_ptr marker; +#if REGAL_FRAME scoped_ptr frame; +#endif /* REGAL_FRAME */ #if REGAL_EMULATION // Fixed function emulation int emuLevel; diff --git a/src/regal/RegalDispatch.h b/src/regal/RegalDispatch.h index e887464..181cd0d 100644 --- 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); diff --git a/src/regal/RegalDispatchCode.cpp b/src/regal/RegalDispatchCode.cpp index d2419ef..2928408 100644 --- 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; diff --git a/src/regal/RegalDispatchDebug.cpp b/src/regal/RegalDispatchDebug.cpp index 9deadde..36d272f 100644 --- 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; diff --git a/src/regal/RegalDispatchEmu.cpp b/src/regal/RegalDispatchEmu.cpp index 5eacb39..9a48d00 100644 --- 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 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 diff --git a/src/regal/RegalDispatchError.cpp b/src/regal/RegalDispatchError.cpp index 2f08c49..2179b7d 100644 --- 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; diff --git a/src/regal/RegalDispatchLoader.cpp b/src/regal/RegalDispatchLoader.cpp index e0d1dcd..82fc6d0 100644 --- 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(&_driver.glFramebufferTextureFace),reinterpret_cast(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(&_driver.glGetPixelTransformParameterfvEXT),reinterpret_cast(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(&_driver.glGetPixelTransformParameterivEXT),reinterpret_cast(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; diff --git a/src/regal/RegalDispatchLog.cpp b/src/regal/RegalDispatchLog.cpp index 9e4edbe..e6fee26 100644 --- 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; diff --git a/src/regal/RegalDispatchMissing.cpp b/src/regal/RegalDispatchMissing.cpp index ecf950b..7dfccb5 100644 --- 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; diff --git a/src/regal/RegalDispatchStatistics.cpp b/src/regal/RegalDispatchStatistics.cpp index 71e6178..d2d31e1 100644 --- 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; diff --git a/src/regal/RegalDispatchTrace.cpp b/src/regal/RegalDispatchTrace.cpp index 0513345..7f3a2e3 100644 --- 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 _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 _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 _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 _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 _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 _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 _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 _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 _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 _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 _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 _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 _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 _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 _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 _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 _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 _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 _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 _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 _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 _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 _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 _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 _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 _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 _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 _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 _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 _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 _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 _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; diff --git a/src/regal/RegalFrame.cpp b/src/regal/RegalFrame.cpp index 2b30ca1..1e36a97 100644 --- 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 diff --git a/src/regal/RegalFrame.h b/src/regal/RegalFrame.h index 23f0ead..c72218a 100644 --- 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 diff --git a/src/regal/RegalIff.h b/src/regal/RegalIff.h index 7486cbe..e28916f 100644 --- a/src/regal/RegalIff.h +++ b/src/regal/RegalIff.h @@ -134,10 +134,10 @@ const GLenum texenvCombineOpGL[] = GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA }; - + /* From GLSLang spec 1.20.8: - + // // Matrix state. p. 31, 32, 37, 39, 40. // @@ -145,7 +145,7 @@ const GLenum texenvCombineOpGL[] = uniform mat4 gl_ProjectionMatrix; uniform mat4 gl_ModelViewProjectionMatrix; uniform mat4 gl_TextureMatrix[gl_MaxTextureCoords]; - + // // Derived matrix state that provides inverse and transposed versions // of the matrices above. Poorly conditioned matrices may result @@ -153,7 +153,7 @@ const GLenum texenvCombineOpGL[] = // uniform mat3 gl_NormalMatrix; // transpose of the inverse of the // upper leftmost 3x3 of gl_ModelViewMatrix - + uniform mat4 gl_ModelViewMatrixInverse; uniform mat4 gl_ProjectionMatrixInverse; uniform mat4 gl_ModelViewProjectionMatrixInverse; @@ -166,12 +166,12 @@ const GLenum texenvCombineOpGL[] = uniform mat4 gl_ProjectionMatrixInverseTranspose; uniform mat4 gl_ModelViewProjectionMatrixInverseTranspose; uniform mat4 gl_TextureMatrixInverseTranspose[gl_MaxTextureCoords]; - + // // Normal scaling p. 39. // uniform float gl_NormalScale; - + // // Depth range in window coordinates, p. 33 // @@ -181,12 +181,12 @@ const GLenum texenvCombineOpGL[] = float diff; // f - n }; uniform gl_DepthRangeParameters gl_DepthRange; - + // // Clip planes p. 42. // uniform vec4 gl_ClipPlane[gl_MaxClipPlanes]; - + // // Point Size, p. 66, 67. // @@ -200,11 +200,11 @@ const GLenum texenvCombineOpGL[] = float distanceQuadraticAttenuation; }; uniform gl_PointParameters gl_Point; - + // // Material State p. 50, 55. // - + struct gl_MaterialParameters { vec4 emission; // Ecm vec4 ambient; // Acm @@ -214,7 +214,7 @@ const GLenum texenvCombineOpGL[] = }; uniform gl_MaterialParameters gl_FrontMaterial; uniform gl_MaterialParameters gl_BackMaterial; - + // // Light State p 50, 53, 55. // @@ -233,12 +233,12 @@ const GLenum texenvCombineOpGL[] = float quadraticAttenuation;// K2 }; uniform gl_LightSourceParameters gl_LightSource[gl_MaxLights]; - + struct gl_LightModelParameters { vec4 ambient; // Acs }; uniform gl_LightModelParameters gl_LightModel; - + // // Derived state from products of light and material. // @@ -247,7 +247,7 @@ const GLenum texenvCombineOpGL[] = }; uniform gl_LightModelProducts gl_FrontLightModelProduct; uniform gl_LightModelProducts gl_BackLightModelProduct; - + struct gl_LightProducts { vec4 ambient; // Acm * Acli vec4 diffuse; // Dcm * Dcli @@ -255,7 +255,7 @@ const GLenum texenvCombineOpGL[] = }; uniform gl_LightProducts gl_FrontLightProduct[gl_MaxLights]; uniform gl_LightProducts gl_BackLightProduct[gl_MaxLights]; - + // // Texture Environment and Generation, p. 152, p. 40-42. // @@ -268,7 +268,7 @@ const GLenum texenvCombineOpGL[] = uniform vec4 gl_ObjectPlaneT[gl_MaxTextureCoords]; uniform vec4 gl_ObjectPlaneR[gl_MaxTextureCoords]; uniform vec4 gl_ObjectPlaneQ[gl_MaxTextureCoords]; - + // // Fog p. 161 // @@ -282,7 +282,7 @@ const GLenum texenvCombineOpGL[] = uniform gl_FogParameters gl_Fog; */ - + enum RegalFFUniformEnum { FFU_foo = 0, diff --git a/src/regal/RegalLookup.cpp b/src/regal/RegalLookup.cpp index 8147196..4d41c8e 100644 --- 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 *), diff --git a/src/regal/RegalLookup.h b/src/regal/RegalLookup.h index 1d9ad20..662c03e 100644 --- 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 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(const_cast(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; } diff --git a/src/regal/RegalPPAPI.def b/src/regal/RegalPPAPI.def index 1485edf..17bd43c 100644 --- a/src/regal/RegalPPAPI.def +++ b/src/regal/RegalPPAPI.def @@ -620,7 +620,6 @@ EXPORTS glFramebufferTexture3DOES glFramebufferTextureARB glFramebufferTextureEXT - glFramebufferTextureFace glFramebufferTextureFaceARB glFramebufferTextureFaceEXT glFramebufferTextureLayer diff --git a/src/regal/RegalPlugin.cpp b/src/regal/RegalPlugin.cpp index a1ddfdb..f65d0b1 100644 --- 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(lookup_gl_Value[(size_t) (res - lookup_gl_Name)]); #if REGAL_SYS_WGL diff --git a/src/regal/RegalStatistics.cpp b/src/regal/RegalStatistics.cpp index 9bef3e6..7636c57 100644 --- 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); diff --git a/src/regal/RegalStatistics.h b/src/regal/RegalStatistics.h index d430d1c..d46d40f 100644 --- 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; diff --git a/src/regal/RegalUtil.h b/src/regal/RegalUtil.h index f0e849c..7e03fd8 100644 --- 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 diff --git a/src/regal/Regalm.def b/src/regal/Regalm.def index 3e4d047..950ae3b 100644 --- a/src/regal/Regalm.def +++ b/src/regal/Regalm.def @@ -639,7 +639,6 @@ EXPORTS rglFramebufferTexture3DOES rglFramebufferTextureARB rglFramebufferTextureEXT - rglFramebufferTextureFace rglFramebufferTextureFaceARB rglFramebufferTextureFaceEXT rglFramebufferTextureLayer diff --git a/src/regal/export_list_mac.txt b/src/regal/export_list_mac.txt index 61e939c..28a2945 100644 --- 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