texformat: use MESA_FORMAT_ARGB2101010 with GL_UNSIGNED_INT_2_10_10_10_REV

Choose MESA_FORMAT_ARGB2101010 when storing
GL_RGBA + GL_UNSIGNED_INT_2_10_10_10_REV or
GL_RGB + GL_UNSIGNED_INT_2_10_10_10_REV.

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>

.gitignore

@@ -4,7 +4,6 @@
 *.ilk
 *.la
 *.lo
-*.log
 *.o
 *.obj
 *.os
@@ -18,7 +17,6 @@
 *.tar
 *.tar.bz2
 *.tar.gz
-*.trs
 *.zip
 *~
 depend
@@ -38,9 +36,9 @@ config.py
 build
 libtool
 manifest.txt
+Makefile.in
 .dir-locals.el
 .deps/
 .dirstamp
 .libs/
-Makefile
-Makefile.in
+/Makefile

Android.common.mk

@@ -35,8 +35,6 @@ LOCAL_C_INCLUDES += \
 
 # define ANDROID_VERSION (e.g., 4.0.x => 0x0400)
 LOCAL_CFLAGS += \
-	-DPACKAGE_VERSION=\"9.2.2\" \
-	-DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\" \
 	-DANDROID_VERSION=0x0$(MESA_ANDROID_MAJOR_VERSION)0$(MESA_ANDROID_MINOR_VERSION)
 
 LOCAL_CFLAGS += \

Android.mk

@@ -24,7 +24,7 @@
 # BOARD_GPU_DRIVERS should be defined.  The valid values are
 #
 #   classic drivers: i915 i965
-#   gallium drivers: swrast i915g ilo nouveau r300g r600g radeonsi vmwgfx
+#   gallium drivers: swrast i915g nouveau r300g r600g radeonsi vmwgfx
 #
 # The main target is libGLES_mesa.  For each classic driver enabled, a DRI
 # module will also be built.  DRI modules will be loaded by libGLES_mesa.
@@ -42,7 +42,7 @@ DRM_TOP := external/drm
 DRM_GRALLOC_TOP := hardware/drm_gralloc
 
 classic_drivers := i915 i965
-gallium_drivers := swrast i915g ilo nouveau r300g r600g radeonsi vmwgfx
+gallium_drivers := swrast i915g nouveau r300g r600g radeonsi vmwgfx
 
 MESA_GPU_DRIVERS := $(strip $(BOARD_GPU_DRIVERS))
 

Makefile.am

@@ -30,12 +30,31 @@ check-local:
 	$(MAKE) -C src/mapi/glapi/tests check
 	$(MAKE) -C src/mapi/shared-glapi/tests check
 	$(MAKE) -C src/mesa/main/tests check
+	$(MAKE) -C src/glsl/tests check
 	$(MAKE) -C src/glx/tests check
 
+clean-local:
+	-@touch $(top_builddir)/configs/current
+	-@for dir in $(SUBDIRS) ; do \
+		if [ -d $$dir ] ; then \
+			(cd $$dir && $(MAKE) clean) ; \
+		fi \
+	done
+	-@test -s $(top_builddir)/configs/current || rm -f $(top_builddir)/configs/current
+
+
+
+distclean-local:
+	-rm -rf lib*
+	-rm -f $(top_builddir)/configs/current
+	-find . '(' -name '*.o' -o -name '*.a' -o -name '*.so' -o \
+	  -name depend -o -name depend.bak ')' -exec rm -f '{}' ';'
+
 .PHONY: doxygen
 
 # Rules for making release tarballs
 
+PACKAGE_VERSION=9.1-devel
 PACKAGE_DIR = Mesa-$(PACKAGE_VERSION)
 PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION)
 
@@ -50,14 +69,19 @@ EXTRA_FILES = \
 	bin/install-sh					\
 	bin/ltmain.sh					\
 	bin/missing					\
-	bin/test-driver					\
 	bin/ylwrap					\
-	src/glsl/glsl_parser.cpp			\
+	src/glsl/glsl_parser.cc				\
 	src/glsl/glsl_parser.h				\
-	src/glsl/glsl_lexer.cpp				\
+	src/glsl/glsl_lexer.cc				\
 	src/glsl/glcpp/glcpp-lex.c			\
 	src/glsl/glcpp/glcpp-parse.c			\
 	src/glsl/glcpp/glcpp-parse.h			\
+	src/mesa/main/api_exec_es1.c			\
+	src/mesa/main/api_exec_es1_dispatch.h		\
+	src/mesa/main/api_exec_es1_remap_helper.h	\
+	src/mesa/main/api_exec_es2.c			\
+	src/mesa/main/api_exec_es2_dispatch.h		\
+	src/mesa/main/api_exec_es2_remap_helper.h	\
 	src/mesa/program/lex.yy.c			\
 	src/mesa/program/program_parse.tab.c		\
 	src/mesa/program/program_parse.tab.h		\
@@ -69,7 +93,9 @@ IGNORE_FILES = \
 
 
 parsers: configure
-	$(MAKE) -C src/glsl glsl_parser.cpp glsl_parser.h glsl_lexer.cpp glcpp/glcpp-lex.c glcpp/glcpp-parse.c glcpp/glcpp-parse.h
+	-@touch $(top_builddir)/configs/current
+	$(MAKE) -C src/glsl glsl_parser.cc glsl_parser.h glsl_lexer.cc
+	$(MAKE) -C src/glsl/glcpp glcpp-lex.c glcpp-parse.c glcpp-parse.h
 	$(MAKE) -C src/mesa/program lex.yy.c program_parse.tab.c program_parse.tab.h
 
 # Everything for new a Mesa release:

SConstruct

@@ -69,11 +69,6 @@ if env['gles']:
 #######################################################################
 # Environment setup
 
-env.Append(CPPDEFINES = [
-    ('PACKAGE_VERSION', '\\"9.2.2\\"'),
-    ('PACKAGE_BUGREPORT', '\\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\\"'),
-])
-
 # Includes
 env.Prepend(CPPPATH = [
 	'#/include',

acinclude.m4

@@ -0,0 +1,119 @@
+# A few convenience macros for Mesa, mostly to keep all the platform
+# specifics out of configure.ac.
+
+# MESA_PIC_FLAGS()
+#
+# Find out whether to build PIC code using the option --enable-pic and
+# the configure enable_static/enable_shared settings. If PIC is needed,
+# figure out the necessary flags for the platform and compiler.
+#
+# The platform checks have been shamelessly taken from libtool and
+# stripped down to just what's needed for Mesa. See _LT_COMPILER_PIC in
+# /usr/share/aclocal/libtool.m4 or
+# http://git.savannah.gnu.org/gitweb/?p=libtool.git;a=blob;f=libltdl/m4/libtool.m4;hb=HEAD
+#
+AC_DEFUN([MESA_PIC_FLAGS],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_ARG_VAR([PIC_FLAGS], [compiler flags for PIC code])
+AC_ARG_ENABLE([pic],
+    [AS_HELP_STRING([--disable-pic],
+        [don't compile PIC objects @<:@default=enabled for shared builds
+        on supported platforms@:>@])],
+    [enable_pic="$enableval"
+    test "x$enable_pic" = x && enable_pic=auto],
+    [enable_pic=auto])
+# disable PIC by default for static builds
+if test "$enable_pic" = auto && test "$enable_static" = yes; then
+    enable_pic=no
+fi
+# if PIC hasn't been explicitly disabled, try to figure out the flags
+if test "$enable_pic" != no; then
+    AC_MSG_CHECKING([for $CC option to produce PIC])
+    # allow the user's flags to override
+    if test "x$PIC_FLAGS" = x; then
+        # see if we're using GCC
+        if test "x$GCC" = xyes; then
+            case "$host_os" in
+            aix*|beos*|cygwin*|irix5*|irix6*|osf3*|osf4*|osf5*)
+                # PIC is the default for these OSes.
+                ;;
+            mingw*|os2*|pw32*)
+                # This hack is so that the source file can tell whether
+                # it is being built for inclusion in a dll (and should
+                # export symbols for example).
+                PIC_FLAGS="-DDLL_EXPORT"
+                ;;
+            darwin*|rhapsody*)
+                # PIC is the default on this platform
+                # Common symbols not allowed in MH_DYLIB files
+                PIC_FLAGS="-fno-common"
+                ;;
+            hpux*)
+                # PIC is the default for IA64 HP-UX and 64-bit HP-UX,
+                # but not for PA HP-UX.
+                case $host_cpu in
+                hppa*64*|ia64*)
+                    ;;
+                *)
+                    PIC_FLAGS="-fPIC"
+                    ;;
+                esac
+                ;;
+            *)
+                # Everyone else on GCC uses -fPIC
+                PIC_FLAGS="-fPIC"
+                ;;
+            esac
+        else # !GCC
+            case "$host_os" in
+            hpux9*|hpux10*|hpux11*)
+                # PIC is the default for IA64 HP-UX and 64-bit HP-UX,
+                # but not for PA HP-UX.
+                case "$host_cpu" in
+                hppa*64*|ia64*)
+                    # +Z the default
+                    ;;
+                *)
+                    PIC_FLAGS="+Z"
+                    ;;
+                esac
+                ;;
+            linux*|k*bsd*-gnu)
+                case `basename "$CC"` in
+                icc*|ecc*|ifort*)
+                    PIC_FLAGS="-KPIC"
+                    ;;
+                pgcc*|pgf77*|pgf90*|pgf95*)
+                    # Portland Group compilers (*not* the Pentium gcc
+                    # compiler, which looks to be a dead project)
+                    PIC_FLAGS="-fpic"
+                    ;;
+                ccc*)
+                    # All Alpha code is PIC.
+                    ;;
+                xl*)
+                    # IBM XL C 8.0/Fortran 10.1 on PPC
+                    PIC_FLAGS="-qpic"
+                    ;;
+                *)
+                    case `$CC -V 2>&1 | sed 5q` in
+                    *Sun\ C*|*Sun\ F*)
+                        # Sun C 5.9 or Sun Fortran
+                        PIC_FLAGS="-KPIC"
+                        ;;
+                    esac
+                esac
+                ;;
+            solaris*)
+                PIC_FLAGS="-KPIC"
+                ;;
+            sunos4*)
+                PIC_FLAGS="-PIC"
+                ;;
+            esac
+        fi # GCC
+    fi # PIC_FLAGS
+    AC_MSG_RESULT([$PIC_FLAGS])
+fi
+AC_SUBST([PIC_FLAGS])
+])# MESA_PIC_FLAGS

bin/.cherry-ignore

@@ -1,10 +0,0 @@
-# Already cherry picked without -x
-d8ac987f6ab228df1a478b36c3d889992754374f glsl: Disallow uniform block layout qualifiers on non-uniform block vars.
-
-# The bug fixed by this patch does not exist in 9.2.  Discussed with Marek and
-# Brian Paul on the mesa-stable mailing list.
-89a665eb5fa176f68223bf54a472d6a0567c3546 draw: fix segfaults with aaline and aapoint stages disabled
-
-# Previously cherry picked (patch originally appeared twice on master with a
-# revert in between)
-4e5eb8ba25054ede4798fa424e6f32b23aba0f98 i965/vec4: Only zero out unused message components when there are any.

bin/bugzilla_mesa.sh

@@ -1,52 +0,0 @@
-#!/bin/bash
-
-# This script is used to generate the list of fixed bugs that
-# appears in the release notes files, with HTML formatting.
-#
-# Note: This script could take a while until all details have
-#       been fetched from bugzilla.
-#
-# Usage examples:
-#
-# $ bin/bugzilla_mesa.sh mesa-9.0.2..mesa-9.0.3
-# $ bin/bugzilla_mesa.sh mesa-9.0.2..mesa-9.0.3 > bugfixes
-# $ bin/bugzilla_mesa.sh mesa-9.0.2..mesa-9.0.3 | tee bugfixes
-# $ DRYRUN=yes bin/bugzilla_mesa.sh mesa-9.0.2..mesa-9.0.3
-# $ DRYRUN=yes bin/bugzilla_mesa.sh mesa-9.0.2..mesa-9.0.3 | wc -l
-
-
-# regex pattern: trim before url
-trim_before='s/.*\(http\)/\1/'
-
-# regex pattern: trim after url
-trim_after='s/\(show_bug.cgi?id=[0-9]*\).*/\1/'
-
-# regex pattern: always use https
-use_https='s/http:/https:/'
-
-# extract fdo urls from commit log
-urls=$(git log $* | grep 'bugs.freedesktop.org/show_bug' | sed -e $trim_before -e $trim_after -e $use_https | sort | uniq)
-
-# if DRYRUN is set to "yes", simply print the URLs and don't fetch the
-# details from fdo bugzilla.
-#DRYRUN=yes
-
-if [ "x$DRYRUN" = xyes ]; then
-	for i in $urls
-	do
-		echo $i
-	done
-else
-	echo "<ul>"
-	echo ""
-
-	for i in $urls
-	do
-		id=$(echo $i | cut -d'=' -f2)
-		summary=$(wget --quiet -O - $i | grep -e '<title>.*</title>' | sed -e 's/ *<title>Bug [0-9]\+ &ndash; \(.*\)<\/title>/\1/')
-		echo "<li><a href=\"$i\">Bug $id</a> - $summary</li>"
-		echo ""
-	done
-
-	echo "</ul>"
-fi

