docs: Add change log to 7.10.3 release notes

Tested by piglit ati_draw_buffers-arbfp.
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
(cherry picked from commit fb6e39737a)

Makefile

@@ -180,7 +180,7 @@ ultrix-gcc:
 
 # Rules for making release tarballs
 
-VERSION=7.10-devel
+VERSION=7.10.3
 DIRECTORY = Mesa-$(VERSION)
 LIB_NAME = MesaLib-$(VERSION)
 GLUT_NAME = MesaGLUT-$(VERSION)
@@ -197,6 +197,9 @@ MAIN_FILES = \
 	$(DIRECTORY)/configure.ac					\
 	$(DIRECTORY)/acinclude.m4					\
 	$(DIRECTORY)/aclocal.m4						\
+	$(DIRECTORY)/SConstruct						\
+	$(DIRECTORY)/common.py						\
+	$(DIRECTORY)/scons/*py						\
 	$(DIRECTORY)/bin/config.guess					\
 	$(DIRECTORY)/bin/config.sub					\
 	$(DIRECTORY)/bin/install-sh					\
@@ -209,7 +212,6 @@ MAIN_FILES = \
 	$(DIRECTORY)/docs/README.*					\
 	$(DIRECTORY)/docs/RELNOTES*					\
 	$(DIRECTORY)/docs/*.spec					\
-	$(DIRECTORY)/include/GL/internal/glcore.h			\
 	$(DIRECTORY)/include/GL/gl.h					\
 	$(DIRECTORY)/include/GL/glext.h					\
 	$(DIRECTORY)/include/GL/gl_mangle.h				\
@@ -224,6 +226,7 @@ MAIN_FILES = \
 	$(DIRECTORY)/include/GL/vms_x_fix.h				\
 	$(DIRECTORY)/include/GL/wglext.h				\
 	$(DIRECTORY)/include/GL/wmesa.h					\
+	$(DIRECTORY)/include/c99/*.h					\
 	$(DIRECTORY)/src/glsl/Makefile					\
 	$(DIRECTORY)/src/glsl/Makefile.template				\
 	$(DIRECTORY)/src/glsl/SConscript				\
@@ -233,7 +236,9 @@ MAIN_FILES = \
 	$(DIRECTORY)/src/glsl/glcpp/*.[chly]				\
 	$(DIRECTORY)/src/glsl/glcpp/README				\
 	$(DIRECTORY)/src/Makefile					\
+	$(DIRECTORY)/src/SConscript					\
 	$(DIRECTORY)/src/mesa/Makefile*					\
+	$(DIRECTORY)/src/mesa/SConscript				\
 	$(DIRECTORY)/src/mesa/sources.mak				\
 	$(DIRECTORY)/src/mesa/descrip.mms				\
 	$(DIRECTORY)/src/mesa/gl.pc.in					\
@@ -259,6 +264,7 @@ MAIN_FILES = \
 	$(DIRECTORY)/src/mesa/tnl_dd/*.[ch]				\
 	$(DIRECTORY)/src/mesa/tnl_dd/imm/*.[ch]				\
 	$(DIRECTORY)/src/mesa/tnl_dd/imm/NOTES.imm			\
+	$(DIRECTORY)/src/mesa/vf/*.[ch]					\
 	$(DIRECTORY)/src/mesa/drivers/Makefile				\
 	$(DIRECTORY)/src/mesa/drivers/beos/*.cpp			\
 	$(DIRECTORY)/src/mesa/drivers/beos/Makefile			\
@@ -271,6 +277,9 @@ MAIN_FILES = \
 	$(DIRECTORY)/src/mesa/drivers/osmesa/descrip.mms		\
 	$(DIRECTORY)/src/mesa/drivers/osmesa/osmesa.def			\
 	$(DIRECTORY)/src/mesa/drivers/osmesa/*.[ch]			\
+	$(DIRECTORY)/src/mesa/drivers/dri/r300/compiler/*.[ch]		\
+	$(DIRECTORY)/src/mesa/drivers/dri/r300/compiler/Makefile	\
+	$(DIRECTORY)/src/mesa/drivers/dri/r300/compiler/SConscript	\
 	$(DIRECTORY)/src/mesa/drivers/windows/*/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/windows/*/*.def			\
 	$(DIRECTORY)/src/mesa/drivers/x11/Makefile			\
@@ -307,9 +316,9 @@ MAPI_FILES = \
 	$(DIRECTORY)/src/mapi/mapi/sources.mak				\
 	$(DIRECTORY)/src/mapi/mapi/*.[ch]				\
 	$(DIRECTORY)/src/mapi/vgapi/Makefile				\
+	$(DIRECTORY)/src/mapi/vgapi/SConscript				\
 	$(DIRECTORY)/src/mapi/vgapi/vgapi.csv				\
-	$(DIRECTORY)/src/mapi/vgapi/vg.pc.in				\
-	$(DIRECTORY)/src/mapi/vgapi/*.h
+	$(DIRECTORY)/src/mapi/vgapi/vg.pc.in
 
 EGL_FILES = \
 	$(DIRECTORY)/include/KHR/*.h					\
@@ -320,6 +329,7 @@ EGL_FILES = \
 	$(DIRECTORY)/src/egl/*/*.[ch]					\
 	$(DIRECTORY)/src/egl/*/*/Makefile				\
 	$(DIRECTORY)/src/egl/*/*/*.[ch]					\
+	$(DIRECTORY)/src/egl/main/SConscript				\
 	$(DIRECTORY)/src/egl/main/*.pc.in				\
 	$(DIRECTORY)/src/egl/main/*.def
 
@@ -344,12 +354,24 @@ GALLIUM_FILES = \
 	$(DIRECTORY)/src/gallium/*/*/*/*.[ch]				\
 	$(DIRECTORY)/src/gallium/*/*/*/*.py
 
+APPLE_DRI_FILES = \
+	$(DIRECTORY)/src/glx/apple/Makefile 				\
+	$(DIRECTORY)/src/glx/apple/*.[ch]				\
+	$(DIRECTORY)/src/glx/apple/*.tcl				\
+	$(DIRECTORY)/src/glx/apple/apple_exports.list			\
+	$(DIRECTORY)/src/glx/apple/GL_aliases				\
+	$(DIRECTORY)/src/glx/apple/GL_extensions			\
+	$(DIRECTORY)/src/glx/apple/GL_noop				\
+	$(DIRECTORY)/src/glx/apple/GL_promoted				\
+	$(DIRECTORY)/src/glx/apple/specs/*.spec				\
+	$(DIRECTORY)/src/glx/apple/specs/*.tm
 
 DRI_FILES = \
 	$(DIRECTORY)/include/GL/internal/dri_interface.h		\
 	$(DIRECTORY)/include/GL/internal/sarea.h			\
 	$(DIRECTORY)/src/glx/Makefile					\
 	$(DIRECTORY)/src/glx/*.[ch]					\
+	$(APPLE_DRI_FILES)						\
 	$(DIRECTORY)/src/mesa/drivers/dri/Makefile			\
 	$(DIRECTORY)/src/mesa/drivers/dri/Makefile.template		\
 	$(DIRECTORY)/src/mesa/drivers/dri/dri.pc.in			\
@@ -395,6 +417,7 @@ GLUT_FILES = \
 	$(DIRECTORY)/include/GL/glut.h			\
 	$(DIRECTORY)/include/GL/glutf90.h		\
 	$(DIRECTORY)/src/glut/glx/Makefile*		\
+	$(DIRECTORY)/src/glut/glx/SConscript		\
 	$(DIRECTORY)/src/glut/glx/depend		\
 	$(DIRECTORY)/src/glut/glx/glut.pc.in		\
 	$(DIRECTORY)/src/glut/glx/*def			\

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@
 
@@ -56,6 +53,10 @@ INSTALL = @INSTALL@
 PYTHON2 = @PYTHON2@
 PYTHON_FLAGS = -t -O -O
 
+# Flex and Bison for GLSL compiler
+FLEX = @FLEX@
+BISON = @BISON@
+
 # Library names (base name)
 GL_LIB = GL
 GLU_LIB = GLU

configs/darwin

@@ -31,21 +31,23 @@ CXXFLAGS =  -ggdb3 -Os -Wall -fno-strict-aliasing \
 	-I$(INSTALL_DIR)/include -I$(X11_DIR)/include $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES)
 
 # Library names (actual file names)
-GL_LIB_NAME = libGL.dylib
-GLU_LIB_NAME = libGLU.dylib
-GLUT_LIB_NAME = libglut.dylib
-GLW_LIB_NAME = libGLw.dylib
-OSMESA_LIB_NAME = libOSMesa.dylib
+GL_LIB_NAME = lib$(GL_LIB).dylib
+GLU_LIB_NAME = lib$(GLU_LIB).dylib
+GLUT_LIB_NAME = lib$(GLUT_LIB).dylib
+GLW_LIB_NAME = lib$(GLW_LIB).dylib
+OSMESA_LIB_NAME = lib$(OSMESA_LIB).dylib
+VG_LIB_NAME = lib$(VG_LIB).dylib
 
 # globs used to install the lib and all symlinks
-GL_LIB_GLOB = libGL.*dylib
-GLU_LIB_GLOB = libGLU.*dylib
-GLUT_LIB_GLOB = libglut.*dylib
-GLW_LIB_GLOB = libGLw.*dylib
-OSMESA_LIB_GLOB = libOSMesa.*dylib
+GL_LIB_GLOB = lib$(GL_LIB).*dylib
+GLU_LIB_GLOB = lib$(GLU_LIB).*dylib
+GLUT_LIB_GLOB = lib$(GLUT_LIB).*dylib
+GLW_LIB_GLOB = lib$(GLW_LIB).*dylib
+OSMESA_LIB_GLOB = lib$(OSMESA_LIB).*dylib
+VG_LIB_GLOB = lib$(VG_LIB).*dylib
 
 GL_LIB_DEPS = -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXext -lm -lpthread
-OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
+OSMESA_LIB_DEPS =
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB)  -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXmu -lXi -lXext
 GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXt
@@ -57,3 +59,5 @@ GLU_DIRS = sgi
 DRIVER_DIRS = osmesa
 #DRIVER_DIRS = dri
 DRI_DIRS = swrast
+GALLIUM_DRIVERS_DIRS = softpipe trace rbug noop identity galahad failover
+#GALLIUM_DRIVERS_DIRS += llvmpipe

configs/default

@@ -10,7 +10,7 @@ CONFIG_NAME = default
 # Version info
 MESA_MAJOR=7
 MESA_MINOR=10
-MESA_TINY=0
+MESA_TINY=3
 MESA_VERSION = $(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY)
 
 # external projects.  This should be useless now that we use libdrm.
@@ -37,6 +37,8 @@ MKLIB_OPTIONS =
 MKDEP = makedepend
 MKDEP_OPTIONS = -fdepend
 MAKE = make
+FLEX = flex
+BISON = bison
 
 # Use MINSTALL for installing libraries, INSTALL for everything else
 MINSTALL = $(SHELL) $(TOP)/bin/minstall
@@ -82,9 +84,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 +118,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

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)
 

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

configure.ac

@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR([bin])
 AC_CANONICAL_HOST
 
 dnl Versions for external dependencies
-LIBDRM_REQUIRED=2.4.15
+LIBDRM_REQUIRED=2.4.24
 LIBDRM_RADEON_REQUIRED=2.4.17
 DRI2PROTO_REQUIRED=2.1
 GLPROTO_REQUIRED=1.4.11
@@ -38,6 +38,12 @@ if test "x$MKDEP" = "x"; then
     AC_MSG_ERROR([makedepend is required to build Mesa])
 fi
 
+AC_PATH_PROG([FLEX], [flex])
+test "x$FLEX" = "x" && AC_MSG_ERROR([flex is needed to build Mesa])
+
+AC_PATH_PROG([BISON], [bison])
+test "x$BISON" = "x" && AC_MSG_ERROR([bison is needed to build Mesa])
+
 dnl Our fallback install-sh is a symlink to minstall. Use the existing
 dnl configuration in that case.
 AC_PROG_INSTALL
@@ -572,10 +578,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 +716,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 +966,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 +1042,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])
@@ -1352,7 +1354,7 @@ if test "x$enable_gallium_egl" = xauto; then
         enable_gallium_egl=$enable_egl
         ;;
     *)
-        enable_gallium_egl=no
+        enable_gallium_egl=$enable_openvg
         ;;
     esac
 fi
@@ -1467,10 +1469,6 @@ AC_SUBST([EGL_CLIENT_APIS])
 
 if test "x$HAVE_ST_EGL" = xyes; then
 	GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS egl"
-	# define GLX_DIRECT_RENDERING even when the driver is not dri
-	if test "x$mesa_driver" != xdri -a "x$driglx_direct" = xyes; then
-            DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"
-	fi
 fi
 
 if test "x$HAVE_ST_XORG" = xyes; then

docs/contents.html

@@ -62,6 +62,7 @@ a:visited {
 <LI><A HREF="perf.html" target="MainFrame">Performance Tips</A>
 <LI><A HREF="extensions.html" target="MainFrame">Mesa Extensions</A>
 <LI><A HREF="mangling.html" target="MainFrame">Function Name Mangling</A>
+<LI><A href="llvmpipe.html" target="MainFrame">Gallium llvmpipe driver</A>
 </ul>
 
 <b>Developer Topics</b>

docs/download.html

@@ -21,76 +21,52 @@ When a new release is coming, release candidates (betas) may be found
 
 
 <p>
-Mesa is distributed in several parts:
+The Mesa package is named MesaLib-x.y.z.{tar.bz2, tar.gz, zip} where x.y.z
+is the version.  There are three types of compressed archives.
 </p>
-<ul>
-<li><b>MesaLib-x.y.z</b> - the main Mesa library source code, drivers
-    and documentation.
-</li>
-<li><b>MesaDemos-x.y.z</b> - OpenGL demonstration and test programs.
-    Most of the programs require GLUT (either the
-    <a href="http://www.opengl.org/resources/libraries/glut"
-    target="_parent">original GLUT by Mark Kilgard</a> or
-    <a href="http://freeglut.sourceforge.net" target="_parent">freeglut</a> or
-    <a href="http://openglut.sourceforge.net" target="_parent">OpenGLUT</a>).
-</li>
-<li><b>MesaGLUT-x.y.z</b> - Mark Kilgard's GLUT, easily compiled and used
-    with Mesa.  Plus, other implementation of GLUT for DOS, OS/2, BeOS, etc.
-</li>
-</ul>
-
 <p>
-If you're not interested in running the demos, you'll only need the first
-package.
+There's also the MesaGLUT-x.y.z.{tar.bz2, tar.gz, zip} packages which
+contain Mark Kilgard's GLUT library.
+This is optional.
+Most Linux distributions include an implementation of GLUT (such as freeglut).
+</p>
+<p>
+In the past, the Mesa demos collection was distributed as
+MesaDemos-x.y.z.{tar.bz2, tar.gz, zip}.
+Now, the
+<a href="ftp://ftp.freedesktop.org/pub/mesa/demos/" target="_parent">
+Mesa demos</a> are distributed separately.
 </p>
 
-<p>
-If you're new to this and not sure what you're doing, grab all three packages.
-</p>
-
-<p>
-The packages are available in .tar.gz, .tar.bz2 and .zip formats.
-Other sites might offer additional package formats.
-</p>
 
 <H1>Unpacking</H1>
 
 <p>
-All the packages should be in the same directory prior to unpacking.
+To unpack .tar.gz files:
 </p>
-
-<ul>
-<li>To unpack .tar.gz files:
 <pre>
-	tar zxf MesaLib-X.Y.tar.gz
-	tar zxf MesaDemos-X.Y.tar.gz
-	tar zxf MesaGLUT-X.Y.tar.gz
+	tar zxf MesaLib-x.y.z.tar.gz
 </pre>
 or
 <pre>
-	gzcat MesaLib-X.Y.tar.gz | tar xf -
-	gzcat MesaDemos-X.Y.tar.gz | tar xf -
-	gzcat MesaGLUT-X.Y.tar.gz | tar xf -
+	gzcat MesaLib-x.y.z.tar.gz | tar xf -
 </pre>
 or
 <pre>
-	gunzip MesaLib-X.Y.tar.gz ; tar xf MesaLib-X.Y.tar
-	gunzip MesaDemos-X.Y.tar.gz ; tar xf MesaDemos-X.Y.tar
-	gunzip MesaGLUT-X.Y.tar.gz ; tar xf MesaGLUT-X.Y.tar
+	gunzip MesaLib-x.y.z.tar.gz ; tar xf MesaLib-x.y.z.tar
 </pre>
-<li>To unpack .tar.bz2 files:
+<p>
+To unpack .tar.bz2 files:
+</p>
 <pre>
-	bunzip2 -c MesaLib-X.Y.tar.gz | tar xf -
-	bunzip2 -c MesaDemos-X.Y.tar.gz | tar xf -
-	bunzip2 -c MesaGLUT-X.Y.tar.gz | tar xf -
+	bunzip2 -c MesaLib-x.y.z.tar.gz | tar xf -
 </pre>
-<li>To unpack .zip files:
+<p>
+To unpack .zip files:
+</p>
 <pre>
-	unzip MesaLib-X.Y.zip
-	unzip MesaDemos-X.Y.zip
-	unzip MesaGLUT-X.Y.zip
+	unzip MesaLib-x.y.z.zip
 </pre>
-</ul>
 
 
 <h1>Contents</h1>
@@ -106,22 +82,13 @@ bin/		- shell scripts for making shared libraries, etc
 docs/		- documentation
 src/		- source code for libraries
 src/mesa	- sources for the main Mesa library and device drivers
+src/gallium     - sources for Gallium and Gallium drivers
 src/glu		- libGLU source code
 src/glx		- sources for building libGL with full GLX and DRI support
 src/glw		- Xt/Motif/OpenGL widget code
 </pre>
 
-If you downloaded and unpacked the MesaDemos.X.Y package:
-
-<pre>
-progs/demos	- original Mesa demos
-progs/xdemos	- GLX OpenGL/Mesa demos
-progs/redbook	- examples from the OpenGL Programming Guide
-progs/samples	- examples from SGI
-progs/images/	- image files
-</pre>
-
-If you downloaded and unpacked the MesaGLUT.X.Y package:
+If you downloaded and unpacked the MesaGLUT.x.y.z package:
 <pre>
 src/glut	- GLUT library source code
 </pre>

docs/egl.html

@@ -19,10 +19,7 @@ API entry points and helper functions for use by the drivers.  Drivers are
 dynamically loaded by the main library and most of the EGL API calls are
 directly dispatched to the drivers.</p>
 
-<p>The driver in use decides the window system to support.  For drivers that
-support hardware rendering, there are usually multiple drivers supporting the
-same window system.  Each one of of them supports a certain range of graphics
-cards.</p>
+<p>The driver in use decides the window system to support.</p>
 
 <h2>Build EGL</h2>
 
@@ -86,16 +83,19 @@ select the right platforms automatically.</p>
 
 <li><code>--enable-gles1</code> and <code>--enable-gles2</code>
 
-<p>These options enable OpenGL ES support in OpenGL.  The result is
-one big library that supports multiple APIs.</p>
+<p>These options enable OpenGL ES support in OpenGL.  The result is one big
+internal library that supports multiple APIs.</p>
 
 </li>
 
 <li><code>--enable-gles-overlay</code>
 
-<p>This option enables OpenGL ES as separate libraries.  This is an alternative
-approach to enable OpenGL ES.  It is only supported by
-<code>egl_gallium</code>.</p>
+<p>This option enables OpenGL ES as separate internal libraries.  This is an
+alternative approach to enable OpenGL ES.</p>
+
+<p>This is only supported by <code>egl_gallium</code>.  For systems using DRI
+drivers, <code>--enable-gles1</code> and <code>--enable-gles2</code> are
+suggested instead as all drivers will benefit.</p>
 
 </li>
 
@@ -134,6 +134,16 @@ colon-separated directories where the main library will look for drivers, in
 addition to the default directory.  This variable is ignored for setuid/setgid
 binaries.</p>
 
+<p>This variable is usually set to test an uninstalled build.  For example, one
+may set</p>
+
+<pre>
+  $ export LD_LIBRARY_PATH=$mesa/lib
+  $ export EGL_DRIVERS_PATH=$mesa/lib/egl
+</pre>
+
+<p>to test a build without installation</p>
+
 </li>
 
 <li><code>EGL_DRIVER</code>
@@ -180,8 +190,10 @@ variable to true forces the use of software rendering.</p>
 <li><code>egl_dri2</code>
 
 <p>This driver supports both <code>x11</code> and <code>drm</code> platforms.
-It functions as a DRI2 driver loader.  For <code>x11</code> support, it talks
-to the X server directly using (XCB-)DRI2 protocol.</p>
+It functions as a DRI driver loader.  For <code>x11</code> support, it talks to
+the X server directly using (XCB-)DRI2 protocol.</p>
+
+<p>This driver can share DRI drivers with <code>libGL</code>.</p>
 
 </li>
 
@@ -191,6 +203,10 @@ to the X server directly using (XCB-)DRI2 protocol.</p>
 hardwares supported by Gallium3D.  It is the only driver that supports OpenVG.
 The supported platforms are X11, DRM, FBDEV, and GDI.</p>
 
+<p>This driver comes with its own hardware drivers
+(<code>pipe_&lt;hw&gt;</code>) and client API modules
+(<code>st_&lt;api&gt;</code>).</p>
+
 </li>
 
 <li><code>egl_glx</code>
@@ -202,6 +218,21 @@ is not available in GLX or GLX extensions.</p>
 </li>
 </ul>
 
+<h2>Packaging</h2>
+
+<p>The ABI between the main library and its drivers are not stable.  Nor is
+there a plan to stabilize it at the moment.  Of the EGL drivers,
+<code>egl_gallium</code> has its own hardware drivers and client API modules.
+They are considered internal to <code>egl_gallium</code> and there is also no
+stable ABI between them.  These should be kept in mind when packaging for
+distribution.</p>
+
+<p>Generally, <code>egl_dri2</code> is preferred over <code>egl_gallium</code>
+when the system already has DRI drivers.  As <code>egl_gallium</code> is loaded
+before <code>egl_dri2</code> when both are available, <code>egl_gallium</code>
+may either be disabled with <code>--disable-gallium-egl</code> or packaged
+separately.</p>
+
 <h2>Developers</h2>
 
 <p>The sources of the main library and the classic drivers can be found at

docs/envvars.html

@@ -9,16 +9,38 @@
 <H1>Environment Variables</H1>
 
 <p>
-Mesa supports the following environment variables:
+Normally, no environment variables need to be set.  Most of the environment
+variables used by Mesa/Gallium are for debugging purposes, but they can
+sometimes be useful for debugging end-user issues.
 </p>
+
+
+<H2>LibGL environment variables</H2>
+
+<ul>
+<li>LIBGL_DEBUG - If defined debug information will be printed to stderr.
+   If set to 'verbose' additional information will be printed.
+<li>LIBGL_DRIVERS_PATH - colon-separated list of paths to search for DRI drivers
+<li>LIBGL_ALWAYS_INDIRECT - forces an indirect rendering context/connection.
+<li>LIBGL_ALWAYS_SOFTWARE - if set, always use software rendering
+<li>LIBGL_NO_DRAWARRAYS - if set do not use DrawArrays GLX protocol (for debugging)
+</ul>
+
+
+
+<H2>Core Mesa environment variables</H2>
+
 <ul>
 <li>MESA_NO_ASM - if set, disables all assembly language optimizations
 <li>MESA_NO_MMX - if set, disables Intel MMX optimizations
 <li>MESA_NO_3DNOW - if set, disables AMD 3DNow! optimizations
 <li>MESA_NO_SSE - if set, disables Intel SSE optimizations
-<li>MESA_DEBUG - if set, error messages are printed to stderr.
-If the value of MESA_DEBUG is "FP" floating point arithmetic errors will
-generate exceptions.
+<li>MESA_DEBUG - if set, error messages are printed to stderr.  For example,
+   if the application generates a GL_INVALID_ENUM error, a corresponding error
+   message indicating where the error occured, and possibly why, will be
+   printed to stderr.<br>
+   If the value of MESA_DEBUG is 'FP' floating point arithmetic errors will
+   generate exceptions.
 <li>MESA_NO_DITHER - if set, disables dithering, overriding glEnable(GL_DITHER)
 <li>MESA_TEX_PROG - if set, implement conventional texture env modes with
 fragment programs (intended for developers only)
@@ -28,11 +50,14 @@ Setting this variable automatically sets the MESA_TEX_PROG variable as well.
 <li>MESA_EXTENSION_OVERRIDE - can be used to enable/disable extensions.
 A value such as "GL_EXT_foo -GL_EXT_bar" will enable the GL_EXT_foo extension
 and disable the GL_EXT_bar extension.
-<li>MESA_GLSL - <a href="shading.html#envvars">shading language options</a>
+<li>MESA_GLSL - <a href="shading.html#envvars">shading language compiler options</a>
 </ul>
 
+
+<H2>Mesa Xlib driver environment variables</H2>
+
 <p>
-The following are only applicable to the Xlib software driver.
+The following are only applicable to the Mesa Xlib software driver.
 See the <A HREF="xlibdriver.html">Xlib software driver page</A> for details.
 </p>
 <ul>
@@ -51,9 +76,8 @@ See the <A HREF="xlibdriver.html">Xlib software driver page</A> for details.
 </ul>
 
 
-<p>
-These environment variables are for the Intel i945/i965 drivers:
-</p>
+<h2>i945/i965 driver environment variables (non-Gallium)</h2>
+
 <ul>
 <li>INTEL_STRICT_CONFORMANCE - if set to 1, enable sw fallbacks to improve
     OpenGL conformance.  If set to 2, always use software rendering.
@@ -62,17 +86,71 @@ These environment variables are for the Intel i945/i965 drivers:
 </ul>
 
 
-<p>
-These environment variables are for the Radeon R300 driver:
-</p>
+<h2>Radeon R300 driver environment variables (non-Gallium)</h2>
+
 <ul>
 <li>R300_NO_TCL - if set, disable hardware-accelerated Transform/Clip/Lighting.
 </ul>
 
+
+<h2>EGL environment variables</h2>
+
 <p>
 Mesa EGL supports different sets of environment variables.  See the
 <a href="egl.html">Mesa EGL</a> page for the details.
 </p>
 
+
+<h2>Gallium environment variables</h2>
+
+<ul>
+<li>GALLIUM_PRINT_OPTIONS - if non-zero, print all the Gallium environment
+    variables which are used, and their current values.
+<li>GALLIUM_NOSSE - if non-zero, do not use SSE runtime code generation for
+    shader execution
+<li>GALLIUM_NOPPC - if non-zero, do not use PPC runtime code generation for
+    shader execution
+<li>GALLIUM_DUMP_CPU - if non-zero, print information about the CPU on start-up
+<li>TGSI_PRINT_SANITY - if set, do extra sanity checking on TGSI shaders and
+    print any errors to stderr.
+<LI>DRAW_FSE - ???
+<LI>DRAW_NO_FSE - ???
+<li>DRAW_USE_LLVM - if set to zero, the draw module will not use LLVM to execute
+    shaders, vertex fetch, etc.
+</ul>
+
+<h3>Softpipe driver environment variables</h3>
+<ul>
+<li>SOFTPIPE_DUMP_FS - if set, the softpipe driver will print fragment shaders
+    to stderr
+<li>SOFTPIPE_DUMP_GS - if set, the softpipe driver will print geometry shaders
+    to stderr
+<li>SOFTPIPE_NO_RAST - if set, rasterization is no-op'd.  For profiling purposes.
+</ul>
+
+
+<h3>LLVMpipe driver environment variables</h3>
+<ul>
+<li>LP_NO_RAST - if set LLVMpipe will no-op rasterization
+<li>LP_DEBUG - a comma-separated list of debug options is acceptec.  See the
+    source code for details.
+<li>LP_PERF - a comma-separated list of options to selectively no-op various
+    parts of the driver.  See the source code for details.
+<li>LP_NUM_THREADS - an integer indicating how many threads to use for rendering.
+    Zero turns of threading completely.  The default value is the number of CPU
+    cores present.
+</ul>
+
+
+<p>
+Other Gallium drivers have their own environment variables.  These may change
+frequently so the source code should be consulted for details.
+</p>
+
+
+<br>
+<br>
+
+
 </BODY>
 </HTML>

docs/install.html

@@ -12,16 +12,16 @@
 <ol>
 <li><a href="#unix-x11">Unix / X11</a>
   <ul>
-  <li><a href="#prereq">Prerequisites for DRI and hardware acceleration</a>
+  <li><a href="#prereq-general">General prerequisites for building</a>
+  <li><a href="#prereq-dri">Prerequisites for DRI and hardware acceleration</a>
   <li><a href="#autoconf">Building with autoconf</a>
   <li><a href="#traditional">Building with traditional Makefiles</a>
   <li><a href="#libs">The Libraries</a>
-  <li><a href="#demos">Running the demos
   <li><a href="#install">Installing the header and library files
   <li><a href="#pkg-config">Building OpenGL programs with pkg-config
   </ul>
 <li><a href="#windows">Windows</a>
-<li><a href="#scons">SCons</a>
+<li><a href="#scons">Building with SCons</a>
 <li><a href="#other">Other</a>
 </ol>
 <br>
@@ -31,8 +31,22 @@
 <H2>1. Unix/X11 Compilation and Installation</H1>
 
 
-<a name="prereq">
-<h3>1.1 Prerequisites for DRI and hardware acceleration</h3>
+<a name="prereq-general">
+<h3>1.1 General prerequisites for building</h3>
+
+<ul>
+<li>lex / yacc - for building the GLSL compiler.
+On Linux systems, flex and bison are used.
+Versions 2.5.35 and 2.4.1, respectively, (or later) should work.
+</li>
+<li>python - Python is needed for building the Gallium components.
+Version 2.6.4 or later should work.
+</li>
+</ul>
+
+
+<a name="prereq-dri">
+<h3>1.2 Prerequisites for DRI and hardware acceleration</h3>
 
 <p>
 The following are required for DRI-based hardware acceleration with Mesa:
@@ -49,7 +63,7 @@ version 2.4.15 or later
 
 
 <a name="autoconf">
-<h3>1.2 Building with Autoconf</h3>
+<h3>1.3 Building with Autoconf</h3>
 
 <p>
 Mesa may be <a href="autoconf.html">built using autoconf</a>.
@@ -59,7 +73,7 @@ If that fails the traditional Mesa build system is available.
 
 
 <a name="traditional">
-<h3>1.3 Building with traditional Makefiles</h3>
+<h3>1.4 Building with traditional Makefiles</h3>
 
 <p>
 The traditional Mesa build system is based on a collection of pre-defined
@@ -126,7 +140,7 @@ Later, if you want to rebuild for a different configuration run
 
 
 <a name="libs">
-<h3>1.4 The libraries</h3>
+<h3>1.5 The libraries</h3>
 
 <p>
 When compilation has finished, look in the top-level <code>lib/</code>
@@ -185,81 +199,11 @@ If you built the DRI hardware drivers, you'll also see the DRI drivers:
 -rwxr-xr-x   1 brian users 10997120 Jul 21 12:13 unichrome_dri.so
 </pre>
 
-
-<a name="demos">
-<h3>1.5 Running the demos</h3>
-
 <p>
-If you downloaded/unpacked the MesaDemos-x.y.z.tar.gz archive or
-obtained Mesa from CVS, the <b>progs/</b> directory will contain a
-bunch of demonstration programs.
+If you built with Gallium support, look in lib/gallium/ for Gallium-based
+versions of libGL and device drivers.
 </p>
 
-<p>
-Before running a demo, you'll probably have to set two environment variables
-to indicate where the libraries are located.  For example:
-<p>
-<blockquote>
-<b>cd lib/</b>
-<br>
-<b>export LD_LIBRARY_PATH=${PWD}</b>
-<br>
-<b>export LIBGL_DRIVERS_PATH=${PWD}</b> (if using DRI drivers)
-</blockquote>
-
-<p>
-Next, change to the Mesa/demos/ directory:
-</p>
-<blockquote>
-<b>cd ../progs/demos</b>
-</blockquote>
-
-<p>
-Run a demo such as gears:
-</p>
-<blockquote>
-<b>./gears</b>
-</blockquote>
-
-<p>
-If this doesn't work, try the <b>Mesa/progs/xdemos/glxinfo</b> program
-and see that it prints the expected Mesa version number.
-</p>
-
-<p>
-If you're using Linux or a similar OS, verify that the demo program is
-being linked with the proper library files:
-</p>
-<blockquote>
-<b>ldd gears</b>
-</blockquote>
-
-<p>
-You should see something like this:
-</p>
-<pre>
-        libglut.so.3 => /home/brian/Mesa/lib/libglut.so.3 (0x40013000)
-        libGLU.so.1 => /home/brian/Mesa/lib/libGLU.so.1 (0x40051000)
-        libGL.so.1 => /home/brian/Mesa/lib/libGL.so.1 (0x400e0000)
-        libc.so.6 => /lib/i686/libc.so.6 (0x42000000)
-        libm.so.6 => /lib/i686/libm.so.6 (0x403da000)
-        libX11.so.6 => /usr/X11R6/lib/libX11.so.6 (0x403fc000)
-        libXmu.so.6 => /usr/X11R6/lib/libXmu.so.6 (0x404da000)
-        libXt.so.6 => /usr/X11R6/lib/libXt.so.6 (0x404f1000)
-        libXi.so.6 => /usr/X11R6/lib/libXi.so.6 (0x40543000)
-        libstdc++.so.5 => /usr/lib/libstdc++.so.5 (0x4054b000)
-        libgcc_s.so.1 => /lib/libgcc_s.so.1 (0x405fd000)
-        libXext.so.6 => /usr/X11R6/lib/libXext.so.6 (0x40605000)
-        libpthread.so.0 => /lib/i686/libpthread.so.0 (0x40613000)
-        /lib/ld-linux.so.2 => /lib/ld-linux.so.2 (0x40000000)
-        libdl.so.2 => /lib/libdl.so.2 (0x40644000)
-        libSM.so.6 => /usr/X11R6/lib/libSM.so.6 (0x40647000)
-        libICE.so.6 => /usr/X11R6/lib/libICE.so.6 (0x40650000)
-</pre>
-
-<p>
-Retrace your steps if this doesn't look right.
-</p>
 
 
 <a name="install">

docs/llvmpipe.html

@@ -1,74 +1,116 @@
-LLVMPIPE -- a fork of softpipe that employs LLVM for code generation.
+<HTML>
+
+<TITLE>llvmpipe</TITLE>
+
+<link rel="stylesheet" type="text/css" href="mesa.css"></head>
+
+<BODY>
+
+<H1>Introduction</H1>
+
+<p>
+The Gallium llvmpipe driver is a software rasterizer that uses LLVM to
+do runtime code generation.
+Shaders, point/line/triangle rasterization and vertex processing are
+implemented with LLVM IR which is translated to x86 or x86-64 machine
+code.
+Also, the driver is multithreaded to take advantage of multiple CPU cores
+(up to 8 at this time).
+It's the fastest software rasterizer for Mesa.
+</p>
 
 
-Requirements
-============
+<h1>Requirements</h1>
 
- - A x86 or amd64 processor.  64bit mode is preferred.
- 
+<dl>
+<dt>An x86 or amd64 processor.  64-bit mode is preferred.</dt>
+<dd>
+   <p>
    Support for sse2 is strongly encouraged.  Support for ssse3, and sse4.1 will
    yield the most efficient code.  The less features the CPU has the more
    likely is that you ran into underperforming, buggy, or incomplete code.  
-   
+   </p>
+   <p>
    See /proc/cpuinfo to know what your CPU supports.
- 
- - LLVM 2.6 (or later)
- 
+   </p>
+</dd>
+<dt>LLVM. Version 2.8 recommended. 2.6 or later required.</dt>
+<dd>
+   <p>
+   <b>NOTE</b>: LLVM 2.8 and earlier will not work on systems that support the
+   Intel AVX extensions (e.g. Sandybridge).  LLVM's code generator will
+   fail when trying to emit AVX instructions.  This was fixed in LLVM 2.9.
+   </p>
+   <p>
    For Linux, on a recent Debian based distribution do:
- 
+   </p>
+<pre>
      aptitude install llvm-dev
+</pre>
+   For a RPM-based distribution do:
+   </p>
+<pre>
+     yum install llvm-devel
+</pre>
 
+   <p>
    For Windows download pre-built MSVC 9.0 or MinGW binaries from
    http://people.freedesktop.org/~jrfonseca/llvm/ and set the LLVM environment
    variable to the extracted path.
+   </p>
 
+   <p>
    For MSVC there are two set of binaries: llvm-x.x-msvc32mt.7z and
    llvm-x.x-msvc32mtd.7z .
+   </p>
 
+   <p>
    You have to set the LLVM=/path/to/llvm-x.x-msvc32mtd env var when passing
    debug=yes to scons, and LLVM=/path/to/llvm-x.x-msvc32mt when building with
    debug=no. This is necessary as LLVM builds as static library so the chosen
    MS CRT must match.
+   </p>
+</dd>
 
-   The version of LLVM from SVN ("2.7svn") from mid-March 2010 is pretty
-   stable and has some features not in version 2.6.
+<dt>scons (optional)</dt>
+</dl>
 
- - scons (optional)
 
- - udis86, http://udis86.sourceforge.net/ (optional). My personal repository
-   supports more opcodes which haven't been merged upstream yet:
- 
-     git clone git://anongit.freedesktop.org/~jrfonseca/udis86
-     cd udis86
-     ./autogen.sh
-     ./configure --with-pic
-     make
-     sudo make install
- 
 
-Building
-========
+<h1>Building</h1>
 
 To build everything on Linux invoke scons as:
 
+<pre>
   scons build=debug libgl-xlib
+</pre>
 
 Alternatively, you can build it with GNU make, if you prefer, by invoking it as
 
+<pre>
   make linux-llvm
+</pre>
 
 but the rest of these instructions assume that scons is used.
 
 For windows is everything the except except the winsys:
 
+<pre>
   scons build=debug libgl-gdi
+</pre>
 
-Using
-=====
+
+<h1>Using</h1>
 
 On Linux, building will create a drop-in alternative for libGL.so into
 
+<pre>
   build/foo/gallium/targets/libgl-xlib/libGL.so
+</pre>
+or
+<pre>
+  lib/gallium/libGL.so
+</pre>
 
 To use it set the LD_LIBRARY_PATH environment variable accordingly.
 
@@ -81,26 +123,21 @@ replacing the native ICD driver, but it's quite an advanced usage, so if you
 need to ask, don't even try it.
 
 
-Profiling
-=========
+<h1>Profiling</h1>
 
 To profile llvmpipe you should pass the options
 
+<pre>
   scons build=profile <same-as-before>
+</pre>
 
 This will ensure that frame pointers are used both in C and JIT functions, and
 that no tail call optimizations are done by gcc.
 
-
 To better profile JIT code you'll need to build LLVM with oprofile integration.
 
-  source_dir=$PWD/llvm-2.6
-  build_dir=$source_dir/build/profile
-  install_dir=$source_dir-profile
-
-  mkdir -p "$build_dir"
-  cd "$build_dir" && \
-  $source_dir/configure \
+<pre>
+  ./configure \
       --prefix=$install_dir \
       --enable-optimized \
       --disable-profiling \
@@ -111,43 +148,57 @@ To better profile JIT code you'll need to build LLVM with oprofile integration.
   make -C "$build_dir" install
 
   find "$install_dir/lib" -iname '*.a' -print0 | xargs -0 strip --strip-debug
+</pre>
 
 The you should define
 
+<pre>
   export LLVM=/path/to/llvm-2.6-profile
+</pre>
 
 and rebuild.
 
 
-Unit testing
-============
+<h1>Unit testing</h1>
 
+<p>
 Building will also create several unit tests in
 build/linux-???-debug/gallium/drivers/llvmpipe:
+</p>
 
- - lp_test_blend: blending
- - lp_test_conv: SIMD vector conversion
- - lp_test_format: pixel unpacking/packing
+</ul>
+<li> lp_test_blend: blending
+<li> lp_test_conv: SIMD vector conversion
+<li> lp_test_format: pixel unpacking/packing
+</ul>
 
+<p>
 Some of this tests can output results and benchmarks to a tab-separated-file
 for posterior analysis, e.g.:
-
+</p>
+<pre>
   build/linux-x86_64-debug/gallium/drivers/llvmpipe/lp_test_blend -o blend.tsv
+</pre>
 
 
-Development Notes
-=================
+<h1>Development Notes</h1>
 
-- When looking to this code by the first time start in lp_state_fs.c, and 
+<ul>
+<li>
+  When looking to this code by the first time start in lp_state_fs.c, and 
   then skim through the lp_bld_* functions called in there, and the comments
   at the top of the lp_bld_*.c functions.  
-
-- The driver-independent parts of the LLVM / Gallium code are found in
+</li>
+<li>
+  The driver-independent parts of the LLVM / Gallium code are found in
   src/gallium/auxiliary/gallivm/.  The filenames and function prefixes
   need to be renamed from "lp_bld_" to something else though.
-
-- We use LLVM-C bindings for now. They are not documented, but follow the C++
+</li>
+<li>
+  We use LLVM-C bindings for now. They are not documented, but follow the C++
   interfaces very closely, and appear to be complete enough for code
   generation. See 
   http://npcontemplation.blogspot.com/2008/06/secret-of-llvm-c-bindings.html
   for a stand-alone example.  See the llvm-c/Core.h file for reference.
+</li>
+</ul>

docs/news.html

@@ -11,6 +11,46 @@
 <H1>News</H1>
 
 
+<h2>June 13, 2011</h2>
+
+<p>
+<a href="relnotes-7.10.3.html">Mesa 7.10.3</a> is released.  This is a bug
+fix release release.
+</p>
+
+<h2>April 6, 2011</h2>
+
+<p>
+<a href="relnotes-7.10.2.html">Mesa 7.10.2</a> is released.  This is a bug
+fix release release.
+</p>
+
+<h2>March 2, 2011</h2>
+
+<p>
+<a href="relnotes-7.10.1.html">Mesa 7.10.1</a> is released.  This is a bug
+fix release release.
+</p>
+
+<p>
+Also, <a href="relnotes-7.9.2.html">Mesa 7.9.2</a> is released.
+This is a bug fix release.
+</p>
+
+
+<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>

docs/relnotes-7.10.1.html

@@ -0,0 +1,380 @@
+<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 / March 2, 2011</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>
+4b4cee19f3bf16eb78bd4cc278ccf812  MesaLib-7.10.1.tar.gz
+efe8da4d80c2a5d32a800770b8ce5dfa  MesaLib-7.10.1.tar.bz2
+0fd2b1a025934de3f8cecf9fb9b57f4c  MesaLib-7.10.1.zip
+42beb0f5188d544476c19496f725fa67  MesaGLUT-7.10.1.tar.gz
+637bb8a20fdad89f7382b4ea83f896e3  MesaGLUT-7.10.1.tar.bz2
+bdbf3ffb2606d6aa8afabb6c6243b91b  MesaGLUT-7.10.1.zip
+</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>Fixed a few GLX protocol encoder bugs (Julien Cristau)</li>
+
+<li>Assorted Gallium llvmpipe driver bug fixes</li>
+
+<li>Assorted Mesa/Gallium state tracker bug fixes</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=26795">Bug 26795</a> - gl_FragCoord off by one in Gallium drivers.</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=29823">Bug 29823</a> - GetUniform[if]v busted</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=29927">Bug 29927</a> - [glsl2] fail to compile shader with constructor for array of struct type</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=32214">Bug 32214</a> - [gles2]no link error happens when missing vertex shader or frag shader</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32375">Bug 32375</a> - [gl gles2] Not able to get the attribute by function glGetVertexAttribfv</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32541">Bug 32541</a> - Segmentation Fault while running an HDR (high dynamic range) rendering demo</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32569">Bug 32569</a> - [gles2] glGetShaderPrecisionFormat not implemented yet</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=33306">Bug 33306</a> - GLSL integer division by zero crashes GLSL compiler</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=33386">Bug 33386</a> - Dubious assembler in read_rgba_span_x86.S</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33388">Bug 33388</a> - Dubious assembler in xform4.S</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33433">Bug 33433</a> - Error in x86-64 API dispatch code.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33507">Bug 33507</a> - [glsl] GLSL preprocessor modulus by zero crash</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33508">Bug 33508</a> - [glsl] GLSL compiler modulus by zero crash</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33916">Bug 33916</a> - Compiler accepts reserved operators % and %=</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34030">Bug 34030</a> - [bisected] Starcraft 2: some effects are corrupted or too big</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34047">Bug 34047</a> - Assert in _tnl_import_array() when using GLfixed vertex datatypes with GLESv2</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34114">Bug 34114</a> - Sun Studio build fails due to standard library functions not being in global namespace</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34179">Bug 34179</a> - Nouveau 3D driver: nv50_pc_emit.c:863 assertion error kills Compiz</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34198">Bug 34198</a> - [GLSL] implicit sized array with index 0 used gets assertion</li>
+
+<li><a href="https://bugs.launchpad.net/ubuntu/+source/mesa/+bug/691653">Ubuntu bug 691653</a> - compiz crashes when using alt-tab (the radeon driver kills it) </li>
+
+<li><a href="https://bugs.meego.com/show_bug.cgi?id=13005">Meego bug 13005</a> - Graphics GLSL issue lead to camera preview fail on Pinetrail</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..mesa-7.10.1
+</pre>
+
+<p>Alberto Milone (1):
+<ul>
+  <li>r600c: add evergreen ARL support.</li>
+</ul></p>
+
+<p>Brian Paul (21):
+<ul>
+  <li>draw: Fix an off-by-one bug in a vsplit assertion.</li>
+  <li>docs: add links to 7.9.1 and 7.10 release notes</li>
+  <li>docs: added news item for 7.9.1 and 7.10 release</li>
+  <li>gallivm: work around LLVM 2.6 bug when calling C functions</li>
+  <li>gallivm: fix copy&amp;paste error from previous commit</li>
+  <li>mesa: fix a few format table mistakes, assertions</li>
+  <li>mesa: fix num_draw_buffers==0 in fixed-function fragment program generation</li>
+  <li>mesa: don't assert in GetIntegerIndexed, etc</li>
+  <li>mesa: check for dummy renderbuffer in _mesa_FramebufferRenderbufferEXT()</li>
+  <li>llvmpipe: make sure binning is active when we begin/end a query</li>
+  <li>st/mesa: fix incorrect fragcoord.x translation</li>
+  <li>softpipe: fix off-by-one error in setup_fragcoord_coeff()</li>
+  <li>cso: fix loop bound in cso_set_vertex_samplers()</li>
+  <li>st/mesa: fix incorrect glCopyPixels position on fallback path</li>
+  <li>st/mesa: set renderbuffer _BaseFormat in a few places</li>
+  <li>st/mesa: fix the default case in st_format_datatype()</li>
+  <li>st/mesa: need to translate clear color according to surface's base format</li>
+  <li>docs: update 7.9.2 release notes with Brian's cherry-picks</li>
+  <li>docs: add link to 7.10.1 release notes</li>
+  <li>mesa: implement glGetShaderPrecisionFormat()</li>
+  <li>docs: updated environment variable list</li>
+</ul></p>
+
+<p>Bryce Harrington (1):
+<ul>
+  <li>r300g: Null pointer check for buffer deref in gallium winsys</li>
+</ul></p>
+
+<p>Chad Versace (20):
+<ul>
+  <li>glsl: At link-time, check that globals have matching centroid qualifiers</li>
+  <li>glcpp: Fix segfault when validating macro redefinitions</li>
+  <li>glsl: Fix parser rule for type_specifier</li>
+  <li>glsl: Change default value of ast_type_specifier::precision</li>
+  <li>glsl: Add semantic checks for precision qualifiers</li>
+  <li>glsl: Add support for default precision statements</li>
+  <li>glsl: Remove redundant semantic check in parser</li>
+  <li>glsl: Fix semantic checks on precision qualifiers</li>
+  <li>glsl: Fix segfault due to missing printf argument</li>
+  <li>glsl: Mark 'in' variables at global scope as read-only</li>
+  <li>mesa: Refactor handling of extension strings</li>
+  <li>mesa: Add/remove extensions in extension string</li>
+  <li>mesa: Change dependencies of some OES extension strings</li>
+  <li>mesa: Change OES_point_sprite to depend on ARB_point_sprite</li>
+  <li>mesa: Change OES_standard_derivatives to be stand-alone extension</li>
+  <li>i915: Disable extension OES_standard_derivatives</li>
+  <li>glcpp: Raise error when modulus is zero</li>
+  <li>glsl: Set operators '%' and '%=' to be reserved when GLSL &lt 1.30</li>
+  <li>glsl: Reinstate constant-folding for division by zero</li>
+  <li>tnl: Add support for datatype GL_FIXED in vertex arrays</li>
+</ul></p>
+
+<p>Chia-I Wu (1):
+<ul>
+  <li>mesa: Add glDepthRangef and glClearDepthf to APIspec.xml.</li>
+</ul></p>
+
+<p>Christoph Bumiller (1):
+<ul>
+  <li>nv50,nvc0: do not forget to apply sign mode to saved TGSI inputs</li>
+</ul></p>
+
+<p>Cyril Brulebois (1):
+<ul>
+  <li>Point to bugs.freedesktop.org rather than bugzilla.freedesktop.org</li>
+</ul></p>
+
+<p>Dave Airlie (3):
+<ul>
+  <li>radeon/r200: fix fbo-clearmipmap + gen-teximage</li>
+  <li>radeon: calculate complete texture state inside TFP function</li>
+  <li>radeon: avoid segfault on 3D textures.</li>
+</ul></p>
+
+<p>Dimitry Andric (4):
+<ul>
+  <li>mesa: s/movzx/movzbl/</li>
+  <li>mesa: s/movzxw/movzwl/ in read_rgba_span_x86.S</li>
+  <li>glapi: adding @ char before type specifier in glapi_x86.S</li>
+  <li>glapi: add @GOTPCREL relocation type</li>
+</ul></p>
+
+<p>Eric Anholt (16):
+<ul>
+  <li>glsl: Fix the lowering of variable array indexing to not lose write_masks.</li>
+  <li>i965/fs: When producing ir_unop_abs of an operand, strip negate.</li>
+  <li>i965/vs: When MOVing to produce ABS, strip negate of the operand.</li>
+  <li>i965/fs: Do flat shading when appropriate.</li>
+  <li>i965: Avoid double-negation of immediate values in the VS.</li>
+  <li>intel: Make renderbuffer tiling choice match texture tiling choice.</li>
+  <li>i965: Fix dead pointers to fp-&gt;Parameters-&gt;ParameterValues[] after realloc.</li>
+  <li>docs: Add a relnote for the Civ IV on i965.</li>
+  <li>glapi: Add entrypoints and enums for GL_ARB_ES2_compatibility.</li>
+  <li>mesa: Add extension enable bit for GL_ARB_ES2_compatibility.</li>
+  <li>mesa: Add actual support for glReleaseShaderCompiler from ES2.</li>
+  <li>mesa: Add support for glDepthRangef and glClearDepthf.</li>
+  <li>mesa: Add getters for ARB_ES2_compatibility MAX_*_VECTORS.</li>
+  <li>mesa: Add getter for GL_SHADER_COMPILER with ARB_ES2_compatibility.</li>
+  <li>i965: Fix a bug in i965 compute-to-MRF.</li>
+  <li>i965/fs: Add a helper function for detecting math opcodes.</li>
+</ul></p>
+
+<p>Fredrik Höglund (1):
+<ul>
+  <li>st/mesa: fix a regression from cae2bb76</li>
+</ul></p>
+
+<p>Ian Romanick (42):
+<ul>
+  <li>docs: Add 7.10 md5sums</li>
+  <li>glsl: Support the 'invariant(all)' pragma</li>
+  <li>glcpp: Generate an error for division by zero</li>
+  <li>glsl: Add version_string containing properly formatted GLSL version</li>
+  <li>glsl &amp; glcpp: Refresh autogenerated lexer and parser files.</li>
+  <li>glsl: Disallow 'in' and 'out' on globals in GLSL 1.20</li>
+  <li>glsl: Track variable usage, use that to enforce semantics</li>
+  <li>glsl: Allow 'in' and 'out' when 'layout' is also available</li>
+  <li>docs: Initial bits of 7.10.1 release notes</li>
+  <li>mesa: bump version to 7.10.1-devel</li>
+  <li>doc: Update 7.10.1 release notes</li>
+  <li>glsl: Emit errors or warnings when 'layout' is used with 'attribute' or 'varying'</li>
+  <li>docs: Update 7.10.1 release notes</li>
+  <li>glsl: Refresh autogenerated lexer and parser files.</li>
+  <li>glsl: Don't assert when the value returned by a function has no rvalue</li>
+  <li>linker: Set sizes for non-global arrays as well</li>
+  <li>linker: Propagate max_array_access while linking functions</li>
+  <li>docs: Update 7.10.1 release notes</li>
+  <li>mesa: glGetUniform only returns a single element of an array</li>
+  <li>linker: Generate link errors when ES shaders are missing stages</li>
+  <li>mesa: Fix error checks in GetVertexAttrib functions</li>
+  <li>Use C-style system headers in C++ code to avoid issues with std:: namespace</li>
+  <li>docs: Update 7.10.1 release notes</li>
+  <li>glapi: Regenerate for GL_ARB_ES2_compatibility.</li>
+  <li>mesa: Connect glGetShaderPrecisionFormat into the dispatch table</li>
+  <li>i965: Set correct values for range/precision of fragment shader types</li>
+  <li>i915: Set correct values for range/precision of fragment shader types</li>
+  <li>intel: Fix typeos from 3d028024 and 790ff232</li>
+  <li>glsl: Ensure that all GLSL versions are supported in the stand-alone compiler</li>
+  <li>glsl: Reject shader versions not supported by the implementation</li>
+  <li>mesa: Initial size for secondary color array is 3</li>
+  <li>glsl: Finish out the reduce/reduce error fixes</li>
+  <li>glsl: Regenerate compiler and glcpp files from cherry picks</li>
+  <li>linker: Fix off-by-one error implicit array sizing</li>
+  <li>docs: update 7.10.1 release notes with Ian's recent cherry picks</li>
+  <li>i915: Only mark a register as available if all components are written</li>
+  <li>i915: Calculate partial result to temp register first</li>
+  <li>i915: Force lowering of all types of indirect array accesses in the FS</li>
+  <li>docs: Update 7.10.1 with (hopefully) the last of the cherry picks</li>
+  <li>docs: Clean up bug fixes list</li>
+  <li>intel: Remove driver date and related bits from renderer string</li>
+  <li>mesa: set version string to 7.10.1 (final)</li>
+</ul></p>
+
+<p>Jian Zhao (1):
+<ul>
+  <li>mesa: fix an error in uniform arrays in row calculating.</li>
+</ul></p>
+
+<p>Julien Cristau (3):
+<ul>
+  <li>glx: fix request lengths</li>
+  <li>glx: fix GLXChangeDrawableAttributesSGIX request</li>
+  <li>glx: fix length of GLXGetFBConfigsSGIX</li>
+</ul></p>
+
+<p>Keith Packard (1):
+<ul>
+  <li>glsl: Eliminate reduce/reduce conflicts in glsl grammar</li>
+</ul></p>
+
+<p>Kenneth Graunke (20):
+<ul>
+  <li>glsl: Expose a public glsl_type::void_type const pointer.</li>
+  <li>glsl: Don't bother unsetting a destructor that was never set.</li>
+  <li>glsl, i965: Remove unnecessary talloc includes.</li>
+  <li>glcpp: Remove use of talloc reference counting.</li>
+  <li>ralloc: Add a fake implementation of ralloc based on talloc.</li>
+  <li>Convert everything from the talloc API to the ralloc API.</li>
+  <li>ralloc: a new MIT-licensed recursive memory allocator.</li>
+  <li>Remove talloc from the make and automake build systems.</li>
+  <li>Remove talloc from the SCons build system.</li>
+  <li>Remove the talloc sources from the Mesa repository.</li>
+  <li>glsl: Fix use of uninitialized values in _mesa_glsl_parse_state ctor.</li>
+  <li>i965/fs: Apply source modifier workarounds to POW as well.</li>
+  <li>i965: Fix shaders that write to gl_PointSize on Sandybridge.</li>
+  <li>i965/fs: Avoid register coalescing away gen6 MATH workarounds.</li>
+  <li>i965/fs: Correctly set up gl_FragCoord.w on Sandybridge.</li>
+  <li>i965: Increase Sandybridge point size clamp.</li>
+  <li>i965/fs: Refactor control flow stack handling.</li>
+  <li>i965: Increase Sandybridge point size clamp in the clip state.</li>
+  <li>glsl: Use reralloc instead of plain realloc.</li>
+  <li>Revert "i965/fs: Correctly set up gl_FragCoord.w on Sandybridge."</li>
+</ul></p>
+
+<p>Marek Olšák (4):
+<ul>
+  <li>docs: fix messed up names with special characters in relnotes-7.10</li>
+  <li>docs: fix messed up names with special characters in relnotes-7.9.1</li>
+  <li>mesa: fix texture3D mipmap generation for UNSIGNED_BYTE_3_3_2</li>
+  <li>st/dri: Track drawable context bindings</li>
+</ul></p>
+
+<p>Paulo Zanoni (1):
+<ul>
+  <li>dri_util: fail driCreateNewScreen if InitScreen is NULL</li>
+</ul></p>
+
+<p>Sam Hocevar (2):
+<ul>
+  <li>docs: add glsl info</li>
+  <li>docs: fix glsl_compiler name</li>
+</ul></p>
+
+<p>Tom Fogal (1):
+<ul>
+  <li>Regenerate gl_mangle.h.</li>
+</ul></p>
+
+<p>Tom Stellard (2):
+<ul>
+  <li>r300/compiler: Disable register rename pass on r500</li>
+  <li>r300/compiler: Don't erase sources when converting RGB-&gt;Alpha</li>
+</ul></p>
+
+<p>Vinson Lee (3):
+<ul>
+  <li>ralloc: Add missing va_end following va_copy.</li>
+  <li>mesa: Move declaration before code in extensions.c.</li>
+  <li>mesa: Move loop variable declarations outside for loop in extensions.c.</li>
+</ul></p>
+
+<p>nobled (1):
+<ul>
+  <li>glx: Put null check before use</li>
+</ul></p>
+
+</p>
+
+</body>
+</html>

docs/relnotes-7.10.2.html

@@ -0,0 +1,206 @@
+<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.2 Release Notes / April 6, 2011</H1>
+
+<p>
+Mesa 7.10.2 is a bug fix release which fixes bugs found since the 7.10 release.
+</p>
+<p>
+Mesa 7.10.2 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>
+2f9f444265534a2cfd9a99d1a8291089  MesaLib-7.10.2.tar.gz
+f5de82852f1243f42cc004039e10b771  MesaLib-7.10.2.tar.bz2
+47836e37bab6fcafe3ac90c9544ba0e9  MesaLib-7.10.2.zip
+175120325828f313621cc5bc6c504803  MesaGLUT-7.10.2.tar.gz
+8c71d273f5f8d6c5eda4ffc39e0fe03e  MesaGLUT-7.10.2.tar.bz2
+03036c8efe7b791a90fa0f2c41b43f43  MesaGLUT-7.10.2.zip
+</pre>
+
+
+<h2>New features</h2>
+<p>None.</p>
+
+<h2>Bug fixes</h2>
+<p>This list is likely incomplete.</p>
+<ul>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=29172">Bug 29172</a> - Arrandale - Pill Popper Pops Pills</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=31159">Bug 31159</a> - shadow problem in 0ad game</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32688">Bug 32688</a> - [RADEON:KMS:R300G] some games have a wireframe or outline visible</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32949">Bug 32949</a> - [glsl wine] Need for Speed renders incorrectly with GLSL enabled</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34203">Bug 34203</a> - [GLSL] fail to call long chains across shaders</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34376">Bug 34376</a> - [GLSL] allowing assignment to unsized array
+  <ul>
+    <li>The commit message incorrectly
+    lists <a href="https://bugs.freedesktop.org/show_bug.cgi?id=34367">bug
+    34367</a>.</li>
+  </ul>
+</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34370">Bug 34370</a> - [GLSL] "i&lt;5 &amp;&amp; i&lt;4" in for loop fails</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34374">Bug 34374</a> - [GLSL] fail to redeclare an array using initializer</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=35073">Bug 35073</a> - [GM45] Alpha test is broken when rendering to FBO with no color attachment</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=35483">Bug 35483</a> - util_blit_pixels_writemask: crash in line 322 of src/gallium/auxiliary/util/u_blit.c</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.1..mesa-7.10.2
+</pre>
+
+<p><em>Note:</em> Reverted commits and the reverts are not included in this list.</p>
+
+<p>Alex Deucher (2):
+<ul>
+  <li>r600c: add new ontario pci ids</li>
+  <li>r600g: add some additional ontario pci ids</li>
+</ul></p>
+
+<p>Benjamin Franzke (1):
+<ul>
+  <li>st/dri: Fix surfaceless gl using contexts with previous bound surfaces</li>
+</ul></p>
+
+<p>Brian Paul (9):
+<ul>
+  <li>docs: pull 7.9.2 release notes into 7.10 branch</li>
+  <li>docs: update news.html with 7.10.1 and 7.9.2 releases</li>
+  <li>docs: fill in 7.10.1 release data</li>
+  <li>docs: add, fix release notes links</li>
+  <li>docs: update info about Mesa packaging/contents</li>
+  <li>docs: update prerequisites, remove old demo info</li>
+  <li>mesa: Guard against null pointer deref in fbo validation</li>
+  <li>st/mesa: Apply LOD bias from correct texture unit</li>
+  <li>glsl: silence warning in printf() with a cast</li>
+</ul></p>
+
+<p>Chad Versace (1):
+<ul>
+  <li>i965: Fix tex_swizzle when depth mode is GL_RED</li>
+</ul></p>
+
+<p>Dave Airlie (1):
+<ul>
+  <li>r600: don't close fd on failed load</li>
+</ul></p>
+
+<p>Eric Anholt (2):
+<ul>
+  <li>i965: Apply a workaround for the Ironlake "vertex flashing".</li>
+  <li>i965: Fix alpha testing when there is no color buffer in the FBO.</li>
+</ul></p>
+
+<p>Fabian Bieler (1):
+<ul>
+  <li>st/mesa: Apply LOD from texture object</li>
+</ul></p>
+
+<p>Henri Verbeet (1):
+<ul>
+  <li>st/mesa: Validate state before doing blits.</li>
+</ul></p>
+
+<p>Ian Romanick (13):
+<ul>
+  <li>docs: Add 7.10.1 md5sums</li>
+  <li>glsl: Refactor AST-to-HIR code handling variable initializers</li>
+  <li>glsl: Refactor AST-to-HIR code handling variable redeclarations</li>
+  <li>glsl: Process redeclarations before initializers</li>
+  <li>glsl: Function signatures cannot have NULL return type</li>
+  <li>glsl: Add several function / call related validations</li>
+  <li>linker: Add imported functions to the linked IR</li>
+  <li>glsl: Use insert_before for lists instead of open coding it</li>
+  <li>glsl: Only allow unsized array assignment in an initializer</li>
+  <li>glcpp: Refresh autogenerated lexer files</li>
+  <li>docs: Initial bits of 7.10.2 release notes</li>
+  <li>mesa: set version string to 7.10.2</li>
+  <li>mesa: Remove nonexistant files from _FILES lists</li>
+</ul></p>
+
+<p>Jerome Glisse (1):
+<ul>
+  <li>r600g: move user fence into base radeon structure</li>
+</ul></p>
+
+<p>José Fonseca (2):
+<ul>
+  <li>mesa: Fix typo glGet*v(GL_TEXTURE_COORD_ARRAY_*).</li>
+  <li>mesa: More glGet* fixes.</li>
+</ul></p>
+
+<p>Kenneth Graunke (4):
+<ul>
+  <li>glcpp: Rework lexer to use a SKIP state rather than REJECT.</li>
+  <li>glcpp: Remove trailing contexts from #if rules.</li>
+  <li>i965/fs: Fix linear gl_Color interpolation on pre-gen6 hardware.</li>
+  <li>glsl: Accept precision qualifiers on sampler types, but only in ES.</li>
+</ul></p>
+
+<p>Marek Olšák (15):
+<ul>
+  <li>st/mesa: fix crash when DrawBuffer-&gt;_ColorDrawBuffers[0] is NULL</li>
+  <li>st/mesa: fail to alloc a renderbuffer if st_choose_renderbuffer_format fails</li>
+  <li>r300/compiler: fix the saturate modifier when applied to TEX instructions</li>
+  <li>r300/compiler: fix translating the src negate bits in pair_translate</li>
+  <li>r300/compiler: Abs doesn't cancel Negate (in the conversion to native swizzles)</li>
+  <li>r300/compiler: TEX instructions don't support negation on source arguments</li>
+  <li>r300/compiler: do not set TEX_IGNORE_UNCOVERED on r500</li>
+  <li>r300/compiler: saturate Z before the shadow comparison</li>
+  <li>r300/compiler: fix equal and notequal shadow compare functions</li>
+  <li>r300/compiler: remove unused variables</li>
+  <li>st/mesa: fix crash when using both user and vbo buffers with the same stride</li>
+  <li>r300g: fix alpha-test with no colorbuffer</li>
+  <li>r300g: tell the GLSL compiler to lower the continue opcode</li>
+  <li>r300/compiler: propagate SaturateMode down to the result of shadow comparison</li>
+  <li>r300/compiler: apply the texture swizzle to shadow pass and fail values too</li>
+</ul></p>
+
+<p>Michel Dänzer (1):
+<ul>
+  <li>Use proper source row stride when getting depth/stencil texels.</li>
+</ul></p>
+
+<p>Tom Stellard (4):
+<ul>
+  <li>r300/compiler: Use a 4-bit writemask in pair instructions</li>
+  <li>prog_optimize: Fix reallocating registers for shaders with loops</li>
+  <li>r300/compiler: Fix vertex shader MAD instructions with constant swizzles</li>
+  <li>r300/compiler: Don't try to convert RGB to Alpha in full instructions</li>
+</ul></p>
+
+</body>
+</html>

docs/relnotes-7.10.3.html

@@ -0,0 +1,298 @@
+<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.3 Release Notes / June 13, 2011</H1>
+
+<p>
+Mesa 7.10.3 is a bug fix release which fixes bugs found since the 7.10.2 release.
+</p>
+<p>
+Mesa 7.10.3 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><a href="https://bugs.freedesktop.org/show_bug.cgi?id=29162">Bug 29162</a> - mesa/darwin is severly broken</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=31590">Bug 31590</a> - Black space between colors on mole hill example</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32395">Bug 32395</a> - [glsl] Incorrect code generation for shadow2DProj() with bias</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32564">Bug 32564</a> - [llvmpipe] prog: Unknown command line argument '-disable-mmx'. Try: 'prog -help' with llvm-2.9svn</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32835">Bug 32835</a> - [glsl] recursive #define results in infinite stack recursion</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33303">Bug 33303</a> - [glsl] ir_constant_expression.cpp:72: virtual ir_constant* ir_expression::constant_expression_value(): Assertion `op[0]->type->base_type == op[1]->type->base_type' failed.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33314">Bug 33314</a> - [glsl] ir_constant_expression.cpp:122: virtual ir_constant* ir_expression::constant_expression_value(): Assertion `op[0]->type->base_type == GLSL_TYPE_BOOL' failed.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33512">Bug 33512</a> - [SNB] case ogles2conform/GL/gl_FragCoord/gl_FragCoord_xy_frag.test and gl_FragCoord_w_frag.test fail</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34280">Bug 34280</a> - r200 mesa-7.10 font distortion</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34321">Bug 34321</a> - The ARB_fragment_program subset of ARB_draw_buffers not implemented</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=35603">Bug 35603</a> - GLSL compiler freezes compiling shaders</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=36173">Bug 36173</a> - struct renderbuffer's 'format' field never set when using FBO</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=36238">Bug 36238</a> - Mesa release files don't contain scons control files</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=36410">Bug 36410</a> - [SNB] Rendering errors in 3DMMES subtest taiji</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=36527">Bug 36527</a> - [wine] Wolfenstein: Failed to translate rgb instruction.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=36651">Bug 36651</a> - mesa requires bison and flex to build but configure does not check for them</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=36738">Bug 36738</a> - Openarena crash with r300g, swrastg + llvm &gt; 2.8</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=37648">Bug 37648</a> - Logic error in mesa/main/teximage.c:texsubimage</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=37739">Bug 37739</a> - Color clear of FBO without color buffer crashes</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.2..mesa-7.10.3
+</pre>
+
+<p>Alan Hourihane (1):
+<ul>
+  <li>Check for out of memory when creating fence</li>
+</ul></p>
+
+<p>Alex Buell (1):
+<ul>
+  <li>configure: bump LIBDRM_REQUIRED to 2.4.24</li>
+</ul></p>
+
+<p>Alex Deucher (2):
+<ul>
+  <li>r600c: add new pci ids</li>
+  <li>r600g: add new pci ids</li>
+</ul></p>
+
+<p>Brian Paul (19):
+<ul>
+  <li>docs: add link to 7.10.2 release notes</li>
+  <li>scons: remove dangling reference to state_trackers/python/SConscript</li>
+  <li>Makefile: add missing Scons files</li>
+  <li>llvmpipe: document issue with LLVM 2.8 and earlier with AVX</li>
+  <li>docs: replace llvmpipe/README with docs/llvmpipe.html</li>
+  <li>glsl: add static qualifier to silence warning</li>
+  <li>glsl: add cast to silence signed/unsigned comparison warning</li>
+  <li>mesa: s/height/depth/ in texsubimage()</li>
+  <li>mesa: fix void pointer arithmetic warnings</li>
+  <li>mesa: add some missing GLAPIENTRY keywords</li>
+  <li>mesa: check that flex/bison are installed</li>
+  <li>st/mesa: fix incorrect texture level/face/slice accesses</li>
+  <li>draw: fix edge flag handling in clipper (for unfilled tris/quads/polygons)</li>
+  <li>vbo: check array indexes to prevent negative indexing</li>
+  <li>vbo: remove node-&gt;count &gt; 0 test in vbo_save_playback_vertex_list()</li>
+  <li>st/mesa: fix software accum buffer format bug</li>
+  <li>mesa: add include/c99/inttypes.h include/c99/stdbool.h include/c99/stdint.h files to tarballs</li>
+  <li>docs: 7.10.3 release notes skeleton file, links</li>
+  <li>mesa: bump version to 7.10.3</li>
+</ul></p>
+
+<p>Carl Worth (2):
+<ul>
+  <li>glcpp: Simplify calling convention of parser's active_list functions</li>
+  <li>glcpp: Fix attempts to expand recursive macros infinitely (bug #32835).</li>
+</ul></p>
+
+<p>Dave Airlie (1):
+<ul>
+  <li>st/mesa: fix compressed mipmap generation.</li>
+</ul></p>
+
+<p>Eric Anholt (19):
+<ul>
+  <li>i965: Fix the VS thread limits for GT1, and clarify the WM limits on both.</li>
+  <li>glsl: Avoid cascading errors when looking for a scalar boolean and failing.</li>
+  <li>glsl: Semantically check the RHS of `&amp;&amp;' even when short-circuiting.</li>
+  <li>glsl: Semantically check the RHS of `||' even when short-circuiting.</li>
+  <li>glsl: When we've emitted a semantic error for ==, return a bool constant.</li>
+  <li>glsl: Perform type checking on "^^" operands.</li>
+  <li>intel: Use _mesa_base_tex_format for FBO texture attachments.</li>
+  <li>swrast: Don't assert against glReadPixels of GL_RED and GL_RG.</li>
+  <li>mesa: Add a gl_renderbuffer.RowStride field like textures have.</li>
+  <li>mesa: Add a function to set up the default renderbuffer accessors.</li>
+  <li>intel: Use Mesa core's renderbuffer accessors for depth.</li>
+  <li>mesa: Use _mesa_get_format_bytes to refactor out the RB get_pointer_*</li>
+  <li>mesa: Use _mesa_get_format_bytes to refactor out the RB get_row_*</li>
+  <li>mesa: Add renderbuffer accessors for R8/RG88/R16/RG1616.</li>
+  <li>swrast: Don't try to adjust_colors for &lt8bpc when handling R16, RG1616.</li>
+  <li>intel: Use mesa core's R8, RG88, R16, RG1616 RB accessors.</li>
+  <li>Revert "intel: Add spans code for the ARB_texture_rg support."</li>
+  <li>mesa: Add support for the ARB_fragment_program part of ARB_draw_buffers.</li>
+  <li>mesa: Add support for OPTION ATI_draw_buffers to ARB_fp.</li>
+</ul></p>
+
+<p>Hans de Goede (1):
+<ul>
+  <li>texstore: fix regression stricter check for memcpy path for unorm88 and unorm1616</li>
+</ul></p>
+
+<p>Henri Verbeet (3):
+<ul>
+  <li>mesa: Also update the color draw buffer if it's explicitly set to GL_NONE.</li>
+  <li>glx: Destroy dri2Hash on DRI2 display destruction.</li>
+  <li>glx: Only remove the glx_display from the list after it's destroyed.</li>
+</ul></p>
+
+<p>Ian Romanick (9):
+<ul>
+  <li>docs: Add 7.10.2 md5sums</li>
+  <li>glsl: Fix off-by-one error setting max_array_access for non-constant indexing</li>
+  <li>ir_to_mesa: Handle shadow compare w/projection and LOD bias correctly</li>
+  <li>intel: Fix ROUND_DOWN_TO macro</li>
+  <li>glsl: Regenerate compiler and glcpp files from cherry picks</li>
+  <li>i965: Remove hint_gs_always and resulting dead code</li>
+  <li>mesa: Don't try to clear a NULL renderbuffer</li>
+  <li>mesa: Ignore blits to/from missing buffers</li>
+  <li>docs: Add list of bugs fixed in 7.10.3 release</li>
+</ul></p>
+
+<p>Jeremy Huddleston (18):
+<ul>
+  <li>apple: Update GL specs</li>
+  <li>apple: Rename glcontextmodes.[ch] to glxconfig.[ch]</li>
+  <li>apple: Rename __GLcontextModes to struct glx_config</li>
+  <li>apple: Rename GLXcontext</li>
+  <li>apple: Re-add driContext and do_destroy</li>
+  <li>apple: Rename _gl_context_modes_find_visual to glx_config_find_visual</li>
+  <li>apple: Rename GLXcontext</li>
+  <li>apple: Change from XExtDisplayInfo to struct glx_display</li>
+  <li>apple: ifdef out come glapi-foo on darwin</li>
+  <li>glx: Dead code removal</li>
+  <li>apple: Build darwin using applegl rather than indirect</li>
+  <li>apple: Fix build failures in applegl_glx.c</li>
+  <li>darwin: Define GALLIUM_DRIVERS_DIRS in darwin config</li>
+  <li>apple: Package applegl source into MesaLib tarball</li>
+  <li>darwin: Set VG_LIB_{NAME,GLOB} to fix make install</li>
+  <li>darwin: Don't link against libGL when building libOSMesa</li>
+  <li>darwin: Fix VG_LIB_GLOB to also match the unversioned symlink</li>
+  <li>osmesa: Fix missing symbols when GLX_INDIRECT_RENDERING is defined.</li>
+</ul></p>
+
+<p>José Fonseca (13):
+<ul>
+  <li>llvmpipe: Update readme.</li>
+  <li>mesa: GL_PROVOKING_VERTEX_EXT is a GLenum, not GLboolean.</li>
+  <li>mesa: Fix GetVertexAttrib* inside display lists.</li>
+  <li>draw: Fix draw_variant_output::format's type.</li>
+  <li>gallivm: Tell LLVM to not assume a 16-byte aligned stack on x86.</li>
+  <li>gallivm: Fix for dynamically linked LLVM 2.8 library.</li>
+  <li>st/wgl: Adjust the pbuffer invisible window size.</li>
+  <li>st/wgl: Fix debug output format specifiers of stw_framebuffer_get_size().</li>
+  <li>st/wgl: Prevent spurious framebuffer sizes when the window is minimized.</li>
+  <li>st/wgl: Cope with zero width/height windows.</li>
+  <li>st/wgl: Allow to create pbuffers bigger than the desktop.</li>
+  <li>st/wgl: Remove buggy assertion.</li>
+  <li>wgl: Don't hold on to user supplied HDC.</li>
+</ul></p>
+
+<p>Kenneth Graunke (10):
+<ul>
+  <li>i965/fs: Switch W and 1/W in Sandybridge interpolation setup.</li>
+  <li>i965: Refactor Sandybridge implied move handling.</li>
+  <li>i965: Resolve implied moves in brw_dp_READ_4_vs_relative.</li>
+  <li>intel: Add IS_GT2 macro for recognizing Sandybridge GT2 systems.</li>
+  <li>i965: Allocate the whole URB to the VS and fix calculations for Gen6.</li>
+  <li>intel: Support glCopyTexImage() from ARGB8888 to XRGB8888.</li>
+  <li>glsl: Fix memory error when creating the supported version string.</li>
+  <li>glsl: Regenerate autogenerated file builtin_function.cpp.</li>
+  <li>i965: Rename various gen6 #defines to match the documentation.</li>
+  <li>i965: Never enable the GS on Gen6.</li>
+</ul></p>
+
+<p>Kostas Georgiou (1):
+<ul>
+  <li>r600c/g: Add pci id for FirePro 2270</li>
+</ul></p>
+
+<p>Marek Olšák (18):
+<ul>
+  <li>tgsi/ureg: bump the limit of immediates</li>
+  <li>st/mesa: fix changing internal format via RenderbufferStorage</li>
+  <li>st/mesa: GenerateMipmap should not be killed by conditional rendering</li>
+  <li>swrast: BlitFramebuffer should not be killed by conditional rendering</li>
+  <li>st/mesa: BlitFramebuffer should not be killed by conditional rendering</li>
+  <li>st/mesa: CopyTex(Sub)Image should not be killed by conditional rendering</li>
+  <li>st/mesa: conditional rendering should not kill texture decompression via blit</li>
+  <li>mesa: forbid UseProgram to be called inside Begin/End</li>
+  <li>mesa: UseShaderProgramEXT and Uniform* shouldn't be allowed inside Begin/End</li>
+  <li>mesa: queries of non-existent FBO attachments should return INVALID_OPERATION</li>
+  <li>r300g: fix draw_vbo splitting on r3xx-r4xx</li>
+  <li>r300g: fix texturing with non-3D textures and wrap R mode set to sample border</li>
+  <li>r300g: fix occlusion queries when depth test is disabled or zbuffer is missing</li>
+  <li>r300g: clear can be killed by render condition</li>
+  <li>st/mesa: remove asserts in st_texture_image_copy</li>
+  <li>mesa: fix up assertion in _mesa_source_buffer_exists</li>
+  <li>mesa: invalidate framebuffer if internal format of renderbuffer is changed</li>
+  <li>mesa: return after invalidating renderbuffer</li>
+</ul></p>
+
+<p>Matt Turner (1):
+<ul>
+  <li>r300/compiler: align memory allocations to 8-bytes</li>
+</ul></p>
+
+<p>Tom Stellard (3):
+<ul>
+  <li>r300/compiler: Fix incorrect presubtract conversion</li>
+  <li>r300/compiler: Fix dataflow analysis bug with ELSE blocks</li>
+  <li>r300/compiler: Limit instructions to 3 source selects</li>
+</ul></p>
+
+<p>Vinson Lee (1):
+<ul>
+  <li>gallivm: Disable MMX-disabling code on llvm-2.9.</li>
+</ul></p>
+
+<p>Zou Nan hai (1):
+<ul>
+  <li>i965: Align interleaved URB write length to 2</li>
+</ul></p>
+
+<p>pepp (1):
+<ul>
+  <li>st/mesa: assign renderbuffer's format field when allocating storage</li>
+</ul></p>
+
+</body>
+</html>

docs/relnotes-7.9.1.html

@@ -0,0 +1,406 @@
+<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.9.1 Release Notes / January 7, 2011</H1>
+
+<p>
+Mesa 7.9.1 is a bug fix release which fixes bugs found since the 7.9 release.
+</p>
+<p>
+Mesa 7.9.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>
+78422843ea875ad4eac35b9b8584032b  MesaLib-7.9.1.tar.gz
+07dc6cfb5928840b8b9df5bd1b3ae434  MesaLib-7.9.1.tar.bz2
+c8eaea5b3c3d6dee784bd8c2db91c80f  MesaLib-7.9.1.zip
+ee9ecae4ca56fbb2d14dc15e3a0a7640  MesaGLUT-7.9.1.tar.gz
+41fc477d524e7dc5c84da8ef22422bea  MesaGLUT-7.9.1.tar.bz2
+90b287229afdf19317aa989d19462e7a  MesaGLUT-7.9.1.zip
+</pre>
+
+
+<h2>New features</h2>
+<p>None.</p>
+
+<h2>Bug fixes</h2>
+<p>This list is likely incomplete.</p>
+<ul>
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=28800">Bug 28800</a> - [r300c, r300g] Texture corruption with World of Warcraft</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=29420">Bug 29420</a> - Amnesia / HPL2 RendererFeatTest - not rendering correctly</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=29946">Bug 29946</a> - [swrast] piglit valgrind glsl-array-bounds-04 fails</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=30261">Bug 30261</a> - [GLSL 1.20] allowing inconsistent invariant declaration between two vertex shaders</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=30632">Bug 30632</a> - [softpipe] state_tracker/st_manager.c:489: st_context_notify_invalid_framebuffer: Assertion `stfb &amp;&amp; stfb-&gt;iface == stfbi' failed.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=30694">Bug 30694</a> - wincopy will crash on Gallium drivers when going to front buffer</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=30787">Bug 30787</a> - Invalid asm shader does not generate draw-time error when used with GLSL shader</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=30993">Bug 30993</a> - getFramebufferAttachmentParameteriv wrongly generates error</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=31101">Bug 31101</a> -  [glsl2] abort() in ir_validate::visit_enter(ir_assignment *ir)</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=31193">Bug 31193</a> -  [regression] aa43176e break water reflections</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=31194">Bug 31194</a> - The mesa meta save/restore code doesn't ref the current GLSL program</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=31371">Bug 31371</a> - glslparsertest: ir.cpp:358: ir_constant::ir_constant(const glsl_type*, const ir_constant_data*): Assertion `(type->base_type &gt;= 0) &amp;&amp; (type->base_type &lt;= 3)' failed.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=31439">Bug 31439</a> - Crash in glBufferSubData() with size == 0</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=31495">Bug 31495</a> - [i965 gles2c bisected] OpenGL ES 2.0 conformance GL2Tests_GetBIFD_input.run regressed</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=31514">Bug 31514</a> - isBuffer returns true for unbound buffers</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=31560">Bug 31560</a> - [tdfx] tdfx_tex.c:702: error: ‘const struct gl_color_table’ has no member named ‘Format’</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=31617">Bug 31617</a> - Radeon/Compiz: 'failed to attach dri2 front buffer', error case not handled</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=31648">Bug 31648</a> -  [GLSL] array-struct-array gets assertion: `(size &gt;= 1) && (size &lt;= 4)' failed.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=31650">Bug 31650</a> - [GLSL] varying gl_TexCoord fails to be re-declared to different size in the second shader</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=31673">Bug 31673</a> - GL_FRAGMENT_PRECISION_HIGH preprocessor macro undefined in GLSL ES</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=31690">Bug 31690</a> -  i915 shader compiler fails to flatten if in Aquarium webgl demo.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=31832">Bug 31832</a> - [i915] Bad renderbuffer format: 21</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=31841">Bug 31841</a> - [drm:radeon_cs_ioctl] *ERROR* Invalid command stream !</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=31894">Bug 31894</a> - Writing to gl_PointSize with GLES2 corrupts other varyings</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=31909">Bug 31909</a> - [i965] brw_fs.cpp:1461: void fs_visitor::emit_bool_to_cond_code(ir_rvalue*): Assertion `expr-&gt;operands[i]-&gt;type-&gt;is_scalar()' failed.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=31934">Bug 31934</a> - [gallium] Mapping empty buffer object causes SIGSEGV</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=31983">Bug 31983</a> -  [i915 gles2] "if (expression with builtin/varying variables) discard" breaks linkage</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=31985">Bug 31985</a> - [GLSL 1.20] initialized uniform array considered as "unsized"</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=31987">Bug 31987</a> - [gles2] if input a wrong pname(GL_NONE) to glGetBoolean, it will not case GL_INVALID_ENUM</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32035">Bug 32035</a> - [GLSL bisected] comparing unsized array gets segfault</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32070">Bug 32070</a> - llvmpipe renders stencil demo incorrectly</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32273">Bug 32273</a> - assertion fails when starting vdrift 2010 release with shaders enabled</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32287">Bug 32287</a> - [bisected GLSL] float-int failure</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32311">Bug 32311</a> - [965 bisected] Array look-ups broken on GM45</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32520">Bug 32520</a> -  [gles2] glBlendFunc(GL_ZERO, GL_DST_COLOR) will result in GL_INVALID_ENUM</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32825">Bug 32825</a> - egl_glx driver completely broken in 7.9 branch [fix in master]</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.9..mesa-7.9.1
+</pre>
+
+<p>Alex Deucher (5):
+<ul>
+  <li>r100: revalidate after radeon_update_renderbuffers</li>
+  <li>r600c: add missing radeon_prepare_render() call on evergreen</li>
+  <li>r600c: properly align mipmaps to group size</li>
+  <li>gallium/egl: fix r300 vs r600 loading</li>
+  <li>r600c: fix some opcodes on evergreen</li>
+</ul></p>
+
+<p>Aras Pranckevicius (2):
+<ul>
+  <li>glsl: fix crash in loop analysis when some controls can't be determined</li>
+  <li>glsl: fix matrix type check in ir_algebraic</li>
+</ul></p>
+
+<p>Brian Paul (27):
+<ul>
+  <li>swrast: fix choose_depth_texture_level() to respect mipmap filtering state</li>
+  <li>st/mesa: replace assertion w/ conditional in framebuffer invalidation</li>
+  <li>egl/i965: include inline_wrapper_sw_helper.h</li>
+  <li>mesa: Add missing else in do_row_3D</li>
+  <li>mesa: add missing formats in _mesa_format_to_type_and_comps()</li>
+  <li>mesa: handle more pixel types in mipmap generation code</li>
+  <li>mesa: make glIsBuffer() return false for never bound buffers</li>
+  <li>mesa: fix glDeleteBuffers() regression</li>
+  <li>swrast: init alpha value to 1.0 in opt_sample_rgb_2d()</li>
+  <li>meta: Mask Stencil.Clear against stencilMax in _mesa_meta_Clear</li>
+  <li>st/mesa: fix mapping of zero-sized buffer objects</li>
+  <li>mesa: check for posix_memalign() errors</li>
+  <li>llvmpipe: fix broken stencil writemask</li>
+  <li>mesa: fix GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME query</li>
+  <li>mesa: return GL_FRAMEBUFFER_DEFAULT as FBO attachment type</li>
+  <li>mesa: make glGet*(GL_NONE) generate GL_INVALID_ENUM</li>
+  <li>mesa: test for cube map completeness in glGenerateMipmap()</li>
+  <li>tnl: Initialize gl_program_machine memory in run_vp.</li>
+  <li>tnl: a better way to initialize the gl_program_machine memory</li>
+  <li>mesa, st/mesa: disable GL_ARB_geometry_shader4</li>
+  <li>glsl: fix off by one in register index assertion</li>
+  <li>st/mesa: fix mipmap generation bug</li>
+  <li>glsl: new glsl_strtod() wrapper to fix decimal point interpretation</li>
+  <li>mesa: no-op glBufferSubData() on size==0</li>
+  <li>tdfx: s/Format/_BaseFormat/</li>
+  <li>st/mesa: fix renderbuffer pointer check in st_Clear()</li>
+  <li>mesa: Bump the number of bits in the register index.</li>
+</ul></p>
+
+<p>Chad Versace (5):
+<ul>
+  <li>glsl: Fix lexer rule for ^=</li>
+  <li>glsl: Fix ast-to-hir for ARB_fragment_coord_conventions</li>
+  <li>glsl: Fix ir_expression::constant_expression_value()</li>
+  <li>glsl: Fix erroneous cast in ast_jump_statement::hir()</li>
+  <li>glsl: Fix linker bug in cross_validate_globals()</li>
+</ul></p>
+
+<p>Chia-I Wu (10):
+<ul>
+  <li>targets/egl: Fix linking with libdrm.</li>
+  <li>st/vega: Fix version check in context creation.</li>
+  <li>st/egl: Do not finish a fence that is NULL.</li>
+  <li>egl: Fix a false negative check in _eglCheckMakeCurrent.</li>
+  <li>st/mesa: Unreference the sampler view in st_bind_surface.</li>
+  <li>egl_dri2: Fix __DRI_DRI2 version 1 support.</li>
+  <li>st/vega: Do not wait NULL fences.</li>
+  <li>mesa: Do not advertise GL_OES_texture_3D.</li>
+  <li>egl_glx: Fix borken driver.</li>
+  <li>egl: Check extensions.</li>
+</ul></p>
+
+<p>Daniel Lichtenberger (1):
+<ul>
+  <li>radeon: fix potential segfault in renderbuffer update</li>
+</ul></p>
+
+<p>Daniel Vetter (1):
+<ul>
+  <li>r200: revalidate after radeon_update_renderbuffers</li>
+</ul></p>
+
+<p>Dave Airlie (1):
+<ul>
+  <li>r300g: fixup rs690 tiling stride alignment calculations.</li>
+</ul></p>
+
+<p>Eric Anholt (13):
+<ul>
+  <li>intel: Allow CopyTexSubImage to InternalFormat 3/4 textures, like RGB/RGBA.</li>
+  <li>glsl: Free the loop state context when we free the loop state.</li>
+  <li>i965: Allow OPCODE_SWZ to put immediates in the first arg.</li>
+  <li>i965: Add support for rendering to SARGB8 FBOs.</li>
+  <li>glsl: Add a helper constructor for expressions that works out result type.</li>
+  <li>glsl: Fix structure and array comparisions.</li>
+  <li>glsl: Quiet unreachable no-return-from-function warning.</li>
+  <li>glsl: Mark the array access for whole-array comparisons.</li>
+  <li>glsl: Fix flipped return of has_value() for array constants.</li>
+  <li>mesa: Add getters for the rest of the supported draw buffers.</li>
+  <li>mesa: Add getters for ARB_copy_buffer's attachment points.</li>
+  <li>i965: Correct the dp_read message descriptor setup on g4x.</li>
+  <li>glsl: Correct the marking of InputsRead/OutputsWritten on in/out matrices.</li>
+</ul></p>
+
+<p>Fabian Bieler (1):
+<ul>
+  <li>glsl: fix lowering conditional returns in subroutines</li>
+</ul></p>
+
+<p>Francisco Jerez (3):
+<ul>
+  <li>meta: Don't leak alpha function/reference value changes.</li>
+  <li>meta: Fix incorrect rendering of the bitmap alpha component.</li>
+  <li>meta: Don't try to disable cube maps if the driver doesn't expose the extension.</li>
+</ul></p>
+
+<p>Henri Verbeet (2):
+<ul>
+  <li>r600: Evergreen has two extra frac_bits for the sampler LOD state.</li>
+  <li>st/mesa: Handle wrapped depth buffers in st_copy_texsubimage().</li>
+</ul></p>
+
+<p>Ian Romanick (33):
+<ul>
+  <li>Add 7.9 md5sums</li>
+  <li>docs: Import 7.8.x release notes from 7.8 branch.</li>
+  <li>docs: download.html does not need to be updated for each release</li>
+  <li>docs: Update mailing lines from sf.net to freedesktop.org</li>
+  <li>docs: added news item for 7.9 release</li>
+  <li>mesa: Validate assembly shaders when GLSL shaders are used</li>
+  <li>linker: Reject shaders that have unresolved function calls</li>
+  <li>mesa: Refactor validation of shader targets</li>
+  <li>glsl: Slightly change the semantic of _LinkedShaders</li>
+  <li>linker: Improve handling of unread/unwritten shader inputs/outputs</li>
+  <li>glsl: Commit lexer files changed by previous cherry picking</li>
+  <li>mesa: Make metaops use program refcounts instead of names.</li>
+  <li>glsl: Fix incorrect gl_type of sampler2DArray and sampler1DArrayShadow</li>
+  <li>mesa: Allow query of MAX_SAMPLES with EXT_framebuffer_multisample</li>
+  <li>glsl: better handling of linker failures</li>
+  <li>mesa: Fix glGet of ES2's GL_MAX_*_VECTORS properties.</li>
+  <li>i915: Disallow alpha, red, RG, and sRGB as render targets</li>
+  <li>glsl/linker: Free any IR discarded by optimization passes.</li>
+  <li>glsl: Add an optimization pass to simplify discards.</li>
+  <li>glsl: Add a lowering pass to move discards out of if-statements.</li>
+  <li>i915: Correctly generate unconditional KIL instructions</li>
+  <li>glsl: Add unary ir_expression constructor</li>
+  <li>glsl: Ensure that equality comparisons don't return a NULL IR tree</li>
+  <li>glcpp: Commit changes in generated files cause by previous commit</li>
+  <li>glsl: Inherrit type of declared variable from initializer</li>
+  <li>glsl: Inherrit type of declared variable from initializer after processing assignment</li>
+  <li>linker: Ensure that unsized arrays have a size after linking</li>
+  <li>linker: Fix regressions caused by previous commit</li>
+  <li>linker: Allow built-in arrays to have different sizes between shader stages</li>
+  <li>ir_to_mesa: Don't generate swizzles for record derefs of non-scalar/vectors</li>
+  <li>Refresh autogenerated file builtin_function.cpp.</li>
+  <li>docs: Initial set of release notes for 7.9.1</li>
+  <li>mesa: set version string to 7.9.1</li>
+</ul></p>
+
+<p>Julien Cristau (1):
+<ul>
+  <li>Makefile: don't include the same files twice in the tarball</li>
+</ul></p>
+
+<p>Kenneth Graunke (19):
+<ul>
+  <li>glcpp: Return NEWLINE token for newlines inside multi-line comments.</li>
+  <li>generate_builtins.py: Output large strings as arrays of characters.</li>
+  <li>glsl: Fix constant component count in vector constructor emitting.</li>
+  <li>ir_dead_functions: Actually free dead functions and signatures.</li>
+  <li>glcpp: Define GL_FRAGMENT_PRECISION_HIGH if GLSL version &gt;= 1.30.</li>
+  <li>glsl: Unconditionally define GL_FRAGMENT_PRECISION_HIGH in ES2 shaders.</li>
+  <li>glsl: Fix constant expression handling for &lt, &gt;, &lt=, &gt;= on vectors.</li>
+  <li>glsl: Use do_common_optimization in the standalone compiler.</li>
+  <li>glsl: Don't inline function prototypes.</li>
+  <li>glsl: Add a virtual as_discard() method.</li>
+  <li>glsl: Remove "discard" support from lower_jumps.</li>
+  <li>glsl: Refactor get_num_operands.</li>
+  <li>glcpp: Don't emit SPACE tokens in conditional_tokens production.</li>
+  <li>glsl: Clean up code by adding a new is_break() function.</li>
+  <li>glsl: Consider the "else" branch when looking for loop breaks.</li>
+  <li>Remove OES_compressed_paletted_texture from the ES2 extension list.</li>
+  <li>glsl/builtins: Compute the correct value for smoothstep(vec, vec, vec).</li>
+  <li>Fix build on systems where "python" is python 3.</li>
+  <li>i965: Internally enable GL_NV_blend_square on ES2.</li>
+</ul></p>
+
+<p>Kristian Høgsberg (1):
+<ul>
+  <li>i965: Don't write mrf assignment for pointsize output</li>
+</ul></p>
+
+<p>Luca Barbieri (1):
+<ul>
+  <li>glsl: Unroll loops with conditional breaks anywhere (not just the end)</li>
+</ul></p>
+
+<p>Marek Olšák (17):
+<ul>
+  <li>r300g: fix microtiling for 16-bits-per-channel formats</li>
+  <li>r300g: fix texture border for 16-bits-per-channel formats</li>
+  <li>r300g: add a default channel ordering of texture border for unhandled formats</li>
+  <li>r300g: fix texture border color for all texture formats</li>
+  <li>r300g: fix rendering with no vertex elements</li>
+  <li>r300/compiler: fix rc_rewrite_depth_out for it to work with any instruction</li>
+  <li>r300g: fix texture border color once again</li>
+  <li>r300g: fix texture swizzling with compressed textures on r400-r500</li>
+  <li>r300g: disable ARB_texture_swizzle if S3TC is enabled on r3xx-only</li>
+  <li>mesa, st/mesa: fix gl_FragCoord with FBOs in Gallium</li>
+  <li>st/mesa: initialize key in st_vp_varient</li>
+  <li>r300/compiler: fix swizzle lowering with a presubtract source operand</li>
+  <li>r300g: fix rendering with a vertex attrib having a zero stride</li>
+  <li>ir_to_mesa: Add support for conditional discards.</li>
+  <li>r300g: finally fix the texture corruption on r3xx-r4xx</li>
+  <li>mesa: fix texel store functions for some float formats</li>
+  <li>r300/compiler: disable the rename_regs pass for loops</li>
+</ul></p>
+
+<p>Mario Kleiner (1):
+<ul>
+  <li>mesa/r300classic: Fix dri2Invalidate/radeon_prepare_render for page flipping.</li>
+</ul></p>
+
+<p>Peter Clifton (1):
+<ul>
+  <li>intel: Fix emit_linear_blit to use DWORD aligned width blits</li>
+</ul></p>
+
+<p>Robert Hooker (2):
+<ul>
+  <li>intel: Add a new B43 pci id.</li>
+  <li>egl_dri2: Add missing intel chip ids.</li>
+</ul></p>
+
+<p>Roland Scheidegger (1):
+<ul>
+  <li>r200: fix r200 large points</li>
+</ul></p>
+
+<p>Thomas Hellstrom (17):
+<ul>
+  <li>st/xorg: Don't try to use option values before processing options</li>
+  <li>xorg/vmwgfx: Make vmwarectrl work also on 64-bit servers</li>
+  <li>st/xorg: Add a customizer option to get rid of annoying cursor update flicker</li>
+  <li>xorg/vmwgfx: Don't hide HW cursors when updating them</li>
+  <li>st/xorg: Don't try to remove invalid fbs</li>
+  <li>st/xorg: Fix typo</li>
+  <li>st/xorg, xorg/vmwgfx: Be a bit more frendly towards cross-compiling environments</li>
+  <li>st/xorg: Fix compilation errors for Xservers compiled without Composite</li>
+  <li>st/xorg: Don't use deprecated x*alloc / xfree functions</li>
+  <li>xorg/vmwgfx: Don't use deprecated x*alloc / xfree functions</li>
+  <li>st/xorg: Fix compilation for Xservers &gt;= 1.10</li>
+  <li>mesa: Make sure we have the talloc cflags when using the talloc headers</li>
+  <li>egl: Add an include for size_t</li>
+  <li>mesa: Add talloc includes for gles</li>
+  <li>st/egl: Fix build for include files in nonstandard places</li>
+  <li>svga/drm: Optionally resolve calls to powf during link-time</li>
+  <li>gallium/targets: Trivial crosscompiling fix</li>
+</ul></p>
+
+<p>Tom Stellard (7):
+<ul>
+  <li>r300/compiler: Make sure presubtract sources use supported swizzles</li>
+  <li>r300/compiler: Fix register allocator's handling of loops</li>
+  <li>r300/compiler: Fix instruction scheduling within IF blocks</li>
+  <li>r300/compiler: Use zero as the register index for unused sources</li>
+  <li>r300/compiler: Ignore alpha dest register when replicating the result</li>
+  <li>r300/compiler: Use correct swizzles for all presubtract sources</li>
+  <li>r300/compiler: Don't allow presubtract sources to be remapped twice</li>
+</ul></p>
+
+<p>Vinson Lee (1):
+<ul>
+  <li>glsl: Fix 'control reaches end of non-void function' warning.</li>
+</ul></p>
+
+<p>richard (1):
+<ul>
+  <li>r600c : inline vertex format is not updated in an app, switch to use vfetch constants. For the 7.9 and 7.10 branches as well.</li>
+</ul></p>
+
+</body>
+</html>

docs/relnotes-7.9.2.html

@@ -0,0 +1,336 @@
+<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.9.2 Release Notes / March 2, 2011</H1>
+
+<p>
+Mesa 7.9.2 is a bug fix release which fixes bugs found since the 7.9.1 release.
+</p>
+<p>
+Mesa 7.9.2 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>
+eb4ab8c1a03386def3ea34b1358e9cda  MesaLib-7.9.2.tar.gz
+8f6d1474912787ce13bd35f3bae9938a  MesaLib-7.9.2.tar.bz2
+427a81dd43ac97603768dc5c6af3df26  MesaLib-7.9.2.zip
+aacb8f4db997e346db40c6066942140a  MesaGLUT-7.9.2.tar.gz
+18abe6cff4fad8ad4752c7b7ab548e5d  MesaGLUT-7.9.2.tar.bz2
+3189e5732d636c71baf3d8bc23ce7b11  MesaGLUT-7.9.2.zip
+</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 GPU hang in GLSL shaders that contain an unconditional <tt>discard</tt> statement.</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>Fixed a few GLX protocol encoder bugs (Julien Cristau)</li>
+
+<li>Assorted Gallium llvmpipe driver bug fixes</li>
+
+<li>Assorted Mesa/Gallium state tracker bug fixes</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=26795">Bug 26795</a> - gl_FragCoord off by one in Gallium drivers.</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=29823">Bug 29823</a> - GetUniform[if]v busted</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=29927">Bug 29927</a> - [glsl2] fail to compile shader with constructor for array of struct type</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=32214">Bug 32214</a> - [gles2]no link error happens when missing vertex shader or frag shader</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32375">Bug 32375</a> - [gl gles2] Not able to get the attribute by function glGetVertexAttribfv</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32541">Bug 32541</a> - Segmentation Fault while running an HDR (high dynamic range) rendering demo</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32569">Bug 32569</a> - [gles2] glGetShaderPrecisionFormat not implemented yet</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=33306">Bug 33306</a> - GLSL integer division by zero crashes GLSL compiler</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=33386">Bug 33386</a> - Dubious assembler in read_rgba_span_x86.S</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33388">Bug 33388</a> - Dubious assembler in xform4.S</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33433">Bug 33433</a> - Error in x86-64 API dispatch code.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33507">Bug 33507</a> - [glsl] GLSL preprocessor modulus by zero crash</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33508">Bug 33508</a> - [glsl] GLSL compiler modulus by zero crash</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33916">Bug 33916</a> - Compiler accepts reserved operators % and %=</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34047">Bug 34047</a> - Assert in _tnl_import_array() when using GLfixed vertex datatypes with GLESv2</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34114">Bug 34114</a> - Sun Studio build fails due to standard library functions not being in global namespace</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34198">Bug 34198</a> - [GLSL] implicit sized array with index 0 used gets assertion</li>
+
+<li><a href="https://bugs.launchpad.net/ubuntu/+source/mesa/+bug/691653">Ubuntu bug 691653</a> - compiz crashes when using alt-tab (the radeon driver kills it) </li>
+
+<li><a href="https://bugs.meego.com/show_bug.cgi?id=13005">Meego bug 13005</a> - Graphics GLSL issue lead to camera preview fail on Pinetrail</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.9.1..mesa-7.9.2
+</pre>
+
+<p>Alberto Milone (1):
+<ul>
+  <li>r600c: add evergreen ARL support.</li>
+</ul></p>
+
+<p>Brian Paul (19):
+<ul>
+  <li>draw: Fix an off-by-one bug in a vsplit assertion.</li>
+  <li>mesa: fix a few format table mistakes, assertions</li>
+  <li>mesa: fix num_draw_buffers==0 in fixed-function fragment program generation</li>
+  <li>mesa: don't assert in GetIntegerIndexed, etc</li>
+  <li>mesa: check for dummy renderbuffer in _mesa_FramebufferRenderbufferEXT()</li>
+  <li>llvmpipe: make sure binning is active when we begin/end a query</li>
+  <li>st/mesa: fix incorrect fragcoord.x translation</li>
+  <li>softpipe: fix off-by-one error in setup_fragcoord_coeff()</li>
+  <li>cso: fix loop bound in cso_set_vertex_samplers()</li>
+  <li>st/mesa: set renderbuffer _BaseFormat in a few places</li>
+  <li>st/mesa: fix the default case in st_format_datatype()</li>
+  <li>st/mesa: need to translate clear color according to surface's base format</li>
+  <li>docs: update 7.9.2 release notes with Brian's cherry-picks</li>
+  <li>docs: add links to 7.9.1 and 7.9.2 release notes</li>
+  <li>mesa: include compiler.h for ASSERT macro</li>
+  <li>glsl: add ir_shader case in switch stmt to silence warning</li>
+  <li>glsl2: fix signed/unsigned comparison warning</li>
+  <li>mesa: implement glGetShaderPrecisionFormat()</li>
+  <li>docs: updated environment variable list</li>
+</ul></p>
+
+<p>Bryce Harrington (1):
+<ul>
+  <li>r300g: Null pointer check for buffer deref in gallium winsys</li>
+</ul></p>
+
+<p>Chad Versace (14):
+<ul>
+  <li>glsl: At link-time, check that globals have matching centroid qualifiers</li>
+  <li>glcpp: Fix segfault when validating macro redefinitions</li>
+  <li>glsl: Fix parser rule for type_specifier</li>
+  <li>glsl: Change default value of ast_type_specifier::precision</li>
+  <li>glsl: Add semantic checks for precision qualifiers</li>
+  <li>glsl: Add support for default precision statements</li>
+  <li>glsl: Remove redundant semantic check in parser</li>
+  <li>glsl: Fix semantic checks on precision qualifiers</li>
+  <li>glsl: Fix segfault due to missing printf argument</li>
+  <li>glsl: Mark 'in' variables at global scope as read-only</li>
+  <li>glcpp: Raise error when modulus is zero</li>
+  <li>glsl: Set operators '%' and '%=' to be reserved when GLSL &lt 1.30</li>
+  <li>glsl: Reinstate constant-folding for division by zero</li>
+  <li>tnl: Add support for datatype GL_FIXED in vertex arrays</li>
+</ul></p>
+
+<p>Chia-I Wu (1):
+<ul>
+  <li>mesa: Add glDepthRangef and glClearDepthf to APIspec.xml.</li>
+</ul></p>
+
+<p>Chris Wilson (1):
+<ul>
+  <li>intel: Check for unsupported texture when finishing using as a render target</li>
+</ul></p>
+
+<p>Cyril Brulebois (1):
+<ul>
+  <li>Point to bugs.freedesktop.org rather than bugzilla.freedesktop.org</li>
+</ul></p>
+
+<p>Dave Airlie (2):
+<ul>
+  <li>radeon/r200: fix fbo-clearmipmap + gen-teximage</li>
+  <li>radeon: avoid segfault on 3D textures.</li>
+</ul></p>
+
+<p>Dimitry Andric (4):
+<ul>
+  <li>mesa: s/movzx/movzbl/</li>
+  <li>mesa: s/movzxw/movzwl/ in read_rgba_span_x86.S</li>
+  <li>glapi: adding @ char before type specifier in glapi_x86.S</li>
+  <li>glapi: add @GOTPCREL relocation type</li>
+</ul></p>
+
+<p>Eric Anholt (11):
+<ul>
+  <li>i965: Avoid double-negation of immediate values in the VS.</li>
+  <li>docs: Add a relnote for the Civ IV on i965.</li>
+  <li>i965/vs: When MOVing to produce ABS, strip negate of the operand.</li>
+  <li>glsl: Fix the lowering of variable array indexing to not lose write_masks.</li>
+  <li>intel: Make renderbuffer tiling choice match texture tiling choice.</li>
+  <li>glapi: Add entrypoints and enums for GL_ARB_ES2_compatibility.</li>
+  <li>mesa: Add extension enable bit for GL_ARB_ES2_compatibility.</li>
+  <li>mesa: Add actual support for glReleaseShaderCompiler from ES2.</li>
+  <li>mesa: Add support for glDepthRangef and glClearDepthf.</li>
+  <li>mesa: Add getters for ARB_ES2_compatibility MAX_*_VECTORS.</li>
+  <li>mesa: Add getter for GL_SHADER_COMPILER with ARB_ES2_compatibility.</li>
+</ul></p>
+
+<p>Ian Romanick (42):
+<ul>
+  <li>docs: Add 7.9.1 md5sums</li>
+  <li>glsl: Support the 'invariant(all)' pragma</li>
+  <li>glcpp: Generate an error for division by zero</li>
+  <li>glsl: Add version_string containing properly formatted GLSL version</li>
+  <li>glsl &amp; glcpp: Refresh autogenerated lexer and parser files.</li>
+  <li>glsl: Disallow 'in' and 'out' on globals in GLSL 1.20</li>
+  <li>glsl: Track variable usage, use that to enforce semantics</li>
+  <li>glsl: Allow 'in' and 'out' when 'layout' is also available</li>
+  <li>docs: Initial set of release notes for 7.9.2</li>
+  <li>mesa: bump version to 7.9.2-devel</li>
+  <li>docs: Update 7.9.2 release notes</li>
+  <li>i965: Make OPCODE_KIL_NV do its work in a temp, not the null reg!</li>
+  <li>glsl: Refresh autogenerated lexer and parser files.</li>
+  <li>glsl: Don't assert when the value returned by a function has no rvalue</li>
+  <li>linker: Set sizes for non-global arrays as well</li>
+  <li>linker: Propagate max_array_access while linking functions</li>
+  <li>docs: Update 7.9.2 release notes</li>
+  <li>Use C-style system headers in C++ code to avoid issues with std:: namespace</li>
+  <li>mesa: glGetUniform only returns a single element of an array</li>
+  <li>linker: Generate link errors when ES shaders are missing stages</li>
+  <li>mesa: Fix error checks in GetVertexAttrib functions</li>
+  <li>docs: Update 7.9.2 release notes</li>
+  <li>mesa: Remove unsupported OES extensions</li>
+  <li>glapi: Regenerate for GL_ARB_ES2_compatibility.</li>
+  <li>mesa: Connect glGetShaderPrecisionFormat into the dispatch table</li>
+  <li>i965: Set correct values for range/precision of fragment shader types</li>
+  <li>i915: Set correct values for range/precision of fragment shader types</li>
+  <li>intel: Fix typeos from 3d028024 and 790ff232</li>
+  <li>glsl: Ensure that all GLSL versions are supported in the stand-alone compiler</li>
+  <li>glsl: Reject shader versions not supported by the implementation</li>
+  <li>mesa: Initial size for secondary color array is 3</li>
+  <li>glcpp: Regenerate files from recent cherry picks</li>
+  <li>glsl: Finish out the reduce/reduce error fixes</li>
+  <li>glsl: Regenerate compiler files from cherry picks</li>
+  <li>linker: Fix off-by-one error implicit array sizing</li>
+  <li>i915: Only mark a register as available if all components are written</li>
+  <li>i915: Calculate partial result to temp register first</li>
+  <li>i915: Force lowering of all types of indirect array accesses in the FS</li>
+  <li>docs: Update 7.9.2 release notes for recent cherry picks</li>
+  <li>docs: Clean up bug fixes list</li>
+  <li>intel: Remove driver date and related bits from renderer string</li>
+  <li>mesa: set version string to 7.9.2 (final)</li>
+</ul></p>
+
+<p>Jian Zhao (1):
+<ul>
+  <li>mesa: fix an error in uniform arrays in row calculating.</li>
+</ul></p>
+
+<p>Julien Cristau (3):
+<ul>
+  <li>glx: fix request lengths</li>
+  <li>glx: fix GLXChangeDrawableAttributesSGIX request</li>
+  <li>glx: fix length of GLXGetFBConfigsSGIX</li>
+</ul></p>
+
+<p>Keith Packard (1):
+<ul>
+  <li>glsl: Eliminate reduce/reduce conflicts in glsl grammar</li>
+</ul></p>
+
+<p>Kenneth Graunke (12):
+<ul>
+  <li>glsl: Expose a public glsl_type::void_type const pointer.</li>
+  <li>glsl: Don't bother unsetting a destructor that was never set.</li>
+  <li>glsl, i965: Remove unnecessary talloc includes.</li>
+  <li>glcpp: Remove use of talloc reference counting.</li>
+  <li>ralloc: Add a fake implementation of ralloc based on talloc.</li>
+  <li>Convert everything from the talloc API to the ralloc API.</li>
+  <li>ralloc: a new MIT-licensed recursive memory allocator.</li>
+  <li>Remove talloc from the make and automake build systems.</li>
+  <li>Remove talloc from the SCons build system.</li>
+  <li>Remove the talloc sources from the Mesa repository.</li>
+  <li>glsl: Fix use of uninitialized values in _mesa_glsl_parse_state ctor.</li>
+  <li>glsl: Use reralloc instead of plain realloc.</li>
+</ul></p>
+
+<p>Marek Olšák (3):
+<ul>
+  <li>docs: fix messed up names with special characters in relnotes-7.9.1</li>
+  <li>mesa: fix texture3D mipmap generation for UNSIGNED_BYTE_3_3_2</li>
+  <li>st/dri: Track drawable context bindings</li>
+</ul></p>
+
+<p>Paulo Zanoni (1):
+<ul>
+  <li>dri_util: fail driCreateNewScreen if InitScreen is NULL</li>
+</ul></p>
+
+<p>Sam Hocevar (2):
+<ul>
+  <li>docs: add glsl info</li>
+  <li>docs: fix glsl_compiler name</li>
+</ul></p>
+
+<p>Vinson Lee (1):
+<ul>
+  <li>ralloc: Add missing va_end following va_copy.</li>
+</ul></p>
+
+<p>nobled (1):
+<ul>
+  <li>glx: Put null check before use</li>
+</ul></p>
+</p>
+
+</body>
+</html>

docs/relnotes.html

@@ -13,6 +13,12 @@ The release notes summarize what's new or changed in each Mesa release.
 </p>
 
 <UL>
+<LI><A HREF="relnotes-7.10.3.html">7.10.3 release notes</A>
+<LI><A HREF="relnotes-7.10.2.html">7.10.2 release notes</A>
+<LI><A HREF="relnotes-7.10.1.html">7.10.1 release notes</A>
+<LI><A HREF="relnotes-7.10.html">7.10 release notes</A>
+<LI><A HREF="relnotes-7.9.2.html">7.9.2 release notes</A>
+<LI><A HREF="relnotes-7.9.1.html">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>

docs/shading.html

@@ -167,7 +167,7 @@ Here's an example of using the compiler to compile a vertex shader and
 emit GL_ARB_vertex_program-style instructions:
 </p>
 <pre>
-    src/glsl/glslcompiler --dump-ast myshader.vert
+    src/glsl/glsl_compiler --dump-ast myshader.vert
 </pre>
 
 Options include

docs/sourcetree.html

@@ -23,6 +23,7 @@ each directory.
     <ul>
     <li><b>docs</b> - EGL documentation
     <li><b>drivers</b> - EGL drivers
+    <li><b>glsl</b> - the GLSL compiler
     <li><b>main</b> - main EGL library implementation.  This is where all
         the EGL API functions are implemented, like eglCreateContext().
     </ul>

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)

src/SConscript

@@ -4,7 +4,6 @@ SConscript('mapi/vgapi/SConscript')
 
 if env['platform'] == 'windows':
     SConscript('egl/main/SConscript')
-    SConscript('talloc/SConscript')
 
 SConscript('glsl/SConscript')
 SConscript('mapi/glapi/SConscript')

src/gallium/SConscript

@@ -52,7 +52,6 @@ if env['drm']:
 # Needed by some state trackers
 SConscript('winsys/sw/null/SConscript')
 
-SConscript('state_trackers/python/SConscript')
 if env['platform'] != 'embedded':
     SConscript('state_trackers/vega/SConscript')
 

src/gallium/auxiliary/cso_cache/cso_context.c

@@ -595,7 +595,7 @@ enum pipe_error cso_set_vertex_samplers(struct cso_context *ctx,
          error = temp;
    }
 
-   for ( ; i < ctx->nr_samplers; i++) {
+   for ( ; i < ctx->nr_vertex_samplers; i++) {
       temp = cso_single_vertex_sampler( ctx, i, NULL );
       if (temp != PIPE_OK)
          error = temp;

src/gallium/auxiliary/draw/draw_pipe_clip.c

@@ -163,6 +163,7 @@ static void interp( const struct clip_stage *clip,
  */
 static void emit_poly( struct draw_stage *stage,
 		       struct vertex_header **inlist,
+                       const boolean *edgeflags,
 		       unsigned n,
 		       const struct prim_header *origPrim)
 {
@@ -181,6 +182,9 @@ static void emit_poly( struct draw_stage *stage,
       edge_last   = DRAW_PIPE_EDGE_FLAG_1;
    }
 
+   if (!edgeflags[0])
+      edge_first = 0;
+
    /* later stages may need the determinant, but only the sign matters */
    header.det = origPrim->det;
    header.flags = DRAW_PIPE_RESET_STIPPLE | edge_first | edge_middle;
@@ -199,7 +203,11 @@ static void emit_poly( struct draw_stage *stage,
          header.v[2] = inlist[0];  /* the provoking vertex */
       }
 
-      if (i == n-1)
+      if (!edgeflags[i-1]) {
+         header.flags &= ~edge_middle;
+      }
+
+      if (i == n - 1 && edgeflags[i])
          header.flags |= edge_last;
 
       if (0) {
@@ -248,15 +256,33 @@ do_clip_tri( struct draw_stage *stage,
    unsigned tmpnr = 0;
    unsigned n = 3;
    unsigned i;
+   boolean aEdges[MAX_CLIPPED_VERTICES];
+   boolean bEdges[MAX_CLIPPED_VERTICES];
+   boolean *inEdges = aEdges;
+   boolean *outEdges = bEdges;
 
    inlist[0] = header->v[0];
    inlist[1] = header->v[1];
    inlist[2] = header->v[2];
 
+   /*
+    * Note: at this point we can't just use the per-vertex edge flags.
+    * We have to observe the edge flag bits set in header->flags which
+    * were set during primitive decomposition.  Put those flags into
+    * an edge flags array which parallels the vertex array.
+    * Later, in the 'unfilled' pipeline stage we'll draw the edge if both
+    * the header.flags bit is set AND the per-vertex edgeflag field is set.
+    */
+   inEdges[0] = !!(header->flags & DRAW_PIPE_EDGE_FLAG_0);
+   inEdges[1] = !!(header->flags & DRAW_PIPE_EDGE_FLAG_1);
+   inEdges[2] = !!(header->flags & DRAW_PIPE_EDGE_FLAG_2);
+
    while (clipmask && n >= 3) {
       const unsigned plane_idx = ffs(clipmask)-1;
+      const boolean is_user_clip_plane = plane_idx >= 6;
       const float *plane = clipper->plane[plane_idx];
       struct vertex_header *vert_prev = inlist[0];
+      boolean *edge_prev = &inEdges[0];
       float dp_prev = dot4( vert_prev->clip, plane );
       unsigned outcount = 0;
 
@@ -266,9 +292,11 @@ do_clip_tri( struct draw_stage *stage,
       if (n >= MAX_CLIPPED_VERTICES)
          return;
       inlist[n] = inlist[0]; /* prevent rotation of vertices */
+      inEdges[n] = inEdges[0];
 
       for (i = 1; i <= n; i++) {
 	 struct vertex_header *vert = inlist[i];
+         boolean *edge = &inEdges[i];
 
 	 float dp = dot4( vert->clip, plane );
 
@@ -276,11 +304,13 @@ do_clip_tri( struct draw_stage *stage,
             assert(outcount < MAX_CLIPPED_VERTICES);
             if (outcount >= MAX_CLIPPED_VERTICES)
                return;
+            outEdges[outcount] = *edge_prev;
 	    outlist[outcount++] = vert_prev;
 	 }
 
 	 if (DIFFERENT_SIGNS(dp, dp_prev)) {
 	    struct vertex_header *new_vert;
+            boolean *new_edge;
 
             assert(tmpnr < MAX_CLIPPED_VERTICES + 1);
             if (tmpnr >= MAX_CLIPPED_VERTICES + 1)
@@ -290,6 +320,8 @@ do_clip_tri( struct draw_stage *stage,
             assert(outcount < MAX_CLIPPED_VERTICES);
             if (outcount >= MAX_CLIPPED_VERTICES)
                return;
+
+            new_edge = &outEdges[outcount];
 	    outlist[outcount++] = new_vert;
 
 	    if (IS_NEGATIVE(dp)) {
@@ -299,10 +331,22 @@ do_clip_tri( struct draw_stage *stage,
 	       float t = dp / (dp - dp_prev);
 	       interp( clipper, new_vert, t, vert, vert_prev );
 	       
-	       /* Force edgeflag true in this case:
+	       /* Whether or not to set edge flag for the new vert depends
+                * on whether it's a user-defined clipping plane.  We're
+                * copying NVIDIA's behaviour here.
 		*/
-	       new_vert->edgeflag = 1;
-	    } else {
+               if (is_user_clip_plane) {
+                  /* we want to see an edge along the clip plane */
+                  *new_edge = TRUE;
+                  new_vert->edgeflag = TRUE;
+               }
+               else {
+                  /* we don't want to see an edge along the frustum clip plane */
+                  *new_edge = *edge_prev;
+                  new_vert->edgeflag = FALSE;
+               }
+	    }
+            else {
 	       /* Coming back in.
 		*/
 	       float t = dp_prev / (dp_prev - dp);
@@ -311,10 +355,12 @@ do_clip_tri( struct draw_stage *stage,
 	       /* Copy starting vert's edgeflag:
 		*/
 	       new_vert->edgeflag = vert_prev->edgeflag;
+               *new_edge = *edge_prev;
 	    }
 	 }
 
 	 vert_prev = vert;
+         edge_prev = edge;
 	 dp_prev = dp;
       }
 
@@ -325,6 +371,12 @@ do_clip_tri( struct draw_stage *stage,
 	 outlist = tmp;
 	 n = outcount;
       }
+      {
+         boolean *tmp = inEdges;
+         inEdges = outEdges;
+         outEdges = tmp;
+      }
+
    }
 
    /* If flat-shading, copy provoking vertex color to polygon vertex[0]
@@ -353,7 +405,7 @@ do_clip_tri( struct draw_stage *stage,
       
       /* Emit the polygon as triangles to the setup stage:
        */
-      emit_poly( stage, inlist, n, header );
+      emit_poly( stage, inlist, inEdges, n, header );
    }
 }
 

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;

src/gallium/auxiliary/draw/draw_vs.h

@@ -33,6 +33,7 @@
 
 #include "draw_context.h"
 #include "draw_private.h"
+#include "draw_vertex.h"
 
 
 struct draw_context;
@@ -48,7 +49,7 @@ struct draw_varient_input
 
 struct draw_varient_output
 {
-   enum pipe_format format;     /* output format */
+   enum attrib_emit format;     /* output format */
    unsigned vs_output:8;        /* which vertex shader output is this? */
    unsigned offset:24;          /* offset into output vertex */
 };

src/gallium/auxiliary/draw/draw_vs_aos_io.c

@@ -384,7 +384,7 @@ static void emit_store_R8G8B8A8_UNORM( struct aos_compilation *cp,
 static boolean emit_output( struct aos_compilation *cp,
                             struct x86_reg ptr,
                             struct x86_reg dataXMM, 
-                            unsigned format )
+                            enum attrib_emit format )
 {
    switch (format) {
    case EMIT_1F:
@@ -422,7 +422,7 @@ boolean aos_emit_outputs( struct aos_compilation *cp )
    unsigned i;
    
    for (i = 0; i < cp->vaos->base.key.nr_outputs; i++) {
-      unsigned format = cp->vaos->base.key.element[i].out.format;
+      enum attrib_emit format = cp->vaos->base.key.element[i].out.format;
       unsigned offset = cp->vaos->base.key.element[i].out.offset;
       unsigned vs_output = cp->vaos->base.key.element[i].out.vs_output;
 

src/gallium/auxiliary/draw/draw_vs_llvm.c

@@ -65,19 +65,7 @@ static void
 vs_llvm_delete( struct draw_vertex_shader *dvs )
 {
    struct llvm_vertex_shader *shader = llvm_vertex_shader(dvs);
-   struct pipe_fence_handle *fence = NULL;
    struct draw_llvm_variant_list_item *li;
-   struct pipe_context *pipe = dvs->draw->pipe;
-
-   /*
-    * XXX: This might be not neccessary at all.
-    */
-   pipe->flush(pipe, 0, &fence);
-   if (fence) {
-      pipe->screen->fence_finish(pipe->screen, fence, 0);
-      pipe->screen->fence_reference(pipe->screen, &fence, NULL);
-   }
-
 
    li = first_elem(&shader->variants);
    while(!at_end(&shader->variants, li)) {

src/gallium/auxiliary/gallivm/lp_bld_const.h

@@ -125,4 +125,22 @@ lp_build_const_float(struct gallivm_state *gallivm, float x)
 }
 
 
+/** Return constant-valued pointer to int */
+static INLINE LLVMValueRef
+lp_build_const_int_pointer(struct gallivm_state *gallivm, const void *ptr)
+{
+   LLVMTypeRef int_type;
+   LLVMValueRef v;
+
+   /* int type large enough to hold a pointer */
+   int_type = LLVMIntTypeInContext(gallivm->context, 8 * sizeof(void *));
+   v = LLVMConstInt(int_type, (unsigned long long) ptr, 0);
+   v = LLVMBuildIntToPtr(gallivm->builder, v,
+                         LLVMPointerType(int_type, 0),
+                         "cast int to ptr");
+   return v;
+}
+
+
+
 #endif /* !LP_BLD_CONST_H */

src/gallium/auxiliary/gallivm/lp_bld_format_aos.c

@@ -36,6 +36,7 @@
 #include "util/u_format.h"
 #include "util/u_memory.h"
 #include "util/u_math.h"
+#include "util/u_pointer.h"
 #include "util/u_string.h"
 
 #include "lp_bld_arit.h"
@@ -520,6 +521,7 @@ lp_build_fetch_rgba_aos(struct gallivm_state *gallivm,
       LLVMValueRef tmp_ptr;
       LLVMValueRef tmp;
       LLVMValueRef res;
+      LLVMValueRef callee;
       unsigned k;
 
       util_snprintf(name, sizeof name, "util_format_%s_fetch_rgba_8unorm",
@@ -535,6 +537,10 @@ lp_build_fetch_rgba_aos(struct gallivm_state *gallivm,
 
       function = LLVMGetNamedFunction(module, name);
       if (!function) {
+         /*
+          * Function to call looks like:
+          *   fetch(uint8_t *dst, const uint8_t *src, unsigned i, unsigned j)
+          */
          LLVMTypeRef ret_type;
          LLVMTypeRef arg_types[4];
          LLVMTypeRef function_type;
@@ -542,19 +548,26 @@ lp_build_fetch_rgba_aos(struct gallivm_state *gallivm,
          ret_type = LLVMVoidTypeInContext(gallivm->context);
          arg_types[0] = pi8t;
          arg_types[1] = pi8t;
-         arg_types[3] = arg_types[2] = LLVMIntTypeInContext(gallivm->context, sizeof(unsigned) * 8);
-         function_type = LLVMFunctionType(ret_type, arg_types, Elements(arg_types), 0);
+         arg_types[2] = i32t;
+         arg_types[3] = i32t;
+         function_type = LLVMFunctionType(ret_type, arg_types,
+                                          Elements(arg_types), 0);
          function = LLVMAddFunction(module, name, function_type);
 
          LLVMSetFunctionCallConv(function, LLVMCCallConv);
          LLVMSetLinkage(function, LLVMExternalLinkage);
 
          assert(LLVMIsDeclaration(function));
-
-         LLVMAddGlobalMapping(gallivm->engine, function,
-                              func_to_pointer((func_pointer)format_desc->fetch_rgba_8unorm));
       }
 
+      /* make const pointer for the C fetch_rgba_float function */
+      callee = lp_build_const_int_pointer(gallivm,
+         func_to_pointer((func_pointer) format_desc->fetch_rgba_8unorm));
+
+      /* cast the callee pointer to the function's type */
+      function = LLVMBuildBitCast(builder, callee,
+                                  LLVMTypeOf(function), "cast callee");
+
       tmp_ptr = lp_build_alloca(gallivm, i32t, "");
 
       res = LLVMGetUndef(LLVMVectorType(i32t, num_pixels));
@@ -619,10 +632,13 @@ lp_build_fetch_rgba_aos(struct gallivm_state *gallivm,
       LLVMTypeRef f32t = LLVMFloatTypeInContext(gallivm->context);
       LLVMTypeRef f32x4t = LLVMVectorType(f32t, 4);
       LLVMTypeRef pf32t = LLVMPointerType(f32t, 0);
+      LLVMTypeRef pi8t = LLVMPointerType(LLVMInt8TypeInContext(gallivm->context), 0);
+      LLVMTypeRef i32t = LLVMInt32TypeInContext(gallivm->context);
       LLVMValueRef function;
       LLVMValueRef tmp_ptr;
       LLVMValueRef tmps[LP_MAX_VECTOR_LENGTH/4];
       LLVMValueRef res;
+      LLVMValueRef callee;
       unsigned k;
 
       util_snprintf(name, sizeof name, "util_format_%s_fetch_rgba_float",
@@ -638,26 +654,42 @@ lp_build_fetch_rgba_aos(struct gallivm_state *gallivm,
 
       function = LLVMGetNamedFunction(module, name);
       if (!function) {
+         /*
+          * Function to call looks like:
+          *   fetch(float *dst, const uint8_t *src, unsigned i, unsigned j)
+          */
          LLVMTypeRef ret_type;
          LLVMTypeRef arg_types[4];
          LLVMTypeRef function_type;
 
          ret_type = LLVMVoidTypeInContext(gallivm->context);
          arg_types[0] = pf32t;
-         arg_types[1] = LLVMPointerType(LLVMInt8TypeInContext(gallivm->context), 0);
-         arg_types[3] = arg_types[2] = LLVMIntTypeInContext(gallivm->context, sizeof(unsigned) * 8);
-         function_type = LLVMFunctionType(ret_type, arg_types, Elements(arg_types), 0);
+         arg_types[1] = pi8t;
+         arg_types[2] = i32t;
+         arg_types[3] = i32t;
+         function_type = LLVMFunctionType(ret_type, arg_types,
+                                          Elements(arg_types), 0);
          function = LLVMAddFunction(module, name, function_type);
 
          LLVMSetFunctionCallConv(function, LLVMCCallConv);
          LLVMSetLinkage(function, LLVMExternalLinkage);
 
          assert(LLVMIsDeclaration(function));
-
-         LLVMAddGlobalMapping(gallivm->engine, function,
-                              func_to_pointer((func_pointer)format_desc->fetch_rgba_float));
       }
 
+      /* Note: we're using this casting here instead of LLVMAddGlobalMapping()
+       * to work around a bug in LLVM 2.6.
+       */
+
+      /* make const pointer for the C fetch_rgba_float function */
+      callee = lp_build_const_int_pointer(gallivm,
+         func_to_pointer((func_pointer) format_desc->fetch_rgba_float));
+
+      /* cast the callee pointer to the function's type */
+      function = LLVMBuildBitCast(builder, callee,
+                                  LLVMTypeOf(function), "cast callee");
+
+
       tmp_ptr = lp_build_alloca(gallivm, f32x4t, "");
 
       /*

src/gallium/auxiliary/gallivm/lp_bld_misc.cpp

@@ -133,6 +133,19 @@ lp_set_target_options(void)
 #endif
 #endif
 
+   /*
+    * LLVM revision 123367 switched the default stack alignment to 16 bytes on
+    * Linux (and several other Unices in later revisions), to match recent gcc
+    * versions.
+    *
+    * However our drivers can be loaded by old binary applications, still
+    * maintaining a 4 bytes stack alignment.  Therefore we must tell LLVM here
+    * to only assume a 4 bytes alignment for backwards compatibility.
+    */
+#if defined(PIPE_ARCH_X86)
+   llvm::StackAlignment = 4;
+#endif
+
 #if defined(DEBUG) || defined(PROFILE)
    llvm::NoFramePointerElim = true;
 #endif
@@ -144,6 +157,7 @@ lp_set_target_options(void)
    llvm::UnsafeFPMath = true;
 #endif
 
+#if HAVE_LLVM < 0x0209
    /*
     * LLVM will generate MMX instructions for vectors <= 64 bits, leading to
     * innefficient code, and in 32bit systems, to the corruption of the FPU
@@ -152,16 +166,27 @@ lp_set_target_options(void)
     * See also:
     * - http://llvm.org/bugs/show_bug.cgi?id=3287
     * - http://l4.me.uk/post/2009/06/07/llvm-wrinkle-3-configuration-what-configuration/
+    *
+    * The -disable-mmx global option can be specified only once  since we
+    * dynamically link against LLVM it will reside in a separate shared object,
+    * which may or not be delete when this shared object is, so we use the
+    * llvm::DisablePrettyStackTrace variable (which we set below and should
+    * reside in the same shared library) to determine whether the -disable-mmx
+    * option has been set or not.
+    *
+    * Thankfully this ugly hack is not necessary on LLVM 2.9 onwards.
     */
-   static boolean first = TRUE;
-   if (first) {
+   if (!llvm::DisablePrettyStackTrace) {
+      static boolean first = TRUE;
       static const char* options[] = {
          "prog",
          "-disable-mmx"
       };
+      assert(first);
       llvm::cl::ParseCommandLineOptions(2, const_cast<char**>(options));
       first = FALSE;
    }
+#endif
 
    /*
     * By default LLVM adds a signal handler to output a pretty stack trace.

src/gallium/auxiliary/tgsi/tgsi_ureg.c

@@ -71,7 +71,7 @@ struct ureg_tokens {
 #define UREG_MAX_SYSTEM_VALUE PIPE_MAX_ATTRIBS
 #define UREG_MAX_OUTPUT PIPE_MAX_ATTRIBS
 #define UREG_MAX_CONSTANT_RANGE 32
-#define UREG_MAX_IMMEDIATE 32
+#define UREG_MAX_IMMEDIATE 256
 #define UREG_MAX_TEMP 256
 #define UREG_MAX_ADDR 2
 #define UREG_MAX_PRED 1

src/gallium/drivers/llvmpipe/lp_fence.c

@@ -47,6 +47,9 @@ lp_fence_create(unsigned rank)
    static int fence_id;
    struct lp_fence *fence = CALLOC_STRUCT(lp_fence);
 
+   if (!fence)
+      return NULL;
+
    pipe_reference_init(&fence->reference, 1);
 
    pipe_mutex_init(fence->mutex);

src/gallium/drivers/llvmpipe/lp_setup.c

@@ -1064,6 +1064,8 @@ lp_setup_begin_query(struct lp_setup_context *setup,
 {
    /* init the query to its beginning state */
    assert(setup->active_query == NULL);
+
+   set_scene_state(setup, SETUP_ACTIVE, "begin_query");
    
    if (setup->scene) {
       if (!lp_scene_bin_everywhere(setup->scene,
@@ -1093,6 +1095,8 @@ lp_setup_end_query(struct lp_setup_context *setup, struct llvmpipe_query *pq)
 {
    union lp_rast_cmd_arg dummy = { 0 };
 
+   set_scene_state(setup, SETUP_ACTIVE, "end_query");
+
    assert(setup->active_query == pq);
    setup->active_query = NULL;
 

src/gallium/drivers/nv50/nv50_tgsi_to_nc.c

@@ -1130,7 +1130,7 @@ emit_fetch(struct bld_context *bld, const struct tgsi_full_instruction *insn,
    case TGSI_FILE_INPUT:
       res = bld_saved_input(bld, idx, swz);
       if (res && (insn->Instruction.Opcode != TGSI_OPCODE_TXP))
-         return res;
+         break;
 
       res = new_value(bld->pc, bld->ti->input_file, type);
       res->reg.id = bld->ti->input_map[idx][swz];

src/gallium/drivers/r300/r300_blit.c

@@ -31,14 +31,24 @@
 
 enum r300_blitter_op /* bitmask */
 {
-    R300_CLEAR         = 1,
-    R300_CLEAR_SURFACE = 2,
-    R300_COPY          = 4
+    R300_STOP_QUERY         = 1,
+    R300_SAVE_TEXTURES      = 2,
+    R300_SAVE_FRAMEBUFFER   = 4,
+    R300_IGNORE_RENDER_COND = 8,
+
+    R300_CLEAR         = R300_STOP_QUERY,
+
+    R300_CLEAR_SURFACE = R300_STOP_QUERY | R300_SAVE_FRAMEBUFFER,
+
+    R300_COPY          = R300_STOP_QUERY | R300_SAVE_FRAMEBUFFER |
+                         R300_SAVE_TEXTURES | R300_IGNORE_RENDER_COND,
+
+    R300_DECOMPRESS    = R300_STOP_QUERY | R300_IGNORE_RENDER_COND,
 };
 
 static void r300_blitter_begin(struct r300_context* r300, enum r300_blitter_op op)
 {
-    if (r300->query_current) {
+    if ((op & R300_STOP_QUERY) && r300->query_current) {
         r300->blitter_saved_query = r300->query_current;
         r300_stop_query(r300);
     }
@@ -58,10 +68,10 @@ static void r300_blitter_begin(struct r300_context* r300, enum r300_blitter_op o
     util_blitter_save_vertex_buffers(r300->blitter, r300->vertex_buffer_count,
                                      r300->vertex_buffer);
 
-    if (op & (R300_CLEAR_SURFACE | R300_COPY))
+    if (op & R300_SAVE_FRAMEBUFFER)
         util_blitter_save_framebuffer(r300->blitter, r300->fb_state.state);
 
-    if (op & R300_COPY) {
+    if (op & R300_SAVE_TEXTURES) {
         struct r300_textures_state* state =
             (struct r300_textures_state*)r300->textures_state.state;
 
@@ -73,6 +83,14 @@ static void r300_blitter_begin(struct r300_context* r300, enum r300_blitter_op o
             r300->blitter, state->sampler_view_count,
             (struct pipe_sampler_view**)state->sampler_views);
     }
+
+    if (op & R300_IGNORE_RENDER_COND) {
+        /* Save the flag. */
+        r300->blitter_saved_skip_rendering = r300->skip_rendering+1;
+        r300->skip_rendering = FALSE;
+    } else {
+        r300->blitter_saved_skip_rendering = 0;
+    }
 }
 
 static void r300_blitter_end(struct r300_context *r300)
@@ -81,6 +99,11 @@ static void r300_blitter_end(struct r300_context *r300)
         r300_resume_query(r300, r300->blitter_saved_query);
         r300->blitter_saved_query = NULL;
     }
+
+    if (r300->blitter_saved_skip_rendering) {
+        /* Restore the flag. */
+        r300->skip_rendering = r300->blitter_saved_skip_rendering-1;
+    }
 }
 
 static uint32_t r300_depth_clear_cb_value(enum pipe_format format,
@@ -320,7 +343,7 @@ void r300_flush_depth_stencil(struct pipe_context *pipe,
     dstsurf = pipe->create_surface(pipe, dst, &surf_tmpl);
 
     r300->z_decomp_rd = TRUE;
-    r300_blitter_begin(r300, R300_CLEAR_SURFACE);
+    r300_blitter_begin(r300, R300_DECOMPRESS);
     util_blitter_flush_depth_stencil(r300->blitter, dstsurf);
     r300_blitter_end(r300);
     r300->z_decomp_rd = FALSE;

src/gallium/drivers/r300/r300_context.c

@@ -35,7 +35,9 @@
 #include "r300_screen_buffer.h"
 #include "r300_winsys.h"
 
-#include <inttypes.h>
+#ifdef HAVE_LLVM
+#include "gallivm/lp_bld_init.h"
+#endif
 
 static void r300_update_num_contexts(struct r300_screen *r300screen,
                                      int diff)
@@ -103,9 +105,14 @@ static void r300_destroy_context(struct pipe_context* context)
 
     if (r300->blitter)
         util_blitter_destroy(r300->blitter);
-    if (r300->draw)
+    if (r300->draw) {
         draw_destroy(r300->draw);
 
+#ifdef HAVE_LLVM
+        gallivm_destroy(r300->gallivm);
+#endif
+    }
+
     if (r300->upload_vb)
         u_upload_destroy(r300->upload_vb);
     if (r300->upload_ib)
@@ -424,7 +431,12 @@ struct pipe_context* r300_create_context(struct pipe_screen* screen,
 
     if (!r300screen->caps.has_tcl) {
         /* Create a Draw. This is used for SW TCL. */
+#ifdef HAVE_LLVM
+        r300->gallivm = gallivm_create();
+        r300->draw = draw_create_gallivm(&r300->context, r300->gallivm);
+#else
         r300->draw = draw_create(&r300->context);
+#endif
         if (r300->draw == NULL)
             goto fail;
         /* Enable our renderer. */

src/gallium/drivers/r300/r300_context.h

@@ -459,6 +459,7 @@ struct r300_context {
     struct r300_screen *screen;
 
     /* Draw module. Used mostly for SW TCL. */
+    struct gallivm_state *gallivm;
     struct draw_context* draw;
     /* Vertex buffer for SW TCL. */
     struct pipe_resource* vbo;
@@ -583,6 +584,8 @@ struct r300_context {
     uint32_t zbuffer_bpp;
     /* Whether rendering is conditional and should be skipped. */
     boolean skip_rendering;
+    /* The flag above saved by blitter. */
+    unsigned char blitter_saved_skip_rendering;
     /* Point sprites texcoord index,  1 bit per texcoord */
     int sprite_coord_enable;
     /* Whether two-sided color selection is enabled (AKA light_twoside). */

src/gallium/drivers/r300/r300_emit.c

@@ -448,6 +448,23 @@ void r300_emit_fb_state(struct r300_context* r300, unsigned size, void* state)
                 OUT_CS_REG(R300_ZB_ZMASK_PITCH, 0);
             }
         }
+    /* Set up a dummy zbuffer. Otherwise occlusion queries won't work.
+     * Use the first colorbuffer, we will disable writes in the DSA state
+     * so as not to corrupt it. */
+    } else if (fb->nr_cbufs) {
+        surf = r300_surface(fb->cbufs[0]);
+        unsigned tiling =
+            r300->rws->get_value(r300->rws, R300_VID_SQUARE_TILING_SUPPORT) ?
+            R300_DEPTHMICROTILE_TILED_SQUARE :
+            R300_DEPTHMICROTILE_TILED;
+
+        OUT_CS_REG(R300_ZB_FORMAT, R300_DEPTHFORMAT_16BIT_INT_Z);
+
+        OUT_CS_REG_SEQ(R300_ZB_DEPTHOFFSET, 1);
+        OUT_CS_RELOC(surf->cs_buffer, 0, 0, surf->domain);
+
+        OUT_CS_REG_SEQ(R300_ZB_DEPTHPITCH, 1);
+        OUT_CS_RELOC(surf->cs_buffer, 4 | tiling, 0, surf->domain);
     }
 
     END_CS;
@@ -494,6 +511,11 @@ void r300_emit_fb_state_pipelined(struct r300_context *r300,
     for (i = 0; i < fb->nr_cbufs; i++) {
         OUT_CS(r300_surface(fb->cbufs[i])->format);
     }
+    for (; i < 1; i++) {
+        OUT_CS(R300_US_OUT_FMT_C4_8 |
+               R300_C0_SEL_B | R300_C1_SEL_G |
+               R300_C2_SEL_R | R300_C3_SEL_A);
+    }
     for (; i < 4; i++) {
         OUT_CS(R300_US_OUT_FMT_UNUSED);
     }

src/gallium/drivers/r300/r300_render.c

@@ -566,7 +566,12 @@ static void r300_draw_range_elements(struct pipe_context* pipe,
 				minIndex, maxIndex, mode, start, count);
     } else {
         do {
-            short_count = MIN2(count, 65534);
+            /* The maximum must be divisible by 4 and 3,
+             * so that quad and triangle lists are split correctly.
+             *
+             * Strips, loops, and fans won't work. */
+            short_count = MIN2(count, 65532);
+
             r300_emit_draw_elements(r300, indexBuffer, indexSize,
                                      minIndex, maxIndex,
                                      mode, start, short_count);
@@ -614,7 +619,11 @@ static void r300_draw_arrays(struct pipe_context* pipe, unsigned mode,
             r300_emit_draw_arrays(r300, mode, count);
         } else {
             do {
-                short_count = MIN2(count, 65535);
+                /* The maximum must be divisible by 4 and 3,
+                 * so that quad and triangle lists are split correctly.
+                 *
+                 * Strips, loops, and fans won't work. */
+                short_count = MIN2(count, 65532);
                 r300_emit_draw_arrays(r300, mode, short_count);
 
                 start += short_count;
@@ -1095,6 +1104,9 @@ static void r300_blitter_draw_rectangle(struct blitter_context *blitter,
     const float zeros[4] = {0, 0, 0, 0};
     CS_LOCALS(r300);
 
+    if (r300->skip_rendering)
+        return;
+
     r300->context.set_vertex_buffers(&r300->context, 0, NULL);
 
     if (type == UTIL_BLITTER_ATTRIB_TEXCOORD)

src/gallium/drivers/r300/r300_screen.c

@@ -34,6 +34,10 @@
 
 #include "draw/draw_context.h"
 
+#ifdef HAVE_LLVM
+#include "gallivm/lp_bld_init.h"
+#endif
+
 /* Return the identifier behind whom the brave coders responsible for this
  * amalgamation of code, sweat, and duct tape, routinely obscure their names.
  *
@@ -209,7 +213,7 @@ static int r300_get_shader_param(struct pipe_screen *pscreen, unsigned shader, e
         case PIPE_SHADER_CAP_MAX_PREDS:
             return is_r500 ? 1 : 0;
         case PIPE_SHADER_CAP_TGSI_CONT_SUPPORTED:
-            return 1;
+            return 0;
         case PIPE_SHADER_CAP_INDIRECT_INPUT_ADDR:
         case PIPE_SHADER_CAP_INDIRECT_OUTPUT_ADDR:
         case PIPE_SHADER_CAP_INDIRECT_TEMP_ADDR:
@@ -247,7 +251,7 @@ static int r300_get_shader_param(struct pipe_screen *pscreen, unsigned shader, e
         case PIPE_SHADER_CAP_MAX_PREDS:
             return is_r500 ? 4 : 0; /* XXX guessed. */
         case PIPE_SHADER_CAP_TGSI_CONT_SUPPORTED:
-            return 1;
+            return 0;
         case PIPE_SHADER_CAP_INDIRECT_INPUT_ADDR:
         case PIPE_SHADER_CAP_INDIRECT_OUTPUT_ADDR:
         case PIPE_SHADER_CAP_INDIRECT_TEMP_ADDR:
@@ -484,5 +488,9 @@ struct pipe_screen* r300_screen_create(struct r300_winsys_screen *rws)
 
     util_format_s3tc_init();
 
+#ifdef HAVE_LLVM
+    lp_build_init();
+#endif
+
     return &r300screen->screen;
 }

src/gallium/drivers/r300/r300_screen_buffer.c

@@ -119,6 +119,7 @@ int r300_upload_user_buffers(struct r300_context *r300)
             vb->buffer = upload_buffer;
             vb->buffer_offset = upload_offset;
             r300->validate_buffers = TRUE;
+            r300->aos_dirty = TRUE;
         }
     }
     return ret;

src/gallium/drivers/r300/r300_state.c

@@ -485,6 +485,10 @@ static void*
         dsa->z_stencil_control |=
             (r300_translate_depth_stencil_function(state->depth.func) <<
                 R300_Z_FUNC_SHIFT);
+    } else {
+        /* We must enable depth test, otherwise occlusion queries won't work. */
+        dsa->z_buffer_control |= R300_Z_ENABLE;
+        dsa->z_stencil_control |= R300_ZS_ALWAYS;
     }
 
     /* Stencil buffer setup. */
@@ -554,11 +558,13 @@ static void*
     OUT_CB_REG(R500_ZB_STENCILREFMASK_BF, dsa->stencil_ref_bf);
     END_CB;
 
+    /* We must enable depth test, otherwise occlusion queries won't work.
+     * We setup a dummy zbuffer to silent the CS checker, see emit_fb_state. */
     BEGIN_CB(dsa->cb_no_readwrite, 8);
     OUT_CB_REG(R300_FG_ALPHA_FUNC, dsa->alpha_function);
     OUT_CB_REG_SEQ(R300_ZB_CNTL, 3);
-    OUT_CB(0);
-    OUT_CB(0);
+    OUT_CB(R300_Z_ENABLE);
+    OUT_CB(R300_ZS_ALWAYS);
     OUT_CB(0);
     OUT_CB_REG(R500_ZB_STENCILREFMASK_BF, 0);
     END_CB;
@@ -699,12 +705,14 @@ void r300_mark_fb_state_dirty(struct r300_context *r300,
     /* Now compute the fb_state atom size. */
     r300->fb_state.size = 2 + (8 * state->nr_cbufs);
 
-    if (r300->cbzb_clear)
+    if (r300->cbzb_clear) {
         r300->fb_state.size += 10;
-    else if (state->zsbuf) {
+    } else if (state->zsbuf) {
         r300->fb_state.size += 10;
         if (can_hyperz)
             r300->fb_state.size += r300->screen->caps.hiz_ram ? 8 : 4;
+    } else if (state->nr_cbufs) {
+        r300->fb_state.size += 10;
     }
 
     /* The size of the rest of atoms stays the same. */
@@ -1298,29 +1306,27 @@ static void r300_set_fragment_sampler_views(struct pipe_context* pipe,
     }
 
     for (i = 0; i < count; i++) {
-        if (&state->sampler_views[i]->base != views[i]) {
-            pipe_sampler_view_reference(
-                    (struct pipe_sampler_view**)&state->sampler_views[i],
-                    views[i]);
+        pipe_sampler_view_reference(
+                (struct pipe_sampler_view**)&state->sampler_views[i],
+                views[i]);
 
-            if (!views[i]) {
-                continue;
-            }
-
-            /* A new sampler view (= texture)... */
-            dirty_tex = TRUE;
-
-            /* Set the texrect factor in the fragment shader.
-             * Needed for RECT and NPOT fallback. */
-            texture = r300_texture(views[i]->texture);
-            if (texture->desc.is_npot) {
-                r300_mark_atom_dirty(r300, &r300->fs_rc_constant_state);
-            }
-
-            state->sampler_views[i]->texcache_region =
-                r300_assign_texture_cache_region(view_index, real_num_views);
-            view_index++;
+        if (!views[i]) {
+            continue;
         }
+
+        /* A new sampler view (= texture)... */
+        dirty_tex = TRUE;
+
+        /* Set the texrect factor in the fragment shader.
+             * Needed for RECT and NPOT fallback. */
+        texture = r300_texture(views[i]->texture);
+        if (texture->desc.is_npot) {
+            r300_mark_atom_dirty(r300, &r300->fs_rc_constant_state);
+        }
+
+        state->sampler_views[i]->texcache_region =
+                r300_assign_texture_cache_region(view_index, real_num_views);
+        view_index++;
     }
 
     for (i = count; i < tex_units; i++) {
@@ -1496,14 +1502,14 @@ static void r300_set_vertex_buffers(struct pipe_context* pipe,
                 any_user_buffer = TRUE;
             }
 
+            /* The stride of zero means we will be fetching only the first
+             * vertex, so don't care about max_index. */
+            if (!vbo->stride)
+                continue;
+
             if (vbo->max_index == ~0) {
-                /* if no VBO stride then only one vertex value so max index is 1 */
-                /* should think about converting to VS constants like svga does */
-                if (!vbo->stride)
-                    vbo->max_index = 1;
-                else
-                    vbo->max_index =
-                             (vbo->buffer->width0 - vbo->buffer_offset) / vbo->stride;
+                vbo->max_index =
+                        (vbo->buffer->width0 - vbo->buffer_offset) / vbo->stride;
             }
 
             max_index = MIN2(vbo->max_index, max_index);

src/gallium/drivers/r300/r300_state_derived.c

@@ -782,6 +782,12 @@ static void r300_merge_textures_and_samplers(struct r300_context* r300)
                 texstate->filter0 |= R300_TX_WRAP_T(R300_TX_CLAMP_TO_EDGE);
             }
 
+            /* The hardware doesn't like CLAMP and CLAMP_TO_BORDER
+             * for the 3rd coordinate if the texture isn't 3D. */
+            if (tex->desc.b.b.target != PIPE_TEXTURE_3D) {
+                texstate->filter0 &= ~R300_TX_WRAP_R_MASK;
+            }
+
             if (tex->desc.is_npot) {
                 /* NPOT textures don't support mip filter, unfortunately.
                  * This prevents incorrect rendering. */

src/gallium/drivers/r300/r300_texture.c

@@ -899,7 +899,7 @@ struct pipe_surface* r300_create_surface(struct pipe_context * ctx,
                                                tex->desc.b.b.nr_samples,
                                                tex->desc.microtile,
                                                tex->desc.macrotile[level],
-                                               DIM_HEIGHT);
+                                               DIM_HEIGHT, 0);
 
         surface->cbzb_height = align((surface->base.height + 1) / 2,
                                      tile_height);

src/gallium/drivers/r300/r300_texture_desc.c

@@ -34,7 +34,7 @@ unsigned r300_get_pixel_alignment(enum pipe_format format,
                                   unsigned num_samples,
                                   enum r300_buffer_tiling microtile,
                                   enum r300_buffer_tiling macrotile,
-                                  enum r300_dim dim)
+                                  enum r300_dim dim, boolean is_rs690)
 {
     static const unsigned table[2][5][3][2] =
     {
@@ -57,6 +57,7 @@ unsigned r300_get_pixel_alignment(enum pipe_format format,
             {{ 16, 8}, { 0,  0}, { 0,  0}}  /* 128 bits per pixel */
         }
     };
+
     static const unsigned aa_block[2] = {4, 8};
     unsigned tile = 0;
     unsigned pixsize = util_format_get_blocksize(format);
@@ -74,6 +75,14 @@ unsigned r300_get_pixel_alignment(enum pipe_format format,
     } else {
         /* Standard alignment. */
         tile = table[macrotile][util_logbase2(pixsize)][microtile][dim];
+        if (macrotile == 0 && is_rs690 && dim == DIM_WIDTH) {
+            int align;
+            int h_tile;
+            h_tile = table[macrotile][util_logbase2(pixsize)][microtile][DIM_HEIGHT];
+            align = 64 / (pixsize * h_tile);
+            if (tile < align)
+                tile = align;
+        }
     }
 
     assert(tile);
@@ -89,7 +98,7 @@ static boolean r300_texture_macro_switch(struct r300_texture_desc *desc,
     unsigned tile, texdim;
 
     tile = r300_get_pixel_alignment(desc->b.b.format, desc->b.b.nr_samples,
-                                    desc->microtile, R300_BUFFER_TILED, dim);
+                                    desc->microtile, R300_BUFFER_TILED, dim, 0);
     if (dim == DIM_WIDTH) {
         texdim = u_minify(desc->width0, level);
     } else {
@@ -113,6 +122,9 @@ static unsigned r300_texture_get_stride(struct r300_screen *screen,
                                         unsigned level)
 {
     unsigned tile_width, width, stride;
+    boolean is_rs690 = (screen->caps.family == CHIP_FAMILY_RS600 ||
+                        screen->caps.family == CHIP_FAMILY_RS690 ||
+                        screen->caps.family == CHIP_FAMILY_RS740);
 
     if (desc->stride_in_bytes_override)
         return desc->stride_in_bytes_override;
@@ -131,38 +143,14 @@ static unsigned r300_texture_get_stride(struct r300_screen *screen,
                                               desc->b.b.nr_samples,
                                               desc->microtile,
                                               desc->macrotile[level],
-                                              DIM_WIDTH);
+                                              DIM_WIDTH, is_rs690);
         width = align(width, tile_width);
 
         stride = util_format_get_stride(desc->b.b.format, width);
-
-        /* Some IGPs need a minimum stride of 64 bytes, hmm... */
-        if (!desc->macrotile[level] &&
-            (screen->caps.family == CHIP_FAMILY_RS600 ||
-             screen->caps.family == CHIP_FAMILY_RS690 ||
-             screen->caps.family == CHIP_FAMILY_RS740)) {
-            unsigned min_stride;
-
-            if (desc->microtile) {
-                unsigned tile_height =
-                        r300_get_pixel_alignment(desc->b.b.format,
-                                                 desc->b.b.nr_samples,
-                                                 desc->microtile,
-                                                 desc->macrotile[level],
-                                                 DIM_HEIGHT);
-
-                min_stride = 64 / tile_height;
-            } else {
-                min_stride = 64;
-            }
-
-            return stride < min_stride ? min_stride : stride;
-        }
-
         /* The alignment to 32 bytes is sort of implied by the layout... */
         return stride;
     } else {
-        return align(util_format_get_stride(desc->b.b.format, width), 32);
+        return align(util_format_get_stride(desc->b.b.format, width), is_rs690 ? 64 : 32);
     }
 }
 
@@ -179,7 +167,7 @@ static unsigned r300_texture_get_nblocksy(struct r300_texture_desc *desc,
                                                desc->b.b.nr_samples,
                                                desc->microtile,
                                                desc->macrotile[level],
-                                               DIM_HEIGHT);
+                                               DIM_HEIGHT, 0);
         height = align(height, tile_height);
 
         /* This is needed for the kernel checker, unfortunately. */

src/gallium/drivers/r300/r300_texture_desc.h

@@ -41,7 +41,7 @@ unsigned r300_get_pixel_alignment(enum pipe_format format,
                                   unsigned num_samples,
                                   enum r300_buffer_tiling microtile,
                                   enum r300_buffer_tiling macrotile,
-                                  enum r300_dim dim);
+                                  enum r300_dim dim, boolean is_rs690);
 
 boolean r300_texture_desc_init(struct r300_screen *rscreen,
                                struct r300_texture_desc *desc,

src/gallium/drivers/r600/evergreen_state.c

@@ -1069,12 +1069,76 @@ void evergreen_init_config(struct r600_pipe_context *rctx)
 		num_hs_stack_entries = 42;
 		num_ls_stack_entries = 42;
 		break;
+	case CHIP_BARTS:
+		num_ps_gprs = 93;
+		num_vs_gprs = 46;
+		num_temp_gprs = 4;
+		num_gs_gprs = 31;
+		num_es_gprs = 31;
+		num_hs_gprs = 23;
+		num_ls_gprs = 23;
+		num_ps_threads = 128;
+		num_vs_threads = 20;
+		num_gs_threads = 20;
+		num_es_threads = 20;
+		num_hs_threads = 20;
+		num_ls_threads = 20;
+		num_ps_stack_entries = 85;
+		num_vs_stack_entries = 85;
+		num_gs_stack_entries = 85;
+		num_es_stack_entries = 85;
+		num_hs_stack_entries = 85;
+		num_ls_stack_entries = 85;
+		break;
+	case CHIP_TURKS:
+		num_ps_gprs = 93;
+		num_vs_gprs = 46;
+		num_temp_gprs = 4;
+		num_gs_gprs = 31;
+		num_es_gprs = 31;
+		num_hs_gprs = 23;
+		num_ls_gprs = 23;
+		num_ps_threads = 128;
+		num_vs_threads = 20;
+		num_gs_threads = 20;
+		num_es_threads = 20;
+		num_hs_threads = 20;
+		num_ls_threads = 20;
+		num_ps_stack_entries = 42;
+		num_vs_stack_entries = 42;
+		num_gs_stack_entries = 42;
+		num_es_stack_entries = 42;
+		num_hs_stack_entries = 42;
+		num_ls_stack_entries = 42;
+		break;
+	case CHIP_CAICOS:
+		num_ps_gprs = 93;
+		num_vs_gprs = 46;
+		num_temp_gprs = 4;
+		num_gs_gprs = 31;
+		num_es_gprs = 31;
+		num_hs_gprs = 23;
+		num_ls_gprs = 23;
+		num_ps_threads = 128;
+		num_vs_threads = 10;
+		num_gs_threads = 10;
+		num_es_threads = 10;
+		num_hs_threads = 10;
+		num_ls_threads = 10;
+		num_ps_stack_entries = 42;
+		num_vs_stack_entries = 42;
+		num_gs_stack_entries = 42;
+		num_es_stack_entries = 42;
+		num_hs_stack_entries = 42;
+		num_ls_stack_entries = 42;
+		break;
 	}
 
 	tmp = 0x00000000;
 	switch (family) {
 	case CHIP_CEDAR:
 	case CHIP_PALM:
+	case CHIP_CAICOS:
 		break;
 	default:
 		tmp |= S_008C00_VC_ENABLE(1);
@@ -1295,11 +1359,6 @@ void evergreen_vertex_buffer_update(struct r600_pipe_context *rctx)
 	if (rctx->vertex_elements == NULL || !rctx->nvertex_buffer)
 		return;
 
-	/* delete previous translated vertex elements */
-	if (rctx->tran.new_velems) {
-		r600_end_vertex_translate(rctx);
-	}
-
 	if (rctx->vertex_elements->incompatible_layout) {
 		/* translate rebind new vertex elements so
 		 * return once translated
@@ -1332,16 +1391,16 @@ void evergreen_vertex_buffer_update(struct r600_pipe_context *rctx)
 			vbuffer_index = rctx->vertex_elements->elements[i].vertex_buffer_index;
 			vertex_buffer = &rctx->vertex_buffer[vbuffer_index];
 			rbuffer = (struct r600_resource*)vertex_buffer->buffer;
-			offset = rctx->vertex_elements->vbuffer_offset[i] +
-				vertex_buffer->buffer_offset +
-				r600_bo_offset(rbuffer->bo);
+			offset = rctx->vertex_elements->vbuffer_offset[i];
 		} else {
 			/* bind vertex buffer once */
 			vertex_buffer = &rctx->vertex_buffer[i];
 			rbuffer = (struct r600_resource*)vertex_buffer->buffer;
-			offset = vertex_buffer->buffer_offset +
-				r600_bo_offset(rbuffer->bo);
+			offset = 0;
 		}
+		if (vertex_buffer == NULL || rbuffer == NULL)
+			continue;
+		offset += vertex_buffer->buffer_offset + r600_bo_offset(rbuffer->bo);
 
 		r600_pipe_state_add_reg(rstate, R_030000_RESOURCE0_WORD0,
 					offset, 0xFFFFFFFF, rbuffer->bo);

src/gallium/drivers/r600/r600.h

@@ -92,6 +92,9 @@ enum radeon_family {
 	CHIP_CYPRESS,
 	CHIP_HEMLOCK,
 	CHIP_PALM,
+	CHIP_BARTS,
+	CHIP_TURKS,
+	CHIP_CAICOS,
 	CHIP_LAST,
 };
 
@@ -245,10 +248,7 @@ struct r600_context {
 	u32			*pm4;
 	struct list_head	query_list;
 	unsigned		num_query_running;
-	unsigned		fence;
 	struct list_head	fenced_bo;
-	unsigned		*cfence;
-	struct r600_bo		*fence_bo;
 };
 
 struct r600_draw {

src/gallium/drivers/r600/r600_asm.c

@@ -155,6 +155,9 @@ int r600_bc_init(struct r600_bc *bc, enum radeon_family family)
 	case CHIP_CYPRESS:
 	case CHIP_HEMLOCK:
 	case CHIP_PALM:
+	case CHIP_BARTS:
+	case CHIP_TURKS:
+	case CHIP_CAICOS:
 		bc->chiprev = CHIPREV_EVERGREEN;
 		break;
 	default:
@@ -470,7 +473,22 @@ int r600_bc_add_alu_type(struct r600_bc *bc, const struct r600_bc_alu *alu, int
 	bc->cf_last->ndw += 2;
 	bc->ndw += 2;
 
-	bc->cf_last->kcache0_mode = 2;
+	/* The following configuration provides 64 128-bit constants.
+	 * Each cacheline holds 16 128-bit constants and each
+	 * kcache can lock 2 cachelines and there are 2 kcaches per
+	 * ALU clause for a max of 64 constants.
+	 * For supporting more than 64 constants, the code needs
+	 * to be broken down into multiple ALU clauses.
+	 */
+	/* select the constant buffer (0-15) for each kcache */
+	bc->cf_last->kcache0_bank = 0;
+	bc->cf_last->kcache1_bank = 0;
+	/* lock 2 cachelines per kcache; 4 total */
+	bc->cf_last->kcache0_mode = V_SQ_CF_KCACHE_LOCK_2;
+	bc->cf_last->kcache1_mode = V_SQ_CF_KCACHE_LOCK_2;
+	/* set the cacheline offsets for each kcache */
+	bc->cf_last->kcache0_addr = 0;
+	bc->cf_last->kcache1_addr = 2;
 
 	/* process cur ALU instructions for bank swizzle */
 	if (alu->last) {

src/gallium/drivers/r600/r600_buffer.c

@@ -103,7 +103,7 @@ static void r600_buffer_destroy(struct pipe_screen *screen,
 {
 	struct r600_resource_buffer *rbuffer = r600_buffer(buf);
 
-	if (!rbuffer->uploaded && rbuffer->r.bo) {
+	if (rbuffer->r.bo) {
 		r600_bo_reference((struct radeon*)screen->winsys, &rbuffer->r.bo, NULL);
 	}
 	rbuffer->r.bo = NULL;

src/gallium/drivers/r600/r600_pipe.c

@@ -148,6 +148,9 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
 	case CHIP_CYPRESS:
 	case CHIP_HEMLOCK:
 	case CHIP_PALM:
+	case CHIP_BARTS:
+	case CHIP_TURKS:
+	case CHIP_CAICOS:
 		rctx->context.draw_vbo = evergreen_draw;
 		evergreen_init_state_functions(rctx);
 		if (evergreen_context_init(&rctx->ctx, rctx->radeon)) {
@@ -232,6 +235,9 @@ static const char *r600_get_family_name(enum radeon_family family)
 	case CHIP_CYPRESS: return "AMD CYPRESS";
 	case CHIP_HEMLOCK: return "AMD HEMLOCK";
 	case CHIP_PALM: return "AMD PALM";
+	case CHIP_BARTS: return "AMD BARTS";
+	case CHIP_TURKS: return "AMD TURKS";
+	case CHIP_CAICOS: return "AMD CAICOS";
 	default: return "AMD unknown";
 	}
 }

src/gallium/drivers/r600/r600_shader.c

@@ -589,6 +589,8 @@ int r600_shader_from_tgsi(const struct tgsi_token *tokens, struct r600_shader *s
 			if (r)
 				goto out_err;
 			break;
+		case TGSI_TOKEN_TYPE_PROPERTY:
+			break;
 		default:
 			R600_ERR("unsupported token type %d\n", ctx.parse.FullToken.Token.Type);
 			r = -EINVAL;
@@ -1451,7 +1453,7 @@ static int tgsi_pow(struct r600_shader_ctx *ctx)
 		return r;
 	/* b * LOG2(a) */
 	memset(&alu, 0, sizeof(struct r600_bc_alu));
-	alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MUL_IEEE);
+	alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MUL);
 	r = tgsi_src(ctx, &inst->Src[1], &alu.src[0]);
 	if (r)
 		return r;

src/gallium/drivers/r600/r600_sq.h

@@ -74,6 +74,10 @@
 #define   S_SQ_CF_ALU_WORD0_KCACHE_MODE0(x)                          (((x) & 0x3) << 30)
 #define   G_SQ_CF_ALU_WORD0_KCACHE_MODE0(x)                          (((x) >> 30) & 0x3)
 #define   C_SQ_CF_ALU_WORD0_KCACHE_MODE0                             0x3FFFFFFF
+#define     V_SQ_CF_KCACHE_NOP                                       0x00000000
+#define     V_SQ_CF_KCACHE_LOCK_1                                    0x00000001
+#define     V_SQ_CF_KCACHE_LOCK_2                                    0x00000002
+#define     V_SQ_CF_KCACHE_LOCK_LOOP_INDEX                           0x00000003
 #define P_SQ_CF_ALU_WORD1
 #define   S_SQ_CF_ALU_WORD1_KCACHE_MODE1(x)                          (((x) & 0x3) << 0)
 #define   G_SQ_CF_ALU_WORD1_KCACHE_MODE1(x)                          (((x) >> 0) & 0x3)

src/gallium/drivers/r600/r600_state.c

@@ -135,11 +135,6 @@ void r600_vertex_buffer_update(struct r600_pipe_context *rctx)
 	if (rctx->vertex_elements == NULL || !rctx->nvertex_buffer)
 		return;
 
-	/* delete previous translated vertex elements */
-	if (rctx->tran.new_velems) {
-		r600_end_vertex_translate(rctx);
-	}
-
 	if (rctx->vertex_elements->incompatible_layout) {
 		/* translate rebind new vertex elements so
 		 * return once translated
@@ -172,16 +167,16 @@ void r600_vertex_buffer_update(struct r600_pipe_context *rctx)
 			vbuffer_index = rctx->vertex_elements->elements[i].vertex_buffer_index;
 			vertex_buffer = &rctx->vertex_buffer[vbuffer_index];
 			rbuffer = (struct r600_resource*)vertex_buffer->buffer;
-			offset = rctx->vertex_elements->vbuffer_offset[i] +
-				vertex_buffer->buffer_offset +
-				r600_bo_offset(rbuffer->bo);
+			offset = rctx->vertex_elements->vbuffer_offset[i];
 		} else {
 			/* bind vertex buffer once */
 			vertex_buffer = &rctx->vertex_buffer[i];
 			rbuffer = (struct r600_resource*)vertex_buffer->buffer;
-			offset = vertex_buffer->buffer_offset +
-				r600_bo_offset(rbuffer->bo);
+			offset = 0;
 		}
+		if (vertex_buffer == NULL || rbuffer == NULL)
+			continue;
+		offset += vertex_buffer->buffer_offset + r600_bo_offset(rbuffer->bo);
 
 		r600_pipe_state_add_reg(rstate, R_038000_RESOURCE0_WORD0,
 					offset, 0xFFFFFFFF, rbuffer->bo);
@@ -280,7 +275,6 @@ void r600_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info)
 {
 	struct r600_pipe_context *rctx = (struct r600_pipe_context *)ctx;
 	struct r600_drawl draw;
-	boolean translate = FALSE;
 
 	memset(&draw, 0, sizeof(struct r600_drawl));
 	draw.ctx = ctx;
@@ -312,9 +306,6 @@ void r600_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info)
 	}
 	r600_draw_common(&draw);
 
-	if (translate)
-		r600_end_vertex_translate(rctx);
-
 	pipe_resource_reference(&draw.index_buffer, NULL);
 }
 

src/gallium/drivers/r600/r600_state_common.c

@@ -119,6 +119,11 @@ void r600_bind_vertex_elements(struct pipe_context *ctx, void *state)
 	struct r600_pipe_context *rctx = (struct r600_pipe_context *)ctx;
 	struct r600_vertex_element *v = (struct r600_vertex_element*)state;
 
+	/* delete previous translated vertex elements */
+	if (rctx->tran.new_velems) {
+		r600_end_vertex_translate(rctx);
+	}
+
 	rctx->vertex_elements = v;
 	if (v) {
 		rctx->states[v->rstate.id] = &v->rstate;
@@ -174,8 +179,16 @@ void r600_set_vertex_buffers(struct pipe_context *ctx, unsigned count,
 	struct pipe_vertex_buffer *vbo;
 	unsigned max_index = (unsigned)-1;
 
-	for (int i = 0; i < rctx->nvertex_buffer; i++) {
-		pipe_resource_reference(&rctx->vertex_buffer[i].buffer, NULL);
+	if (rctx->family >= CHIP_CEDAR) {
+		for (int i = 0; i < rctx->nvertex_buffer; i++) {
+			pipe_resource_reference(&rctx->vertex_buffer[i].buffer, NULL);
+			evergreen_context_pipe_state_set_fs_resource(&rctx->ctx, NULL, i);
+		}
+	} else {
+		for (int i = 0; i < rctx->nvertex_buffer; i++) {
+			pipe_resource_reference(&rctx->vertex_buffer[i].buffer, NULL);
+			r600_context_pipe_state_set_fs_resource(&rctx->ctx, NULL, i);
+		}
 	}
 	memcpy(rctx->vertex_buffer, buffers, sizeof(struct pipe_vertex_buffer) * count);
 
@@ -183,15 +196,19 @@ void r600_set_vertex_buffers(struct pipe_context *ctx, unsigned count,
 		vbo = (struct pipe_vertex_buffer*)&buffers[i];
 
 		rctx->vertex_buffer[i].buffer = NULL;
+		if (buffers[i].buffer == NULL)
+			continue;
 		if (r600_buffer_is_user_buffer(buffers[i].buffer))
 			rctx->any_user_vbs = TRUE;
 		pipe_resource_reference(&rctx->vertex_buffer[i].buffer, buffers[i].buffer);
 
+		/* The stride of zero means we will be fetching only the first
+		 * vertex, so don't care about max_index. */
+		if (!vbo->stride)
+			continue;
+
 		if (vbo->max_index == ~0) {
-			if (!vbo->stride)
-				vbo->max_index = 1;
-			else
-				vbo->max_index = (vbo->buffer->width0 - vbo->buffer_offset) / vbo->stride;
+			vbo->max_index = (vbo->buffer->width0 - vbo->buffer_offset) / vbo->stride;
 		}
 		max_index = MIN2(vbo->max_index, max_index);
 	}

src/gallium/drivers/r600/r600_translate.c

@@ -42,6 +42,7 @@ void r600_begin_vertex_translate(struct r600_pipe_context *rctx)
 	struct pipe_resource *out_buffer;
 	unsigned i, num_verts;
 	struct pipe_vertex_element new_velems[PIPE_MAX_ATTRIBS];
+	void *tmp;
 
 	/* Initialize the translate key, i.e. the recipe how vertices should be
 	 * translated. */
@@ -159,8 +160,9 @@ void r600_begin_vertex_translate(struct r600_pipe_context *rctx)
 		}
 	}
 
-	rctx->tran.new_velems = pipe->create_vertex_elements_state(pipe, ve->count, new_velems);
-	pipe->bind_vertex_elements_state(pipe, rctx->tran.new_velems);
+	tmp = pipe->create_vertex_elements_state(pipe, ve->count, new_velems);
+	pipe->bind_vertex_elements_state(pipe, tmp);
+	rctx->tran.new_velems = tmp;
 
 	pipe_resource_reference(&out_buffer, NULL);
 }
@@ -173,15 +175,11 @@ void r600_end_vertex_translate(struct r600_pipe_context *rctx)
 		return;
 	}
 	/* Restore vertex elements. */
-	if (rctx->vertex_elements == rctx->tran.new_velems) {
-		pipe->bind_vertex_elements_state(pipe, NULL);
-	}
 	pipe->delete_vertex_elements_state(pipe, rctx->tran.new_velems);
 	rctx->tran.new_velems = NULL;
 
 	/* Delete the now-unused VBO. */
-	pipe_resource_reference(&rctx->vertex_buffer[rctx->tran.vb_slot].buffer,
-				NULL);
+	pipe_resource_reference(&rctx->vertex_buffer[rctx->tran.vb_slot].buffer, NULL);
 }
 
 void r600_translate_index_buffer(struct r600_pipe_context *r600,

src/gallium/drivers/r600/r600_upload.c

@@ -69,6 +69,7 @@ void r600_upload_flush(struct r600_upload *upload)
 	upload->default_size = MAX2(upload->total_alloc_size, upload->default_size);
 	upload->total_alloc_size = 0;
 	upload->size = 0;
+	upload->offset = 0;
 	upload->ptr = NULL;
 	upload->buffer = NULL;
 }
@@ -105,7 +106,8 @@ int r600_upload_buffer(struct r600_upload *upload, unsigned offset,
 	memcpy(upload->ptr + upload->offset, (uint8_t *) in_ptr + offset, size);
 	*out_offset = upload->offset;
 	*out_size = upload->size;
-	*out_buffer = upload->buffer;
+	*out_buffer = NULL;
+	r600_bo_reference(upload->rctx->radeon, out_buffer, upload->buffer);
 	upload->offset += alloc_size;
 
 	return 0;

src/gallium/drivers/softpipe/sp_setup.c

@@ -575,7 +575,7 @@ setup_fragcoord_coeff(struct setup_context *setup, uint slot)
    setup->coef[slot].dady[0] = 0.0;
    /*Y*/
    setup->coef[slot].a0[1] =
-		   (spfs->origin_lower_left ? setup->softpipe->framebuffer.height : 0)
+		   (spfs->origin_lower_left ? setup->softpipe->framebuffer.height-1 : 0)
 		   + (spfs->pixel_center_integer ? 0.0 : 0.5);
    setup->coef[slot].dadx[1] = 0.0;
    setup->coef[slot].dady[1] = spfs->origin_lower_left ? -1.0 : 1.0;

src/gallium/state_trackers/dri/common/dri_context.c

@@ -141,12 +141,18 @@ GLboolean
 dri_unbind_context(__DRIcontext * cPriv)
 {
    /* dri_util.c ensures cPriv is not null */
+   struct dri_screen *screen = dri_screen(cPriv->driScreenPriv);
    struct dri_context *ctx = dri_context(cPriv);
+   struct dri_drawable *draw = dri_drawable(ctx->dPriv);
+   struct dri_drawable *read = dri_drawable(ctx->rPriv);
+   struct st_api *stapi = screen->st_api;
 
    if (--ctx->bind_count == 0) {
       if (ctx->st == ctx->stapi->get_current(ctx->stapi)) {
          ctx->st->flush(ctx->st, PIPE_FLUSH_RENDER_CACHE, NULL);
-         ctx->stapi->make_current(ctx->stapi, NULL, NULL, NULL);
+         stapi->make_current(stapi, NULL, NULL, NULL);
+         draw->context = NULL;
+         read->context = NULL;
       }
    }
 
@@ -169,17 +175,23 @@ dri_make_current(__DRIcontext * cPriv,
 
    ++ctx->bind_count;
 
+   if (!driDrawPriv && !driReadPriv)
+      return ctx->stapi->make_current(ctx->stapi, ctx->st, NULL, NULL);
+   else if (!driDrawPriv || !driReadPriv)
+      return GL_FALSE;
+
+   draw->context = ctx;
    if (ctx->dPriv != driDrawPriv) {
       ctx->dPriv = driDrawPriv;
       draw->texture_stamp = driDrawPriv->lastStamp - 1;
    }
+   read->context = ctx;
    if (ctx->rPriv != driReadPriv) {
       ctx->rPriv = driReadPriv;
       read->texture_stamp = driReadPriv->lastStamp - 1;
    }
 
-   ctx->stapi->make_current(ctx->stapi, ctx->st,
-         (draw) ? &draw->base : NULL, (read) ? &read->base : NULL);
+   ctx->stapi->make_current(ctx->stapi, ctx->st, &draw->base, &read->base);
 
    return GL_TRUE;
 }

src/gallium/state_trackers/dri/common/dri_drawable.c

@@ -132,6 +132,7 @@ dri_create_buffer(__DRIscreen * sPriv,
    drawable->base.validate = dri_st_framebuffer_validate;
    drawable->base.st_manager_private = (void *) drawable;
 
+   drawable->screen = screen;
    drawable->sPriv = sPriv;
    drawable->dPriv = dPriv;
    dPriv->driverPrivate = (void *)drawable;

src/gallium/state_trackers/dri/common/dri_drawable.h

@@ -41,6 +41,9 @@ struct dri_drawable
    struct st_framebuffer_iface base;
    struct st_visual stvis;
 
+   struct dri_screen *screen;
+   struct dri_context *context;
+
    /* dri */
    __DRIdrawable *dPriv;
    __DRIscreen *sPriv;

src/gallium/state_trackers/dri/drm/dri2.c

@@ -51,7 +51,7 @@ static void
 dri2_invalidate_drawable(__DRIdrawable *dPriv)
 {
    struct dri_drawable *drawable = dri_drawable(dPriv);
-   struct dri_context *ctx = dri_context(dPriv->driContextPriv);
+   struct dri_context *ctx = drawable->context;
 
    dri2InvalidateDrawable(dPriv);
    drawable->dPriv->lastStamp = *drawable->dPriv->pStamp;

src/gallium/state_trackers/egl/common/egl_g3d_api.c

@@ -158,17 +158,17 @@ egl_g3d_choose_config(_EGLDriver *drv, _EGLDisplay *dpy, const EGLint *attribs,
          (_EGLArrayForEach) egl_g3d_match_config, (void *) &criteria);
 
    /* perform sorting of configs */
-   if (tmp_configs && tmp_size) {
+   if (configs && tmp_size) {
       _eglSortConfigs((const _EGLConfig **) tmp_configs, tmp_size,
             egl_g3d_compare_config, (void *) &criteria);
-      size = MIN2(tmp_size, size);
-      for (i = 0; i < size; i++)
+      tmp_size = MIN2(tmp_size, size);
+      for (i = 0; i < tmp_size; i++)
          configs[i] = _eglGetConfigHandle(tmp_configs[i]);
    }
 
    FREE(tmp_configs);
 
-   *num_configs = size;
+   *num_configs = tmp_size;
 
    return EGL_TRUE;
 }
@@ -402,7 +402,6 @@ egl_g3d_create_pbuffer_surface(_EGLDriver *drv, _EGLDisplay *dpy,
                                _EGLConfig *conf, const EGLint *attribs)
 {
    struct egl_g3d_surface *gsurf;
-   struct pipe_resource *ptex = NULL;
 
    gsurf = create_pbuffer_surface(dpy, conf, attribs,
          "eglCreatePbufferSurface");
@@ -411,13 +410,6 @@ egl_g3d_create_pbuffer_surface(_EGLDriver *drv, _EGLDisplay *dpy,
 
    gsurf->client_buffer_type = EGL_NONE;
 
-   if (!gsurf->stfbi->validate(gsurf->stfbi,
-            &gsurf->stvis.render_buffer, 1, &ptex)) {
-      egl_g3d_destroy_st_framebuffer(gsurf->stfbi);
-      FREE(gsurf);
-      return NULL;
-   }
-
    return &gsurf->base;
 }
 
@@ -477,12 +469,14 @@ egl_g3d_create_pbuffer_from_client_buffer(_EGLDriver *drv, _EGLDisplay *dpy,
    gsurf->client_buffer_type = buftype;
    gsurf->client_buffer = buffer;
 
+   /* validate now so that it fails if the client buffer is invalid */
    if (!gsurf->stfbi->validate(gsurf->stfbi,
             &gsurf->stvis.render_buffer, 1, &ptex)) {
       egl_g3d_destroy_st_framebuffer(gsurf->stfbi);
       FREE(gsurf);
       return NULL;
    }
+   pipe_resource_reference(&ptex, NULL);
 
    return &gsurf->base;
 }
@@ -676,14 +670,13 @@ egl_g3d_copy_buffers(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSurface *surf,
 
    ptex = get_pipe_resource(gdpy->native, nsurf, NATIVE_ATTACHMENT_FRONT_LEFT);
    if (ptex) {
-      struct pipe_resource *psrc = gsurf->render_texture;
       struct pipe_box src_box;
+
       u_box_origin_2d(ptex->width0, ptex->height0, &src_box);
-      if (psrc) {
-         gdpy->pipe->resource_copy_region(gdpy->pipe, ptex, 0, 0, 0, 0,
-               gsurf->render_texture, 0, &src_box);
-         nsurf->present(nsurf, NATIVE_ATTACHMENT_FRONT_LEFT, FALSE, 0);
-      }
+      gdpy->pipe->resource_copy_region(gdpy->pipe, ptex, 0, 0, 0, 0,
+            gsurf->render_texture, 0, &src_box);
+      gdpy->pipe->flush(gdpy->pipe, PIPE_FLUSH_RENDER_CACHE, NULL);
+      nsurf->present(nsurf, NATIVE_ATTACHMENT_FRONT_LEFT, FALSE, 0);
 
       pipe_resource_reference(&ptex, NULL);
    }

src/gallium/state_trackers/egl/x11/native_dri2.c

@@ -548,6 +548,10 @@ dri2_display_convert_config(struct native_display *ndpy,
    if (!mode->xRenderable || !mode->drawableType)
       return FALSE;
 
+   /* fast/slow configs are probably not relevant */
+   if (mode->visualRating == GLX_SLOW_CONFIG)
+      return FALSE;
+
    nconf->buffer_mask = 1 << NATIVE_ATTACHMENT_FRONT_LEFT;
    if (mode->doubleBufferMode)
       nconf->buffer_mask |= 1 << NATIVE_ATTACHMENT_BACK_LEFT;
@@ -568,13 +572,32 @@ dri2_display_convert_config(struct native_display *ndpy,
    if (nconf->color_format == PIPE_FORMAT_NONE)
       return FALSE;
 
-   if (mode->drawableType & GLX_WINDOW_BIT)
+   if ((mode->drawableType & GLX_WINDOW_BIT) && mode->visualID)
       nconf->window_bit = TRUE;
    if (mode->drawableType & GLX_PIXMAP_BIT)
       nconf->pixmap_bit = TRUE;
 
    nconf->native_visual_id = mode->visualID;
-   nconf->native_visual_type = mode->visualType;
+   switch (mode->visualType) {
+   case GLX_TRUE_COLOR:
+      nconf->native_visual_type = TrueColor;
+      break;
+   case GLX_DIRECT_COLOR:
+      nconf->native_visual_type = DirectColor;
+      break;
+   case GLX_PSEUDO_COLOR:
+      nconf->native_visual_type = PseudoColor;
+      break;
+   case GLX_STATIC_COLOR:
+      nconf->native_visual_type = StaticColor;
+      break;
+   case GLX_GRAY_SCALE:
+      nconf->native_visual_type = GrayScale;
+      break;
+   case GLX_STATIC_GRAY:
+      nconf->native_visual_type = StaticGray;
+      break;
+   }
    nconf->level = mode->level;
    nconf->samples = mode->samples;
 
@@ -614,8 +637,17 @@ dri2_display_get_configs(struct native_display *ndpy, int *num_configs)
       count = 0;
       for (i = 0; i < num_modes; i++) {
          struct native_config *nconf = &dri2dpy->configs[count].base;
-         if (dri2_display_convert_config(&dri2dpy->base, modes, nconf))
-            count++;
+
+         if (dri2_display_convert_config(&dri2dpy->base, modes, nconf)) {
+            int j;
+            /* look for duplicates */
+            for (j = 0; j < count; j++) {
+               if (memcmp(&dri2dpy->configs[j], nconf, sizeof(*nconf)) == 0)
+                  break;
+            }
+            if (j == count)
+               count++;
+         }
          modes = modes->next;
       }
 

src/gallium/state_trackers/wgl/stw_ext_pbuffer.c

@@ -40,6 +40,30 @@
 #include "stw_framebuffer.h"
 
 
+#define LARGE_WINDOW_SIZE 60000
+
+
+static LRESULT CALLBACK
+WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+    MINMAXINFO *pMMI;
+    switch (uMsg) {
+    case WM_GETMINMAXINFO:
+        // Allow to create a window bigger than the desktop
+        pMMI = (MINMAXINFO *)lParam;
+        pMMI->ptMaxSize.x = LARGE_WINDOW_SIZE;
+        pMMI->ptMaxSize.y = LARGE_WINDOW_SIZE;
+        pMMI->ptMaxTrackSize.x = LARGE_WINDOW_SIZE;
+        pMMI->ptMaxTrackSize.y = LARGE_WINDOW_SIZE;
+        break;
+    default:
+        break;
+    }
+
+    return DefWindowProc(hWnd, uMsg, wParam, lParam);
+}
+
+
 HPBUFFERARB WINAPI
 wglCreatePbufferARB(HDC _hDC,
                     int iPixelFormat,
@@ -52,6 +76,9 @@ wglCreatePbufferARB(HDC _hDC,
    int useLargest = 0;
    const struct stw_pixelformat_info *info;
    struct stw_framebuffer *fb;
+   DWORD dwExStyle;
+   DWORD dwStyle;
+   RECT rect;
    HWND hWnd;
    HDC hDC;
 
@@ -106,22 +133,52 @@ wglCreatePbufferARB(HDC _hDC,
       wc.hbrBackground = (HBRUSH) (COLOR_BTNFACE + 1);
       wc.hCursor = LoadCursor(NULL, IDC_ARROW);
       wc.hIcon = LoadIcon(NULL, IDI_APPLICATION);
-      wc.lpfnWndProc = DefWindowProc;
+      wc.lpfnWndProc = WndProc;
       wc.lpszClassName = "wglpbuffer";
       wc.style = CS_OWNDC | CS_HREDRAW | CS_VREDRAW;
       RegisterClass(&wc);
       first = FALSE;
    }
 
-   hWnd = CreateWindowEx(0,
+   dwExStyle = 0;
+   dwStyle = WS_CLIPSIBLINGS | WS_CLIPCHILDREN;
+
+   if (0) {
+      /*
+       * Don't hide the window -- useful for debugging what the application is
+       * drawing
+       */
+
+      dwStyle |= WS_VISIBLE | WS_OVERLAPPEDWINDOW;
+   } else {
+      dwStyle |= WS_POPUPWINDOW;
+   }
+
+   rect.left = 0;
+   rect.top = 0;
+   rect.right = rect.left + iWidth;
+   rect.bottom = rect.top + iHeight;
+
+   /*
+    * The CreateWindowEx parameters are the total (outside) dimensions of the
+    * window, which can vary with Windows version and user settings.  Use
+    * AdjustWindowRect to get the required total area for the given client area.
+    *
+    * AdjustWindowRectEx does not accept WS_OVERLAPPED style (which is defined
+    * as 0), which means we need to use some other style instead, e.g.,
+    * WS_OVERLAPPEDWINDOW or WS_POPUPWINDOW as above.
+    */
+
+   AdjustWindowRectEx(&rect, dwStyle, FALSE, dwExStyle);
+
+   hWnd = CreateWindowEx(dwExStyle,
                          "wglpbuffer", /* wc.lpszClassName */
-                         "wglpbuffer",
-#if 0 /* Useful for debugging what the application is drawing */
-                         WS_VISIBLE |
-#endif
-                         WS_CLIPSIBLINGS | WS_CLIPCHILDREN,
-                         CW_USEDEFAULT, CW_USEDEFAULT, /* x, y */
-                         iWidth, iHeight,
+                         NULL,
+                         dwStyle,
+                         CW_USEDEFAULT, /* x */
+                         CW_USEDEFAULT, /* y */
+                         rect.right - rect.left, /* width */
+                         rect.bottom - rect.top, /* height */
                          NULL,
                          NULL,
                          NULL,
@@ -130,6 +187,18 @@ wglCreatePbufferARB(HDC _hDC,
       return 0;
    }
 
+#ifdef DEBUG
+   /*
+    * Verify the client area size matches the specified size.
+    */
+
+   GetClientRect(hWnd, &rect);
+   assert(rect.left == 0);
+   assert(rect.top == 0);
+   assert(rect.right - rect.left == iWidth);
+   assert(rect.bottom - rect.top == iHeight);
+#endif
+
    hDC = GetDC(hWnd);
    if (!hDC) {
       return 0;

src/gallium/state_trackers/wgl/stw_framebuffer.c

@@ -92,6 +92,8 @@ stw_framebuffer_destroy_locked(
 
    stw_st_destroy_framebuffer_locked(fb->stfb);
    
+   ReleaseDC(fb->hWnd, fb->hDC);
+
    pipe_mutex_unlock( fb->mutex );
 
    pipe_mutex_destroy( fb->mutex );
@@ -112,26 +114,44 @@ stw_framebuffer_release(
 static INLINE void
 stw_framebuffer_get_size( struct stw_framebuffer *fb )
 {
-   unsigned width, height;
+   LONG width, height;
    RECT client_rect;
    RECT window_rect;
    POINT client_pos;
 
+   /*
+    * Sanity checking.
+    */
+
    assert(fb->hWnd);
-   
-   /* Get the client area size. */
-   GetClientRect( fb->hWnd, &client_rect );
+   assert(fb->width && fb->height);
+   assert(fb->client_rect.right  == fb->client_rect.left + fb->width);
+   assert(fb->client_rect.bottom == fb->client_rect.top  + fb->height);
+
+   /*
+    * Get the client area size.
+    */
+
+   if (!GetClientRect(fb->hWnd, &client_rect)) {
+      return;
+   }
+
    assert(client_rect.left == 0);
    assert(client_rect.top == 0);
-   width = client_rect.right - client_rect.left;
+   width  = client_rect.right  - client_rect.left;
    height = client_rect.bottom - client_rect.top;
 
-   if(width < 1)
-      width = 1;
-   if(height < 1)
-      height = 1;
+   if (width <= 0 || height <= 0) {
+      /*
+       * When the window is minimized GetClientRect will return zeros.  Simply
+       * preserve the current window size, until the window is restored or
+       * maximized again.
+       */
 
-   if(width != fb->width || height != fb->height) {
+      return;
+   }
+
+   if (width != fb->width || height != fb->height) {
       fb->must_resize = TRUE;
       fb->width = width; 
       fb->height = height; 
@@ -139,24 +159,25 @@ stw_framebuffer_get_size( struct stw_framebuffer *fb )
 
    client_pos.x = 0;
    client_pos.y = 0;
-   ClientToScreen(fb->hWnd, &client_pos);
+   if (ClientToScreen(fb->hWnd, &client_pos) &&
+       GetWindowRect(fb->hWnd, &window_rect)) {
+      fb->client_rect.left = client_pos.x - window_rect.left;
+      fb->client_rect.top  = client_pos.y - window_rect.top;
+   }
 
-   GetWindowRect(fb->hWnd, &window_rect);
-
-   fb->client_rect.left = client_pos.x - window_rect.left;
-   fb->client_rect.top =  client_pos.y - window_rect.top;
-   fb->client_rect.right = fb->client_rect.left + fb->width;
-   fb->client_rect.bottom = fb->client_rect.top + fb->height;
+   fb->client_rect.right  = fb->client_rect.left + fb->width;
+   fb->client_rect.bottom = fb->client_rect.top  + fb->height;
 
 #if 0
    debug_printf("\n");
-   debug_printf("%s: client_position = (%i, %i)\n",
+   debug_printf("%s: hwnd = %p\n", __FUNCTION__, fb->hWnd);
+   debug_printf("%s: client_position = (%li, %li)\n",
                 __FUNCTION__, client_pos.x, client_pos.y);
-   debug_printf("%s: window_rect = (%i, %i) - (%i, %i)\n",
+   debug_printf("%s: window_rect = (%li, %li) - (%li, %li)\n",
                 __FUNCTION__,
                 window_rect.left, window_rect.top,
                 window_rect.right, window_rect.bottom);
-   debug_printf("%s: client_rect = (%i, %i) - (%i, %i)\n",
+   debug_printf("%s: client_rect = (%li, %li) - (%li, %li)\n",
                 __FUNCTION__,
                 fb->client_rect.left, fb->client_rect.top,
                 fb->client_rect.right, fb->client_rect.bottom);
@@ -233,7 +254,11 @@ stw_framebuffer_create(
    if (fb == NULL)
       return NULL;
 
-   fb->hDC = hdc;
+   /* Applications use, create, destroy device contexts, so the hdc passed is.  We create our own DC
+    * because we need one for single buffered visuals.
+    */
+   fb->hDC = GetDC(hWnd);
+
    fb->hWnd = hWnd;
    fb->iPixelFormat = iPixelFormat;
 
@@ -246,6 +271,19 @@ stw_framebuffer_create(
 
    fb->refcnt = 1;
 
+   /*
+    * Windows can be sometimes have zero width and or height, but we ensure
+    * a non-zero framebuffer size at all times.
+    */
+
+   fb->must_resize = TRUE;
+   fb->width  = 1;
+   fb->height = 1;
+   fb->client_rect.left   = 0;
+   fb->client_rect.top    = 0;
+   fb->client_rect.right  = fb->client_rect.left + fb->width;
+   fb->client_rect.bottom = fb->client_rect.top  + fb->height;
+
    stw_framebuffer_get_size(fb);
 
    pipe_mutex_init( fb->mutex );
@@ -347,24 +385,13 @@ stw_framebuffer_from_hdc_locked(
    HDC hdc )
 {
    HWND hwnd;
-   struct stw_framebuffer *fb;
 
-   /* 
-    * Some applications create and use several HDCs for the same window, so 
-    * looking up the framebuffer by the HDC is not reliable. Use HWND whenever
-    * possible.
-    */ 
    hwnd = WindowFromDC(hdc);
-   if(hwnd)
-      return stw_framebuffer_from_hwnd_locked(hwnd);
-   
-   for (fb = stw_dev->fb_head; fb != NULL; fb = fb->next)
-      if (fb->hDC == hdc) {
-         pipe_mutex_lock(fb->mutex);
-         break;
-      }
+   if (!hwnd) {
+      return NULL;
+   }
 
-   return fb;
+   return stw_framebuffer_from_hwnd_locked(hwnd);
 }
 
 
@@ -576,7 +603,7 @@ DrvSwapBuffers(
 
    stw_flush_current_locked(fb);
 
-   return stw_st_swap_framebuffer_locked(fb->stfb);
+   return stw_st_swap_framebuffer_locked(hdc, fb->stfb);
 }
 
 

src/gallium/state_trackers/wgl/stw_st.c

@@ -154,7 +154,8 @@ stw_st_framebuffer_validate(struct st_framebuffer_iface *stfb,
  * Present an attachment of the framebuffer.
  */
 static boolean
-stw_st_framebuffer_present_locked(struct st_framebuffer_iface *stfb,
+stw_st_framebuffer_present_locked(HDC hdc,
+                                  struct st_framebuffer_iface *stfb,
                                   enum st_attachment_type statt)
 {
    struct stw_st_framebuffer *stwfb = stw_st_framebuffer(stfb);
@@ -162,7 +163,7 @@ stw_st_framebuffer_present_locked(struct st_framebuffer_iface *stfb,
 
    resource = stwfb->textures[statt];
    if (resource) {
-      stw_framebuffer_present_locked(stwfb->fb->hDC, stwfb->fb, resource);
+      stw_framebuffer_present_locked(hdc, stwfb->fb, resource);
    }
 
    return TRUE;
@@ -176,7 +177,7 @@ stw_st_framebuffer_flush_front(struct st_framebuffer_iface *stfb,
 
    pipe_mutex_lock(stwfb->fb->mutex);
 
-   return stw_st_framebuffer_present_locked(&stwfb->base, statt);
+   return stw_st_framebuffer_present_locked(stwfb->fb->hDC, &stwfb->base, statt);
 }
 
 /**
@@ -220,7 +221,7 @@ stw_st_destroy_framebuffer_locked(struct st_framebuffer_iface *stfb)
  * Swap the buffers of the given framebuffer.
  */
 boolean
-stw_st_swap_framebuffer_locked(struct st_framebuffer_iface *stfb)
+stw_st_swap_framebuffer_locked(HDC hdc, struct st_framebuffer_iface *stfb)
 {
    struct stw_st_framebuffer *stwfb = stw_st_framebuffer(stfb);
    unsigned front = ST_ATTACHMENT_FRONT_LEFT, back = ST_ATTACHMENT_BACK_LEFT;
@@ -245,7 +246,7 @@ stw_st_swap_framebuffer_locked(struct st_framebuffer_iface *stfb)
    stwfb->texture_mask = mask;
 
    front = ST_ATTACHMENT_FRONT_LEFT;
-   return stw_st_framebuffer_present_locked(&stwfb->base, front);
+   return stw_st_framebuffer_present_locked(hdc, &stwfb->base, front);
 }
 
 /**

src/gallium/state_trackers/wgl/stw_st.h

@@ -28,6 +28,8 @@
 #ifndef STW_ST_H
 #define STW_ST_H
 
+#include <windows.h>
+
 #include "state_tracker/st_api.h"
 
 struct stw_framebuffer;
@@ -42,6 +44,6 @@ void
 stw_st_destroy_framebuffer_locked(struct st_framebuffer_iface *stfb);
 
 boolean
-stw_st_swap_framebuffer_locked(struct st_framebuffer_iface *stfb);
+stw_st_swap_framebuffer_locked(HDC hdc, struct st_framebuffer_iface *stfb);
 
 #endif /* STW_ST_H */

src/gallium/targets/SConscript.dri

@@ -72,7 +72,6 @@ COMMON_DRI_DRM_OBJECTS = [
 
 drienv.AppendUnique(LIBS = [
     'expat',
-    'talloc',
 ])
 
 Export([

src/gallium/targets/libgl-gdi/SConscript

@@ -15,7 +15,6 @@ env.Append(LIBS = [
     'user32',
     'kernel32',
     'ws2_32',
-    talloc,
 ])
 
 sources = ['libgl_gdi.c']

src/gallium/targets/libgl-xlib/SConscript

@@ -23,7 +23,6 @@ env.Prepend(LIBS = [
     mesa,
     glsl,
     gallium,
-    'talloc'
 ])
 
 sources = [

src/gallium/winsys/r600/drm/evergreen_hw_context.c

@@ -621,10 +621,7 @@ int evergreen_context_init(struct r600_context *ctx, struct radeon *radeon)
 	/* save 16dwords space for fence mecanism */
 	ctx->pm4_ndwords -= 16;
 
-	r = r600_context_init_fence(ctx);
-	if (r) {
-		goto out_err;
-	}
+	LIST_INITHEAD(&ctx->fenced_bo);
 
 	/* init dirty list */
 	LIST_INITHEAD(&ctx->dirty);

src/gallium/winsys/r600/drm/r600.c

@@ -79,58 +79,6 @@ struct radeon *r600_new(int fd, unsigned device)
 		r600_delete(r600);
 		return NULL;
 	}
-	switch (r600->family) {
-	case CHIP_R600:
-	case CHIP_RV610:
-	case CHIP_RV630:
-	case CHIP_RV670:
-	case CHIP_RV620:
-	case CHIP_RV635:
-	case CHIP_RS780:
-	case CHIP_RS880:
-	case CHIP_RV770:
-	case CHIP_RV730:
-	case CHIP_RV710:
-	case CHIP_RV740:
-	case CHIP_CEDAR:
-	case CHIP_REDWOOD:
-	case CHIP_JUNIPER:
-	case CHIP_CYPRESS:
-	case CHIP_HEMLOCK:
-	case CHIP_PALM:
-		break;
-	case CHIP_R100:
-	case CHIP_RV100:
-	case CHIP_RS100:
-	case CHIP_RV200:
-	case CHIP_RS200:
-	case CHIP_R200:
-	case CHIP_RV250:
-	case CHIP_RS300:
-	case CHIP_RV280:
-	case CHIP_R300:
-	case CHIP_R350:
-	case CHIP_RV350:
-	case CHIP_RV380:
-	case CHIP_R420:
-	case CHIP_R423:
-	case CHIP_RV410:
-	case CHIP_RS400:
-	case CHIP_RS480:
-	case CHIP_RS600:
-	case CHIP_RS690:
-	case CHIP_RS740:
-	case CHIP_RV515:
-	case CHIP_R520:
-	case CHIP_RV530:
-	case CHIP_RV560:
-	case CHIP_RV570:
-	case CHIP_R580:
-	default:
-		R600_ERR("unknown or unsupported chipset 0x%04X\n", r600->device);
-		break;
-	}
-
 	/* setup class */
 	switch (r600->family) {
 	case CHIP_R600:
@@ -155,6 +103,9 @@ struct radeon *r600_new(int fd, unsigned device)
 	case CHIP_CYPRESS:
 	case CHIP_HEMLOCK:
 	case CHIP_PALM:
+	case CHIP_BARTS:
+	case CHIP_TURKS:
+	case CHIP_CAICOS:
 		r600->chip_class = EVERGREEN;
 		break;
 	default:

src/gallium/winsys/r600/drm/r600_bo.c

@@ -85,7 +85,7 @@ struct r600_bo *r600_bo_handle(struct radeon *radeon,
 		free(bo);
 		return NULL;
 	}
-	bo->size = bo->size;
+	bo->size = rbo->size;
 	bo->domains = (RADEON_GEM_DOMAIN_CPU |
 			RADEON_GEM_DOMAIN_GTT |
 			RADEON_GEM_DOMAIN_VRAM);

src/gallium/winsys/r600/drm/r600_drm.c

@@ -30,6 +30,7 @@
 #include <sys/ioctl.h>
 #include "util/u_inlines.h"
 #include "util/u_debug.h"
+#include <pipebuffer/pb_bufmgr.h>
 #include "r600.h"
 #include "r600_priv.h"
 #include "r600_drm_public.h"
@@ -110,6 +111,18 @@ static int radeon_drm_get_tiling(struct radeon *radeon)
 	return 0;
 }
 
+static int radeon_init_fence(struct radeon *radeon)
+{
+	radeon->fence = 1;
+	radeon->fence_bo = r600_bo(radeon, 4096, 0, 0, 0);
+	if (radeon->fence_bo == NULL) {
+		return -ENOMEM;
+	}
+	radeon->cfence = r600_bo_map(radeon, radeon->fence_bo, PB_USAGE_UNSYNCHRONIZED, NULL);
+	*radeon->cfence = 0;
+	return 0;
+}
+
 static struct radeon *radeon_new(int fd, unsigned device)
 {
 	struct radeon *radeon;
@@ -134,59 +147,6 @@ static struct radeon *radeon_new(int fd, unsigned device)
 		fprintf(stderr, "Unknown chipset 0x%04X\n", radeon->device);
 		return radeon_decref(radeon);
 	}
-	switch (radeon->family) {
-	case CHIP_R600:
-	case CHIP_RV610:
-	case CHIP_RV630:
-	case CHIP_RV670:
-	case CHIP_RV620:
-	case CHIP_RV635:
-	case CHIP_RS780:
-	case CHIP_RS880:
-	case CHIP_RV770:
-	case CHIP_RV730:
-	case CHIP_RV710:
-	case CHIP_RV740:
-	case CHIP_CEDAR:
-	case CHIP_REDWOOD:
-	case CHIP_JUNIPER:
-	case CHIP_CYPRESS:
-	case CHIP_HEMLOCK:
-	case CHIP_PALM:
-		break;
-	case CHIP_R100:
-	case CHIP_RV100:
-	case CHIP_RS100:
-	case CHIP_RV200:
-	case CHIP_RS200:
-	case CHIP_R200:
-	case CHIP_RV250:
-	case CHIP_RS300:
-	case CHIP_RV280:
-	case CHIP_R300:
-	case CHIP_R350:
-	case CHIP_RV350:
-	case CHIP_RV380:
-	case CHIP_R420:
-	case CHIP_R423:
-	case CHIP_RV410:
-	case CHIP_RS400:
-	case CHIP_RS480:
-	case CHIP_RS600:
-	case CHIP_RS690:
-	case CHIP_RS740:
-	case CHIP_RV515:
-	case CHIP_R520:
-	case CHIP_RV530:
-	case CHIP_RV560:
-	case CHIP_RV570:
-	case CHIP_R580:
-	default:
-		fprintf(stderr, "%s unknown or unsupported chipset 0x%04X\n",
-			__func__, radeon->device);
-		break;
-	}
-
 	/* setup class */
 	switch (radeon->family) {
 	case CHIP_R600:
@@ -215,6 +175,9 @@ static struct radeon *radeon_new(int fd, unsigned device)
 	case CHIP_CYPRESS:
 	case CHIP_HEMLOCK:
 	case CHIP_PALM:
+	case CHIP_BARTS:
+	case CHIP_TURKS:
+	case CHIP_CAICOS:
 		radeon->chip_class = EVERGREEN;
 		/* set default group bytes, overridden by tiling info ioctl */
 		radeon->tiling_info.group_bytes = 512;
@@ -233,6 +196,11 @@ static struct radeon *radeon_new(int fd, unsigned device)
 	if (radeon->bomgr == NULL) {
 		return NULL;
 	}
+	r = radeon_init_fence(radeon);
+	if (r) {
+		radeon_decref(radeon);
+		return NULL;
+	}
 	return radeon;
 }
 
@@ -249,12 +217,13 @@ struct radeon *radeon_decref(struct radeon *radeon)
 		return NULL;
 	}
 
+	if (radeon->fence_bo) {
+		r600_bo_reference(radeon, &radeon->fence_bo, NULL);
+	}
+
 	if (radeon->bomgr)
 		r600_bomgr_destroy(radeon->bomgr);
 
-	if (radeon->fd >= 0)
-		drmClose(radeon->fd);
-
 	free(radeon);
 	return NULL;
 }

src/gallium/winsys/r600/drm/r600_hw_context.c

@@ -40,27 +40,13 @@
 
 #define GROUP_FORCE_NEW_BLOCK	0
 
-int r600_context_init_fence(struct r600_context *ctx)
-{
-	ctx->fence = 1;
-	ctx->fence_bo = r600_bo(ctx->radeon, 4096, 0, 0, 0);
-	if (ctx->fence_bo == NULL) {
-		return -ENOMEM;
-	}
-	ctx->cfence = r600_bo_map(ctx->radeon, ctx->fence_bo, PB_USAGE_UNSYNCHRONIZED, NULL);
-	*ctx->cfence = 0;
-	ctx->radeon->cfence = ctx->cfence;
-	LIST_INITHEAD(&ctx->fenced_bo);
-	return 0;
-}
-
 static void INLINE r600_context_update_fenced_list(struct r600_context *ctx)
 {
 	for (int i = 0; i < ctx->creloc; i++) {
 		if (!LIST_IS_EMPTY(&ctx->bo[i]->fencedlist))
 			LIST_DELINIT(&ctx->bo[i]->fencedlist);
 		LIST_ADDTAIL(&ctx->bo[i]->fencedlist, &ctx->fenced_bo);
-		ctx->bo[i]->fence = ctx->fence;
+		ctx->bo[i]->fence = ctx->radeon->fence;
 		ctx->bo[i]->ctx = ctx;
 	}
 }
@@ -71,7 +57,7 @@ static void INLINE r600_context_fence_wraparound(struct r600_context *ctx, unsig
 	struct radeon_bo *tmp;
 
 	LIST_FOR_EACH_ENTRY_SAFE(bo, tmp, &ctx->fenced_bo, fencedlist) {
-		if (bo->fence <= *ctx->cfence) {
+		if (bo->fence <= *ctx->radeon->cfence) {
 			LIST_DELINIT(&bo->fencedlist);
 			bo->fence = 0;
 		} else {
@@ -632,9 +618,6 @@ void r600_context_fini(struct r600_context *ctx)
 	free(ctx->pm4);
 
 	r600_context_clear_fenced_bo(ctx);
-	if (ctx->fence_bo) {
-		r600_bo_reference(ctx->radeon, &ctx->fence_bo, NULL);
-	}
 	memset(ctx, 0, sizeof(struct r600_context));
 }
 
@@ -763,10 +746,7 @@ int r600_context_init(struct r600_context *ctx, struct radeon *radeon)
 	/* save 16dwords space for fence mecanism */
 	ctx->pm4_ndwords -= 16;
 
-	r = r600_context_init_fence(ctx);
-	if (r) {
-		goto out_err;
-	}
+	LIST_INITHEAD(&ctx->fenced_bo);
 
 	/* init dirty list */
 	LIST_INITHEAD(&ctx->dirty);
@@ -814,7 +794,7 @@ void r600_context_bo_reloc(struct r600_context *ctx, u32 *pm4, struct r600_bo *r
 	ctx->reloc[ctx->creloc].write_domain = rbo->domains & (RADEON_GEM_DOMAIN_GTT | RADEON_GEM_DOMAIN_VRAM);
 	ctx->reloc[ctx->creloc].flags = 0;
 	radeon_bo_reference(ctx->radeon, &ctx->bo[ctx->creloc], bo);
-	rbo->fence = ctx->fence;
+	rbo->fence = ctx->radeon->fence;
 	ctx->creloc++;
 	/* set PKT3 to point to proper reloc */
 	*pm4 = bo->reloc_id;
@@ -837,7 +817,7 @@ void r600_context_pipe_state_set(struct r600_context *ctx, struct r600_pipe_stat
 			/* find relocation */
 			id = block->pm4_bo_index[id];
 			r600_bo_reference(ctx->radeon, &block->reloc[id].bo, state->regs[i].bo);
-			state->regs[i].bo->fence = ctx->fence;
+			state->regs[i].bo->fence = ctx->radeon->fence;
 		}
 		if (!(block->status & R600_BLOCK_STATUS_DIRTY)) {
 			block->status |= R600_BLOCK_STATUS_ENABLED;
@@ -877,13 +857,13 @@ static inline void r600_context_pipe_state_set_resource(struct r600_context *ctx
 		 */
 		r600_bo_reference(ctx->radeon, &block->reloc[1].bo, state->regs[0].bo);
 		r600_bo_reference(ctx->radeon, &block->reloc[2].bo, state->regs[0].bo);
-		state->regs[0].bo->fence = ctx->fence;
+		state->regs[0].bo->fence = ctx->radeon->fence;
 	} else {
 		/* TEXTURE RESOURCE */
 		r600_bo_reference(ctx->radeon, &block->reloc[1].bo, state->regs[2].bo);
 		r600_bo_reference(ctx->radeon, &block->reloc[2].bo, state->regs[3].bo);
-		state->regs[2].bo->fence = ctx->fence;
-		state->regs[3].bo->fence = ctx->fence;
+		state->regs[2].bo->fence = ctx->radeon->fence;
+		state->regs[3].bo->fence = ctx->radeon->fence;
 	}
 	if (!(block->status & R600_BLOCK_STATUS_DIRTY)) {
 		block->status |= R600_BLOCK_STATUS_ENABLED;
@@ -1123,11 +1103,11 @@ void r600_context_flush(struct r600_context *ctx)
 	ctx->pm4[ctx->pm4_cdwords++] = EVENT_TYPE(EVENT_TYPE_CACHE_FLUSH_AND_INV_TS_EVENT) | EVENT_INDEX(5);
 	ctx->pm4[ctx->pm4_cdwords++] = 0;
 	ctx->pm4[ctx->pm4_cdwords++] = (1 << 29) | (0 << 24);
-	ctx->pm4[ctx->pm4_cdwords++] = ctx->fence;
+	ctx->pm4[ctx->pm4_cdwords++] = ctx->radeon->fence;
 	ctx->pm4[ctx->pm4_cdwords++] = 0;
 	ctx->pm4[ctx->pm4_cdwords++] = PKT3(PKT3_NOP, 0);
 	ctx->pm4[ctx->pm4_cdwords++] = 0;
-	r600_context_bo_reloc(ctx, &ctx->pm4[ctx->pm4_cdwords - 1], ctx->fence_bo);
+	r600_context_bo_reloc(ctx, &ctx->pm4[ctx->pm4_cdwords - 1], ctx->radeon->fence_bo);
 
 #if 1
 	/* emit cs */
@@ -1144,18 +1124,18 @@ void r600_context_flush(struct r600_context *ctx)
 	r = drmCommandWriteRead(ctx->radeon->fd, DRM_RADEON_CS, &drmib,
 				sizeof(struct drm_radeon_cs));
 #else
-	*ctx->cfence = ctx->fence;
+	*ctx->radeon->cfence = ctx->radeon->fence;
 #endif
 
 	r600_context_update_fenced_list(ctx);
 
-	fence = ctx->fence + 1;
-	if (fence < ctx->fence) {
+	fence = ctx->radeon->fence + 1;
+	if (fence < ctx->radeon->fence) {
 		/* wrap around */
 		fence = 1;
 		r600_context_fence_wraparound(ctx, fence);
 	}
-	ctx->fence = fence;
+	ctx->radeon->fence = fence;
 
 	/* restart */
 	for (int i = 0; i < ctx->creloc; i++) {

src/gallium/winsys/r600/drm/r600_priv.h

@@ -36,6 +36,7 @@
 #include "r600.h"
 
 struct r600_bomgr;
+struct r600_bo;
 
 struct radeon {
 	int				fd;
@@ -45,7 +46,9 @@ struct radeon {
 	enum chip_class			chip_class;
 	struct r600_tiling_info		tiling_info;
 	struct r600_bomgr		*bomgr;
+	unsigned			fence;
 	unsigned			*cfence;
+	struct r600_bo			*fence_bo;
 };
 
 struct r600_reg {

src/gallium/winsys/r600/drm/radeon_bo.c

@@ -156,7 +156,7 @@ int radeon_bo_wait(struct radeon *radeon, struct radeon_bo *bo)
         if (!bo->shared) {
                 if (!bo->fence)
 			return 0;
-		if (bo->fence <= *bo->ctx->cfence) {
+		if (bo->fence <= *radeon->cfence) {
 			LIST_DELINIT(&bo->fencedlist);
 			bo->fence = 0;
 			return 0;
@@ -181,7 +181,7 @@ int radeon_bo_busy(struct radeon *radeon, struct radeon_bo *bo, uint32_t *domain
 	if (!bo->shared) {
 		if (!bo->fence)
 			return 0;
-		if (bo->fence <= *bo->ctx->cfence) {
+		if (bo->fence <= *radeon->cfence) {
 			LIST_DELINIT(&bo->fencedlist);
 			bo->fence = 0;
 			return 0;

src/gallium/winsys/r600/drm/radeon_pciid.c

@@ -177,6 +177,7 @@ struct pci_id radeon_pci_id[] = {
 	{0x1002, 0x688A, CHIP_CYPRESS},
 	{0x1002, 0x6898, CHIP_CYPRESS},
 	{0x1002, 0x6899, CHIP_CYPRESS},
+	{0x1002, 0x689b, CHIP_CYPRESS},
 	{0x1002, 0x689c, CHIP_HEMLOCK},
 	{0x1002, 0x689d, CHIP_HEMLOCK},
 	{0x1002, 0x689e, CHIP_CYPRESS},
@@ -187,7 +188,9 @@ struct pci_id radeon_pci_id[] = {
 	{0x1002, 0x68b0, CHIP_JUNIPER},
 	{0x1002, 0x68b8, CHIP_JUNIPER},
 	{0x1002, 0x68b9, CHIP_JUNIPER},
+	{0x1002, 0x68ba, CHIP_JUNIPER},
 	{0x1002, 0x68be, CHIP_JUNIPER},
+	{0x1002, 0x68bf, CHIP_JUNIPER},
 	{0x1002, 0x68c0, CHIP_REDWOOD},
 	{0x1002, 0x68c1, CHIP_REDWOOD},
 	{0x1002, 0x68c8, CHIP_REDWOOD},
@@ -203,6 +206,7 @@ struct pci_id radeon_pci_id[] = {
 	{0x1002, 0x68e8, CHIP_CEDAR},
 	{0x1002, 0x68e9, CHIP_CEDAR},
 	{0x1002, 0x68f1, CHIP_CEDAR},
+	{0x1002, 0x68f2, CHIP_CEDAR},
 	{0x1002, 0x68f8, CHIP_CEDAR},
 	{0x1002, 0x68f9, CHIP_CEDAR},
 	{0x1002, 0x68fe, CHIP_CEDAR},
@@ -445,6 +449,45 @@ struct pci_id radeon_pci_id[] = {
 	{0x1002, 0x9803, CHIP_PALM},
 	{0x1002, 0x9804, CHIP_PALM},
 	{0x1002, 0x9805, CHIP_PALM},
+	{0x1002, 0x9806, CHIP_PALM},
+	{0x1002, 0x9807, CHIP_PALM},
+	{0x1002, 0x6720, CHIP_BARTS},
+	{0x1002, 0x6721, CHIP_BARTS},
+	{0x1002, 0x6722, CHIP_BARTS},
+	{0x1002, 0x6723, CHIP_BARTS},
+	{0x1002, 0x6724, CHIP_BARTS},
+	{0x1002, 0x6725, CHIP_BARTS},
+	{0x1002, 0x6726, CHIP_BARTS},
+	{0x1002, 0x6727, CHIP_BARTS},
+	{0x1002, 0x6728, CHIP_BARTS},
+	{0x1002, 0x6729, CHIP_BARTS},
+	{0x1002, 0x6738, CHIP_BARTS},
+	{0x1002, 0x6739, CHIP_BARTS},
+	{0x1002, 0x673e, CHIP_BARTS},
+	{0x1002, 0x6740, CHIP_TURKS},
+	{0x1002, 0x6741, CHIP_TURKS},
+	{0x1002, 0x6742, CHIP_TURKS},
+	{0x1002, 0x6743, CHIP_TURKS},
+	{0x1002, 0x6744, CHIP_TURKS},
+	{0x1002, 0x6745, CHIP_TURKS},
+	{0x1002, 0x6746, CHIP_TURKS},
+	{0x1002, 0x6747, CHIP_TURKS},
+	{0x1002, 0x6748, CHIP_TURKS},
+	{0x1002, 0x6749, CHIP_TURKS},
+	{0x1002, 0x6750, CHIP_TURKS},
+	{0x1002, 0x6758, CHIP_TURKS},
+	{0x1002, 0x6759, CHIP_TURKS},
+	{0x1002, 0x6760, CHIP_CAICOS},
+	{0x1002, 0x6761, CHIP_CAICOS},
+	{0x1002, 0x6762, CHIP_CAICOS},
+	{0x1002, 0x6763, CHIP_CAICOS},
+	{0x1002, 0x6764, CHIP_CAICOS},
+	{0x1002, 0x6765, CHIP_CAICOS},
+	{0x1002, 0x6766, CHIP_CAICOS},
+	{0x1002, 0x6767, CHIP_CAICOS},
+	{0x1002, 0x6768, CHIP_CAICOS},
+	{0x1002, 0x6770, CHIP_CAICOS},
+	{0x1002, 0x6779, CHIP_CAICOS},
 	{0, 0},
 };
 

src/gallium/winsys/radeon/drm/radeon_r300.c

@@ -118,7 +118,7 @@ static struct r300_winsys_buffer *radeon_r300_winsys_buffer_from_handle(struct r
 
     if (stride)
         *stride = whandle->stride;
-    if (size)
+    if (size && _buf)
         *size = _buf->base.size;
 
     return (struct r300_winsys_buffer*)_buf;

src/glsl/Makefile

@@ -16,6 +16,8 @@ GLCPP_SOURCES = \
 	glcpp/glcpp.c
 
 C_SOURCES = \
+	strtod.c \
+	ralloc.c \
 	$(LIBGLCPP_SOURCES)
 
 CXX_SOURCES = \
@@ -82,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
 
@@ -112,7 +113,6 @@ OBJECTS = \
 	$(CXX_SOURCES:.cpp=.o)
 
 INCLUDES = \
-	$(TALLOC_CFLAGS) \
 	-I. \
 	-I../mesa \
 	-I../mapi \
@@ -162,16 +162,16 @@ glcpp/glcpp: $(GLCPP_OBJECTS) libglsl.a
 	$(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
 
 glsl_lexer.cpp: glsl_lexer.lpp
-	flex --nounistd -o$@  $<
+	$(FLEX) --nounistd -o$@  $<
 
 glsl_parser.cpp: glsl_parser.ypp
-	bison -v -o "$@" -p "_mesa_glsl_" --defines=glsl_parser.h $<
+	$(BISON) -v -o "$@" -p "_mesa_glsl_" --defines=glsl_parser.h $<
 
 glcpp/glcpp-lex.c: glcpp/glcpp-lex.l
-	flex --nounistd -o$@  $<
+	$(FLEX) --nounistd -o$@  $<
 
 glcpp/glcpp-parse.c: glcpp/glcpp-parse.y
-	bison -v -o "$@" --defines=glcpp/glcpp-parse.h $<
+	$(BISON) -v -o "$@" --defines=glcpp/glcpp-parse.h $<
 
 builtins: builtin_function.cpp builtins/profiles/* builtins/ir/* builtins/tools/generate_builtins.py builtins/tools/texture_builtins.py
 	@echo Bootstrapping the compiler...

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,7 +73,9 @@ sources = [
     'opt_structure_splitting.cpp',
     'opt_swizzle_swizzle.cpp',
     'opt_tree_grafting.cpp',
+    'ralloc.c',
     's_expression.cpp',
+    'strtod.c',
 ]
 
 glsl = env.ConvenienceLibrary(
@@ -95,7 +95,7 @@ if env['platform'] == 'windows':
         'user32',
     ])
 
-env.Prepend(LIBS = [glsl, talloc])
+env.Prepend(LIBS = [glsl])
 
 env.Program(
     target = 'glsl2',

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;
 };
 
 

src/glsl/ast_expr.cpp

@@ -20,8 +20,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include <cstdio>
-#include <cassert>
+#include <stdio.h>
+#include <assert.h>
 #include "ast.h"
 
 const char *

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,11 +195,11 @@ 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: ";
 
-      for (int i = -1; i < state->num_builtins_to_link; i++) {
+      for (int i = -1; i < (int) state->num_builtins_to_link; i++) {
 	 glsl_symbol_table *syms = i >= 0 ? state->builtins_to_link[i]->symbols
 					  : state->symbols;
 	 f = syms->get_function(name);
@@ -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
@@ -993,6 +993,16 @@ ast_function_expression::hir(exec_list *instructions,
 
       const glsl_type *const constructor_type = type->glsl_type(& name, state);
 
+      /* constructor_type can be NULL if a variable with the same name as the
+       * structure has come into scope.
+       */
+      if (constructor_type == NULL) {
+	 _mesa_glsl_error(& loc, state, "unknown type `%s' (structure name "
+			  "may be shadowed by a variable with the same name)",
+			  type->type_name);
+	 return ir_call::get_error_instruction(ctx);
+      }
+
 
       /* Constructors for samplers are illegal.
        */
@@ -1022,6 +1032,57 @@ ast_function_expression::hir(exec_list *instructions,
        * correct order.  These constructors follow essentially the same type
        * matching rules as functions.
        */
+      if (constructor_type->is_record()) {
+	 exec_list actual_parameters;
+
+	 process_parameters(instructions, &actual_parameters,
+			    &this->expressions, state);
+
+	 exec_node *node = actual_parameters.head;
+	 for (unsigned i = 0; i < constructor_type->length; i++) {
+	    ir_rvalue *ir = (ir_rvalue *) node;
+
+	    if (node->is_tail_sentinel()) {
+	       _mesa_glsl_error(&loc, state,
+				"insufficient parameters to constructor "
+				"for `%s'",
+				constructor_type->name);
+	       return ir_call::get_error_instruction(ctx);
+	    }
+
+	    if (apply_implicit_conversion(constructor_type->fields.structure[i].type,
+					  ir, state)) {
+	       node->replace_with(ir);
+	    } else {
+	       _mesa_glsl_error(&loc, state,
+				"parameter type mismatch in constructor "
+				"for `%s.%s' (%s vs %s)",
+				constructor_type->name,
+				constructor_type->fields.structure[i].name,
+				ir->type->name,
+				constructor_type->fields.structure[i].type->name);
+	       return ir_call::get_error_instruction(ctx);;
+	    }
+
+	    node = node->next;
+	 }
+
+	 if (!node->is_tail_sentinel()) {
+	    _mesa_glsl_error(&loc, state, "too many parameters in constructor "
+			     "for `%s'", constructor_type->name);
+	    return ir_call::get_error_instruction(ctx);
+	 }
+
+	 ir_rvalue *const constant =
+	    constant_record_constructor(constructor_type, &actual_parameters,
+					state);
+
+	 return (constant != NULL)
+	    ? constant
+	    : emit_inline_record_constructor(constructor_type, instructions,
+					     &actual_parameters, state);
+      }
+
       if (!constructor_type->is_numeric() && !constructor_type->is_boolean())
 	 return ir_call::get_error_instruction(ctx);
 
@@ -1197,54 +1258,6 @@ ast_function_expression::hir(exec_list *instructions,
       process_parameters(instructions, &actual_parameters, &this->expressions,
 			 state);
 
-      const glsl_type *const type =
-	 state->symbols->get_type(id->primary_expression.identifier);
-
-      if ((type != NULL) && type->is_record()) {
-	 exec_node *node = actual_parameters.head;
-	 for (unsigned i = 0; i < type->length; i++) {
-	    ir_rvalue *ir = (ir_rvalue *) node;
-
-	    if (node->is_tail_sentinel()) {
-	       _mesa_glsl_error(&loc, state,
-				"insufficient parameters to constructor "
-				"for `%s'",
-				type->name);
-	       return ir_call::get_error_instruction(ctx);
-	    }
-
-	    if (apply_implicit_conversion(type->fields.structure[i].type, ir,
-					  state)) {
-	       node->replace_with(ir);
-	    } else {
-	       _mesa_glsl_error(&loc, state,
-				"parameter type mismatch in constructor "
-				"for `%s.%s' (%s vs %s)",
-				type->name,
-				type->fields.structure[i].name,
-				ir->type->name,
-				type->fields.structure[i].type->name);
-	       return ir_call::get_error_instruction(ctx);;
-	    }
-
-	    node = node->next;
-	 }
-
-	 if (!node->is_tail_sentinel()) {
-	    _mesa_glsl_error(&loc, state, "too many parameters in constructor "
-			     "for `%s'", type->name);
-	    return ir_call::get_error_instruction(ctx);
-	 }
-
-	 ir_rvalue *const constant =
-	    constant_record_constructor(type, &actual_parameters, state);
-
-	 return (constant != NULL)
-	    ? constant
-	    : emit_inline_record_constructor(type, instructions,
-					     &actual_parameters, state);
-      }
-
       return match_function_by_name(instructions, 
 				    id->primary_expression.identifier, & loc,
 				    &actual_parameters, state);

src/glsl/ast_type.cpp

@@ -21,7 +21,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <cstdio>
+#include <stdio.h>
 #include "ast.h"
 extern "C" {
 #include "program/symbol_table.h"
@@ -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",

src/glsl/builtin_function.cpp

@@ -37,6 +37,8 @@ read_builtins(GLenum target, const char *protos, const char **functions, unsigne
 {
    struct gl_context fakeCtx;
    fakeCtx.API = API_OPENGL;
+   fakeCtx.Const.GLSLVersion = 130;
+   fakeCtx.Extensions.ARB_ES2_compatibility = true;
    gl_shader *sh = _mesa_new_shader(NULL, 0, target);
    struct _mesa_glsl_parse_state *st =
       new(sh) _mesa_glsl_parse_state(&fakeCtx, target, sh);
@@ -63,7 +65,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;
       }
    }
@@ -3010,40 +3012,26 @@ static const char builtin_smoothstep[] =
    "       (declare (in) float edge1)\n"
    "       (declare (in) float x))\n"
    "     ((declare () float t)\n"
-   "\n"
    "      (assign (constant bool (1)) (x) (var_ref t)\n"
    "              (expression float max\n"
    "	                  (expression float min\n"
    "	                              (expression float / (expression float - (var_ref x) (var_ref edge0)) (expression float - (var_ref edge1) (var_ref edge0)))\n"
    "	                              (constant float (1.0)))\n"
    "	                  (constant float (0.0))))\n"
-   "      (return (expression float * (var_ref t) (expression float * (var_ref t) (expression float - (constant float (3.000000)) (expression float * (constant float (2.000000)) (var_ref t))))))))\n"
-   "\n"
+   "      (return (expression float * (var_ref t) (expression float * (var_ref t) (expression float - (constant float (3.0)) (expression float * (constant float (2.0)) (var_ref t))))))))\n"
    "   (signature vec2\n"
    "     (parameters\n"
    "       (declare (in) float edge0)\n"
    "       (declare (in) float edge1)\n"
    "       (declare (in) vec2 x))\n"
    "     ((declare () vec2 t)\n"
-   "      (declare () vec2 retval)\n"
-   "\n"
-   "      (assign (constant bool (1)) (x) (var_ref t)\n"
-   "              (expression float max\n"
-   "	                  (expression float min\n"
-   "	                              (expression float / (expression float - (swiz x (var_ref x)) (var_ref edge0)) (expression float - (var_ref edge1) (var_ref edge0)))\n"
+   "      (assign (constant bool (1)) (xy) (var_ref t)\n"
+   "              (expression vec2 max\n"
+   "	                  (expression vec2 min\n"
+   "	                              (expression vec2 / (expression vec2 - (var_ref x) (var_ref edge0)) (expression float - (var_ref edge1) (var_ref edge0)))\n"
    "	                              (constant float (1.0)))\n"
    "	                  (constant float (0.0))))\n"
-   "      (assign (constant bool (1)) (x) (var_ref retval) (expression float * (swiz x (var_ref t)) (expression float * (swiz x (var_ref t)) (expression float - (constant float (3.000000)) (expression float * (constant float (2.000000)) (swiz x (var_ref t)))))))\n"
-   "\n"
-   "      (assign (constant bool (1)) (y) (var_ref t)\n"
-   "              (expression float max\n"
-   "	                  (expression float min\n"
-   "	                              (expression float / (expression float - (swiz y (var_ref x)) (var_ref edge0)) (expression float - (var_ref edge1) (var_ref edge0)))\n"
-   "	                              (constant float (1.0)))\n"
-   "	                  (constant float (0.0))))\n"
-   "      (assign (constant bool (1)) (y) (var_ref retval) (expression float * (swiz y (var_ref t)) (expression float * (swiz y (var_ref t)) (expression float - (constant float (3.000000)) (expression float * (constant float (2.000000)) (swiz y (var_ref t)))))))\n"
-   "      (return (var_ref retval))\n"
-   "      ))\n"
+   "      (return (expression vec2 * (var_ref t) (expression vec2 * (var_ref t) (expression vec2 - (constant float (3.0)) (expression vec2 * (constant float (2.0)) (var_ref t))))))))\n"
    "\n"
    "   (signature vec3\n"
    "     (parameters\n"
@@ -3051,33 +3039,13 @@ static const char builtin_smoothstep[] =
    "       (declare (in) float edge1)\n"
    "       (declare (in) vec3 x))\n"
    "     ((declare () vec3 t)\n"
-   "      (declare () vec3 retval)\n"
-   "\n"
-   "      (assign (constant bool (1)) (x) (var_ref t)\n"
-   "              (expression float max\n"
-   "	                  (expression float min\n"
-   "	                              (expression float / (expression float - (swiz x (var_ref x)) (var_ref edge0)) (expression float - (var_ref edge1) (var_ref edge0)))\n"
+   "      (assign (constant bool (1)) (xyz) (var_ref t)\n"
+   "              (expression vec3 max\n"
+   "	                  (expression vec3 min\n"
+   "	                              (expression vec3 / (expression vec3 - (var_ref x) (var_ref edge0)) (expression float - (var_ref edge1) (var_ref edge0)))\n"
    "	                              (constant float (1.0)))\n"
    "	                  (constant float (0.0))))\n"
-   "      (assign (constant bool (1)) (x) (var_ref retval) (expression float * (swiz x (var_ref t)) (expression float * (swiz x (var_ref t)) (expression float - (constant float (3.000000)) (expression float * (constant float (2.000000)) (swiz x (var_ref t)))))))\n"
-   "\n"
-   "      (assign (constant bool (1)) (y) (var_ref t)\n"
-   "              (expression float max\n"
-   "	                  (expression float min\n"
-   "	                              (expression float / (expression float - (swiz y (var_ref x)) (var_ref edge0)) (expression float - (var_ref edge1) (var_ref edge0)))\n"
-   "	                              (constant float (1.0)))\n"
-   "	                  (constant float (0.0))))\n"
-   "      (assign (constant bool (1)) (y) (var_ref retval) (expression float * (swiz y (var_ref t)) (expression float * (swiz y (var_ref t)) (expression float - (constant float (3.000000)) (expression float * (constant float (2.000000)) (swiz y (var_ref t)))))))\n"
-   "\n"
-   "      (assign (constant bool (1)) (z) (var_ref t)\n"
-   "              (expression float max\n"
-   "	                  (expression float min\n"
-   "	                              (expression float / (expression float - (swiz z (var_ref x)) (var_ref edge0)) (expression float - (var_ref edge1) (var_ref edge0)))\n"
-   "	                              (constant float (1.0)))\n"
-   "	                  (constant float (0.0))))\n"
-   "      (assign (constant bool (1)) (z) (var_ref retval) (expression float * (swiz z (var_ref t)) (expression float * (swiz z (var_ref t)) (expression float - (constant float (3.000000)) (expression float * (constant float (2.000000)) (swiz z (var_ref t)))))))\n"
-   "      (return (var_ref retval))\n"
-   "      ))\n"
+   "      (return (expression vec3 * (var_ref t) (expression vec3 * (var_ref t) (expression vec3 - (constant float (3.0)) (expression vec3 * (constant float (2.0)) (var_ref t))))))))\n"
    "\n"
    "\n"
    "   (signature vec4\n"
@@ -3086,74 +3054,55 @@ static const char builtin_smoothstep[] =
    "       (declare (in) float edge1)\n"
    "       (declare (in) vec4 x))\n"
    "     ((declare () vec4 t)\n"
-   "      (declare () vec4 retval)\n"
-   "\n"
-   "      (assign (constant bool (1)) (x) (var_ref t)\n"
-   "              (expression float max\n"
-   "	                  (expression float min\n"
-   "	                              (expression float / (expression float - (swiz x (var_ref x)) (var_ref edge0)) (expression float - (var_ref edge1) (var_ref edge0)))\n"
+   "      (assign (constant bool (1)) (xyzw) (var_ref t)\n"
+   "              (expression vec4 max\n"
+   "	                  (expression vec4 min\n"
+   "	                              (expression vec4 / (expression vec4 - (var_ref x) (var_ref edge0)) (expression float - (var_ref edge1) (var_ref edge0)))\n"
    "	                              (constant float (1.0)))\n"
    "	                  (constant float (0.0))))\n"
-   "      (assign (constant bool (1)) (x) (var_ref retval) (expression float * (swiz x (var_ref t)) (expression float * (swiz x (var_ref t)) (expression float - (constant float (3.000000)) (expression float * (constant float (2.000000)) (swiz x (var_ref t)))))))\n"
-   "\n"
-   "      (assign (constant bool (1)) (y) (var_ref t)\n"
-   "              (expression float max\n"
-   "	                  (expression float min\n"
-   "	                              (expression float / (expression float - (swiz y (var_ref x)) (var_ref edge0)) (expression float - (var_ref edge1) (var_ref edge0)))\n"
-   "	                              (constant float (1.0)))\n"
-   "	                  (constant float (0.0))))\n"
-   "      (assign (constant bool (1)) (y) (var_ref retval) (expression float * (swiz y (var_ref t)) (expression float * (swiz y (var_ref t)) (expression float - (constant float (3.000000)) (expression float * (constant float (2.000000)) (swiz y (var_ref t)))))))\n"
-   "\n"
-   "      (assign (constant bool (1)) (z) (var_ref t)\n"
-   "              (expression float max\n"
-   "	                  (expression float min\n"
-   "	                              (expression float / (expression float - (swiz z (var_ref x)) (var_ref edge0)) (expression float - (var_ref edge1) (var_ref edge0)))\n"
-   "	                              (constant float (1.0)))\n"
-   "	                  (constant float (0.0))))\n"
-   "      (assign (constant bool (1)) (z) (var_ref retval) (expression float * (swiz z (var_ref t)) (expression float * (swiz z (var_ref t)) (expression float - (constant float (3.000000)) (expression float * (constant float (2.000000)) (swiz z (var_ref t)))))))\n"
-   "\n"
-   "      (assign (constant bool (1)) (w) (var_ref t)\n"
-   "              (expression float max\n"
-   "	                  (expression float min\n"
-   "	                              (expression float / (expression float - (swiz w (var_ref x)) (var_ref edge0)) (expression float - (var_ref edge1) (var_ref edge0)))\n"
-   "	                              (constant float (1.0)))\n"
-   "	                  (constant float (0.0))))\n"
-   "      (assign (constant bool (1)) (w) (var_ref retval) (expression float * (swiz w (var_ref t)) (expression float * (swiz w (var_ref t)) (expression float - (constant float (3.000000)) (expression float * (constant float (2.000000)) (swiz w (var_ref t)))))))\n"
-   "      (return (var_ref retval))\n"
-   "      ))\n"
+   "      (return (expression vec4 * (var_ref t) (expression vec4 * (var_ref t) (expression vec4 - (constant float (3.0)) (expression vec4 * (constant float (2.0)) (var_ref t))))))))\n"
    "\n"
    "   (signature vec2\n"
    "     (parameters\n"
    "       (declare (in) vec2 edge0)\n"
    "       (declare (in) vec2 edge1)\n"
    "       (declare (in) vec2 x))\n"
-   "     ((return (expression vec2 max\n"
+   "     ((declare () vec2 t)\n"
+   "      (assign (constant bool (1)) (xy) (var_ref t)\n"
+   "              (expression vec2 max\n"
    "                          (expression vec2 min\n"
    "                                      (expression vec2 / (expression vec2 - (var_ref x) (var_ref edge0)) (expression vec2 - (var_ref edge1) (var_ref edge0)))\n"
-   "                                      (constant vec2 (1.0 1.0)))\n"
-   "                          (constant vec2 (0.0 0.0))))))\n"
+   "                                      (constant float (1.0)))\n"
+   "                          (constant float (0.0))))\n"
+   "      (return (expression vec2 * (var_ref t) (expression vec2 * (var_ref t) (expression vec2 - (constant float (3.0)) (expression vec2 * (constant float (2.0)) (var_ref t))))))))\n"
    "\n"
    "   (signature vec3\n"
    "     (parameters\n"
    "       (declare (in) vec3 edge0)\n"
    "       (declare (in) vec3 edge1)\n"
    "       (declare (in) vec3 x))\n"
-   "     ((return (expression vec3 max\n"
+   "     ((declare () vec3 t)\n"
+   "      (assign (constant bool (1)) (xyz) (var_ref t)\n"
+   "              (expression vec3 max\n"
    "                          (expression vec3 min\n"
    "                                      (expression vec3 / (expression vec3 - (var_ref x) (var_ref edge0)) (expression vec3 - (var_ref edge1) (var_ref edge0)))\n"
-   "                                      (constant vec3 (1.0 1.0 1.0)))\n"
-   "                          (constant vec3 (0.0 0.0 0.0))))))\n"
+   "                                      (constant float (1.0)))\n"
+   "                          (constant float (0.0))))\n"
+   "      (return (expression vec3 * (var_ref t) (expression vec3 * (var_ref t) (expression vec3 - (constant float (3.0)) (expression vec3 * (constant float (2.0)) (var_ref t))))))))\n"
    "\n"
    "   (signature vec4\n"
    "     (parameters\n"
    "       (declare (in) vec4 edge0)\n"
    "       (declare (in) vec4 edge1)\n"
    "       (declare (in) vec4 x))\n"
-   "     ((return (expression vec4 max\n"
+   "     ((declare () vec4 t)\n"
+   "      (assign (constant bool (1)) (xyzw) (var_ref t)\n"
+   "              (expression vec4 max\n"
    "                          (expression vec4 min\n"
    "                                      (expression vec4 / (expression vec4 - (var_ref x) (var_ref edge0)) (expression vec4 - (var_ref edge1) (var_ref edge0)))\n"
-   "                                      (constant vec4 (1.0 1.0 1.0 1.0)))\n"
-   "                          (constant vec4 (0.0 0.0 0.0 0.0))))))\n"
+   "                                      (constant float (1.0)))\n"
+   "                          (constant float (0.0))))\n"
+   "      (return (expression vec4 * (var_ref t) (expression vec4 * (var_ref t) (expression vec4 - (constant float (3.0)) (expression vec4 * (constant float (2.0)) (var_ref t))))))))\n"
    "))\n"
    "\n"
    ""
@@ -13569,7 +13518,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));
 }
@@ -13586,7 +13535,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;
    }
 
@@ -13599,7 +13548,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));
    }
 

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
  *

src/glsl/builtins/ir/smoothstep

@@ -5,40 +5,26 @@
        (declare (in) float edge1)
        (declare (in) float x))
      ((declare () float t)
-
       (assign (constant bool (1)) (x) (var_ref t)
               (expression float max
 	                  (expression float min
 	                              (expression float / (expression float - (var_ref x) (var_ref edge0)) (expression float - (var_ref edge1) (var_ref edge0)))
 	                              (constant float (1.0)))
 	                  (constant float (0.0))))
-      (return (expression float * (var_ref t) (expression float * (var_ref t) (expression float - (constant float (3.000000)) (expression float * (constant float (2.000000)) (var_ref t))))))))
-
+      (return (expression float * (var_ref t) (expression float * (var_ref t) (expression float - (constant float (3.0)) (expression float * (constant float (2.0)) (var_ref t))))))))
    (signature vec2
      (parameters
        (declare (in) float edge0)
        (declare (in) float edge1)
        (declare (in) vec2 x))
      ((declare () vec2 t)
-      (declare () vec2 retval)
-
-      (assign (constant bool (1)) (x) (var_ref t)
-              (expression float max
-	                  (expression float min
-	                              (expression float / (expression float - (swiz x (var_ref x)) (var_ref edge0)) (expression float - (var_ref edge1) (var_ref edge0)))
+      (assign (constant bool (1)) (xy) (var_ref t)
+              (expression vec2 max
+	                  (expression vec2 min
+	                              (expression vec2 / (expression vec2 - (var_ref x) (var_ref edge0)) (expression float - (var_ref edge1) (var_ref edge0)))
 	                              (constant float (1.0)))
 	                  (constant float (0.0))))
-      (assign (constant bool (1)) (x) (var_ref retval) (expression float * (swiz x (var_ref t)) (expression float * (swiz x (var_ref t)) (expression float - (constant float (3.000000)) (expression float * (constant float (2.000000)) (swiz x (var_ref t)))))))
-
-      (assign (constant bool (1)) (y) (var_ref t)
-              (expression float max
-	                  (expression float min
-	                              (expression float / (expression float - (swiz y (var_ref x)) (var_ref edge0)) (expression float - (var_ref edge1) (var_ref edge0)))
-	                              (constant float (1.0)))
-	                  (constant float (0.0))))
-      (assign (constant bool (1)) (y) (var_ref retval) (expression float * (swiz y (var_ref t)) (expression float * (swiz y (var_ref t)) (expression float - (constant float (3.000000)) (expression float * (constant float (2.000000)) (swiz y (var_ref t)))))))
-      (return (var_ref retval))
-      ))
+      (return (expression vec2 * (var_ref t) (expression vec2 * (var_ref t) (expression vec2 - (constant float (3.0)) (expression vec2 * (constant float (2.0)) (var_ref t))))))))
 
    (signature vec3
      (parameters
@@ -46,33 +32,13 @@
        (declare (in) float edge1)
        (declare (in) vec3 x))
      ((declare () vec3 t)
-      (declare () vec3 retval)
-
-      (assign (constant bool (1)) (x) (var_ref t)
-              (expression float max
-	                  (expression float min
-	                              (expression float / (expression float - (swiz x (var_ref x)) (var_ref edge0)) (expression float - (var_ref edge1) (var_ref edge0)))
+      (assign (constant bool (1)) (xyz) (var_ref t)
+              (expression vec3 max
+	                  (expression vec3 min
+	                              (expression vec3 / (expression vec3 - (var_ref x) (var_ref edge0)) (expression float - (var_ref edge1) (var_ref edge0)))
 	                              (constant float (1.0)))
 	                  (constant float (0.0))))
-      (assign (constant bool (1)) (x) (var_ref retval) (expression float * (swiz x (var_ref t)) (expression float * (swiz x (var_ref t)) (expression float - (constant float (3.000000)) (expression float * (constant float (2.000000)) (swiz x (var_ref t)))))))
-
-      (assign (constant bool (1)) (y) (var_ref t)
-              (expression float max
-	                  (expression float min
-	                              (expression float / (expression float - (swiz y (var_ref x)) (var_ref edge0)) (expression float - (var_ref edge1) (var_ref edge0)))
-	                              (constant float (1.0)))
-	                  (constant float (0.0))))
-      (assign (constant bool (1)) (y) (var_ref retval) (expression float * (swiz y (var_ref t)) (expression float * (swiz y (var_ref t)) (expression float - (constant float (3.000000)) (expression float * (constant float (2.000000)) (swiz y (var_ref t)))))))
-
-      (assign (constant bool (1)) (z) (var_ref t)
-              (expression float max
-	                  (expression float min
-	                              (expression float / (expression float - (swiz z (var_ref x)) (var_ref edge0)) (expression float - (var_ref edge1) (var_ref edge0)))
-	                              (constant float (1.0)))
-	                  (constant float (0.0))))
-      (assign (constant bool (1)) (z) (var_ref retval) (expression float * (swiz z (var_ref t)) (expression float * (swiz z (var_ref t)) (expression float - (constant float (3.000000)) (expression float * (constant float (2.000000)) (swiz z (var_ref t)))))))
-      (return (var_ref retval))
-      ))
+      (return (expression vec3 * (var_ref t) (expression vec3 * (var_ref t) (expression vec3 - (constant float (3.0)) (expression vec3 * (constant float (2.0)) (var_ref t))))))))
 
 
    (signature vec4
@@ -81,73 +47,54 @@
        (declare (in) float edge1)
        (declare (in) vec4 x))
      ((declare () vec4 t)
-      (declare () vec4 retval)
-
-      (assign (constant bool (1)) (x) (var_ref t)
-              (expression float max
-	                  (expression float min
-	                              (expression float / (expression float - (swiz x (var_ref x)) (var_ref edge0)) (expression float - (var_ref edge1) (var_ref edge0)))
+      (assign (constant bool (1)) (xyzw) (var_ref t)
+              (expression vec4 max
+	                  (expression vec4 min
+	                              (expression vec4 / (expression vec4 - (var_ref x) (var_ref edge0)) (expression float - (var_ref edge1) (var_ref edge0)))
 	                              (constant float (1.0)))
 	                  (constant float (0.0))))
-      (assign (constant bool (1)) (x) (var_ref retval) (expression float * (swiz x (var_ref t)) (expression float * (swiz x (var_ref t)) (expression float - (constant float (3.000000)) (expression float * (constant float (2.000000)) (swiz x (var_ref t)))))))
-
-      (assign (constant bool (1)) (y) (var_ref t)
-              (expression float max
-	                  (expression float min
-	                              (expression float / (expression float - (swiz y (var_ref x)) (var_ref edge0)) (expression float - (var_ref edge1) (var_ref edge0)))
-	                              (constant float (1.0)))
-	                  (constant float (0.0))))
-      (assign (constant bool (1)) (y) (var_ref retval) (expression float * (swiz y (var_ref t)) (expression float * (swiz y (var_ref t)) (expression float - (constant float (3.000000)) (expression float * (constant float (2.000000)) (swiz y (var_ref t)))))))
-
-      (assign (constant bool (1)) (z) (var_ref t)
-              (expression float max
-	                  (expression float min
-	                              (expression float / (expression float - (swiz z (var_ref x)) (var_ref edge0)) (expression float - (var_ref edge1) (var_ref edge0)))
-	                              (constant float (1.0)))
-	                  (constant float (0.0))))
-      (assign (constant bool (1)) (z) (var_ref retval) (expression float * (swiz z (var_ref t)) (expression float * (swiz z (var_ref t)) (expression float - (constant float (3.000000)) (expression float * (constant float (2.000000)) (swiz z (var_ref t)))))))
-
-      (assign (constant bool (1)) (w) (var_ref t)
-              (expression float max
-	                  (expression float min
-	                              (expression float / (expression float - (swiz w (var_ref x)) (var_ref edge0)) (expression float - (var_ref edge1) (var_ref edge0)))
-	                              (constant float (1.0)))
-	                  (constant float (0.0))))
-      (assign (constant bool (1)) (w) (var_ref retval) (expression float * (swiz w (var_ref t)) (expression float * (swiz w (var_ref t)) (expression float - (constant float (3.000000)) (expression float * (constant float (2.000000)) (swiz w (var_ref t)))))))
-      (return (var_ref retval))
-      ))
+      (return (expression vec4 * (var_ref t) (expression vec4 * (var_ref t) (expression vec4 - (constant float (3.0)) (expression vec4 * (constant float (2.0)) (var_ref t))))))))
 
    (signature vec2
      (parameters
        (declare (in) vec2 edge0)
        (declare (in) vec2 edge1)
        (declare (in) vec2 x))
-     ((return (expression vec2 max
+     ((declare () vec2 t)
+      (assign (constant bool (1)) (xy) (var_ref t)
+              (expression vec2 max
                           (expression vec2 min
                                       (expression vec2 / (expression vec2 - (var_ref x) (var_ref edge0)) (expression vec2 - (var_ref edge1) (var_ref edge0)))
-                                      (constant vec2 (1.0 1.0)))
-                          (constant vec2 (0.0 0.0))))))
+                                      (constant float (1.0)))
+                          (constant float (0.0))))
+      (return (expression vec2 * (var_ref t) (expression vec2 * (var_ref t) (expression vec2 - (constant float (3.0)) (expression vec2 * (constant float (2.0)) (var_ref t))))))))
 
    (signature vec3
      (parameters
        (declare (in) vec3 edge0)
        (declare (in) vec3 edge1)
        (declare (in) vec3 x))
-     ((return (expression vec3 max
+     ((declare () vec3 t)
+      (assign (constant bool (1)) (xyz) (var_ref t)
+              (expression vec3 max
                           (expression vec3 min
                                       (expression vec3 / (expression vec3 - (var_ref x) (var_ref edge0)) (expression vec3 - (var_ref edge1) (var_ref edge0)))
-                                      (constant vec3 (1.0 1.0 1.0)))
-                          (constant vec3 (0.0 0.0 0.0))))))
+                                      (constant float (1.0)))
+                          (constant float (0.0))))
+      (return (expression vec3 * (var_ref t) (expression vec3 * (var_ref t) (expression vec3 - (constant float (3.0)) (expression vec3 * (constant float (2.0)) (var_ref t))))))))
 
    (signature vec4
      (parameters
        (declare (in) vec4 edge0)
        (declare (in) vec4 edge1)
        (declare (in) vec4 x))
-     ((return (expression vec4 max
+     ((declare () vec4 t)
+      (assign (constant bool (1)) (xyzw) (var_ref t)
+              (expression vec4 max
                           (expression vec4 min
                                       (expression vec4 / (expression vec4 - (var_ref x) (var_ref edge0)) (expression vec4 - (var_ref edge1) (var_ref edge0)))
-                                      (constant vec4 (1.0 1.0 1.0 1.0)))
-                          (constant vec4 (0.0 0.0 0.0 0.0))))))
+                                      (constant float (1.0)))
+                          (constant float (0.0))))
+      (return (expression vec4 * (var_ref t) (expression vec4 * (var_ref t) (expression vec4 - (constant float (3.0)) (expression vec4 * (constant float (2.0)) (var_ref t))))))))
 ))
 

src/glsl/builtins/tools/generate_builtins.py

@@ -142,6 +142,8 @@ read_builtins(GLenum target, const char *protos, const char **functions, unsigne
 {
    struct gl_context fakeCtx;
    fakeCtx.API = API_OPENGL;
+   fakeCtx.Const.GLSLVersion = 130;
+   fakeCtx.Extensions.ARB_ES2_compatibility = true;
    gl_shader *sh = _mesa_new_shader(NULL, 0, target);
    struct _mesa_glsl_parse_state *st =
       new(sh) _mesa_glsl_parse_state(&fakeCtx, target, sh);
@@ -168,7 +170,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;
       }
    }
@@ -193,7 +195,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));
 }
@@ -210,7 +212,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;
    }
 
@@ -223,7 +225,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));
    }
 

src/glsl/glcpp/glcpp-lex.c

@@ -358,45 +358,43 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static yyconst flex_int16_t yy_acclist[137] =
+static yyconst flex_int16_t yy_acclist[125] =
     {   0,
         3,    3,   44,   39,   43,   40,   43,   41,   43,   43,
        38,   43,   43,   38,   43,   38,   43,   38,   43,   25,
        39,   43,   24,   39,   43,   38,   43,   38,   43,   38,
        43,   37,   39,   43,   37,   39,   43,   38,   43,   40,
-       43,   23,   43,   43,    3,   43,    4,   43,    5,   43,
-       42,   43,   39,   18,   40,   32,   35,   33,    2,    1,
-       25,   39,   25,   39,   39,   24,   39,   24,   39,   27,
-       29,   31,   30,   28,   37,   39,   37,   39,   34,   40,
-       23,   23,    3,    4,    5,    6,    5,    7,    1,   26,
-       39,   37,   39,16398,   26,   39,   37,   39,   18,   37,
+       43,   23,   43,    3,   43,    4,   43,    5,   43,   42,
+       43,   18,   43,   18,   43,   18,   43,   39,   40,   32,
+       35,   33,    2,    1,   25,   39,   25,   39,   39,   24,
+       39,   24,   39,   27,   29,   31,   30,   28,   37,   39,
+       37,   39,   34,   40,   23,   23,    3,    4,    5,    6,
+        5,    7,    1,   26,   39,   37,   39,   26,   39,   37,
 
-       39,16399,16400, 8206,   18, 8206,   37,   39, 8207,   18,
-     8208,   18,16401,   19,16396,   22,   36,   37,   39,   21,
-     8209,   18,   19, 8204,   18,16397,16404, 8205,   18,   11,
-       18,    9,    8, 8212,   10,   18
+       39,   14,   37,   39,   15,   16,   37,   39,   17,   19,
+       12,   22,   36,   37,   39,   21,   19,   13,16404,   11,
+        9,    8, 8212,   10
     } ;
 
-static yyconst flex_int16_t yy_accept[164] =
+static yyconst flex_int16_t yy_accept[155] =
     {   0,
-        1,    1,    1,    1,    1,    2,    3,    3,    3,    4,
-        6,    8,   10,   11,   13,   14,   16,   18,   20,   23,
-       26,   28,   30,   32,   35,   38,   40,   42,   44,   45,
-       47,   49,   51,   53,   54,   54,   55,   56,   57,   58,
-       59,   60,   61,   63,   65,   66,   68,   70,   71,   72,
-       73,   74,   75,   77,   79,   80,   81,   82,   83,   83,
-       83,   83,   83,   83,   83,   83,   84,   85,   86,   87,
-       88,   89,   90,   92,   94,   94,   94,   94,   94,   94,
-       95,   95,   95,   95,   95,   97,   99,   99,   99,   99,
-       99,   99,   99,   99,  100,  100,  100,  100,  100,  100,
+        1,    1,    1,    1,    1,    2,    3,    3,    3,    3,
+        3,    4,    6,    8,   10,   11,   13,   14,   16,   18,
+       20,   23,   26,   28,   30,   32,   35,   38,   40,   42,
+       44,   46,   48,   50,   52,   54,   56,   58,   59,   60,
+       61,   62,   63,   64,   65,   67,   69,   70,   72,   74,
+       75,   76,   77,   78,   79,   81,   83,   84,   85,   86,
+       87,   87,   87,   87,   87,   87,   87,   87,   88,   89,
+       90,   91,   92,   93,   93,   93,   93,   93,   94,   96,
+       98,   98,   98,   98,   98,   98,   98,   98,   98,   98,
+       98,  100,  102,  102,  102,  102,  102,  102,  102,  103,
 
-      100,  102,  102,  103,  104,  104,  104,  104,  104,  106,
-      106,  107,  107,  107,  107,  107,  107,  107,  109,  109,
-      109,  111,  111,  113,  114,  115,  115,  116,  116,  116,
-      116,  117,  117,  120,  121,  121,  123,  124,  124,  124,
-      126,  127,  127,  127,  127,  128,  128,  128,  130,  130,
-      132,  132,  133,  134,  134,  134,  134,  135,  135,  135,
-      137,  137,  137
+      103,  103,  103,  103,  103,  103,  105,  105,  106,  107,
+      107,  107,  107,  107,  107,  107,  107,  107,  107,  109,
+      109,  110,  111,  111,  112,  112,  112,  112,  113,  113,
+      116,  117,  118,  118,  119,  119,  119,  119,  120,  120,
+      120,  121,  121,  122,  123,  123,  123,  123,  124,  124,
+      124,  125,  125,  125
     } ;
 
 static yyconst flex_int32_t yy_ec[256] =
@@ -433,198 +431,144 @@ static yyconst flex_int32_t yy_ec[256] =
 
 static yyconst flex_int32_t yy_meta[40] =
     {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    2,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1
+        1,    2,    3,    4,    4,    4,    4,    4,    5,    6,
+        4,    7,    7,    7,    4,    4,    4,    8,    8,    8,
+        8,    8,    9,    8,    8,    8,    8,    8,    8,    9,
+        8,    8,    8,    8,    8,    8,    8,    8,    4
     } ;
 
-static yyconst flex_int16_t yy_base[182] =
+static yyconst flex_int16_t yy_base[168] =
     {   0,
-        0,   38,    0,    0,   38,   39,  499,  498,  500,   48,
-       43,  552,  496,   44,   63,  495,   59,   65,   87,  125,
-       58,   67,   68,  164,  203,   40,   75,  241,  552,  494,
-      552,  140,  552,  140,  493,  552,  144,  492,  491,  487,
-      486,  485,  156,  179,  267,    0,  209,  472,  471,  470,
-      469,  468,  446,  124,  466,  153,  462,  458,  154,  198,
-      159,  155,  183,  160,  193,  460,  552,  222,  552,  227,
-      552,  459,  204,  161,  231,  232,  238,  243,  236,  303,
-      245,  180,  247,  249,  281,   56,  257,  271,  248,  259,
-      252,  264,  455,  454,  297,  299,  312,  313,  320,  294,
+        0,   38,    0,    0,   38,   39,  328,  327,  326,   44,
+      328,    0,  325,  332,  332,  310,  319,  332,  316,   41,
+       41,   44,   44,  307,   49,  321,   44,  282,   61,   79,
+      317,  332,   72,  332,  332,   67,   68,    0,  317,  332,
+      332,  332,  332,    0,   34,    0,  105,    0,    0,  332,
+      332,  332,  332,  332,  317,   73,  332,   82,  311,  310,
+      291,   61,  289,  286,  279,  281,  286,  306,  332,   90,
+      332,   94,  332,   84,   85,  108,   48,    0,   88,   95,
+      283,   86,  284,  273,  270,   91,  274,  281,  279,  268,
+        0,  124,  273,  274,  274,  270,  265,  271,  332,  267,
 
-      407,  295,  427,  426,  321,  296,  324,  425,  552,  424,
-      552,  327,  329,  195,  328,  331,  332,  230,  334,  378,
-      552,  377,  552,  371,  370,  335,  365,  337,  358,  342,
-      360,  344,  326,  255,  340,  552,  260,  338,  246,  552,
-      197,  364,  192,  352,  382,  348,  186,  552,  420,  552,
-      423,  184,  141,  437,  421,  447,   79,  476,  346,  552,
-      453,  552,  515,  517,  519,  521,  523,  525,   71,  527,
-      529,  531,  533,  535,  537,  539,  541,  543,  545,  547,
-      549
+      264,  262,  259,  260,  249,  125,  245,  332,  332,  241,
+      229,  231,  223,  209,  222,  194,  197,  194,  130,  196,
+      332,    0,  181,  332,  189,  131,  191,  332,  181,  210,
+      162,    0,  136,  332,  134,    0,  130,  155,  111,  138,
+      332,  153,    0,  332,  125,   41,  156,  332,   34,  136,
+      332,  159,  332,  173,  182,  191,  200,  209,  218,  227,
+      236,  245,  254,  263,  272,  280,  285
     } ;
 
-static yyconst flex_int16_t yy_def[182] =
+static yyconst flex_int16_t yy_def[168] =
     {   0,
-      162,    1,  163,  163,  164,  164,  165,  165,  162,  166,
-      167,  162,  167,  167,  167,  167,  167,  167,  162,  166,
-      167,  167,  167,  168,  168,  167,  167,  167,  162,  169,
-      162,  170,  162,   20,  167,  162,  167,  167,  167,  167,
-      167,  171,   19,   20,   20,   20,   20,  167,  167,  167,
-      167,  167,   25,   25,  167,  167,   28,   28,  167,  167,
-      167,  167,  167,  167,  167,  169,  162,  170,  162,  170,
-      162,  171,   45,   25,  167,  167,  167,  167,  167,  167,
-      167,  167,  167,  167,   20,   25,  167,  167,  167,  167,
-      167,  167,  172,  173,  167,  167,  167,  167,  167,  167,
+      153,    1,  154,  154,  155,  155,  156,  156,  157,  157,
+      153,  158,  153,  153,  153,  153,  153,  153,  153,  153,
+      158,  158,  153,  153,  153,  159,  159,  153,  153,  153,
+      160,  153,  161,  153,  153,  153,  153,  158,  153,  153,
+      153,  153,  153,  162,   21,  158,  158,   22,  158,  153,
+      153,  153,  153,  153,  159,  159,  153,  153,   30,   30,
+      153,  153,  153,  153,  153,  153,  153,  160,  153,  161,
+      153,  161,  153,  153,  153,  153,  153,  162,   47,  159,
+      153,  153,  153,  153,  153,  163,  153,  153,  153,  153,
+      158,  159,  153,  153,  153,  153,  153,  153,  153,  153,
 
-       25,  167,  174,  175,  167,  167,  167,  172,  162,  173,
-      162,  167,  167,  167,  167,  167,  167,   25,  167,  174,
-      162,  175,  162,  176,  177,  167,  178,  167,  167,  167,
-      167,  167,   25,  167,  176,  162,  177,  167,  178,  162,
-      179,  167,  180,  167,  162,  167,  179,  162,  167,  162,
-      167,  180,  167,  181,  167,  167,  167,  181,  167,  162,
-      167,    0,  162,  162,  162,  162,  162,  162,  162,  162,
-      162,  162,  162,  162,  162,  162,  162,  162,  162,  162,
-      162
+      153,  153,  153,  153,  153,  159,  153,  153,  153,  153,
+      153,  153,  153,  153,  153,  153,  153,  153,  159,  153,
+      153,  164,  153,  153,  153,  153,  153,  153,  153,  159,
+      153,  164,  153,  153,  153,  165,  153,  166,  153,  153,
+      153,  153,  165,  153,  167,  153,  153,  153,  167,  153,
+      153,  153,    0,  153,  153,  153,  153,  153,  153,  153,
+      153,  153,  153,  153,  153,  153,  153
     } ;
 
-static yyconst flex_int16_t yy_nxt[592] =
+static yyconst flex_int16_t yy_nxt[372] =
     {   0,
-       10,   11,   12,   13,   14,   15,   16,   17,   16,   16,
-       18,   19,   20,   20,   21,   22,   23,   24,   24,   24,
-       24,   24,   25,   24,   24,   24,   24,   24,   24,   24,
-       24,   24,   24,   24,   24,   24,   24,   24,   26,   27,
-       31,   31,   36,   28,   37,   36,   36,   32,   32,   35,
-       36,   35,   35,   35,   35,   35,   35,   35,   35,   38,
-       36,   36,   35,   35,   35,   36,   40,   36,   39,   36,
-       36,   66,   48,   49,   41,   42,   56,   36,   55,   53,
-       57,   36,   50,   51,   52,  101,   35,   34,   35,   36,
-       35,   35,   35,   35,   35,   35,   35,   35,   43,   43,
+       12,   13,   14,   15,   16,   17,   18,   19,   18,   18,
+       20,   21,   22,   22,   23,   24,   25,   26,   26,   26,
+       26,   26,   27,   26,   26,   26,   26,   26,   26,   26,
+       26,   26,   26,   26,   26,   26,   26,   26,   28,   29,
+       32,   32,  148,   30,   38,   36,   14,   33,   33,   37,
+       43,   44,   45,   45,   38,   48,   48,   48,   50,   51,
+       46,   47,   58,   49,   53,   54,   59,   56,   74,   76,
+      136,   38,   75,   38,   71,   82,   46,   83,   47,   49,
+       60,   72,   73,   58,   41,   74,   76,   59,   82,   75,
+       83,   77,   71,   84,   63,   38,   71,   80,   85,  153,
 
-       34,   35,   35,   35,   34,   34,   44,   45,   34,   34,
-       34,   34,   34,   34,   34,   34,   34,   34,   34,   34,
-       34,   34,   44,   34,   45,   35,   35,   36,   35,   35,
-       35,   35,   35,   35,   35,   35,   46,   46,   46,   35,
-       35,   35,   69,   36,   47,   37,   36,   53,   74,   70,
-       71,   34,   34,   34,   56,   36,   36,   36,   57,   34,
-       47,   36,   36,   35,   34,   35,   36,   35,   35,   35,
-       35,   35,   35,   35,   35,   34,   34,   75,   35,   35,
-       35,   81,   36,   80,   53,   36,   36,   86,  148,   83,
-       34,   34,   34,   34,   36,   36,  129,   36,   34,  148,
+      153,   61,   62,   72,   73,   63,   64,   91,   77,   76,
+       65,   63,   94,  100,   66,   67,   79,   79,   79,   95,
+      101,   92,   79,   91,   38,   38,   79,   79,   79,   79,
+       38,   77,  126,  148,   63,  140,  141,  150,  151,  140,
+      141,  146,  135,  135,  135,  142,  142,  142,  119,  147,
+      147,  147,  130,  106,  140,  141,  138,  150,  151,  144,
+      150,  151,  139,  138,  142,  142,  142,  152,  152,  152,
+      152,  152,  152,   15,   15,   15,   15,   15,   15,   15,
+       15,   15,   31,   31,   31,   31,   31,   31,   31,   31,
+       31,   34,   34,   34,   34,   34,   34,   34,   34,   34,
 
-       36,   98,   35,   34,   35,   36,   35,   35,   35,   35,
-       35,   35,   35,   35,   34,   82,   84,   35,   35,   35,
-       34,   34,   34,   85,   69,   76,   54,   77,   34,   69,
-       78,  162,  162,   36,   36,   79,   70,   71,   36,   85,
-       36,   35,   58,   36,   34,   36,   39,   36,  140,   36,
-       36,   36,  133,   53,   36,   87,  145,   36,   88,   36,
-       90,   36,   36,   59,   60,   89,   36,   61,   62,   99,
-       92,  104,   63,   36,   97,   91,   64,   65,   73,   73,
-       73,  100,  106,  102,   73,  105,   34,  107,   73,   73,
-       73,   73,   34,   34,   34,  103,   36,   36,   36,   36,
-
-       34,   36,   34,   93,   93,   94,   93,   93,   93,   93,
-       93,   93,   93,   93,   36,   36,   34,   93,   93,   93,
-      112,  113,   36,   36,  119,   95,   36,  117,  125,   36,
-       36,   36,   96,   36,   36,  114,   36,   36,  115,   36,
-       36,   93,  136,  116,   36,  124,   36,  159,  160,   53,
-       36,  127,  128,  126,   36,  131,  130,  134,  132,  129,
-       36,  141,   36,  143,  146,  149,  150,  140,  138,  142,
-      142,  142,   36,  136,  144,  151,  151,  151,  155,  123,
-      121,  153,   35,  145,   36,   35,   35,   35,   35,   35,
-       35,   35,   35,   35,   35,   35,   35,   35,   35,  154,
-
-      154,  154,  154,  154,  154,  154,  154,  154,  154,  154,
-      154,  154,  154,  154,  154,  154,  154,  154,  154,  154,
-       35,  149,  150,   36,  149,  150,  111,  109,  123,  121,
-      118,  156,  156,  156,  151,  151,  151,   35,   35,   36,
-       35,   35,   35,   35,   35,  157,   35,   35,  159,  160,
-      143,   35,   35,   35,  159,  160,  111,  109,  161,  161,
-      161,   36,   67,   35,  161,  161,  161,   35,   36,   53,
-       36,   36,   36,   36,   36,   35,   35,   35,   36,   35,
-       35,   35,   35,   35,  157,   35,   35,   36,   36,   36,
-       35,   35,   35,   36,   36,   36,   67,   36,   36,  162,
-
-       29,   29,  162,  162,  162,  162,  162,  162,  162,  162,
-      162,  162,  162,  162,   35,   29,   29,   30,   30,   33,
-       33,   34,   34,   35,   35,   53,   53,   68,   68,   72,
-       72,  108,  108,  110,  110,  120,  120,  122,  122,  135,
-      135,  137,  137,  139,  139,  147,  147,  152,  152,  158,
-      158,    9,  162,  162,  162,  162,  162,  162,  162,  162,
-      162,  162,  162,  162,  162,  162,  162,  162,  162,  162,
-      162,  162,  162,  162,  162,  162,  162,  162,  162,  162,
-      162,  162,  162,  162,  162,  162,  162,  162,  162,  162,
-      162
+       35,   35,   35,   35,   35,   35,   35,   35,   35,   38,
+       38,  137,  136,  134,  133,   38,   38,   38,   55,  131,
+      129,  128,  127,  126,   55,   55,   55,   68,   68,   68,
+       68,   68,  125,   68,   68,   68,   70,   70,   70,   70,
+       70,   70,   70,   70,   70,   78,   78,  124,   78,   78,
+       78,   78,   78,   78,   99,   99,   99,   99,   99,   99,
+      123,  122,   99,  132,  132,  121,  132,  132,  132,  132,
+      132,  132,  143,  143,  120,  143,  143,  143,  143,  143,
+      143,  145,  118,  117,  116,  115,  114,  145,  145,  149,
+      113,  149,  149,  149,  112,  111,  110,  109,  108,  107,
 
+      105,  104,  103,  102,   98,   97,   96,   93,   69,   90,
+       89,   88,   87,   86,   81,  153,  153,   38,   39,   69,
+       57,   38,   52,   42,   41,   40,   39,  153,   14,   15,
+       15,   11,  153,  153,  153,  153,  153,  153,  153,  153,
+      153,  153,  153,  153,  153,  153,  153,  153,  153,  153,
+      153,  153,  153,  153,  153,  153,  153,  153,  153,  153,
+      153,  153,  153,  153,  153,  153,  153,  153,  153,  153,
+      153
     } ;
 
-static yyconst flex_int16_t yy_chk[592] =
+static yyconst flex_int16_t yy_chk[372] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    2,
-        5,    6,   26,    2,   11,   11,   14,    5,    6,   10,
-       10,   10,   10,   10,   10,   10,   10,   10,   10,   14,
-       21,   17,   10,   10,   10,   15,   17,   18,   15,   22,
-       23,  169,   21,   21,   18,   18,   27,   27,   26,   86,
-       27,  157,   22,   23,   23,   86,   10,   19,   19,   19,
-       19,   19,   19,   19,   19,   19,   19,   19,   19,   19,
+        5,    6,  149,    2,   27,   10,   10,    5,    6,   10,
+       20,   20,   21,   21,   45,   22,   22,   22,   23,   23,
+       21,   21,   29,   22,   25,   25,   29,   27,   36,   37,
+      146,   45,   36,   56,   33,   77,   21,   77,   21,   22,
+       30,   33,   33,   58,   30,   74,   75,   58,   62,   74,
+       62,   37,   70,   62,   37,   80,   72,   56,   62,   70,
 
-       19,   19,   19,   19,   19,   19,   19,   19,   19,   19,
-       19,   19,   19,   19,   19,   19,   19,   19,   19,   19,
-       19,   19,   19,   19,   19,   19,   20,   20,   20,   20,
-       20,   20,   20,   20,   20,   20,   20,   20,   20,   20,
-       20,   20,   32,  153,   20,   37,   37,   54,   54,   32,
-       32,   34,   34,   34,   56,   56,   59,   62,   56,   34,
-       20,   61,   64,   20,   24,   24,   24,   24,   24,   24,
-       24,   24,   24,   24,   24,   34,   43,   59,   24,   24,
-       24,   62,   82,   61,   74,   63,  152,   74,  147,   64,
-       44,   44,   44,   43,  143,   65,  114,  114,   44,  141,
+       70,   30,   30,   72,   72,   30,   30,   79,   75,   76,
+       30,   75,   82,   86,   30,   30,   47,   47,   47,   82,
+       86,   80,   47,   79,   92,  106,   47,   47,   47,   47,
+      119,   76,  126,  145,   76,  135,  135,  150,  150,  140,
+      140,  139,  126,  126,  126,  135,  135,  135,  106,  140,
+      140,  140,  119,   92,  142,  142,  138,  147,  147,  137,
+      152,  152,  133,  131,  142,  142,  142,  147,  147,  147,
+      152,  152,  152,  154,  154,  154,  154,  154,  154,  154,
+      154,  154,  155,  155,  155,  155,  155,  155,  155,  155,
+      155,  156,  156,  156,  156,  156,  156,  156,  156,  156,
 
-       60,   82,   24,   25,   25,   25,   25,   25,   25,   25,
-       25,   25,   25,   25,   44,   63,   65,   25,   25,   25,
-       47,   47,   47,   73,   68,   60,   25,   60,   47,   70,
-       60,   68,   68,   75,   76,   60,   70,   70,   79,   73,
-       77,   25,   28,   28,   47,   78,   28,   81,  139,   83,
-       89,   84,  118,  118,   91,   75,  134,  134,   76,   87,
-       77,   90,  137,   28,   28,   76,   92,   28,   28,   83,
-       79,   89,   28,   88,   81,   78,   28,   28,   45,   45,
-       45,   84,   91,   87,   45,   90,   45,   92,   45,   45,
-       45,   45,   85,   85,   85,   88,  100,  102,  106,   95,
-
-       85,   96,   45,   80,   80,   80,   80,   80,   80,   80,
-       80,   80,   80,   80,   97,   98,   85,   80,   80,   80,
-       95,   96,   99,  105,  102,   80,  107,  100,  106,  112,
-      115,  113,   80,  116,  117,   97,  119,  126,   98,  128,
-      138,   80,  135,   99,  130,  105,  132,  159,  159,  133,
-      146,  112,  113,  107,  144,  116,  115,  119,  117,  129,
-      129,  128,  131,  130,  138,  142,  142,  127,  126,  129,
-      129,  129,  125,  124,  132,  142,  142,  142,  146,  122,
-      120,  144,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  149,  149,  155,  151,  151,  110,  108,  104,  103,
-      101,  149,  149,  149,  151,  151,  151,  154,  154,  154,
-      154,  154,  154,  154,  154,  154,  154,  154,  156,  156,
-      155,  154,  154,  154,  161,  161,   94,   93,  156,  156,
-      156,   72,   66,   58,  161,  161,  161,   57,   55,   53,
-       52,   51,   50,   49,   48,  154,  158,  158,  158,  158,
-      158,  158,  158,  158,  158,  158,  158,   42,   41,   40,
-      158,  158,  158,   39,   38,   35,   30,   16,   13,    9,
-
-        8,    7,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,  158,  163,  163,  164,  164,  165,
-      165,  166,  166,  167,  167,  168,  168,  170,  170,  171,
-      171,  172,  172,  173,  173,  174,  174,  175,  175,  176,
-      176,  177,  177,  178,  178,  179,  179,  180,  180,  181,
-      181,  162,  162,  162,  162,  162,  162,  162,  162,  162,
-      162,  162,  162,  162,  162,  162,  162,  162,  162,  162,
-      162,  162,  162,  162,  162,  162,  162,  162,  162,  162,
-      162,  162,  162,  162,  162,  162,  162,  162,  162,  162,
-      162
+      157,  157,  157,  157,  157,  157,  157,  157,  157,  158,
+      130,  129,  127,  125,  123,  158,  158,  158,  159,  120,
+      118,  117,  116,  115,  159,  159,  159,  160,  160,  160,
+      160,  160,  114,  160,  160,  160,  161,  161,  161,  161,
+      161,  161,  161,  161,  161,  162,  162,  113,  162,  162,
+      162,  162,  162,  162,  163,  163,  163,  163,  163,  163,
+      112,  111,  163,  164,  164,  110,  164,  164,  164,  164,
+      164,  164,  165,  165,  107,  165,  165,  165,  165,  165,
+      165,  166,  105,  104,  103,  102,  101,  166,  166,  167,
+      100,  167,  167,  167,   98,   97,   96,   95,   94,   93,
 
+       90,   89,   88,   87,   85,   84,   83,   81,   68,   67,
+       66,   65,   64,   63,   61,   60,   59,   55,   39,   31,
+       28,   26,   24,   19,   17,   16,   13,   11,    9,    8,
+        7,  153,  153,  153,  153,  153,  153,  153,  153,  153,
+      153,  153,  153,  153,  153,  153,  153,  153,  153,  153,
+      153,  153,  153,  153,  153,  153,  153,  153,  153,  153,
+      153,  153,  153,  153,  153,  153,  153,  153,  153,  153,
+      153
     } ;
 
 #define YY_TRAILING_MASK 0x2000
@@ -696,12 +640,13 @@ void glcpp_set_column (int  column_no , yyscan_t yyscanner);
 		yylloc->source = 0;	\
 	} while(0)
 
-#line 700 "glcpp/glcpp-lex.c"
+#line 644 "glcpp/glcpp-lex.c"
 
 #define INITIAL 0
 #define DONE 1
 #define COMMENT 2
 #define UNREACHABLE 3
+#define SKIP 4
 
 #define YY_EXTRA_TYPE glcpp_parser_t *
 
@@ -795,6 +740,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 );
@@ -952,9 +901,20 @@ YY_DECL
 
 #line 76 "glcpp/glcpp-lex.l"
 
+	/* Implicitly switch between SKIP and INITIAL (non-skipping);
+	 * don't switch if some other state was explicitly set.
+	 */
+	glcpp_parser_t *parser = yyextra;
+	if (YY_START == 0 || YY_START == SKIP) {
+		if (parser->lexing_if || parser->skip_stack == NULL || parser->skip_stack->type == SKIP_NO_SKIP) {
+			BEGIN 0;
+		} else {
+			BEGIN SKIP;
+		}
+	}
 
 	/* Single-line comments */
-#line 958 "glcpp/glcpp-lex.c"
+#line 918 "glcpp/glcpp-lex.c"
 
     yylval = yylval_param;
 
@@ -1017,14 +977,14 @@ yy_match:
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 163 )
+				if ( yy_current_state >= 154 )
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 			*yyg->yy_state_ptr++ = yy_current_state;
 			++yy_cp;
 			}
-		while ( yy_current_state != 162 );
+		while ( yy_current_state != 153 );
 
 yy_find_action:
 		yy_current_state = *--yyg->yy_state_ptr;
@@ -1049,9 +1009,6 @@ find_rule: /* we branch to this label when backing up */
 					{
 					yyg->yy_looking_for_trail_begin = yy_act & ~YY_TRAILING_MASK;
 					yyg->yy_looking_for_trail_begin |= YY_TRAILING_HEAD_MASK;
-					yyg->yy_full_match = yy_cp;
-					yyg->yy_full_state = yyg->yy_state_ptr;
-					yyg->yy_full_lp = yyg->yy_lp;
 					}
 				else
 					{
@@ -1076,41 +1033,41 @@ do_action:	/* This label is used only to access EOF actions. */
 	{ /* beginning of action switch */
 case 1:
 YY_RULE_SETUP
-#line 79 "glcpp/glcpp-lex.l"
+#line 90 "glcpp/glcpp-lex.l"
 {
 }
 	YY_BREAK
 /* Multi-line comments */
 case 2:
 YY_RULE_SETUP
-#line 83 "glcpp/glcpp-lex.l"
+#line 94 "glcpp/glcpp-lex.l"
 { yy_push_state(COMMENT, yyscanner); }
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 84 "glcpp/glcpp-lex.l"
+#line 95 "glcpp/glcpp-lex.l"
 
 	YY_BREAK
 case 4:
 /* rule 4 can match eol */
 YY_RULE_SETUP
-#line 85 "glcpp/glcpp-lex.l"
+#line 96 "glcpp/glcpp-lex.l"
 { yylineno++; yycolumn = 0; return NEWLINE; }
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 86 "glcpp/glcpp-lex.l"
+#line 97 "glcpp/glcpp-lex.l"
 
 	YY_BREAK
 case 6:
 /* rule 6 can match eol */
 YY_RULE_SETUP
-#line 87 "glcpp/glcpp-lex.l"
+#line 98 "glcpp/glcpp-lex.l"
 { yylineno++; yycolumn = 0; return NEWLINE; }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 88 "glcpp/glcpp-lex.l"
+#line 99 "glcpp/glcpp-lex.l"
 {
 	yy_pop_state(yyscanner);
 	if (yyextra->space_tokens)
@@ -1119,9 +1076,9 @@ YY_RULE_SETUP
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 94 "glcpp/glcpp-lex.l"
+#line 105 "glcpp/glcpp-lex.l"
 {
-	yylval->str = talloc_strdup (yyextra, yytext);
+	yylval->str = ralloc_strdup (yyextra, yytext);
 	yyextra->space_tokens = 0;
 	return HASH_VERSION;
 }
@@ -1130,9 +1087,9 @@ YY_RULE_SETUP
 	 * Simply pass them through to the main compiler's lexer/parser. */
 case 9:
 YY_RULE_SETUP
-#line 102 "glcpp/glcpp-lex.l"
+#line 113 "glcpp/glcpp-lex.l"
 {
-	yylval->str = talloc_strdup (yyextra, yytext);
+	yylval->str = ralloc_strdup (yyextra, yytext);
 	yylineno++;
 	yycolumn = 0;
 	return OTHER;
@@ -1143,7 +1100,7 @@ case 10:
 yyg->yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 109 "glcpp/glcpp-lex.l"
+#line 120 "glcpp/glcpp-lex.l"
 {
 	/* Eat characters until the first digit is
 	 * encountered
@@ -1165,7 +1122,7 @@ case 11:
 yyg->yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 125 "glcpp/glcpp-lex.l"
+#line 136 "glcpp/glcpp-lex.l"
 {
 	/* Eat characters until the first digit is
 	 * encountered
@@ -1181,10 +1138,10 @@ YY_RULE_SETUP
 	yylineno = strtol(ptr, &ptr, 0) - 1;
 }
 	YY_BREAK
+
 case 12:
-/* rule 12 can match eol */
 YY_RULE_SETUP
-#line 140 "glcpp/glcpp-lex.l"
+#line 152 "glcpp/glcpp-lex.l"
 {
 	yyextra->lexing_if = 1;
 	yyextra->space_tokens = 0;
@@ -1192,9 +1149,8 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 case 13:
-/* rule 13 can match eol */
 YY_RULE_SETUP
-#line 146 "glcpp/glcpp-lex.l"
+#line 158 "glcpp/glcpp-lex.l"
 {
 	yyextra->lexing_if = 1;
 	yyextra->space_tokens = 0;
@@ -1203,8 +1159,11 @@ YY_RULE_SETUP
 	YY_BREAK
 case 14:
 /* rule 14 can match eol */
+*yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */
+yyg->yy_c_buf_p = yy_cp -= 1;
+YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 152 "glcpp/glcpp-lex.l"
+#line 164 "glcpp/glcpp-lex.l"
 {
 	yyextra->lexing_if = 1;
 	yyextra->space_tokens = 0;
@@ -1212,9 +1171,8 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 case 15:
-/* rule 15 can match eol */
 YY_RULE_SETUP
-#line 158 "glcpp/glcpp-lex.l"
+#line 170 "glcpp/glcpp-lex.l"
 {
 	yyextra->lexing_if = 1;
 	yyextra->space_tokens = 0;
@@ -1222,53 +1180,30 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 case 16:
-/* rule 16 can match eol */
 YY_RULE_SETUP
-#line 164 "glcpp/glcpp-lex.l"
+#line 176 "glcpp/glcpp-lex.l"
 {
 	yyextra->space_tokens = 0;
 	return HASH_ELSE;
 }
 	YY_BREAK
 case 17:
-/* rule 17 can match eol */
 YY_RULE_SETUP
-#line 169 "glcpp/glcpp-lex.l"
+#line 181 "glcpp/glcpp-lex.l"
 {
 	yyextra->space_tokens = 0;
 	return HASH_ENDIF;
 }
 	YY_BREAK
-/* When skipping (due to an #if 0 or similar) consume anything
-	 * up to a newline. We do this with less priority than any
-	 * #if-related directive (#if, #elif, #else, #endif), but with
-	 * more priority than any other directive or token to avoid
-	 * any side-effects from skipped content.
-	 *
-	 * We use the lexing_if flag to avoid skipping any part of an
-	 * if conditional expression. */
+
 case 18:
-/* rule 18 can match eol */
-*yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */
-yyg->yy_c_buf_p = yy_cp -= 1;
-YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 182 "glcpp/glcpp-lex.l"
-{
-	/* Since this rule always matches, YY_USER_ACTION gets called for it,
-	 * wrongly incrementing yycolumn.  We undo that effect here. */
-	yycolumn -= yyleng;
-	if (yyextra->lexing_if ||
-	    yyextra->skip_stack == NULL ||
-	    yyextra->skip_stack->type == SKIP_NO_SKIP)
-	{
-		REJECT;
-	}
-}
+#line 187 "glcpp/glcpp-lex.l"
+;
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 194 "glcpp/glcpp-lex.l"
+#line 189 "glcpp/glcpp-lex.l"
 {
 	char *p;
 	for (p = yytext; !isalpha(p[0]); p++); /* skip "  #   " */
@@ -1278,7 +1213,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 201 "glcpp/glcpp-lex.l"
+#line 196 "glcpp/glcpp-lex.l"
 {
 	yyextra->space_tokens = 0;
 	return HASH_DEFINE_FUNC;
@@ -1286,7 +1221,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 206 "glcpp/glcpp-lex.l"
+#line 201 "glcpp/glcpp-lex.l"
 {
 	yyextra->space_tokens = 0;
 	return HASH_DEFINE_OBJ;
@@ -1294,7 +1229,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 211 "glcpp/glcpp-lex.l"
+#line 206 "glcpp/glcpp-lex.l"
 {
 	yyextra->space_tokens = 0;
 	return HASH_UNDEF;
@@ -1302,7 +1237,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 216 "glcpp/glcpp-lex.l"
+#line 211 "glcpp/glcpp-lex.l"
 {
 	yyextra->space_tokens = 0;
 	return HASH;
@@ -1310,124 +1245,124 @@ YY_RULE_SETUP
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 221 "glcpp/glcpp-lex.l"
+#line 216 "glcpp/glcpp-lex.l"
 {
-	yylval->str = talloc_strdup (yyextra, yytext);
+	yylval->str = ralloc_strdup (yyextra, yytext);
 	return INTEGER_STRING;
 }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 226 "glcpp/glcpp-lex.l"
+#line 221 "glcpp/glcpp-lex.l"
 {
-	yylval->str = talloc_strdup (yyextra, yytext);
+	yylval->str = ralloc_strdup (yyextra, yytext);
 	return INTEGER_STRING;
 }
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 231 "glcpp/glcpp-lex.l"
+#line 226 "glcpp/glcpp-lex.l"
 {
-	yylval->str = talloc_strdup (yyextra, yytext);
+	yylval->str = ralloc_strdup (yyextra, yytext);
 	return INTEGER_STRING;
 }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 236 "glcpp/glcpp-lex.l"
+#line 231 "glcpp/glcpp-lex.l"
 {
 	return LEFT_SHIFT;
 }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 240 "glcpp/glcpp-lex.l"
+#line 235 "glcpp/glcpp-lex.l"
 {
 	return RIGHT_SHIFT;
 }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 244 "glcpp/glcpp-lex.l"
+#line 239 "glcpp/glcpp-lex.l"
 {
 	return LESS_OR_EQUAL;
 }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 248 "glcpp/glcpp-lex.l"
+#line 243 "glcpp/glcpp-lex.l"
 {
 	return GREATER_OR_EQUAL;
 }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 252 "glcpp/glcpp-lex.l"
+#line 247 "glcpp/glcpp-lex.l"
 {
 	return EQUAL;
 }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 256 "glcpp/glcpp-lex.l"
+#line 251 "glcpp/glcpp-lex.l"
 {
 	return NOT_EQUAL;
 }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 260 "glcpp/glcpp-lex.l"
+#line 255 "glcpp/glcpp-lex.l"
 {
 	return AND;
 }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 264 "glcpp/glcpp-lex.l"
+#line 259 "glcpp/glcpp-lex.l"
 {
 	return OR;
 }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 268 "glcpp/glcpp-lex.l"
+#line 263 "glcpp/glcpp-lex.l"
 {
 	return PASTE;
 }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 272 "glcpp/glcpp-lex.l"
+#line 267 "glcpp/glcpp-lex.l"
 {
 	return DEFINED;
 }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 276 "glcpp/glcpp-lex.l"
+#line 271 "glcpp/glcpp-lex.l"
 {
-	yylval->str = talloc_strdup (yyextra, yytext);
+	yylval->str = ralloc_strdup (yyextra, yytext);
 	return IDENTIFIER;
 }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 281 "glcpp/glcpp-lex.l"
+#line 276 "glcpp/glcpp-lex.l"
 {
 	return yytext[0];
 }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 285 "glcpp/glcpp-lex.l"
+#line 280 "glcpp/glcpp-lex.l"
 {
-	yylval->str = talloc_strdup (yyextra, yytext);
+	yylval->str = ralloc_strdup (yyextra, yytext);
 	return OTHER;
 }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 290 "glcpp/glcpp-lex.l"
+#line 285 "glcpp/glcpp-lex.l"
 {
 	if (yyextra->space_tokens) {
 		return SPACE;
@@ -1437,7 +1372,7 @@ YY_RULE_SETUP
 case 41:
 /* rule 41 can match eol */
 YY_RULE_SETUP
-#line 296 "glcpp/glcpp-lex.l"
+#line 291 "glcpp/glcpp-lex.l"
 {
 	yyextra->lexing_if = 0;
 	yylineno++;
@@ -1447,7 +1382,7 @@ YY_RULE_SETUP
 	YY_BREAK
 /* Handle missing newline at EOF. */
 case YY_STATE_EOF(INITIAL):
-#line 304 "glcpp/glcpp-lex.l"
+#line 299 "glcpp/glcpp-lex.l"
 {
 	BEGIN DONE; /* Don't keep matching this rule forever. */
 	yyextra->lexing_if = 0;
@@ -1460,7 +1395,7 @@ case YY_STATE_EOF(INITIAL):
 	warnings. */
 case 42:
 YY_RULE_SETUP
-#line 314 "glcpp/glcpp-lex.l"
+#line 309 "glcpp/glcpp-lex.l"
 {
 	unput('.');
 	yy_top_state(yyextra);
@@ -1468,13 +1403,14 @@ YY_RULE_SETUP
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 319 "glcpp/glcpp-lex.l"
+#line 314 "glcpp/glcpp-lex.l"
 ECHO;
 	YY_BREAK
-#line 1475 "glcpp/glcpp-lex.c"
+#line 1410 "glcpp/glcpp-lex.c"
 			case YY_STATE_EOF(DONE):
 			case YY_STATE_EOF(COMMENT):
 			case YY_STATE_EOF(UNREACHABLE):
+			case YY_STATE_EOF(SKIP):
 				yyterminate();
 
 	case YY_END_OF_BUFFER:
@@ -1737,7 +1673,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 163 )
+			if ( yy_current_state >= 154 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -1761,11 +1697,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 163 )
+		if ( yy_current_state >= 154 )
 			yy_c = yy_meta[(unsigned int) yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 162);
+	yy_is_jam = (yy_current_state == 153);
 	if ( ! yy_is_jam )
 		*yyg->yy_state_ptr++ = yy_current_state;
 
@@ -2665,7 +2601,7 @@ void glcpp_free (void * ptr , yyscan_t yyscanner)
 
 #define YYTABLES_NAME "yytables"
 
-#line 319 "glcpp/glcpp-lex.l"
+#line 314 "glcpp/glcpp-lex.l"
 
 
 

src/glsl/glcpp/glcpp-lex.l

@@ -57,7 +57,7 @@ void glcpp_set_column (int  column_no , yyscan_t yyscanner);
 %option stack
 %option never-interactive
 
-%x DONE COMMENT UNREACHABLE
+%x DONE COMMENT UNREACHABLE SKIP
 
 SPACE		[[:space:]]
 NONSPACE	[^[:space:]]
@@ -74,6 +74,17 @@ OCTAL_INTEGER		0[0-7]*[uU]?
 HEXADECIMAL_INTEGER	0[xX][0-9a-fA-F]+[uU]?
 
 %%
+	/* Implicitly switch between SKIP and INITIAL (non-skipping);
+	 * don't switch if some other state was explicitly set.
+	 */
+	glcpp_parser_t *parser = yyextra;
+	if (YY_START == 0 || YY_START == SKIP) {
+		if (parser->lexing_if || parser->skip_stack == NULL || parser->skip_stack->type == SKIP_NO_SKIP) {
+			BEGIN 0;
+		} else {
+			BEGIN SKIP;
+		}
+	}
 
 	/* Single-line comments */
 "//"[^\n]* {
@@ -92,7 +103,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 +111,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;
@@ -137,60 +148,44 @@ HEXADECIMAL_INTEGER	0[xX][0-9a-fA-F]+[uU]?
 	yylineno = strtol(ptr, &ptr, 0) - 1;
 }
 
-{HASH}ifdef/.*\n {
+<SKIP,INITIAL>{
+{HASH}ifdef {
 	yyextra->lexing_if = 1;
 	yyextra->space_tokens = 0;
 	return HASH_IFDEF;
 }
 
-{HASH}ifndef/.*\n {
+{HASH}ifndef {
 	yyextra->lexing_if = 1;
 	yyextra->space_tokens = 0;
 	return HASH_IFNDEF;
 }
 
-{HASH}if/[^_a-zA-Z0-9].*\n {
+{HASH}if/[^_a-zA-Z0-9] {
 	yyextra->lexing_if = 1;
 	yyextra->space_tokens = 0;
 	return HASH_IF;
 }
 
-{HASH}elif/.*\n {
+{HASH}elif {
 	yyextra->lexing_if = 1;
 	yyextra->space_tokens = 0;
 	return HASH_ELIF;
 }
 
-{HASH}else/.*\n {
+{HASH}else {
 	yyextra->space_tokens = 0;
 	return HASH_ELSE;
 }
 
-{HASH}endif/.*\n {
+{HASH}endif {
 	yyextra->space_tokens = 0;
 	return HASH_ENDIF;
 }
-
-	/* When skipping (due to an #if 0 or similar) consume anything
-	 * up to a newline. We do this with less priority than any
-	 * #if-related directive (#if, #elif, #else, #endif), but with
-	 * more priority than any other directive or token to avoid
-	 * any side-effects from skipped content.
-	 *
-	 * We use the lexing_if flag to avoid skipping any part of an
-	 * if conditional expression. */
-[^\n]+/\n {
-	/* Since this rule always matches, YY_USER_ACTION gets called for it,
-	 * wrongly incrementing yycolumn.  We undo that effect here. */
-	yycolumn -= yyleng;
-	if (yyextra->lexing_if ||
-	    yyextra->skip_stack == NULL ||
-	    yyextra->skip_stack->type == SKIP_NO_SKIP)
-	{
-		REJECT;
-	}
 }
 
+<SKIP>[^\n] ;
+
 {HASH}error.* {
 	char *p;
 	for (p = yytext; !isalpha(p[0]); p++); /* skip "  #   " */
@@ -219,17 +214,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 +269,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 +278,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;
 }
 
@@ -293,7 +288,7 @@ HEXADECIMAL_INTEGER	0[xX][0-9a-fA-F]+[uU]?
 	}
 }
 
-\n {
+<SKIP,INITIAL>\n {
 	yyextra->lexing_if = 0;
 	yylineno++;
 	yycolumn = 0;

src/glsl/glcpp/glcpp-parse.y

@@ -32,10 +32,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);
 
@@ -79,7 +75,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);
 
@@ -89,10 +85,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);
 
@@ -102,16 +95,16 @@ _token_list_append_list (token_list_t *list, token_list_t *tail);
 static int
 _token_list_equal_ignoring_space (token_list_t *a, token_list_t *b);
 
-static active_list_t *
-_active_list_push (active_list_t *list,
-		   const char *identifier,
-		   token_node_t *marker);
+static void
+_parser_active_list_push (glcpp_parser_t *parser,
+			  const char *identifier,
+			  token_node_t *marker);
 
-static active_list_t *
-_active_list_pop (active_list_t *list);
+static void
+_parser_active_list_pop (glcpp_parser_t *parser);
 
-int
-_active_list_contains (active_list_t *list, const char *identifier);
+static int
+_parser_active_list_contains (glcpp_parser_t *parser, const char *identifier);
 
 static void
 _glcpp_parser_expand_if (glcpp_parser_t *parser, int type, token_list_t *list);
@@ -192,12 +185,12 @@ input:
 
 line:
 	control_line {
-		glcpp_print(parser->output, "\n");
+		ralloc_strcat (&parser->output, "\n");
 	}
 |	text_line {
 		_glcpp_parser_print_expanded_token_list (parser, $1);
-		glcpp_print(parser->output, "\n");
-		talloc_free ($1);
+		ralloc_strcat (&parser->output, "\n");
+		ralloc_free ($1);
 	}
 |	expanded_line
 |	HASH non_directive
@@ -226,9 +219,9 @@ control_line:
 		macro_t *macro = hash_table_find (parser->defines, $2);
 		if (macro) {
 			hash_table_remove (parser->defines, $2);
-			talloc_free (macro);
+			ralloc_free (macro);
 		}
-		talloc_free ($2);
+		ralloc_free ($2);
 	}
 |	HASH_IF conditional_tokens NEWLINE {
 		/* Be careful to only evaluate the 'if' expression if
@@ -261,12 +254,12 @@ control_line:
 	}
 |	HASH_IFDEF IDENTIFIER junk NEWLINE {
 		macro_t *macro = hash_table_find (parser->defines, $2);
-		talloc_free ($2);
+		ralloc_free ($2);
 		_glcpp_parser_skip_stack_push_if (parser, & @1, macro != NULL);
 	}
 |	HASH_IFNDEF IDENTIFIER junk NEWLINE {
 		macro_t *macro = hash_table_find (parser->defines, $2);
-		talloc_free ($2);
+		ralloc_free ($2);
 		_glcpp_parser_skip_stack_push_if (parser, & @1, macro == NULL);
 	}
 |	HASH_ELIF conditional_tokens NEWLINE {
@@ -313,7 +306,7 @@ control_line:
 		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__", $2);
 
@@ -328,7 +321,7 @@ control_line:
 		if ($2 >= 130 || $2 == 100)
 			add_builtin_define (parser, "GL_FRAGMENT_PRECISION_HIGH", 1);
 
-		glcpp_printf(parser->output, "#version %" PRIiMAX, $2);
+		ralloc_asprintf_append (&parser->output, "#version %" PRIiMAX, $2);
 	}
 |	HASH NEWLINE
 ;
@@ -395,10 +388,20 @@ expression:
 		$$ = $1 + $3;
 	}
 |	expression '%' expression {
-		$$ = $1 % $3;
+		if ($3 == 0) {
+			yyerror (& @1, parser,
+				 "zero modulus in preprocessor directive");
+		} else {
+			$$ = $1 % $3;
+		}
 	}
 |	expression '/' expression {
-		$$ = $1 / $3;
+		if ($3 == 0) {
+			yyerror (& @1, parser,
+				 "division by 0 in preprocessor directive");
+		} else {
+			$$ = $1 / $3;
+		}
 	}
 |	expression '*' expression {
 		$$ = $1 * $3;
@@ -424,12 +427,12 @@ identifier_list:
 	IDENTIFIER {
 		$$ = _string_list_create (parser);
 		_string_list_append_item ($$, $1);
-		talloc_steal ($$, $1);
+		ralloc_steal ($$, $1);
 	}
 |	identifier_list ',' IDENTIFIER {
 		$$ = $1;	
 		_string_list_append_item ($$, $3);
-		talloc_steal ($$, $3);
+		ralloc_steal ($$, $3);
 	}
 ;
 
@@ -474,12 +477,10 @@ conditional_tokens:
 	conditional_token {
 		$$ = _token_list_create (parser);
 		_token_list_append ($$, $1);
-		talloc_unlink (parser, $1);
 	}
 |	conditional_tokens conditional_token {
 		$$ = $1;
 		_token_list_append ($$, $2);
-		talloc_unlink (parser, $2);
 	}
 ;
 
@@ -488,12 +489,10 @@ pp_tokens:
 		parser->space_tokens = 1;
 		$$ = _token_list_create (parser);
 		_token_list_append ($$, $1);
-		talloc_unlink (parser, $1);
 	}
 |	pp_tokens preprocessing_token {
 		$$ = $1;
 		_token_list_append ($$, $2);
-		talloc_unlink (parser, $2);
 	}
 ;
 
@@ -561,7 +560,7 @@ _string_list_create (void *ctx)
 {
 	string_list_t *list;
 
-	list = talloc (ctx, string_list_t);
+	list = ralloc (ctx, string_list_t);
 	list->head = NULL;
 	list->tail = NULL;
 
@@ -573,8 +572,8 @@ _string_list_append_item (string_list_t *list, const char *str)
 {
 	string_node_t *node;
 
-	node = talloc (list, string_node_t);
-	node->str = talloc_strdup (node, str);
+	node = ralloc (list, string_node_t);
+	node->str = ralloc_strdup (node, str);
 
 	node->next = NULL;
 
@@ -652,7 +651,7 @@ _argument_list_create (void *ctx)
 {
 	argument_list_t *list;
 
-	list = talloc (ctx, argument_list_t);
+	list = ralloc (ctx, argument_list_t);
 	list->head = NULL;
 	list->tail = NULL;
 
@@ -664,7 +663,7 @@ _argument_list_append (argument_list_t *list, token_list_t *argument)
 {
 	argument_node_t *node;
 
-	node = talloc (list, argument_node_t);
+	node = ralloc (list, argument_node_t);
 	node->argument = argument;
 
 	node->next = NULL;
@@ -715,15 +714,17 @@ _argument_list_member_at (argument_list_t *list, int index)
 	return NULL;
 }
 
-/* Note: This function talloc_steal()s the str pointer. */
+/* Note: This function ralloc_steal()s the str pointer. */
 token_t *
 _token_create_str (void *ctx, int type, char *str)
 {
 	token_t *token;
 
-	token = talloc (ctx, token_t);
+	token = ralloc (ctx, token_t);
 	token->type = type;
-	token->value.str = talloc_steal (token, str);
+	token->value.str = str;
+
+	ralloc_steal (token, str);
 
 	return token;
 }
@@ -733,7 +734,7 @@ _token_create_ival (void *ctx, int type, int ival)
 {
 	token_t *token;
 
-	token = talloc (ctx, token_t);
+	token = ralloc (ctx, token_t);
 	token->type = type;
 	token->value.ival = ival;
 
@@ -745,7 +746,7 @@ _token_list_create (void *ctx)
 {
 	token_list_t *list;
 
-	list = talloc (ctx, token_list_t);
+	list = ralloc (ctx, token_list_t);
 	list->head = NULL;
 	list->tail = NULL;
 	list->non_space_tail = NULL;
@@ -758,11 +759,12 @@ _token_list_append (token_list_t *list, token_t *token)
 {
 	token_node_t *node;
 
-	node = talloc (list, token_node_t);
-	node->token = talloc_reference (list, token);
-
+	node = ralloc (list, token_node_t);
+	node->token = token;
 	node->next = NULL;
 
+	ralloc_steal (list, token);
+
 	if (list->head == NULL) {
 		list->head = node;
 	} else {
@@ -800,8 +802,11 @@ _token_list_copy (void *ctx, token_list_t *other)
 		return NULL;
 
 	copy = _token_list_create (ctx);
-	for (node = other->head; node; node = node->next)
-		_token_list_append (copy, node->token);
+	for (node = other->head; node; node = node->next) {
+		token_t *new_token = ralloc (copy, token_t);
+		*new_token = *node->token;
+		_token_list_append (copy, new_token);
+	}
 
 	return copy;
 }
@@ -818,17 +823,38 @@ _token_list_trim_trailing_space (token_list_t *list)
 
 		while (tail) {
 			next = tail->next;
-			talloc_free (tail);
+			ralloc_free (tail);
 			tail = next;
 		}
 	}
 }
 
+static int
+_token_list_is_empty_ignoring_space (token_list_t *l)
+{
+	token_node_t *n;
+
+	if (l == NULL)
+		return 1;
+
+	n = l->head;
+	while (n != NULL && n->token->type == SPACE)
+		n = n->next;
+
+	return n == NULL;
+}
+
 int
 _token_list_equal_ignoring_space (token_list_t *a, token_list_t *b)
 {
 	token_node_t *node_a, *node_b;
 
+	if (a == NULL || b == NULL) {
+		int a_empty = _token_list_is_empty_ignoring_space(a);
+		int b_empty = _token_list_is_empty_ignoring_space(b);
+		return a_empty == b_empty;
+	}
+
 	node_a = a->head;
 	node_b = b->head;
 
@@ -883,51 +909,51 @@ static void
 _token_print (char **out, token_t *token)
 {
 	if (token->type < 256) {
-		glcpp_printf (*out, "%c", token->type);
+		ralloc_asprintf_append (out, "%c", token->type);
 		return;
 	}
 
 	switch (token->type) {
 	case INTEGER:
-		glcpp_printf (*out, "%" PRIiMAX, token->value.ival);
+		ralloc_asprintf_append (out, "%" PRIiMAX, token->value.ival);
 		break;
 	case IDENTIFIER:
 	case INTEGER_STRING:
 	case OTHER:
-		glcpp_print (*out, token->value.str);
+		ralloc_strcat (out, token->value.str);
 		break;
 	case SPACE:
-		glcpp_print (*out, " ");
+		ralloc_strcat (out, " ");
 		break;
 	case LEFT_SHIFT:
-		glcpp_print (*out, "<<");
+		ralloc_strcat (out, "<<");
 		break;
 	case RIGHT_SHIFT:
-		glcpp_print (*out, ">>");
+		ralloc_strcat (out, ">>");
 		break;
 	case LESS_OR_EQUAL:
-		glcpp_print (*out, "<=");
+		ralloc_strcat (out, "<=");
 		break;
 	case GREATER_OR_EQUAL:
-		glcpp_print (*out, ">=");
+		ralloc_strcat (out, ">=");
 		break;
 	case EQUAL:
-		glcpp_print (*out, "==");
+		ralloc_strcat (out, "==");
 		break;
 	case NOT_EQUAL:
-		glcpp_print (*out, "!=");
+		ralloc_strcat (out, "!=");
 		break;
 	case AND:
-		glcpp_print (*out, "&&");
+		ralloc_strcat (out, "&&");
 		break;
 	case OR:
-		glcpp_print (*out, "||");
+		ralloc_strcat (out, "||");
 		break;
 	case PASTE:
-		glcpp_print (*out, "##");
+		ralloc_strcat (out, "##");
 		break;
 	case COMMA_FINAL:
-		glcpp_print (*out, ",");
+		ralloc_strcat (out, ",");
 		break;
 	case PLACEHOLDER:
 		/* Nothing to print. */
@@ -938,7 +964,7 @@ _token_print (char **out, token_t *token)
 	}
 }
 
-/* Return a new token (talloc()ed off of 'token') formed by pasting
+/* Return a new token (ralloc()ed off of 'token') formed by pasting
  * 'token' and 'other'. Note that this function may return 'token' or
  * 'other' directly rather than allocating anything new.
  *
@@ -1009,7 +1035,7 @@ _token_paste (glcpp_parser_t *parser, token_t *token, token_t *other)
 	{
 		char *str;
 
-		str = talloc_asprintf (token, "%s%s", token->value.str,
+		str = ralloc_asprintf (token, "%s%s", token->value.str,
 				       other->value.str);
 		combined = _token_create_str (token, token->type, str);
 		combined->location = token->location;
@@ -1017,11 +1043,11 @@ _token_paste (glcpp_parser_t *parser, token_t *token, token_t *other)
 	}
 
 	glcpp_error (&token->location, parser, "");
-	glcpp_print (parser->info_log, "Pasting \"");
+	ralloc_strcat (&parser->info_log, "Pasting \"");
 	_token_print (&parser->info_log, token);
-	glcpp_print (parser->info_log, "\" and \"");
+	ralloc_strcat (&parser->info_log, "\" and \"");
 	_token_print (&parser->info_log, other);
-	glcpp_print (parser->info_log, "\" does not give a valid preprocessing token.\n");
+	ralloc_strcat (&parser->info_log, "\" does not give a valid preprocessing token.\n");
 
 	return token;
 }
@@ -1055,8 +1081,6 @@ static void add_builtin_define(glcpp_parser_t *parser,
    list = _token_list_create(parser);
    _token_list_append(list, tok);
    _define_object_macro(parser, NULL, name, list);
-
-   talloc_unlink(parser, tok);
 }
 
 glcpp_parser_t *
@@ -1065,7 +1089,7 @@ glcpp_parser_create (const struct gl_extensions *extensions, int api)
 	glcpp_parser_t *parser;
 	int language_version;
 
-	parser = talloc (NULL, glcpp_parser_t);
+	parser = ralloc (NULL, glcpp_parser_t);
 
 	glcpp_lex_init_extra (parser, &parser->scanner);
 	parser->defines = hash_table_ctor (32, hash_table_string_hash,
@@ -1082,8 +1106,8 @@ glcpp_parser_create (const struct gl_extensions *extensions, int api)
 	parser->lex_from_list = NULL;
 	parser->lex_from_node = NULL;
 
-	parser->output = talloc_strdup(parser, "");
-	parser->info_log = talloc_strdup(parser, "");
+	parser->output = ralloc_strdup(parser, "");
+	parser->info_log = ralloc_strdup(parser, "");
 	parser->error = 0;
 
 	/* Add pre-defined macros. */
@@ -1123,7 +1147,7 @@ glcpp_parser_destroy (glcpp_parser_t *parser)
 {
 	glcpp_lex_destroy (parser->scanner);
 	hash_table_dtor (parser->defines);
-	talloc_free (parser);
+	ralloc_free (parser);
 }
 
 typedef enum function_status
@@ -1294,7 +1318,7 @@ _glcpp_parser_expand_function (glcpp_parser_t *parser,
 
 	/* Replace a macro defined as empty with a SPACE token. */
 	if (macro->replacements == NULL) {
-		talloc_free (arguments);
+		ralloc_free (arguments);
 		return _token_list_create_with_one_space (parser);
 	}
 
@@ -1442,7 +1466,7 @@ _glcpp_parser_expand_node (glcpp_parser_t *parser,
 
 	/* Finally, don't expand this macro if we're already actively
 	 * expanding it, (to avoid infinite recursion). */
-	if (_active_list_contains (parser->active, identifier)) {
+	if (_parser_active_list_contains (parser, identifier)) {
 		/* We change the token type here from IDENTIFIER to
 		 * OTHER to prevent any future expansion of this
 		 * unexpanded token. */
@@ -1450,7 +1474,7 @@ _glcpp_parser_expand_node (glcpp_parser_t *parser,
 		token_list_t *expansion;
 		token_t *final;
 
-		str = talloc_strdup (parser, token->value.str);
+		str = ralloc_strdup (parser, token->value.str);
 		final = _token_create_str (parser, OTHER, str);
 		expansion = _token_list_create (parser);
 		_token_list_append (expansion, final);
@@ -1472,51 +1496,53 @@ _glcpp_parser_expand_node (glcpp_parser_t *parser,
 	return _glcpp_parser_expand_function (parser, node, last);
 }
 
-/* Push a new identifier onto the active list, returning the new list.
+/* Push a new identifier onto the parser's active list.
  *
  * Here, 'marker' is the token node that appears in the list after the
  * expansion of 'identifier'. That is, when the list iterator begins
- * examinging 'marker', then it is time to pop this node from the
+ * examining 'marker', then it is time to pop this node from the
  * active stack.
  */
-active_list_t *
-_active_list_push (active_list_t *list,
-		   const char *identifier,
-		   token_node_t *marker)
+static void
+_parser_active_list_push (glcpp_parser_t *parser,
+			  const char *identifier,
+			  token_node_t *marker)
 {
 	active_list_t *node;
 
-	node = talloc (list, active_list_t);
-	node->identifier = talloc_strdup (node, identifier);
+	node = ralloc (parser->active, active_list_t);
+	node->identifier = ralloc_strdup (node, identifier);
 	node->marker = marker;
-	node->next = list;
+	node->next = parser->active;
 
-	return node;
+	parser->active = node;
 }
 
-active_list_t *
-_active_list_pop (active_list_t *list)
+static void
+_parser_active_list_pop (glcpp_parser_t *parser)
 {
-	active_list_t *node = list;
+	active_list_t *node = parser->active;
 
-	if (node == NULL)
-		return NULL;
+	if (node == NULL) {
+		parser->active = NULL;
+		return;
+	}
 
-	node = list->next;
-	talloc_free (list);
+	node = parser->active->next;
+	ralloc_free (parser->active);
 
-	return node;
+	parser->active = node;
 }
 
-int
-_active_list_contains (active_list_t *list, const char *identifier)
+static int
+_parser_active_list_contains (glcpp_parser_t *parser, const char *identifier)
 {
 	active_list_t *node;
 
-	if (list == NULL)
+	if (parser->active == NULL)
 		return 0;
 
-	for (node = list; node; node = node->next)
+	for (node = parser->active; node; node = node->next)
 		if (strcmp (node->identifier, identifier) == 0)
 			return 1;
 
@@ -1535,6 +1561,7 @@ _glcpp_parser_expand_token_list (glcpp_parser_t *parser,
 	token_node_t *node_prev;
 	token_node_t *node, *last = NULL;
 	token_list_t *expansion;
+	active_list_t *active_initial = parser->active;
 
 	if (list == NULL)
 		return;
@@ -1547,10 +1574,8 @@ _glcpp_parser_expand_token_list (glcpp_parser_t *parser,
 	while (node) {
 
 		while (parser->active && parser->active->marker == node)
-			parser->active = _active_list_pop (parser->active);
+			_parser_active_list_pop (parser);
 
-		/* Find the expansion for node, which will replace all
-		 * nodes from node to last, inclusive. */
 		expansion = _glcpp_parser_expand_node (parser, node, &last);
 		if (expansion) {
 			token_node_t *n;
@@ -1559,12 +1584,12 @@ _glcpp_parser_expand_token_list (glcpp_parser_t *parser,
 				while (parser->active &&
 				       parser->active->marker == n)
 				{
-					parser->active = _active_list_pop (parser->active);
+					_parser_active_list_pop (parser);
 				}
 
-			parser->active = _active_list_push (parser->active,
-							    node->token->value.str,
-							    last->next);
+			_parser_active_list_push (parser,
+						  node->token->value.str,
+						  last->next);
 			
 			/* Splice expansion into list, supporting a
 			 * simple deletion if the expansion is
@@ -1591,8 +1616,11 @@ _glcpp_parser_expand_token_list (glcpp_parser_t *parser,
 		node = node_prev ? node_prev->next : list->head;
 	}
 
-	while (parser->active)
-		parser->active = _active_list_pop (parser->active);
+	/* Remove any lingering effects of this invocation on the
+	 * active list. That is, pop until the list looks like it did
+	 * at the beginning of this function. */
+	while (parser->active && parser->active != active_initial)
+		_parser_active_list_pop (parser);
 
 	list->non_space_tail = list->tail;
 }
@@ -1652,17 +1680,18 @@ _define_object_macro (glcpp_parser_t *parser,
 	if (loc != NULL)
 		_check_for_reserved_macro_name(parser, loc, identifier);
 
-	macro = talloc (parser, macro_t);
+	macro = ralloc (parser, macro_t);
 
 	macro->is_function = 0;
 	macro->parameters = NULL;
-	macro->identifier = talloc_strdup (macro, identifier);
-	macro->replacements = talloc_steal (macro, replacements);
+	macro->identifier = ralloc_strdup (macro, identifier);
+	macro->replacements = replacements;
+	ralloc_steal (macro, replacements);
 
 	previous = hash_table_find (parser->defines, identifier);
 	if (previous) {
 		if (_macro_equal (macro, previous)) {
-			talloc_free (macro);
+			ralloc_free (macro);
 			return;
 		}
 		glcpp_error (loc, parser, "Redefinition of macro %s\n",
@@ -1683,17 +1712,18 @@ _define_function_macro (glcpp_parser_t *parser,
 
 	_check_for_reserved_macro_name(parser, loc, identifier);
 
-	macro = talloc (parser, macro_t);
+	macro = ralloc (parser, macro_t);
+	ralloc_steal (macro, parameters);
+	ralloc_steal (macro, replacements);
 
 	macro->is_function = 1;
-	macro->parameters = talloc_steal (macro, parameters);
-	macro->identifier = talloc_strdup (macro, identifier);
-	macro->replacements = talloc_steal (macro, replacements);
-
+	macro->parameters = parameters;
+	macro->identifier = ralloc_strdup (macro, identifier);
+	macro->replacements = replacements;
 	previous = hash_table_find (parser->defines, identifier);
 	if (previous) {
 		if (_macro_equal (macro, previous)) {
-			talloc_free (macro);
+			ralloc_free (macro);
 			return;
 		}
 		glcpp_error (loc, parser, "Redefinition of macro %s\n",
@@ -1769,7 +1799,7 @@ glcpp_parser_lex (YYSTYPE *yylval, YYLTYPE *yylloc, glcpp_parser_t *parser)
 	node = parser->lex_from_node;
 
 	if (node == NULL) {
-		talloc_free (parser->lex_from_list);
+		ralloc_free (parser->lex_from_list);
 		parser->lex_from_list = NULL;
 		return NEWLINE;
 	}
@@ -1798,13 +1828,13 @@ glcpp_parser_lex_from (glcpp_parser_t *parser, token_list_t *list)
 		_token_list_append (parser->lex_from_list, node->token);
 	}
 
-	talloc_free (list);
+	ralloc_free (list);
 
 	parser->lex_from_node = parser->lex_from_list->head;
 
 	/* It's possible the list consisted of nothing but whitespace. */
 	if (parser->lex_from_node == NULL) {
-		talloc_free (parser->lex_from_list);
+		ralloc_free (parser->lex_from_list);
 		parser->lex_from_list = NULL;
 	}
 }
@@ -1819,7 +1849,7 @@ _glcpp_parser_skip_stack_push_if (glcpp_parser_t *parser, YYLTYPE *loc,
 	if (parser->skip_stack)
 		current = parser->skip_stack->type;
 
-	node = talloc (parser, skip_node_t);
+	node = ralloc (parser, skip_node_t);
 	node->loc = *loc;
 
 	if (current == SKIP_NO_SKIP) {
@@ -1864,5 +1894,5 @@ _glcpp_parser_skip_stack_pop (glcpp_parser_t *parser, YYLTYPE *loc)
 
 	node = parser->skip_stack;
 	parser->skip_stack = node->next;
-	talloc_free (node);
+	ralloc_free (node);
 }