From d64460afde04d1aba6372e840e7e217e99e7bc4b Mon Sep 17 00:00:00 2001 From: Yu Ke Date: Wed, 9 Feb 2011 18:54:47 +0800 Subject: mesa-dri-7.10: replace GPLv3 talloc with MIT-x licensed ralloc mesa 7.10.1 devel branch has the patch to replace talloc with ralloc. so add a patch to sync with 7.10.1 devel branch. Signed-off-by: Yu Ke --- .../mesa/files/talloc-removal.patch | 15571 +++++++++++++++++++ meta/recipes-graphics/mesa/mesa-dri_7.10.bb | 5 +- 2 files changed, 15574 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-graphics/mesa/files/talloc-removal.patch diff --git a/meta/recipes-graphics/mesa/files/talloc-removal.patch b/meta/recipes-graphics/mesa/files/talloc-removal.patch new file mode 100644 index 0000000000..3038f6a5e6 --- /dev/null +++ b/meta/recipes-graphics/mesa/files/talloc-removal.patch @@ -0,0 +1,15571 @@ +mesa: sync with mesa 7.10.1 devel branch to replace GPLv3 talloc with BSD-license ralloc + +mesa 7.10.1 devel branch already has the patch to replace talloc with ralloc, so this patch is the diff of mesa-7.10(7a3f869a4) and mesa 7.10.1 ralloc commit (546aade2) + +Pick-from-upstream-by: Yu Ke + +diff --git a/Makefile b/Makefile +index d62ec43..32a5f2f 100644 +--- a/Makefile ++++ b/Makefile +@@ -180,7 +180,7 @@ ultrix-gcc: + + # Rules for making release tarballs + +-VERSION=7.10 ++VERSION=7.10.1-devel + DIRECTORY = Mesa-$(VERSION) + LIB_NAME = MesaLib-$(VERSION) + GLUT_NAME = MesaGLUT-$(VERSION) +diff --git a/configs/autoconf.in b/configs/autoconf.in +index e2d70c6..1538d9a 100644 +--- a/configs/autoconf.in ++++ b/configs/autoconf.in +@@ -34,9 +34,6 @@ LLVM_LIBS = @LLVM_LIBS@ + GLW_CFLAGS = @GLW_CFLAGS@ + GLUT_CFLAGS = @GLUT_CFLAGS@ + +-TALLOC_LIBS = @TALLOC_LIBS@ +-TALLOC_CFLAGS = @TALLOC_CFLAGS@ +- + # dlopen + DLOPEN_LIBS = @DLOPEN_LIBS@ + +diff --git a/configs/default b/configs/default +index 0301345..2301a68 100644 +--- a/configs/default ++++ b/configs/default +@@ -82,9 +82,6 @@ GLESv1_CM_LIB_GLOB = $(GLESv1_CM_LIB_NAME)* + GLESv2_LIB_GLOB = $(GLESv2_LIB_NAME)* + VG_LIB_GLOB = $(VG_LIB_NAME)* + +-TALLOC_LIBS = `pkg-config --libs talloc` +-TALLOC_CFLAGS = `pkg-config --cflags talloc` +- + # Optional assembly language optimization files for libGL + MESA_ASM_SOURCES = + +@@ -119,7 +116,7 @@ EGL_CLIENT_APIS = $(GL_LIB) + + # Library dependencies + #EXTRA_LIB_PATH ?= +-GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread $(TALLOC_LIBS) ++GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread + EGL_LIB_DEPS = $(EXTRA_LIB_PATH) -ldl -lpthread + OSMESA_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) + GLU_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm +diff --git a/configs/linux-dri b/configs/linux-dri +index 64fc407..1c94ed0 100644 +--- a/configs/linux-dri ++++ b/configs/linux-dri +@@ -45,7 +45,7 @@ EXTRA_LIB_PATH=-L/usr/X11R6/lib + + LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm) + LIBDRM_LIB = $(shell pkg-config --libs libdrm) +-DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl -ltalloc $(LIBDRM_LIB) ++DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) + GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ + -lm -lpthread -ldl $(LIBDRM_LIB) + +diff --git a/configs/linux-llvm b/configs/linux-llvm +index 22de066..e699953 100644 +--- a/configs/linux-llvm ++++ b/configs/linux-llvm +@@ -41,4 +41,4 @@ else + endif + + LD = g++ +-GL_LIB_DEPS = $(LLVM_LDFLAGS) $(LLVM_LIBS) $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread -ltalloc -lstdc++ -ludis86 ++GL_LIB_DEPS = $(LLVM_LDFLAGS) $(LLVM_LIBS) $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread -lstdc++ -ludis86 +diff --git a/configure.ac b/configure.ac +index b451f7c..6662b8a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -572,10 +572,6 @@ xno) + ;; + esac + +-PKG_CHECK_MODULES([TALLOC], [talloc]) +-AC_SUBST([TALLOC_LIBS]) +-AC_SUBST([TALLOC_CFLAGS]) +- + dnl + dnl Driver specific build directories + dnl +@@ -714,8 +710,8 @@ xlib) + GL_PC_LIB_PRIV="$GL_LIB_DEPS" + GL_PC_CFLAGS="$X11_INCLUDES" + fi +- GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS -lm -lpthread $TALLOC_LIBS" +- GL_PC_LIB_PRIV="$GL_PC_LIB_PRIV $SELINUX_LIBS -lm -lpthread $TALLOC_LIBS" ++ GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS -lm -lpthread" ++ GL_PC_LIB_PRIV="$GL_PC_LIB_PRIV $SELINUX_LIBS -lm -lpthread" + + # if static, move the external libraries to the programs + # and empty the libraries for libGL +@@ -964,7 +960,7 @@ if test "$mesa_driver" = dri -o "$mesa_driver" = no; then + fi + + # put all the necessary libs together +- DRI_LIB_DEPS="$SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIB -lm -lpthread $DLOPEN_LIBS $TALLOC_LIBS" ++ DRI_LIB_DEPS="$SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIB -lm -lpthread $DLOPEN_LIBS" + fi + AC_SUBST([DRI_DIRS]) + AC_SUBST([EXPAT_INCLUDES]) +@@ -1040,12 +1036,12 @@ case "$DRIVER_DIRS" in + *osmesa*) + # only link libraries with osmesa if shared + if test "$enable_static" = no; then +- OSMESA_LIB_DEPS="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS $TALLOC_LIBS" ++ OSMESA_LIB_DEPS="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS" + else + OSMESA_LIB_DEPS="" + fi + OSMESA_MESA_DEPS="" +- OSMESA_PC_LIB_PRIV="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS $TALLOC_LIBS" ++ OSMESA_PC_LIB_PRIV="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS" + ;; + esac + AC_SUBST([OSMESA_LIB_DEPS]) +diff --git a/docs/news.html b/docs/news.html +index 72d38ee..ce0cd0c 100644 +--- a/docs/news.html ++++ b/docs/news.html +@@ -11,6 +11,19 @@ +

News

+ + ++

January 7, 2011

++ ++

++Mesa 7.10 (final) is released. This is a new ++development release. ++

++ ++

++Also, Mesa 7.9.1 (final) is released. ++This is a bug fix release. ++

++ ++ +

October 4, 2010

+ +

+diff --git a/docs/relnotes-7.10.1.html b/docs/relnotes-7.10.1.html +new file mode 100644 +index 0000000..1cd8d85 +--- /dev/null ++++ b/docs/relnotes-7.10.1.html +@@ -0,0 +1,84 @@ ++ ++ ++ ++Mesa Release Notes ++ ++ ++ ++ ++ ++ ++ ++ ++

Mesa 7.10.1 Release Notes / TBD

++ ++

++Mesa 7.10.1 is a bug fix release which fixes bugs found since the 7.10 release. ++

++

++Mesa 7.10.1 implements the OpenGL 2.1 API, but the version reported by ++glGetString(GL_VERSION) depends on the particular driver being used. ++Some drivers don't support all the features required in OpenGL 2.1. ++

++

++See the Compiling/Installing page for prerequisites ++for DRI hardware acceleration. ++

++ ++ ++

MD5 checksums

++
++TBD
++
++ ++ ++

New features

++

None.

++ ++

Bug fixes

++

This list is likely incomplete.