bin/get-pick-list.sh

@@ -1,12 +1,6 @@
 #!/bin/sh
 
 # Script for generating a list of candidates for cherry-picking to a stable branch
-#
-# Usage examples:
-#
-# $ bin/get-pick-list.sh
-# $ bin/get-pick-list.sh > picklist
-# $ bin/get-pick-list.sh | tee picklist
 
 # Grep for commits with "cherry picked from commit" in the commit message.
 git log --reverse --grep="cherry picked from commit" origin/master..HEAD |\
@@ -14,7 +8,7 @@ git log --reverse --grep="cherry picked from commit" origin/master..HEAD |\
 	sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//' > already_picked
 
 # Grep for commits that were marked as a candidate for the stable tree.
-git log --reverse --pretty=%H -i --grep='^\([[:space:]]*NOTE: .*[Cc]andidate\|CC:.*mesa-stable\)' HEAD..origin/master |\
+git log --reverse --pretty=%H -i --grep='^[[:space:]]*NOTE: This is a candidate' HEAD..origin/master |\
 while read sha
 do
 	# Check to see whether the patch is on the ignore list.

bin/installmesa

@@ -0,0 +1,74 @@
+#!/bin/sh
+
+#
+# Simple shell script for installing Mesa's header and library files.
+# If the copy commands below don't work on a particular system (i.e. the
+# -f or -d flags), we may need to branch on `uname` to do the right thing.
+#
+
+
+TOP=.
+
+INCLUDE_DIR="/usr/local/include"
+LIB_DIR="/usr/local/lib"
+
+if [ "x$#" = "x0" ] ; then
+echo
+echo "***** Mesa installation - You may need root privileges to do this *****"
+echo
+echo "Default directory for header files is:" ${INCLUDE_DIR}
+echo "Enter new directory or press <Enter> to accept this default."
+
+read INPUT
+if [ "x${INPUT}" != "x" ] ; then
+	INCLUDE_DIR=${INPUT}
+fi
+
+echo
+echo "Default directory for library files is:" ${LIB_DIR}
+echo "Enter new directory or press <Enter> to accept this default."
+
+read INPUT
+if [ "x${INPUT}" != "x" ] ; then
+	LIB_DIR=${INPUT}
+fi
+
+echo
+echo "About to install Mesa header files (GL/*.h) in: " ${INCLUDE_DIR}/GL
+echo "and Mesa library files (libGL.*, etc) in: " ${LIB_DIR}
+echo "Press <Enter> to continue, or <ctrl>-C to abort."
+
+read INPUT
+
+else
+INCLUDE_DIR=$1/include
+LIB_DIR=$1/lib
+fi
+
+# flags:
+#  -f = force
+#  -d = preserve symlinks (does not work on BSD)
+
+if [ `uname` = "FreeBSD" ] ; then
+	CP_FLAGS="-f"
+elif [ `uname` = "Darwin" ] ; then
+	CP_FLAGS="-f"
+elif [ `uname` = "AIX" ] ; then
+	CP_FLAGS="-fh"
+else
+	CP_FLAGS="-fd"
+fi
+
+
+set -v
+
+mkdir -p ${INCLUDE_DIR}
+mkdir -p ${INCLUDE_DIR}/GL
+# NOT YET: mkdir -p ${INCLUDE_DIR}/GLES
+mkdir -p ${LIB_DIR}
+cp -f ${TOP}/include/GL/*.h ${INCLUDE_DIR}/GL
+cp -f ${TOP}/src/glw/*.h ${INCLUDE_DIR}/GL
+# NOT YET: cp -f ${TOP}/include/GLES/*.h ${INCLUDE_DIR}/GLES
+cp ${CP_FLAGS} ${TOP}/lib*/lib* ${LIB_DIR}
+
+echo "Done."

bin/minstall

@@ -0,0 +1,112 @@
+#!/bin/sh
+
+
+# A minimal replacement for 'install' that supports installing symbolic links.
+# Only a limited number of options are supported:
+# -d dir          Create a directory
+# -m mode         Sets a file's mode when installing
+
+
+# If these commands aren't portable, we'll need some "if (arch)" type stuff
+SYMLINK="ln -s"
+MKDIR="mkdir -p"
+RM="rm -f"
+
+MODE=""
+
+if [ "$1" = "-d" ] ; then
+	# make a directory path
+	$MKDIR "$2"
+	exit 0
+fi
+
+if [ "$1" = "-m" ] ; then
+	# set file mode
+	MODE=$2
+	shift 2
+fi
+
+# install file(s) into destination
+if [ $# -ge 2 ] ; then
+
+	# Last cmd line arg is the dest dir
+	for FILE in $@ ; do
+		DESTDIR="$FILE"
+	done
+
+	# Loop over args, moving them to DEST directory
+	I=1
+	for FILE in $@ ; do
+		if [ $I = $# ] ; then
+			# stop, don't want to install $DEST into $DEST
+			exit 0
+		fi
+
+                DEST=$DESTDIR
+
+                # On CYGWIN, because DLLs are loaded by the native Win32 loader,
+                # they are installed in the executable path.  Stub libraries used
+                # only for linking are installed in the library path
+                case `uname` in
+                    CYGWIN*)
+                        case $FILE in
+                            *.dll)
+                                DEST="$DEST/../bin"
+                                ;;
+                            *)
+                                ;;
+                        esac
+	                ;;
+                    *)
+                        ;;
+                esac
+
+		PWDSAVE=`pwd`
+
+		# determine file's type
+		if [ -h "$FILE" ] ; then
+			#echo $FILE is a symlink
+			# Unfortunately, cp -d isn't universal so we have to
+			# use a work-around.
+
+			# Use ls -l to find the target that the link points to
+			LL=`ls -l "$FILE"`
+			for L in $LL ; do
+				TARGET=$L
+			done
+			#echo $FILE is a symlink pointing to $TARGET
+
+			FILE=`basename "$FILE"`
+			# Go to $DEST and make the link
+			cd "$DEST"        # pushd
+				$RM "$FILE"
+				$SYMLINK "$TARGET" "$FILE"
+			cd "$PWDSAVE"     # popd
+
+		elif [ -f "$FILE" ] ; then
+			#echo "$FILE" is a regular file
+			# Only copy if the files differ
+			if ! cmp -s $FILE $DEST/`basename $FILE`; then
+				$RM "$DEST/`basename $FILE`"
+				cp "$FILE" "$DEST"
+			fi
+			if [ $MODE ] ; then
+				FILE=`basename "$FILE"`
+				chmod $MODE "$DEST/$FILE"
+			fi
+		else
+			echo "Unknown type of argument: " "$FILE"
+			exit 1
+		fi
+
+		I=`expr $I + 1`
+	done
+
+	exit 0
+fi
+
+# If we get here, we didn't find anything to do
+echo "Usage:"
+echo "  install -d dir                      Create named directory"
+echo "  install [-m mode] file [...] dest   Install files in destination"
+

bin/perf-annotate-jit

@@ -1,251 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2012 VMware Inc
-# Copyright 2008-2009 Jose Fonseca
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-
-"""Perf annotate for JIT code.
-
-Linux `perf annotate` does not work with JIT code.  This script takes the data
-produced by `perf script` command, plus the diassemblies outputed by gallivm
-into /tmp/perf-XXXXX.map.asm and produces output similar to `perf annotate`.
-
-See docs/llvmpipe.html for usage instructions.
-
-The `perf script` output parser was derived from the gprof2dot.py script.
-"""
-
-
-import sys
-import os.path
-import re
-import optparse
-import subprocess
-
-
-class Parser:
-    """Parser interface."""
-
-    def __init__(self):
-        pass
-
-    def parse(self):
-        raise NotImplementedError
-
-
-class LineParser(Parser):
-    """Base class for parsers that read line-based formats."""
-
-    def __init__(self, file):
-        Parser.__init__(self)
-        self._file = file
-        self.__line = None
-        self.__eof = False
-        self.line_no = 0
-
-    def readline(self):
-        line = self._file.readline()
-        if not line:
-            self.__line = ''
-            self.__eof = True
-        else:
-            self.line_no += 1
-        self.__line = line.rstrip('\r\n')
-
-    def lookahead(self):
-        assert self.__line is not None
-        return self.__line
-
-    def consume(self):
-        assert self.__line is not None
-        line = self.__line
-        self.readline()
-        return line
-
-    def eof(self):
-        assert self.__line is not None
-        return self.__eof
-
-
-mapFile = None
-
-def lookupMap(filename, matchSymbol):
-    global mapFile
-    mapFile = filename
-    stream = open(filename, 'rt')
-    for line in stream:
-        start, length, symbol = line.split()
-
-        start = int(start, 16)
-        length = int(length,16)
-
-        if symbol == matchSymbol:
-            return start
-
-    return None
-
-def lookupAsm(filename, desiredFunction):
-    stream = open(filename + '.asm', 'rt')
-    while stream.readline() != desiredFunction + ':\n':
-        pass
-
-    asm = []
-    line = stream.readline().strip()
-    while line:
-        addr, instr = line.split(':', 1)
-        addr = int(addr)
-        asm.append((addr, instr))
-        line = stream.readline().strip()
-
-    return asm
-
-
-
-samples = {}
-
-
-class PerfParser(LineParser):
-    """Parser for linux perf callgraph output.
-
-    It expects output generated with
-
-        perf record -g
-        perf script
-    """
-
-    def __init__(self, infile, symbol):
-        LineParser.__init__(self, infile)
-	self.symbol = symbol
-
-    def readline(self):
-        # Override LineParser.readline to ignore comment lines
-        while True:
-            LineParser.readline(self)
-            if self.eof() or not self.lookahead().startswith('#'):
-                break
-
-    def parse(self):
-        # read lookahead
-        self.readline()
-
-        while not self.eof():
-            self.parse_event()
-
-        asm = lookupAsm(mapFile, self.symbol)
-
-        addresses = samples.keys()
-        addresses.sort()
-        total_samples = 0
-
-	sys.stdout.write('%s:\n' % self.symbol)
-        for address, instr in asm:
-            try:
-                sample = samples.pop(address)
-            except KeyError:
-                sys.stdout.write(6*' ')
-            else:
-                sys.stdout.write('%6u' % (sample))
-                total_samples += sample
-            sys.stdout.write('%6u: %s\n' % (address, instr))
-        print 'total:', total_samples
-        assert len(samples) == 0
-
-        sys.exit(0)
-
-    def parse_event(self):
-        if self.eof():
-            return
-
-        line = self.consume()
-        assert line
-
-        callchain = self.parse_callchain()
-        if not callchain:
-            return
-
-    def parse_callchain(self):
-        callchain = []
-        while self.lookahead():
-            function = self.parse_call(len(callchain) == 0)
-            if function is None:
-                break
-            callchain.append(function)
-        if self.lookahead() == '':
-            self.consume()
-        return callchain
-
-    call_re = re.compile(r'^\s+(?P<address>[0-9a-fA-F]+)\s+(?P<symbol>.*)\s+\((?P<module>[^)]*)\)$')
-
-    def parse_call(self, first):
-        line = self.consume()
-        mo = self.call_re.match(line)
-        assert mo
-        if not mo:
-            return None
-
-        if not first:
-            return None
-
-        function_name = mo.group('symbol')
-        if not function_name:
-            function_name = mo.group('address')
-
-        module = mo.group('module')
-
-        function_id = function_name + ':' + module
-
-        address = mo.group('address')
-        address = int(address, 16)
-
-        if function_name != self.symbol:
-            return None
-
-        start_address = lookupMap(module, function_name)
-        address -= start_address
-
-        #print function_name, module, address
-
-        samples[address] = samples.get(address, 0) + 1
-
-        return True
-
-
-def main():
-    """Main program."""
-
-    optparser = optparse.OptionParser(
-        usage="\n\t%prog [options] symbol_name")
-    (options, args) = optparser.parse_args(sys.argv[1:])
-    if len(args) != 1:
-        optparser.error('wrong number of arguments')
-
-    symbol = args[0]
-
-    p = subprocess.Popen(['perf', 'script'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    parser = PerfParser(p.stdout, symbol)
-    parser.parse()
-
-
-if __name__ == '__main__':
-    main()
-
-
-# vim: set sw=4 et:

bin/shortlog_mesa.sh

@@ -2,12 +2,6 @@
 
 # This script is used to generate the list of changes that
 # appears in the release notes files, with HTML formatting.
-#
-# Usage examples:
-#
-# $ bin/shortlog_mesa.sh mesa-9.0.2..mesa-9.0.3
-# $ bin/shortlog_mesa.sh mesa-9.0.2..mesa-9.0.3 > changes
-# $ bin/shortlog_mesa.sh mesa-9.0.2..mesa-9.0.3 | tee changes
 
 
 typeset -i in_log=0

common.py

@@ -100,4 +100,4 @@ def AddOptions(opts):
 	opts.Add(BoolOption('quiet', 'DEPRECATED: profile build', 'yes'))
 	opts.Add(BoolOption('texture_float', 'enable floating-point textures and renderbuffers', 'no'))
 	if host_platform == 'windows':
-		opts.Add(EnumOption('MSVC_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0', '10.0', '11.0')))
+		opts.Add(EnumOption('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0')))

configs/.gitignore

@@ -0,0 +1,2 @@
+current
+autoconf

configs/current.in

