recipes upgrade V2

From: Yu Ke<[email protected]>

- also remove the talloc-removal.patch because it is already included in this version

Signed-off-by Yu Ke<[email protected]>

---
  .../distro/include/preferred-xorg-versions.inc     |    2 +-
  .../mesa/files/talloc-removal.patch                |15571 --------------------
  .../mesa/{mesa-dri_7.10.bb =>  mesa-dri_7.10.2.bb}  |    7 +-
  .../{mesa-xlib_7.10.bb =>  mesa-xlib_7.10.2.bb}     |    7 +-
  4 files changed, 7 insertions(+), 15580 deletions(-)

delete mode 100644 meta/recipes-graphics/mesa/files/talloc-removal.patch rename meta/recipes-graphics/mesa/{mesa-dri_7.10.bb => mesa-dri_7.10.2.bb} (85%) rename meta/recipes-graphics/mesa/{mesa-xlib_7.10.bb => mesa-xlib_7.10.2.bb} (68%)

meta/conf/distro/include/preferred-xorg-versions.inc +1 -1

index 8b2c8a0..4966bd9 100644
@@ -135,7 +135,7 @@ PREFERRED_VERSION_xtrans-native ?= "1.2.6"
  PREFERRED_VERSION_xtrans-nativesdk ?= "1.2.6"
  PREFERRED_VERSION_xvinfo ?= "1.1.1"
  PREFERRED_VERSION_xwininfo ?= "1.1.1"
-PREFERRED_VERSION_mesa-dri ?= "7.10"
+PREFERRED_VERSION_mesa-dri ?= "7.10.2"
  PREFERRED_VERSION_libdrm ?= "2.4.25"
  PREFERRED_VERSION_xcb-proto ?= "1.6"
  PREFERRED_VERSION_libxcb ?= "1.7"

meta/recipes-graphics/mesa/files/talloc-removal.patch deleted +0 -15571