++
    ++
  • Fix an off-by-one bug in a vsplit assertion.
    • ++
  • Fix incorrect handling of layout qualifier ++with in, out, attribute, and varying.
    • ++ ++
  • Fix an i965 shader bug where the negative absolute value was generated instead of the absolute value of a negation.
    • ++ ++
  • Fix numerous issues handling precision qualifiers in GLSL ES.
    • ++ ++
  • Bug 29164 - [GLSL 1.20] invariant variable shouldn't be used before declaration
    • ++ ++
  • Bug 30156 - [i965] After updating to Mesa 7.9, Civilization IV starts to show garbage
    • ++ ++
  • Bug 31923 - [GLSL 1.20] allowing inconsistent centroid declaration between two vertex shaders
    • ++ ++
  • Bug 31925 - [GLSL 1.20] "#pragma STDGL invariant(all)" fail
    • ++ ++
  • Bug 32695 - [glsl] SIGSEGV glcpp/glcpp-parse.y:833
    • ++ ++
  • Bug 32831 - [glsl] division by zero crashes GLSL compiler
    • ++ ++
  • Bug 32910 - Keywords 'in' and 'out' not handled properly for GLSL 1.20 shaders
    • ++ ++
  • Bug 33219 -[GLSL bisected] implicit sized array triggers segfault in ir_to_mesa_visitor::copy_propagate
    • ++ ++
  • Bug 33308 -[glsl] ast_to_hir.cpp:3016: virtual ir_rvalue* ast_jump_statement::hir(exec_list*, _mesa_glsl_parse_state*): Assertion `ret != __null' failed.
    • ++ ++
  • Bug 33316 - uniform array will be allocate one line more and initialize it when it was freed will abort
    • ++ ++ ++ ++
++ ++ ++

Changes

++

The full set of changes can be viewed by using the following GIT command:

++ ++
++  git log mesa-7.10..origin/7.10
++
++ ++

++ ++ ++ +diff --git a/docs/relnotes-7.10.html b/docs/relnotes-7.10.html +index 2abbc4a..3f4f229 100644 +--- a/docs/relnotes-7.10.html ++++ b/docs/relnotes-7.10.html +@@ -1,8 +1,10 @@ + + ++ + Mesa Release Notes +- +- ++ ++ ++ + + + +@@ -28,7 +30,12 @@ for DRI hardware acceleration. + +

MD5 checksums

+ 
+-tbd
++0a70c15c135561824bdcae92bf232e43  MesaLib-7.10.tar.gz
++33fb94eccc02cbb4d8d1365615e38e46  MesaLib-7.10.tar.bz2
++5cafdc0eda0f9bf370b95c98df3338fa  MesaLib-7.10.zip
++bc644be551ed585fc4f66c16b64a91c9  MesaGLUT-7.10.tar.gz
++5c2677a155672352d62b177e4f0f92e8  MesaGLUT-7.10.tar.bz2
++2ce5001f74496d1ba719ef74d910a5cf  MesaGLUT-7.10.zip
+
+ + +diff --git a/docs/relnotes-7.9.1.html b/docs/relnotes-7.9.1.html +index a46eb16..bef4ef1 100644 +--- a/docs/relnotes-7.9.1.html ++++ b/docs/relnotes-7.9.1.html +@@ -1,8 +1,10 @@ + + ++ + Mesa Release Notes +- +- ++ ++ ++ + + + +diff --git a/docs/relnotes.html b/docs/relnotes.html +index 4487af9..036d3f8 100644 +--- a/docs/relnotes.html ++++ b/docs/relnotes.html +@@ -13,6 +13,8 @@ The release notes summarize what's new or changed in each Mesa release. +

+ +
    ++
  • 7.10 release notes ++
  • 7.9.1 release notes +
  • 7.9 release notes +
  • 7.8.3 release notes +
  • 7.8.2 release notes +diff --git a/include/GL/gl_mangle.h b/include/GL/gl_mangle.h +index 43d2e89..3684803 100644 +--- a/include/GL/gl_mangle.h ++++ b/include/GL/gl_mangle.h +@@ -31,6 +31,7 @@ + + #define glAccum MANGLE(Accum) + #define glActiveProgramEXT MANGLE(ActiveProgramEXT) ++#define glActiveShaderProgram MANGLE(ActiveShaderProgram) + #define glActiveStencilFaceEXT MANGLE(ActiveStencilFaceEXT) + #define glActiveTextureARB MANGLE(ActiveTextureARB) + #define glActiveTexture MANGLE(ActiveTexture) +@@ -56,6 +57,7 @@ + #define glBeginOcclusionQueryNV MANGLE(BeginOcclusionQueryNV) + #define glBeginPerfMonitorAMD MANGLE(BeginPerfMonitorAMD) + #define glBeginQueryARB MANGLE(BeginQueryARB) ++#define glBeginQueryIndexed MANGLE(BeginQueryIndexed) + #define glBeginQuery MANGLE(BeginQuery) + #define glBeginTransformFeedbackEXT MANGLE(BeginTransformFeedbackEXT) + #define glBeginTransformFeedback MANGLE(BeginTransformFeedback) +@@ -75,22 +77,27 @@ + #define glBindBufferRange MANGLE(BindBufferRange) + #define glBindBufferRangeNV MANGLE(BindBufferRangeNV) + #define glBindFragDataLocationEXT MANGLE(BindFragDataLocationEXT) ++#define glBindFragDataLocationIndexed MANGLE(BindFragDataLocationIndexed) + #define glBindFragDataLocation MANGLE(BindFragDataLocation) + #define glBindFragmentShaderATI MANGLE(BindFragmentShaderATI) + #define glBindFramebufferEXT MANGLE(BindFramebufferEXT) + #define glBindFramebuffer MANGLE(BindFramebuffer) ++#define glBindImageTextureEXT MANGLE(BindImageTextureEXT) + #define glBindLightParameterEXT MANGLE(BindLightParameterEXT) + #define glBindMaterialParameterEXT MANGLE(BindMaterialParameterEXT) + #define glBindMultiTextureEXT MANGLE(BindMultiTextureEXT) + #define glBindParameterEXT MANGLE(BindParameterEXT) + #define glBindProgramARB MANGLE(BindProgramARB) + #define glBindProgramNV MANGLE(BindProgramNV) ++#define glBindProgramPipeline MANGLE(BindProgramPipeline) + #define glBindRenderbufferEXT MANGLE(BindRenderbufferEXT) + #define glBindRenderbuffer MANGLE(BindRenderbuffer) ++#define glBindSampler MANGLE(BindSampler) + #define glBindTexGenParameterEXT MANGLE(BindTexGenParameterEXT) + #define glBindTextureEXT MANGLE(BindTextureEXT) + #define glBindTexture MANGLE(BindTexture) + #define glBindTextureUnitParameterEXT MANGLE(BindTextureUnitParameterEXT) ++#define glBindTransformFeedback MANGLE(BindTransformFeedback) + #define glBindTransformFeedbackNV MANGLE(BindTransformFeedbackNV) + #define glBindVertexArrayAPPLE MANGLE(BindVertexArrayAPPLE) + #define glBindVertexArray MANGLE(BindVertexArray) +@@ -112,18 +119,22 @@ + #define glBlendColorEXT MANGLE(BlendColorEXT) + #define glBlendColor MANGLE(BlendColor) + #define glBlendEquationEXT MANGLE(BlendEquationEXT) ++#define glBlendEquationiARB MANGLE(BlendEquationiARB) + #define glBlendEquationi MANGLE(BlendEquationi) + #define glBlendEquationIndexedAMD MANGLE(BlendEquationIndexedAMD) + #define glBlendEquation MANGLE(BlendEquation) + #define glBlendEquationSeparateATI MANGLE(BlendEquationSeparateATI) + #define glBlendEquationSeparateEXT MANGLE(BlendEquationSeparateEXT) ++#define glBlendEquationSeparateiARB MANGLE(BlendEquationSeparateiARB) + #define glBlendEquationSeparatei MANGLE(BlendEquationSeparatei) + #define glBlendEquationSeparateIndexedAMD MANGLE(BlendEquationSeparateIndexedAMD) + #define glBlendEquationSeparate MANGLE(BlendEquationSeparate) ++#define glBlendFunciARB MANGLE(BlendFunciARB) + #define glBlendFunci MANGLE(BlendFunci) + #define glBlendFuncIndexedAMD MANGLE(BlendFuncIndexedAMD) + #define glBlendFunc MANGLE(BlendFunc) + #define glBlendFuncSeparateEXT MANGLE(BlendFuncSeparateEXT) ++#define glBlendFuncSeparateiARB MANGLE(BlendFuncSeparateiARB) + #define glBlendFuncSeparatei MANGLE(BlendFuncSeparatei) + #define glBlendFuncSeparateIndexedAMD MANGLE(BlendFuncSeparateIndexedAMD) + #define glBlendFuncSeparateINGR MANGLE(BlendFuncSeparateINGR) +@@ -153,6 +164,7 @@ + #define glClearColor MANGLE(ClearColor) + #define glClearDebugLogMESA MANGLE(ClearDebugLogMESA) + #define glClearDepthdNV MANGLE(ClearDepthdNV) ++#define glClearDepthf MANGLE(ClearDepthf) + #define glClearDepth MANGLE(ClearDepth) + #define glClearIndex MANGLE(ClearIndex) + #define glClear MANGLE(Clear) +@@ -215,6 +227,10 @@ + #define glColorMaskIndexedEXT MANGLE(ColorMaskIndexedEXT) + #define glColorMask MANGLE(ColorMask) + #define glColorMaterial MANGLE(ColorMaterial) ++#define glColorP3ui MANGLE(ColorP3ui) ++#define glColorP3uiv MANGLE(ColorP3uiv) ++#define glColorP4ui MANGLE(ColorP4ui) ++#define glColorP4uiv MANGLE(ColorP4uiv) + #define glColorPointerEXT MANGLE(ColorPointerEXT) + #define glColorPointerListIBM MANGLE(ColorPointerListIBM) + #define glColorPointer MANGLE(ColorPointer) +@@ -236,6 +252,7 @@ + #define glCombinerParameterivNV MANGLE(CombinerParameterivNV) + #define glCombinerStageParameterfvNV MANGLE(CombinerStageParameterfvNV) + #define glCompileShaderARB MANGLE(CompileShaderARB) ++#define glCompileShaderIncludeARB MANGLE(CompileShaderIncludeARB) + #define glCompileShader MANGLE(CompileShader) + #define glCompressedMultiTexImage1DEXT MANGLE(CompressedMultiTexImage1DEXT) + #define glCompressedMultiTexImage2DEXT MANGLE(CompressedMultiTexImage2DEXT) +@@ -310,10 +327,18 @@ + #define glCreateShader MANGLE(CreateShader) + #define glCreateShaderObjectARB MANGLE(CreateShaderObjectARB) + #define glCreateShaderProgramEXT MANGLE(CreateShaderProgramEXT) ++#define glCreateShaderProgramv MANGLE(CreateShaderProgramv) ++#define glCreateSyncFromCLeventARB MANGLE(CreateSyncFromCLeventARB) + #define glCullFace MANGLE(CullFace) + #define glCullParameterdvEXT MANGLE(CullParameterdvEXT) + #define glCullParameterfvEXT MANGLE(CullParameterfvEXT) + #define glCurrentPaletteMatrixARB MANGLE(CurrentPaletteMatrixARB) ++#define glDebugMessageCallbackAMD MANGLE(DebugMessageCallbackAMD) ++#define glDebugMessageCallbackARB MANGLE(DebugMessageCallbackARB) ++#define glDebugMessageControlARB MANGLE(DebugMessageControlARB) ++#define glDebugMessageEnableAMD MANGLE(DebugMessageEnableAMD) ++#define glDebugMessageInsertAMD MANGLE(DebugMessageInsertAMD) ++#define glDebugMessageInsertARB MANGLE(DebugMessageInsertARB) + #define glDeformationMap3dSGIX MANGLE(DeformationMap3dSGIX) + #define glDeformationMap3fSGIX MANGLE(DeformationMap3fSGIX) + #define glDeformSGIX MANGLE(DeformSGIX) +@@ -326,20 +351,25 @@ + #define glDeleteFramebuffersEXT MANGLE(DeleteFramebuffersEXT) + #define glDeleteFramebuffers MANGLE(DeleteFramebuffers) + #define glDeleteLists MANGLE(DeleteLists) ++#define glDeleteNamedStringARB MANGLE(DeleteNamedStringARB) ++#define glDeleteNamesAMD MANGLE(DeleteNamesAMD) + #define glDeleteObjectARB MANGLE(DeleteObjectARB) + #define glDeleteOcclusionQueriesNV MANGLE(DeleteOcclusionQueriesNV) + #define glDeletePerfMonitorsAMD MANGLE(DeletePerfMonitorsAMD) + #define glDeleteProgram MANGLE(DeleteProgram) ++#define glDeleteProgramPipelines MANGLE(DeleteProgramPipelines) + #define glDeleteProgramsARB MANGLE(DeleteProgramsARB) + #define glDeleteProgramsNV MANGLE(DeleteProgramsNV) + #define glDeleteQueriesARB MANGLE(DeleteQueriesARB) + #define glDeleteQueries MANGLE(DeleteQueries) + #define glDeleteRenderbuffersEXT MANGLE(DeleteRenderbuffersEXT) + #define glDeleteRenderbuffers MANGLE(DeleteRenderbuffers) ++#define glDeleteSamplers MANGLE(DeleteSamplers) + #define glDeleteShader MANGLE(DeleteShader) + #define glDeleteSync MANGLE(DeleteSync) + #define glDeleteTexturesEXT MANGLE(DeleteTexturesEXT) + #define glDeleteTextures MANGLE(DeleteTextures) ++#define glDeleteTransformFeedbacks MANGLE(DeleteTransformFeedbacks) + #define glDeleteTransformFeedbacksNV MANGLE(DeleteTransformFeedbacksNV) + #define glDeleteVertexArraysAPPLE MANGLE(DeleteVertexArraysAPPLE) + #define glDeleteVertexArrays MANGLE(DeleteVertexArrays) +@@ -348,7 +378,10 @@ + #define glDepthBoundsEXT MANGLE(DepthBoundsEXT) + #define glDepthFunc MANGLE(DepthFunc) + #define glDepthMask MANGLE(DepthMask) ++#define glDepthRangeArrayv MANGLE(DepthRangeArrayv) + #define glDepthRangedNV MANGLE(DepthRangedNV) ++#define glDepthRangef MANGLE(DepthRangef) ++#define glDepthRangeIndexed MANGLE(DepthRangeIndexed) + #define glDepthRange MANGLE(DepthRange) + #define glDetachObjectARB MANGLE(DetachObjectARB) + #define glDetachShader MANGLE(DetachShader) +@@ -363,6 +396,7 @@ + #define glDisableVertexAttribArrayARB MANGLE(DisableVertexAttribArrayARB) + #define glDisableVertexAttribArray MANGLE(DisableVertexAttribArray) + #define glDrawArraysEXT MANGLE(DrawArraysEXT) ++#define glDrawArraysIndirect MANGLE(DrawArraysIndirect) + #define glDrawArraysInstancedARB MANGLE(DrawArraysInstancedARB) + #define glDrawArraysInstancedEXT MANGLE(DrawArraysInstancedEXT) + #define glDrawArraysInstanced MANGLE(DrawArraysInstanced) +@@ -374,6 +408,7 @@ + #define glDrawElementArrayAPPLE MANGLE(DrawElementArrayAPPLE) + #define glDrawElementArrayATI MANGLE(DrawElementArrayATI) + #define glDrawElementsBaseVertex MANGLE(DrawElementsBaseVertex) ++#define glDrawElementsIndirect MANGLE(DrawElementsIndirect) + #define glDrawElementsInstancedARB MANGLE(DrawElementsInstancedARB) + #define glDrawElementsInstancedBaseVertex MANGLE(DrawElementsInstancedBaseVertex) + #define glDrawElementsInstancedEXT MANGLE(DrawElementsInstancedEXT) +@@ -386,7 +421,9 @@ + #define glDrawRangeElementsBaseVertex MANGLE(DrawRangeElementsBaseVertex) + #define glDrawRangeElementsEXT MANGLE(DrawRangeElementsEXT) + #define glDrawRangeElements MANGLE(DrawRangeElements) ++#define glDrawTransformFeedback MANGLE(DrawTransformFeedback) + #define glDrawTransformFeedbackNV MANGLE(DrawTransformFeedbackNV) ++#define glDrawTransformFeedbackStream MANGLE(DrawTransformFeedbackStream) + #define glEdgeFlagFormatNV MANGLE(EdgeFlagFormatNV) + #define glEdgeFlag MANGLE(EdgeFlag) + #define glEdgeFlagPointerEXT MANGLE(EdgeFlagPointerEXT) +@@ -414,6 +451,7 @@ + #define glEndOcclusionQueryNV MANGLE(EndOcclusionQueryNV) + #define glEndPerfMonitorAMD MANGLE(EndPerfMonitorAMD) + #define glEndQueryARB MANGLE(EndQueryARB) ++#define glEndQueryIndexed MANGLE(EndQueryIndexed) + #define glEndQuery MANGLE(EndQuery) + #define glEndTransformFeedbackEXT MANGLE(EndTransformFeedbackEXT) + #define glEndTransformFeedback MANGLE(EndTransformFeedback) +@@ -447,6 +485,7 @@ + #define glFlush MANGLE(Flush) + #define glFlushMappedBufferRangeAPPLE MANGLE(FlushMappedBufferRangeAPPLE) + #define glFlushMappedBufferRange MANGLE(FlushMappedBufferRange) ++#define glFlushMappedNamedBufferRangeEXT MANGLE(FlushMappedNamedBufferRangeEXT) + #define glFlushPixelDataRangeNV MANGLE(FlushPixelDataRangeNV) + #define glFlushRasterSGIX MANGLE(FlushRasterSGIX) + #define glFlushVertexArrayRangeAPPLE MANGLE(FlushVertexArrayRangeAPPLE) +@@ -498,7 +537,6 @@ + #define glFramebufferTextureEXT MANGLE(FramebufferTextureEXT) + #define glFramebufferTextureFaceARB MANGLE(FramebufferTextureFaceARB) + #define glFramebufferTextureFaceEXT MANGLE(FramebufferTextureFaceEXT) +-#define glFramebufferTextureFace MANGLE(FramebufferTextureFace) + #define glFramebufferTextureLayerARB MANGLE(FramebufferTextureLayerARB) + #define glFramebufferTextureLayerEXT MANGLE(FramebufferTextureLayerEXT) + #define glFramebufferTextureLayer MANGLE(FramebufferTextureLayer) +@@ -521,23 +559,30 @@ + #define glGenFramebuffersEXT MANGLE(GenFramebuffersEXT) + #define glGenFramebuffers MANGLE(GenFramebuffers) + #define glGenLists MANGLE(GenLists) ++#define glGenNamesAMD MANGLE(GenNamesAMD) + #define glGenOcclusionQueriesNV MANGLE(GenOcclusionQueriesNV) + #define glGenPerfMonitorsAMD MANGLE(GenPerfMonitorsAMD) ++#define glGenProgramPipelines MANGLE(GenProgramPipelines) + #define glGenProgramsARB MANGLE(GenProgramsARB) + #define glGenProgramsNV MANGLE(GenProgramsNV) + #define glGenQueriesARB MANGLE(GenQueriesARB) + #define glGenQueries MANGLE(GenQueries) + #define glGenRenderbuffersEXT MANGLE(GenRenderbuffersEXT) + #define glGenRenderbuffers MANGLE(GenRenderbuffers) ++#define glGenSamplers MANGLE(GenSamplers) + #define glGenSymbolsEXT MANGLE(GenSymbolsEXT) + #define glGenTexturesEXT MANGLE(GenTexturesEXT) + #define glGenTextures MANGLE(GenTextures) ++#define glGenTransformFeedbacks MANGLE(GenTransformFeedbacks) + #define glGenTransformFeedbacksNV MANGLE(GenTransformFeedbacksNV) + #define glGenVertexArraysAPPLE MANGLE(GenVertexArraysAPPLE) + #define glGenVertexArrays MANGLE(GenVertexArrays) + #define glGenVertexShadersEXT MANGLE(GenVertexShadersEXT) + #define glGetActiveAttribARB MANGLE(GetActiveAttribARB) + #define glGetActiveAttrib MANGLE(GetActiveAttrib) ++#define glGetActiveSubroutineName MANGLE(GetActiveSubroutineName) ++#define glGetActiveSubroutineUniformiv MANGLE(GetActiveSubroutineUniformiv) ++#define glGetActiveSubroutineUniformName MANGLE(GetActiveSubroutineUniformName) + #define glGetActiveUniformARB MANGLE(GetActiveUniformARB) + #define glGetActiveUniformBlockiv MANGLE(GetActiveUniformBlockiv) + #define glGetActiveUniformBlockName MANGLE(GetActiveUniformBlockName) +@@ -589,16 +634,21 @@ + #define glGetConvolutionParameteriv MANGLE(GetConvolutionParameteriv) + #define glGetDebugLogLengthMESA MANGLE(GetDebugLogLengthMESA) + #define glGetDebugLogMESA MANGLE(GetDebugLogMESA) ++#define glGetDebugMessageLogAMD MANGLE(GetDebugMessageLogAMD) ++#define glGetDebugMessageLogARB MANGLE(GetDebugMessageLogARB) + #define glGetDetailTexFuncSGIS MANGLE(GetDetailTexFuncSGIS) + #define glGetDoubleIndexedvEXT MANGLE(GetDoubleIndexedvEXT) ++#define glGetDoublei_v MANGLE(GetDoublei_v) + #define glGetDoublev MANGLE(GetDoublev) + #define glGetError MANGLE(GetError) + #define glGetFenceivNV MANGLE(GetFenceivNV) + #define glGetFinalCombinerInputParameterfvNV MANGLE(GetFinalCombinerInputParameterfvNV) + #define glGetFinalCombinerInputParameterivNV MANGLE(GetFinalCombinerInputParameterivNV) + #define glGetFloatIndexedvEXT MANGLE(GetFloatIndexedvEXT) ++#define glGetFloati_v MANGLE(GetFloati_v) + #define glGetFloatv MANGLE(GetFloatv) + #define glGetFogFuncSGIS MANGLE(GetFogFuncSGIS) ++#define glGetFragDataIndex MANGLE(GetFragDataIndex) + #define glGetFragDataLocationEXT MANGLE(GetFragDataLocationEXT) + #define glGetFragDataLocation MANGLE(GetFragDataLocation) + #define glGetFragmentLightfvSGIX MANGLE(GetFragmentLightfvSGIX) +@@ -608,6 +658,7 @@ + #define glGetFramebufferAttachmentParameterivEXT MANGLE(GetFramebufferAttachmentParameterivEXT) + #define glGetFramebufferAttachmentParameteriv MANGLE(GetFramebufferAttachmentParameteriv) + #define glGetFramebufferParameterivEXT MANGLE(GetFramebufferParameterivEXT) ++#define glGetGraphicsResetStatusARB MANGLE(GetGraphicsResetStatusARB) + #define glGetHandleARB MANGLE(GetHandleARB) + #define glGetHistogramEXT MANGLE(GetHistogramEXT) + #define glGetHistogram MANGLE(GetHistogram) +@@ -678,6 +729,26 @@ + #define glGetNamedProgramLocalParameterIuivEXT MANGLE(GetNamedProgramLocalParameterIuivEXT) + #define glGetNamedProgramStringEXT MANGLE(GetNamedProgramStringEXT) + #define glGetNamedRenderbufferParameterivEXT MANGLE(GetNamedRenderbufferParameterivEXT) ++#define glGetNamedStringARB MANGLE(GetNamedStringARB) ++#define glGetNamedStringivARB MANGLE(GetNamedStringivARB) ++#define glGetnColorTableARB MANGLE(GetnColorTableARB) ++#define glGetnCompressedTexImageARB MANGLE(GetnCompressedTexImageARB) ++#define glGetnConvolutionFilterARB MANGLE(GetnConvolutionFilterARB) ++#define glGetnHistogramARB MANGLE(GetnHistogramARB) ++#define glGetnMapdvARB MANGLE(GetnMapdvARB) ++#define glGetnMapfvARB MANGLE(GetnMapfvARB) ++#define glGetnMapivARB MANGLE(GetnMapivARB) ++#define glGetnMinmaxARB MANGLE(GetnMinmaxARB) ++#define glGetnPixelMapfvARB MANGLE(GetnPixelMapfvARB) ++#define glGetnPixelMapuivARB MANGLE(GetnPixelMapuivARB) ++#define glGetnPixelMapusvARB MANGLE(GetnPixelMapusvARB) ++#define glGetnPolygonStippleARB MANGLE(GetnPolygonStippleARB) ++#define glGetnSeparableFilterARB MANGLE(GetnSeparableFilterARB) ++#define glGetnTexImageARB MANGLE(GetnTexImageARB) ++#define glGetnUniformdvARB MANGLE(GetnUniformdvARB) ++#define glGetnUniformfvARB MANGLE(GetnUniformfvARB) ++#define glGetnUniformivARB MANGLE(GetnUniformivARB) ++#define glGetnUniformuivARB MANGLE(GetnUniformuivARB) + #define glGetObjectBufferfvATI MANGLE(GetObjectBufferfvATI) + #define glGetObjectBufferivATI MANGLE(GetObjectBufferivATI) + #define glGetObjectParameterfvARB MANGLE(GetObjectParameterfvARB) +@@ -700,6 +771,7 @@ + #define glGetPointervEXT MANGLE(GetPointervEXT) + #define glGetPointerv MANGLE(GetPointerv) + #define glGetPolygonStipple MANGLE(GetPolygonStipple) ++#define glGetProgramBinary MANGLE(GetProgramBinary) + #define glGetProgramEnvParameterdvARB MANGLE(GetProgramEnvParameterdvARB) + #define glGetProgramEnvParameterfvARB MANGLE(GetProgramEnvParameterfvARB) + #define glGetProgramEnvParameterIivNV MANGLE(GetProgramEnvParameterIivNV) +@@ -716,28 +788,42 @@ + #define glGetProgramNamedParameterfvNV MANGLE(GetProgramNamedParameterfvNV) + #define glGetProgramParameterdvNV MANGLE(GetProgramParameterdvNV) + #define glGetProgramParameterfvNV MANGLE(GetProgramParameterfvNV) ++#define glGetProgramPipelineInfoLog MANGLE(GetProgramPipelineInfoLog) ++#define glGetProgramPipelineiv MANGLE(GetProgramPipelineiv) + #define glGetProgramRegisterfvMESA MANGLE(GetProgramRegisterfvMESA) ++#define glGetProgramStageiv MANGLE(GetProgramStageiv) + #define glGetProgramStringARB MANGLE(GetProgramStringARB) + #define glGetProgramStringNV MANGLE(GetProgramStringNV) ++#define glGetProgramSubroutineParameteruivNV MANGLE(GetProgramSubroutineParameteruivNV) ++#define glGetQueryIndexediv MANGLE(GetQueryIndexediv) + #define glGetQueryivARB MANGLE(GetQueryivARB) + #define glGetQueryiv MANGLE(GetQueryiv) + #define glGetQueryObjecti64vEXT MANGLE(GetQueryObjecti64vEXT) ++#define glGetQueryObjecti64v MANGLE(GetQueryObjecti64v) + #define glGetQueryObjectivARB MANGLE(GetQueryObjectivARB) + #define glGetQueryObjectiv MANGLE(GetQueryObjectiv) + #define glGetQueryObjectui64vEXT MANGLE(GetQueryObjectui64vEXT) ++#define glGetQueryObjectui64v MANGLE(GetQueryObjectui64v) + #define glGetQueryObjectuivARB MANGLE(GetQueryObjectuivARB) + #define glGetQueryObjectuiv MANGLE(GetQueryObjectuiv) + #define glGetRenderbufferParameterivEXT MANGLE(GetRenderbufferParameterivEXT) + #define glGetRenderbufferParameteriv MANGLE(GetRenderbufferParameteriv) ++#define glGetSamplerParameterfv MANGLE(GetSamplerParameterfv) ++#define glGetSamplerParameterIiv MANGLE(GetSamplerParameterIiv) ++#define glGetSamplerParameterIuiv MANGLE(GetSamplerParameterIuiv) ++#define glGetSamplerParameteriv MANGLE(GetSamplerParameteriv) + #define glGetSeparableFilterEXT MANGLE(GetSeparableFilterEXT) + #define glGetSeparableFilter MANGLE(GetSeparableFilter) + #define glGetShaderInfoLog MANGLE(GetShaderInfoLog) + #define glGetShaderiv MANGLE(GetShaderiv) ++#define glGetShaderPrecisionFormat MANGLE(GetShaderPrecisionFormat) + #define glGetShaderSourceARB MANGLE(GetShaderSourceARB) + #define glGetShaderSource MANGLE(GetShaderSource) + #define glGetSharpenTexFuncSGIS MANGLE(GetSharpenTexFuncSGIS) + #define glGetStringi MANGLE(GetStringi) + #define glGetString MANGLE(GetString) ++#define glGetSubroutineIndex MANGLE(GetSubroutineIndex) ++#define glGetSubroutineUniformLocation MANGLE(GetSubroutineUniformLocation) + #define glGetSynciv MANGLE(GetSynciv) + #define glGetTexBumpParameterfvATI MANGLE(GetTexBumpParameterfvATI) + #define glGetTexBumpParameterivATI MANGLE(GetTexBumpParameterivATI) +@@ -770,14 +856,17 @@ + #define glGetTransformFeedbackVaryingNV MANGLE(GetTransformFeedbackVaryingNV) + #define glGetUniformBlockIndex MANGLE(GetUniformBlockIndex) + #define glGetUniformBufferSizeEXT MANGLE(GetUniformBufferSizeEXT) ++#define glGetUniformdv MANGLE(GetUniformdv) + #define glGetUniformfvARB MANGLE(GetUniformfvARB) + #define glGetUniformfv MANGLE(GetUniformfv) ++#define glGetUniformi64vNV MANGLE(GetUniformi64vNV) + #define glGetUniformIndices MANGLE(GetUniformIndices) + #define glGetUniformivARB MANGLE(GetUniformivARB) + #define glGetUniformiv MANGLE(GetUniformiv) + #define glGetUniformLocationARB MANGLE(GetUniformLocationARB) + #define glGetUniformLocation MANGLE(GetUniformLocation) + #define glGetUniformOffsetEXT MANGLE(GetUniformOffsetEXT) ++#define glGetUniformSubroutineuiv MANGLE(GetUniformSubroutineuiv) + #define glGetUniformui64vNV MANGLE(GetUniformui64vNV) + #define glGetUniformuivEXT MANGLE(GetUniformuivEXT) + #define glGetUniformuiv MANGLE(GetUniformuiv) +@@ -803,6 +892,10 @@ + #define glGetVertexAttribivARB MANGLE(GetVertexAttribivARB) + #define glGetVertexAttribiv MANGLE(GetVertexAttribiv) + #define glGetVertexAttribivNV MANGLE(GetVertexAttribivNV) ++#define glGetVertexAttribLdvEXT MANGLE(GetVertexAttribLdvEXT) ++#define glGetVertexAttribLdv MANGLE(GetVertexAttribLdv) ++#define glGetVertexAttribLi64vNV MANGLE(GetVertexAttribLi64vNV) ++#define glGetVertexAttribLui64vNV MANGLE(GetVertexAttribLui64vNV) + #define glGetVertexAttribPointervARB MANGLE(GetVertexAttribPointervARB) + #define glGetVertexAttribPointerv MANGLE(GetVertexAttribPointerv) + #define glGetVertexAttribPointervNV MANGLE(GetVertexAttribPointervNV) +@@ -864,20 +957,25 @@ + #define glIsFramebufferEXT MANGLE(IsFramebufferEXT) + #define glIsFramebuffer MANGLE(IsFramebuffer) + #define glIsList MANGLE(IsList) ++#define glIsNameAMD MANGLE(IsNameAMD) + #define glIsNamedBufferResidentNV MANGLE(IsNamedBufferResidentNV) ++#define glIsNamedStringARB MANGLE(IsNamedStringARB) + #define glIsObjectBufferATI MANGLE(IsObjectBufferATI) + #define glIsOcclusionQueryNV MANGLE(IsOcclusionQueryNV) + #define glIsProgramARB MANGLE(IsProgramARB) + #define glIsProgram MANGLE(IsProgram) + #define glIsProgramNV MANGLE(IsProgramNV) ++#define glIsProgramPipeline MANGLE(IsProgramPipeline) + #define glIsQueryARB MANGLE(IsQueryARB) + #define glIsQuery MANGLE(IsQuery) + #define glIsRenderbufferEXT MANGLE(IsRenderbufferEXT) + #define glIsRenderbuffer MANGLE(IsRenderbuffer) ++#define glIsSampler MANGLE(IsSampler) + #define glIsShader MANGLE(IsShader) + #define glIsSync MANGLE(IsSync) + #define glIsTextureEXT MANGLE(IsTextureEXT) + #define glIsTexture MANGLE(IsTexture) ++#define glIsTransformFeedback MANGLE(IsTransformFeedback) + #define glIsTransformFeedbackNV MANGLE(IsTransformFeedbackNV) + #define glIsVariantEnabledEXT MANGLE(IsVariantEnabledEXT) + #define glIsVertexArrayAPPLE MANGLE(IsVertexArrayAPPLE) +@@ -915,6 +1013,8 @@ + #define glLogicOp MANGLE(LogicOp) + #define glMakeBufferNonResidentNV MANGLE(MakeBufferNonResidentNV) + #define glMakeBufferResidentNV MANGLE(MakeBufferResidentNV) ++#define glMakeNamedBufferNonResidentNV MANGLE(MakeNamedBufferNonResidentNV) ++#define glMakeNamedBufferResidentNV MANGLE(MakeNamedBufferResidentNV) + #define glMap1d MANGLE(Map1d) + #define glMap1f MANGLE(Map1f) + #define glMap2d MANGLE(Map2d) +@@ -928,6 +1028,7 @@ + #define glMapGrid2d MANGLE(MapGrid2d) + #define glMapGrid2f MANGLE(MapGrid2f) + #define glMapNamedBufferEXT MANGLE(MapNamedBufferEXT) ++#define glMapNamedBufferRangeEXT MANGLE(MapNamedBufferRangeEXT) + #define glMapObjectBufferATI MANGLE(MapObjectBufferATI) + #define glMapParameterfvNV MANGLE(MapParameterfvNV) + #define glMapParameterivNV MANGLE(MapParameterivNV) +@@ -963,8 +1064,10 @@ + #define glMatrixScalefEXT MANGLE(MatrixScalefEXT) + #define glMatrixTranslatedEXT MANGLE(MatrixTranslatedEXT) + #define glMatrixTranslatefEXT MANGLE(MatrixTranslatefEXT) ++#define glMemoryBarrierEXT MANGLE(MemoryBarrierEXT) + #define glMinmaxEXT MANGLE(MinmaxEXT) + #define glMinmax MANGLE(Minmax) ++#define glMinSampleShadingARB MANGLE(MinSampleShadingARB) + #define glMinSampleShading MANGLE(MinSampleShading) + #define glMultiDrawArraysEXT MANGLE(MultiDrawArraysEXT) + #define glMultiDrawArrays MANGLE(MultiDrawArrays) +@@ -1048,6 +1151,14 @@ + #define glMultiTexCoord4s MANGLE(MultiTexCoord4s) + #define glMultiTexCoord4svARB MANGLE(MultiTexCoord4svARB) + #define glMultiTexCoord4sv MANGLE(MultiTexCoord4sv) ++#define glMultiTexCoordP1ui MANGLE(MultiTexCoordP1ui) ++#define glMultiTexCoordP1uiv MANGLE(MultiTexCoordP1uiv) ++#define glMultiTexCoordP2ui MANGLE(MultiTexCoordP2ui) ++#define glMultiTexCoordP2uiv MANGLE(MultiTexCoordP2uiv) ++#define glMultiTexCoordP3ui MANGLE(MultiTexCoordP3ui) ++#define glMultiTexCoordP3uiv MANGLE(MultiTexCoordP3uiv) ++#define glMultiTexCoordP4ui MANGLE(MultiTexCoordP4ui) ++#define glMultiTexCoordP4uiv MANGLE(MultiTexCoordP4uiv) + #define glMultiTexCoordPointerEXT MANGLE(MultiTexCoordPointerEXT) + #define glMultiTexEnvfEXT MANGLE(MultiTexEnvfEXT) + #define glMultiTexEnvfvEXT MANGLE(MultiTexEnvfvEXT) +@@ -1080,6 +1191,7 @@ + #define glMultTransposeMatrixf MANGLE(MultTransposeMatrixf) + #define glNamedBufferDataEXT MANGLE(NamedBufferDataEXT) + #define glNamedBufferSubDataEXT MANGLE(NamedBufferSubDataEXT) ++#define glNamedCopyBufferSubDataEXT MANGLE(NamedCopyBufferSubDataEXT) + #define glNamedFramebufferRenderbufferEXT MANGLE(NamedFramebufferRenderbufferEXT) + #define glNamedFramebufferTexture1DEXT MANGLE(NamedFramebufferTexture1DEXT) + #define glNamedFramebufferTexture2DEXT MANGLE(NamedFramebufferTexture2DEXT) +@@ -1087,8 +1199,6 @@ + #define glNamedFramebufferTextureEXT MANGLE(NamedFramebufferTextureEXT) + #define glNamedFramebufferTextureFaceEXT MANGLE(NamedFramebufferTextureFaceEXT) + #define glNamedFramebufferTextureLayerEXT MANGLE(NamedFramebufferTextureLayerEXT) +-#define glNamedMakeBufferNonResidentNV MANGLE(NamedMakeBufferNonResidentNV) +-#define glNamedMakeBufferResidentNV MANGLE(NamedMakeBufferResidentNV) + #define glNamedProgramLocalParameter4dEXT MANGLE(NamedProgramLocalParameter4dEXT) + #define glNamedProgramLocalParameter4dvEXT MANGLE(NamedProgramLocalParameter4dvEXT) + #define glNamedProgramLocalParameter4fEXT MANGLE(NamedProgramLocalParameter4fEXT) +@@ -1104,6 +1214,7 @@ + #define glNamedRenderbufferStorageEXT MANGLE(NamedRenderbufferStorageEXT) + #define glNamedRenderbufferStorageMultisampleCoverageEXT MANGLE(NamedRenderbufferStorageMultisampleCoverageEXT) + #define glNamedRenderbufferStorageMultisampleEXT MANGLE(NamedRenderbufferStorageMultisampleEXT) ++#define glNamedStringARB MANGLE(NamedStringARB) + #define glNewList MANGLE(NewList) + #define glNewObjectBufferATI MANGLE(NewObjectBufferATI) + #define glNormal3b MANGLE(Normal3b) +@@ -1121,6 +1232,8 @@ + #define glNormal3s MANGLE(Normal3s) + #define glNormal3sv MANGLE(Normal3sv) + #define glNormalFormatNV MANGLE(NormalFormatNV) ++#define glNormalP3ui MANGLE(NormalP3ui) ++#define glNormalP3uiv MANGLE(NormalP3uiv) + #define glNormalPointerEXT MANGLE(NormalPointerEXT) + #define glNormalPointerListIBM MANGLE(NormalPointerListIBM) + #define glNormalPointer MANGLE(NormalPointer) +@@ -1140,6 +1253,9 @@ + #define glOrtho MANGLE(Ortho) + #define glPassTexCoordATI MANGLE(PassTexCoordATI) + #define glPassThrough MANGLE(PassThrough) ++#define glPatchParameterfv MANGLE(PatchParameterfv) ++#define glPatchParameteri MANGLE(PatchParameteri) ++#define glPauseTransformFeedback MANGLE(PauseTransformFeedback) + #define glPauseTransformFeedbackNV MANGLE(PauseTransformFeedbackNV) + #define glPixelDataRangeNV MANGLE(PixelDataRangeNV) + #define glPixelMapfv MANGLE(PixelMapfv) +@@ -1191,6 +1307,7 @@ + #define glPrimitiveRestartNV MANGLE(PrimitiveRestartNV) + #define glPrioritizeTexturesEXT MANGLE(PrioritizeTexturesEXT) + #define glPrioritizeTextures MANGLE(PrioritizeTextures) ++#define glProgramBinary MANGLE(ProgramBinary) + #define glProgramBufferParametersfvNV MANGLE(ProgramBufferParametersfvNV) + #define glProgramBufferParametersIivNV MANGLE(ProgramBufferParametersIivNV) + #define glProgramBufferParametersIuivNV MANGLE(ProgramBufferParametersIuivNV) +@@ -1231,39 +1348,123 @@ + #define glProgramParameters4dvNV MANGLE(ProgramParameters4dvNV) + #define glProgramParameters4fvNV MANGLE(ProgramParameters4fvNV) + #define glProgramStringARB MANGLE(ProgramStringARB) ++#define glProgramSubroutineParametersuivNV MANGLE(ProgramSubroutineParametersuivNV) ++#define glProgramUniform1dEXT MANGLE(ProgramUniform1dEXT) ++#define glProgramUniform1d MANGLE(ProgramUniform1d) ++#define glProgramUniform1dvEXT MANGLE(ProgramUniform1dvEXT) ++#define glProgramUniform1dv MANGLE(ProgramUniform1dv) + #define glProgramUniform1fEXT MANGLE(ProgramUniform1fEXT) ++#define glProgramUniform1f MANGLE(ProgramUniform1f) + #define glProgramUniform1fvEXT MANGLE(ProgramUniform1fvEXT) ++#define glProgramUniform1fv MANGLE(ProgramUniform1fv) ++#define glProgramUniform1i64NV MANGLE(ProgramUniform1i64NV) ++#define glProgramUniform1i64vNV MANGLE(ProgramUniform1i64vNV) + #define glProgramUniform1iEXT MANGLE(ProgramUniform1iEXT) ++#define glProgramUniform1i MANGLE(ProgramUniform1i) + #define glProgramUniform1ivEXT MANGLE(ProgramUniform1ivEXT) ++#define glProgramUniform1iv MANGLE(ProgramUniform1iv) ++#define glProgramUniform1ui64NV MANGLE(ProgramUniform1ui64NV) ++#define glProgramUniform1ui64vNV MANGLE(ProgramUniform1ui64vNV) + #define glProgramUniform1uiEXT MANGLE(ProgramUniform1uiEXT) ++#define glProgramUniform1ui MANGLE(ProgramUniform1ui) + #define glProgramUniform1uivEXT MANGLE(ProgramUniform1uivEXT) ++#define glProgramUniform1uiv MANGLE(ProgramUniform1uiv) ++#define glProgramUniform2dEXT MANGLE(ProgramUniform2dEXT) ++#define glProgramUniform2d MANGLE(ProgramUniform2d) ++#define glProgramUniform2dvEXT MANGLE(ProgramUniform2dvEXT) ++#define glProgramUniform2dv MANGLE(ProgramUniform2dv) + #define glProgramUniform2fEXT MANGLE(ProgramUniform2fEXT) ++#define glProgramUniform2f MANGLE(ProgramUniform2f) + #define glProgramUniform2fvEXT MANGLE(ProgramUniform2fvEXT) ++#define glProgramUniform2fv MANGLE(ProgramUniform2fv) ++#define glProgramUniform2i64NV MANGLE(ProgramUniform2i64NV) ++#define glProgramUniform2i64vNV MANGLE(ProgramUniform2i64vNV) + #define glProgramUniform2iEXT MANGLE(ProgramUniform2iEXT) ++#define glProgramUniform2i MANGLE(ProgramUniform2i) + #define glProgramUniform2ivEXT MANGLE(ProgramUniform2ivEXT) ++#define glProgramUniform2iv MANGLE(ProgramUniform2iv) ++#define glProgramUniform2ui64NV MANGLE(ProgramUniform2ui64NV) ++#define glProgramUniform2ui64vNV MANGLE(ProgramUniform2ui64vNV) + #define glProgramUniform2uiEXT MANGLE(ProgramUniform2uiEXT) ++#define glProgramUniform2ui MANGLE(ProgramUniform2ui) + #define glProgramUniform2uivEXT MANGLE(ProgramUniform2uivEXT) ++#define glProgramUniform2uiv MANGLE(ProgramUniform2uiv) ++#define glProgramUniform3dEXT MANGLE(ProgramUniform3dEXT) ++#define glProgramUniform3d MANGLE(ProgramUniform3d) ++#define glProgramUniform3dvEXT MANGLE(ProgramUniform3dvEXT) ++#define glProgramUniform3dv MANGLE(ProgramUniform3dv) + #define glProgramUniform3fEXT MANGLE(ProgramUniform3fEXT) ++#define glProgramUniform3f MANGLE(ProgramUniform3f) + #define glProgramUniform3fvEXT MANGLE(ProgramUniform3fvEXT) ++#define glProgramUniform3fv MANGLE(ProgramUniform3fv) ++#define glProgramUniform3i64NV MANGLE(ProgramUniform3i64NV) ++#define glProgramUniform3i64vNV MANGLE(ProgramUniform3i64vNV) + #define glProgramUniform3iEXT MANGLE(ProgramUniform3iEXT) ++#define glProgramUniform3i MANGLE(ProgramUniform3i) + #define glProgramUniform3ivEXT MANGLE(ProgramUniform3ivEXT) ++#define glProgramUniform3iv MANGLE(ProgramUniform3iv) ++#define glProgramUniform3ui64NV MANGLE(ProgramUniform3ui64NV) ++#define glProgramUniform3ui64vNV MANGLE(ProgramUniform3ui64vNV) + #define glProgramUniform3uiEXT MANGLE(ProgramUniform3uiEXT) ++#define glProgramUniform3ui MANGLE(ProgramUniform3ui) + #define glProgramUniform3uivEXT MANGLE(ProgramUniform3uivEXT) ++#define glProgramUniform3uiv MANGLE(ProgramUniform3uiv) ++#define glProgramUniform4dEXT MANGLE(ProgramUniform4dEXT) ++#define glProgramUniform4d MANGLE(ProgramUniform4d) ++#define glProgramUniform4dvEXT MANGLE(ProgramUniform4dvEXT) ++#define glProgramUniform4dv MANGLE(ProgramUniform4dv) + #define glProgramUniform4fEXT MANGLE(ProgramUniform4fEXT) ++#define glProgramUniform4f MANGLE(ProgramUniform4f) + #define glProgramUniform4fvEXT MANGLE(ProgramUniform4fvEXT) ++#define glProgramUniform4fv MANGLE(ProgramUniform4fv) ++#define glProgramUniform4i64NV MANGLE(ProgramUniform4i64NV) ++#define glProgramUniform4i64vNV MANGLE(ProgramUniform4i64vNV) + #define glProgramUniform4iEXT MANGLE(ProgramUniform4iEXT) ++#define glProgramUniform4i MANGLE(ProgramUniform4i) + #define glProgramUniform4ivEXT MANGLE(ProgramUniform4ivEXT) ++#define glProgramUniform4iv MANGLE(ProgramUniform4iv) ++#define glProgramUniform4ui64NV MANGLE(ProgramUniform4ui64NV) ++#define glProgramUniform4ui64vNV MANGLE(ProgramUniform4ui64vNV) + #define glProgramUniform4uiEXT MANGLE(ProgramUniform4uiEXT) ++#define glProgramUniform4ui MANGLE(ProgramUniform4ui) + #define glProgramUniform4uivEXT MANGLE(ProgramUniform4uivEXT) ++#define glProgramUniform4uiv MANGLE(ProgramUniform4uiv) ++#define glProgramUniformMatrix2dvEXT MANGLE(ProgramUniformMatrix2dvEXT) ++#define glProgramUniformMatrix2dv MANGLE(ProgramUniformMatrix2dv) + #define glProgramUniformMatrix2fvEXT MANGLE(ProgramUniformMatrix2fvEXT) ++#define glProgramUniformMatrix2fv MANGLE(ProgramUniformMatrix2fv) ++#define glProgramUniformMatrix2x3dvEXT MANGLE(ProgramUniformMatrix2x3dvEXT) ++#define glProgramUniformMatrix2x3dv MANGLE(ProgramUniformMatrix2x3dv) + #define glProgramUniformMatrix2x3fvEXT MANGLE(ProgramUniformMatrix2x3fvEXT) ++#define glProgramUniformMatrix2x3fv MANGLE(ProgramUniformMatrix2x3fv) ++#define glProgramUniformMatrix2x4dvEXT MANGLE(ProgramUniformMatrix2x4dvEXT) ++#define glProgramUniformMatrix2x4dv MANGLE(ProgramUniformMatrix2x4dv) + #define glProgramUniformMatrix2x4fvEXT MANGLE(ProgramUniformMatrix2x4fvEXT) ++#define glProgramUniformMatrix2x4fv MANGLE(ProgramUniformMatrix2x4fv) ++#define glProgramUniformMatrix3dvEXT MANGLE(ProgramUniformMatrix3dvEXT) ++#define glProgramUniformMatrix3dv MANGLE(ProgramUniformMatrix3dv) + #define glProgramUniformMatrix3fvEXT MANGLE(ProgramUniformMatrix3fvEXT) ++#define glProgramUniformMatrix3fv MANGLE(ProgramUniformMatrix3fv) ++#define glProgramUniformMatrix3x2dvEXT MANGLE(ProgramUniformMatrix3x2dvEXT) ++#define glProgramUniformMatrix3x2dv MANGLE(ProgramUniformMatrix3x2dv) + #define glProgramUniformMatrix3x2fvEXT MANGLE(ProgramUniformMatrix3x2fvEXT) ++#define glProgramUniformMatrix3x2fv MANGLE(ProgramUniformMatrix3x2fv) ++#define glProgramUniformMatrix3x4dvEXT MANGLE(ProgramUniformMatrix3x4dvEXT) ++#define glProgramUniformMatrix3x4dv MANGLE(ProgramUniformMatrix3x4dv) + #define glProgramUniformMatrix3x4fvEXT MANGLE(ProgramUniformMatrix3x4fvEXT) ++#define glProgramUniformMatrix3x4fv MANGLE(ProgramUniformMatrix3x4fv) ++#define glProgramUniformMatrix4dvEXT MANGLE(ProgramUniformMatrix4dvEXT) ++#define glProgramUniformMatrix4dv MANGLE(ProgramUniformMatrix4dv) + #define glProgramUniformMatrix4fvEXT MANGLE(ProgramUniformMatrix4fvEXT) ++#define glProgramUniformMatrix4fv MANGLE(ProgramUniformMatrix4fv) ++#define glProgramUniformMatrix4x2dvEXT MANGLE(ProgramUniformMatrix4x2dvEXT) ++#define glProgramUniformMatrix4x2dv MANGLE(ProgramUniformMatrix4x2dv) + #define glProgramUniformMatrix4x2fvEXT MANGLE(ProgramUniformMatrix4x2fvEXT) ++#define glProgramUniformMatrix4x2fv MANGLE(ProgramUniformMatrix4x2fv) ++#define glProgramUniformMatrix4x3dvEXT MANGLE(ProgramUniformMatrix4x3dvEXT) ++#define glProgramUniformMatrix4x3dv MANGLE(ProgramUniformMatrix4x3dv) + #define glProgramUniformMatrix4x3fvEXT MANGLE(ProgramUniformMatrix4x3fvEXT) ++#define glProgramUniformMatrix4x3fv MANGLE(ProgramUniformMatrix4x3fv) + #define glProgramUniformui64NV MANGLE(ProgramUniformui64NV) + #define glProgramUniformui64vNV MANGLE(ProgramUniformui64vNV) + #define glProgramVertexLimitNV MANGLE(ProgramVertexLimitNV) +@@ -1274,6 +1475,7 @@ + #define glPushClientAttrib MANGLE(PushClientAttrib) + #define glPushMatrix MANGLE(PushMatrix) + #define glPushName MANGLE(PushName) ++#define glQueryCounter MANGLE(QueryCounter) + #define glRasterPos2d MANGLE(RasterPos2d) + #define glRasterPos2dv MANGLE(RasterPos2dv) + #define glRasterPos2f MANGLE(RasterPos2f) +@@ -1300,6 +1502,7 @@ + #define glRasterPos4sv MANGLE(RasterPos4sv) + #define glReadBuffer MANGLE(ReadBuffer) + #define glReadInstrumentsSGIX MANGLE(ReadInstrumentsSGIX) ++#define glReadnPixelsARB MANGLE(ReadnPixelsARB) + #define glReadPixels MANGLE(ReadPixels) + #define glRectd MANGLE(Rectd) + #define glRectdv MANGLE(Rectdv) +@@ -1310,6 +1513,7 @@ + #define glRects MANGLE(Rects) + #define glRectsv MANGLE(Rectsv) + #define glReferencePlaneSGIX MANGLE(ReferencePlaneSGIX) ++#define glReleaseShaderCompiler MANGLE(ReleaseShaderCompiler) + #define glRenderbufferStorageEXT MANGLE(RenderbufferStorageEXT) + #define glRenderbufferStorage MANGLE(RenderbufferStorage) + #define glRenderbufferStorageMultisampleCoverageNV MANGLE(RenderbufferStorageMultisampleCoverageNV) +@@ -1345,6 +1549,7 @@ + #define glResetMinmaxEXT MANGLE(ResetMinmaxEXT) + #define glResetMinmax MANGLE(ResetMinmax) + #define glResizeBuffersMESA MANGLE(ResizeBuffersMESA) ++#define glResumeTransformFeedback MANGLE(ResumeTransformFeedback) + #define glResumeTransformFeedbackNV MANGLE(ResumeTransformFeedbackNV) + #define glRotated MANGLE(Rotated) + #define glRotatef MANGLE(Rotatef) +@@ -1357,8 +1562,17 @@ + #define glSampleMaskSGIS MANGLE(SampleMaskSGIS) + #define glSamplePatternEXT MANGLE(SamplePatternEXT) + #define glSamplePatternSGIS MANGLE(SamplePatternSGIS) ++#define glSamplerParameterf MANGLE(SamplerParameterf) ++#define glSamplerParameterfv MANGLE(SamplerParameterfv) ++#define glSamplerParameterIiv MANGLE(SamplerParameterIiv) ++#define glSamplerParameteri MANGLE(SamplerParameteri) ++#define glSamplerParameterIuiv MANGLE(SamplerParameterIuiv) ++#define glSamplerParameteriv MANGLE(SamplerParameteriv) + #define glScaled MANGLE(Scaled) + #define glScalef MANGLE(Scalef) ++#define glScissorArrayv MANGLE(ScissorArrayv) ++#define glScissorIndexed MANGLE(ScissorIndexed) ++#define glScissorIndexedv MANGLE(ScissorIndexedv) + #define glScissor MANGLE(Scissor) + #define glSecondaryColor3bEXT MANGLE(SecondaryColor3bEXT) + #define glSecondaryColor3b MANGLE(SecondaryColor3b) +@@ -1395,6 +1609,8 @@ + #define glSecondaryColor3usvEXT MANGLE(SecondaryColor3usvEXT) + #define glSecondaryColor3usv MANGLE(SecondaryColor3usv) + #define glSecondaryColorFormatNV MANGLE(SecondaryColorFormatNV) ++#define glSecondaryColorP3ui MANGLE(SecondaryColorP3ui) ++#define glSecondaryColorP3uiv MANGLE(SecondaryColorP3uiv) + #define glSecondaryColorPointerEXT MANGLE(SecondaryColorPointerEXT) + #define glSecondaryColorPointerListIBM MANGLE(SecondaryColorPointerListIBM) + #define glSecondaryColorPointer MANGLE(SecondaryColorPointer) +@@ -1408,6 +1624,7 @@ + #define glSetInvariantEXT MANGLE(SetInvariantEXT) + #define glSetLocalConstantEXT MANGLE(SetLocalConstantEXT) + #define glShadeModel MANGLE(ShadeModel) ++#define glShaderBinary MANGLE(ShaderBinary) + #define glShaderOp1EXT MANGLE(ShaderOp1EXT) + #define glShaderOp2EXT MANGLE(ShaderOp2EXT) + #define glShaderOp3EXT MANGLE(ShaderOp3EXT) +@@ -1509,6 +1726,14 @@ + #define glTexCoord4s MANGLE(TexCoord4s) + #define glTexCoord4sv MANGLE(TexCoord4sv) + #define glTexCoordFormatNV MANGLE(TexCoordFormatNV) ++#define glTexCoordP1ui MANGLE(TexCoordP1ui) ++#define glTexCoordP1uiv MANGLE(TexCoordP1uiv) ++#define glTexCoordP2ui MANGLE(TexCoordP2ui) ++#define glTexCoordP2uiv MANGLE(TexCoordP2uiv) ++#define glTexCoordP3ui MANGLE(TexCoordP3ui) ++#define glTexCoordP3uiv MANGLE(TexCoordP3uiv) ++#define glTexCoordP4ui MANGLE(TexCoordP4ui) ++#define glTexCoordP4uiv MANGLE(TexCoordP4uiv) + #define glTexCoordPointerEXT MANGLE(TexCoordPointerEXT) + #define glTexCoordPointerListIBM MANGLE(TexCoordPointerListIBM) + #define glTexCoordPointer MANGLE(TexCoordPointer) +@@ -1569,73 +1794,108 @@ + #define glTextureSubImage3DEXT MANGLE(TextureSubImage3DEXT) + #define glTrackMatrixNV MANGLE(TrackMatrixNV) + #define glTransformFeedbackAttribsNV MANGLE(TransformFeedbackAttribsNV) ++#define glTransformFeedbackStreamAttribsNV MANGLE(TransformFeedbackStreamAttribsNV) + #define glTransformFeedbackVaryingsEXT MANGLE(TransformFeedbackVaryingsEXT) + #define glTransformFeedbackVaryings MANGLE(TransformFeedbackVaryings) + #define glTransformFeedbackVaryingsNV MANGLE(TransformFeedbackVaryingsNV) + #define glTranslated MANGLE(Translated) + #define glTranslatef MANGLE(Translatef) ++#define glUniform1d MANGLE(Uniform1d) ++#define glUniform1dv MANGLE(Uniform1dv) + #define glUniform1fARB MANGLE(Uniform1fARB) + #define glUniform1f MANGLE(Uniform1f) + #define glUniform1fvARB MANGLE(Uniform1fvARB) + #define glUniform1fv MANGLE(Uniform1fv) ++#define glUniform1i64NV MANGLE(Uniform1i64NV) ++#define glUniform1i64vNV MANGLE(Uniform1i64vNV) + #define glUniform1iARB MANGLE(Uniform1iARB) + #define glUniform1i MANGLE(Uniform1i) + #define glUniform1ivARB MANGLE(Uniform1ivARB) + #define glUniform1iv MANGLE(Uniform1iv) ++#define glUniform1ui64NV MANGLE(Uniform1ui64NV) ++#define glUniform1ui64vNV MANGLE(Uniform1ui64vNV) + #define glUniform1uiEXT MANGLE(Uniform1uiEXT) + #define glUniform1ui MANGLE(Uniform1ui) + #define glUniform1uivEXT MANGLE(Uniform1uivEXT) + #define glUniform1uiv MANGLE(Uniform1uiv) ++#define glUniform2d MANGLE(Uniform2d) ++#define glUniform2dv MANGLE(Uniform2dv) + #define glUniform2fARB MANGLE(Uniform2fARB) + #define glUniform2f MANGLE(Uniform2f) + #define glUniform2fvARB MANGLE(Uniform2fvARB) + #define glUniform2fv MANGLE(Uniform2fv) ++#define glUniform2i64NV MANGLE(Uniform2i64NV) ++#define glUniform2i64vNV MANGLE(Uniform2i64vNV) + #define glUniform2iARB MANGLE(Uniform2iARB) + #define glUniform2i MANGLE(Uniform2i) + #define glUniform2ivARB MANGLE(Uniform2ivARB) + #define glUniform2iv MANGLE(Uniform2iv) ++#define glUniform2ui64NV MANGLE(Uniform2ui64NV) ++#define glUniform2ui64vNV MANGLE(Uniform2ui64vNV) + #define glUniform2uiEXT MANGLE(Uniform2uiEXT) + #define glUniform2ui MANGLE(Uniform2ui) + #define glUniform2uivEXT MANGLE(Uniform2uivEXT) + #define glUniform2uiv MANGLE(Uniform2uiv) ++#define glUniform3d MANGLE(Uniform3d) ++#define glUniform3dv MANGLE(Uniform3dv) + #define glUniform3fARB MANGLE(Uniform3fARB) + #define glUniform3f MANGLE(Uniform3f) + #define glUniform3fvARB MANGLE(Uniform3fvARB) + #define glUniform3fv MANGLE(Uniform3fv) ++#define glUniform3i64NV MANGLE(Uniform3i64NV) ++#define glUniform3i64vNV MANGLE(Uniform3i64vNV) + #define glUniform3iARB MANGLE(Uniform3iARB) + #define glUniform3i MANGLE(Uniform3i) + #define glUniform3ivARB MANGLE(Uniform3ivARB) + #define glUniform3iv MANGLE(Uniform3iv) ++#define glUniform3ui64NV MANGLE(Uniform3ui64NV) ++#define glUniform3ui64vNV MANGLE(Uniform3ui64vNV) + #define glUniform3uiEXT MANGLE(Uniform3uiEXT) + #define glUniform3ui MANGLE(Uniform3ui) + #define glUniform3uivEXT MANGLE(Uniform3uivEXT) + #define glUniform3uiv MANGLE(Uniform3uiv) ++#define glUniform4d MANGLE(Uniform4d) ++#define glUniform4dv MANGLE(Uniform4dv) + #define glUniform4fARB MANGLE(Uniform4fARB) + #define glUniform4f MANGLE(Uniform4f) + #define glUniform4fvARB MANGLE(Uniform4fvARB) + #define glUniform4fv MANGLE(Uniform4fv) ++#define glUniform4i64NV MANGLE(Uniform4i64NV) ++#define glUniform4i64vNV MANGLE(Uniform4i64vNV) + #define glUniform4iARB MANGLE(Uniform4iARB) + #define glUniform4i MANGLE(Uniform4i) + #define glUniform4ivARB MANGLE(Uniform4ivARB) + #define glUniform4iv MANGLE(Uniform4iv) ++#define glUniform4ui64NV MANGLE(Uniform4ui64NV) ++#define glUniform4ui64vNV MANGLE(Uniform4ui64vNV) + #define glUniform4uiEXT MANGLE(Uniform4uiEXT) + #define glUniform4ui MANGLE(Uniform4ui) + #define glUniform4uivEXT MANGLE(Uniform4uivEXT) + #define glUniform4uiv MANGLE(Uniform4uiv) + #define glUniformBlockBinding MANGLE(UniformBlockBinding) + #define glUniformBufferEXT MANGLE(UniformBufferEXT) ++#define glUniformMatrix2dv MANGLE(UniformMatrix2dv) + #define glUniformMatrix2fvARB MANGLE(UniformMatrix2fvARB) + #define glUniformMatrix2fv MANGLE(UniformMatrix2fv) ++#define glUniformMatrix2x3dv MANGLE(UniformMatrix2x3dv) + #define glUniformMatrix2x3fv MANGLE(UniformMatrix2x3fv) ++#define glUniformMatrix2x4dv MANGLE(UniformMatrix2x4dv) + #define glUniformMatrix2x4fv MANGLE(UniformMatrix2x4fv) ++#define glUniformMatrix3dv MANGLE(UniformMatrix3dv) + #define glUniformMatrix3fvARB MANGLE(UniformMatrix3fvARB) + #define glUniformMatrix3fv MANGLE(UniformMatrix3fv) ++#define glUniformMatrix3x2dv MANGLE(UniformMatrix3x2dv) + #define glUniformMatrix3x2fv MANGLE(UniformMatrix3x2fv) ++#define glUniformMatrix3x4dv MANGLE(UniformMatrix3x4dv) + #define glUniformMatrix3x4fv MANGLE(UniformMatrix3x4fv) ++#define glUniformMatrix4dv MANGLE(UniformMatrix4dv) + #define glUniformMatrix4fvARB MANGLE(UniformMatrix4fvARB) + #define glUniformMatrix4fv MANGLE(UniformMatrix4fv) ++#define glUniformMatrix4x2dv MANGLE(UniformMatrix4x2dv) + #define glUniformMatrix4x2fv MANGLE(UniformMatrix4x2fv) ++#define glUniformMatrix4x3dv MANGLE(UniformMatrix4x3dv) + #define glUniformMatrix4x3fv MANGLE(UniformMatrix4x3fv) ++#define glUniformSubroutinesuiv MANGLE(UniformSubroutinesuiv) + #define glUniformui64NV MANGLE(Uniformui64NV) + #define glUniformui64vNV MANGLE(Uniformui64vNV) + #define glUnlockArraysEXT MANGLE(UnlockArraysEXT) +@@ -1646,9 +1906,11 @@ + #define glUpdateObjectBufferATI MANGLE(UpdateObjectBufferATI) + #define glUseProgram MANGLE(UseProgram) + #define glUseProgramObjectARB MANGLE(UseProgramObjectARB) ++#define glUseProgramStages MANGLE(UseProgramStages) + #define glUseShaderProgramEXT MANGLE(UseShaderProgramEXT) + #define glValidateProgramARB MANGLE(ValidateProgramARB) + #define glValidateProgram MANGLE(ValidateProgram) ++#define glValidateProgramPipeline MANGLE(ValidateProgramPipeline) + #define glVariantArrayObjectATI MANGLE(VariantArrayObjectATI) + #define glVariantbvEXT MANGLE(VariantbvEXT) + #define glVariantdvEXT MANGLE(VariantdvEXT) +@@ -1659,6 +1921,16 @@ + #define glVariantubvEXT MANGLE(VariantubvEXT) + #define glVariantuivEXT MANGLE(VariantuivEXT) + #define glVariantusvEXT MANGLE(VariantusvEXT) ++#define glVDPAUFiniNV MANGLE(VDPAUFiniNV) ++#define glVDPAUGetSurfaceivNV MANGLE(VDPAUGetSurfaceivNV) ++#define glVDPAUInitNV MANGLE(VDPAUInitNV) ++#define glVDPAUIsSurfaceNV MANGLE(VDPAUIsSurfaceNV) ++#define glVDPAUMapSurfacesNV MANGLE(VDPAUMapSurfacesNV) ++#define glVDPAURegisterOutputSurfaceNV MANGLE(VDPAURegisterOutputSurfaceNV) ++#define glVDPAURegisterVideoSurfaceNV MANGLE(VDPAURegisterVideoSurfaceNV) ++#define glVDPAUSurfaceAccessNV MANGLE(VDPAUSurfaceAccessNV) ++#define glVDPAUUnmapSurfacesNV MANGLE(VDPAUUnmapSurfacesNV) ++#define glVDPAUUnregisterSurfaceNV MANGLE(VDPAUUnregisterSurfaceNV) + #define glVertex2d MANGLE(Vertex2d) + #define glVertex2dv MANGLE(Vertex2dv) + #define glVertex2f MANGLE(Vertex2f) +@@ -1692,6 +1964,7 @@ + #define glVertexArrayParameteriAPPLE MANGLE(VertexArrayParameteriAPPLE) + #define glVertexArrayRangeAPPLE MANGLE(VertexArrayRangeAPPLE) + #define glVertexArrayRangeNV MANGLE(VertexArrayRangeNV) ++#define glVertexArrayVertexAttribLOffsetEXT MANGLE(VertexArrayVertexAttribLOffsetEXT) + #define glVertexAttrib1dARB MANGLE(VertexAttrib1dARB) + #define glVertexAttrib1d MANGLE(VertexAttrib1d) + #define glVertexAttrib1dNV MANGLE(VertexAttrib1dNV) +@@ -1800,6 +2073,7 @@ + #define glVertexAttrib4usv MANGLE(VertexAttrib4usv) + #define glVertexAttribArrayObjectATI MANGLE(VertexAttribArrayObjectATI) + #define glVertexAttribDivisorARB MANGLE(VertexAttribDivisorARB) ++#define glVertexAttribDivisor MANGLE(VertexAttribDivisor) + #define glVertexAttribFormatNV MANGLE(VertexAttribFormatNV) + #define glVertexAttribI1iEXT MANGLE(VertexAttribI1iEXT) + #define glVertexAttribI1i MANGLE(VertexAttribI1i) +@@ -1844,6 +2118,49 @@ + #define glVertexAttribIFormatNV MANGLE(VertexAttribIFormatNV) + #define glVertexAttribIPointerEXT MANGLE(VertexAttribIPointerEXT) + #define glVertexAttribIPointer MANGLE(VertexAttribIPointer) ++#define glVertexAttribL1dEXT MANGLE(VertexAttribL1dEXT) ++#define glVertexAttribL1d MANGLE(VertexAttribL1d) ++#define glVertexAttribL1dvEXT MANGLE(VertexAttribL1dvEXT) ++#define glVertexAttribL1dv MANGLE(VertexAttribL1dv) ++#define glVertexAttribL1i64NV MANGLE(VertexAttribL1i64NV) ++#define glVertexAttribL1i64vNV MANGLE(VertexAttribL1i64vNV) ++#define glVertexAttribL1ui64NV MANGLE(VertexAttribL1ui64NV) ++#define glVertexAttribL1ui64vNV MANGLE(VertexAttribL1ui64vNV) ++#define glVertexAttribL2dEXT MANGLE(VertexAttribL2dEXT) ++#define glVertexAttribL2d MANGLE(VertexAttribL2d) ++#define glVertexAttribL2dvEXT MANGLE(VertexAttribL2dvEXT) ++#define glVertexAttribL2dv MANGLE(VertexAttribL2dv) ++#define glVertexAttribL2i64NV MANGLE(VertexAttribL2i64NV) ++#define glVertexAttribL2i64vNV MANGLE(VertexAttribL2i64vNV) ++#define glVertexAttribL2ui64NV MANGLE(VertexAttribL2ui64NV) ++#define glVertexAttribL2ui64vNV MANGLE(VertexAttribL2ui64vNV) ++#define glVertexAttribL3dEXT MANGLE(VertexAttribL3dEXT) ++#define glVertexAttribL3d MANGLE(VertexAttribL3d) ++#define glVertexAttribL3dvEXT MANGLE(VertexAttribL3dvEXT) ++#define glVertexAttribL3dv MANGLE(VertexAttribL3dv) ++#define glVertexAttribL3i64NV MANGLE(VertexAttribL3i64NV) ++#define glVertexAttribL3i64vNV MANGLE(VertexAttribL3i64vNV) ++#define glVertexAttribL3ui64NV MANGLE(VertexAttribL3ui64NV) ++#define glVertexAttribL3ui64vNV MANGLE(VertexAttribL3ui64vNV) ++#define glVertexAttribL4dEXT MANGLE(VertexAttribL4dEXT) ++#define glVertexAttribL4d MANGLE(VertexAttribL4d) ++#define glVertexAttribL4dvEXT MANGLE(VertexAttribL4dvEXT) ++#define glVertexAttribL4dv MANGLE(VertexAttribL4dv) ++#define glVertexAttribL4i64NV MANGLE(VertexAttribL4i64NV) ++#define glVertexAttribL4i64vNV MANGLE(VertexAttribL4i64vNV) ++#define glVertexAttribL4ui64NV MANGLE(VertexAttribL4ui64NV) ++#define glVertexAttribL4ui64vNV MANGLE(VertexAttribL4ui64vNV) ++#define glVertexAttribLFormatNV MANGLE(VertexAttribLFormatNV) ++#define glVertexAttribLPointerEXT MANGLE(VertexAttribLPointerEXT) ++#define glVertexAttribLPointer MANGLE(VertexAttribLPointer) ++#define glVertexAttribP1ui MANGLE(VertexAttribP1ui) ++#define glVertexAttribP1uiv MANGLE(VertexAttribP1uiv) ++#define glVertexAttribP2ui MANGLE(VertexAttribP2ui) ++#define glVertexAttribP2uiv MANGLE(VertexAttribP2uiv) ++#define glVertexAttribP3ui MANGLE(VertexAttribP3ui) ++#define glVertexAttribP3uiv MANGLE(VertexAttribP3uiv) ++#define glVertexAttribP4ui MANGLE(VertexAttribP4ui) ++#define glVertexAttribP4uiv MANGLE(VertexAttribP4uiv) + #define glVertexAttribPointerARB MANGLE(VertexAttribPointerARB) + #define glVertexAttribPointer MANGLE(VertexAttribPointer) + #define glVertexAttribPointerNV MANGLE(VertexAttribPointerNV) +@@ -1868,6 +2185,12 @@ + #define glVertexBlendEnvfATI MANGLE(VertexBlendEnvfATI) + #define glVertexBlendEnviATI MANGLE(VertexBlendEnviATI) + #define glVertexFormatNV MANGLE(VertexFormatNV) ++#define glVertexP2ui MANGLE(VertexP2ui) ++#define glVertexP2uiv MANGLE(VertexP2uiv) ++#define glVertexP3ui MANGLE(VertexP3ui) ++#define glVertexP3uiv MANGLE(VertexP3uiv) ++#define glVertexP4ui MANGLE(VertexP4ui) ++#define glVertexP4uiv MANGLE(VertexP4uiv) + #define glVertexPointerEXT MANGLE(VertexPointerEXT) + #define glVertexPointerListIBM MANGLE(VertexPointerListIBM) + #define glVertexPointer MANGLE(VertexPointer) +@@ -1913,6 +2236,9 @@ + #define glVideoCaptureStreamParameterdvNV MANGLE(VideoCaptureStreamParameterdvNV) + #define glVideoCaptureStreamParameterfvNV MANGLE(VideoCaptureStreamParameterfvNV) + #define glVideoCaptureStreamParameterivNV MANGLE(VideoCaptureStreamParameterivNV) ++#define glViewportArrayv MANGLE(ViewportArrayv) ++#define glViewportIndexedf MANGLE(ViewportIndexedf) ++#define glViewportIndexedfv MANGLE(ViewportIndexedfv) + #define glViewport MANGLE(Viewport) + #define glWaitSync MANGLE(WaitSync) + #define glWeightbvARB MANGLE(WeightbvARB) +diff --git a/src/gallium/auxiliary/draw/draw_pt_vsplit_tmp.h b/src/gallium/auxiliary/draw/draw_pt_vsplit_tmp.h +index 3f66f96..75dba8c 100644 +--- a/src/gallium/auxiliary/draw/draw_pt_vsplit_tmp.h ++++ b/src/gallium/auxiliary/draw/draw_pt_vsplit_tmp.h +@@ -258,9 +258,10 @@ vsplit_segment_fan_linear(struct vsplit_frontend *vsplit, unsigned flags, + boolean use_spoken = ((flags & DRAW_SPLIT_BEFORE) != 0); + unsigned nr = 0, i; + +- assert(icount + !!use_spoken <= vsplit->segment_size); ++ assert(icount <= vsplit->segment_size); + + if (use_spoken) { ++ /* replace istart by i0 */ + vsplit->fetch_elts[nr++] = i0; + for (i = 1 ; i < icount; i++) + vsplit->fetch_elts[nr++] = istart + i; +diff --git a/src/gallium/targets/SConscript.dri b/src/gallium/targets/SConscript.dri +index bc3671a..101863a 100644 +--- a/src/gallium/targets/SConscript.dri ++++ b/src/gallium/targets/SConscript.dri +@@ -72,7 +72,6 @@ COMMON_DRI_DRM_OBJECTS = [ + + drienv.AppendUnique(LIBS = [ + 'expat', +- 'talloc', + ]) + + Export([ +diff --git a/src/gallium/targets/libgl-gdi/SConscript b/src/gallium/targets/libgl-gdi/SConscript +index 6fa0851..ec7dbad 100644 +--- a/src/gallium/targets/libgl-gdi/SConscript ++++ b/src/gallium/targets/libgl-gdi/SConscript +@@ -15,7 +15,6 @@ env.Append(LIBS = [ + 'user32', + 'kernel32', + 'ws2_32', +- talloc, + ]) + + sources = ['libgl_gdi.c'] +diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript +index d932736..7f0f245 100644 +--- a/src/gallium/targets/libgl-xlib/SConscript ++++ b/src/gallium/targets/libgl-xlib/SConscript +@@ -23,7 +23,6 @@ env.Prepend(LIBS = [ +