@@ -0,0 +1,222 @@
+# Autoconf configuration
+
+# Pull in the defaults
+include $(TOP)/configs/default
+
+# This is generated by configure
+CONFIG_NAME = autoconf
+
+# Compiler and flags
+CC = @CC@
+CXX = @CXX@
+PIC_FLAGS = @PIC_FLAGS@
+DEFINES = @DEFINES@
+API_DEFINES = @API_DEFINES@
+SHARED_GLAPI = @SHARED_GLAPI@
+CFLAGS_NOVISIBILITY = @CPPFLAGS@ @CFLAGS@ \
+	$(PIC_FLAGS) $(DEFINES)
+CXXFLAGS_NOVISIBILITY = @CPPFLAGS@ @CXXFLAGS@ \
+	$(PIC_FLAGS) $(DEFINES)
+CFLAGS = $(CFLAGS_NOVISIBILITY) @VISIBILITY_CFLAGS@
+CXXFLAGS = $(CXXFLAGS_NOVISIBILITY) @VISIBILITY_CXXFLAGS@
+LDFLAGS = @LDFLAGS@
+RADEON_CFLAGS = @RADEON_CFLAGS@
+RADEON_LIBS = @RADEON_LIBS@
+NOUVEAU_CFLAGS = @NOUVEAU_CFLAGS@
+NOUVEAU_LIBS = @NOUVEAU_LIBS@
+INTEL_LIBS = @INTEL_LIBS@
+INTEL_CFLAGS = @INTEL_CFLAGS@
+X11_LIBS = @X11_LIBS@
+X11_CFLAGS = @X11_CFLAGS@
+LLVM_BINDIR = @LLVM_BINDIR@
+LLVM_CFLAGS = @LLVM_CFLAGS@
+LLVM_CPPFLAGS = @LLVM_CPPFLAGS@
+LLVM_CXXFLAGS = @LLVM_CXXFLAGS@
+LLVM_LDFLAGS = @LLVM_LDFLAGS@
+LLVM_LIBDIR = @LLVM_LIBDIR@
+LLVM_LIBS = @LLVM_LIBS@
+LLVM_INCLUDEDIR = @LLVM_INCLUDEDIR@
+GLW_CFLAGS = @GLW_CFLAGS@
+GLX_TLS = @GLX_TLS@
+
+# dlopen
+DLOPEN_LIBS = @DLOPEN_LIBS@
+CLOCK_LIB = @CLOCK_LIB@
+
+# Source selection
+MESA_ASM_FILES = @MESA_ASM_FILES@
+
+# Misc tools and flags
+MAKE = @MAKE@
+SHELL = @SHELL@
+MKLIB_OPTIONS = @MKLIB_OPTIONS@
+MKDEP = @MKDEP@
+MKDEP_OPTIONS = @MKDEP_OPTIONS@
+INSTALL = @INSTALL@
+AWK = @AWK@
+GREP = @GREP@
+NM = @NM@
+
+# Perl
+PERL = @PERL@
+
+# Indent (used for generating dispatch tables)
+INDENT = @INDENT@
+INDENT_FLAGS = @INDENT_FLAGS@
+
+# Python and flags (generally only needed by the developers)
+PYTHON2 = @PYTHON2@
+PYTHON_FLAGS = -t -O -O
+
+# Flex and Bison for GLSL compiler
+FLEX = @LEX@
+BISON = @YACC@
+
+# Library names (base name)
+GL_LIB = @GL_LIB@
+GLU_LIB = @GLU_LIB@
+GLW_LIB = GLw
+OSMESA_LIB = @OSMESA_LIB@
+GLESv1_CM_LIB = GLESv1_CM
+GLESv2_LIB = GLESv2
+VG_LIB = OpenVG
+GLAPI_LIB = glapi
+
+# Library names (actual file names)
+GL_LIB_NAME = @GL_LIB_NAME@
+GLU_LIB_NAME = @GLU_LIB_NAME@
+GLW_LIB_NAME = @GLW_LIB_NAME@
+OSMESA_LIB_NAME = @OSMESA_LIB_NAME@
+EGL_LIB_NAME = @EGL_LIB_NAME@
+GLESv1_CM_LIB_NAME = @GLESv1_CM_LIB_NAME@
+GLESv2_LIB_NAME = @GLESv2_LIB_NAME@
+VG_LIB_NAME = @VG_LIB_NAME@
+GLAPI_LIB_NAME = @GLAPI_LIB_NAME@
+
+# Globs used to install the lib and all symlinks
+GL_LIB_GLOB = @GL_LIB_GLOB@
+GLU_LIB_GLOB = @GLU_LIB_GLOB@
+GLW_LIB_GLOB = @GLW_LIB_GLOB@
+EGL_LIB_GLOB = @EGL_LIB_GLOB@
+GLESv1_CM_LIB_GLOB = @GLESv1_CM_LIB_GLOB@
+GLESv2_LIB_GLOB = @GLESv2_LIB_GLOB@
+VG_LIB_GLOB = @VG_LIB_GLOB@
+GLAPI_LIB_GLOB = @GLAPI_LIB_GLOB@
+
+# Directories to build
+LIB_DIR = @LIB_DIR@
+SRC_DIRS = @SRC_DIRS@
+DRIVER_DIRS = @DRIVER_DIRS@
+GALLIUM_DIRS = @GALLIUM_DIRS@
+GALLIUM_DRIVERS_DIRS = @GALLIUM_DRIVERS_DIRS@
+GALLIUM_WINSYS_DIRS = @GALLIUM_WINSYS_DIRS@
+GALLIUM_TARGET_DIRS = @GALLIUM_TARGET_DIRS@
+GALLIUM_STATE_TRACKERS_DIRS = @GALLIUM_STATE_TRACKERS_DIRS@
+GALLIUM_AUXILIARIES = $(TOP)/src/gallium/auxiliary/libgallium.a
+GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
+
+# Driver specific build vars
+DRI_DIRS = @DRI_DIRS@
+EGL_PLATFORMS = @EGL_PLATFORMS@
+EGL_CLIENT_APIS = @EGL_CLIENT_APIS@
+
+# Dependencies
+X11_INCLUDES = @X11_INCLUDES@
+
+# GLw motif setup
+GLW_SOURCES = @GLW_SOURCES@
+MOTIF_CFLAGS = @MOTIF_CFLAGS@
+
+# Library/program dependencies
+GL_LIB_DEPS = @GL_LIB_DEPS@
+OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @OSMESA_MESA_DEPS@ \
+	@OSMESA_LIB_DEPS@
+EGL_LIB_DEPS = @EGL_LIB_DEPS@
+GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLU_MESA_DEPS@ \
+	@GLU_LIB_DEPS@
+GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLW_MESA_DEPS@ \
+	@GLW_LIB_DEPS@
+GLESv1_CM_LIB_DEPS = @GLESv1_CM_LIB_DEPS@
+GLESv2_LIB_DEPS = @GLESv2_LIB_DEPS@
+VG_LIB_DEPS = @VG_LIB_DEPS@
+GLAPI_LIB_DEPS = @GLAPI_LIB_DEPS@
+
+# DRI dependencies
+DRI_LIB_DEPS = @DRI_LIB_DEPS@
+GALLIUM_DRI_LIB_DEPS = @GALLIUM_DRI_LIB_DEPS@
+LIBDRM_CFLAGS = @LIBDRM_CFLAGS@
+LIBDRM_LIBS = @LIBDRM_LIBS@
+DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
+GLPROTO_CFLAGS = @GLPROTO_CFLAGS@
+EXPAT_INCLUDES = @EXPAT_INCLUDES@
+
+# Autoconf directories
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+libdir = @libdir@
+includedir = @includedir@
+
+# Installation directories (for make install)
+INSTALL_DIR = $(prefix)
+INSTALL_LIB_DIR = $(libdir)
+INSTALL_INC_DIR = $(includedir)
+
+# DRI installation directories
+DRI_DRIVER_INSTALL_DIR = @DRI_DRIVER_INSTALL_DIR@
+
+# Where libGL will look for DRI hardware drivers
+DRI_DRIVER_SEARCH_DIR = @DRI_DRIVER_SEARCH_DIR@
+
+# EGL driver install directory
+EGL_DRIVER_INSTALL_DIR = @EGL_DRIVER_INSTALL_DIR@
+
+# XVMC library install directory
+XVMC_LIB_INSTALL_DIR=@XVMC_LIB_INSTALL_DIR@
+
+# VDPAU library install directory
+VDPAU_LIB_INSTALL_DIR=@VDPAU_LIB_INSTALL_DIR@
+
+# VA library install directory
+VA_LIB_INSTALL_DIR=@VA_LIB_INSTALL_DIR@
+
+# Xorg driver install directory (for xorg state-tracker)
+XORG_DRIVER_INSTALL_DIR = @XORG_DRIVER_INSTALL_DIR@
+
+# Path to OpenCL C library libclc
+LIBCLC_PATH = @LIBCLC_PATH@
+
+# pkg-config substitutions
+GL_PC_REQ_PRIV = @GL_PC_REQ_PRIV@
+GL_PC_LIB_PRIV = @GL_PC_LIB_PRIV@
+GL_PC_CFLAGS = @GL_PC_CFLAGS@
+DRI_PC_REQ_PRIV = @DRI_PC_REQ_PRIV@
+GLU_PC_REQ = @GLU_PC_REQ@
+GLU_PC_REQ_PRIV = @GLU_PC_REQ_PRIV@
+GLU_PC_LIB_PRIV = @GLU_PC_LIB_PRIV@
+GLU_PC_CFLAGS = @GLU_PC_CFLAGS@
+GLW_PC_REQ_PRIV = @GLW_PC_REQ_PRIV@
+GLW_PC_LIB_PRIV = @GLW_PC_LIB_PRIV@
+GLW_PC_CFLAGS = @GLW_PC_CFLAGS@
+OSMESA_PC_REQ = @OSMESA_PC_REQ@
+OSMESA_PC_LIB_PRIV = @OSMESA_PC_LIB_PRIV@
+GLESv1_CM_PC_LIB_PRIV = @GLESv1_CM_PC_LIB_PRIV@
+GLESv2_PC_LIB_PRIV = @GLESv2_PC_LIB_PRIV@
+EGL_PC_REQ_PRIV = @GL_PC_REQ_PRIV@
+EGL_PC_LIB_PRIV = @GL_PC_LIB_PRIV@
+EGL_PC_CFLAGS = @GL_PC_CFLAGS@
+
+XCB_DRI2_CFLAGS = @XCB_DRI2_CFLAGS@
+XCB_DRI2_LIBS = @XCB_DRI2_LIBS@
+LIBUDEV_CFLAGS = @LIBUDEV_CFLAGS@
+LIBUDEV_LIBS = @LIBUDEV_LIBS@
+WAYLAND_CFLAGS = @WAYLAND_CFLAGS@
+WAYLAND_LIBS = @WAYLAND_LIBS@
+
+MESA_LLVM = @MESA_LLVM@
+
+LLVM_VERSION = @LLVM_VERSION@
+
+HAVE_XF86VIDMODE = @HAVE_XF86VIDMODE@
+
+GALLIUM_PIPE_LOADER_DEFINES = @GALLIUM_PIPE_LOADER_DEFINES@
+GALLIUM_PIPE_LOADER_LIBS = @GALLIUM_PIPE_LOADER_LIBS@

configs/default