deleted file mode 100644
index 3038f6a..0000000
@@ -1,15571 +0,0 @@
-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<[email protected]>
-
-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 @@
-<H1>News</H1>
-
-
-+<h2>January 7, 2011</h2>
-+
-+<p>
-+<a href="relnotes-7.10.html">Mesa 7.10</a>  (final) is released.  This is a new
-+development release.
-+</p>
-+
-+<p>
-+Also,<a href="relnotes-7.9.1.html">Mesa 7.9.1</a>  (final) is released.
-+This is a bug fix release.
-+</p>
-+
-+
-<h2>October 4, 2010</h2>
-
-<p>
-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 @@
-+<HTML>
-+
-+<head>
-+<TITLE>Mesa Release Notes</TITLE>
-+<link rel="stylesheet" type="text/css" href="mesa.css">
-+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-+</head>
-+
-+<BODY>
-+
-+<body bgcolor="#eeeeee">
-+
-+<H1>Mesa 7.10.1 Release Notes / TBD</H1>
-+
-+<p>
-+Mesa 7.10.1 is a bug fix release which fixes bugs found since the 7.10 release.
-+</p>
-+<p>
-+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.
-+</p>
-+<p>
-+See the<a href="install.html">Compiling/Installing page</a>  for prerequisites
-+for DRI hardware acceleration.
-+</p>
-+
-+
-+<h2>MD5 checksums</h2>
-+<pre>
-+TBD
-+</pre>
-+
-+
-+<h2>New features</h2>
-+<p>None.</p>
-+
-+<h2>Bug fixes</h2>
-+<p>This list is likely incomplete.</p>
-+<ul>
-+<li>Fix an off-by-one bug in a vsplit assertion.</li>
-+<li>Fix incorrect handling of<tt>layout</tt>  qualifier
-+with<tt>in</tt>,<tt>out</tt>,<tt>attribute</tt>, and<tt>varying</tt>.</li>
-+
-+<li>Fix an i965 shader bug where the negative absolute value was generated instead of the absolute value of a negation.</li>
-+
-+<li>Fix numerous issues handling precision qualifiers in GLSL ES.</li>
-+
-+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=29164">Bug 29164</a>  - [GLSL 1.20] invariant variable shouldn't be used before declaration</li>
-+
-+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=30156">Bug 30156</a>  - [i965] After updating to Mesa 7.9, Civilization IV starts to show garbage</li>
-+
-+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=31923">Bug 31923</a>  - [GLSL 1.20] allowing inconsistent centroid declaration between two vertex shaders</li>
-+
-+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=31925">Bug 31925</a>  - [GLSL 1.20] "#pragma STDGL invariant(all)" fail</li>
-+
-+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32695">Bug 32695</a>  - [glsl] SIGSEGV glcpp/glcpp-parse.y:833</li>
-+
-+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32831">Bug 32831</a>  - [glsl] division by zero crashes GLSL compiler</li>
-+
-+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32910">Bug 32910</a>  - Keywords 'in' and 'out' not handled properly for GLSL 1.20 shaders</li>
-+
-+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33219">Bug 33219</a>  -[GLSL bisected] implicit sized array triggers segfault in ir_to_mesa_visitor::copy_propagate</li>
-+
-+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33308">Bug 33308</a>  -[glsl] ast_to_hir.cpp:3016: virtual ir_rvalue* ast_jump_statement::hir(exec_list*, _mesa_glsl_parse_state*): Assertion `ret != __null' failed.</li>
-+
-+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33316">Bug 33316</a>  - uniform array will be allocate one line more and initialize it when it was freed will abort</li>
-+
-+<!--<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=">Bug</a>  -</li>  -->
-+
-+</ul>
-+
-+
-+<h2>Changes</h2>
-+<p>The full set of changes can be viewed by using the following GIT command:</p>
-+
-+<pre>
-+  git log mesa-7.10..origin/7.10
-+</pre>
-+
-+</p>
-+
-+</body>
-+</html>
-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 @@
-<HTML>
-
-+<head>
-<TITLE>Mesa Release Notes</TITLE>
--
--<head><link rel="stylesheet" type="text/css" href="mesa.css"></head>
-+<link rel="stylesheet" type="text/css" href="mesa.css">
-+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-+</head>
-
-<BODY>
-
-@@ -28,7 +30,12 @@ for DRI hardware acceleration.
-
-<h2>MD5 checksums</h2>
-<pre>
--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
-</pre>
-
-
-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 @@
-<HTML>
-
-+<head>
-<TITLE>Mesa Release Notes</TITLE>
--
--<head><link rel="stylesheet" type="text/css" href="mesa.css"></head>
-+<link rel="stylesheet" type="text/css" href="mesa.css">
-+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-+</head>
-
-<BODY>
-
-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.
-</p>
-
-<UL>
-+<LI><A HREF="relnotes-7.10.html">7.10 release notes</A>
-+<LI><A HREF="relnotes-7.9.1html">7.9.1 release notes</A>
-<LI><A HREF="relnotes-7.9.html">7.9 release notes</A>
-<LI><A HREF="relnotes-7.8.3.html">7.8.3 release notes</A>
-<LI><A HREF="relnotes-7.8.2.html">7.8.2 release notes</A>
-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 = [
-     mesa,
-     glsl,
-     gallium,
--    'talloc'
- ])
-
- sources = [
-diff --git a/src/glsl/Makefile b/src/glsl/Makefile
-index 86a577e..7e9471e 100644
---- a/src/glsl/Makefile
-+++ b/src/glsl/Makefile
-@@ -17,6 +17,7 @@ GLCPP_SOURCES = \
-
- C_SOURCES = \
- 	strtod.c \
-+	ralloc.c \
- 	$(LIBGLCPP_SOURCES)
-
- CXX_SOURCES = \
-@@ -83,8 +84,7 @@ CXX_SOURCES = \
- 	s_expression.cpp
-
- LIBS = \
--	$(TOP)/src/glsl/libglsl.a \
--	$(TALLOC_LIBS)
-+	$(TOP)/src/glsl/libglsl.a
-
- APPS = glsl_compiler glcpp/glcpp
-
-@@ -113,7 +113,6 @@ OBJECTS = \
- 	$(CXX_SOURCES:.cpp=.o)
-
- INCLUDES = \
--	$(TALLOC_CFLAGS) \
- 	-I. \
- 	-I../mesa \
- 	-I../mapi \
-diff --git a/src/glsl/SConscript b/src/glsl/SConscript
-index f179721..c1adfe8 100644
---- a/src/glsl/SConscript
-+++ b/src/glsl/SConscript
-@@ -7,11 +7,9 @@ env = env.Clone()
- env.Prepend(CPPPATH = [
-     '#src/mapi',
-     '#src/mesa',
-+    '#src/glsl',
- ])
-
--if env['platform'] == 'windows':
--    env.Prepend(CPPPATH = ['#src/talloc'])
--
- sources = [
-     'glcpp/glcpp-lex.c',
-     'glcpp/glcpp-parse.c',
-@@ -75,6 +73,7 @@ sources = [
-     'opt_structure_splitting.cpp',
-     'opt_swizzle_swizzle.cpp',
-     'opt_tree_grafting.cpp',
-+    'ralloc.c',
-     's_expression.cpp',
-     'strtod.c',
- ]
-@@ -96,7 +95,7 @@ if env['platform'] == 'windows':
-         'user32',
-     ])
-
--env.Prepend(LIBS = [glsl, talloc])
-+env.Prepend(LIBS = [glsl])
-
- env.Program(
-     target = 'glsl2',
-diff --git a/src/glsl/ast.h b/src/glsl/ast.h
-index a77b522..da11f5a 100644
---- a/src/glsl/ast.h
-+++ b/src/glsl/ast.h
-@@ -49,23 +49,23 @@ struct YYLTYPE;
-  */
- class ast_node {
- public:
--   /* Callers of this talloc-based new need not call delete. It's
--    * easier to just talloc_free 'ctx' (or any of its ancestors). */
-+   /* Callers of this ralloc-based new need not call delete. It's
-+    * easier to just ralloc_free 'ctx' (or any of its ancestors). */
-    static void* operator new(size_t size, void *ctx)
-    {
-       void *node;
-
--      node = talloc_zero_size(ctx, size);
-+      node = rzalloc_size(ctx, size);
-       assert(node != NULL);
-
-       return node;
-    }
-
-    /* If the user *does* call delete, that's OK, we will just
--    * talloc_free in that case. */
-+    * ralloc_free in that case. */
-    static void operator delete(void *table)
-    {
--      talloc_free(table);
-+      ralloc_free(table);
-    }
-
-    /**
-@@ -318,7 +318,8 @@ public:
-
-
- enum {
--   ast_precision_high = 0, /**<  Default precision. */
-+   ast_precision_none = 0, /**<  Absence of precision qualifier. */
-+   ast_precision_high,
-    ast_precision_medium,
-    ast_precision_low
- };
-@@ -440,7 +441,8 @@ public:
-    /** Construct a type specifier from a type name */
-    ast_type_specifier(const char *name)
-       : type_specifier(ast_type_name), type_name(name), structure(NULL),
--	is_array(false), array_size(NULL), precision(ast_precision_high)
-+	is_array(false), array_size(NULL), precision(ast_precision_none),
-+	is_precision_statement(false)
-    {
-       /* empty */
-    }
-@@ -448,7 +450,8 @@ public:
-    /** Construct a type specifier from a structure definition */
-    ast_type_specifier(ast_struct_specifier *s)
-       : type_specifier(ast_struct), type_name(s->name), structure(s),
--	is_array(false), array_size(NULL), precision(ast_precision_high)
-+	is_array(false), array_size(NULL), precision(ast_precision_none),
-+	is_precision_statement(false)
-    {
-       /* empty */
-    }
-@@ -470,6 +473,8 @@ public:
-    ast_expression *array_size;
-
-    unsigned precision:2;
-+
-+   bool is_precision_statement;
- };
-
-
-diff --git a/src/glsl/ast_function.cpp b/src/glsl/ast_function.cpp
-index 6ecf779..07c994f 100644
---- a/src/glsl/ast_function.cpp
-+++ b/src/glsl/ast_function.cpp
-@@ -66,7 +66,7 @@ process_parameters(exec_list *instructions, exec_list *actual_parameters,
-  *                    formal or actual parameter list.  Only the type is used.
-  *
-  * \return
-- * A talloced string representing the prototype of the function.
-+ * A ralloced string representing the prototype of the function.
-  */
- char *
- prototype_string(const glsl_type *return_type, const char *name,
-@@ -75,19 +75,19 @@ prototype_string(const glsl_type *return_type, const char *name,
-    char *str = NULL;
-
-    if (return_type != NULL)
--      str = talloc_asprintf(str, "%s ", return_type->name);
-+      str = ralloc_asprintf(NULL, "%s ", return_type->name);
-
--   str = talloc_asprintf_append(str, "%s(", name);
-+   ralloc_asprintf_append(&str, "%s(", name);
-
-    const char *comma = "";
-    foreach_list(node, parameters) {
-       const ir_instruction *const param = (ir_instruction *) node;
-
--      str = talloc_asprintf_append(str, "%s%s", comma, param->type->name);
-+      ralloc_asprintf_append(&str, "%s%s", comma, param->type->name);
-       comma = ", ";
-    }
-
--   str = talloc_strdup_append(str, ")");
-+   ralloc_strcat(&str, ")");
-    return str;
- }
-
-@@ -173,7 +173,7 @@ match_function_by_name(exec_list *instructions, const char *name,
- 	 ir_dereference_variable *deref;
-
- 	 var = new(ctx) ir_variable(sig->return_type,
--				    talloc_asprintf(ctx, "%s_retval",
-+				    ralloc_asprintf(ctx, "%s_retval",
- 						    sig->function_name()),
- 				    ir_var_temporary);
- 	 instructions->push_tail(var);
-@@ -195,7 +195,7 @@ match_function_by_name(exec_list *instructions, const char *name,
-
-       _mesa_glsl_error(loc, state, "no matching function for call to `%s'",
- 		       str);
--      talloc_free(str);
-+      ralloc_free(str);
-
-       const char *prefix = "candidates are: ";
-
-@@ -211,7 +211,7 @@ match_function_by_name(exec_list *instructions, const char *name,
-
- 	    str = prototype_string(sig->return_type, f->name,&sig->parameters);
- 	    _mesa_glsl_error(loc, state, "%s%s\n", prefix, str);
--	    talloc_free(str);
-+	    ralloc_free(str);
-
- 	    prefix = "                ";
- 	 }
-@@ -232,7 +232,7 @@ match_function_by_name(exec_list *instructions, const char *name,
- static ir_rvalue *
- convert_component(ir_rvalue *src, const glsl_type *desired_type)
- {
--   void *ctx = talloc_parent(src);
-+   void *ctx = ralloc_parent(src);
-    const unsigned a = desired_type->base_type;
-    const unsigned b = src->type->base_type;
-    ir_expression *result = NULL;
-@@ -295,7 +295,7 @@ convert_component(ir_rvalue *src, const glsl_type *desired_type)
- static ir_rvalue *
- dereference_component(ir_rvalue *src, unsigned component)
- {
--   void *ctx = talloc_parent(src);
-+   void *ctx = ralloc_parent(src);
-    assert(component<  src->type->components());
-
-    /* If the source is a constant, just create a new constant instead of a
-diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
-index 0423add..e66016d 100644
---- a/src/glsl/ast_to_hir.cpp
-+++ b/src/glsl/ast_to_hir.cpp
-@@ -715,7 +715,7 @@ do_assignment(exec_list *instructions, struct _mesa_glsl_parse_state *state,
- static ir_rvalue *
- get_lvalue_copy(exec_list *instructions, ir_rvalue *lvalue)
- {
--   void *ctx = talloc_parent(lvalue);
-+   void *ctx = ralloc_parent(lvalue);
-    ir_variable *var;
-
-    var = new(ctx) ir_variable(lvalue->type, "_post_incdec_tmp",
-@@ -1626,6 +1626,7 @@ ast_expression::hir(exec_list *instructions,
-       result = new(ctx) ir_dereference_variable(var);
-
-       if (var != NULL) {
-+	 var->used = true;
- 	 type = result->type;
-       } else {
- 	 _mesa_glsl_error(&  loc, state, "`%s' undeclared",
-@@ -1800,10 +1801,17 @@ apply_type_qualifier_to_variable(const struct ast_type_qualifier *qual,
- 				 struct _mesa_glsl_parse_state *state,
- 				 YYLTYPE *loc)
- {
--   if (qual->flags.q.invariant)
--      var->invariant = 1;
-+   if (qual->flags.q.invariant) {
-+      if (var->used) {
-+	 _mesa_glsl_error(loc, state,
-+			  "variable `%s' may not be redeclared "
-+			  "`invariant' after being used",
-+			  var->name);
-+      } else {
-+	 var->invariant = 1;
-+      }
-+   }
-
--   /* FINISHME: Mark 'in' variables at global scope as read-only. */
-    if (qual->flags.q.constant || qual->flags.q.attribute
-        || qual->flags.q.uniform
-        || (qual->flags.q.varying&&  (state->target == fragment_shader)))
-@@ -1855,6 +1863,23 @@ apply_type_qualifier_to_variable(const struct ast_type_qualifier *qual,
-    else if (qual->flags.q.uniform)
-       var->mode = ir_var_uniform;
-
-+   if (state->all_invariant&&  (state->current_function == NULL)) {
-+      switch (state->target) {
-+      case vertex_shader:
-+	 if (var->mode == ir_var_out)
-+	    var->invariant = true;
-+	 break;
-+      case geometry_shader:
-+	 if ((var->mode == ir_var_in) || (var->mode == ir_var_out))
-+	    var->invariant = true;
-+	 break;
-+      case fragment_shader:
-+	 if (var->mode == ir_var_in)
-+	    var->invariant = true;
-+	 break;
-+      }
-+   }
-+
-    if (qual->flags.q.flat)
-       var->interpolation = ir_var_flat;
-    else if (qual->flags.q.noperspective)
-@@ -1934,6 +1959,52 @@ apply_type_qualifier_to_variable(const struct ast_type_qualifier *qual,
-       }
-    }
-
-+   /* Does the declaration use the 'layout' keyword?
-+    */
-+   const bool uses_layout = qual->flags.q.pixel_center_integer
-+      || qual->flags.q.origin_upper_left
-+      || qual->flags.q.explicit_location;
-+
-+   /* Does the declaration use the deprecated 'attribute' or 'varying'
-+    * keywords?
-+    */
-+   const bool uses_deprecated_qualifier = qual->flags.q.attribute
-+      || qual->flags.q.varying;
-+
-+   /* Is the 'layout' keyword used with parameters that allow relaxed checking.
-+    * Many implementations of GL_ARB_fragment_coord_conventions_enable and some
-+    * implementations (only Mesa?) GL_ARB_explicit_attrib_location_enable
-+    * allowed the layout qualifier to be used with 'varying' and 'attribute'.
-+    * These extensions and all following extensions that add the 'layout'
-+    * keyword have been modified to require the use of 'in' or 'out'.
-+    *
-+    * The following extension do not allow the deprecated keywords:
-+    *
-+    *    GL_AMD_conservative_depth
-+    *    GL_ARB_gpu_shader5
-+    *    GL_ARB_separate_shader_objects
-+    *    GL_ARB_tesselation_shader
-+    *    GL_ARB_transform_feedback3
-+    *    GL_ARB_uniform_buffer_object
-+    *
-+    * It is unknown whether GL_EXT_shader_image_load_store or GL_NV_gpu_shader5
-+    * allow layout with the deprecated keywords.
-+    */
-+   const bool relaxed_layout_qualifier_checking =
-+      state->ARB_fragment_coord_conventions_enable;
-+
-+   if (uses_layout&&  uses_deprecated_qualifier) {
-+      if (relaxed_layout_qualifier_checking) {
-+	 _mesa_glsl_warning(loc, state,
-+			    "`layout' qualifier may not be used with "
-+			    "`attribute' or `varying'");
-+      } else {
-+	 _mesa_glsl_error(loc, state,
-+			  "`layout' qualifier may not be used with "
-+			  "`attribute' or `varying'");
-+      }
-+   }
-+
-    if (var->type->is_array()&&  state->language_version != 110) {
-       var->array_lvalue = true;
-    }
-@@ -1991,6 +2062,11 @@ ast_declarator_list::hir(exec_list *instructions,
- 	    _mesa_glsl_error(&  loc, state,
- 			     "`%s' cannot be marked invariant, fragment shader "
- 			     "inputs only\n", decl->identifier);
-+	 } else if (earlier->used) {
-+	    _mesa_glsl_error(&  loc, state,
-+			     "variable `%s' may not be redeclared "
-+			     "`invariant' after being used",
-+			     earlier->name);
- 	 } else {
- 	    earlier->invariant = true;
- 	 }
-@@ -2060,20 +2136,23 @@ ast_declarator_list::hir(exec_list *instructions,
-        *
-        *     Local variables can only use the qualifier const."
-        *
--       * This is relaxed in GLSL 1.30.
-+       * This is relaxed in GLSL 1.30.  It is also relaxed by any extension
-+       * that adds the 'layout' keyword.
-        */
--      if (state->language_version<  120) {
-+      if ((state->language_version<  130)
-+	&&  !state->ARB_explicit_attrib_location_enable
-+	&&  !state->ARB_fragment_coord_conventions_enable) {
- 	 if (this->type->qualifier.flags.q.out) {
- 	    _mesa_glsl_error(&  loc, state,
- 			     "`out' qualifier in declaration of `%s' "
--			     "only valid for function parameters in GLSL 1.10.",
--			     decl->identifier);
-+			     "only valid for function parameters in %s.",
-+			     decl->identifier, state->version_string);
- 	 }
- 	 if (this->type->qualifier.flags.q.in) {
- 	    _mesa_glsl_error(&  loc, state,
- 			     "`in' qualifier in declaration of `%s' "
--			     "only valid for function parameters in GLSL 1.10.",
--			     decl->identifier);
-+			     "only valid for function parameters in %s.",
-+			     decl->identifier, state->version_string);
- 	 }
- 	 /* FINISHME: Test for other invalid qualifiers. */
-       }
-@@ -2129,6 +2208,8 @@ ast_declarator_list::hir(exec_list *instructions,
- 			     mode, var->name, extra);
- 	 }
-       } else if (var->mode == ir_var_in) {
-+         var->read_only = true;
-+
- 	 if (state->target == vertex_shader) {
- 	    bool error_emitted = false;
-
-@@ -2181,6 +2262,38 @@ ast_declarator_list::hir(exec_list *instructions,
- 	 }
-       }
-
-+      /* Precision qualifiers exists only in GLSL versions 1.00 and>= 1.30.
-+       */
-+      if (this->type->specifier->precision != ast_precision_none
-+&&  state->language_version != 100
-+&&  state->language_version<  130) {
-+
-+         _mesa_glsl_error(&loc, state,
-+                          "precision qualifiers are supported only in GLSL ES "
-+                          "1.00, and GLSL 1.30 and later");
-+      }
-+
-+
-+      /* Precision qualifiers only apply to floating point and integer types.
-+       *
-+       * From section 4.5.2 of the GLSL 1.30 spec:
-+       *    "Any floating point or any integer declaration can have the type
-+       *    preceded by one of these precision qualifiers [...] Literal
-+       *    constants do not have precision qualifiers. Neither do Boolean
-+       *    variables.
-+       */
-+      if (this->type->specifier->precision != ast_precision_none
-+&&  !var->type->is_float()
-+&&  !var->type->is_integer()
-+&&  !(var->type->is_array()
-+&&  (var->type->fields.array->is_float()
-+                   || var->type->fields.array->is_integer()))) {
-+
-+         _mesa_glsl_error(&loc, state,
-+                          "precision qualifiers apply only to floating point "
-+                          "and integer types");
-+      }
-+
-       /* Process the initializer and add its instructions to a temporary
-        * list.  This list will be added to the instruction stream (below) after
-        * the declaration is added.  This is done because in some cases (such as
-@@ -2307,7 +2420,8 @@ ast_declarator_list::hir(exec_list *instructions,
-        */
-       if (this->type->qualifier.flags.q.constant&&  decl->initializer == NULL) {
- 	 _mesa_glsl_error(&  loc, state,
--			  "const declaration of `%s' must be initialized");
-+			  "const declaration of `%s' must be initialized",
-+			  decl->identifier);
-       }
-
-       /* Check if this declaration is actually a re-declaration, either to
-@@ -2778,27 +2892,26 @@ ast_jump_statement::hir(exec_list *instructions,
-       assert(state->current_function);
-
-       if (opt_return_value) {
--	 if (state->current_function->return_type->base_type ==
--	     GLSL_TYPE_VOID) {
--	    YYLTYPE loc = this->get_location();
--
--	    _mesa_glsl_error(&  loc, state,
--			     "`return` with a value, in function `%s' "
--			     "returning void",
--			     state->current_function->function_name());
--	 }
--
- 	 ir_rvalue *const ret = opt_return_value->hir(instructions, state);
--	 assert(ret != NULL);
-+
-+	 /* The value of the return type can be NULL if the shader says
-+	  * 'return foo();' and foo() is a function that returns void.
-+	  *
-+	  * NOTE: The GLSL spec doesn't say that this is an error.  The type
-+	  * of the return value is void.  If the return type of the function is
-+	  * also void, then this should compile without error.  Seriously.
-+	  */
-+	 const glsl_type *const ret_type =
-+	    (ret == NULL) ? glsl_type::void_type : ret->type;
-
- 	 /* Implicit conversions are not allowed for return values. */
--	 if (state->current_function->return_type != ret->type) {
-+	 if (state->current_function->return_type != ret_type) {
- 	    YYLTYPE loc = this->get_location();
-
- 	    _mesa_glsl_error(&  loc, state,
- 			     "`return' with wrong type %s, in function `%s' "
- 			     "returning %s",
--			     ret->type->name,
-+			     ret_type->name,
- 			     state->current_function->function_name(),
- 			     state->current_function->return_type->name);
- 	 }
-@@ -3015,6 +3128,58 @@ ir_rvalue *
- ast_type_specifier::hir(exec_list *instructions,
- 			  struct _mesa_glsl_parse_state *state)
- {
-+   if (!this->is_precision_statement&&  this->structure == NULL)
-+      return NULL;
-+
-+   YYLTYPE loc = this->get_location();
-+
-+   if (this->precision != ast_precision_none
-+&&  state->language_version != 100
-+&&  state->language_version<  130) {
-+      _mesa_glsl_error(&loc, state,
-+                       "precision qualifiers exist only in "
-+                       "GLSL ES 1.00, and GLSL 1.30 and later");
-+      return NULL;
-+   }
-+   if (this->precision != ast_precision_none
-+&&  this->structure != NULL) {
-+      _mesa_glsl_error(&loc, state,
-+                       "precision qualifiers do not apply to structures");
-+      return NULL;
-+   }
-+
-+   /* If this is a precision statement, check that the type to which it is
-+    * applied is either float or int.
-+    *
-+    * From section 4.5.3 of the GLSL 1.30 spec:
-+    *    "The precision statement
-+    *       precision precision-qualifier type;
-+    *    can be used to establish a default precision qualifier. The type
-+    *    field can be either int or float [...].  Any other types or
-+    *    qualifiers will result in an error.
-+    */
-+   if (this->is_precision_statement) {
-+      assert(this->precision != ast_precision_none);
-+      assert(this->structure == NULL); /* The check for structures was
-+                                        * performed above. */
-+      if (this->is_array) {
-+         _mesa_glsl_error(&loc, state,
-+                          "default precision statements do not apply to "
-+                          "arrays");
-+         return NULL;
-+      }
-+      if (this->type_specifier != ast_float
-+&&  this->type_specifier != ast_int) {
-+         _mesa_glsl_error(&loc, state,
-+                          "default precision statements apply only to types "
-+                          "float and int");
-+         return NULL;
-+      }
-+
-+      /* FINISHME: Translate precision statements into IR. */
-+      return NULL;
-+   }
-+
-    if (this->structure != NULL)
-       return this->structure->hir(instructions, state);
-
-@@ -3045,7 +3210,7 @@ ast_struct_specifier::hir(exec_list *instructions,
-     * the types to HIR.  This ensures that structure definitions embedded in
-     * other structure definitions are processed.
-     */
--   glsl_struct_field *const fields = talloc_array(state, glsl_struct_field,
-+   glsl_struct_field *const fields = ralloc_array(state, glsl_struct_field,
- 						  decl_count);
-
-    unsigned i = 0;
-diff --git a/src/glsl/ast_type.cpp b/src/glsl/ast_type.cpp
-index b7488cf..47d4f9f 100644
---- a/src/glsl/ast_type.cpp
-+++ b/src/glsl/ast_type.cpp
-@@ -49,7 +49,8 @@ ast_type_specifier::print(void) const
-
- ast_type_specifier::ast_type_specifier(int specifier)
-       : type_specifier(ast_types(specifier)), type_name(NULL), structure(NULL),
--	is_array(false), array_size(NULL), precision(ast_precision_high)
-+	is_array(false), array_size(NULL), precision(ast_precision_none),
-+	is_precision_statement(false)
- {
-    static const char *const names[] = {
-       "void",
-diff --git a/src/glsl/builtin_function.cpp b/src/glsl/builtin_function.cpp
-index 1c6d59d..c6d1fc8 100644
---- a/src/glsl/builtin_function.cpp
-+++ b/src/glsl/builtin_function.cpp
-@@ -63,7 +63,7 @@ read_builtins(GLenum target, const char *protos, const char **functions, unsigne
-       if (st->error) {
-          printf("error reading builtin: %.35s ...\n", functions[i]);
-          printf("Info log:\n%s\n", st->info_log);
--         talloc_free(sh);
-+         ralloc_free(sh);
-          return NULL;
-       }
-    }
-@@ -13516,7 +13516,7 @@ void *builtin_mem_ctx = NULL;
- void
- _mesa_glsl_release_functions(void)
- {
--   talloc_free(builtin_mem_ctx);
-+   ralloc_free(builtin_mem_ctx);
-    builtin_mem_ctx = NULL;
-    memset(builtin_profiles, 0, sizeof(builtin_profiles));
- }
-@@ -13533,7 +13533,7 @@ _mesa_read_profile(struct _mesa_glsl_parse_state *state,
-
-    if (sh == NULL) {
-       sh = read_builtins(GL_VERTEX_SHADER, prototypes, functions, count);
--      talloc_steal(builtin_mem_ctx, sh);
-+      ralloc_steal(builtin_mem_ctx, sh);
-       builtin_profiles[profile_index] = sh;
-    }
-
-@@ -13546,7 +13546,7 @@ _mesa_glsl_initialize_functions(exec_list *instructions,
-                                 struct _mesa_glsl_parse_state *state)
- {
-    if (builtin_mem_ctx == NULL) {
--      builtin_mem_ctx = talloc_init("GLSL built-in functions");
-+      builtin_mem_ctx = ralloc_context(NULL); // "GLSL built-in functions"
-       memset(&builtin_profiles, 0, sizeof(builtin_profiles));
-    }
-
-diff --git a/src/glsl/builtin_types.h b/src/glsl/builtin_types.h
-index 443ae16..8ccbf6e 100644
---- a/src/glsl/builtin_types.h
-+++ b/src/glsl/builtin_types.h
-@@ -24,10 +24,11 @@
- const glsl_type glsl_type::_error_type =
-    glsl_type(GL_INVALID_ENUM, GLSL_TYPE_ERROR, 0, 0, "");
-
--const glsl_type glsl_type::void_type =
-+const glsl_type glsl_type::_void_type =
-    glsl_type(GL_INVALID_ENUM, GLSL_TYPE_VOID, 0, 0, "void");
-
- const glsl_type *const glsl_type::error_type =&  glsl_type::_error_type;
-+const glsl_type *const glsl_type::void_type =&  glsl_type::_void_type;
-
- /** \name Core built-in types
-  *
-diff --git a/src/glsl/glcpp/glcpp-lex.c b/src/glsl/glcpp/glcpp-lex.c
-index 156af30..b53bea6 100644
---- a/src/glsl/glcpp/glcpp-lex.c
-+++ b/src/glsl/glcpp/glcpp-lex.c
-@@ -795,6 +795,10 @@ int glcpp_get_lineno (yyscan_t yyscanner );
-
- void glcpp_set_lineno (int line_number ,yyscan_t yyscanner );
-
-+int glcpp_get_column  (yyscan_t yyscanner );
-+
-+void glcpp_set_column (int column_no ,yyscan_t yyscanner );
-+
- YYSTYPE * glcpp_get_lval (yyscan_t yyscanner );
-
- void glcpp_set_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner );
-@@ -954,7 +958,7 @@ YY_DECL
-
-
- 	/* Single-line comments */
--#line 958 "glcpp/glcpp-lex.c"
-+#line 962 "glcpp/glcpp-lex.c"
-
-     yylval = yylval_param;
-
-@@ -1121,7 +1125,7 @@ case 8:
- YY_RULE_SETUP
- #line 94 "glcpp/glcpp-lex.l"
- {
--	yylval->str = talloc_strdup (yyextra, yytext);
-+	yylval->str = ralloc_strdup (yyextra, yytext);
- 	yyextra->space_tokens = 0;
- 	return HASH_VERSION;
- }
-@@ -1132,7 +1136,7 @@ case 9:
- YY_RULE_SETUP
- #line 102 "glcpp/glcpp-lex.l"
- {
--	yylval->str = talloc_strdup (yyextra, yytext);
-+	yylval->str = ralloc_strdup (yyextra, yytext);
- 	yylineno++;
- 	yycolumn = 0;
- 	return OTHER;
-@@ -1312,7 +1316,7 @@ case 24:
- YY_RULE_SETUP
- #line 221 "glcpp/glcpp-lex.l"
- {
--	yylval->str = talloc_strdup (yyextra, yytext);
-+	yylval->str = ralloc_strdup (yyextra, yytext);
- 	return INTEGER_STRING;
- }
- 	YY_BREAK
-@@ -1320,7 +1324,7 @@ case 25:
- YY_RULE_SETUP
- #line 226 "glcpp/glcpp-lex.l"
- {
--	yylval->str = talloc_strdup (yyextra, yytext);
-+	yylval->str = ralloc_strdup (yyextra, yytext);
- 	return INTEGER_STRING;
- }
- 	YY_BREAK
-@@ -1328,7 +1332,7 @@ case 26:
- YY_RULE_SETUP
- #line 231 "glcpp/glcpp-lex.l"
- {
--	yylval->str = talloc_strdup (yyextra, yytext);
-+	yylval->str = ralloc_strdup (yyextra, yytext);
- 	return INTEGER_STRING;
- }
- 	YY_BREAK
-@@ -1406,7 +1410,7 @@ case 37:
- YY_RULE_SETUP
- #line 276 "glcpp/glcpp-lex.l"
- {
--	yylval->str = talloc_strdup (yyextra, yytext);
-+	yylval->str = ralloc_strdup (yyextra, yytext);
- 	return IDENTIFIER;
- }
- 	YY_BREAK
-@@ -1421,7 +1425,7 @@ case 39:
- YY_RULE_SETUP
- #line 285 "glcpp/glcpp-lex.l"
- {
--	yylval->str = talloc_strdup (yyextra, yytext);
-+	yylval->str = ralloc_strdup (yyextra, yytext);
- 	return OTHER;
- }
- 	YY_BREAK
-@@ -1471,7 +1475,7 @@ YY_RULE_SETUP
- #line 319 "glcpp/glcpp-lex.l"
- ECHO;
- 	YY_BREAK
--#line 1475 "glcpp/glcpp-lex.c"
-+#line 1479 "glcpp/glcpp-lex.c"
- 			case YY_STATE_EOF(DONE):
- 			case YY_STATE_EOF(COMMENT):
- 			case YY_STATE_EOF(UNREACHABLE):
-diff --git a/src/glsl/glcpp/glcpp-lex.l b/src/glsl/glcpp/glcpp-lex.l
-index e936854..11b73ae 100644
---- a/src/glsl/glcpp/glcpp-lex.l
-+++ b/src/glsl/glcpp/glcpp-lex.l
-@@ -92,7 +92,7 @@ HEXADECIMAL_INTEGER	0[xX][0-9a-fA-F]+[uU]?
- }
-
- {HASH}version {
--	yylval->str = talloc_strdup (yyextra, yytext);
-+	yylval->str = ralloc_strdup (yyextra, yytext);
- 	yyextra->space_tokens = 0;
- 	return HASH_VERSION;
- }
-@@ -100,7 +100,7 @@ HEXADECIMAL_INTEGER	0[xX][0-9a-fA-F]+[uU]?
- 	/* glcpp doesn't handle #extension, #version, or #pragma directives.
- 	 * Simply pass them through to the main compiler's lexer/parser. */
- {HASH}(extension|pragma)[^\n]+ {
--	yylval->str = talloc_strdup (yyextra, yytext);
-+	yylval->str = ralloc_strdup (yyextra, yytext);
- 	yylineno++;
- 	yycolumn = 0;
- 	return OTHER;
-@@ -219,17 +219,17 @@ HEXADECIMAL_INTEGER	0[xX][0-9a-fA-F]+[uU]?
- }
-
- {DECIMAL_INTEGER} {
--	yylval->str = talloc_strdup (yyextra, yytext);
-+	yylval->str = ralloc_strdup (yyextra, yytext);
- 	return INTEGER_STRING;
- }
-
- {OCTAL_INTEGER} {
--	yylval->str = talloc_strdup (yyextra, yytext);
-+	yylval->str = ralloc_strdup (yyextra, yytext);
- 	return INTEGER_STRING;
- }
-
- {HEXADECIMAL_INTEGER} {
--	yylval->str = talloc_strdup (yyextra, yytext);
-+	yylval->str = ralloc_strdup (yyextra, yytext);
- 	return INTEGER_STRING;
- }
-
-@@ -274,7 +274,7 @@ HEXADECIMAL_INTEGER	0[xX][0-9a-fA-F]+[uU]?
- }
-
- {IDENTIFIER} {
--	yylval->str = talloc_strdup (yyextra, yytext);
-+	yylval->str = ralloc_strdup (yyextra, yytext);
- 	return IDENTIFIER;
- }
-
-@@ -283,7 +283,7 @@ HEXADECIMAL_INTEGER	0[xX][0-9a-fA-F]+[uU]?
- }
-
- {OTHER}+ {
--	yylval->str = talloc_strdup (yyextra, yytext);
-+	yylval->str = ralloc_strdup (yyextra, yytext);
- 	return OTHER;
- }
-
-diff --git a/src/glsl/glcpp/glcpp-parse.c b/src/glsl/glcpp/glcpp-parse.c
-index ab7c30e..609db08 100644
---- a/src/glsl/glcpp/glcpp-parse.c
-+++ b/src/glsl/glcpp/glcpp-parse.c
-@@ -102,10 +102,6 @@
- #include "main/core.h" /* for struct gl_extensions */
- #include "main/mtypes.h" /* for gl_api enum */
-
--#define glcpp_print(stream, str) stream = talloc_strdup_append(stream, str)
--#define glcpp_printf(stream, fmt, args, ...) \
--	stream = talloc_asprintf_append(stream, fmt, args)
--
- static void
- yyerror (YYLTYPE *locp, glcpp_parser_t *parser, const char *error);
-
-@@ -149,7 +145,7 @@ _argument_list_length (argument_list_t *list);
- static token_list_t *
- _argument_list_member_at (argument_list_t *list, int index);
-
--/* Note: This function talloc_steal()s the str pointer. */
-+/* Note: This function ralloc_steal()s the str pointer. */
- static token_t *
- _token_create_str (void *ctx, int type, char *str);
-
-@@ -159,10 +155,7 @@ _token_create_ival (void *ctx, int type, int ival);
- static token_list_t *
- _token_list_create (void *ctx);
-
--/* Note: This function adds a talloc_reference() to token.
-- *
-- * You may want to talloc_unlink any current reference if you no
-- * longer need it. */
-+/* Note: This function calls ralloc_steal on token. */
- static void
- _token_list_append (token_list_t *list, token_t *token);
-
-@@ -219,7 +212,7 @@ add_builtin_define(glcpp_parser_t *parser, const char *name, int value);
-
-
- /* Line 189 of yacc.c  */
--#line 223 "glcpp/glcpp-parse.c"
-+#line 216 "glcpp/glcpp-parse.c"
-
- /* Enabling traces.  */
- #ifndef YYDEBUG
-@@ -307,7 +300,7 @@ typedef struct YYLTYPE
-
-
- /* Line 264 of yacc.c  */
--#line 311 "glcpp/glcpp-parse.c"
-+#line 304 "glcpp/glcpp-parse.c"
-
- #ifdef short
- # undef short
-@@ -632,17 +625,17 @@ static const yytype_int8 yyrhs[] =
- /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
- static const yytype_uint16 yyrline[] =
- {
--       0,   188,   188,   190,   194,   197,   202,   203,   207,   210,
--     216,   219,   222,   225,   233,   252,   262,   267,   272,   291,
--     306,   309,   312,   333,   337,   346,   351,   352,   355,   358,
--     361,   364,   367,   370,   373,   376,   379,   382,   385,   388,
--     391,   394,   397,   400,   403,   406,   409,   412,   415,   418,
--     424,   429,   437,   438,   442,   448,   449,   452,   454,   461,
--     465,   469,   474,   479,   487,   493,   501,   505,   509,   513,
--     517,   524,   525,   526,   527,   528,   529,   530,   531,   532,
--     533,   534,   535,   536,   537,   538,   539,   540,   541,   542,
--     543,   544,   545,   546,   547,   548,   549,   550,   551,   552,
--     553,   554
-+       0,   181,   181,   183,   187,   190,   195,   196,   200,   203,
-+     209,   212,   215,   218,   226,   245,   255,   260,   265,   284,
-+     299,   302,   305,   326,   330,   339,   344,   345,   348,   351,
-+     354,   357,   360,   363,   366,   369,   372,   375,   378,   381,
-+     384,   387,   390,   393,   401,   404,   407,   410,   413,   416,
-+     422,   427,   435,   436,   440,   446,   447,   450,   452,   459,
-+     463,   467,   472,   476,   483,   488,   495,   499,   503,   507,
-+     511,   518,   519,   520,   521,   522,   523,   524,   525,   526,
-+     527,   528,   529,   530,   531,   532,   533,   534,   535,   536,
-+     537,   538,   539,   540,   541,   542,   543,   544,   545,   546,
-+     547,   548
- };
- #endif
-
-@@ -1611,7 +1604,7 @@ YYLTYPE yylloc;
- /* User initialization code.  */
-
- /* Line 1251 of yacc.c  */
--#line 155 "glcpp/glcpp-parse.y"
-+#line 148 "glcpp/glcpp-parse.y"
- {
- 	yylloc.first_line = 1;
- 	yylloc.first_column = 1;
-@@ -1621,7 +1614,7 @@ YYLTYPE yylloc;
- }
-
- /* Line 1251 of yacc.c  */
--#line 1625 "glcpp/glcpp-parse.c"
-+#line 1618 "glcpp/glcpp-parse.c"
-   yylsp[0] = yylloc;
-
-   goto yysetstate;
-@@ -1809,27 +1802,27 @@ yyreduce:
-         case 4:
-
- /* Line 1464 of yacc.c  */
--#line 194 "glcpp/glcpp-parse.y"
-+#line 187 "glcpp/glcpp-parse.y"
-     {
--		glcpp_print(parser->output, "\n");
-+		ralloc_strcat (&parser->output, "\n");
- 	;}
-     break;
-
-   case 5:
-
- /* Line 1464 of yacc.c  */
--#line 197 "glcpp/glcpp-parse.y"
-+#line 190 "glcpp/glcpp-parse.y"
-     {
- 		_glcpp_parser_print_expanded_token_list (parser, (yyvsp[(1) - (1)].token_list));
--		glcpp_print(parser->output, "\n");
--		talloc_free ((yyvsp[(1) - (1)].token_list));
-+		ralloc_strcat (&parser->output, "\n");
-+		ralloc_free ((yyvsp[(1) - (1)].token_list));
- 	;}
-     break;
-
-   case 8:
-
- /* Line 1464 of yacc.c  */
--#line 207 "glcpp/glcpp-parse.y"
-+#line 200 "glcpp/glcpp-parse.y"
-     {
- 		_glcpp_parser_skip_stack_push_if (parser,&  (yylsp[(1) - (3)]), (yyvsp[(2) - (3)].ival));
- 	;}
-@@ -1838,7 +1831,7 @@ yyreduce:
-   case 9:
-
- /* Line 1464 of yacc.c  */
--#line 210 "glcpp/glcpp-parse.y"
-+#line 203 "glcpp/glcpp-parse.y"
-     {
- 		_glcpp_parser_skip_stack_change_if (parser,&  (yylsp[(1) - (3)]), "elif", (yyvsp[(2) - (3)].ival));
- 	;}
-@@ -1847,7 +1840,7 @@ yyreduce:
-   case 10:
-
- /* Line 1464 of yacc.c  */
--#line 216 "glcpp/glcpp-parse.y"
-+#line 209 "glcpp/glcpp-parse.y"
-     {
- 		_define_object_macro (parser,&  (yylsp[(2) - (4)]), (yyvsp[(2) - (4)].str), (yyvsp[(3) - (4)].token_list));
- 	;}
-@@ -1856,7 +1849,7 @@ yyreduce:
-   case 11:
-
- /* Line 1464 of yacc.c  */
--#line 219 "glcpp/glcpp-parse.y"
-+#line 212 "glcpp/glcpp-parse.y"
-     {
- 		_define_function_macro (parser,&  (yylsp[(2) - (6)]), (yyvsp[(2) - (6)].str), NULL, (yyvsp[(5) - (6)].token_list));
- 	;}
-@@ -1865,7 +1858,7 @@ yyreduce:
-   case 12:
-
- /* Line 1464 of yacc.c  */
--#line 222 "glcpp/glcpp-parse.y"
-+#line 215 "glcpp/glcpp-parse.y"
-     {
- 		_define_function_macro (parser,&  (yylsp[(2) - (7)]), (yyvsp[(2) - (7)].str), (yyvsp[(4) - (7)].string_list), (yyvsp[(6) - (7)].token_list));
- 	;}
-@@ -1874,21 +1867,21 @@ yyreduce:
-   case 13:
-
- /* Line 1464 of yacc.c  */
--#line 225 "glcpp/glcpp-parse.y"
-+#line 218 "glcpp/glcpp-parse.y"
-     {
- 		macro_t *macro = hash_table_find (parser->defines, (yyvsp[(2) - (3)].str));
- 		if (macro) {
- 			hash_table_remove (parser->defines, (yyvsp[(2) - (3)].str));
--			talloc_free (macro);
-+			ralloc_free (macro);
- 		}
--		talloc_free ((yyvsp[(2) - (3)].str));
-+		ralloc_free ((yyvsp[(2) - (3)].str));
- 	;}
-     break;
-
-   case 14:
-
- /* Line 1464 of yacc.c  */
--#line 233 "glcpp/glcpp-parse.y"
-+#line 226 "glcpp/glcpp-parse.y"
-     {
- 		/* Be careful to only evaluate the 'if' expression if
- 		 * we are not skipping. When we are skipping, we
-@@ -1913,7 +1906,7 @@ yyreduce:
-   case 15:
-
- /* Line 1464 of yacc.c  */
--#line 252 "glcpp/glcpp-parse.y"
-+#line 245 "glcpp/glcpp-parse.y"
-     {
- 		/* #if without an expression is only an error if we
- 		 *  are not skipping */
-@@ -1929,10 +1922,10 @@ yyreduce:
-   case 16:
-
- /* Line 1464 of yacc.c  */
--#line 262 "glcpp/glcpp-parse.y"
-+#line 255 "glcpp/glcpp-parse.y"
-     {
- 		macro_t *macro = hash_table_find (parser->defines, (yyvsp[(2) - (4)].str));
--		talloc_free ((yyvsp[(2) - (4)].str));
-+		ralloc_free ((yyvsp[(2) - (4)].str));
- 		_glcpp_parser_skip_stack_push_if (parser,&  (yylsp[(1) - (4)]), macro != NULL);
- 	;}
-     break;
-@@ -1940,10 +1933,10 @@ yyreduce:
-   case 17:
-
- /* Line 1464 of yacc.c  */
--#line 267 "glcpp/glcpp-parse.y"
-+#line 260 "glcpp/glcpp-parse.y"
-     {
- 		macro_t *macro = hash_table_find (parser->defines, (yyvsp[(2) - (4)].str));
--		talloc_free ((yyvsp[(2) - (4)].str));
-+		ralloc_free ((yyvsp[(2) - (4)].str));
- 		_glcpp_parser_skip_stack_push_if (parser,&  (yylsp[(1) - (4)]), macro == NULL);
- 	;}
-     break;
-@@ -1951,7 +1944,7 @@ yyreduce:
-   case 18:
-
- /* Line 1464 of yacc.c  */
--#line 272 "glcpp/glcpp-parse.y"
-+#line 265 "glcpp/glcpp-parse.y"
-     {
- 		/* Be careful to only evaluate the 'elif' expression
- 		 * if we are not skipping. When we are skipping, we
-@@ -1976,7 +1969,7 @@ yyreduce:
-   case 19:
-
- /* Line 1464 of yacc.c  */
--#line 291 "glcpp/glcpp-parse.y"
-+#line 284 "glcpp/glcpp-parse.y"
-     {
- 		/* #elif without an expression is an error unless we
- 		 * are skipping. */
-@@ -1997,7 +1990,7 @@ yyreduce:
-   case 20:
-
- /* Line 1464 of yacc.c  */
--#line 306 "glcpp/glcpp-parse.y"
-+#line 299 "glcpp/glcpp-parse.y"
-     {
- 		_glcpp_parser_skip_stack_change_if (parser,&  (yylsp[(1) - (2)]), "else", 1);
- 	;}
-@@ -2006,7 +1999,7 @@ yyreduce:
-   case 21:
-
- /* Line 1464 of yacc.c  */
--#line 309 "glcpp/glcpp-parse.y"
-+#line 302 "glcpp/glcpp-parse.y"
-     {
- 		_glcpp_parser_skip_stack_pop (parser,&  (yylsp[(1) - (2)]));
- 	;}
-@@ -2015,12 +2008,12 @@ yyreduce:
-   case 22:
-
- /* Line 1464 of yacc.c  */
--#line 312 "glcpp/glcpp-parse.y"
-+#line 305 "glcpp/glcpp-parse.y"
-     {
- 		macro_t *macro = hash_table_find (parser->defines, "__VERSION__");
- 		if (macro) {
- 			hash_table_remove (parser->defines, "__VERSION__");
--			talloc_free (macro);
-+			ralloc_free (macro);
- 		}
- 		add_builtin_define (parser, "__VERSION__", (yyvsp[(2) - (3)].ival));
-
-@@ -2035,14 +2028,14 @@ yyreduce:
- 		if ((yyvsp[(2) - (3)].ival)>= 130 || (yyvsp[(2) - (3)].ival) == 100)
- 			add_builtin_define (parser, "GL_FRAGMENT_PRECISION_HIGH", 1);
-
--		glcpp_printf(parser->output, "#version %" PRIiMAX, (yyvsp[(2) - (3)].ival));
-+		ralloc_asprintf_append (&parser->output, "#version %" PRIiMAX, (yyvsp[(2) - (3)].ival));
- 	;}
-     break;
-
-   case 24:
-
- /* Line 1464 of yacc.c  */
--#line 337 "glcpp/glcpp-parse.y"
-+#line 330 "glcpp/glcpp-parse.y"
-     {
- 		if (strlen ((yyvsp[(1) - (1)].str))>= 3&&  strncmp ((yyvsp[(1) - (1)].str), "0x", 2) == 0) {
- 			(yyval.ival) = strtoll ((yyvsp[(1) - (1)].str) + 2, NULL, 16);
-@@ -2057,7 +2050,7 @@ yyreduce:
-   case 25:
-
- /* Line 1464 of yacc.c  */
--#line 346 "glcpp/glcpp-parse.y"
-+#line 339 "glcpp/glcpp-parse.y"
-     {
- 		(yyval.ival) = (yyvsp[(1) - (1)].ival);
- 	;}
-@@ -2066,7 +2059,7 @@ yyreduce:
-   case 27:
-
- /* Line 1464 of yacc.c  */
--#line 352 "glcpp/glcpp-parse.y"
-+#line 345 "glcpp/glcpp-parse.y"
-     {
- 		(yyval.ival) = (yyvsp[(1) - (3)].ival) || (yyvsp[(3) - (3)].ival);
- 	;}
-@@ -2075,7 +2068,7 @@ yyreduce:
-   case 28:
-
- /* Line 1464 of yacc.c  */
--#line 355 "glcpp/glcpp-parse.y"
-+#line 348 "glcpp/glcpp-parse.y"
-     {
- 		(yyval.ival) = (yyvsp[(1) - (3)].ival)&&  (yyvsp[(3) - (3)].ival);
- 	;}
-@@ -2084,7 +2077,7 @@ yyreduce:
-   case 29:
-
- /* Line 1464 of yacc.c  */
--#line 358 "glcpp/glcpp-parse.y"
-+#line 351 "glcpp/glcpp-parse.y"
-     {
- 		(yyval.ival) = (yyvsp[(1) - (3)].ival) | (yyvsp[(3) - (3)].ival);
- 	;}
-@@ -2093,7 +2086,7 @@ yyreduce:
-   case 30:
-
- /* Line 1464 of yacc.c  */
--#line 361 "glcpp/glcpp-parse.y"
-+#line 354 "glcpp/glcpp-parse.y"
-     {
- 		(yyval.ival) = (yyvsp[(1) - (3)].ival) ^ (yyvsp[(3) - (3)].ival);
- 	;}
-@@ -2102,7 +2095,7 @@ yyreduce:
-   case 31:
-
- /* Line 1464 of yacc.c  */
--#line 364 "glcpp/glcpp-parse.y"
-+#line 357 "glcpp/glcpp-parse.y"
-     {
- 		(yyval.ival) = (yyvsp[(1) - (3)].ival)&  (yyvsp[(3) - (3)].ival);
- 	;}
-@@ -2111,7 +2104,7 @@ yyreduce:
-   case 32:
-
- /* Line 1464 of yacc.c  */
--#line 367 "glcpp/glcpp-parse.y"
-+#line 360 "glcpp/glcpp-parse.y"
-     {
- 		(yyval.ival) = (yyvsp[(1) - (3)].ival) != (yyvsp[(3) - (3)].ival);
- 	;}
-@@ -2120,7 +2113,7 @@ yyreduce:
-   case 33:
-
- /* Line 1464 of yacc.c  */
--#line 370 "glcpp/glcpp-parse.y"
-+#line 363 "glcpp/glcpp-parse.y"
-     {
- 		(yyval.ival) = (yyvsp[(1) - (3)].ival) == (yyvsp[(3) - (3)].ival);
- 	;}
-@@ -2129,7 +2122,7 @@ yyreduce:
-   case 34:
-
- /* Line 1464 of yacc.c  */
--#line 373 "glcpp/glcpp-parse.y"
-+#line 366 "glcpp/glcpp-parse.y"
-     {
- 		(yyval.ival) = (yyvsp[(1) - (3)].ival)>= (yyvsp[(3) - (3)].ival);
- 	;}
-@@ -2138,7 +2131,7 @@ yyreduce:
-   case 35:
-
- /* Line 1464 of yacc.c  */
--#line 376 "glcpp/glcpp-parse.y"
-+#line 369 "glcpp/glcpp-parse.y"
-     {
- 		(yyval.ival) = (yyvsp[(1) - (3)].ival)<= (yyvsp[(3) - (3)].ival);
- 	;}
-@@ -2147,7 +2140,7 @@ yyreduce:
-   case 36:
-
- /* Line 1464 of yacc.c  */
--#line 379 "glcpp/glcpp-parse.y"
-+#line 372 "glcpp/glcpp-parse.y"
-     {
- 		(yyval.ival) = (yyvsp[(1) - (3)].ival)>  (yyvsp[(3) - (3)].ival);
- 	;}
-@@ -2156,7 +2149,7 @@ yyreduce:
-   case 37:
-
- /* Line 1464 of yacc.c  */
--#line 382 "glcpp/glcpp-parse.y"
-+#line 375 "glcpp/glcpp-parse.y"
-     {
- 		(yyval.ival) = (yyvsp[(1) - (3)].ival)<  (yyvsp[(3) - (3)].ival);
- 	;}
-@@ -2165,7 +2158,7 @@ yyreduce:
-   case 38:
-
- /* Line 1464 of yacc.c  */
--#line 385 "glcpp/glcpp-parse.y"
-+#line 378 "glcpp/glcpp-parse.y"
-     {
- 		(yyval.ival) = (yyvsp[(1) - (3)].ival)>>  (yyvsp[(3) - (3)].ival);
- 	;}
-@@ -2174,7 +2167,7 @@ yyreduce:
-   case 39:
-
- /* Line 1464 of yacc.c  */
--#line 388 "glcpp/glcpp-parse.y"
-+#line 381 "glcpp/glcpp-parse.y"
-     {
- 		(yyval.ival) = (yyvsp[(1) - (3)].ival)<<  (yyvsp[(3) - (3)].ival);
- 	;}
-@@ -2183,7 +2176,7 @@ yyreduce:
-   case 40:
-
- /* Line 1464 of yacc.c  */
--#line 391 "glcpp/glcpp-parse.y"
-+#line 384 "glcpp/glcpp-parse.y"
-     {
- 		(yyval.ival) = (yyvsp[(1) - (3)].ival) - (yyvsp[(3) - (3)].ival);
- 	;}
-@@ -2192,7 +2185,7 @@ yyreduce:
-   case 41:
-
- /* Line 1464 of yacc.c  */
--#line 394 "glcpp/glcpp-parse.y"
-+#line 387 "glcpp/glcpp-parse.y"
-     {
- 		(yyval.ival) = (yyvsp[(1) - (3)].ival) + (yyvsp[(3) - (3)].ival);
- 	;}
-@@ -2201,7 +2194,7 @@ yyreduce:
-   case 42:
-
- /* Line 1464 of yacc.c  */
--#line 397 "glcpp/glcpp-parse.y"
-+#line 390 "glcpp/glcpp-parse.y"
-     {
- 		(yyval.ival) = (yyvsp[(1) - (3)].ival) % (yyvsp[(3) - (3)].ival);
- 	;}
-@@ -2210,16 +2203,21 @@ yyreduce:
-   case 43:
-
- /* Line 1464 of yacc.c  */
--#line 400 "glcpp/glcpp-parse.y"
-+#line 393 "glcpp/glcpp-parse.y"
-     {
--		(yyval.ival) = (yyvsp[(1) - (3)].ival) / (yyvsp[(3) - (3)].ival);
-+		if ((yyvsp[(3) - (3)].ival) == 0) {
-+			yyerror (&  (yylsp[(1) - (3)]), parser,
-+				 "division by 0 in preprocessor directive");
-+		} else {
-+			(yyval.ival) = (yyvsp[(1) - (3)].ival) / (yyvsp[(3) - (3)].ival);
-+		}
- 	;}
-     break;
-
-   case 44:
-
- /* Line 1464 of yacc.c  */
--#line 403 "glcpp/glcpp-parse.y"
-+#line 401 "glcpp/glcpp-parse.y"
-     {
- 		(yyval.ival) = (yyvsp[(1) - (3)].ival) * (yyvsp[(3) - (3)].ival);
- 	;}
-@@ -2228,7 +2226,7 @@ yyreduce:
-   case 45:
-
- /* Line 1464 of yacc.c  */
--#line 406 "glcpp/glcpp-parse.y"
-+#line 404 "glcpp/glcpp-parse.y"
-     {
- 		(yyval.ival) = ! (yyvsp[(2) - (2)].ival);
- 	;}
-@@ -2237,7 +2235,7 @@ yyreduce:
-   case 46:
-
- /* Line 1464 of yacc.c  */
--#line 409 "glcpp/glcpp-parse.y"
-+#line 407 "glcpp/glcpp-parse.y"
-     {
- 		(yyval.ival) = ~ (yyvsp[(2) - (2)].ival);
- 	;}
-@@ -2246,7 +2244,7 @@ yyreduce:
-   case 47:
-
- /* Line 1464 of yacc.c  */
--#line 412 "glcpp/glcpp-parse.y"
-+#line 410 "glcpp/glcpp-parse.y"
-     {
- 		(yyval.ival) = - (yyvsp[(2) - (2)].ival);
- 	;}
-@@ -2255,7 +2253,7 @@ yyreduce:
-   case 48:
-
- /* Line 1464 of yacc.c  */
--#line 415 "glcpp/glcpp-parse.y"
-+#line 413 "glcpp/glcpp-parse.y"
-     {
- 		(yyval.ival) = + (yyvsp[(2) - (2)].ival);
- 	;}
-@@ -2264,7 +2262,7 @@ yyreduce:
-   case 49:
-
- /* Line 1464 of yacc.c  */
--#line 418 "glcpp/glcpp-parse.y"
-+#line 416 "glcpp/glcpp-parse.y"
-     {
- 		(yyval.ival) = (yyvsp[(2) - (3)].ival);
- 	;}
-@@ -2273,36 +2271,36 @@ yyreduce:
-   case 50:
-
- /* Line 1464 of yacc.c  */
--#line 424 "glcpp/glcpp-parse.y"
-+#line 422 "glcpp/glcpp-parse.y"
-     {
- 		(yyval.string_list) = _string_list_create (parser);
- 		_string_list_append_item ((yyval.string_list), (yyvsp[(1) - (1)].str));
--		talloc_steal ((yyval.string_list), (yyvsp[(1) - (1)].str));
-+		ralloc_steal ((yyval.string_list), (yyvsp[(1) - (1)].str));
- 	;}
-     break;
-
-   case 51:
-
- /* Line 1464 of yacc.c  */
--#line 429 "glcpp/glcpp-parse.y"
-+#line 427 "glcpp/glcpp-parse.y"
-     {
- 		(yyval.string_list) = (yyvsp[(1) - (3)].string_list);	
- 		_string_list_append_item ((yyval.string_list), (yyvsp[(3) - (3)].str));
--		talloc_steal ((yyval.string_list), (yyvsp[(3) - (3)].str));
-+		ralloc_steal ((yyval.string_list), (yyvsp[(3) - (3)].str));
- 	;}
-     break;
-
-   case 52:
-
- /* Line 1464 of yacc.c  */
--#line 437 "glcpp/glcpp-parse.y"
-+#line 435 "glcpp/glcpp-parse.y"
-     { (yyval.token_list) = NULL; ;}
-     break;
-
-   case 54:
-
- /* Line 1464 of yacc.c  */
--#line 442 "glcpp/glcpp-parse.y"
-+#line 440 "glcpp/glcpp-parse.y"
-     {
- 		yyerror (&  (yylsp[(1) - (2)]), parser, "Invalid tokens after #");
- 	;}
-@@ -2311,14 +2309,14 @@ yyreduce:
-   case 55:
-
- /* Line 1464 of yacc.c  */
--#line 448 "glcpp/glcpp-parse.y"
-+#line 446 "glcpp/glcpp-parse.y"
-     { (yyval.token_list) = NULL; ;}
-     break;
-
-   case 58:
-
- /* Line 1464 of yacc.c  */
--#line 454 "glcpp/glcpp-parse.y"
-+#line 452 "glcpp/glcpp-parse.y"
-     {
- 		glcpp_warning(&(yylsp[(1) - (1)]), parser, "extra tokens at end of directive");
- 	;}
-@@ -2327,7 +2325,7 @@ yyreduce:
-   case 59:
-
- /* Line 1464 of yacc.c  */
--#line 461 "glcpp/glcpp-parse.y"
-+#line 459 "glcpp/glcpp-parse.y"
-     {
- 		int v = hash_table_find (parser->defines, (yyvsp[(2) - (2)].str)) ? 1 : 0;
- 		(yyval.token) = _token_create_ival (parser, INTEGER, v);
-@@ -2337,7 +2335,7 @@ yyreduce:
-   case 60:
-
- /* Line 1464 of yacc.c  */
--#line 465 "glcpp/glcpp-parse.y"
-+#line 463 "glcpp/glcpp-parse.y"
-     {
- 		int v = hash_table_find (parser->defines, (yyvsp[(3) - (4)].str)) ? 1 : 0;
- 		(yyval.token) = _token_create_ival (parser, INTEGER, v);
-@@ -2347,52 +2345,48 @@ yyreduce:
-   case 62:
-
- /* Line 1464 of yacc.c  */
--#line 474 "glcpp/glcpp-parse.y"
-+#line 472 "glcpp/glcpp-parse.y"
-     {
- 		(yyval.token_list) = _token_list_create (parser);
- 		_token_list_append ((yyval.token_list), (yyvsp[(1) - (1)].token));
--		talloc_unlink (parser, (yyvsp[(1) - (1)].token));
- 	;}
-     break;
-
-   case 63:
-
- /* Line 1464 of yacc.c  */
--#line 479 "glcpp/glcpp-parse.y"
-+#line 476 "glcpp/glcpp-parse.y"
-     {
- 		(yyval.token_list) = (yyvsp[(1) - (2)].token_list);
- 		_token_list_append ((yyval.token_list), (yyvsp[(2) - (2)].token));
--		talloc_unlink (parser, (yyvsp[(2) - (2)].token));
- 	;}
-     break;
-
-   case 64:
-
- /* Line 1464 of yacc.c  */
--#line 487 "glcpp/glcpp-parse.y"
-+#line 483 "glcpp/glcpp-parse.y"
-     {
- 		parser->space_tokens = 1;
- 		(yyval.token_list) = _token_list_create (parser);
- 		_token_list_append ((yyval.token_list), (yyvsp[(1) - (1)].token));
--		talloc_unlink (parser, (yyvsp[(1) - (1)].token));
- 	;}
-     break;
-
-   case 65:
-
- /* Line 1464 of yacc.c  */
--#line 493 "glcpp/glcpp-parse.y"
-+#line 488 "glcpp/glcpp-parse.y"
-     {
- 		(yyval.token_list) = (yyvsp[(1) - (2)].token_list);
- 		_token_list_append ((yyval.token_list), (yyvsp[(2) - (2)].token));
--		talloc_unlink (parser, (yyvsp[(2) - (2)].token));
- 	;}
-     break;
-
-   case 66:
-
- /* Line 1464 of yacc.c  */
--#line 501 "glcpp/glcpp-parse.y"
-+#line 495 "glcpp/glcpp-parse.y"
-     {
- 		(yyval.token) = _token_create_str (parser, IDENTIFIER, (yyvsp[(1) - (1)].str));
- 		(yyval.token)->location = yylloc;
-@@ -2402,7 +2396,7 @@ yyreduce:
-   case 67:
-
- /* Line 1464 of yacc.c  */
--#line 505 "glcpp/glcpp-parse.y"
-+#line 499 "glcpp/glcpp-parse.y"
-     {
- 		(yyval.token) = _token_create_str (parser, INTEGER_STRING, (yyvsp[(1) - (1)].str));
- 		(yyval.token)->location = yylloc;
-@@ -2412,7 +2406,7 @@ yyreduce:
-   case 68:
-
- /* Line 1464 of yacc.c  */
--#line 509 "glcpp/glcpp-parse.y"
-+#line 503 "glcpp/glcpp-parse.y"
-     {
- 		(yyval.token) = _token_create_ival (parser, (yyvsp[(1) - (1)].ival), (yyvsp[(1) - (1)].ival));
- 		(yyval.token)->location = yylloc;
-@@ -2422,7 +2416,7 @@ yyreduce:
-   case 69:
-
- /* Line 1464 of yacc.c  */
--#line 513 "glcpp/glcpp-parse.y"
-+#line 507 "glcpp/glcpp-parse.y"
-     {
- 		(yyval.token) = _token_create_str (parser, OTHER, (yyvsp[(1) - (1)].str));
- 		(yyval.token)->location = yylloc;
-@@ -2432,7 +2426,7 @@ yyreduce:
-   case 70:
-
- /* Line 1464 of yacc.c  */
--#line 517 "glcpp/glcpp-parse.y"
-+#line 511 "glcpp/glcpp-parse.y"
-     {
- 		(yyval.token) = _token_create_ival (parser, SPACE, SPACE);
- 		(yyval.token)->location = yylloc;
-@@ -2442,224 +2436,224 @@ yyreduce:
-   case 71:
-
- /* Line 1464 of yacc.c  */
--#line 524 "glcpp/glcpp-parse.y"
-+#line 518 "glcpp/glcpp-parse.y"
-     { (yyval.ival) = '['; ;}
-     break;
-
-   case 72:
-
- /* Line 1464 of yacc.c  */
--#line 525 "glcpp/glcpp-parse.y"
-+#line 519 "glcpp/glcpp-parse.y"
-     { (yyval.ival) = ']'; ;}
-     break;
-
-   case 73:
-
- /* Line 1464 of yacc.c  */
--#line 526 "glcpp/glcpp-parse.y"
-+#line 520 "glcpp/glcpp-parse.y"
-     { (yyval.ival) = '('; ;}
-     break;
-
-   case 74:
-
- /* Line 1464 of yacc.c  */
--#line 527 "glcpp/glcpp-parse.y"
-+#line 521 "glcpp/glcpp-parse.y"
-     { (yyval.ival) = ')'; ;}
-     break;
-
-   case 75:
-
- /* Line 1464 of yacc.c  */
--#line 528 "glcpp/glcpp-parse.y"
-+#line 522 "glcpp/glcpp-parse.y"
-     { (yyval.ival) = '{'; ;}
-     break;
-
-   case 76:
-
- /* Line 1464 of yacc.c  */
--#line 529 "glcpp/glcpp-parse.y"
-+#line 523 "glcpp/glcpp-parse.y"
-     { (yyval.ival) = '}'; ;}
-     break;
-
-   case 77:
-
- /* Line 1464 of yacc.c  */
--#line 530 "glcpp/glcpp-parse.y"
-+#line 524 "glcpp/glcpp-parse.y"
-     { (yyval.ival) = '.'; ;}
-     break;
-
-   case 78:
-
- /* Line 1464 of yacc.c  */
--#line 531 "glcpp/glcpp-parse.y"
-+#line 525 "glcpp/glcpp-parse.y"
-     { (yyval.ival) = '&'; ;}
-     break;
-
-   case 79:
-
- /* Line 1464 of yacc.c  */
--#line 532 "glcpp/glcpp-parse.y"
-+#line 526 "glcpp/glcpp-parse.y"
-     { (yyval.ival) = '*'; ;}
-     break;
-
-   case 80:
-
- /* Line 1464 of yacc.c  */
--#line 533 "glcpp/glcpp-parse.y"
-+#line 527 "glcpp/glcpp-parse.y"
-     { (yyval.ival) = '+'; ;}
-     break;
-
-   case 81:
-
- /* Line 1464 of yacc.c  */
--#line 534 "glcpp/glcpp-parse.y"
-+#line 528 "glcpp/glcpp-parse.y"
-     { (yyval.ival) = '-'; ;}
-     break;
-
-   case 82:
-
- /* Line 1464 of yacc.c  */
--#line 535 "glcpp/glcpp-parse.y"
-+#line 529 "glcpp/glcpp-parse.y"
-     { (yyval.ival) = '~'; ;}
-     break;
-
-   case 83:
-
- /* Line 1464 of yacc.c  */
--#line 536 "glcpp/glcpp-parse.y"
-+#line 530 "glcpp/glcpp-parse.y"
-     { (yyval.ival) = '!'; ;}
-     break;
-
-   case 84:
-
- /* Line 1464 of yacc.c  */
--#line 537 "glcpp/glcpp-parse.y"
-+#line 531 "glcpp/glcpp-parse.y"
-     { (yyval.ival) = '/'; ;}
-     break;
-
-   case 85:
-
- /* Line 1464 of yacc.c  */
--#line 538 "glcpp/glcpp-parse.y"
-+#line 532 "glcpp/glcpp-parse.y"
-     { (yyval.ival) = '%'; ;}
-     break;
-
-   case 86:
-
- /* Line 1464 of yacc.c  */
--#line 539 "glcpp/glcpp-parse.y"
-+#line 533 "glcpp/glcpp-parse.y"
-     { (yyval.ival) = LEFT_SHIFT; ;}
-     break;
-
-   case 87:
-
- /* Line 1464 of yacc.c  */
--#line 540 "glcpp/glcpp-parse.y"
-+#line 534 "glcpp/glcpp-parse.y"
-     { (yyval.ival) = RIGHT_SHIFT; ;}
-     break;
-
-   case 88:
-
- /* Line 1464 of yacc.c  */
--#line 541 "glcpp/glcpp-parse.y"
-+#line 535 "glcpp/glcpp-parse.y"
-     { (yyval.ival) = '<'; ;}
-     break;
-
-   case 89:
-
- /* Line 1464 of yacc.c  */
--#line 542 "glcpp/glcpp-parse.y"
-+#line 536 "glcpp/glcpp-parse.y"
-     { (yyval.ival) = '>'; ;}
-     break;
-
-   case 90:
-
- /* Line 1464 of yacc.c  */
--#line 543 "glcpp/glcpp-parse.y"
-+#line 537 "glcpp/glcpp-parse.y"
-     { (yyval.ival) = LESS_OR_EQUAL; ;}
-     break;
-
-   case 91:
-
- /* Line 1464 of yacc.c  */
--#line 544 "glcpp/glcpp-parse.y"
-+#line 538 "glcpp/glcpp-parse.y"
-     { (yyval.ival) = GREATER_OR_EQUAL; ;}
-     break;
-
-   case 92:
-
- /* Line 1464 of yacc.c  */
--#line 545 "glcpp/glcpp-parse.y"
-+#line 539 "glcpp/glcpp-parse.y"
-     { (yyval.ival) = EQUAL; ;}
-     break;
-
-   case 93:
-
- /* Line 1464 of yacc.c  */
--#line 546 "glcpp/glcpp-parse.y"
-+#line 540 "glcpp/glcpp-parse.y"
-     { (yyval.ival) = NOT_EQUAL; ;}
-     break;
-
-   case 94:
-
- /* Line 1464 of yacc.c  */
--#line 547 "glcpp/glcpp-parse.y"
-+#line 541 "glcpp/glcpp-parse.y"
-     { (yyval.ival) = '^'; ;}
-     break;
-
-   case 95:
-
- /* Line 1464 of yacc.c  */
--#line 548 "glcpp/glcpp-parse.y"
-+#line 542 "glcpp/glcpp-parse.y"
-     { (yyval.ival) = '|'; ;}
-     break;
-
-   case 96:
-
- /* Line 1464 of yacc.c  */
--#line 549 "glcpp/glcpp-parse.y"
-+#line 543 "glcpp/glcpp-parse.y"
-     { (yyval.ival) = AND; ;}
-     break;
-
-   case 97:
-
- /* Line 1464 of yacc.c  */
--#line 550 "glcpp/glcpp-parse.y"
-+#line 544 "glcpp/glcpp-parse.y"
-     { (yyval.ival) = OR; ;}
-     break;
-
-   case 98:
-
- /* Line 1464 of yacc.c  */
--#line 551 "glcpp/glcpp-parse.y"
-+#line 545 "glcpp/glcpp-parse.y"
-     { (yyval.ival) = ';'; ;}
-     break;
-
-   case 99:
-
- /* Line 1464 of yacc.c  */
--#line 552 "glcpp/glcpp-parse.y"
-+#line 546 "glcpp/glcpp-parse.y"
-     { (yyval.ival) = ','; ;}
-     break;
-
-   case 100:
-
- /* Line 1464 of yacc.c  */
--#line 553 "glcpp/glcpp-parse.y"
-+#line 547 "glcpp/glcpp-parse.y"
-     { (yyval.ival) = '='; ;}
-     break;
-
-   case 101:
[… more lines in the raw message]

Lines of this file are not shown. View the raw message.

meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb renamed from meta/recipes-graphics/mesa/mesa-dri_7.10.bb +3 -4

similarity index 85%
rename from meta/recipes-graphics/mesa/mesa-dri_7.10.bb
rename to meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb
index 1865dd4..99d6066 100644

Lines of this file are not shown. View the raw message.

meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb renamed from meta/recipes-graphics/mesa/mesa-xlib_7.10.bb +3 -4

similarity index 68%
rename from meta/recipes-graphics/mesa/mesa-xlib_7.10.bb
rename to meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb
index c8eb88f..b77df2c 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Quoted 13 lines · Yu Ke

From: Yu Ke<[email protected]>

- also remove the talloc-removal.patch because it is already included in this version

Signed-off-by Yu Ke<[email protected]>

---
  .../distro/include/preferred-xorg-versions.inc     |    2 +-
  .../mesa/files/talloc-removal.patch                |15571 
--------------------
  .../mesa/{mesa-dri_7.10.bb =>  mesa-dri_7.10.2.bb}  |    7 +-
  .../{mesa-xlib_7.10.bb =>  mesa-xlib_7.10.2.bb}     |    7 +-
  4 files changed, 7 insertions(+), 15580 deletions(-)

Quoted 7 lines

delete mode 100644
meta/recipes-graphics/mesa/files/talloc-removal.patch
rename meta/recipes-graphics/mesa/{mesa-dri_7.10.bb =>
mesa-dri_7.10.2.bb} (85%)
rename meta/recipes-graphics/mesa/{mesa-xlib_7.10.bb =>
mesa-xlib_7.10.2.bb} (68%)

Ke,

I noticed other patches for both the 7.10.2 version and GIT version in the mesa-dri directory. Also is there a reason we are carrying around older versions of mesa-dri?

I am looking at the overall clean state of things as we move forward.

Thanks
Sau!

Quoted 21 lines · Saul Wold

Quoted 11 lines · Yu Ke

From: Yu Ke<[email protected]>

- also remove the talloc-removal.patch because it is already included in this version

Signed-off-by Yu Ke<[email protected]>

---
.../distro/include/preferred-xorg-versions.inc | 2 +- .../mesa/files/talloc-removal.patch |15571 -------------------- .../mesa/{mesa-dri_7.10.bb => mesa-dri_7.10.2.bb} | 7 +- .../{mesa-xlib_7.10.bb => mesa-xlib_7.10.2.bb} | 7 +-

Quoted 7 lines

4 files changed, 7 insertions(+), 15580 deletions(-)

delete mode 100644 meta/recipes-graphics/mesa/files/talloc-removal.patch rename meta/recipes-graphics/mesa/{mesa-dri_7.10.bb => mesa-dri_7.10.2.bb} (85%)
rename meta/recipes-graphics/mesa/{mesa-xlib_7.10.bb => mesa-xlib_7.10.2.bb} (68%)

Ke,

Quoted 8 lines

I noticed other patches for both the 7.10.2 version and GIT version in the mesa-dri directory. Also is there a reason we are carrying around older versions of mesa-dri?

I am looking at the overall clean state of things as we move forward.

Thanks
Sau!

Thanks for pointing it out. Yes, I will add Upstream-Status tag to those patches. The old versions 7.8.2 is kept for GPLv3 talloc workaround, The other old 7.5 and 7.7 version is just legacy recipe from poky. These old recipes can be removed safely. I will make patch to remove it.

BTW, I notice this mesa upgrade patch is already in your staging branch
(http://git.pokylinux.org/cgit/cgit.cgi/poky-contrib/log/?h=distro/stage),
so should I make a incremental patch base on this, or make a V3 mesa upgrade patch base on master branch?

Regards
Ke

Review LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-nativ · line 14

Quoted 6 lines · Yu Ke

From: Yu Ke<[email protected]>

- also remove the talloc-removal.patch because it is already included in this version

(quoted diff) +0 -0

@@ -15,6 +14,6 @@ LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-nativ
  DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS} makedepend-native"

While we're in here, the mesa stuff needs python-native as a DEPENDS.

From: Yu Ke<[email protected]>

This patch set upgrade the following recipes:
libdrm
xf86-input-synaptics
xf86-input-vmmouse
mesa
evieext
xf86-input-mouse
pango
xf86-input-keyboard
xkbcomp

changes since V1: add the upstream status tag.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: kyu3/upgrade-04-15
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/upgrade-04-15

Thanks,
Yu Ke<[email protected]>
---

Yu Ke (9):

   libdrm: upgrade from 2.4.23 to 2.4.25
   xf86-input-synaptics: upgrade from 1.3.0 to 1.4.0
   xf86-input-vmmouse: upgrade from 12.6.10 to 12.7.0
   mesa: upgrade to 7.10.2
   evieext: upgrade from 1.1.0 to 1.1.1
   xf86-input-mouse: upgrade from 1.6 to 1.7
   pango: upgrade from 1.28.3 to 1.28.4
   xf86-input-keyboard: upgrade from 1.5.0 to 1.6.0
   xkbcomp: upgrade from 1.2.0 to 1.2.1

  .../distro/include/preferred-xorg-versions.inc     |   12 +-
  .../drm/libdrm-2.4.23/installtests.patch           |   43 -
  .../drm/libdrm-2.4.25/installtests.patch           |   49 +
  .../drm/{libdrm_2.4.23.bb =>  libdrm_2.4.25.bb}     |    5 +-
  .../mesa/files/talloc-removal.patch                |15571 --------------------
  .../mesa/{mesa-dri_7.10.bb =>  mesa-dri_7.10.2.bb}  |    7 +-
  .../{mesa-xlib_7.10.bb =>  mesa-xlib_7.10.2.bb}     |    7 +-
  .../{pango-1.28.3 =>  pango-1.28.4}/no-tests.patch  |    4 +
  .../pango/{pango_1.28.3.bb =>  pango_1.28.4.bb}     |    4 +-
  .../xorg-app/xkbcomp/cross-compile-fix.patch       |   35 -
  .../{xkbcomp_1.2.0.bb =>  xkbcomp_1.2.1.bb}         |    5 +-
  ...board_1.5.0.bb =>  xf86-input-keyboard_1.6.0.bb} |    4 +-
  .../xorg-driver/xf86-input-mouse/unbreak.patch     |    2 +
  ...ut-mouse_1.6.0.bb =>  xf86-input-mouse_1.7.0.bb} |    4 +-
  ...tics_1.3.0.bb =>  xf86-input-synaptics_1.4.0.bb} |    4 +-
  ...use_12.6.10.bb =>  xf86-input-vmmouse_12.7.0.bb} |    4 +-
  .../{evieext_1.1.0.bb =>  evieext_1.1.1.bb}         |    8 +-
  17 files changed, 86 insertions(+), 15682 deletions(-)

delete mode 100644 meta/recipes-graphics/drm/libdrm-2.4.23/installtests.patch
create mode 100644 meta/recipes-graphics/drm/libdrm-2.4.25/installtests.patch
rename meta/recipes-graphics/drm/{libdrm_2.4.23.bb => libdrm_2.4.25.bb} (54%)
delete mode 100644 meta/recipes-graphics/mesa/files/talloc-removal.patch
rename meta/recipes-graphics/mesa/{mesa-dri_7.10.bb => mesa-dri_7.10.2.bb} (85%)
rename meta/recipes-graphics/mesa/{mesa-xlib_7.10.bb => mesa-xlib_7.10.2.bb} (68%)
rename meta/recipes-graphics/pango/{pango-1.28.3 => pango-1.28.4}/no-tests.patch (72%) rename meta/recipes-graphics/pango/{pango_1.28.3.bb => pango_1.28.4.bb} (50%)
delete mode 100644 meta/recipes-graphics/xorg-app/xkbcomp/cross-compile-fix.patch
rename meta/recipes-graphics/xorg-app/{xkbcomp_1.2.0.bb => xkbcomp_1.2.1.bb} (72%)
rename meta/recipes-graphics/xorg-driver/{xf86-input-keyboard_1.5.0.bb => xf86-input-keyboard_1.6.0.bb} (74%) rename meta/recipes-graphics/xorg-driver/{xf86-input-mouse_1.6.0.bb => xf86-input-mouse_1.7.0.bb} (76%) rename meta/recipes-graphics/xorg-driver/{xf86-input-synaptics_1.3.0.bb => xf86-input-synaptics_1.4.0.bb} (83%) rename meta/recipes-graphics/xorg-driver/{xf86-input-vmmouse_12.6.10.bb => xf86-input-vmmouse_12.7.0.bb} (64%) rename meta/recipes-graphics/xorg-proto/{evieext_1.1.0.bb => evieext_1.1.1.bb} (54%)

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core