@@ -0,0 +1,180 @@
+# Default/template configuration
+
+# This is included by other config files which may override some
+# of these variables.
+# Think of this as a base class from which configs are derived.
+
+
+CONFIG_NAME = default
+
+# Version info
+MESA_MAJOR=9
+MESA_MINOR=1
+MESA_TINY=0
+MESA_VERSION = $(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY)
+
+# external projects.  This should be useless now that we use libdrm.
+DRM_SOURCE_PATH=$(TOP)/../drm
+
+# Compiler and flags
+CC = cc
+CXX = CC
+CFLAGS = -O
+CXXFLAGS = -O
+LDFLAGS =
+GLU_CFLAGS = 
+GLX_TLS = no
+
+# Compiler for building demos/tests/etc
+APP_CC = $(CC)
+APP_CXX = $(CXX)
+
+# Misc tools and flags
+SHELL = /bin/sh
+MKLIB = $(SHELL) $(TOP)/bin/mklib
+MKLIB_OPTIONS = 
+MKDEP = makedepend
+MKDEP_OPTIONS = -fdepend
+MAKE = make
+FLEX = flex
+BISON = bison
+PKG_CONFIG = pkg-config
+
+# Use MINSTALL for installing libraries, INSTALL for everything else
+MINSTALL = $(SHELL) $(TOP)/bin/minstall
+INSTALL = $(MINSTALL)
+
+# Tools for regenerating glapi (generally only needed by the developers)
+PYTHON2 = python
+PYTHON_FLAGS = -t -O -O
+INDENT = indent
+INDENT_FLAGS = -i4 -nut -br -brs -npcs -ce -T GLubyte -T GLbyte -T Bool
+
+# Library names (base name)
+GL_LIB = GL
+GLU_LIB = GLU
+GLW_LIB = GLw
+OSMESA_LIB = OSMesa
+EGL_LIB = EGL
+GLESv1_CM_LIB = GLESv1_CM
+GLESv2_LIB = GLESv2
+VG_LIB = OpenVG
+GLAPI_LIB = glapi
+
+# Library names (actual file names)
+GL_LIB_NAME = lib$(GL_LIB).so
+GLU_LIB_NAME = lib$(GLU_LIB).so
+GLW_LIB_NAME = lib$(GLW_LIB).so
+OSMESA_LIB_NAME = lib$(OSMESA_LIB).so
+EGL_LIB_NAME = lib$(EGL_LIB).so
+GLESv1_CM_LIB_NAME = lib$(GLESv1_CM_LIB).so
+GLESv2_LIB_NAME = lib$(GLESv2_LIB).so
+VG_LIB_NAME = lib$(VG_LIB).so
+GLAPI_LIB_NAME = lib$(GLAPI_LIB).so
+
+# globs used to install the lib and all symlinks
+GL_LIB_GLOB = $(GL_LIB_NAME)*
+GLU_LIB_GLOB = $(GLU_LIB_NAME)*
+GLW_LIB_GLOB = $(GLW_LIB_NAME)*
+EGL_LIB_GLOB = $(EGL_LIB_NAME)*
+GLESv1_CM_LIB_GLOB = $(GLESv1_CM_LIB_NAME)*
+GLESv2_LIB_GLOB = $(GLESv2_LIB_NAME)*
+VG_LIB_GLOB = $(VG_LIB_NAME)*
+GLAPI_LIB_GLOB = $(GLAPI_LIB_NAME)*
+
+# Optional assembly language optimization files for libGL
+MESA_ASM_FILES =
+
+# GLw widget sources (Append "GLwMDrawA.c" here and add -lXm to GLW_LIB_DEPS in
+# order to build the Motif widget too)
+GLW_SOURCES = GLwDrawA.c
+MOTIF_CFLAGS = -I/usr/include/Motif1.2
+
+
+# Directories to build
+LIB_DIR = lib
+SRC_DIRS = glsl mapi/glapi mapi/vgapi mesa \
+	gallium egl gallium/winsys gallium/targets
+DRIVER_DIRS = x11 osmesa
+
+# Gallium directories and
+GALLIUM_DIRS = auxiliary drivers state_trackers
+GALLIUM_AUXILIARIES = $(TOP)/src/gallium/auxiliary/libgallium.a
+GALLIUM_DRIVERS_DIRS = softpipe trace rbug noop identity galahad i915 svga r300 nvfx nv50
+GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
+GALLIUM_WINSYS_DIRS = sw sw/xlib
+GALLIUM_TARGET_DIRS = libgl-xlib
+GALLIUM_STATE_TRACKERS_DIRS = glx vega
+
+# native platforms EGL should support
+EGL_PLATFORMS = x11
+EGL_CLIENT_APIS = $(GL_LIB)
+
+# Library dependencies
+#EXTRA_LIB_PATH ?=
+GL_LIB_DEPS     = -lX11 -lXext -lm -lpthread
+EGL_LIB_DEPS    = -ldl -lpthread
+OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
+GLU_LIB_DEPS    = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
+GLW_LIB_DEPS    = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXt -lX11
+GLESv1_CM_LIB_DEPS = -lpthread
+GLESv2_LIB_DEPS = -lpthread
+VG_LIB_DEPS    = -lpthread
+GLAPI_LIB_DEPS = -lpthread
+
+# Program dependencies - specific GL libraries added in Makefiles
+X11_LIBS = -lX11
+
+DLOPEN_LIBS = -ldl
+
+# Installation directories (for make install)
+INSTALL_DIR = /usr/local
+INSTALL_LIB_DIR = $(INSTALL_DIR)/$(LIB_DIR)
+INSTALL_INC_DIR = $(INSTALL_DIR)/include
+DRI_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/dri
+
+# Where libGL will look for DRI hardware drivers
+DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR)
+
+# EGL driver install directory
+EGL_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/egl
+
+# Xorg driver install directory (for xorg state-tracker)
+XORG_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/xorg/modules/drivers
+
+# pkg-config substitutions
+GL_PC_REQ_PRIV =
+GL_PC_LIB_PRIV =
+GL_PC_CFLAGS =
+DRI_PC_REQ_PRIV =
+GLU_PC_REQ = gl
+GLU_PC_REQ_PRIV =
+GLU_PC_LIB_PRIV =
+GLU_PC_CFLAGS =
+GLW_PC_REQ_PRIV =
+GLW_PC_LIB_PRIV =
+GLW_PC_CFLAGS =
+OSMESA_PC_REQ =
+OSMESA_PC_LIB_PRIV =
+GLESv1_CM_PC_REQ_PRIV =
+GLESv1_CM_PC_LIB_PRIV =
+GLESv1_CM_PC_CFLAGS =
+GLESv2_PC_REQ_PRIV =
+GLESv2_PC_LIB_PRIV =
+GLESv2_PC_CFLAGS =
+VG_PC_REQ_PRIV =
+VG_PC_LIB_PRIV =
+VG_PC_CFLAGS =
+
+# default targets
+# this helps reduce the mismatch between our automake Makefiles and the old
+# custom Makefiles while we transition.
+
+all: default
+
+am--refresh:
+
+distclean: clean
+
+check:
+test:

docs/GL3.txt

@@ -23,12 +23,12 @@ GL_EXT_texture_shared_exponent                        DONE (i965, r600, swrast)
 Float depth buffers (GL_ARB_depth_buffer_float)       DONE (i965, r600)
 Framebuffer objects (GL_ARB_framebuffer_object)       DONE (i965, r300, r600, swrast)
 Half-float                                            DONE
-Non-normalized Integer texture/framebuffer formats    DONE (i965, r600)
+Non-normalized Integer texture/framebuffer formats    DONE (i965, r600)
 1D/2D Texture arrays                                  DONE
 Per-buffer blend and masks (GL_EXT_draw_buffers2)     DONE (i965, r600, swrast)
 GL_EXT_texture_compression_rgtc                       DONE (i965, r300, r600, swrast)
 Red and red/green texture formats                     DONE (i965, swrast, gallium)
-Transform feedback (GL_EXT_transform_feedback)        DONE (i965, r600)
+Transform feedback (GL_EXT_transform_feedback)        DONE (i965, r600)
 Vertex array objects (GL_APPLE_vertex_array_object)   DONE (i965, r300, r600, swrast)
 sRGB framebuffer format (GL_EXT_framebuffer_sRGB)     DONE (i965, r600)
 glClearBuffer commands                                DONE
@@ -41,29 +41,29 @@ GLX_ARB_create_context (GLX 1.4 is required)          DONE
 
 GL 3.1:
 
-GLSL 1.40                                             DONE (i965, r600)
-Forward compatibile context support/deprecations      DONE (i965, r600)
+GLSL 1.40                                             DONE (i965)
+Forward compatibile context support/deprecations      DONE (i965)
 Instanced drawing (GL_ARB_draw_instanced)             DONE (i965, gallium, swrast)
 Buffer copying (GL_ARB_copy_buffer)                   DONE (i965, r300, r600, swrast)
 Primitive restart (GL_NV_primitive_restart)           DONE (i965, r600)
 16 vertex texture image units                         DONE
-Texture buffer objs (GL_ARB_texture_buffer_object)    DONE for OpenGL 3.1 contexts (i965, r600)
+Texture buffer objs (GL_ARB_texture_buffer_object)    DONE for OpenGL 3.1 contexts (i965)
 Rectangular textures (GL_ARB_texture_rectangle)       DONE (i965, r300, r600, swrast)
-Uniform buffer objs (GL_ARB_uniform_buffer_object)    DONE (i965, r600, swrast)
+Uniform buffer objs (GL_ARB_uniform_buffer_object)    DONE (i965)
 Signed normalized textures (GL_EXT_texture_snorm)     DONE (i965, r300, r600)
 
 
 GL 3.2:
 
 Core/compatibility profiles                           DONE
-GLSL 1.50                                             in progress
-Geometry shaders (GL_ARB_geometry_shader4)            partially done
+GLSL 1.50                                             not started
+Geometry shaders (GL_ARB_geometry_shader4)            partially done (Zack)
 BGRA vertex order (GL_ARB_vertex_array_bgra)          DONE (i965, r300, r600, swrast)
 Base vertex offset(GL_ARB_draw_elements_base_vertex)  DONE (i965, r300, r600, swrast)
 Frag shader coord (GL_ARB_fragment_coord_conventions) DONE (i965, r300, r600, swrast)
 Provoking vertex (GL_ARB_provoking_vertex)            DONE (i965, r300, r600, swrast)
 Seamless cubemaps (GL_ARB_seamless_cube_map)          DONE (i965, r600)
-Multisample textures (GL_ARB_texture_multisample)     DONE (i965)
+Multisample textures (GL_ARB_texture_multisample)     not started
 Frag depth clamp (GL_ARB_depth_clamp)                 DONE (i965, r600, swrast)
 Fence objects (GL_ARB_sync)                           DONE (i965, r300, r600, swrast)
 GLX_ARB_create_context_profile                        DONE
@@ -79,7 +79,7 @@ GL_ARB_sampler_objects                                DONE (i965, r300, r600)
 GL_ARB_shader_bit_encoding                            DONE
 GL_ARB_texture_rgb10_a2ui                             DONE (i965, r600)
 GL_ARB_texture_swizzle                                DONE (same as EXT version) (i965, r300, r600, swrast)
-GL_ARB_timer_query                                    DONE (i965, r600)
+GL_ARB_timer_query                                    DONE (i965, r600)
 GL_ARB_instanced_arrays                               DONE (i965, r300, r600)
 GL_ARB_vertex_type_2_10_10_10_rev                     DONE (i965, r600)
 
@@ -87,17 +87,17 @@ GL_ARB_vertex_type_2_10_10_10_rev                     DONE (i965, r600)
 GL 4.0:
 
 GLSL 4.0                                             not started
-GL_ARB_texture_query_lod                             DONE (i965)
+GL_ARB_texture_query_lod                             not started
 GL_ARB_draw_buffers_blend                            DONE (i965, r600, softpipe)
-GL_ARB_draw_indirect                                 started (Christoph)
-GL_ARB_gpu_shader5                                   started
+GL_ARB_draw_indirect                                 not started
+GL_ARB_gpu_shader5                                   not started
 GL_ARB_gpu_shader_fp64                               not started
 GL_ARB_sample_shading                                not started
 GL_ARB_shader_subroutine                             not started
 GL_ARB_tessellation_shader                           not started
-GL_ARB_texture_buffer_object_rgb32                   DONE (i965, softpipe)
+GL_ARB_texture_buffer_object_rgb32                   DONE (softpipe)
 GL_ARB_texture_cube_map_array                        DONE (i965, softpipe)
-GL_ARB_texture_gather                                started (Maxence, Chris)
+GL_ARB_texture_gather                                not started
 GL_ARB_transform_feedback2                           DONE
 GL_ARB_transform_feedback3                           DONE
 
@@ -106,7 +106,7 @@ GL 4.1:
 
 GLSL 4.1                                             not started
 GL_ARB_ES2_compatibility                             DONE (i965, r300, r600)
-GL_ARB_get_program_binary                            DONE (0 binary formats)
+GL_ARB_get_program_binary                            not started
 GL_ARB_separate_shader_objects                       some infrastructure done
 GL_ARB_shader_precision                              not started
 GL_ARB_vertex_attrib_64bit                           not started
@@ -119,13 +119,13 @@ GLSL 4.2                                             not started
 GL_ARB_texture_compression_bptc                      not started
 GL_ARB_compressed_texture_pixel_storage              not started
 GL_ARB_shader_atomic_counters                        not started
-GL_ARB_texture_storage                               DONE (i965, r300, r600, swrast, gallium)
+GL_ARB_texture_storage                               DONE (r300, r600, swrast, gallium)
 GL_ARB_transform_feedback_instanced                  DONE
-GL_ARB_base_instance                                 DONE (i965, nv50, nvc0, r600, radeonsi)
+GL_ARB_base_instance                                 DONE (nv50, nvc0, r600, radeonsi)
 GL_ARB_shader_image_load_store                       not started
 GL_ARB_conservative_depth                            DONE (softpipe)
-GL_ARB_shading_language_420pack                      started (Todd)
-GL_ARB_internalformat_query                          DONE (i965, gallium)
+GL_ARB_shading_language_420pack                      not started
+GL_ARB_internalformat_query                          not started
 GL_ARB_map_buffer_alignment                          DONE (r300, r600, radeonsi)
 
 
@@ -133,7 +133,7 @@ GL 4.3:
 
 GLSL 4.3                                             not started
 ARB_arrays_of_arrays                                 not started
-ARB_ES3_compatibility                                DONE (i965)
+ARB_ES3_compatibility                                not started
 ARB_clear_buffer_object                              not started
 ARB_compute_shader                                   started (gallium)
 ARB_copy_image                                       not started
@@ -149,9 +149,9 @@ ARB_robust_buffer_access_behavior                    not started
 ARB_shader_image_size                                not started
 ARB_shader_storage_buffer_object                     not started
 ARB_stencil_texturing                                not started
-ARB_texture_buffer_range                             DONE (nv50, nvc0)
+ARB_texture_buffer_range                             not started
 ARB_texture_query_levels                             not started
-ARB_texture_storage_multisample                      DONE (i965)
+ARB_texture_storage_multisample                      not started
 ARB_texture_view                                     not started
 ARB_vertex_attrib_binding                            not started
 

docs/MESA_resize_buffers.spec

@@ -12,7 +12,7 @@ Contact
 
 Status
 
-    Obsolete.
+    Shipping (since Mesa version 2.2)
 
 Version
 

docs/README.UVD

@@ -1,13 +0,0 @@
-The software may implement third party technologies (e.g. third party
-libraries) that are not licensed to you by AMD and for which you may need
-to obtain licenses from other parties.  Unless explicitly stated otherwise,
-these third party technologies are not licensed hereunder.  Such third
-party technologies include, but are not limited, to H.264, MPEG-2, MPEG-4,
-AVC, and VC-1.
-
-For MPEG-2 Encoding Products ANY USE OF THIS PRODUCT IN ANY MANNER OTHER
-THAN PERSONAL USE THAT COMPLIES WITH THE MPEG-2 STANDARD FOR ENCODING VIDEO
-INFORMATION FOR PACKAGED MEDIA IS EXPRESSLY PROHIBITED WITHOUT A LICENSE
-UNDER APPLICABLE PATENTS IN THE MPEG-2 PATENT PORTFOLIO, WHICH LICENSES IS
-AVAILABLE FROM MPEG LA, LLC, 6312 S. Fiddlers Green Circle, Suite 400E,
-Greenwood Village, Colorado 80111 U.S.A.

docs/README.WIN32

@@ -1,6 +1,6 @@
 File: docs/README.WIN32
 
-Last updated: 21 June 2013
+Last updated: 23 April 2011
 
 
 Quick Start
@@ -30,23 +30,6 @@ At this time, only the gallium GDI driver is known to work.
 Source code also exists in the tree for other drivers in
 src/mesa/drivers/windows, but the status of this code is unknown.
 
-Recipe
-------
-
-Building on windows requires several open-source packages. These are
-steps that work as of this writing.
-
-1) install python 2.7
-2) install scons (latest)
-3) install mingw, flex, and bison
-4) install libxml2 from here: http://www.lfd.uci.edu/~gohlke/pythonlibs
-  get libxml2-python-2.9.1.win-amd64-py2.7.exe
-5) install pywin32 from here: http://www.lfd.uci.edu/~gohlke/pythonlibs
-  get pywin32-218.4.win-amd64-py2.7.exe
-6) install git
-7) download mesa from git
-  see http://www.mesa3d.org/repository.html
-8) run scons
 
 General
 -------

docs/RELNOTES-5.1

@@ -106,7 +106,7 @@ Vertex/Fragment program debugger
 
 GL_MESA_program_debug is an experimental extension to support
 interactive debugging of vertex and fragment programs.  See the
-docs/specs/OLD/MESA_program_debug.spec file for details.
+docs/MESA_program_debug.spec file for details.
 
 The bulk of the vertex/fragment program debugger is implemented
 outside of Mesa.  The GL_MESA_program_debug extension just has minimal

docs/application-issues.html

@@ -1,83 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="en">
-<head>
-  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-  <title>Application Issues</title>
-  <link rel="stylesheet" type="text/css" href="mesa.css">
-</head>
-<body>
-
-<div class="header">
-  <h1>The Mesa 3D Graphics Library</h1>
-</div>
-
-<iframe src="contents.html"></iframe>
-<div class="content">
-
-<h1>Application Issues</h1>
-
-<p>
-This page documents known issues with some OpenGL applications.
-</p>
-
-
-<h2>Topogun</h2>
-
-<p>
-<a href="http://www.topogun.com/">Topogun</a> for Linux (version 2, at least)
-creates a GLX visual without requesting a depth buffer.
-This causes bad rendering if the OpenGL driver happens to choose a visual
-without a depth buffer.
-</p>
-
-<p>
-Mesa 9.1.2 and later (will) support a DRI configuration option to work around
-this issue.
-Using the <a href="http://dri.freedesktop.org/wiki/DriConf">driconf</a> tool,
-set the "Create all visuals with a depth buffer" option before running Topogun.
-Then, all GLX visuals will be created with a depth buffer.
-</p>
-
-
-<h2>Old OpenGL games</h2>
-
-<p>
-Some old OpenGL games (approx. ten years or older) may crash during
-start-up because of an extension string buffer-overflow problem.
-</p>
-
-<p>
-The problem is a modern OpenGL driver will return a very long string
-for the glGetString(GL_EXTENSIONS) query and if the application
-naively copies the string into a fixed-size buffer it can overflow the
-buffer and crash the application.
-</p>
-
-<p>
-The work-around is to set the MESA_EXTENSION_MAX_YEAR environment variable
-to the approximate release year of the game.
-This will cause the glGetString(GL_EXTENSIONS) query to only report extensions
-older than the given year.
-</p>
-
-<p>
-For example, if the game was released in 2001, do
-<pre>
-export MESA_EXTENSION_MAX_YEAR=2001
-</pre>
-before running the game.
-</p>
-
-
-
-<h2>Viewperf</h2>
-
-<p>
-See the <a href="viewperf.html">Viewperf issues</a> page for a detailed list
-of Viewperf issues.
-</p>
-
-
-</div>
-</body>
-</html>

docs/contents.html

@@ -71,7 +71,6 @@
 <li><a href="llvmpipe.html" target="_parent">Gallium llvmpipe driver</a>
 <li><a href="vmware-guest.html" target="_parent">VMware SVGA3D guest driver</a>
 <li><a href="postprocess.html" target="_parent">Gallium post-processing</a>
-<li><a href="application-issues.html" target="_parent">Application Issues</a>
 <li><a href="viewperf.html" target="_parent">Viewperf Issues</a>
 </ul>
 

docs/devinfo.html

@@ -196,18 +196,21 @@ branch is relevant.
 <h3>Verify and update version info</h3>
 
 <dl>
-  <dt>SConstruct</dt>
-  <dt>Android.common.mk</dt>
+  <dt>configs/default</dt>
+  <dd>MESA_MAJOR, MESA_MINOR and MESA_TINY</dd>
+  <dt>Makefile.am</dt>
   <dd>PACKAGE_VERSION</dd>
   <dt>configure.ac</dt>
   <dd>AC_INIT</dd>
+  <dt>src/mesa/main/version.h</dt>
+  <dd>MESA_MAJOR, MESA_MINOR, MESA_PATCH and MESA_VERSION_STRING</dd>
 </dl>
 
 <p>
-Create a docs/relnotes/x.y.z.html file.
-The bin/bugzilla_mesa.sh and bin/shortlog_mesa.sh scripts can be used to
-create the HTML-formatted lists of bugfixes and changes to include in the file.
-Link the new docs/relnotes/x.y.z.html file into the main <a href="relnotes.html">relnotes.html</a> file.
+Create a docs/relnotes-x.y.z.html file.
+The bin/shortlog_mesa.sh script can be used to create a HTML-formatted list
+of changes to include in the file.
+Link the new docs/relnotes-x.y.z.html file into the main <a href="relnotes.html">relnotes.html</a> file.
 </p>
 
 <p>
@@ -216,7 +219,7 @@ Update <a href="index.html">docs/index.html</a>.
 
 <p>
 Tag the files with the release name (in the form <b>mesa-x.y</b>)
-with: <code>git tag -s mesa-x.y -m "Mesa x.y Release"</code>
+with: <code>git tag -a mesa-x.y</code>
 Then: <code>git push origin mesa-x.y</code>
 </p>
 
@@ -225,14 +228,13 @@ Then: <code>git push origin mesa-x.y</code>
 <p>
 Make the distribution files.  From inside the Mesa directory:
 <pre>
-	./autogen.sh
 	make tarballs
 </pre>
 
 <p>
 After the tarballs are created, the md5 checksums for the files will
 be computed.
-Add them to the docs/relnotes/x.y.html file.
+Add them to the docs/relnotes-x.y.html file.
 </p>
 
 <p>
@@ -242,18 +244,15 @@ compile everything, and run some demos to be sure everything works.
 
 <h3>Update the website and announce the release</h3>
 <p>
-Make a new directory for the release on annarchy.freedesktop.org with:
-<br>
-<code>
-mkdir /srv/ftp.freedesktop.org/pub/mesa/x.y
-</code>
+Follow the directions on SourceForge for creating a new "release" and
+uploading the tarballs.
 </p>
 
 <p>
 Basically, to upload the tarball files with:
 <br>
 <code>
-rsync -avP -e ssh MesaLib-x.y.* USERNAME@annarchy.freedesktop.org:/srv/ftp.freedesktop.org/pub/mesa/x.y/
+rsync -avP ssh Mesa*-X.Y.* USERNAME@frs.sourceforge.net:uploads/
 </code>
 </p>
 

docs/envvars.html

@@ -32,8 +32,6 @@ sometimes be useful for debugging end-user issues.
 <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)
-<li>LIBGL_SHOW_FPS - print framerate to stdout based on the number of glXSwapBuffers
-    calls per second.
 </ul>
 
 
@@ -146,13 +144,14 @@ Mesa EGL supports different sets of environment variables.  See the
 <h2>Gallium environment variables</h2>
 
 <ul>
-<li>GALLIUM_HUD - draws various information on the screen, like framerate,
-    cpu load, driver statistics, performance counters, etc.
-    Set GALLIUM_HUD=help and run e.g. glxgears for more info.
 <li>GALLIUM_LOG_FILE - specifies a file for logging all errors, warnings, etc.
     rather than stderr.
 <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.
@@ -160,9 +159,6 @@ Mesa EGL supports different sets of environment variables.  See the
 <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.
-<li>ST_DEBUG - controls debug output from the Mesa/Gallium state tracker.
-Setting to "tgsi", for example, will print all the TGSI shaders.
-See src/mesa/state_tracker/st_debug.c for other options.
 </ul>
 
 <h3>Softpipe driver environment variables</h3>
@@ -189,16 +185,6 @@ See src/mesa/state_tracker/st_debug.c for other options.
     cores present.
 </ul>
 
-<h3>VMware SVGA driver environment variables</h3>
-<ul>
-<li>SVGA_FORCE_SWTNL - force use of software vertex transformation
-<li>SVGA_NO_SWTNL - don't allow software vertex transformation fallbacks
-(will often result in incorrect rendering).
-<li>SVGA_DEBUG - for dumping shaders, constant buffers, etc.  See the code
-for details.
-<li>See the driver code for other, lesser-used variables.
-</ul>
-
 
 <p>
 Other Gallium drivers have their own environment variables.  These may change

docs/extensions.html

@@ -23,27 +23,19 @@ The specifications follow.
 
 
 <ul>
-<li><a href="specs/MESA_agp_offset.spec">MESA_agp_offset.spec</a>
-<li><a href="specs/MESA_copy_sub_buffer.spec">MESA_copy_sub_buffer.spec</a>
-<li><a href="specs/MESA_drm_image.spec">MESA_drm_image.spec</a>
-<li><a href="specs/MESA_multithread_makecurrent.spec">MESA_multithread_makecurrent.spec</a>
-<li><a href="specs/OLD/MESA_packed_depth_stencil.spec">MESA_packed_depth_stencil.spec</a> (obsolete)
-<li><a href="specs/MESA_pack_invert.spec">MESA_pack_invert.spec</a>
-<li><a href="specs/MESA_pixmap_colormap.spec">MESA_pixmap_colormap.spec</a>
-<li><a href="specs/OLD/MESA_program_debug.spec">MESA_program_debug.spec</a> (obsolete)
-<li><a href="specs/MESA_release_buffers.spec">MESA_release_buffers.spec</a>
-<li><a href="specs/OLD/MESA_resize_buffers.spec">MESA_resize_buffers.spec</a> (obsolete)
-<li><a href="specs/MESA_set_3dfx_mode.spec">MESA_set_3dfx_mode.spec</a>
-<li><a href="specs/MESA_shader_debug.spec">MESA_shader_debug.spec</a>
-<li><a href="specs/OLD/MESA_sprite_point.spec">MESA_sprite_point.spec</a> (obsolete)
-<li><a href="specs/MESA_swap_control.spec">MESA_swap_control.spec</a>
-<li><a href="specs/MESA_swap_frame_usage.spec">MESA_swap_frame_usage.spec</a>
-<li><a href="specs/MESA_texture_array.spec">MESA_texture_array.spec</a>
-<li><a href="specs/MESA_texture_signed_rgba.spec">MESA_texture_signed_rgba.spec</a>
-<li><a href="specs/OLD/MESA_trace.spec">MESA_trace.spec</a> (obsolete)
-<li><a href="specs/MESA_window_pos.spec">MESA_window_pos.spec</a>
-<li><a href="specs/MESA_ycbcr_texture.spec">MESA_ycbcr_texture.spec</a>
-<li><a href="specs/WL_bind_wayland_display.spec">WL_bind_wayland_display.spec</a>
+<li><a href="MESA_agp_offset.spec">MESA_agp_offset.spec</a>
+<li><a href="MESA_copy_sub_buffer.spec">MESA_copy_sub_buffer.spec</a>
+<li><a href="MESA_packed_depth_stencil.spec">MESA_packed_depth_stencil.spec</a>
+<li><a href="MESA_pack_invert.spec">MESA_pack_invert.spec</a>
+<li><a href="MESA_pixmap_colormap.spec">MESA_pixmap_colormap.spec</a>
+<li><a href="MESA_release_buffers.spec">MESA_release_buffers.spec</a>
+<li><a href="MESA_resize_buffers.spec">MESA_resize_buffers.spec</a>
+<li><a href="MESA_set_3dfx_mode.spec">MESA_set_3dfx_mode.spec</a>
+<li><a href="MESA_sprite_point.spec">MESA_sprite_point.spec</a> (obsolete)
+<li><a href="MESA_texture_signed_rgba.spec">MESA_texture_signed_rgba.spec</a>
+<li><a href="MESA_trace.spec">MESA_trace.spec</a> (obsolete)
+<li><a href="MESA_window_pos.spec">MESA_window_pos.spec</a>
+<li><a href="MESA_ycbcr_texture.spec">MESA_ycbcr_texture.spec</a>
 </ul>
 
 </div>

docs/index.html

@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
-  <title>The Mesa 3D Graphics Library</title>
+  <title>Mesa News</title>
   <link rel="stylesheet" type="text/css" href="mesa.css">
 </head>
 <body>
@@ -16,80 +16,10 @@
 
 <h1>News</h1>
 
-<h2>August 1, 2013</h2>
-<p>
-<a href="relnotes/9.1.6.html">Mesa 9.1.6</a> is released.
-This is a bug fix release.
-</p>
-
-<h2>July 17, 2013</h2>
-<p>
-<a href="relnotes/9.1.5.html">Mesa 9.1.5</a> is released.
-This is a bug fix release.
-</p>
-
-<h2>July 1, 2013</h2>
-<p>
-<a href="relnotes/9.1.4.html">Mesa 9.1.4</a> is released.
-This is a bug fix release.
-</p>
-
-<h2>May 21, 2013</h2>
-<p>
-<a href="relnotes/9.1.3.html">Mesa 9.1.3</a> is released.
-This is a bug fix release.
-</p>
-
-<h2>April 30, 2013</h2>
-<p>
-<a href="relnotes/9.1.2.html">Mesa 9.1.2</a> is released.
-This is a bug fix release.
-</p>
-
-<h2>March 19, 2013</h2>
-<p>
-<a href="relnotes/9.1.1.html">Mesa 9.1.1</a> is released.
-This is a bug fix release.
-</p>
-
-<h2>February 24, 2013</h2>
-
-<p>
-Mesa demos 8.1.0 is released.
-See the <a href="http://lists.freedesktop.org/archives/mesa-dev/2013-February/035180.html">announcement</a> for more information about the release.
-You can download it from <a href="ftp://ftp.freedesktop.org/pub/mesa/demos/8.1.0/">ftp.freedesktop.org/pub/mesa/demos/8.1.0/</a>.
-</p>
-
-
-<h2>February 22, 2013</h2>
-
-<p>
-<a href="relnotes/9.1.html">Mesa 9.1</a> is released.
-This is a new development release.
-See the release notes for more information about the release.
-</p>
-
-
-<h2>February 21, 2013</h2>
-
-<p>
-<a href="relnotes/9.0.3.html">Mesa 9.0.3</a> is released.
-This is a bug fix release.
-</p>
-
-
-<h2>January 22, 2013</h2>
-
-<p>
-<a href="relnotes/9.0.2.html">Mesa 9.0.2</a> is released.
-This is a bug fix release.
-</p>
-
-
 <h2>November 16, 2012</h2>
 
 <p>
-<a href="relnotes/9.0.1.html">Mesa 9.0.1</a> is released.
+<a href="relnotes-9.0.1.html">Mesa 9.0.1</a> is released.
 This is a bug fix release.
 </p>
 
@@ -97,7 +27,7 @@ This is a bug fix release.
 <h2>October 24, 2012</h2>
 
 <p>
-<a href="relnotes/8.0.5.html">Mesa 8.0.5</a> is released.
+<a href="relnotes-8.0.5.html">Mesa 8.0.5</a> is released.
 This is a bug fix release.
 </p>
 
@@ -105,7 +35,7 @@ This is a bug fix release.
 <h2>October 8, 2012</h2>
 
 <p>
-<a href="relnotes/9.0.html">Mesa 9.0</a> is released.
+<a href="relnotes-9.0.html">Mesa 9.0</a> is released.
 This is the first version of Mesa to support OpenGL 3.1 and GLSL 1.40
 (with the i965 driver).
 See the release notes for more information about the release.
@@ -115,7 +45,7 @@ See the release notes for more information about the release.
 <h2>July 10, 2012</h2>
 
 <p>
-<a href="relnotes/8.0.4.html">Mesa 8.0.4</a> is released.
+<a href="relnotes-8.0.4.html">Mesa 8.0.4</a> is released.
 This is a bug fix release.
 </p>
 
@@ -123,7 +53,7 @@ This is a bug fix release.
 <h2>May 18, 2012</h2>
 
 <p>
-<a href="relnotes/8.0.3.html">Mesa 8.0.3</a> is released.
+<a href="relnotes-8.0.3.html">Mesa 8.0.3</a> is released.
 This is a bug fix release.
 </p>
 
@@ -131,7 +61,7 @@ This is a bug fix release.
 <h2>March 21, 2012</h2>
 
 <p>
-<a href="relnotes/8.0.2.html">Mesa 8.0.2</a> is released.
+<a href="relnotes-8.0.2.html">Mesa 8.0.2</a> is released.
 This is a bug fix release.
 </p>
 
@@ -139,14 +69,14 @@ This is a bug fix release.
 <h2>February 16, 2012</h2>
 
 <p>
-<a href="relnotes/8.0.1.html">Mesa 8.0.1</a> is released.  This is a bug fix
+<a href="relnotes-8.0.1.html">Mesa 8.0.1</a> is released.  This is a bug fix
 release.  See the release notes for more information about the release.
 </p>
 
 <h2>February 9, 2012</h2>
 
 <p>
-<a href="relnotes/8.0.html">Mesa 8.0</a> is released.
+<a href="relnotes-8.0.html">Mesa 8.0</a> is released.
 This is the first version of Mesa to support OpenGL 3.0 and GLSL 1.30
 (with the i965 driver).
 See the release notes for more information about the release.
@@ -156,7 +86,7 @@ See the release notes for more information about the release.
 <h2>November 27, 2011</h2>
 
 <p>
-<a href="relnotes/7.11.2.html">Mesa 7.11.2</a> is released.  This is a bug fix
+<a href="relnotes-7.11.2.html">Mesa 7.11.2</a> is released.  This is a bug fix
 release.  This release was made primarily to fix build problems with 7.11.1 on
 Mandriva and to fix problems related to glCopyTexImage to luminance-alpha
 textures.  The later was believed to have been fixed in 7.11.1 but was not.
@@ -165,36 +95,36 @@ textures.  The later was believed to have been fixed in 7.11.1 but was not.
 <h2>November 17, 2011</h2>
 
 <p>
-<a href="relnotes/7.11.1.html">Mesa 7.11.1</a> is released.  This is a bug
+<a href="relnotes-7.11.1.html">Mesa 7.11.1</a> is released.  This is a bug
 fix release.
 </p>
 
 <h2>July 31, 2011</h2>
 
 <p>
-<a href="relnotes/7.11.html">Mesa 7.11</a> (final) is released.  This is a new
+<a href="relnotes-7.11.html">Mesa 7.11</a> (final) is released.  This is a new
 development release.
 </p>
 
 <h2>June 13, 2011</h2>
 
 <p>
-<a href="relnotes/7.10.3.html">Mesa 7.10.3</a> is released.  This is a bug
+<a href="relnotes-7.10.3.html">Mesa 7.10.3</a> is released.  This is a bug
 fix 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
+<a href="relnotes-7.10.2.html">Mesa 7.10.2</a> is released.  This is a bug
 fix release.
 </p>
 
 <h2>March 2, 2011</h2>
 
 <p>
-<a href="relnotes/7.9.2.html">Mesa 7.9.2</a> and
-<a href="relnotes/7.10.1.html">Mesa 7.10.1</a> are released.  These are
+<a href="relnotes-7.9.2.html">Mesa 7.9.2</a> and
+<a href="relnotes-7.10.1.html">Mesa 7.10.1</a> are released.  These are
 stable releases containing bug fixes since the 7.9.1 and 7.10 releases.
 </p>
 
@@ -202,7 +132,7 @@ stable releases containing bug fixes since the 7.9.1 and 7.10 releases.
 <h2>October 4, 2010</h2>
 
 <p>
-<a href="relnotes/7.9.html">Mesa 7.9</a> (final) is released.  This is a new
+<a href="relnotes-7.9.html">Mesa 7.9</a> (final) is released.  This is a new
 development release.
 </p>
 
@@ -210,7 +140,7 @@ development release.
 <h2>September 27, 2010</h2>
 
 <p>
-<a href="relnotes/7.9.html">Mesa 7.9.0-rc1</a> is released.  This is a
+<a href="relnotes-7.9.html">Mesa 7.9.0-rc1</a> is released.  This is a
 release candidate for the 7.9 development release.
 </p>
 
@@ -218,7 +148,7 @@ release candidate for the 7.9 development release.
 <h2>June 16, 2010</h2>
 
 <p>
-<a href="relnotes/7.8.2.html">Mesa 7.8.2</a> is released.  This is a bug-fix
+<a href="relnotes-7.8.2.html">Mesa 7.8.2</a> is released.  This is a bug-fix
 release collecting fixes since the 7.8.1 release.
 </p>
 
@@ -226,18 +156,18 @@ release collecting fixes since the 7.8.1 release.
 <h2>April 5, 2010</h2>
 
 <p>
-<a href="relnotes/7.8.1.html">Mesa 7.8.1</a> is released.  This is a bug-fix
+<a href="relnotes-7.8.1.html">Mesa 7.8.1</a> is released.  This is a bug-fix
 release for a few critical issues in the 7.8 release.
 </p>
 
 
 <h2>March 28, 2010</h2>
 <p>
-<a href="relnotes/7.7.1.html">Mesa 7.7.1</a> is released.  This is a bug-fix
+<a href="relnotes-7.7.1.html">Mesa 7.7.1</a> is released.  This is a bug-fix
 release fixing issues found in the 7.7 release.
 </p>
 <p>
-Also, <a href="relnotes/7.8.html">Mesa 7.8</a> is released.  This is a new
+Also, <a href="relnotes-7.8.html">Mesa 7.8</a> is released.  This is a new
 development release.
 </p>
 
@@ -245,37 +175,37 @@ development release.
 
 <h2>December 21, 2009</h2>
 <p>
-<a href="relnotes/7.6.1.html">Mesa 7.6.1</a> is released.  This is a bug-fix
+<a href="relnotes-7.6.1.html">Mesa 7.6.1</a> is released.  This is a bug-fix
 release fixing issues found in the 7.6 release.
 </p>
 <p>
-Also, <a href="relnotes/7.7.html">Mesa 7.7</a> is released.  This is a new
+Also, <a href="relnotes-7.7.html">Mesa 7.7</a> is released.  This is a new
 development release.
 </p>
 
 
 <h2>September 28, 2009</h2>
 <p>
-<a href="relnotes/7.6.html">Mesa 7.6</a> is released.  This is a new feature
+<a href="relnotes-7.6.html">Mesa 7.6</a> is released.  This is a new feature
 release.  Those especially concerned about stability may want to wait for the
 follow-on 7.6.1 bug-fix release.
 </p>
 <p>
-<a href="relnotes/7.5.2.html">Mesa 7.5.2</a> is also released.
+<a href="relnotes-7.5.2.html">Mesa 7.5.2</a> is also released.
 This is a stable release fixing bugs since the 7.5.1 release.
 </p>
 
 
 <h2>September 3, 2009</h2>
 <p>
-<a href="relnotes/7.5.1.html">Mesa 7.5.1</a> is released.
+<a href="relnotes-7.5.1.html">Mesa 7.5.1</a> is released.
 This is a bug-fix release which fixes bugs found in version 7.5.
 </p>
 
 
 <h2>July 17, 2009</h2>
 <p>
-<a href="relnotes/7.5.html">Mesa 7.5</a> is released.
+<a href="relnotes-7.5.html">Mesa 7.5</a> is released.
 This is a new features release.  People especially concerned about
 stability may want to wait for the follow-on 7.5.1 bug-fix release.
 </p>
@@ -283,7 +213,7 @@ stability may want to wait for the follow-on 7.5.1 bug-fix release.
 
 <h2>June 23, 2009</h2>
 <p>
-<a href="relnotes/7.4.4.html">Mesa 7.4.4</a> is released.
+<a href="relnotes-7.4.4.html">Mesa 7.4.4</a> is released.
 This is a stable release that fixes a regression in the i915/i965 drivers
 that slipped into the 7.4.3 release.
 </p>
@@ -291,35 +221,35 @@ that slipped into the 7.4.3 release.
 
 <h2>June 19, 2009</h2>
 <p>
-<a href="relnotes/7.4.3.html">Mesa 7.4.3</a> is released.
+<a href="relnotes-7.4.3.html">Mesa 7.4.3</a> is released.
 This is a stable release fixing bugs since the 7.4.2 release.
 </p>
 
 
 <h2>May 15, 2009</h2>
 <p>
-<a href="relnotes/7.4.2.html">Mesa 7.4.2</a> is released.
+<a href="relnotes-7.4.2.html">Mesa 7.4.2</a> is released.
 This is a stable release fixing bugs since the 7.4.1 release.
 </p>
 
 
 <h2>April 18, 2009</h2>
 <p>
-<a href="relnotes/7.4.1.html">Mesa 7.4.1</a> is released.
+<a href="relnotes-7.4.1.html">Mesa 7.4.1</a> is released.
 This is a stable release fixing bugs since the 7.4 release.
 </p>
 
 
 <h2>March 27, 2009</h2>
 <p>
-<a href="relnotes/7.4.html">Mesa 7.4</a> is released.
+<a href="relnotes-7.4.html">Mesa 7.4</a> is released.
 This is a stable release fixing bugs since the 7.3 release.
 </p>
 
 
 <h2>January 22, 2009</h2>
 <p>
-<a href="relnotes/7.3.html">Mesa 7.3</a> is released.
+<a href="relnotes-7.3.html">Mesa 7.3</a> is released.
 This is a new development release.
 Mesa 7.4 will follow and will have bug fixes relative to 7.3.
 </p>
@@ -327,14 +257,14 @@ Mesa 7.4 will follow and will have bug fixes relative to 7.3.
 
 <h2>September 20, 2008</h2>
 <p>
-<a href="relnotes/7.2.html">Mesa 7.2</a> is released.
+<a href="relnotes-7.2.html">Mesa 7.2</a> is released.
 This is a stable, bug-fix release.
 </p>
 
 
 <h2>August 26, 2008</h2>
 <p>
-<a href="relnotes/7.1.html">Mesa 7.1</a> is released.
+<a href="relnotes-7.1.html">Mesa 7.1</a> is released.
 This is a new development release.
 It should be relatively stable, but those especially concerned about
 stability should wait for the 7.2 release or use Mesa 7.0.4 (the
@@ -344,14 +274,14 @@ previous stable release).
 
 <h2>August 16, 2008</h2>
 <p>
-<a href="relnotes/7.0.4.html">Mesa 7.0.4</a> is released.
+<a href="relnotes-7.0.4.html">Mesa 7.0.4</a> is released.
 This is a bug-fix release.
 </p>
 
 
 <h2>April 4, 2008</h2>
 <p>
-<a href="relnotes/7.0.3.html">Mesa 7.0.3</a> is released.
+<a href="relnotes-7.0.3.html">Mesa 7.0.3</a> is released.
 This is a bug-fix release.
 </p>
 
@@ -380,28 +310,28 @@ but other drivers will be coming...
 
 <h2>November 10, 2007</h2>
 <p>
-<a href="relnotes/7.0.2.html">Mesa 7.0.2</a> is released.
+<a href="relnotes-7.0.2.html">Mesa 7.0.2</a> is released.
 This is a bug-fix release.
 </p>
 
 
 <h2>August 3, 2007</h2>
 <p>
-<a href="relnotes/7.0.1.html">Mesa 7.0.1</a> is released.
+<a href="relnotes-7.0.1.html">Mesa 7.0.1</a> is released.
 This is a bug-fix release.
 </p>
 
 
 <h2>June 22, 2007</h2>
 <p>
-<a href="relnotes/7.0.html">Mesa 7.0</a> is released.
+<a href="relnotes-7.0.html">Mesa 7.0</a> is released.
 This is a stable release featuring OpenGL 2.1 support.
 </p>
 
 
 <h2>April 27, 2007</h2>
 <p>
-<a href="relnotes/6.5.3.html">Mesa 6.5.3</a> is released.
+<a href="relnotes-6.5.3.html">Mesa 6.5.3</a> is released.
 This is a development release which will lead up to the Mesa 7.0 release
 (which will advertise OpenGL 2.1 API support).
 </p>
@@ -432,33 +362,33 @@ See the <a href="repository.html">repository page</a> for more information.
 
 <h2>December 2, 2006</h2>
 <p>
-<a href="relnotes/6.5.2.html">Mesa 6.5.2</a> has been released.
+<a href="relnotes-6.5.2.html">Mesa 6.5.2</a> has been released.
 This is a new development release.
 </p>
 
 <h2>September 15, 2006</h2>
 <p>
-<a href="relnotes/6.5.1.html">Mesa 6.5.1</a> has been released.
+<a href="relnotes-6.5.1.html">Mesa 6.5.1</a> has been released.
 This is a new development release.
 </p>
 
 <h2>March 31, 2006</h2>
 <p>
-<a href="relnotes/6.5.html">Mesa 6.5</a> has been released.
+<a href="relnotes-6.5.html">Mesa 6.5</a> has been released.
 This is a new development release.
 </p>
 
 
 <h2>February 2, 2006</h2>
 <p>
-<a href="relnotes/6.4.2.html">Mesa 6.4.2</a> has been released.
+<a href="relnotes-6.4.2.html">Mesa 6.4.2</a> has been released.
 This is stable, bug-fix release.
 </p>
 
 
 <h2>November 29, 2005</h2>
 <p>
-<a href="relnotes/6.4.1.html">Mesa 6.4.1</a> has been released.
+<a href="relnotes-6.4.1.html">Mesa 6.4.1</a> has been released.
 This is stable, bug-fix release.
 </p>
 
@@ -466,7 +396,7 @@ This is stable, bug-fix release.
 
 <h2>October 24, 2005</h2>
 <p>
-<a href="relnotes/6.4.html">Mesa 6.4</a> has been released.
+<a href="relnotes-6.4.html">Mesa 6.4</a> has been released.
 This is stable, bug-fix release.
 </p>
 
@@ -785,8 +715,8 @@ OpenGL 1.5 features.
 	- demo of per-pixel lighting with a fragment program (demos/fplight.c)
 	- new version (18) of glext.h header
 	- new spriteblast.c demo of GL_ARB_point_sprite
-	- faster glDrawPixels in X11 driver in some cases (see relnotes/5.1)
-	- faster glCopyPixels in X11 driver in some cases (see relnotes/5.1)
+	- faster glDrawPixels in X11 driver in some cases (see RELNOTES-5.1)
+	- faster glCopyPixels in X11 driver in some cases (see RELNOTES-5.1)
     Bug fixes:
 	- really enable OpenGL 1.4 features in DOS driver.
 	- fixed issues in glDrawPixels and glCopyPixels for very wide images

docs/license.html

@@ -75,10 +75,9 @@ in all copies or substantial portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 </pre>
 
 

docs/llvmpipe.html

@@ -130,38 +130,38 @@ need to ask, don't even try it.
 
 <h1>Profiling</h1>
 
-<p>
-To profile llvmpipe you should build as
-</p>
+To profile llvmpipe you should pass the options
+
 <pre>
   scons build=profile &lt;same-as-before&gt;
 </pre>
 
-<p>
 This will ensure that frame pointers are used both in C and JIT functions, and
 that no tail call optimizations are done by gcc.
-</p>
 
-<h2>Linux perf integration</h2>
-
-<p>
-On Linux, it is possible to have symbol resolution of JIT code with <a href="http://perf.wiki.kernel.org/">Linux perf</a>:
-</p>
+To better profile JIT code you'll need to build LLVM with oprofile integration.
 
 <pre>
-	perf record -g /my/application
-	perf report
+  ./configure \
+      --prefix=$install_dir \
+      --enable-optimized \
+      --disable-profiling \
+      --enable-targets=host-only \
+      --with-oprofile
+
+  make -C "$build_dir"
+  make -C "$build_dir" install
+
+  find "$install_dir/lib" -iname '*.a' -print0 | xargs -0 strip --strip-debug
 </pre>
 
-<p>
-When run inside Linux perf, llvmpipe will create a /tmp/perf-XXXXX.map file with
-symbol address table.  It also dumps assembly code to /tmp/perf-XXXXX.map.asm,
-which can be used by the bin/perf-annotate-jit script to produce disassembly of
-the generated code annotated with the samples.
-</p>
+The you should define
 
-<p>You can obtain a call graph via
-<a href="http://code.google.com/p/jrfonseca/wiki/Gprof2Dot#linux_perf">Gprof2Dot</a>.</p>
+<pre>
+  export LLVM=/path/to/llvm-2.6-profile
+</pre>
+
+and rebuild.
 
 
 <h1>Unit testing</h1>

docs/osmesa.html

@@ -18,62 +18,77 @@
 
 
 <p>
-Mesa's off-screen interface is used for rendering into user-allocated memory
-without any sort of window system or operating system dependencies.
+Mesa's off-screen rendering interface is used for rendering into
+user-allocated blocks of memory.
 That is, the GL_FRONT colorbuffer is actually a buffer in main memory,
 rather than a window on your display.
+There are no window system or operating system dependencies.
+One potential application is to use Mesa as an off-line, batch-style renderer.
 </p>
 
 <p>
-The OSMesa API provides three basic functions for making off-screen
+The <b>OSMesa</b> API provides three basic functions for making off-screen
 renderings: OSMesaCreateContext(), OSMesaMakeCurrent(), and
 OSMesaDestroyContext().  See the Mesa/include/GL/osmesa.h header for
 more information about the API functions.
 </p>
 
-<p>
-The OSMesa interface may be used with any of three software renderers:
-</p>
-<ol>
-<li>llvmpipe - this is the high-performance Gallium LLVM driver
-<li>softpipe - this it the reference Gallium software driver
-<li>swrast - this is the legacy Mesa software rasterizer
-</ol>
-
-
 <p>
 There are several examples of OSMesa in the mesa/demos repository.
 </p>
 
-<h1>Building OSMesa</h1>
+
+<h2>Deep color channels</h2>
 
 <p>
-Configure and build Mesa with something like:
+For some applications 8-bit color channels don't have sufficient
+precision.
+OSMesa supports 16-bit and 32-bit color channels through the OSMesa interface.
+When using 16-bit channels, channels are GLushorts and RGBA pixels occupy
+8 bytes.
+When using 32-bit channels, channels are GLfloats and RGBA pixels occupy
+16 bytes.
+</p>
 
+<p>
+Before version 6.5.1, Mesa had to be recompiled to support exactly
+one of 8, 16 or 32-bit channels.
+With Mesa 6.5.1, Mesa can be compiled for either 8, 16 or 32-bit channels
+and render into any of the smaller size channels.
+For example, if Mesa's compiled for 32-bit channels, you can also render
+16 and 8-bit channel images.
+</p>
+
+<p>
+To build Mesa/OSMesa for 16 and 8-bit color channel support:
 <pre>
-configure --enable-osmesa --disable-driglx-direct --disable-dri --with-gallium-drivers=swrast
-make
+      make realclean
+      make linux-osmesa16
 </pre>
 
 <p>
-Make sure you have LLVM installed first if you want to use the llvmpipe driver.
-</p>
-
-<p>
-When the build is complete you should find:
-</p>
+To build Mesa/OSMesa for 32, 16 and 8-bit color channel support:
 <pre>
-lib/libOSMesa.so  (swrast-based OSMesa)
-lib/gallium/libOSMsea.so  (gallium-based OSMesa)
+      make realclean
+      make linux-osmesa32
 </pre>
 
 <p>
-Set your LD_LIBRARY_PATH to point to one directory or the other to select
-the library you want to use.
+You'll wind up with a library named libOSMesa16.so or libOSMesa32.so.
+Otherwise, most Mesa configurations build an 8-bit/channel libOSMesa.so library
+by default.
 </p>
 
 <p>
-When you link your application, link with -lOSMesa
+If performance is important, compile Mesa for the channel size you're
+most interested in.
+</p>
+
+<p>
+If you need to compile on a non-Linux platform, copy Mesa/configs/linux-osmesa16
+to a new config file and edit it as needed.  Then, add the new config name to
+the top-level Makefile.  Send a patch to the Mesa developers too, if you're
+inclined.
 </p>
 
 </div>

docs/relnotes-6.4.1.html

@@ -3,7 +3,7 @@
 <head>
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
   <title>Mesa Release Notes</title>
-  <link rel="stylesheet" type="text/css" href="../mesa.css">
+  <link rel="stylesheet" type="text/css" href="mesa.css">
 </head>
 <body>
 
@@ -11,7 +11,7 @@
   <h1>The Mesa 3D Graphics Library</h1>
 </div>
 
-<iframe src="../contents.html"></iframe>
+<iframe src="contents.html"></iframe>
 <div class="content">
 
 <h1>Mesa 6.4.1 / November 29, 2006</h1>

docs/relnotes-6.4.2.html

@@ -3,7 +3,7 @@
 <head>
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
   <title>Mesa Release Notes</title>
-  <link rel="stylesheet" type="text/css" href="../mesa.css">
+  <link rel="stylesheet" type="text/css" href="mesa.css">
 </head>
 <body>
 
@@ -11,7 +11,7 @@
   <h1>The Mesa 3D Graphics Library</h1>
 </div>
 
-<iframe src="../contents.html"></iframe>
+<iframe src="contents.html"></iframe>
 <div class="content">
 
 <h1>Mesa 6.4.2 / February 2, 2006</h1>

docs/relnotes-6.4.html

@@ -3,7 +3,7 @@
 <head>
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
   <title>Mesa Release Notes</title>
-  <link rel="stylesheet" type="text/css" href="../mesa.css">
+  <link rel="stylesheet" type="text/css" href="mesa.css">
 </head>
 <body>
 
@@ -11,7 +11,7 @@
   <h1>The Mesa 3D Graphics Library</h1>
 </div>
 
-<iframe src="../contents.html"></iframe>
+<iframe src="contents.html"></iframe>
 <div class="content">
 
 <h1>Mesa 6.4 / October 24, 2005</h1>

docs/relnotes-6.5.1.html

@@ -3,7 +3,7 @@
 <head>
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
   <title>Mesa Release Notes</title>
-  <link rel="stylesheet" type="text/css" href="../mesa.css">
+  <link rel="stylesheet" type="text/css" href="mesa.css">
 </head>
 <body>
 
@@ -11,7 +11,7 @@
   <h1>The Mesa 3D Graphics Library</h1>
 </div>
 
-<iframe src="../contents.html"></iframe>
+<iframe src="contents.html"></iframe>
 <div class="content">
 
 <h1>Mesa 6.5.1 Release Notes / September 15, 2006</h1>

docs/relnotes-6.5.2.html

@@ -3,7 +3,7 @@
 <head>
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
   <title>Mesa Release Notes</title>
-  <link rel="stylesheet" type="text/css" href="../mesa.css">
+  <link rel="stylesheet" type="text/css" href="mesa.css">
 </head>
 <body>
 
@@ -11,7 +11,7 @@
   <h1>The Mesa 3D Graphics Library</h1>
 </div>
 
-<iframe src="../contents.html"></iframe>
+<iframe src="contents.html"></iframe>
 <div class="content">
 
 <h1>Mesa 6.5.2 Release Notes / December 2, 2006</h1>

docs/relnotes-6.5.3.html

@@ -3,7 +3,7 @@
 <head>
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
   <title>Mesa Release Notes</title>
-  <link rel="stylesheet" type="text/css" href="../mesa.css">
+  <link rel="stylesheet" type="text/css" href="mesa.css">
 </head>
 <body>
 
@@ -11,7 +11,7 @@
   <h1>The Mesa 3D Graphics Library</h1>
 </div>
 
-<iframe src="../contents.html"></iframe>
+<iframe src="contents.html"></iframe>
 <div class="content">
 
 <h1>Mesa 6.5.3 Release Notes / April 27, 2007</h1>
@@ -56,7 +56,7 @@ for the same reason.
 <ul>
 <li>OpenGL 2.0 and 2.1 API support.
 <li>Entirely new Shading Language code generator.  See the
-<a href="../shading.html">Shading Language</a> page for more information.
+<a href="shading.html">Shading Language</a> page for more information.
 <li>Much faster software execution of vertex, fragment shaders.
 <li>New vertex buffer object (vbo) infrastructure
 <li>Updated glext.h file (version 39)

docs/relnotes-6.5.html

@@ -3,7 +3,7 @@
 <head>
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
   <title>Mesa Release Notes</title>
-  <link rel="stylesheet" type="text/css" href="../mesa.css">
+  <link rel="stylesheet" type="text/css" href="mesa.css">
 </head>
 <body>
 
@@ -11,7 +11,7 @@
   <h1>The Mesa 3D Graphics Library</h1>
 </div>
 
-<iframe src="../contents.html"></iframe>
+<iframe src="contents.html"></iframe>
 <div class="content">
 
 <h1>Mesa 6.5 Release Notes / March 31, 2006</h1>

docs/relnotes-7.0.1.html

@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
   <title>Mesa Release Notes</title>
-  <link rel="stylesheet" type="text/css" href="../mesa.css">
+  <link rel="stylesheet" type="text/css" href="mesa.css">
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
 </head>
 <body>
@@ -11,7 +11,7 @@
   <h1>The Mesa 3D Graphics Library</h1>
 </div>
 
-<iframe src="../contents.html"></iframe>
+<iframe src="contents.html"></iframe>
 <div class="content">
 
 <h1>Mesa 7.0.1 Release Notes / August 3, 2007</h1>

docs/relnotes-7.0.2.html

@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
   <title>Mesa Release Notes</title>
-  <link rel="stylesheet" type="text/css" href="../mesa.css">
+  <link rel="stylesheet" type="text/css" href="mesa.css">
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
 </head>
 <body>
@@ -11,7 +11,7 @@
   <h1>The Mesa 3D Graphics Library</h1>
 </div>
 
-<iframe src="../contents.html"></iframe>
+<iframe src="contents.html"></iframe>
 <div class="content">
 
 <h1>Mesa 7.0.2 Release Notes / November 10, 2007</h1>

docs/relnotes-7.0.3.html

@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
   <title>Mesa Release Notes</title>
-  <link rel="stylesheet" type="text/css" href="../mesa.css">
+  <link rel="stylesheet" type="text/css" href="mesa.css">
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
 </head>
 <body>
@@ -11,7 +11,7 @@
   <h1>The Mesa 3D Graphics Library</h1>
 </div>
 
-<iframe src="../contents.html"></iframe>
+<iframe src="contents.html"></iframe>
 <div class="content">
 
 <h1>Mesa 7.0.3 Release Notes / April 4, 2008</h1>

docs/relnotes-7.0.4.html

@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
   <title>Mesa Release Notes</title>
-  <link rel="stylesheet" type="text/css" href="../mesa.css">
+  <link rel="stylesheet" type="text/css" href="mesa.css">
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
 </head>
 <body>
@@ -11,7 +11,7 @@
   <h1>The Mesa 3D Graphics Library</h1>
 </div>
 
-<iframe src="../contents.html"></iframe>
+<iframe src="contents.html"></iframe>
 <div class="content">
 
 <h1>Mesa 7.0.4 Release Notes / August 16, 2008</h1>

docs/relnotes-7.0.html

@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
   <title>Mesa Release Notes</title>
-  <link rel="stylesheet" type="text/css" href="../mesa.css">
+  <link rel="stylesheet" type="text/css" href="mesa.css">
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
 </head>
 <body>
@@ -11,7 +11,7 @@
   <h1>The Mesa 3D Graphics Library</h1>
 </div>
 
-<iframe src="../contents.html"></iframe>
+<iframe src="contents.html"></iframe>
 <div class="content">
 
 <h1>Mesa 7.0 Release Notes / June 22, 2007</h1>

docs/relnotes-7.1.html

@@ -3,7 +3,7 @@
 <head>
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
   <title>Mesa Release Notes</title>
-  <link rel="stylesheet" type="text/css" href="../mesa.css">
+  <link rel="stylesheet" type="text/css" href="mesa.css">
 </head>
 <body>
 
@@ -11,7 +11,7 @@
   <h1>The Mesa 3D Graphics Library</h1>
 </div>
 
-<iframe src="../contents.html"></iframe>
+<iframe src="contents.html"></iframe>
 <div class="content">
 
 <h1>Mesa 7.1 Release Notes / August 26, 2008</h1>

docs/relnotes-7.10.1.html

@@ -3,7 +3,7 @@
 <head>
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
   <title>Mesa Release Notes</title>
-  <link rel="stylesheet" type="text/css" href="../mesa.css">
+  <link rel="stylesheet" type="text/css" href="mesa.css">
 </head>
 <body>
 
@@ -11,7 +11,7 @@
   <h1>The Mesa 3D Graphics Library</h1>
 </div>
 
-<iframe src="../contents.html"></iframe>
+<iframe src="contents.html"></iframe>
 <div class="content">
 
 <h1>Mesa 7.10.1 Release Notes / March 2, 2011</h1>
@@ -25,7 +25,7 @@ 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
+See the <a href="install.html">Compiling/Installing page</a> for prerequisites
 for DRI hardware acceleration.
 </p>
 

docs/relnotes-7.10.2.html

@@ -3,7 +3,7 @@
 <head>
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
   <title>Mesa Release Notes</title>
-  <link rel="stylesheet" type="text/css" href="../mesa.css">
+  <link rel="stylesheet" type="text/css" href="mesa.css">
 </head>
 <body>
 
@@ -11,7 +11,7 @@
   <h1>The Mesa 3D Graphics Library</h1>
 </div>
 
-<iframe src="../contents.html"></iframe>
+<iframe src="contents.html"></iframe>
 <div class="content">
 
 <h1>Mesa 7.10.2 Release Notes / April 6, 2011</h1>
@@ -25,7 +25,7 @@ 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
+See the <a href="install.html">Compiling/Installing page</a> for prerequisites
 for DRI hardware acceleration.
 </p>
 

docs/relnotes-7.10.3.html

@@ -3,7 +3,7 @@
 <head>
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
   <title>Mesa Release Notes</title>
-  <link rel="stylesheet" type="text/css" href="../mesa.css">
+  <link rel="stylesheet" type="text/css" href="mesa.css">
 </head>
 <body>
 
@@ -11,7 +11,7 @@
   <h1>The Mesa 3D Graphics Library</h1>
 </div>
 
-<iframe src="../contents.html"></iframe>
+<iframe src="contents.html"></iframe>
 <div class="content">
 
 <h1>Mesa 7.10.3 Release Notes / June 13, 2011</h1>
@@ -25,7 +25,7 @@ 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
+See the <a href="install.html">Compiling/Installing page</a> for prerequisites
 for DRI hardware acceleration.
 </p>
 

docs/relnotes-7.10.html

@@ -3,7 +3,7 @@
 <head>
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
   <title>Mesa Release Notes</title>
-  <link rel="stylesheet" type="text/css" href="../mesa.css">
+  <link rel="stylesheet" type="text/css" href="mesa.css">
 </head>
 <body>
 
@@ -11,7 +11,7 @@
   <h1>The Mesa 3D Graphics Library</h1>
 </div>
 
-<iframe src="../contents.html"></iframe>
+<iframe src="contents.html"></iframe>
 <div class="content">
 
 <h1>Mesa 7.10 Release Notes / January 7, 2011</h1>
@@ -27,7 +27,7 @@ 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
+See the <a href="install.html">Compiling/Installing page</a> for prerequisites
 for DRI hardware acceleration.
 </p>
 
@@ -699,7 +699,7 @@ bc644be551ed585fc4f66c16b64a91c9  MesaGLUT-7.10.tar.gz
   <li>st/egl: Plug pbuffer leaks.</li>
   <li>st/egl: Fix eglCopyBuffers.</li>
   <li>st/egl: Assorted fixes for dri2_display_get_configs.</li>
-  <li>docs/egl: Update ../egl.html.</li>
+  <li>docs/egl: Update egl.html.</li>
   <li>st/egl: Fix eglChooseConfig when configs is NULL.</li>
   <li>docs: Add an example for EGL_DRIVERS_PATH.</li>
   <li>autoconf: Fix --with-driver=xlib --enable-openvg.</li>

docs/relnotes-7.11.1.html

@@ -3,7 +3,7 @@
 <head>
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
   <title>Mesa Release Notes</title>
-  <link rel="stylesheet" type="text/css" href="../mesa.css">
+  <link rel="stylesheet" type="text/css" href="mesa.css">
 </head>
 <body>
 
@@ -11,7 +11,7 @@
   <h1>The Mesa 3D Graphics Library</h1>
 </div>
 
-<iframe src="../contents.html"></iframe>
+<iframe src="contents.html"></iframe>
 <div class="content">
 
 <h1>Mesa 7.11.1 Release Notes / November 17, 2011</h1>
@@ -25,7 +25,7 @@ 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
+See the <a href="install.html">Compiling/Installing page</a> for prerequisites
 for DRI hardware acceleration.
 </p>
 

docs/relnotes-7.11.2.html

@@ -3,7 +3,7 @@
 <head>
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
   <title>Mesa Release Notes</title>
-  <link rel="stylesheet" type="text/css" href="../mesa.css">
+  <link rel="stylesheet" type="text/css" href="mesa.css">
 </head>
 <body>
 
@@ -11,7 +11,7 @@
   <h1>The Mesa 3D Graphics Library</h1>
 </div>
 
-<iframe src="../contents.html"></iframe>
+<iframe src="contents.html"></iframe>
 <div class="content">
 
 <h1>Mesa 7.11.2 Release Notes / November 27, 2011</h1>
@@ -25,7 +25,7 @@ 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
+See the <a href="install.html">Compiling/Installing page</a> for prerequisites
 for DRI hardware acceleration.
 </p>
 

docs/relnotes-7.11.html

@@ -3,7 +3,7 @@
 <head>
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
   <title>Mesa Release Notes</title>
-  <link rel="stylesheet" type="text/css" href="../mesa.css">
+  <link rel="stylesheet" type="text/css" href="mesa.css">
 </head>
 <body>
 
@@ -11,7 +11,7 @@
   <h1>The Mesa 3D Graphics Library</h1>
 </div>
 
-<iframe src="../contents.html"></iframe>
+<iframe src="contents.html"></iframe>
 <div class="content">
 
 <h1>Mesa 7.11 Release Notes / July 31, 2011</h1>
@@ -27,7 +27,7 @@ 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
+See the <a href="install.html">Compiling/Installing page</a> for prerequisites
 for DRI hardware acceleration.
 </p>
 

docs/relnotes-7.2.html

@@ -3,7 +3,7 @@
 <head>
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
   <title>Mesa Release Notes</title>
-  <link rel="stylesheet" type="text/css" href="../mesa.css">
+  <link rel="stylesheet" type="text/css" href="mesa.css">
 </head>
 <body>
 
@@ -11,7 +11,7 @@
   <h1>The Mesa 3D Graphics Library</h1>
 </div>
 
-<iframe src="../contents.html"></iframe>
+<iframe src="contents.html"></iframe>
 <div class="content">
 
 <h1>Mesa 7.2 Release Notes / 20 September 2008</h1>